Merge branch 'develop' into nh/automatic-function-middleware-instrumentation

Author: nicohrubec

CHANGELOG.md

@@ -4,7 +4,11 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
-Work in this release was contributed by @sebws, @harshit078, and @fedetorre. Thank you for your contributions!
+Work in this release was contributed by @harshit078. Thank you for your contribution!
+
+## 10.37.0
+
+### Important Changes
 
 - **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))**
 
@@ -23,9 +27,7 @@ Work in this release was contributed by @sebws, @harshit078, and @fedetorre. Tha
   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))**
+- **feat(tanstackstart-react): Auto-instrument global middleware in `sentryTanstackStart` Vite plugin ([#18844](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.
 
@@ -43,7 +45,39 @@ Work in this release was contributed by @sebws, @harshit078, and @fedetorre. Tha
 
 ### Other Changes
 
+- feat(core): simplify truncation logic to only keep the newest message ([#18906](https://github.com/getsentry/sentry-javascript/pull/18906))
+- feat(core): Support new client discard reason `invalid` ([#18901](https://github.com/getsentry/sentry-javascript/pull/18901))
 - feat(deps): Bump OpenTelemetry instrumentations ([#18934](https://github.com/getsentry/sentry-javascript/pull/18934))
+- feat(nextjs): Update default ignore list for sourcemaps ([#18938](https://github.com/getsentry/sentry-javascript/pull/18938))
+- feat(node): pass prisma instrumentation options through ([#18900](https://github.com/getsentry/sentry-javascript/pull/18900))
+- feat(nuxt): Don't run source maps related code on Nuxt "prepare" ([#18936](https://github.com/getsentry/sentry-javascript/pull/18936))
+- feat(replay): Update client report discard reason for invalid sessions ([#18796](https://github.com/getsentry/sentry-javascript/pull/18796))
+- feat(winston): Add customLevelMap for winston transport ([#18922](https://github.com/getsentry/sentry-javascript/pull/18922))
+- feat(react-router): Add support for React Router instrumentation API ([#18580](https://github.com/getsentry/sentry-javascript/pull/18580))
+- fix(astro): Do not show warnings for valid options ([#18947](https://github.com/getsentry/sentry-javascript/pull/18947))
+- fix(core): Report well known values in gen_ai.operation.name attribute ([#18925](https://github.com/getsentry/sentry-javascript/pull/18925))
+- fix(node-core): ignore vercel `AbortError` by default on unhandled rejection ([#18973](https://github.com/getsentry/sentry-javascript/pull/18973))
+- fix(nuxt): include sentry.config.server.ts in nuxt app types ([#18971](https://github.com/getsentry/sentry-javascript/pull/18971))
+- fix(profiling): Add `platform` to envelope item header ([#18954](https://github.com/getsentry/sentry-javascript/pull/18954))
+- fix(react): Defer React Router span finalization until lazy routes load ([#18881](https://github.com/getsentry/sentry-javascript/pull/18881))
+- ref(core): rename `gen_ai.input.messages.original_length` to `sentry.sdk_meta.gen_ai.input.messages.original_length` ([#18970](https://github.com/getsentry/sentry-javascript/pull/18970))
+- ref(core): rename `gen_ai.request.messages` to `gen_ai.input.messages` ([#18944](https://github.com/getsentry/sentry-javascript/pull/18944))
+- ref(core): Set system message as separate attribute ([#18978](https://github.com/getsentry/sentry-javascript/pull/18978))
+- deps: Bump version of sentry-bundler-plugins ([#18972](https://github.com/getsentry/sentry-javascript/pull/18972))
+
+<details>
+  <summary><strong>Internal Changes</strong></summary>
+
+- chore(e2e): Add e2e claude skill ([#18957](https://github.com/getsentry/sentry-javascript/pull/18957))
+- chore(e2e): Add Makefile to make running specific e2e test apps easier ([#18953](https://github.com/getsentry/sentry-javascript/pull/18953))
+- chore(e2e): Modify e2e skill to also account for untracked files ([#18959](https://github.com/getsentry/sentry-javascript/pull/18959))
+- ref(tests): use constants in ai integration tests and add missing ones ([#18945](https://github.com/getsentry/sentry-javascript/pull/18945))
+- test(nextjs): Added nextjs CF workers test app ([#18928](https://github.com/getsentry/sentry-javascript/pull/18928))
+- test(prisma): Move to yarn prisma ([#18975](https://github.com/getsentry/sentry-javascript/pull/18975))
+
+</details>
+
+Work in this release was contributed by @sebws, @harshit078, and @fedetorre. Thank you for your contributions!
 
 ## 10.36.0
 

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

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

dev-packages/browser-integration-tests/suites/wasm/webWorker/assets/worker.js

@@ -0,0 +1,89 @@
+// This worker manually replicates what Sentry.registerWebWorkerWasm() does.
+// the reason for manual replication is that it allows us to test the message-passing protocol
+//  between worker and main thread independent of SDK implementation details
+// in production code you would do: registerWebWorkerWasm({ self });
+
+const origInstantiateStreaming = WebAssembly.instantiateStreaming;
+WebAssembly.instantiateStreaming = function instantiateStreaming(response, importObject) {
+  return Promise.resolve(response).then(res => {
+    return origInstantiateStreaming(res, importObject).then(rv => {
+      if (res.url) {
+        registerModuleAndForward(rv.module, res.url);
+      }
+      return rv;
+    });
+  });
+};
+
+function registerModuleAndForward(module, url) {
+  const buildId = getBuildId(module);
+
+  if (buildId) {
+    const image = {
+      type: 'wasm',
+      code_id: buildId,
+      code_file: url,
+      debug_file: null,
+      debug_id: `${`${buildId}00000000000000000000000000000000`.slice(0, 32)}0`,
+    };
+
+    self.postMessage({
+      _sentryMessage: true,
+      _sentryWasmImages: [image],
+    });
+  }
+}
+
+// Extract build ID from WASM module
+function getBuildId(module) {
+  const sections = WebAssembly.Module.customSections(module, 'build_id');
+  if (sections.length > 0) {
+    const buildId = Array.from(new Uint8Array(sections[0]))
+      .map(b => b.toString(16).padStart(2, '0'))
+      .join('');
+    return buildId;
+  }
+  return null;
+}
+
+// Handle messages from the main thread
+self.addEventListener('message', async event => {
+  function crash() {
+    throw new Error('WASM error from worker');
+  }
+
+  if (event.data.type === 'load-wasm-and-crash') {
+    const wasmUrl = event.data.wasmUrl;
+
+    try {
+      const { instance } = await WebAssembly.instantiateStreaming(fetch(wasmUrl), {
+        env: {
+          external_func: crash,
+        },
+      });
+
+      instance.exports.internal_func();
+    } catch (err) {
+      self.postMessage({
+        _sentryMessage: true,
+        _sentryWorkerError: {
+          reason: err,
+          filename: self.location.href,
+        },
+      });
+    }
+  }
+});
+
+self.addEventListener('unhandledrejection', event => {
+  self.postMessage({
+    _sentryMessage: true,
+    _sentryWorkerError: {
+      reason: event.reason,
+      filename: self.location.href,
+    },
+  });
+});
+
+// Let the main thread know that worker is ready
+self.postMessage({ _sentryMessage: false, type: 'WORKER_READY' });

dev-packages/browser-integration-tests/suites/wasm/webWorker/init.js

@@ -0,0 +1,15 @@
+import * as Sentry from '@sentry/browser';
+import { wasmIntegration } from '@sentry/wasm';
+
+window.Sentry = Sentry;
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  integrations: [wasmIntegration({ applicationKey: 'wasm-worker-app' })],
+});
+
+const worker = new Worker('/worker.js');
+
+Sentry.addIntegration(Sentry.webWorkerIntegration({ worker }));
+
+window.wasmWorker = worker;

dev-packages/browser-integration-tests/suites/wasm/webWorker/subject.js

@@ -0,0 +1,8 @@
+window.events = [];
+
+window.triggerWasmError = () => {
+  window.wasmWorker.postMessage({
+    type: 'load-wasm-and-crash',
+    wasmUrl: 'https://localhost:5887/simple.wasm',
+  });
+};

dev-packages/browser-integration-tests/suites/wasm/webWorker/template.html

@@ -0,0 +1,9 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+  </head>
+  <body>
+    <button id="triggerWasmError">Trigger WASM Error in Worker</button>
+  </body>
+</html>

dev-packages/browser-integration-tests/suites/wasm/webWorker/test.ts

@@ -0,0 +1,139 @@
+import { expect } from '@playwright/test';
+import fs from 'fs';
+import path from 'path';
+import { sentryTest } from '../../../utils/fixtures';
+import { envelopeRequestParser, waitForErrorRequest } from '../../../utils/helpers';
+import { shouldSkipWASMTests } from '../../../utils/wasmHelpers';
+
+declare global {
+  interface Window {
+    wasmWorker: Worker;
+    triggerWasmError: () => void;
+  }
+}
+
+const bundle = process.env.PW_BUNDLE || '';
+if (bundle.startsWith('bundle')) {
+  sentryTest.skip();
+}
+
+sentryTest(
+  'WASM debug images from worker should be forwarded to main thread and attached to events',
+  async ({ getLocalTestUrl, page, browserName }) => {
+    if (shouldSkipWASMTests(browserName)) {
+      sentryTest.skip();
+    }
+
+    const url = await getLocalTestUrl({ testDir: __dirname });
+
+    await page.route('**/simple.wasm', route => {
+      const wasmModule = fs.readFileSync(path.resolve(__dirname, '../simple.wasm'));
+      return route.fulfill({
+        status: 200,
+        body: wasmModule,
+        headers: {
+          'Content-Type': 'application/wasm',
+        },
+      });
+    });
+
+    await page.route('**/worker.js', route => {
+      return route.fulfill({
+        path: `${__dirname}/assets/worker.js`,
+      });
+    });
+
+    const errorEventPromise = waitForErrorRequest(page, e => {
+      return e.exception?.values?.[0]?.value === 'WASM error from worker';
+    });
+
+    await page.goto(url);
+
+    await page.waitForFunction(() => window.wasmWorker !== undefined);
+
+    await page.evaluate(() => {
+      window.triggerWasmError();
+    });
+
+    const errorEvent = envelopeRequestParser(await errorEventPromise);
+
+    expect(errorEvent.exception?.values?.[0]?.value).toBe('WASM error from worker');
+
+    expect(errorEvent.debug_meta?.images).toBeDefined();
+    expect(errorEvent.debug_meta?.images).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          type: 'wasm',
+          code_file: expect.stringMatching(/simple\.wasm$/),
+          code_id: '0ba020cdd2444f7eafdd25999a8e9010',
+          debug_id: '0ba020cdd2444f7eafdd25999a8e90100',
+        }),
+      ]),
+    );
+
+    expect(errorEvent.exception?.values?.[0]?.stacktrace?.frames).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          filename: expect.stringMatching(/simple\.wasm$/),
+          platform: 'native',
+          instruction_addr: expect.stringMatching(/^0x[a-fA-F\d]+$/),
+          addr_mode: expect.stringMatching(/^rel:\d+$/),
+        }),
+      ]),
+    );
+  },
+);
+
+sentryTest(
+  'WASM frames from worker should be recognized as first-party when applicationKey is configured',
+  async ({ getLocalTestUrl, page, browserName }) => {
+    if (shouldSkipWASMTests(browserName)) {
+      sentryTest.skip();
+    }
+
+    const url = await getLocalTestUrl({ testDir: __dirname });
+
+    await page.route('**/simple.wasm', route => {
+      const wasmModule = fs.readFileSync(path.resolve(__dirname, '../simple.wasm'));
+      return route.fulfill({
+        status: 200,
+        body: wasmModule,
+        headers: {
+          'Content-Type': 'application/wasm',
+        },
+      });
+    });
+
+    await page.route('**/worker.js', route => {
+      return route.fulfill({
+        path: `${__dirname}/assets/worker.js`,
+      });
+    });
+
+    const errorEventPromise = waitForErrorRequest(page, e => {
+      return e.exception?.values?.[0]?.value === 'WASM error from worker';
+    });
+
+    await page.goto(url);
+
+    await page.waitForFunction(() => window.wasmWorker !== undefined);
+
+    await page.evaluate(() => {
+      window.triggerWasmError();
+    });
+
+    const errorEvent = envelopeRequestParser(await errorEventPromise);
+
+    expect(errorEvent.exception?.values?.[0]?.stacktrace?.frames).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          filename: expect.stringMatching(/simple\.wasm$/),
+          platform: 'native',
+          module_metadata: expect.objectContaining({
+            '_sentryBundlerPluginAppKey:wasm-worker-app': true,
+          }),
+        }),
+      ]),
+    );
+  },
+);

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

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/bundle-analyzer-scenarios",
-  "version": "10.36.0",
+  "version": "10.37.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/bundler-tests/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/bundler-tests",
-  "version": "10.36.0",
+  "version": "10.37.0",
   "description": "Bundler tests for Sentry Browser SDK",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/bundler-tests",
@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@rollup/plugin-node-resolve": "^15.2.3",
-    "@sentry/browser": "10.36.0",
+    "@sentry/browser": "10.37.0",
     "rollup": "^4.0.0",
     "vite": "^5.0.0",
     "vitest": "^3.2.4",

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