Merge branch 'develop' into rolaabuhasna/js-1527-report-well-known-values-in-gen_aioperationname-attribute

Author: RulaKhaled

.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

CHANGELOG.md

@@ -4,6 +4,8 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+Work in this release was contributed by @sebws and @harshit078. Thank you for your contributions!
+
 - **feat(tanstackstart-react): Auto-instrument global middleware in `sentryTanstackStart` Vite plugin ([#18884](https://github.com/getsentry/sentry-javascript/pull/18844))**
 
   The `sentryTanstackStart` Vite plugin now automatically instruments `requestMiddleware` and `functionMiddleware` arrays in `createStart()`. This captures performance data without requiring manual wrapping.

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/profiling/manualMode/test.ts

@@ -48,7 +48,7 @@ sentryTest('sends profile_chunk envelopes in manual mode', async ({ page, getLoc
   const envelopeItemHeader = profileChunkEnvelopeItem[0];
   const envelopeItemPayload1 = profileChunkEnvelopeItem[1];
 
-  expect(envelopeItemHeader).toHaveProperty('type', 'profile_chunk');
+  expect(envelopeItemHeader).toEqual({ type: 'profile_chunk', platform: 'javascript' });
   expect(envelopeItemPayload1.profile).toBeDefined();
 
   const profilerId1 = envelopeItemPayload1.profiler_id;
@@ -71,7 +71,7 @@ sentryTest('sends profile_chunk envelopes in manual mode', async ({ page, getLoc
   const envelopeItemHeader2 = profileChunkEnvelopeItem2[0];
   const envelopeItemPayload2 = profileChunkEnvelopeItem2[1];
 
-  expect(envelopeItemHeader2).toHaveProperty('type', 'profile_chunk');
+  expect(envelopeItemHeader2).toEqual({ type: 'profile_chunk', platform: 'javascript' });
   expect(envelopeItemPayload2.profile).toBeDefined();
 
   expect(envelopeItemPayload2.profiler_id).toBe(profilerId1); // same profiler id for the whole session

dev-packages/browser-integration-tests/suites/profiling/traceLifecycleMode_multiple-chunks/test.ts

@@ -51,7 +51,7 @@ sentryTest(
     const envelopeItemHeader = profileChunkEnvelopeItem[0];
     const envelopeItemPayload1 = profileChunkEnvelopeItem[1];
 
-    expect(envelopeItemHeader).toHaveProperty('type', 'profile_chunk');
+    expect(envelopeItemHeader).toEqual({ type: 'profile_chunk', platform: 'javascript' });
     expect(envelopeItemPayload1.profile).toBeDefined();
 
     validateProfilePayloadMetadata(envelopeItemPayload1);
@@ -77,7 +77,7 @@ sentryTest(
     const envelopeItemHeader2 = profileChunkEnvelopeItem2[0];
     const envelopeItemPayload2 = profileChunkEnvelopeItem2[1];
 
-    expect(envelopeItemHeader2).toHaveProperty('type', 'profile_chunk');
+    expect(envelopeItemHeader2).toEqual({ type: 'profile_chunk', platform: 'javascript' });
     expect(envelopeItemPayload2.profile).toBeDefined();
 
     validateProfilePayloadMetadata(envelopeItemPayload2);

dev-packages/browser-integration-tests/suites/profiling/traceLifecycleMode_overlapping-spans/test.ts

@@ -52,7 +52,7 @@ sentryTest(
     const envelopeItemHeader = profileChunkEnvelopeItem[0];
     const envelopeItemPayload = profileChunkEnvelopeItem[1];
 
-    expect(envelopeItemHeader).toHaveProperty('type', 'profile_chunk');
+    expect(envelopeItemHeader).toEqual({ type: 'profile_chunk', platform: 'javascript' });
     expect(envelopeItemPayload.profile).toBeDefined();
 
     validateProfilePayloadMetadata(envelopeItemPayload);

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

@@ -1,4 +1,15 @@
+import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
 import { expect, it } from 'vitest';
+import {
+  GEN_AI_OPERATION_NAME_ATTRIBUTE,
+  GEN_AI_REQUEST_MODEL_ATTRIBUTE,
+  GEN_AI_REQUEST_TEMPERATURE_ATTRIBUTE,
+  GEN_AI_RESPONSE_ID_ATTRIBUTE,
+  GEN_AI_RESPONSE_MODEL_ATTRIBUTE,
+  GEN_AI_SYSTEM_ATTRIBUTE,
+  GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE,
+  GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE,
+} from '../../../../../packages/core/src/tracing/ai/gen-ai-attributes';
 import { createRunner } from '../../../runner';
 
 // These tests are not exhaustive because the instrumentation is
@@ -17,16 +28,16 @@ it('traces a basic message creation request', async ({ signal }) => {
         expect.arrayContaining([
           expect.objectContaining({
             data: expect.objectContaining({
-              'gen_ai.operation.name': 'chat',
-              'sentry.op': 'gen_ai.chat',
-              'sentry.origin': 'auto.ai.anthropic',
-              'gen_ai.system': 'anthropic',
-              'gen_ai.request.model': 'claude-3-haiku-20240307',
-              'gen_ai.request.temperature': 0.7,
-              'gen_ai.response.model': 'claude-3-haiku-20240307',
-              'gen_ai.response.id': 'msg_mock123',
-              'gen_ai.usage.input_tokens': 10,
-              'gen_ai.usage.output_tokens': 15,
+              [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',
+              [GEN_AI_REQUEST_TEMPERATURE_ATTRIBUTE]: 0.7,
+              [GEN_AI_RESPONSE_MODEL_ATTRIBUTE]: 'claude-3-haiku-20240307',
+              [GEN_AI_RESPONSE_ID_ATTRIBUTE]: 'msg_mock123',
+              [GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE]: 10,
+              [GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE]: 15,
             }),
             description: 'chat claude-3-haiku-20240307',
             op: 'gen_ai.chat',