Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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,16 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
sendDefaultPii: true,
transport: loggingTransport,
traceLifecycle: 'stream',
integrations: [
Sentry.openAIIntegration({
enableTruncation: true,
}),
],
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import * as Sentry from '@sentry/node';
import { loggingTransport } from '@sentry-internal/node-integration-tests';

Sentry.init({
dsn: 'https://public@dsn.ingest.sentry.io/1337',
release: '1.0',
tracesSampleRate: 1.0,
sendDefaultPii: true,
transport: loggingTransport,
traceLifecycle: 'stream',
});
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ async function run() {
});
});

// Flush is required when span streaming is enabled to ensure streamed spans are sent before the process exits
await Sentry.flush();
server.close();
}

Expand Down
54 changes: 54 additions & 0 deletions dev-packages/node-integration-tests/suites/tracing/openai/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1019,4 +1019,58 @@ describe('OpenAI integration', () => {
.completed();
});
});

const streamingLongContent = 'A'.repeat(50_000);
const streamingLongString = 'B'.repeat(50_000);

createEsmAndCjsTests(__dirname, 'scenario-no-truncation.mjs', 'instrument-streaming.mjs', (createRunner, test) => {
test('automatically disables truncation when span streaming is enabled', async () => {
await createRunner()
.expect({
span: container => {
const spans = container.items;

const chatSpan = spans.find(s =>
s.attributes?.[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]?.value?.includes(streamingLongContent),
);
expect(chatSpan).toBeDefined();

const responsesSpan = spans.find(s =>
s.attributes?.[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]?.value?.includes(streamingLongString),
);
expect(responsesSpan).toBeDefined();
},
})
.start()
.completed();
});
});

createEsmAndCjsTests(
__dirname,
'scenario-no-truncation.mjs',
'instrument-streaming-with-truncation.mjs',
(createRunner, test) => {
test('respects explicit enableTruncation: true even when span streaming is enabled', async () => {
await createRunner()
.expect({
span: container => {
const spans = container.items;

// With explicit enableTruncation: true, content should be truncated despite streaming.
// Find the chat span by matching the start of the truncated content (the 'A' repeated messages).
const chatSpan = spans.find(s =>
s.attributes?.[GEN_AI_INPUT_MESSAGES_ATTRIBUTE]?.value?.startsWith('[{"role":"user","content":"AAAA'),
);
expect(chatSpan).toBeDefined();
expect(chatSpan!.attributes[GEN_AI_INPUT_MESSAGES_ATTRIBUTE].value.length).toBeLessThan(
streamingLongContent.length,
);
},
})
.start()
.completed();
});
},
);
});
11 changes: 11 additions & 0 deletions packages/core/src/tracing/ai/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
*/
import { captureException } from '../../exports';
import { getClient } from '../../currentScopes';
import { hasSpanStreamingEnabled } from '../spans/hasSpanStreamingEnabled';
import type { Span } from '../../types-hoist/span';
import { isThenable } from '../../utils/is';
import {
Expand Down Expand Up @@ -56,6 +57,16 @@ export function resolveAIRecordingOptions<T extends AIRecordingOptions>(options?
} as T & Required<AIRecordingOptions>;
}

/**
* Resolves whether truncation should be enabled.
* If the user explicitly set `enableTruncation`, that value is used.
* Otherwise, truncation is disabled when span streaming is active.
*/
export function shouldEnableTruncation(enableTruncation: boolean | undefined): boolean {
const client = getClient();
return enableTruncation ?? !(client && hasSpanStreamingEnabled(client));
}

/**
* Build method path from current traversal
*/
Expand Down
5 changes: 3 additions & 2 deletions packages/core/src/tracing/openai/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import {
getJsonString,
getTruncatedJsonString,
resolveAIRecordingOptions,
shouldEnableTruncation,
wrapPromiseWithMethods,
} from '../ai/utils';
import { OPENAI_METHOD_REGISTRY } from './constants';
Expand Down Expand Up @@ -170,7 +171,7 @@ function instrumentMethod<T extends unknown[], R>(
originalResult = originalMethod.apply(context, args);

if (options.recordInputs && params) {
addRequestAttributes(span, params, operationName, options.enableTruncation ?? true);
addRequestAttributes(span, params, operationName, shouldEnableTruncation(options.enableTruncation));
}

// Return async processing
Expand Down Expand Up @@ -208,7 +209,7 @@ function instrumentMethod<T extends unknown[], R>(
originalResult = originalMethod.apply(context, args);

if (options.recordInputs && params) {
addRequestAttributes(span, params, operationName, options.enableTruncation ?? true);
addRequestAttributes(span, params, operationName, shouldEnableTruncation(options.enableTruncation));
}

return originalResult.then(
Expand Down
Loading