Merge branch 'develop' into bete/mcp-server-semantic-convention-fill

Author: betegon

CHANGELOG.md

@@ -4,6 +4,21 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+Work in this release was contributed by @janpapenbrock. Thank you for your contribution!
+
+## 9.38.0
+
+### Important Changes
+
+- **chore: Add craft entry for @sentry/node-native ([#16907](https://github.com/getsentry/sentry-javascript/pull/16907))**
+
+This release publishes the `@sentry/node-native` SDK.
+
+### Other Changes
+
+- feat(core): Introduce `debug` to replace `logger` ([#16906](https://github.com/getsentry/sentry-javascript/pull/16906))
+- fix(browser): Guard `nextHopProtocol` when adding resource spans ([#16900](https://github.com/getsentry/sentry-javascript/pull/16900))
+
 ## 9.37.0
 
 ### Important Changes

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

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/browser-integration-tests",
-  "version": "9.37.0",
+  "version": "9.38.0",
   "main": "index.js",
   "license": "MIT",
   "engines": {
@@ -43,7 +43,7 @@
     "@babel/preset-typescript": "^7.16.7",
     "@playwright/test": "~1.53.2",
     "@sentry-internal/rrweb": "2.34.0",
-    "@sentry/browser": "9.37.0",
+    "@sentry/browser": "9.38.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.37.0",
+  "version": "9.38.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.37.0",
+  "version": "9.38.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"

dev-packages/e2e-tests/package.json

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

dev-packages/e2e-tests/run.ts

@@ -84,10 +84,10 @@ async function run(): Promise<void> {
       const cwd = tmpDirPath;
 
       console.log(`Building ${testAppPath} in ${tmpDirPath}...`);
-      await asyncExec('pnpm test:build', { env, cwd });
+      await asyncExec('volta run pnpm test:build', { env, cwd });
 
       console.log(`Testing ${testAppPath}...`);
-      await asyncExec('pnpm test:assert', { env, cwd });
+      await asyncExec('volta run pnpm test:assert', { env, cwd });
 
       // clean up (although this is tmp, still nice to do)
       await rm(tmpDirPath, { recursive: true });

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

@@ -31,34 +31,34 @@ test('should create AI spans with correct attributes', async ({ page }) => {
 
   // First AI call - should have telemetry enabled and record inputs/outputs (sendDefaultPii: true)
   /* const firstPipelineSpan = aiPipelineSpans[0];
-  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?.['vercel.ai.model.id']).toBe('mock-model-id');
+  expect(firstPipelineSpan?.data?.['vercel.ai.model.provider']).toBe('mock-provider');
+  expect(firstPipelineSpan?.data?.['vercel.ai.prompt']).toContain('Where is the first span?');
   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?.['vercel.ai.prompt']).toContain('Where is the second span?');
   expect(secondPipelineSpan?.data?.['gen_ai.response.text']).toContain('Second span here!');
 
   // Third AI call - with tool calls
   /*  const thirdPipelineSpan = aiPipelineSpans[2];
-  expect(thirdPipelineSpan?.data?.['ai.response.finishReason']).toBe('tool-calls');
+  expect(thirdPipelineSpan?.data?.['vercel.ai.response.finishReason']).toBe('tool-calls');
   expect(thirdPipelineSpan?.data?.['gen_ai.usage.input_tokens']).toBe(15);
   expect(thirdPipelineSpan?.data?.['gen_ai.usage.output_tokens']).toBe(25); */
 
   // Tool call span
   /*  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');
-  expect(toolSpan?.data?.['ai.toolCall.result']).toContain('Sunny, 72°F'); */
+  expect(toolSpan?.data?.['vercel.ai.toolCall.name']).toBe('getWeather');
+  expect(toolSpan?.data?.['vercel.ai.toolCall.id']).toBe('call-1');
+  expect(toolSpan?.data?.['vercel.ai.toolCall.args']).toContain('San Francisco');
+  expect(toolSpan?.data?.['vercel.ai.toolCall.result']).toContain('Sunny, 72°F'); */
 
   // Verify the fourth call was not captured (telemetry disabled)
   const promptsInSpans = spans
-    .map(span => span.data?.['ai.prompt'])
+    .map(span => span.data?.['vercel.ai.prompt'])
     .filter((prompt): prompt is string => prompt !== undefined);
   const hasDisabledPrompt = promptsInSpans.some(prompt => prompt.includes('Where is the third span?'));
   expect(hasDisabledPrompt).toBe(false);

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.37.0",
+  "version": "9.38.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"

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

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/node-core-integration-tests",
-  "version": "9.37.0",
+  "version": "9.38.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
@@ -34,8 +34,8 @@
     "@opentelemetry/resources": "^1.30.1",
     "@opentelemetry/sdk-trace-base": "^1.30.1",
     "@opentelemetry/semantic-conventions": "^1.34.0",
-    "@sentry/core": "9.37.0",
-    "@sentry/node-core": "9.37.0",
+    "@sentry/core": "9.38.0",
+    "@sentry/node-core": "9.38.0",
     "body-parser": "^1.20.3",
     "cors": "^2.8.5",
     "cron": "^3.1.6",

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

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