-
-
Notifications
You must be signed in to change notification settings - Fork 1.8k
feat(deno): add openai integration #22467
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| // <reference lib="deno.ns" /> | ||
|
|
||
| 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<TransactionEvent>; | ||
| } { | ||
| 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<TransactionEvent>(resolve => { | ||
| waiters.push({ predicate, resolve }); | ||
| }); | ||
| }, | ||
| }; | ||
| } | ||
|
|
||
| function withTimeout<T>(p: Promise<T>, ms: number, what: string): Promise<T> { | ||
| let timer: ReturnType<typeof setTimeout> | undefined; | ||
| const timeout = new Promise<T>((_, 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('openai 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('OpenAI'), `OpenAI should be in defaults, got ${names.join(', ')}`); | ||
| }); | ||
|
|
||
| Deno.test('openai instrumentation: orchestrion:openai:chat channel produces a nested gen_ai span', async () => { | ||
| resetGlobals(); | ||
| const sink = transactionSink(); | ||
| init({ | ||
| dsn: 'https://username@domain/123', | ||
| tracesSampleRate: 1, | ||
| beforeSendTransaction: sink.beforeSendTransaction, | ||
| }); | ||
|
Comment on lines
+68
to
+71
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Bug: The global Suggested FixReset the Prompt for AI Agent |
||
|
|
||
| const channel = tracingChannel('orchestrion:openai:chat'); | ||
|
|
||
| // `arguments[0]` is the request body passed to `create(body, options)`. | ||
| const body = { model: 'gpt-4o', messages: [{ role: 'user', content: 'hi' }] }; | ||
| const ctx: Record<string, unknown> = { arguments: [body] }; | ||
|
|
||
| startSpan({ name: 'parent', op: 'test' }, () => { | ||
| channel.start.runStores(ctx, () => undefined); | ||
| channel.end.publish(ctx); | ||
| ctx.result = { | ||
| id: 'chatcmpl-1', | ||
| model: 'gpt-4o-2024-08-06', | ||
| usage: { prompt_tokens: 10, completion_tokens: 5, total_tokens: 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.chat'); | ||
| assertExists(aiSpan, `expected a gen_ai.chat child span, got ops: ${parent.spans?.map(s => s.op).join(', ')}`); | ||
| assertEquals(aiSpan!.description, 'chat gpt-4o'); | ||
| assertEquals(aiSpan!.data?.['gen_ai.system'], 'openai'); | ||
| assertEquals(aiSpan!.data?.['gen_ai.operation.name'], 'chat'); | ||
| assertEquals(aiSpan!.data?.['gen_ai.request.model'], 'gpt-4o'); | ||
| assertEquals(aiSpan!.data?.['gen_ai.response.model'], 'gpt-4o-2024-08-06'); | ||
| assertEquals(aiSpan!.data?.['gen_ai.usage.total_tokens'], 15); | ||
| assertEquals(aiSpan!.data?.['sentry.origin'], 'auto.ai.orchestrion.openai'); | ||
| }); | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Bug: The global
installedIntegrationsarray is not reset between tests, causingsetupOnce()to be skipped in the second test, which prevents channel subscribers from being registered and leads to test failure.Severity: MEDIUM
Suggested Fix
The global state needs to be reset between test runs. The
installedIntegrationsarray should be cleared as part of the test teardown or setup process. For example, theresetGlobals()function could be modified to also clear this array, ensuring each test runs in an isolated environment andsetupOnce()is called correctly.Prompt for AI Agent
Also affects:
dev-packages/deno-integration-tests/suites/orchestrion-openai/test.ts:57~62Did we get this right? 👍 / 👎 to inform future reviews.