Merge remote-tracking branch 'origin/develop' into pr-24768

# Conflicts:
#	packages/bundler-plugins/package.json
#	yarn.lock

Author: timfish

.github/workflows/cleanup-e2e-workers.yml

@@ -16,7 +16,7 @@ jobs:
       CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
     strategy:
       matrix:
-        # Name prefix of every E2E app that deploys a real worker, see the app's global-setup.mjs
+        # Name prefix of every E2E app that deploys a real worker, see the app's global-setup.ts
         worker-prefix:
           - e2e-send-to-sentry
     steps:

.size-limit.js

@@ -406,7 +406,7 @@ module.exports = [
     import: createImport('init'),
     ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
     gzip: true,
-    limit: '142 KB',
+    limit: '143 KB',
     disablePlugins: ['@size-limit/esbuild'],
   },
   {

CHANGELOG.md

@@ -4,7 +4,7 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
-Work in this release was contributed by @nabi-noor and @LuccaRebelloToledo. Thank you for your contributions!
+Work in this release was contributed by @nabi-noor, @LuccaRebelloToledo, and @andasan. Thank you for your contributions!
 
 ## 11.1.0
 

dev-packages/browser-integration-tests/suites/replay/largeMutations/mutationLimit/test.ts

@@ -1,6 +1,9 @@
 import { expect } from '@playwright/test';
+import { EventType } from '@sentry/rrweb';
 import { sentryTest } from '../../../../utils/fixtures';
 import {
+  collectReplayRequests,
+  getReplayBreadcrumbs,
   getReplayRecordingContent,
   getReplaySnapshot,
   shouldSkipReplayTest,
@@ -25,14 +28,20 @@ sentryTest(
     const [res0] = await Promise.all([waitForReplayRequest(page, 0), gotoPageAndClick()]);
     await forceFlushReplay();
 
-    const [res1] = await Promise.all([
-      waitForReplayRequest(page, (_event, res) => {
-        const parsed = getReplayRecordingContent(res);
-        return !!parsed.incrementalSnapshots.length || !!parsed.fullSnapshots.length;
-      }),
-      page.locator('#button-add').click(),
-      forceFlushReplay(),
-    ]);
+    // The `replay.mutations` breadcrumb is added asynchronously (once rrweb's
+    // MutationObserver fires) and can land in a different flush than the
+    // incremental snapshots and the `ui.click` breadcrumb. Collect across
+    // requests until the mutation breadcrumb has arrived rather than betting on
+    // a single request containing everything.
+    const requestsPromise = collectReplayRequests(
+      page,
+      recordingSnapshots => getReplayBreadcrumbs(recordingSnapshots, 'replay.mutations').length > 0,
+    );
+
+    await page.locator('#button-add').click();
+    await forceFlushReplay();
+
+    const { replayRecordingSnapshots } = await requestsPromise;
 
     // replay should be stopped due to mutation limit
     let replay = await getReplaySnapshot(page);
@@ -48,11 +57,21 @@ sentryTest(
     const replayData0 = getReplayRecordingContent(res0);
     expect(replayData0.fullSnapshots.length).toBe(1);
 
+    const fullSnapshots = replayRecordingSnapshots.filter(snapshot => snapshot.type === EventType.FullSnapshot);
+    const incrementalSnapshots = replayRecordingSnapshots.filter(
+      snapshot => snapshot.type === EventType.IncrementalSnapshot,
+    );
+    // A still-in-flight envelope from the setup flush can re-deliver the
+    // `#noop` `ui.click` breadcrumb into the collected set, so assert on the
+    // unique categories rather than the raw (potentially duplicated) list.
+    const breadcrumbCategories = [
+      ...new Set(getReplayBreadcrumbs(replayRecordingSnapshots).map(({ category }) => category)),
+    ].sort();
+
     // Breadcrumbs (click and mutation);
-    const replayData1 = getReplayRecordingContent(res1);
-    expect(replayData1.fullSnapshots.length).toBe(0);
-    expect(replayData1.incrementalSnapshots.length).toBeGreaterThan(0);
-    expect(replayData1.breadcrumbs.map(({ category }) => category).sort()).toEqual(['replay.mutations', 'ui.click']);
+    expect(fullSnapshots.length).toBe(0);
+    expect(incrementalSnapshots.length).toBeGreaterThan(0);
+    expect(breadcrumbCategories).toEqual(['replay.mutations', 'ui.click']);
 
     replay = await getReplaySnapshot(page);
     expect(replay.session).toBe(undefined);

dev-packages/bun-integration-tests/node-suites/bun-build.ts

@@ -0,0 +1,38 @@
+// Bundles one Node suite scenario with `@sentry/bun/plugin`, so the plugin can inject the
+// diagnostics channels into the libraries the scenario uses. The runner calls this script with the
+// scenario path when `RUNTIME_BUILD_SCRIPT` points to it, and runs the printed output file instead.
+import { sentryBunPlugin } from '@sentry/bun/plugin';
+import { dirname, join, relative } from 'node:path';
+
+const NODE_SUITES_ROOT = join(import.meta.dir, '..', '..', 'node-integration-tests');
+const BUILD_ROOT = join(import.meta.dir, '..', 'build');
+
+const entry = process.argv[2];
+if (!entry) {
+  // eslint-disable-next-line no-console
+  console.error('BUILD_FAILED no scenario path');
+  process.exit(1);
+}
+
+const result = await Bun.build({
+  entrypoints: [entry],
+  target: 'bun',
+  // Mirrors the scenario's folder, so relative paths between scenarios keep their shape.
+  outdir: join(BUILD_ROOT, relative(NODE_SUITES_ROOT, dirname(entry))),
+  sourcemap: 'linked',
+  // The instrument file is preloaded unbundled, so the bundle must share its `@sentry/*` packages.
+  // knex requires the drivers of all its dialects, and the ones that are not installed must stay
+  // external so the bundle still builds.
+  external: ['@sentry/*', '@sentry-internal/*', 'better-sqlite3', 'oracledb', 'pg-query-stream', 'sqlite3'],
+  plugins: [sentryBunPlugin()],
+});
+
+const output = result.outputs.find(file => file.kind === 'entry-point');
+if (!result.success || !output) {
+  // eslint-disable-next-line no-console
+  console.error('BUILD_FAILED', result.logs);
+  process.exit(1);
+}
+
+// eslint-disable-next-line no-console
+console.log(`BUILD_OK ${output.path}`);

dev-packages/bun-integration-tests/node-suites/excludes.ts

@@ -75,7 +75,7 @@ const NO_OUTGOING_HTTP_INSTRUMENTATION = [
 // `bun run` cannot inject the diagnostics channels into libraries, so framework, database and AI
 // instrumentation creates no spans. Apps must be built with `@sentry/bun/plugin`.
 // See https://github.com/getsentry/sentry-javascript/issues/23882
-const NO_AUTO_INSTRUMENTATION = [
+export const NO_AUTO_INSTRUMENTATION = [
   'suites/express/**',
   'suites/fs-instrumentation/test.ts',
   'suites/hono-sdk/test.ts',
@@ -216,3 +216,56 @@ export const SENTRY_BUN_EXCLUDE = [
   ...NO_NATIVE_NODE_FETCH_INTEGRATION,
   ...FETCH_INTEGRATION_DIFFERS,
 ];
+
+// The build project (`node-suites-bun-build`) runs the suites of `NO_AUTO_INSTRUMENTATION` with the
+// scenarios bundled by `@sentry/bun/plugin`. These do not run there.
+
+// On Bun the channel integrations subscribe at `init()` by design, and this suite checks that
+// they wait until their module loads.
+const BUN_BUILD_EAGER_SUBSCRIPTION = ['suites/tracing/orchestrion-lazy-registration/test.ts'];
+
+// The first `init()` has no DSN, so `bunHttpServerIntegration` is not set up, and the suite then
+// adds only `httpIntegration`. On Bun that does not isolate requests, because Bun does not publish
+// `http.server.request.start`.
+const BUN_BUILD_NO_HTTP_SERVER_INTEGRATION = ['suites/express/multiple-init/test.ts'];
+
+// Some or all tests fail with the bundled scenarios, cause not investigated yet. In
+// `express/tracing` only the request data tests fail: they set `httpIntegration` options, and with
+// `@sentry/bun` the request body comes from `bunHttpServerIntegration`.
+const BUN_BUILD_NOT_TRIAGED = [
+  'suites/express/sentry-trace/test.ts',
+  'suites/express/tracing/test.ts',
+  'suites/express/with-http/**',
+  'suites/hono-sdk/test.ts',
+  'suites/pino/test.ts',
+  'suites/tracing/google-genai-v2/test.ts',
+  'suites/tracing/google-genai/test.ts',
+  'suites/tracing/langchain/v1/test.ts',
+  'suites/tracing/mastra/test.ts',
+  'suites/tracing/mcp-handler-exact-once/test.ts',
+  'suites/tracing/mcp-server-streamed/test.ts',
+  'suites/tracing/mongodb-v4/test.ts',
+  'suites/tracing/mongodb-v5/test.ts',
+  'suites/tracing/mongodb-v6/test.ts',
+  'suites/tracing/mongodb-v7/test.ts',
+  'suites/tracing/mongodb/test.ts',
+  'suites/tracing/mongoose-tracing-channel/test.ts',
+  'suites/tracing/mongoose-v5/test.ts',
+  'suites/tracing/mongoose-v7/test.ts',
+  'suites/tracing/mongoose-v8/test.ts',
+  'suites/tracing/mongoose-v9/test.ts',
+  'suites/tracing/mongoose/test.ts',
+  'suites/tracing/mysql/test.ts',
+  'suites/tracing/openai/test.ts',
+  'suites/tracing/prisma-orm-v8/test.ts',
+  'suites/tracing/together-ai/test.ts',
+  'suites/tracing/vercelai/test.ts',
+  'suites/tracing/vercelai/v6_v7/test.ts',
+];
+
+export const BUN_BUILD_EXCLUDE = [
+  '**/node_modules/**',
+  ...BUN_BUILD_EAGER_SUBSCRIPTION,
+  ...BUN_BUILD_NO_HTTP_SERVER_INTEGRATION,
+  ...BUN_BUILD_NOT_TRIAGED,
+];

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

@@ -24,7 +24,7 @@
     "@sentry-internal/node-integration-tests": "11.1.0",
     "@sentry-internal/test-utils": "11.1.0",
     "bun-types": "^1.2.9",
-    "vitest": "^3.2.7"
+    "vitest": "^4.1.11"
   },
   "volta": {
     "extends": "../../package.json"

dev-packages/bun-integration-tests/tsconfig.json

@@ -4,7 +4,7 @@
   "include": ["suites/**/*.ts", "node-suites/**/*.ts", "*.ts"],
 
   "compilerOptions": {
-    "lib": ["ES2020"],
+    "lib": ["DOM", "ES2020"],
     "esModuleInterop": true,
     "types": ["bun-types"]
   }

dev-packages/bun-integration-tests/vite.config.mts

@@ -1,7 +1,13 @@
 import { fileURLToPath } from 'node:url';
 import { defineConfig } from 'vitest/config';
 import baseConfig from '../../vite/vite.config';
-import { NODE_SUITES_EXCLUDE, SENTRY_BUN_EXCLUDE, SENTRY_NODE_EXCLUDE } from './node-suites/excludes';
+import {
+  BUN_BUILD_EXCLUDE,
+  NO_AUTO_INSTRUMENTATION,
+  NODE_SUITES_EXCLUDE,
+  SENTRY_BUN_EXCLUDE,
+  SENTRY_NODE_EXCLUDE,
+} from './node-suites/excludes';
 
 const NODE_SUITES_ROOT = fileURLToPath(new URL('../node-integration-tests', import.meta.url));
 
@@ -46,11 +52,9 @@ export default defineConfig({
           env: { RUNTIME: 'bun' },
           // Above the 30 second port timeout of the runner on Bun, so a slow start can still pass.
           testTimeout: 45_000,
-          poolOptions: {
-            threads: {
-              singleThread: true,
-            },
-          },
+          maxWorkers: 1,
+          // Vitest requires projects with a different `maxWorkers` to run in their own group.
+          sequence: { groupOrder: 1 },
         },
       },
       {
@@ -82,6 +86,24 @@ export default defineConfig({
           },
         },
       },
+      {
+        extends: true,
+        test: {
+          ...nodeSuitesTest,
+          // The auto-instrumentation suites, with each scenario bundled by `@sentry/bun/plugin` before
+          // it starts, as Bun apps must be built to get these spans.
+          // See https://github.com/getsentry/sentry-javascript/issues/23882
+          name: 'node-suites-bun-build',
+          include: NO_AUTO_INSTRUMENTATION.map(glob => (glob.endsWith('/**') ? `${glob}/test.ts` : glob)),
+          exclude: BUN_BUILD_EXCLUDE,
+          env: {
+            RUNTIME: 'bun',
+            RUNTIME_PRELOAD: fileURLToPath(new URL('./node-suites/alias-sentry-bun.ts', import.meta.url)),
+            RUNTIME_BUILD_SCRIPT: fileURLToPath(new URL('./node-suites/bun-build.ts', import.meta.url)),
+            EXPECTED_SDK_NAME: 'sentry.javascript.bun',
+          },
+        },
+      },
     ],
   },
 });

dev-packages/bundler-plugin-integration-tests/package.json

@@ -17,7 +17,7 @@
   "devDependencies": {
     "premove": "^4.0.0",
     "typescript": "~6.0.3",
-    "vitest": "^3.2.7"
+    "vitest": "^4.1.11"
   },
   "volta": {
     "extends": "../../package.json"