Skip to content

wip fix(node): Actually check for ai require resolve to enforce the integraton #19188

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

Draft
RulaKhaled wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

wip fix(node): Actually check for ai require resolve to enforce the integraton #19188

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 20 additions & 10 deletions packages/node/src/integrations/tracing/vercelai/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,28 @@
import type { Client, IntegrationFn } from '@sentry/core';
import type { IntegrationFn } from '@sentry/core';
import { addVercelAiProcessors, defineIntegration } from '@sentry/core';
import { generateInstrumentOnce, type modulesIntegration } from '@sentry/node-core';
import { generateInstrumentOnce } from '@sentry/node-core';
import { INTEGRATION_NAME } from './constants';
import { SentryVercelAiInstrumentation } from './instrumentation';
import type { VercelAiOptions } from './types';

export const instrumentVercelAi = generateInstrumentOnce(INTEGRATION_NAME, () => new SentryVercelAiInstrumentation({}));

/**
* Determines if the integration should be forced based on environment and package availability.
* Returns true if the 'ai' package is available.
* Determines if the 'ai' package is installed and available.
*
* Uses require.resolve() to check for package availability without loading it.
* This approach avoids race conditions that can occur with filesystem-based
* detection during initialization in serverless environments (Lambda/Vercel).
*
* @returns true if the 'ai' package can be resolved, false otherwise
*/
function shouldForceIntegration(client: Client): boolean {
const modules = client.getIntegrationByName<ReturnType<typeof modulesIntegration>>('Modules');
return !!modules?.getModules?.()?.ai;
function shouldForceIntegration(): boolean {
try {
require.resolve('ai');
return true;
} catch {
return false;
}
}

const _vercelAIIntegration = ((options: VercelAiOptions = {}) => {
Expand All @@ -26,13 +35,14 @@ const _vercelAIIntegration = ((options: VercelAiOptions = {}) => {
instrumentation = instrumentVercelAi();
},
afterAllSetup(client) {
// Auto-detect if we should force the integration when running with 'ai' package available
// Note that this can only be detected if the 'Modules' integration is available, and running in CJS mode
const shouldForce = options.force ?? shouldForceIntegration(client);
// Auto-detect if we should force the integration when the 'ai' package is available
// Uses require.resolve() for reliable detection in all environments
const shouldForce = options.force ?? shouldForceIntegration();

if (shouldForce) {
addVercelAiProcessors(client);
} else {
// Lazy registration - only registers when 'ai' package is actually imported
instrumentation?.callWhenPatched(() => addVercelAiProcessors(client));
}
},
Expand Down
Loading