Merge branch 'next' into improve-cloud-telemetry-errors

firebase · Oct 23, 2024 · a8daf2d · a8daf2d
2 parents aa4cc95 + f6e8982
commit a8daf2d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 11,725 deletions.
diff --git a/js/plugins/google-cloud/package.json b/js/plugins/google-cloud/package.json
@@ -73,4 +73,4 @@
       "default": "./lib/index.js"
     }
   }
-}
+}
diff --git a/js/plugins/google-cloud/tests/logs_no_io_test.ts b/js/plugins/google-cloud/tests/logs_no_io_test.ts
@@ -27,10 +27,10 @@ import { GenerateResponseData, Genkit, genkit, run, z } from 'genkit';
 import assert from 'node:assert';
 import { Writable } from 'stream';
 import {
+  enableGoogleCloudTelemetry,
   __addTransportStreamForTesting,
   __forceFlushSpansForTesting,
   __getSpanExporterForTesting,
-  enableGoogleCloudTelemetry,
 } from '../src/index.js';
 
 jest.mock('../src/auth.js', () => {

diff --git a/js/plugins/google-cloud/tests/logs_test.ts b/js/plugins/google-cloud/tests/logs_test.ts
@@ -24,14 +24,14 @@ import {
 } from '@jest/globals';
 import { ReadableSpan } from '@opentelemetry/sdk-trace-base';
 import { GenerateResponseData, Genkit, genkit, run, z } from 'genkit';
-import { SPAN_TYPE_ATTR, appendSpan } from 'genkit/tracing';
+import { appendSpan, SPAN_TYPE_ATTR } from 'genkit/tracing';
 import assert from 'node:assert';
 import { Writable } from 'stream';
 import {
+  enableGoogleCloudTelemetry,
   __addTransportStreamForTesting,
   __forceFlushSpansForTesting,
   __getSpanExporterForTesting,
-  enableGoogleCloudTelemetry,
 } from '../src/index.js';
 
 jest.mock('../src/auth.js', () => {