From a2edc7e7ed6023758179a3452e62ac6a159d4aae Mon Sep 17 00:00:00 2001 From: isaacs Date: Tue, 21 Jul 2026 13:30:13 -0700 Subject: [PATCH] feat(deno): add google-genai integration --- .../suites/orchestrion-google-genai/test.ts | 107 ++++++++++++++++++ packages/deno/src/index.ts | 1 + packages/deno/src/sdk.ts | 2 + .../deno/test/__snapshots__/mod.test.ts.snap | 4 + 4 files changed, 114 insertions(+) create mode 100644 dev-packages/deno-integration-tests/suites/orchestrion-google-genai/test.ts diff --git a/dev-packages/deno-integration-tests/suites/orchestrion-google-genai/test.ts b/dev-packages/deno-integration-tests/suites/orchestrion-google-genai/test.ts new file mode 100644 index 000000000000..4d9d6c5b7f86 --- /dev/null +++ b/dev-packages/deno-integration-tests/suites/orchestrion-google-genai/test.ts @@ -0,0 +1,107 @@ +// + +import { tracingChannel } from 'node:diagnostics_channel'; +import type { TransactionEvent } from '@sentry/core'; +import type { DenoClient } from '@sentry/deno'; +import { getCurrentScope, getGlobalScope, getIsolationScope, init, startSpan } from '@sentry/deno'; +import { assert } from 'https://deno.land/std@0.212.0/assert/assert.ts'; +import { assertExists } from 'https://deno.land/std@0.212.0/assert/assert_exists.ts'; +import { assertEquals } from 'https://deno.land/std@0.212.0/assert/assert_equals.ts'; + +function resetGlobals(): void { + getCurrentScope().clear(); + getCurrentScope().setClient(undefined); + getIsolationScope().clear(); + getGlobalScope().clear(); +} + +/** See deno-redis.test.ts — same sink shape, deduped for clarity. */ +function transactionSink(): { + beforeSendTransaction: (event: TransactionEvent) => null; + waitFor: (predicate: (event: TransactionEvent) => boolean) => Promise; +} { + const transactions: TransactionEvent[] = []; + const waiters: { predicate: (e: TransactionEvent) => boolean; resolve: (e: TransactionEvent) => void }[] = []; + return { + beforeSendTransaction(event) { + transactions.push(event); + for (let i = waiters.length - 1; i >= 0; i--) { + const w = waiters[i]!; + if (w.predicate(event)) { + waiters.splice(i, 1); + w.resolve(event); + } + } + return null; + }, + waitFor(predicate) { + const already = transactions.find(predicate); + if (already) return Promise.resolve(already); + return new Promise(resolve => { + waiters.push({ predicate, resolve }); + }); + }, + }; +} + +function withTimeout(p: Promise, ms: number, what: string): Promise { + let timer: ReturnType | undefined; + const timeout = new Promise((_, reject) => { + timer = setTimeout(() => reject(new Error(`Timed out waiting for ${what} after ${ms}ms`)), ms); + }); + return Promise.race([p, timeout]).finally(() => { + if (timer !== undefined) clearTimeout(timer); + }); +} + +Deno.test('google-genai instrumentation: included in default integrations (Deno 2.8.0+)', () => { + resetGlobals(); + const client = init({ dsn: 'https://username@domain/123' }) as DenoClient; + const names = client.getOptions().integrations.map(i => i.name); + assert(names.includes('Google_GenAI'), `Google_GenAI should be in defaults, got ${names.join(', ')}`); +}); + +Deno.test('google-genai instrumentation: orchestrion @google/genai:generate-content channel produces a nested gen_ai span', async () => { + resetGlobals(); + const sink = transactionSink(); + init({ + dsn: 'https://username@domain/123', + tracesSampleRate: 1, + beforeSendTransaction: sink.beforeSendTransaction, + }); + + const channel = tracingChannel('orchestrion:@google/genai:generate-content'); + + // `arguments[0]` is the request params passed to `generateContent(params)`. + const params = { model: 'gemini-1.5-flash', contents: 'hi' }; + const ctx: Record = { arguments: [params] }; + + startSpan({ name: 'parent', op: 'test' }, () => { + channel.start.runStores(ctx, () => undefined); + channel.end.publish(ctx); + ctx.result = { + modelVersion: 'gemini-1.5-flash-002', + usageMetadata: { promptTokenCount: 10, candidatesTokenCount: 5, totalTokenCount: 15 }, + }; + channel.asyncEnd.publish(ctx); + }); + + const parent = await withTimeout( + sink.waitFor(t => t.transaction === 'parent'), + 5000, + "'parent' transaction", + ); + + const aiSpan = parent.spans?.find(s => s.op === 'gen_ai.generate_content'); + assertExists( + aiSpan, + `expected a gen_ai.generate_content child span, got ops: ${parent.spans?.map(s => s.op).join(', ')}`, + ); + assertEquals(aiSpan!.description, 'generate_content gemini-1.5-flash'); + assertEquals(aiSpan!.data?.['gen_ai.system'], 'google_genai'); + assertEquals(aiSpan!.data?.['gen_ai.operation.name'], 'generate_content'); + assertEquals(aiSpan!.data?.['gen_ai.request.model'], 'gemini-1.5-flash'); + assertEquals(aiSpan!.data?.['gen_ai.response.model'], 'gemini-1.5-flash-002'); + assertEquals(aiSpan!.data?.['gen_ai.usage.total_tokens'], 15); + assertEquals(aiSpan!.data?.['sentry.origin'], 'auto.ai.orchestrion.google_genai'); +}); diff --git a/packages/deno/src/index.ts b/packages/deno/src/index.ts index 6fafb47a4d0e..858bb24adc4c 100644 --- a/packages/deno/src/index.ts +++ b/packages/deno/src/index.ts @@ -123,6 +123,7 @@ export { expressChannelIntegration, firebaseChannelIntegration, genericPoolChannelIntegration, + googleGenAIChannelIntegration, graphqlDiagnosticsChannelIntegration, hapiChannelIntegration, kafkajsChannelIntegration, diff --git a/packages/deno/src/sdk.ts b/packages/deno/src/sdk.ts index e4b79978dad0..daea3ebb1166 100644 --- a/packages/deno/src/sdk.ts +++ b/packages/deno/src/sdk.ts @@ -18,6 +18,7 @@ import { expressChannelIntegration, firebaseChannelIntegration, genericPoolChannelIntegration, + googleGenAIChannelIntegration, graphqlDiagnosticsChannelIntegration, hapiChannelIntegration, kafkajsChannelIntegration, @@ -95,6 +96,7 @@ export function getDefaultIntegrations(_options: Options): Integration[] { expressChannelIntegration(), firebaseChannelIntegration(), genericPoolChannelIntegration(), + googleGenAIChannelIntegration(), hapiChannelIntegration(), kafkajsChannelIntegration(), koaChannelIntegration(), diff --git a/packages/deno/test/__snapshots__/mod.test.ts.snap b/packages/deno/test/__snapshots__/mod.test.ts.snap index 83ea2aeb046d..8265f60a6e48 100644 --- a/packages/deno/test/__snapshots__/mod.test.ts.snap +++ b/packages/deno/test/__snapshots__/mod.test.ts.snap @@ -122,6 +122,7 @@ snapshot[`captureException 1`] = ` "Express", "Firebase", "GenericPool", + "Google_GenAI", "Hapi", "Kafka", "Koa", @@ -216,6 +217,7 @@ snapshot[`captureMessage 1`] = ` "Express", "Firebase", "GenericPool", + "Google_GenAI", "Hapi", "Kafka", "Koa", @@ -317,6 +319,7 @@ snapshot[`captureMessage twice 1`] = ` "Express", "Firebase", "GenericPool", + "Google_GenAI", "Hapi", "Kafka", "Koa", @@ -425,6 +428,7 @@ snapshot[`captureMessage twice 2`] = ` "Express", "Firebase", "GenericPool", + "Google_GenAI", "Hapi", "Kafka", "Koa",