Skip to content
Open
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.googleGenAIIntegration({
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
@@ -0,0 +1,51 @@
import { GoogleGenAI } from '@google/genai';
import * as Sentry from '@sentry/node';
import express from 'express';

function startMockGoogleGenAIServer() {
const app = express();
app.use(express.json({ limit: '10mb' }));

app.post('/v1beta/models/:model\\:generateContent', (req, res) => {
res.json({
candidates: [
{
content: { parts: [{ text: 'Response' }], role: 'model' },
finishReason: 'STOP',
},
],
usageMetadata: { promptTokenCount: 10, candidatesTokenCount: 5, totalTokenCount: 15 },
});
});

return new Promise(resolve => {
const server = app.listen(0, () => {
resolve(server);
});
});
}

async function run() {
const server = await startMockGoogleGenAIServer();

await Sentry.startSpan({ op: 'function', name: 'main' }, async () => {
const client = new GoogleGenAI({
apiKey: 'mock-api-key',
httpOptions: { baseUrl: `http://localhost:${server.address().port}` },
});

// Long content that would normally be truncated
const longContent = 'A'.repeat(50_000);
await client.models.generateContent({
model: 'gemini-1.5-flash',
contents: [{ role: 'user', parts: [{ text: longContent }] }],
});
});

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

server.close();
}

run();
Original file line number Diff line number Diff line change
Expand Up @@ -686,4 +686,54 @@ describe('Google GenAI integration', () => {
});
},
);

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

createEsmAndCjsTests(__dirname, 'scenario-span-streaming.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();
},
})
.start()
.completed();
});
});

createEsmAndCjsTests(
__dirname,
'scenario-span-streaming.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","parts":[{"text":"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
10 changes: 8 additions & 2 deletions packages/core/src/tracing/google-genai/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import {
getJsonString,
getTruncatedJsonString,
resolveAIRecordingOptions,
shouldEnableTruncation,
} from '../ai/utils';
import { GOOGLE_GENAI_METHOD_REGISTRY, GOOGLE_GENAI_SYSTEM_NAME } from './constants';
import { instrumentStream } from './streaming';
Expand Down Expand Up @@ -297,7 +298,12 @@ function instrumentMethod<T extends unknown[], R>(
async (span: Span) => {
try {
if (options.recordInputs && params) {
addPrivateRequestAttributes(span, params, isEmbeddings, options.enableTruncation ?? true);
addPrivateRequestAttributes(
span,
params,
isEmbeddings,
shouldEnableTruncation(options.enableTruncation),
);
}
const stream = await target.apply(context, args);
return instrumentStream(stream, span, Boolean(options.recordOutputs)) as R;
Expand Down Expand Up @@ -325,7 +331,7 @@ function instrumentMethod<T extends unknown[], R>(
},
(span: Span) => {
if (options.recordInputs && params) {
addPrivateRequestAttributes(span, params, isEmbeddings, options.enableTruncation ?? true);
addPrivateRequestAttributes(span, params, isEmbeddings, shouldEnableTruncation(options.enableTruncation));
}

return handleCallbackErrors(
Expand Down
Loading