-
-
Notifications
You must be signed in to change notification settings - Fork 1.7k
feat(deno): Add OpenTelemetry support and vercelAI integration #17445
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
Merged
Merged
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
4269b46
feat(deno): Add OpenTelemetry support and vercelAI integration
sergical 1427b8b
lint
sergical 814a1e3
better tests
sergical 446f901
Merge branch 'develop' into feat/deno-opentelemetry-vercelai
sergical 170d300
fixes for 🤖
sergical 3b38271
Merge branch 'develop' into feat/deno-opentelemetry-vercelai
sergical a84b0d9
Merge branch 'develop' into feat/deno-opentelemetry-vercelai
sergical f98559f
Merge branch 'develop' into feat/deno-opentelemetry-vercelai
sergical f93232a
Merge branch 'develop' into feat/deno-opentelemetry-vercelai
sergical 70f92af
feat(deno): Add OTeL compatability tests, move vercelai to /tracing
sergical bb5ff2d
Merge branch 'develop' into feat/deno-opentelemetry-vercelai
sergical 0636943
fix(deno) formatting
sergical 304d17d
Merge branch 'develop' into feat/deno-opentelemetry-vercelai
sergical File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
45 changes: 45 additions & 0 deletions
packages/deno/src/integrations/tracing/vercelai.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
/** | ||
* This is a copy of the Vercel AI integration from the cloudflare SDK. | ||
*/ | ||
|
||
import type { IntegrationFn } from '@sentry/core'; | ||
import { addVercelAiProcessors, defineIntegration } from '@sentry/core'; | ||
|
||
const INTEGRATION_NAME = 'VercelAI'; | ||
|
||
const _vercelAIIntegration = (() => { | ||
return { | ||
name: INTEGRATION_NAME, | ||
setup(client) { | ||
addVercelAiProcessors(client); | ||
}, | ||
}; | ||
}) satisfies IntegrationFn; | ||
|
||
/** | ||
* Adds Sentry tracing instrumentation for the [ai](https://www.npmjs.com/package/ai) library. | ||
* This integration is not enabled by default, you need to manually add it. | ||
* | ||
* For more information, see the [`ai` documentation](https://sdk.vercel.ai/docs/ai-sdk-core/telemetry). | ||
* | ||
* You need to enable collecting spans for a specific call by setting | ||
* `experimental_telemetry.isEnabled` to `true` in the first argument of the function call. | ||
* | ||
* ```javascript | ||
* const result = await generateText({ | ||
* model: openai('gpt-4-turbo'), | ||
* experimental_telemetry: { isEnabled: true }, | ||
* }); | ||
* ``` | ||
* | ||
* If you want to collect inputs and outputs for a specific call, you must specifically opt-in to each | ||
* function call by setting `experimental_telemetry.recordInputs` and `experimental_telemetry.recordOutputs` | ||
* to `true`. | ||
* | ||
* ```javascript | ||
* const result = await generateText({ | ||
* model: openai('gpt-4-turbo'), | ||
* experimental_telemetry: { isEnabled: true, recordInputs: true, recordOutputs: true }, | ||
* }); | ||
*/ | ||
export const vercelAIIntegration = defineIntegration(_vercelAIIntegration); |
110 changes: 110 additions & 0 deletions
packages/deno/src/opentelemetry/tracer.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,110 @@ | ||
import type { Context, Span, SpanOptions, Tracer, TracerProvider } from '@opentelemetry/api'; | ||
import { SpanKind, trace } from '@opentelemetry/api'; | ||
import { | ||
SEMANTIC_ATTRIBUTE_SENTRY_OP, | ||
SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, | ||
startInactiveSpan, | ||
startSpanManual, | ||
} from '@sentry/core'; | ||
|
||
/** | ||
* Set up a mock OTEL tracer to allow inter-op with OpenTelemetry emitted spans. | ||
* This is not perfect but handles easy/common use cases. | ||
*/ | ||
export function setupOpenTelemetryTracer(): void { | ||
trace.setGlobalTracerProvider(new SentryDenoTraceProvider()); | ||
} | ||
cursor[bot] marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
class SentryDenoTraceProvider implements TracerProvider { | ||
private readonly _tracers: Map<string, Tracer> = new Map(); | ||
|
||
public getTracer(name: string, version?: string, options?: { schemaUrl?: string }): Tracer { | ||
const key = `${name}@${version || ''}:${options?.schemaUrl || ''}`; | ||
if (!this._tracers.has(key)) { | ||
this._tracers.set(key, new SentryDenoTracer()); | ||
} | ||
|
||
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion | ||
return this._tracers.get(key)!; | ||
} | ||
} | ||
|
||
class SentryDenoTracer implements Tracer { | ||
public startSpan(name: string, options?: SpanOptions): Span { | ||
// Map OpenTelemetry SpanKind to Sentry operation | ||
const op = this._mapSpanKindToOp(options?.kind); | ||
|
||
return startInactiveSpan({ | ||
name, | ||
...options, | ||
attributes: { | ||
...options?.attributes, | ||
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'manual', | ||
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: op, | ||
'sentry.deno_tracer': true, | ||
}, | ||
}); | ||
cursor[bot] marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} | ||
|
||
/** | ||
* NOTE: This does not handle `context` being passed in. It will always put spans on the current scope. | ||
*/ | ||
public startActiveSpan<F extends (span: Span) => unknown>(name: string, fn: F): ReturnType<F>; | ||
public startActiveSpan<F extends (span: Span) => unknown>(name: string, options: SpanOptions, fn: F): ReturnType<F>; | ||
public startActiveSpan<F extends (span: Span) => unknown>( | ||
name: string, | ||
options: SpanOptions, | ||
context: Context, | ||
fn: F, | ||
): ReturnType<F>; | ||
public startActiveSpan<F extends (span: Span) => unknown>( | ||
name: string, | ||
options: unknown, | ||
context?: unknown, | ||
fn?: F, | ||
): ReturnType<F> { | ||
const opts = (typeof options === 'object' && options !== null ? options : {}) as SpanOptions; | ||
|
||
// Map OpenTelemetry SpanKind to Sentry operation | ||
const op = this._mapSpanKindToOp(opts.kind); | ||
|
||
const spanOpts = { | ||
name, | ||
...opts, | ||
attributes: { | ||
...opts.attributes, | ||
[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'manual', | ||
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: op, | ||
'sentry.deno_tracer': true, | ||
}, | ||
}; | ||
|
||
const callback = ( | ||
typeof options === 'function' | ||
? options | ||
: typeof context === 'function' | ||
? context | ||
: typeof fn === 'function' | ||
? fn | ||
: () => {} | ||
) as F; | ||
|
||
// In OTEL the semantic matches `startSpanManual` because spans are not auto-ended | ||
return startSpanManual(spanOpts, callback) as ReturnType<F>; | ||
} | ||
|
||
private _mapSpanKindToOp(kind?: SpanKind): string { | ||
switch (kind) { | ||
case SpanKind.CLIENT: | ||
return 'http.client'; | ||
case SpanKind.SERVER: | ||
return 'http.server'; | ||
case SpanKind.PRODUCER: | ||
return 'message.produce'; | ||
case SpanKind.CONSUMER: | ||
return 'message.consume'; | ||
default: | ||
return 'otel.span'; | ||
} | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.