Merge branch 'develop' into nh/rename-messages-attribute

Author: nicohrubec

.claude/skills/e2e/SKILL.md

@@ -0,0 +1,200 @@
+---
+name: e2e
+description: Run E2E tests for Sentry JavaScript SDK test applications
+argument-hint: <test-app-name> [--variant <variant-name>]
+---
+
+# E2E Test Runner Skill
+
+This skill runs end-to-end tests for Sentry JavaScript SDK test applications. It ensures SDK packages are built before running tests.
+
+## Input
+
+The user provides a test application name and optionally a variant:
+
+- `e2e-tests/test-applications/nextjs-app-dir` (full path)
+- `nextjs-app-dir` (just the app name)
+- `nextjs-app-dir --variant nextjs-15` (with variant)
+
+## Workflow
+
+### Step 1: Parse the Test Application Name
+
+Extract the test app name from user input:
+
+- Strip `e2e-tests/test-applications/` prefix if present
+- Extract variant flag if provided (e.g., `--variant nextjs-15`)
+- Store the clean app name (e.g., `nextjs-app-dir`)
+
+### Step 2: Determine Which Packages Need Rebuilding
+
+If the user recently edited files in `packages/*`, identify which packages were modified:
+
+```bash
+# Check which packages have uncommitted changes (including untracked files)
+git status --porcelain | grep "^[ MARC?][ MD?] packages/" | cut -d'/' -f2 | sort -u
+```
+
+For each modified package, rebuild its tarball:
+
+```bash
+cd packages/<package-name>
+yarn build && yarn build:tarball
+cd ../..
+```
+
+**Option C: User Specifies Packages**
+
+If the user says "I changed @sentry/node" or similar, rebuild just that package:
+
+```bash
+cd packages/node
+yarn build && yarn build:tarball
+cd ../..
+```
+
+### Step 3: Verify Test Application Exists
+
+Check that the test app exists:
+
+```bash
+ls -d dev-packages/e2e-tests/test-applications/<app-name>
+```
+
+If it doesn't exist, list available test apps:
+
+```bash
+ls dev-packages/e2e-tests/test-applications/
+```
+
+Ask the user which one they meant.
+
+### Step 4: Run the E2E Test
+
+Navigate to the e2e-tests directory and run the test:
+
+```bash
+cd dev-packages/e2e-tests
+yarn test:run <app-name>
+```
+
+If a variant was specified:
+
+```bash
+cd dev-packages/e2e-tests
+yarn test:run <app-name> --variant <variant-name>
+```
+
+### Step 5: Report Results
+
+After the test completes, provide a summary:
+
+**If tests passed:**
+
+```
+✅ E2E tests passed for <app-name>
+
+All tests completed successfully. Your SDK changes work correctly with this test application.
+```
+
+**If tests failed:**
+
+```
+❌ E2E tests failed for <app-name>
+
+[Include relevant error output]
+```
+
+**If package rebuild was needed:**
+
+```
+📦 Rebuilt SDK packages: <list of packages>
+🧪 Running E2E tests for <app-name>...
+```
+
+## Error Handling
+
+- **No tarballs found**: Run `yarn build && yarn build:tarball` at repository root
+- **Test app not found**: List available apps and ask user to clarify
+- **Verdaccio not running**: Tests should start Verdaccio automatically, but if issues occur, check Docker
+- **Build failures**: Fix build errors before running tests
+
+## Common Test Applications
+
+Here are frequently tested applications:
+
+- `nextjs-app-dir` - Next.js App Router
+- `nextjs-15` - Next.js 15.x
+- `react-create-hash-router` - React with React Router
+- `node-express-esm-loader` - Node.js Express with ESM
+- `sveltekit-2` - SvelteKit 2.x
+- `remix-2` - Remix 2.x
+- `nuxt-3` - Nuxt 3.x
+
+To see all available test apps:
+
+```bash
+ls dev-packages/e2e-tests/test-applications/
+```
+
+## Example Workflows
+
+### Example 1: After modifying @sentry/node
+
+```bash
+# User: "Run e2e tests for node-express-esm-loader"
+
+# Step 1: Detect recent changes to packages/node
+# Step 2: Rebuild the modified package
+cd packages/node
+yarn build && yarn build:tarball
+cd ../..
+
+# Step 3: Run the test
+cd dev-packages/e2e-tests
+yarn test:run node-express-esm-loader
+```
+
+### Example 2: First-time test run
+
+```bash
+# User: "Run e2e tests for nextjs-app-dir"
+
+# Step 1: Check for existing tarballs
+# Step 2: None found, build all packages
+yarn build && yarn build:tarball
+
+# Step 3: Run the test
+cd dev-packages/e2e-tests
+yarn test:run nextjs-app-dir
+```
+
+### Example 3: With variant
+
+```bash
+# User: "Run e2e tests for nextjs-app-dir with nextjs-15 variant"
+
+# Step 1: Rebuild if needed
+# Step 2: Run with variant
+cd dev-packages/e2e-tests
+yarn test:run nextjs-app-dir --variant nextjs-15
+```
+
+## Tips
+
+- **Always rebuild after SDK changes**: Tarballs contain the compiled SDK code
+- **Watch build output**: Build errors must be fixed before testing
+
+## Integration with Development Workflow
+
+This skill integrates with the standard SDK development workflow:
+
+1. Make changes to SDK code in `packages/*`
+2. Run `/e2e <app-name>` to test your changes
+3. Fix any test failures
+
+The skill automates the tedious parts of:
+
+- Remembering to rebuild tarballs
+- Navigating to the correct directory
+- Running tests with the right flags

.size-limit.js

@@ -96,21 +96,21 @@ module.exports = [
     path: 'packages/browser/build/npm/esm/prod/index.js',
     import: createImport('init', 'feedbackIntegration'),
     gzip: true,
-    limit: '42 KB',
+    limit: '43 KB',
   },
   {
     name: '@sentry/browser (incl. sendFeedback)',
     path: 'packages/browser/build/npm/esm/prod/index.js',
     import: createImport('init', 'sendFeedback'),
     gzip: true,
-    limit: '30 KB',
+    limit: '31 KB',
   },
   {
     name: '@sentry/browser (incl. FeedbackAsync)',
     path: 'packages/browser/build/npm/esm/prod/index.js',
     import: createImport('init', 'feedbackAsyncIntegration'),
     gzip: true,
-    limit: '35 KB',
+    limit: '36 KB',
   },
   {
     name: '@sentry/browser (incl. Metrics)',
@@ -140,7 +140,7 @@ module.exports = [
     import: createImport('init', 'ErrorBoundary'),
     ignore: ['react/jsx-runtime'],
     gzip: true,
-    limit: '27 KB',
+    limit: '28 KB',
   },
   {
     name: '@sentry/react (incl. Tracing)',
@@ -208,7 +208,7 @@ module.exports = [
     name: 'CDN Bundle (incl. Tracing, Replay, Feedback, Logs, Metrics)',
     path: createCDNPath('bundle.tracing.replay.feedback.logs.metrics.min.js'),
     gzip: true,
-    limit: '86 KB',
+    limit: '87 KB',
   },
   // browser CDN bundles (non-gzipped)
   {
@@ -223,7 +223,7 @@ module.exports = [
     path: createCDNPath('bundle.tracing.min.js'),
     gzip: false,
     brotli: false,
-    limit: '127 KB',
+    limit: '128 KB',
   },
   {
     name: 'CDN Bundle (incl. Tracing, Logs, Metrics) - uncompressed',
@@ -278,7 +278,7 @@ module.exports = [
     import: createImport('init'),
     ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
     gzip: true,
-    limit: '52 KB',
+    limit: '53 KB',
   },
   // Node SDK (ESM)
   {

CHANGELOG.md

@@ -4,7 +4,26 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
-Work in this release was contributed by @sebws. Thank you for your contribution!
+Work in this release was contributed by @sebws and @harshit078. Thank you for your contributions!
+
+- **feat(core): Introduces a new `Sentry.setConversationId()` API to track multi turn AI conversations across API calls. ([#18909](https://github.com/getsentry/sentry-javascript/pull/18909))**
+
+  You can now set a conversation ID that will be automatically applied to spans within that scope. This allows you to link traces from the same conversation together.
+
+  ```javascript
+  import * as Sentry from '@sentry/node';
+
+  // Set conversation ID for all subsequent spans
+  Sentry.setConversationId('conv_abc123');
+
+  // All AI spans will now include the gen_ai.conversation.id attribute
+  await openai.chat.completions.create({...});
+  ```
+
+  This is particularly useful for tracking multiple AI API calls that are part of the same conversation, allowing you to analyze entire conversation flows in Sentry.
+  The conversation ID is stored on the isolation scope and automatically applied to spans via the new `conversationIdIntegration`.
+
+### Important Changes
 
 - **feat(tanstackstart-react): Auto-instrument global middleware in `sentryTanstackStart` Vite plugin ([#18884](https://github.com/getsentry/sentry-javascript/pull/18844))**
 
@@ -24,6 +43,8 @@ Work in this release was contributed by @sebws. Thank you for your contribution!
 
 ### Other Changes
 
+- feat(deps): Bump OpenTelemetry instrumentations ([#18934](https://github.com/getsentry/sentry-javascript/pull/18934))
+
 ## 10.36.0
 
 - feat(node): Add Prisma v7 support ([#18908](https://github.com/getsentry/sentry-javascript/pull/18908))

CLAUDE.md

@@ -145,17 +145,7 @@ Without this file, pnpm installs from the public npm registry instead of Verdacc
 
 #### Running a Single E2E Test
 
-```bash
-# Build packages first
-yarn build && yarn build:tarball
-
-# Run a specific test app
-cd dev-packages/e2e-tests
-yarn test:run <app-name>
-
-# Run with a specific variant (e.g., Next.js 15)
-yarn test:run <app-name> --variant <variant-name>
-```
+Run the e2e skill.
 
 #### Common Pitfalls and Debugging
 

dev-packages/browser-integration-tests/suites/public-api/debug/test.ts

@@ -24,6 +24,7 @@ sentryTest('logs debug messages correctly', async ({ getLocalTestUrl, page }) =>
       ? [
           'Sentry Logger [log]: Integration installed: InboundFilters',
           'Sentry Logger [log]: Integration installed: FunctionToString',
+          'Sentry Logger [log]: Integration installed: ConversationId',
           'Sentry Logger [log]: Integration installed: BrowserApiErrors',
           'Sentry Logger [log]: Integration installed: Breadcrumbs',
           'Sentry Logger [log]: Global Handler attached: onerror',

dev-packages/browser-integration-tests/suites/tracing/ai-providers/anthropic/test.ts

@@ -20,11 +20,11 @@ sentryTest('manual Anthropic instrumentation sends gen_ai transactions', async (
   const eventData = envelopeRequestParser(req);
 
   // Verify it's a gen_ai transaction
-  expect(eventData.transaction).toBe('messages claude-3-haiku-20240307');
-  expect(eventData.contexts?.trace?.op).toBe('gen_ai.messages');
+  expect(eventData.transaction).toBe('chat claude-3-haiku-20240307');
+  expect(eventData.contexts?.trace?.op).toBe('gen_ai.chat');
   expect(eventData.contexts?.trace?.origin).toBe('auto.ai.anthropic');
   expect(eventData.contexts?.trace?.data).toMatchObject({
-    'gen_ai.operation.name': 'messages',
+    'gen_ai.operation.name': 'chat',
     'gen_ai.system': 'anthropic',
     'gen_ai.request.model': 'claude-3-haiku-20240307',
     'gen_ai.request.temperature': 0.7,

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

@@ -28,8 +28,8 @@ it('traces a basic message creation request', async ({ signal }) => {
         expect.arrayContaining([
           expect.objectContaining({
             data: expect.objectContaining({
-              [GEN_AI_OPERATION_NAME_ATTRIBUTE]: 'messages',
-              [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'gen_ai.messages',
+              [GEN_AI_OPERATION_NAME_ATTRIBUTE]: 'chat',
+              [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'gen_ai.chat',
               [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.anthropic',
               [GEN_AI_SYSTEM_ATTRIBUTE]: 'anthropic',
               [GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'claude-3-haiku-20240307',
@@ -39,8 +39,8 @@ it('traces a basic message creation request', async ({ signal }) => {
               [GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE]: 10,
               [GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE]: 15,
             }),
-            description: 'messages claude-3-haiku-20240307',
-            op: 'gen_ai.messages',
+            description: 'chat claude-3-haiku-20240307',
+            op: 'gen_ai.chat',
             origin: 'auto.ai.anthropic',
           }),
         ]),

dev-packages/cloudflare-integration-tests/suites/tracing/google-genai/test.ts

@@ -62,8 +62,8 @@ it('traces Google GenAI chat creation and message sending', async () => {
           // Third span - models.generateContent
           expect.objectContaining({
             data: expect.objectContaining({
-              [GEN_AI_OPERATION_NAME_ATTRIBUTE]: 'models',
-              [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'gen_ai.models',
+              [GEN_AI_OPERATION_NAME_ATTRIBUTE]: 'generate_content',
+              [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'gen_ai.generate_content',
               [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ai.google_genai',
               [GEN_AI_SYSTEM_ATTRIBUTE]: 'google_genai',
               [GEN_AI_REQUEST_MODEL_ATTRIBUTE]: 'gemini-1.5-flash',
@@ -74,8 +74,8 @@ it('traces Google GenAI chat creation and message sending', async () => {
               [GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE]: 12,
               [GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE]: 20,
             }),
-            description: 'models gemini-1.5-flash',
-            op: 'gen_ai.models',
+            description: 'generate_content gemini-1.5-flash',
+            op: 'gen_ai.generate_content',
             origin: 'auto.ai.google_genai',
           }),
         ]),