Skip to content

fix(node): Fix this context for vercel AI instrumentation #17681

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.

Sign up for GitHub

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 2 commits into from
Sep 17, 2025
Merged

fix(node): Fix this context for vercel AI instrumentation #17681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15f8378
fix(node): Fix `this` context for vercel AI instrumentation
mydea Sep 17, 2025
7ad75b5
fix client lookup
mydea Sep 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions packages/node/src/integrations/tracing/anthropic-ai/instrumentation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
InstrumentationNodeModuleDefinition,
} from '@opentelemetry/instrumentation';
import type { AnthropicAiClient, AnthropicAiOptions, Integration } from '@sentry/core';
import { ANTHROPIC_AI_INTEGRATION_NAME, getCurrentScope, instrumentAnthropicAiClient, SDK_VERSION } from '@sentry/core';
import { ANTHROPIC_AI_INTEGRATION_NAME, getClient, instrumentAnthropicAiClient, SDK_VERSION } from '@sentry/core';

const supportedVersions = ['>=0.19.2 <1.0.0'];

Expand Down Expand Up @@ -61,10 +61,10 @@ export class SentryAnthropicAiInstrumentation extends InstrumentationBase<Instru

const WrappedAnthropic = function (this: unknown, ...args: unknown[]) {
const instance = Reflect.construct(Original, args);
const scopeClient = getCurrentScope().getClient();
const integration = scopeClient?.getIntegrationByName<AnthropicAiIntegration>(ANTHROPIC_AI_INTEGRATION_NAME);
const client = getClient();
const integration = client?.getIntegrationByName<AnthropicAiIntegration>(ANTHROPIC_AI_INTEGRATION_NAME);
const integrationOpts = integration?.options;
const defaultPii = Boolean(scopeClient?.getOptions().sendDefaultPii);
const defaultPii = Boolean(client?.getOptions().sendDefaultPii);

const { recordInputs, recordOutputs } = determineRecordingSettings(integrationOpts, defaultPii);

Expand Down
8 changes: 4 additions & 4 deletions packages/node/src/integrations/tracing/openai/instrumentation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
InstrumentationNodeModuleDefinition,
} from '@opentelemetry/instrumentation';
import type { Integration, OpenAiClient, OpenAiOptions } from '@sentry/core';
import { getCurrentScope, instrumentOpenAiClient, OPENAI_INTEGRATION_NAME, SDK_VERSION } from '@sentry/core';
import { getClient, instrumentOpenAiClient, OPENAI_INTEGRATION_NAME, SDK_VERSION } from '@sentry/core';

const supportedVersions = ['>=4.0.0 <6'];

Expand Down Expand Up @@ -57,10 +57,10 @@ export class SentryOpenAiInstrumentation extends InstrumentationBase<Instrumenta

const WrappedOpenAI = function (this: unknown, ...args: unknown[]) {
const instance = Reflect.construct(Original, args);
const scopeClient = getCurrentScope().getClient();
const integration = scopeClient?.getIntegrationByName<OpenAiIntegration>(OPENAI_INTEGRATION_NAME);
const client = getClient();
const integration = client?.getIntegrationByName<OpenAiIntegration>(OPENAI_INTEGRATION_NAME);
const integrationOpts = integration?.options;
const defaultPii = Boolean(scopeClient?.getOptions().sendDefaultPii);
const defaultPii = Boolean(client?.getOptions().sendDefaultPii);

const { recordInputs, recordOutputs } = determineRecordingSettings(integrationOpts, defaultPii);

Expand Down
103 changes: 52 additions & 51 deletions packages/node/src/integrations/tracing/vercelai/instrumentation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
addNonEnumerableProperty,
captureException,
getActiveSpan,
getCurrentScope,
getClient,
handleCallbackErrors,
isThenable,
SDK_VERSION,
Expand Down Expand Up @@ -212,57 +212,58 @@ export class SentryVercelAiInstrumentation extends InstrumentationBase {
this._callbacks.forEach(callback => callback());
this._callbacks = [];

function generatePatch(originalMethod: (...args: MethodArgs) => unknown) {
return (...args: MethodArgs) => {
const existingExperimentalTelemetry = args[0].experimental_telemetry || {};
const isEnabled = existingExperimentalTelemetry.isEnabled;

const client = getCurrentScope().getClient();
const integration = client?.getIntegrationByName<VercelAiIntegration>(INTEGRATION_NAME);
const integrationOptions = integration?.options;
const shouldRecordInputsAndOutputs = integration ? Boolean(client?.getOptions().sendDefaultPii) : false;

const { recordInputs, recordOutputs } = determineRecordingSettings(
integrationOptions,
existingExperimentalTelemetry,
isEnabled,
shouldRecordInputsAndOutputs,
);

args[0].experimental_telemetry = {
...existingExperimentalTelemetry,
isEnabled: isEnabled !== undefined ? isEnabled : true,
recordInputs,
recordOutputs,
};

return handleCallbackErrors(
() => {
// @ts-expect-error we know that the method exists
const result = originalMethod.apply(this, args);

if (isThenable(result)) {
// check for tool errors when the promise resolves, keep the original promise identity
result.then(checkResultForToolErrors, () => {});
const generatePatch = <T extends (...args: MethodArgs) => unknown>(originalMethod: T): T => {
return new Proxy(originalMethod, {
apply: (target, thisArg, args: MethodArgs) => {
const existingExperimentalTelemetry = args[0].experimental_telemetry || {};
const isEnabled = existingExperimentalTelemetry.isEnabled;

const client = getClient();
const integration = client?.getIntegrationByName<VercelAiIntegration>(INTEGRATION_NAME);
const integrationOptions = integration?.options;
const shouldRecordInputsAndOutputs = integration ? Boolean(client?.getOptions().sendDefaultPii) : false;

const { recordInputs, recordOutputs } = determineRecordingSettings(
integrationOptions,
existingExperimentalTelemetry,
isEnabled,
shouldRecordInputsAndOutputs,
);

args[0].experimental_telemetry = {
...existingExperimentalTelemetry,
isEnabled: isEnabled !== undefined ? isEnabled : true,
recordInputs,
recordOutputs,
};

return handleCallbackErrors(
() => {
const result = Reflect.apply(target, thisArg, args);

if (isThenable(result)) {
// check for tool errors when the promise resolves, keep the original promise identity
result.then(checkResultForToolErrors, () => {});
return result;
}

// check for tool errors when the result is synchronous
checkResultForToolErrors(result);
return result;
}

// check for tool errors when the result is synchronous
checkResultForToolErrors(result);
return result;
},
error => {
// This error bubbles up to unhandledrejection handler (if not handled before),
// where we do not know the active span anymore
// So to circumvent this, we set the active span on the error object
// which is picked up by the unhandledrejection handler
if (error && typeof error === 'object') {
addNonEnumerableProperty(error, '_sentry_active_span', getActiveSpan());
}
},
);
};
}
},
error => {
// This error bubbles up to unhandledrejection handler (if not handled before),
// where we do not know the active span anymore
// So to circumvent this, we set the active span on the error object
// which is picked up by the unhandledrejection handler
if (error && typeof error === 'object') {
addNonEnumerableProperty(error, '_sentry_active_span', getActiveSpan());
}
},
);
},
});
};

// Is this an ESM module?
// https://tc39.es/ecma262/#sec-module-namespace-objects
Expand Down