Merge branch 'develop' into cg-JS-1207

Author: chargome

.size-limit.js

@@ -240,7 +240,7 @@ module.exports = [
     import: createImport('init'),
     ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
     gzip: true,
-    limit: '160 KB',
+    limit: '161 KB',
   },
   {
     name: '@sentry/node - without tracing',

dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/package.json

@@ -27,7 +27,7 @@
     "@sentry/core": "latest || *",
     "ai": "^3.0.0",
     "import-in-the-middle": "^1",
-    "next": "16.0.9",
+    "next": "16.0.10",
     "react": "19.1.0",
     "react-dom": "19.1.0",
     "require-in-the-middle": "^7",

dev-packages/e2e-tests/test-applications/nextjs-pages-dir/package.json

@@ -20,7 +20,7 @@
     "@types/node": "^18.19.1",
     "@types/react": "18.0.26",
     "@types/react-dom": "18.0.9",
-    "next": "14.2.32",
+    "next": "14.2.35",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "typescript": "~5.0.0"

dev-packages/node-integration-tests/suites/tracing/anthropic/scenario-media-truncation.mjs

@@ -0,0 +1,79 @@
+import { instrumentAnthropicAiClient } from '@sentry/core';
+import * as Sentry from '@sentry/node';
+
+class MockAnthropic {
+  constructor(config) {
+    this.apiKey = config.apiKey;
+    this.baseURL = config.baseURL;
+
+    // Create messages object with create method
+    this.messages = {
+      create: this._messagesCreate.bind(this),
+    };
+  }
+
+  /**
+   * Create a mock message
+   */
+  async _messagesCreate(params) {
+    // Simulate processing time
+    await new Promise(resolve => setTimeout(resolve, 10));
+
+    return {
+      id: 'msg-truncation-test',
+      type: 'message',
+      role: 'assistant',
+      content: [
+        {
+          type: 'text',
+          text: 'This is the number **3**.',
+        },
+      ],
+      model: params.model,
+      stop_reason: 'end_turn',
+      stop_sequence: null,
+      usage: {
+        input_tokens: 10,
+        output_tokens: 15,
+      },
+    };
+  }
+}
+
+async function run() {
+  await Sentry.startSpan({ op: 'function', name: 'main' }, async () => {
+    const mockClient = new MockAnthropic({
+      apiKey: 'mock-api-key',
+    });
+
+    const client = instrumentAnthropicAiClient(mockClient);
+
+    // Send the image showing the number 3
+    await client.messages.create({
+      model: 'claude-3-haiku-20240307',
+      max_tokens: 1024,
+      messages: [
+        {
+          role: 'user',
+          content: [
+            {
+              type: 'image',
+              source: {
+                type: 'base64',
+                media_type: 'image/png',
+                data: 'base64-mumbo-jumbo'.repeat(100),
+              },
+            },
+          ],
+        },
+        {
+          role: 'user',
+          content: 'what number is this?',
+        },
+      ],
+      temperature: 0.7,
+    });
+  });
+}
+
+run();

dev-packages/node-integration-tests/suites/tracing/anthropic/test.ts

@@ -661,4 +661,52 @@ describe('Anthropic integration', () => {
       });
     },
   );
+
+  createEsmAndCjsTests(__dirname, 'scenario-media-truncation.mjs', 'instrument-with-pii.mjs', (createRunner, test) => {
+    test('truncates media attachment, keeping all other details', async () => {
+      await createRunner()
+        .ignore('event')
+        .expect({
+          transaction: {
+            transaction: 'main',
+            spans: expect.arrayContaining([
+              expect.objectContaining({
+                data: expect.objectContaining({
+                  'gen_ai.operation.name': 'messages',
+                  'sentry.op': 'gen_ai.messages',
+                  'sentry.origin': 'auto.ai.anthropic',
+                  'gen_ai.system': 'anthropic',
+                  'gen_ai.request.model': 'claude-3-haiku-20240307',
+                  'gen_ai.request.messages': JSON.stringify([
+                    {
+                      role: 'user',
+                      content: [
+                        {
+                          type: 'image',
+                          source: {
+                            type: 'base64',
+                            media_type: 'image/png',
+                            data: '[Filtered]',
+                          },
+                        },
+                      ],
+                    },
+                    {
+                      role: 'user',
+                      content: 'what number is this?',
+                    },
+                  ]),
+                }),
+                description: 'messages claude-3-haiku-20240307',
+                op: 'gen_ai.messages',
+                origin: 'auto.ai.anthropic',
+                status: 'ok',
+              }),
+            ]),
+          },
+        })
+        .start()
+        .completed();
+    });
+  });
 });

packages/browser/src/tracing/linkedTraces.ts

@@ -176,10 +176,10 @@ export function addPreviousTraceSpanLink(
   if (Date.now() / 1000 - previousTraceInfo.startTimestamp <= PREVIOUS_TRACE_MAX_DURATION) {
     if (DEBUG_BUILD) {
       debug.log(
-        `Adding previous_trace ${previousTraceSpanCtx} link to span ${{
+        `Adding previous_trace \`${JSON.stringify(previousTraceSpanCtx)}\` link to span \`${JSON.stringify({
           op: spanJson.op,
           ...span.spanContext(),
-        }}`,
+        })}\``,
       );
     }
 

packages/browser/test/tracing/linkedTraces.test.ts

@@ -1,5 +1,5 @@
 import type { Span } from '@sentry/core';
-import { addChildSpanToSpan, SentrySpan, spanToJSON, timestampInSeconds } from '@sentry/core';
+import { addChildSpanToSpan, debug, SentrySpan, spanToJSON, timestampInSeconds } from '@sentry/core';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { BrowserClient } from '../../src';
 import type { PreviousTraceInfo } from '../../src/tracing/linkedTraces';
@@ -201,6 +201,47 @@ describe('addPreviousTraceSpanLink', () => {
     });
   });
 
+  it('logs a debug message when adding a previous trace link (with stringified context)', () => {
+    const debugLogSpy = vi.spyOn(debug, 'log');
+
+    const currentSpanStart = timestampInSeconds();
+
+    const previousTraceInfo: PreviousTraceInfo = {
+      spanContext: { traceId: '123', spanId: '456', traceFlags: 1 },
+      startTimestamp: currentSpanStart - PREVIOUS_TRACE_MAX_DURATION + 1,
+      sampleRand: 0.0126,
+      sampleRate: 0.5,
+    };
+
+    const currentSpan = new SentrySpan({
+      name: 'test',
+      op: 'navigation',
+      startTimestamp: currentSpanStart,
+      parentSpanId: '789',
+      spanId: 'abc',
+      traceId: 'def',
+      sampled: true,
+    });
+
+    const oldPropagationContext = {
+      sampleRand: 0.0126,
+      traceId: '123',
+      sampled: true,
+      dsc: { sample_rand: '0.0126', sample_rate: '0.5' },
+    };
+
+    addPreviousTraceSpanLink(previousTraceInfo, currentSpan, oldPropagationContext);
+
+    expect(debugLogSpy).not.toHaveBeenCalledWith(expect.stringContaining('[object Object]'));
+    expect(debugLogSpy).toHaveBeenCalledWith(
+      expect.stringContaining(
+        'Adding previous_trace `{"traceId":"123","spanId":"456","traceFlags":1}` link to span `{"op":"navigation","spanId":"abc","traceId":"def","traceFlags":1}`',
+      ),
+    );
+
+    debugLogSpy.mockRestore();
+  });
+
   it(`doesn't add a previous_trace span link if the previous trace was created more than ${PREVIOUS_TRACE_MAX_DURATION}s ago`, () => {
     const currentSpanStart = timestampInSeconds();