Merge branch 'develop' into lms/feat-browser-elementtiming

Author: AbhiPrasad

CHANGELOG.md

@@ -4,6 +4,17 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 9.30.0
+
+- feat(nextjs): Add URL to tags of server components and generation functions issues ([#16500](https://github.com/getsentry/sentry-javascript/pull/16500))
+- feat(nextjs): Ensure all packages we auto-instrument are externalized ([#16552](https://github.com/getsentry/sentry-javascript/pull/16552))
+- feat(node): Automatically enable `vercelAiIntegration` when `ai` module is detected ([#16565](https://github.com/getsentry/sentry-javascript/pull/16565))
+- feat(node): Ensure `modulesIntegration` works in more environments ([#16566](https://github.com/getsentry/sentry-javascript/pull/16566))
+- feat(core): Don't gate user on logs with `sendDefaultPii` ([#16527](https://github.com/getsentry/sentry-javascript/pull/16527))
+- feat(browser): Add detail to measure spans and add regression tests ([#16557](https://github.com/getsentry/sentry-javascript/pull/16557))
+- feat(node): Update Vercel AI span attributes ([#16580](https://github.com/getsentry/sentry-javascript/pull/16580))
+- fix(opentelemetry): Ensure only orphaned spans of sent spans are sent ([#16590](https://github.com/getsentry/sentry-javascript/pull/16590))
+
 ## 9.29.0
 
 ### Important Changes

dev-packages/browser-integration-tests/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/browser-integration-tests",
-  "version": "9.29.0",
+  "version": "9.30.0",
   "main": "index.js",
   "license": "MIT",
   "engines": {
@@ -42,7 +42,7 @@
     "@babel/preset-typescript": "^7.16.7",
     "@playwright/test": "~1.50.0",
     "@sentry-internal/rrweb": "2.34.0",
-    "@sentry/browser": "9.29.0",
+    "@sentry/browser": "9.30.0",
     "@supabase/supabase-js": "2.49.3",
     "axios": "1.8.2",
     "babel-loader": "^8.2.2",

dev-packages/bundle-analyzer-scenarios/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/bundle-analyzer-scenarios",
-  "version": "9.29.0",
+  "version": "9.30.0",
   "description": "Scenarios to test bundle analysis with",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/dev-packages/bundle-analyzer-scenarios",

dev-packages/clear-cache-gh-action/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sentry-internal/clear-cache-gh-action",
   "description": "An internal Github Action to clear GitHub caches.",
-  "version": "9.29.0",
+  "version": "9.30.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"

dev-packages/e2e-tests/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/e2e-tests",
-  "version": "9.29.0",
+  "version": "9.30.0",
   "license": "MIT",
   "private": true,
   "scripts": {

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

@@ -17,7 +17,7 @@
     "@types/node": "^18.19.1",
     "@types/react": "18.0.26",
     "@types/react-dom": "18.0.9",
-    "next": "14.1.3",
+    "next": "14.2.30",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "typescript": "~5.0.0"

dev-packages/e2e-tests/test-applications/nextjs-15/tests/ai-test.test.ts

@@ -3,16 +3,15 @@ import { waitForTransaction } from '@sentry-internal/test-utils';
 
 test('should create AI spans with correct attributes', async ({ page }) => {
   const aiTransactionPromise = waitForTransaction('nextjs-15', async transactionEvent => {
-    return transactionEvent?.transaction === 'ai-test';
+    return transactionEvent.transaction === 'GET /ai-test';
   });
 
   await page.goto('/ai-test');
 
   const aiTransaction = await aiTransactionPromise;
 
   expect(aiTransaction).toBeDefined();
-  expect(aiTransaction.contexts?.trace?.op).toBe('function');
-  expect(aiTransaction.transaction).toBe('ai-test');
+  expect(aiTransaction.transaction).toBe('GET /ai-test');
 
   const spans = aiTransaction.spans || [];
 
@@ -35,14 +34,14 @@ test('should create AI spans with correct attributes', async ({ page }) => {
   expect(firstPipelineSpan?.data?.['ai.model.id']).toBe('mock-model-id');
   expect(firstPipelineSpan?.data?.['ai.model.provider']).toBe('mock-provider');
   expect(firstPipelineSpan?.data?.['ai.prompt']).toContain('Where is the first span?');
-  expect(firstPipelineSpan?.data?.['ai.response.text']).toBe('First span here!');
+  expect(firstPipelineSpan?.data?.['gen_ai.response.text']).toBe('First span here!');
   expect(firstPipelineSpan?.data?.['gen_ai.usage.input_tokens']).toBe(10);
   expect(firstPipelineSpan?.data?.['gen_ai.usage.output_tokens']).toBe(20); */
 
   // Second AI call - explicitly enabled telemetry
   const secondPipelineSpan = aiPipelineSpans[0];
   expect(secondPipelineSpan?.data?.['ai.prompt']).toContain('Where is the second span?');
-  expect(secondPipelineSpan?.data?.['ai.response.text']).toContain('Second span here!');
+  expect(secondPipelineSpan?.data?.['gen_ai.response.text']).toContain('Second span here!');
 
   // Third AI call - with tool calls
   /*  const thirdPipelineSpan = aiPipelineSpans[2];
@@ -51,7 +50,7 @@ test('should create AI spans with correct attributes', async ({ page }) => {
   expect(thirdPipelineSpan?.data?.['gen_ai.usage.output_tokens']).toBe(25); */
 
   // Tool call span
- /*  const toolSpan = toolCallSpans[0];
+  /*  const toolSpan = toolCallSpans[0];
   expect(toolSpan?.data?.['ai.toolCall.name']).toBe('getWeather');
   expect(toolSpan?.data?.['ai.toolCall.id']).toBe('call-1');
   expect(toolSpan?.data?.['ai.toolCall.args']).toContain('San Francisco');

dev-packages/e2e-tests/test-applications/nextjs-app-dir/tests/server-components.test.ts

@@ -39,6 +39,7 @@ test('Sends a transaction for a request to app router', async ({ page }) => {
     headers: expect.objectContaining({
       'user-agent': expect.any(String),
     }),
+    url: expect.stringContaining('/server-component/parameter/1337/42'),
   });
 
   // The transaction should not contain any spans with the same name as the transaction

dev-packages/external-contributor-gh-action/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sentry-internal/external-contributor-gh-action",
   "description": "An internal Github Action to add external contributors to the CHANGELOG.md file.",
-  "version": "9.29.0",
+  "version": "9.30.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"

dev-packages/node-integration-tests/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/node-integration-tests",
-  "version": "9.29.0",
+  "version": "9.30.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
@@ -30,9 +30,9 @@
     "@nestjs/common": "11.0.16",
     "@nestjs/core": "10.4.6",
     "@nestjs/platform-express": "10.4.6",
-    "@sentry/aws-serverless": "9.29.0",
-    "@sentry/core": "9.29.0",
-    "@sentry/node": "9.29.0",
+    "@sentry/aws-serverless": "9.30.0",
+    "@sentry/core": "9.30.0",
+    "@sentry/node": "9.30.0",
     "@types/mongodb": "^3.6.20",
     "@types/mysql": "^2.15.21",
     "@types/pg": "^8.6.5",