Skip to content

test(node): Enable additionalDependencies in integration runner #17361

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 4 commits into from
Aug 11, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
import * as Sentry from '@sentry/node';
import { generateText } from 'ai';
import { MockLanguageModelV2 } from 'ai/test';
import { z } from 'zod';

async function run() {
await Sentry.startSpan({ op: 'function', name: 'main' }, async () => {
await generateText({
model: new MockLanguageModelV2({
doGenerate: async () => ({
finishReason: 'stop',
usage: { inputTokens: 10, outputTokens: 20, totalTokens: 30 },
content: [{ type: 'text', text: 'First span here!' }],
}),
}),
prompt: 'Where is the first span?',
});

// This span should have input and output prompts attached because telemetry is explicitly enabled.
await generateText({
experimental_telemetry: { isEnabled: true },
model: new MockLanguageModelV2({
doGenerate: async () => ({
finishReason: 'stop',
usage: { inputTokens: 10, outputTokens: 20, totalTokens: 30 },
content: [{ type: 'text', text: 'Second span here!' }],
}),
}),
prompt: 'Where is the second span?',
});

// This span should include tool calls and tool results
await generateText({
model: new MockLanguageModelV2({
doGenerate: async () => ({
finishReason: 'tool-calls',
usage: { inputTokens: 15, outputTokens: 25, totalTokens: 40 },
content: [{ type: 'text', text: 'Tool call completed!' }],
toolCalls: [
{
toolCallType: 'function',
toolCallId: 'call-1',
toolName: 'getWeather',
args: '{ "location": "San Francisco" }',
},
],
}),
}),
tools: {
getWeather: {
parameters: z.object({ location: z.string() }),
execute: async args => {
return `Weather in ${args.location}: Sunny, 72°F`;
},
},
},
prompt: 'What is the weather in San Francisco?',
});

// This span should not be captured because we've disabled telemetry
await generateText({
experimental_telemetry: { isEnabled: false },
model: new MockLanguageModelV2({
doGenerate: async () => ({
finishReason: 'stop',
usage: { inputTokens: 10, outputTokens: 20, totalTokens: 30 },
content: [{ type: 'text', text: 'Third span here!' }],
}),
}),
prompt: 'Where is the third span?',
});
});
}

run();
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,73 @@ describe('Vercel AI integration', () => {
]),
};

// Todo: Add missing attribute spans for v5
// Right now only second span is recorded as it's manually opted in via explicit telemetry option
const EXPECTED_TRANSACTION_DEFAULT_PII_FALSE_V5 = {
transaction: 'main',
spans: expect.arrayContaining([
expect.objectContaining({
data: {
'vercel.ai.model.id': 'mock-model-id',
'vercel.ai.model.provider': 'mock-provider',
'vercel.ai.operationId': 'ai.generateText',
'vercel.ai.pipeline.name': 'generateText',
'vercel.ai.prompt': '{"prompt":"Where is the second span?"}',
'vercel.ai.response.finishReason': 'stop',
'gen_ai.response.text': expect.any(String),
'vercel.ai.settings.maxRetries': 2,
// 'vercel.ai.settings.maxSteps': 1,
'vercel.ai.streaming': false,
'gen_ai.prompt': '{"prompt":"Where is the second span?"}',
'gen_ai.response.model': 'mock-model-id',
'gen_ai.usage.input_tokens': 10,
'gen_ai.usage.output_tokens': 20,
'gen_ai.usage.total_tokens': 30,
'operation.name': 'ai.generateText',
'sentry.op': 'gen_ai.invoke_agent',
'sentry.origin': 'auto.vercelai.otel',
},
description: 'generateText',
op: 'gen_ai.invoke_agent',
origin: 'auto.vercelai.otel',
status: 'ok',
}),
// doGenerate
expect.objectContaining({
data: {
'sentry.origin': 'auto.vercelai.otel',
'sentry.op': 'gen_ai.generate_text',
'operation.name': 'ai.generateText.doGenerate',
'vercel.ai.operationId': 'ai.generateText.doGenerate',
'vercel.ai.model.provider': 'mock-provider',
'vercel.ai.model.id': 'mock-model-id',
'vercel.ai.settings.maxRetries': 2,
'gen_ai.system': 'mock-provider',
'gen_ai.request.model': 'mock-model-id',
'vercel.ai.pipeline.name': 'generateText.doGenerate',
'vercel.ai.streaming': false,
'vercel.ai.response.finishReason': 'stop',
'vercel.ai.response.model': 'mock-model-id',
'vercel.ai.response.id': expect.any(String),
'gen_ai.response.text': 'Second span here!',
'vercel.ai.response.timestamp': expect.any(String),
// 'vercel.ai.prompt.format': expect.any(String),
'gen_ai.request.messages': expect.any(String),
'gen_ai.response.finish_reasons': ['stop'],
'gen_ai.usage.input_tokens': 10,
'gen_ai.usage.output_tokens': 20,
'gen_ai.response.id': expect.any(String),
'gen_ai.response.model': 'mock-model-id',
'gen_ai.usage.total_tokens': 30,
},
description: 'generate_text mock-model-id',
op: 'gen_ai.generate_text',
origin: 'auto.vercelai.otel',
status: 'ok',
}),
]),
};

const EXPECTED_TRANSACTION_DEFAULT_PII_TRUE = {
transaction: 'main',
spans: expect.arrayContaining([
Expand Down Expand Up @@ -538,6 +605,23 @@ describe('Vercel AI integration', () => {
});
});

// Test with specific Vercel AI v5 version
createEsmAndCjsTests(
__dirname,
'scenario-v5.mjs',
'instrument.mjs',
(createRunner, test) => {
test('creates ai related spans with v5', async () => {
await createRunner().expect({ transaction: EXPECTED_TRANSACTION_DEFAULT_PII_FALSE_V5 }).start().completed();
});
},
{
additionalDependencies: {
ai: '^5.0.0',
},
},
);

createEsmAndCjsTests(__dirname, 'scenario-error-in-tool-express.mjs', 'instrument.mjs', (createRunner, test) => {
test('captures error in tool in express server', async () => {
const expectedTransaction = {
Expand Down
106 changes: 86 additions & 20 deletions dev-packages/node-integration-tests/utils/runner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ import type {
import { normalize } from '@sentry/core';
import { createBasicSentryServer } from '@sentry-internal/test-utils';
import { execSync, spawn, spawnSync } from 'child_process';
import { existsSync, readFileSync, unlinkSync, writeFileSync } from 'fs';
import { join } from 'path';
import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'fs';
import { basename, join } from 'path';
import { inspect } from 'util';
import { afterAll, beforeAll, describe, test } from 'vitest';
import { afterAll, describe, test } from 'vitest';
import {
assertEnvelopeHeader,
assertSentryCheckIn,
Expand Down Expand Up @@ -174,7 +174,7 @@ export function createEsmAndCjsTests(
testFn: typeof test | typeof test.fails,
mode: 'esm' | 'cjs',
) => void,
options?: { failsOnCjs?: boolean; failsOnEsm?: boolean },
options?: { failsOnCjs?: boolean; failsOnEsm?: boolean; additionalDependencies?: Record<string, string> },
): void {
const mjsScenarioPath = join(cwd, scenarioPath);
const mjsInstrumentPath = join(cwd, instrumentPath);
Expand All @@ -187,31 +187,97 @@ export function createEsmAndCjsTests(
throw new Error(`Instrument file not found: ${mjsInstrumentPath}`);
}

const cjsScenarioPath = join(cwd, `tmp_${scenarioPath.replace('.mjs', '.cjs')}`);
const cjsInstrumentPath = join(cwd, `tmp_${instrumentPath.replace('.mjs', '.cjs')}`);
// Create a dedicated tmp directory that includes copied ESM & CJS scenario/instrument files.
// If additionalDependencies are provided, we also create a nested package.json and install them there.
const uniqueId = `${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 8)}`;
const tmpDirPath = join(cwd, `tmp_${uniqueId}`);
mkdirSync(tmpDirPath);

// Copy ESM files as-is into tmp dir
const esmScenarioBasename = basename(scenarioPath);
const esmInstrumentBasename = basename(instrumentPath);
const esmScenarioPathForRun = join(tmpDirPath, esmScenarioBasename);
const esmInstrumentPathForRun = join(tmpDirPath, esmInstrumentBasename);
writeFileSync(esmScenarioPathForRun, readFileSync(mjsScenarioPath, 'utf8'));
writeFileSync(esmInstrumentPathForRun, readFileSync(mjsInstrumentPath, 'utf8'));

// Pre-create CJS converted files inside tmp dir
const cjsScenarioPath = join(tmpDirPath, esmScenarioBasename.replace('.mjs', '.cjs'));
const cjsInstrumentPath = join(tmpDirPath, esmInstrumentBasename.replace('.mjs', '.cjs'));
convertEsmFileToCjs(esmScenarioPathForRun, cjsScenarioPath);
convertEsmFileToCjs(esmInstrumentPathForRun, cjsInstrumentPath);

// Create a minimal package.json with requested dependencies (if any) and install them
const additionalDependencies = options?.additionalDependencies ?? {};
if (Object.keys(additionalDependencies).length > 0) {
const packageJson = {
name: 'tmp-integration-test',
private: true,
version: '0.0.0',
dependencies: additionalDependencies,
} as const;

writeFileSync(join(tmpDirPath, 'package.json'), JSON.stringify(packageJson, null, 2));

try {
const deps = Object.entries(additionalDependencies).map(([name, range]) => {
if (!range || typeof range !== 'string') {
throw new Error(`Invalid version range for "${name}": ${String(range)}`);
}
return `${name}@${range}`;
});

if (deps.length > 0) {
// --ignore-engines is needed to avoid engine mismatches when installing deps in the tmp dir
// (e.g. Vercel AI v5 requires a package that requires Node >= 20 while the system Node is 18)
// https://github.com/vercel/ai/issues/7777
const result = spawnSync('yarn', ['add', '--non-interactive', '--ignore-engines', ...deps], {
cwd: tmpDirPath,
encoding: 'utf8',
});

if (process.env.DEBUG) {
// eslint-disable-next-line no-console
console.log('[additionalDependencies]', deps.join(' '));
// eslint-disable-next-line no-console
console.log('[yarn stdout]', result.stdout);
// eslint-disable-next-line no-console
console.log('[yarn stderr]', result.stderr);
}

if (result.error) {
throw new Error(`Failed to install additionalDependencies in tmp dir ${tmpDirPath}: ${result.error.message}`);
}
if (typeof result.status === 'number' && result.status !== 0) {
throw new Error(
`Failed to install additionalDependencies in tmp dir ${tmpDirPath} (exit ${result.status}):\n${
result.stderr || result.stdout || '(no output)'
}`,
);
}
}
} catch (e) {
// eslint-disable-next-line no-console
console.error('Failed to install additionalDependencies:', e);
throw e;
}
}

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bug: Test Runner File Overwrite and Cleanup Failures

The test runner has two distinct issues: First, if the instrumentPath does not end with .mjs, the CJS conversion overwrites the ESM instrument file. This occurs because the CJS filename generation logic fails to create a distinct path when the original file lacks the .mjs extension, causing both ESM and CJS versions to point to the same temporary file. Second, temporary directories created for tests are not reliably cleaned up. If npm install fails during setup, the afterAll cleanup hook, defined within a describe block, will not execute, leaving the temporary directory behind.

Fix in Cursor Fix in Web

describe('esm', () => {
const testFn = options?.failsOnEsm ? test.fails : test;
callback(() => createRunner(mjsScenarioPath).withFlags('--import', mjsInstrumentPath), testFn, 'esm');
callback(() => createRunner(esmScenarioPathForRun).withFlags('--import', esmInstrumentPathForRun), testFn, 'esm');
});

describe('cjs', () => {
beforeAll(() => {
// For the CJS runner, we create some temporary files...
convertEsmFileToCjs(mjsScenarioPath, cjsScenarioPath);
convertEsmFileToCjs(mjsInstrumentPath, cjsInstrumentPath);
});

// Clean up the tmp directory once CJS tests are finished
afterAll(() => {
try {
unlinkSync(cjsInstrumentPath);
rmSync(tmpDirPath, { recursive: true, force: true });
} catch {
// Ignore errors here
}
try {
unlinkSync(cjsScenarioPath);
} catch {
// Ignore errors here
if (process.env.DEBUG) {
// eslint-disable-next-line no-console
console.error(`Failed to remove tmp dir: ${tmpDirPath}`);
}
}
});

Expand Down
Loading