From 2c6e710b9c54a015ec7b8e9c28257895fddde881 Mon Sep 17 00:00:00 2001
From: Sigrid Huemer <32902192+s1gr1d@users.noreply.github.com>
Date: Fri, 24 Oct 2025 10:31:35 +0200
Subject: [PATCH 001/186] feat(react-router): Align options with shared build
 time options type (#18014)

closes https://github.com/getsentry/sentry-javascript/issues/17066

Also updates the shared `BuildTimeOptionsBase` type a bit to align with
the latest changes.
---
 .../buildTimeOptionsBase.ts                   | 171 ++++++++++--------
 packages/react-router/.eslintrc.js            |   2 +-
 .../src/vite/buildEnd/handleOnBuildEnd.ts     |  33 +++-
 packages/react-router/src/vite/plugin.ts      |   4 +-
 packages/react-router/src/vite/types.ts       | 156 +++-------------
 .../test/client/tracingIntegration.test.ts    |   1 +
 .../server/createSentryHandleRequest.test.ts  |   7 +-
 .../instrumentation/reactRouterServer.test.ts |   3 +
 .../vite/buildEnd/handleOnBuildEnd.test.ts    |  13 ++
 .../react-router/test/vite/types.test-d.ts    | 114 ++++++++++++
 packages/react-router/tsconfig.test.json      |   2 +-
 packages/react-router/tsconfig.vite.json      |   9 +
 packages/react-router/vite.config.ts          |   4 +
 13 files changed, 299 insertions(+), 220 deletions(-)
 create mode 100644 packages/react-router/test/vite/types.test-d.ts
 create mode 100644 packages/react-router/tsconfig.vite.json

diff --git a/packages/core/src/build-time-plugins/buildTimeOptionsBase.ts b/packages/core/src/build-time-plugins/buildTimeOptionsBase.ts
index e43160cc03ab..67f74f696dcf 100644
--- a/packages/core/src/build-time-plugins/buildTimeOptionsBase.ts
+++ b/packages/core/src/build-time-plugins/buildTimeOptionsBase.ts
@@ -243,6 +243,37 @@ interface SourceMapsOptions {
   filesToDeleteAfterUpload?: string | Array<string>;
 }
 
+type AutoSetCommitsOptions = {
+  /**
+   * Automatically sets `commit` and `previousCommit`. Sets `commit` to `HEAD`
+   * and `previousCommit` as described in the option's documentation.
+   *
+   * If you set this to `true`, manually specified `commit` and `previousCommit`
+   * options will be overridden. It is best to not specify them at all if you
+   * set this option to `true`.
+   */
+  auto: true;
+  repo?: undefined;
+  commit?: undefined;
+};
+
+type ManualSetCommitsOptions = {
+  auto?: false | undefined;
+  /**
+   * The full repo name as defined in Sentry.
+   *
+   * Required if the `auto` option is not set to `true`.
+   */
+  repo: string;
+
+  /**
+   * The current (last) commit in the release.
+   *
+   * Required if the `auto` option is not set to `true`.
+   */
+  commit: string;
+};
+
 interface ReleaseOptions {
   /**
    * Unique identifier for the release you want to create.
@@ -299,101 +330,81 @@ interface ReleaseOptions {
 
   /**
    * Configuration for associating the release with its commits in Sentry.
+   *
+   * Set to `false` to disable commit association.
+   *
+   * @default { auto: true }
    */
-  setCommits?: (
-    | {
+  setCommits?:
+    | false
+    | ((AutoSetCommitsOptions | ManualSetCommitsOptions) & {
         /**
-         * Automatically sets `commit` and `previousCommit`. Sets `commit` to `HEAD`
-         * and `previousCommit` as described in the option's documentation.
+         * The commit before the beginning of this release (in other words,
+         * the last commit of the previous release).
+         *
+         * Defaults to the last commit of the previous release in Sentry.
          *
-         * If you set this to `true`, manually specified `commit` and `previousCommit`
-         * options will be overridden. It is best to not specify them at all if you
-         * set this option to `true`.
+         * If there was no previous release, the last 10 commits will be used.
          */
-        auto: true;
-        repo?: undefined;
-        commit?: undefined;
-      }
-    | {
-        auto?: false | undefined;
+        previousCommit?: string;
+
         /**
-         * The full repo name as defined in Sentry.
+         * If the flag is to `true` and the previous release commit was not found
+         * in the repository, the plugin creates a release with the default commits
+         * count instead of failing the command.
          *
-         * Required if the `auto` option is not set to `true`.
+         * @default false
          */
-        repo: string;
+        ignoreMissing?: boolean;
 
         /**
-         * The current (last) commit in the release.
+         * If this flag is set, the setCommits step will not fail and just exit
+         * silently if no new commits for a given release have been found.
          *
-         * Required if the `auto` option is not set to `true`.
+         * @default false
          */
-        commit: string;
-      }
-  ) & {
-    /**
-     * The commit before the beginning of this release (in other words,
-     * the last commit of the previous release).
-     *
-     * Defaults to the last commit of the previous release in Sentry.
-     *
-     * If there was no previous release, the last 10 commits will be used.
-     */
-    previousCommit?: string;
-
-    /**
-     * If the flag is to `true` and the previous release commit was not found
-     * in the repository, the plugin creates a release with the default commits
-     * count instead of failing the command.
-     *
-     * @default false
-     */
-    ignoreMissing?: boolean;
-
-    /**
-     * If this flag is set, the setCommits step will not fail and just exit
-     * silently if no new commits for a given release have been found.
-     *
-     * @default false
-     */
-    ignoreEmpty?: boolean;
-  };
+        ignoreEmpty?: boolean;
+      });
 
   /**
    * Configuration for adding deployment information to the release in Sentry.
+   *
+   * Set to `false` to disable automatic deployment detection and creation.
    */
-  deploy?: {
-    /**
-     * Environment for this release. Values that make sense here would
-     * be `production` or `staging`.
-     */
-    env: string;
-
-    /**
-     * Deployment start time in Unix timestamp (in seconds) or ISO 8601 format.
-     */
-    started?: number | string;
-
-    /**
-     * Deployment finish time in Unix timestamp (in seconds) or ISO 8601 format.
-     */
-    finished?: number | string;
-
-    /**
-     * Deployment duration (in seconds). Can be used instead of started and finished.
-     */
-    time?: number;
-
-    /**
-     * Human-readable name for the deployment.
-     */
-    name?: string;
-
-    /**
-     * URL that points to the deployment.
-     */
-    url?: string;
-  };
+  deploy?:
+    | false
+    | {
+        /**
+         * Environment for this release. Values that make sense here would
+         * be `production` or `staging`.
+         */
+        env: string;
+
+        /**
+         * Deployment start time in Unix timestamp (in seconds) or ISO 8601 format.
+         */
+        started?: number | string;
+
+        /**
+         * Deployment finish time in Unix timestamp (in seconds) or ISO 8601 format.
+         */
+        finished?: number | string;
+
+        /**
+         * Deployment duration (in seconds). Can be used instead of started and finished.
+         */
+        time?: number;
+
+        /**
+         * Human-readable name for the deployment.
+         */
+        name?: string;
+
+        /**
+         * URL that points to the deployment.
+         */
+        url?: string;
+      };
 }
 
 interface BundleSizeOptimizationsOptions {
diff --git a/packages/react-router/.eslintrc.js b/packages/react-router/.eslintrc.js
index a22f9710cf6b..e6ea40d78d05 100644
--- a/packages/react-router/.eslintrc.js
+++ b/packages/react-router/.eslintrc.js
@@ -7,7 +7,7 @@ module.exports = {
     {
       files: ['vite.config.ts'],
       parserOptions: {
-        project: ['tsconfig.test.json'],
+        project: ['tsconfig.vite.json'],
       },
     },
   ],
diff --git a/packages/react-router/src/vite/buildEnd/handleOnBuildEnd.ts b/packages/react-router/src/vite/buildEnd/handleOnBuildEnd.ts
index 959578b6d644..a3d1e78cb285 100644
--- a/packages/react-router/src/vite/buildEnd/handleOnBuildEnd.ts
+++ b/packages/react-router/src/vite/buildEnd/handleOnBuildEnd.ts
@@ -1,6 +1,7 @@
 import { rm } from 'node:fs/promises';
 import type { Config } from '@react-router/dev/config';
 import SentryCli from '@sentry/cli';
+import type { SentryVitePluginOptions } from '@sentry/vite-plugin';
 import { glob } from 'glob';
 import type { SentryReactRouterBuildOptions } from '../types';
 
@@ -23,17 +24,31 @@ function getSentryConfig(viteConfig: unknown): SentryReactRouterBuildOptions {
 export const sentryOnBuildEnd: BuildEndHook = async ({ reactRouterConfig, viteConfig }) => {
   const sentryConfig = getSentryConfig(viteConfig);
 
+  // todo(v11): Remove deprecated sourceMapsUploadOptions support (no need for spread/pick anymore)
+  const {
+    sourceMapsUploadOptions, // extract to exclude from rest config
+    ...sentryConfigWithoutDeprecatedSourceMapOption
+  } = sentryConfig;
+
   const {
     authToken,
     org,
     project,
     release,
-    sourceMapsUploadOptions = { enabled: true },
+    sourcemaps = { disable: false },
     debug = false,
-    unstable_sentryVitePluginOptions,
-  }: SentryReactRouterBuildOptions = {
+  }: Omit<SentryReactRouterBuildOptions, 'sourcemaps' | 'sourceMapsUploadOptions'> &
+    // Pick 'sourcemaps' from Vite plugin options as the types allow more (e.g. Promise values for `deleteFilesAfterUpload`)
+    Pick<SentryVitePluginOptions, 'sourcemaps'> = {
     ...sentryConfig.unstable_sentryVitePluginOptions,
-    ...sentryConfig,
+    ...sentryConfigWithoutDeprecatedSourceMapOption, // spread in the config without the deprecated sourceMapsUploadOptions
+    sourcemaps: {
+      ...sentryConfig.unstable_sentryVitePluginOptions?.sourcemaps,
+      ...sentryConfig.sourcemaps,
+      ...sourceMapsUploadOptions,
+      // eslint-disable-next-line deprecation/deprecation
+      disable: sourceMapsUploadOptions?.enabled === false ? true : sentryConfig.sourcemaps?.disable,
+    },
     release: {
       ...sentryConfig.unstable_sentryVitePluginOptions?.release,
       ...sentryConfig.release,
@@ -44,8 +59,9 @@ export const sentryOnBuildEnd: BuildEndHook = async ({ reactRouterConfig, viteCo
     authToken,
     org,
     project,
-    ...unstable_sentryVitePluginOptions,
+    ...sentryConfig.unstable_sentryVitePluginOptions,
   });
+
   // check if release should be created
   if (release?.name) {
     try {
@@ -56,7 +72,7 @@ export const sentryOnBuildEnd: BuildEndHook = async ({ reactRouterConfig, viteCo
     }
   }
 
-  if (sourceMapsUploadOptions?.enabled ?? (true && viteConfig.build.sourcemap !== false)) {
+  if (!sourcemaps?.disable && viteConfig.build.sourcemap !== false) {
     // inject debugIds
     try {
       await cliInstance.execute(
@@ -84,9 +100,10 @@ export const sentryOnBuildEnd: BuildEndHook = async ({ reactRouterConfig, viteCo
     }
   }
   // delete sourcemaps after upload
-  let updatedFilesToDeleteAfterUpload = sourceMapsUploadOptions?.filesToDeleteAfterUpload;
+  let updatedFilesToDeleteAfterUpload = await sourcemaps?.filesToDeleteAfterUpload;
+
   // set a default value no option was set
-  if (typeof sourceMapsUploadOptions?.filesToDeleteAfterUpload === 'undefined') {
+  if (typeof updatedFilesToDeleteAfterUpload === 'undefined') {
     updatedFilesToDeleteAfterUpload = [`${reactRouterConfig.buildDirectory}/**/*.map`];
     debug &&
       // eslint-disable-next-line no-console
diff --git a/packages/react-router/src/vite/plugin.ts b/packages/react-router/src/vite/plugin.ts
index 98405771ee1b..8163ee4c6a1b 100644
--- a/packages/react-router/src/vite/plugin.ts
+++ b/packages/react-router/src/vite/plugin.ts
@@ -14,13 +14,13 @@ import type { SentryReactRouterBuildOptions } from './types';
  */
 export async function sentryReactRouter(
   options: SentryReactRouterBuildOptions = {},
-  config: ConfigEnv,
+  viteConfig: ConfigEnv,
 ): Promise<Plugin[]> {
   const plugins: Plugin[] = [];
 
   plugins.push(makeConfigInjectorPlugin(options));
 
-  if (process.env.NODE_ENV !== 'development' && config.command === 'build' && config.mode !== 'development') {
+  if (process.env.NODE_ENV !== 'development' && viteConfig.command === 'build' && viteConfig.mode !== 'development') {
     plugins.push(makeEnableSourceMapsPlugin(options));
     plugins.push(...(await makeCustomSentryVitePlugins(options)));
   }
diff --git a/packages/react-router/src/vite/types.ts b/packages/react-router/src/vite/types.ts
index fb488d2ca8bc..c7555630c4fa 100644
--- a/packages/react-router/src/vite/types.ts
+++ b/packages/react-router/src/vite/types.ts
@@ -1,3 +1,4 @@
+import type { BuildTimeOptionsBase, UnstableVitePluginOptions } from '@sentry/core';
 import type { SentryVitePluginOptions } from '@sentry/vite-plugin';
 
 type SourceMapsOptions = {
@@ -6,6 +7,7 @@ type SourceMapsOptions = {
    * automatically generate and upload source maps to Sentry during a production build.
    *
    * @default true
+   * @deprecated Use `sourcemaps.disable` option instead of `sourceMapsUploadOptions.enabled`.
    */
   enabled?: boolean;
 
@@ -16,6 +18,8 @@ type SourceMapsOptions = {
    * @default [] - By default no files are deleted.
    *
    * The globbing patterns follow the implementation of the glob package. (https://www.npmjs.com/package/glob)
+   *
+   * @deprecated Use `sourcemaps.filesToDeleteAfterUpload` option instead of `sourceMapsUploadOptions.filesToDeleteAfterUpload`.
    */
   filesToDeleteAfterUpload?: string | Array<string>;
 
@@ -23,7 +27,10 @@ type SourceMapsOptions = {
    * Options related to managing the Sentry releases for a build.
    *
    * More info: https://docs.sentry.io/product/releases/
+   *
+   * @deprecated Use the `release` option at the root of `SentryVitePluginOptions` instead.
    */
+  // todo(v11): Remove this option (currently it's not in use either, but it's kept to not cause a breaking change)
   release?: {
     /**
      * Unique identifier for the release you want to create.
@@ -40,136 +47,31 @@ type SourceMapsOptions = {
   };
 };
 
-type BundleSizeOptimizationOptions = {
-  /**
-   * If set to `true`, the plugin will attempt to tree-shake (remove) any debugging code within the Sentry SDK.
-   * Note that the success of this depends on tree shaking being enabled in your build tooling.
-   *
-   * Setting this option to `true` will disable features like the SDK's `debug` option.
-   */
-  excludeDebugStatements?: boolean;
-
-  /**
-   * If set to true, the plugin will try to tree-shake tracing statements out.
-   * Note that the success of this depends on tree shaking generally being enabled in your build.
-   * Attention: DO NOT enable this when you're using any performance monitoring-related SDK features (e.g. Sentry.startSpan()).
-   */
-  excludeTracing?: boolean;
-
-  /**
-   * If set to `true`, the plugin will attempt to tree-shake (remove) code related to the Sentry SDK's Session Replay Shadow DOM recording functionality.
-   * Note that the success of this depends on tree shaking being enabled in your build tooling.
-   *
-   * This option is safe to be used when you do not want to capture any Shadow DOM activity via Sentry Session Replay.
-   */
-  excludeReplayShadowDom?: boolean;
-
-  /**
-   * If set to `true`, the plugin will attempt to tree-shake (remove) code related to the Sentry SDK's Session Replay `iframe` recording functionality.
-   * Note that the success of this depends on tree shaking being enabled in your build tooling.
-   *
-   * You can safely do this when you do not want to capture any `iframe` activity via Sentry Session Replay.
-   */
-  excludeReplayIframe?: boolean;
-
-  /**
-   * If set to `true`, the plugin will attempt to tree-shake (remove) code related to the Sentry SDK's Session Replay's Compression Web Worker.
-   * Note that the success of this depends on tree shaking being enabled in your build tooling.
-   *
-   * **Notice:** You should only do use this option if you manually host a compression worker and configure it in your Sentry Session Replay integration config via the `workerUrl` option.
-   */
-  excludeReplayWorker?: boolean;
-};
-
-export type SentryReactRouterBuildOptions = {
-  /**
-   * Options for configuring the Sentry release.
-   */
-  release?: {
-    /**
-     * The name of the release to create in Sentry
-     */
-    name?: string;
-  };
-
-  /**
-   * The auth token to use when uploading source maps to Sentry.
-   *
-   * Instead of specifying this option, you can also set the `SENTRY_AUTH_TOKEN` environment variable.
-   *
-   * To create an auth token, follow this guide:
-   * @see https://docs.sentry.io/product/accounts/auth-tokens/#organization-auth-tokens
-   */
-  authToken?: string;
-
-  /**
-   * The organization slug of your Sentry organization.
-   * Instead of specifying this option, you can also set the `SENTRY_ORG` environment variable.
-   */
-  org?: string;
-
-  /**
-   * The project slug of your Sentry project.
-   * Instead of specifying this option, you can also set the `SENTRY_PROJECT` environment variable.
-   */
-  project?: string;
-
-  /**
-   * Options for the Sentry Vite plugin to customize bundle size optimizations.
-   */
-  bundleSizeOptimizations?: BundleSizeOptimizationOptions;
-
-  /**
-   * If this flag is `true`, Sentry will log debug information during build time.
-   * @default false.
-   */
-  debug?: boolean;
-
-  /**
-   * Options related to react component name annotations.
-   * Disabled by default, unless a value is set for this option.
-   * When enabled, your app's DOM will automatically be annotated during build-time with their respective component names.
-   * This will unlock the capability to search for Replays in Sentry by component name, as well as see component names in breadcrumbs and performance monitoring.
-   * Please note that this feature is not currently supported by the esbuild bundler plugins, and will only annotate React components
-   */
-  reactComponentAnnotation?: {
+export type SentryReactRouterBuildOptions = BuildTimeOptionsBase &
+  UnstableVitePluginOptions<Partial<SentryVitePluginOptions>> & {
     /**
-     * Whether the component name annotate plugin should be enabled or not.
+     * Options related to react component name annotations.
+     * Disabled by default, unless a value is set for this option.
+     * When enabled, your app's DOM will automatically be annotated during build-time with their respective component names.
+     * This will unlock the capability to search for Replays in Sentry by component name, as well as see component names in breadcrumbs and performance monitoring.
+     * Please note that this feature is not currently supported by the esbuild bundler plugins, and will only annotate React components
      */
-    enabled?: boolean;
+    reactComponentAnnotation?: {
+      /**
+       * Whether the component name annotate plugin should be enabled or not.
+       */
+      enabled?: boolean;
+
+      /**
+       * A list of strings representing the names of components to ignore. The plugin will not apply `data-sentry` annotations on the DOM element for these components.
+       */
+      ignoredComponents?: string[];
+    };
 
     /**
-     * A list of strings representing the names of components to ignore. The plugin will not apply `data-sentry` annotations on the DOM element for these components.
+     * Options for the Sentry Vite plugin to customize the source maps upload process.
+     *
      */
-    ignoredComponents?: string[];
+    sourceMapsUploadOptions?: SourceMapsOptions;
+    // todo(v11): Remove this option (all options already exist in BuildTimeOptionsBase)
   };
-
-  /**
-   * Options for the Sentry Vite plugin to customize the source maps upload process.
-   *
-   */
-  sourceMapsUploadOptions?: SourceMapsOptions;
-
-  /**
-   * If this flag is `true`, the Sentry plugin will collect some telemetry data and send it to Sentry.
-   * It will not collect any sensitive or user-specific data.
-   *
-   * @default true
-   */
-  telemetry?: boolean;
-
-  /**
-   * Options to further customize the Sentry Vite Plugin (@sentry/vite-plugin) behavior directly.
-   * Options specified in this object take precedence over the options specified in
-   * the `sourcemaps` and `release` objects.
-   *
-   * @see https://www.npmjs.com/package/@sentry/vite-plugin/v/2.22.2#options which lists all available options.
-   *
-   * Warning: Options within this object are subject to change at any time.
-   * We DO NOT guarantee semantic versioning for these options, meaning breaking
-   * changes can occur at any time within a major SDK version.
-   *
-   * Furthermore, some options are untested with SvelteKit specifically. Use with caution.
-   */
-  unstable_sentryVitePluginOptions?: Partial<SentryVitePluginOptions>;
-};
diff --git a/packages/react-router/test/client/tracingIntegration.test.ts b/packages/react-router/test/client/tracingIntegration.test.ts
index 9d511b4c6bde..2469c9b29db6 100644
--- a/packages/react-router/test/client/tracingIntegration.test.ts
+++ b/packages/react-router/test/client/tracingIntegration.test.ts
@@ -17,6 +17,7 @@ describe('reactRouterTracingIntegration', () => {
 
   it('calls instrumentHydratedRouter and browserTracingIntegrationInstance.afterAllSetup in afterAllSetup', () => {
     const browserTracingSpy = vi.spyOn(sentryBrowser, 'browserTracingIntegration').mockImplementation(() => ({
+      setup: vi.fn(),
       afterAllSetup: vi.fn(),
       name: 'BrowserTracing',
     }));
diff --git a/packages/react-router/test/server/createSentryHandleRequest.test.ts b/packages/react-router/test/server/createSentryHandleRequest.test.ts
index 19e6d9542cbb..f87de2f3b0ea 100644
--- a/packages/react-router/test/server/createSentryHandleRequest.test.ts
+++ b/packages/react-router/test/server/createSentryHandleRequest.test.ts
@@ -42,8 +42,13 @@ describe('createSentryHandleRequest', () => {
       url: '/test',
       version: '1.0.0',
     },
+    ssr: true,
+    routeDiscovery: {
+      mode: 'lazy',
+      manifestPath: '/path/to/manifest',
+    },
     routeModules: {},
-    future: {},
+    future: { unstable_subResourceIntegrity: false, v8_middleware: false },
     isSpaMode: false,
     staticHandlerContext: {
       matches: [
diff --git a/packages/react-router/test/server/instrumentation/reactRouterServer.test.ts b/packages/react-router/test/server/instrumentation/reactRouterServer.test.ts
index 473ad1272ca4..fb5141f8830d 100644
--- a/packages/react-router/test/server/instrumentation/reactRouterServer.test.ts
+++ b/packages/react-router/test/server/instrumentation/reactRouterServer.test.ts
@@ -88,10 +88,13 @@ describe('ReactRouterInstrumentation', () => {
 
   it('should start a span for data requests with active root span', async () => {
     vi.spyOn(Util, 'isDataRequest').mockReturnValue(true);
+    // @ts-expect-error MockSpan just for testing
     vi.spyOn(SentryCore, 'getActiveSpan').mockReturnValue(mockSpan as Span);
+    // @ts-expect-error MockSpan just for testing
     vi.spyOn(SentryCore, 'getRootSpan').mockReturnValue(mockSpan as Span);
     vi.spyOn(SentryCore, 'spanToJSON').mockReturnValue({ data: {} } as SpanJSON);
     vi.spyOn(Util, 'getSpanName').mockImplementation((pathname, method) => `span:${pathname}:${method}`);
+    // @ts-expect-error MockSpan just for testing
     vi.spyOn(SentryCore, 'startSpan').mockImplementation((_opts, fn) => fn(mockSpan as Span));
 
     const proxy = (instrumentation as any)._createPatchedModuleProxy(mockModule);
diff --git a/packages/react-router/test/vite/buildEnd/handleOnBuildEnd.test.ts b/packages/react-router/test/vite/buildEnd/handleOnBuildEnd.test.ts
index 29bb5c0527d6..8be1d7764219 100644
--- a/packages/react-router/test/vite/buildEnd/handleOnBuildEnd.test.ts
+++ b/packages/react-router/test/vite/buildEnd/handleOnBuildEnd.test.ts
@@ -81,6 +81,7 @@ describe('sentryOnBuildEnd', () => {
       } as unknown as TestConfig,
     };
 
+    // @ts-expect-error - mocking the React config
     await sentryOnBuildEnd(config);
 
     expect(mockSentryCliInstance.releases.new).toHaveBeenCalledWith('v1.0.0');
@@ -102,6 +103,7 @@ describe('sentryOnBuildEnd', () => {
       } as unknown as TestConfig,
     };
 
+    // @ts-expect-error - mocking the React config
     await sentryOnBuildEnd(config);
 
     expect(mockSentryCliInstance.releases.new).toHaveBeenCalledWith('v1.0.0-unstable');
@@ -126,6 +128,7 @@ describe('sentryOnBuildEnd', () => {
       } as unknown as TestConfig,
     };
 
+    // @ts-expect-error - mocking the React config
     await sentryOnBuildEnd(config);
 
     expect(mockSentryCliInstance.releases.new).toHaveBeenCalledWith('v1.0.0');
@@ -145,6 +148,7 @@ describe('sentryOnBuildEnd', () => {
       } as unknown as TestConfig,
     };
 
+    // @ts-expect-error - mocking the React config
     await sentryOnBuildEnd(config);
 
     expect(mockSentryCliInstance.releases.uploadSourceMaps).toHaveBeenCalledTimes(1);
@@ -168,12 +172,14 @@ describe('sentryOnBuildEnd', () => {
       } as unknown as TestConfig,
     };
 
+    // @ts-expect-error - mocking the React config
     await sentryOnBuildEnd(config);
 
     expect(mockSentryCliInstance.releases.uploadSourceMaps).not.toHaveBeenCalled();
   });
 
   it('should delete source maps after upload with default pattern', async () => {
+    // @ts-expect-error - mocking the React config
     await sentryOnBuildEnd(defaultConfig);
 
     expect(glob).toHaveBeenCalledWith(['/build/**/*.map'], {
@@ -196,6 +202,7 @@ describe('sentryOnBuildEnd', () => {
       } as unknown as TestConfig,
     };
 
+    // @ts-expect-error - mocking the React config
     await sentryOnBuildEnd(config);
 
     expect(glob).toHaveBeenCalledWith('/custom/**/*.map', {
@@ -221,6 +228,7 @@ describe('sentryOnBuildEnd', () => {
       } as unknown as TestConfig,
     };
 
+    // @ts-expect-error - mocking the React config
     await sentryOnBuildEnd(config);
 
     expect(consoleSpy).toHaveBeenCalledWith('[Sentry] Could not create release', expect.any(Error));
@@ -241,6 +249,7 @@ describe('sentryOnBuildEnd', () => {
       } as unknown as TestConfig,
     };
 
+    // @ts-expect-error - mocking the React config
     await sentryOnBuildEnd(config);
 
     expect(mockSentryCliInstance.execute).toHaveBeenCalledWith(['sourcemaps', 'inject', '/build'], false);
@@ -250,6 +259,7 @@ describe('sentryOnBuildEnd', () => {
     const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
     mockSentryCliInstance.execute.mockRejectedValueOnce(new Error('Injection failed'));
 
+    // @ts-expect-error - mocking the React config
     await sentryOnBuildEnd(defaultConfig);
     expect(mockSentryCliInstance.execute).toHaveBeenCalledTimes(1);
     expect(mockSentryCliInstance.execute).toHaveBeenCalledWith(['sourcemaps', 'inject', '/build'], false);
@@ -262,6 +272,7 @@ describe('sentryOnBuildEnd', () => {
     const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
     mockSentryCliInstance.releases.uploadSourceMaps.mockRejectedValueOnce(new Error('Upload failed'));
 
+    // @ts-expect-error - mocking the React config
     await sentryOnBuildEnd(defaultConfig);
 
     expect(consoleSpy).toHaveBeenCalledWith('[Sentry] Could not upload sourcemaps', expect.any(Error));
@@ -282,6 +293,7 @@ describe('sentryOnBuildEnd', () => {
       } as unknown as TestConfig,
     };
 
+    // @ts-expect-error - mocking the React config
     await sentryOnBuildEnd(config);
 
     expect(consoleSpy).toHaveBeenCalledWith(expect.stringContaining('[Sentry] Automatically setting'));
@@ -312,6 +324,7 @@ describe('sentryOnBuildEnd', () => {
       } as unknown as TestConfig,
     };
 
+    // @ts-expect-error - mocking the React config
     await sentryOnBuildEnd(config);
 
     expect(SentryCli).toHaveBeenCalledWith(null, expect.objectContaining(customOptions));
diff --git a/packages/react-router/test/vite/types.test-d.ts b/packages/react-router/test/vite/types.test-d.ts
new file mode 100644
index 000000000000..c6a50e92b275
--- /dev/null
+++ b/packages/react-router/test/vite/types.test-d.ts
@@ -0,0 +1,114 @@
+import { describe, expectTypeOf, it } from 'vitest';
+import type { SentryReactRouterBuildOptions } from '../../src/vite/types';
+
+describe('Sentry React-Router build-time options type', () => {
+  it('includes all options based on type BuildTimeOptionsBase', () => {
+    const completeOptions: SentryReactRouterBuildOptions = {
+      // --- BuildTimeOptionsBase options ---
+      org: 'test-org',
+      project: 'test-project',
+      authToken: 'test-auth-token',
+      sentryUrl: 'https://sentry.io',
+      headers: { Authorization: ' Bearer test-auth-token' },
+      telemetry: true,
+      silent: false,
+      // eslint-disable-next-line no-console
+      errorHandler: (err: Error) => console.warn(err),
+      debug: false,
+      sourcemaps: {
+        disable: false,
+        assets: ['./dist/**/*'],
+        ignore: ['./dist/*.map'],
+        filesToDeleteAfterUpload: ['./dist/*.map'],
+      },
+      release: {
+        name: 'test-release-1.0.0',
+        create: true,
+        finalize: true,
+        dist: 'test-dist',
+        vcsRemote: 'origin',
+        setCommits: {
+          auto: false,
+          repo: 'test/repo',
+          commit: 'abc123',
+          previousCommit: 'def456',
+          ignoreMissing: false,
+          ignoreEmpty: false,
+        },
+        deploy: {
+          env: 'production',
+          started: 1234567890,
+          finished: 1234567900,
+          time: 10,
+          name: 'deployment-name',
+          url: 'https://example.com',
+        },
+      },
+      bundleSizeOptimizations: {
+        excludeDebugStatements: true,
+        excludeTracing: false,
+        excludeReplayShadowDom: true,
+        excludeReplayIframe: true,
+        excludeReplayWorker: true,
+      },
+
+      // --- SentryReactRouterBuildOptions specific options ---
+      reactComponentAnnotation: { enabled: true, ignoredComponents: ['IgnoredComponent1', 'IgnoredComponent2'] },
+
+      unstable_sentryVitePluginOptions: {
+        // Rollup plugin options
+        bundleSizeOptimizations: {
+          excludeDebugStatements: true,
+        },
+        // Vite plugin options
+        sourcemaps: {
+          assets: './dist/**/*',
+        },
+      },
+    };
+
+    expectTypeOf(completeOptions).toEqualTypeOf<SentryReactRouterBuildOptions>();
+  });
+
+  it('includes all deprecated options', () => {
+    const completeOptions: SentryReactRouterBuildOptions = {
+      // SentryNuxtModuleOptions specific options
+      reactComponentAnnotation: { enabled: true, ignoredComponents: ['IgnoredComponent1', 'IgnoredComponent2'] },
+
+      unstable_sentryVitePluginOptions: {
+        // Rollup plugin options
+        bundleSizeOptimizations: {
+          excludeDebugStatements: true,
+        },
+        // Vite plugin options
+        sourcemaps: {
+          assets: './dist/**/*',
+        },
+      },
+
+      // Deprecated sourceMapsUploadOptions
+      sourceMapsUploadOptions: {
+        release: {
+          name: 'deprecated-release',
+        },
+        enabled: true,
+        filesToDeleteAfterUpload: ['./build/*.map'],
+      },
+    };
+
+    expectTypeOf(completeOptions).toEqualTypeOf<SentryReactRouterBuildOptions>();
+  });
+
+  it('allows partial configuration', () => {
+    const minimalOptions: SentryReactRouterBuildOptions = { reactComponentAnnotation: { enabled: true } };
+
+    expectTypeOf(minimalOptions).toEqualTypeOf<SentryReactRouterBuildOptions>();
+
+    const partialOptions: SentryReactRouterBuildOptions = {
+      reactComponentAnnotation: { enabled: true },
+      debug: false,
+    };
+
+    expectTypeOf(partialOptions).toEqualTypeOf<SentryReactRouterBuildOptions>();
+  });
+});
diff --git a/packages/react-router/tsconfig.test.json b/packages/react-router/tsconfig.test.json
index 508cf3ea381b..0bb16039ac48 100644
--- a/packages/react-router/tsconfig.test.json
+++ b/packages/react-router/tsconfig.test.json
@@ -1,7 +1,7 @@
 {
   "extends": "./tsconfig.json",
 
-  "include": ["test/**/*", "vite.config.ts"],
+  "include": ["test/**/*"],
 
   "compilerOptions": {
     "types": ["node"]
diff --git a/packages/react-router/tsconfig.vite.json b/packages/react-router/tsconfig.vite.json
new file mode 100644
index 000000000000..3e2d75a55e61
--- /dev/null
+++ b/packages/react-router/tsconfig.vite.json
@@ -0,0 +1,9 @@
+{
+  "extends": "./tsconfig.json",
+
+  "include": ["vite.config.ts"],
+
+  "compilerOptions": {
+    "types": ["node"]
+  }
+}
diff --git a/packages/react-router/vite.config.ts b/packages/react-router/vite.config.ts
index 1094fe0d79da..d05c71037c75 100644
--- a/packages/react-router/vite.config.ts
+++ b/packages/react-router/vite.config.ts
@@ -5,5 +5,9 @@ export default {
   test: {
     ...baseConfig.test,
     environment: 'jsdom',
+    typecheck: {
+      enabled: true,
+      tsconfig: './tsconfig.test.json',
+    },
   },
 };

From 2e78b06dc374d57228f08cfa764f3e08bcfbd1d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Peer=20St=C3=B6cklmair?= <jan.oster94@gmail.com>
Date: Fri, 24 Oct 2025 10:52:23 +0200
Subject: [PATCH 002/186] feat: Add a note to save changes before starting
 (#17987)

During the release I figured that most of the times you might work on
features/bugfixes. In that case the current release process this
scenario isn't specified and who knows what it might or might not do.

I added point 1. and 9. where we ask Cursor to save the changes (1) and
go back to the state it was before (9). This would make the release
process more complete.

---------

Co-authored-by: Charly Gomez <charly.gomez@sentry.io>
---
 .cursor/rules/publishing_release.mdc | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.cursor/rules/publishing_release.mdc b/.cursor/rules/publishing_release.mdc
index 4d6fecca5d2a..f50a5ea57f93 100644
--- a/.cursor/rules/publishing_release.mdc
+++ b/.cursor/rules/publishing_release.mdc
@@ -12,13 +12,18 @@ Use these guidelines when publishing a new Sentry JavaScript SDK release.
 
 The release process is outlined in [publishing-a-release.md](mdc:docs/publishing-a-release.md).
 
-1. Make sure you are on the latest version of the `develop` branch. To confirm this, run `git pull origin develop` to get the latest changes from the repo.
+1. Ensure you're on the `develop` branch with the latest changes:
+   - If you have unsaved changes, stash them with `git stash -u`.
+   - If you're on a different branch than `develop`, check out the develop branch using `git checkout develop`.
+   - Pull the latest updates from the remote repository by running `git pull origin develop`.
+
 2. Run `yarn changelog` on the `develop` branch and copy the output. You can use `yarn changelog | pbcopy` to copy the output of `yarn changelog` into your clipboard.
 3. Decide on a version for the release based on [semver](mdc:https://semver.org). The version should be decided based on what is in included in the release. For example, if the release includes a new feature, we should increment the minor version. If it includes only bug fixes, we should increment the patch version. You can find the latest version in [CHANGELOG.md](mdc:CHANGELOG.md) at the very top.
 4. Create a branch `prepare-release/VERSION`, eg. `prepare-release/8.1.0`, off `develop`.
-5. Update [CHANGELOG.md](mdc:CHANGELOG.md) to add an entry for the next release number and a list of changes since the last release from the output of `yarn changelog`. See the `Updating the Changelog` section in [publishing-a-release.md](mdc:docs/publishing-a-release.md) for more details. If you remove changelog entries because they are not applicable, please let the user know.
+5. Update [CHANGELOG.md](mdc:CHANGELOG.md) to add an entry for the next release number and a list of changes since the last release from the output of `yarn changelog`. See the `Updating the Changelog` section in [publishing-a-release.md](mdc:docs/publishing-a-release.md) for more details. Do not remove any changelog entries.
 6. Commit the changes to [CHANGELOG.md](mdc:CHANGELOG.md) with `meta(changelog): Update changelog for VERSION` where `VERSION` is the version of the release, e.g. `meta(changelog): Update changelog for 8.1.0`
 7. Push the `prepare-release/VERSION` branch to origin and remind the user that the release PR needs to be opened from the `master` branch.
+8. In case you were working on a different branch, you can checkout back to the branch you were working on and continue your work by unstashing the changes you stashed earlier with the command `git stash pop` (only if you stashed changes).
 
 ## Key Commands
 

From d29de56a1ba13af46e7f9ccb27c74097ce3b3806 Mon Sep 17 00:00:00 2001
From: HanSu Lee <i.hansu.lee@gmail.com>
Date: Fri, 24 Oct 2025 20:32:40 +0900
Subject: [PATCH 003/186] chore(aws-serverless): Fix typo in timeout warning
 function name (#18031)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

While exploring the Timeout Warning feature in `Sentry.wrapHandler`, I
fount a type in the function name.
It seems `setupTimeoutWarning` was intended name, so I've corrected it
accordingly.

## Changes
- Renamed `setupTimeoutWatning` → `setupTimeoutWarning`
- Updated all 3 call sites to use the corrected function name

## Checklist
- [x] Code lints successfully (`yarn lint`)
- [x] No new tests required (typo fix only, no functional changes)
---
 packages/aws-serverless/src/sdk.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/aws-serverless/src/sdk.ts b/packages/aws-serverless/src/sdk.ts
index b7ac8927813c..5b0100ae4460 100644
--- a/packages/aws-serverless/src/sdk.ts
+++ b/packages/aws-serverless/src/sdk.ts
@@ -108,7 +108,7 @@ function enhanceScopeWithEnvironmentData(scope: Scope, context: Context, startTi
   });
 }
 
-function setupTimeoutWatning(context: Context, options: WrapperOptions): NodeJS.Timeout | undefined {
+function setupTimeoutWarning(context: Context, options: WrapperOptions): NodeJS.Timeout | undefined {
   // In seconds. You cannot go any more granular than this in AWS Lambda.
   const configuredTimeout = Math.ceil(tryGetRemainingTimeInMillis(context) / 1000);
   const configuredTimeoutMinutes = Math.floor(configuredTimeout / 60);
@@ -220,7 +220,7 @@ export function wrapHandler<TEvent, TResult>(
   return async (event: TEvent, context: Context) => {
     context.callbackWaitsForEmptyEventLoop = options.callbackWaitsForEmptyEventLoop;
 
-    timeoutWarningTimer = setupTimeoutWatning(context, options);
+    timeoutWarningTimer = setupTimeoutWarning(context, options);
 
     async function processResult(): Promise<TResult> {
       const scope = getCurrentScope();
@@ -272,7 +272,7 @@ function wrapStreamingHandler<TEvent, TResult>(
   ): Promise<TResult> => {
     context.callbackWaitsForEmptyEventLoop = options.callbackWaitsForEmptyEventLoop;
 
-    timeoutWarningTimer = setupTimeoutWatning(context, options);
+    timeoutWarningTimer = setupTimeoutWarning(context, options);
 
     async function processStreamingResult(): Promise<TResult> {
       const scope = getCurrentScope();

From 749638766641b552e1193353c3f0430cf970787d Mon Sep 17 00:00:00 2001
From: Daniel Griesser <daniel.griesser.86@gmail.com>
Date: Fri, 24 Oct 2025 13:51:41 +0200
Subject: [PATCH 004/186] chore: Add external contributor to CHANGELOG.md
 (#18032)

This PR adds the external contributor to the CHANGELOG.md file, so that
they are credited for their contribution. See #18031

Co-authored-by: andreiborza <168741329+andreiborza@users.noreply.github.com>
---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d91a753f6544..5b3b35020083 100644
--- a/CHANGELOG.md
+++ b/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 @hanseo0507. Thank you for your contribution!
+
 ## 10.22.0
 
 ### Important Changes

From fe97d67a96d7e7611fe65301edb5c44b6d965924 Mon Sep 17 00:00:00 2001
From: Abdelrahman Awad <me@awad.dev>
Date: Fri, 24 Oct 2025 16:00:38 +0300
Subject: [PATCH 005/186] fix(nuxt): check for H3 error cause before
 re-capturing (#18035)

The flakey tests in nuxt-4 pointed out that we have a race condition
where a middleware error can bubble up as an H3 event error, which wraps
the original error we caught.

This means the
[`checkOrSetAlreadyCaught`](https://github.com/getsentry/sentry-javascript/blob/749638766641b552e1193353c3f0430cf970787d/packages/core/src/utils/misc.ts#L212-L232)
won't actually detect it since it doesn't check the [`.cause`
property](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error/cause).

I added the logic needed for that for the Nuxt SDK but feels like this
may come up later if it hadn't already.

Note that this does not affect the spans created, just the mechanism of
the caught error, the spans would still be marked correctly as errored.
---
 .../src/runtime/hooks/captureErrorHook.ts     |  11 ++
 .../runtime/hooks/captureErrorHook.test.ts    | 155 ++++++++++++++++++
 2 files changed, 166 insertions(+)
 create mode 100644 packages/nuxt/test/runtime/hooks/captureErrorHook.test.ts

diff --git a/packages/nuxt/src/runtime/hooks/captureErrorHook.ts b/packages/nuxt/src/runtime/hooks/captureErrorHook.ts
index 9c2bc1011277..b8e53f0ca0c3 100644
--- a/packages/nuxt/src/runtime/hooks/captureErrorHook.ts
+++ b/packages/nuxt/src/runtime/hooks/captureErrorHook.ts
@@ -25,6 +25,17 @@ export async function sentryCaptureErrorHook(error: Error, errorContext: Capture
     if (error.statusCode >= 300 && error.statusCode < 500) {
       return;
     }
+
+    // Check if the cause (original error) was already captured by middleware instrumentation
+    // H3 wraps errors, so we need to check the cause property
+    if (
+      'cause' in error &&
+      typeof error.cause === 'object' &&
+      error.cause !== null &&
+      '__sentry_captured__' in error.cause
+    ) {
+      return;
+    }
   }
 
   const { method, path } = {
diff --git a/packages/nuxt/test/runtime/hooks/captureErrorHook.test.ts b/packages/nuxt/test/runtime/hooks/captureErrorHook.test.ts
new file mode 100644
index 000000000000..30776c4d932c
--- /dev/null
+++ b/packages/nuxt/test/runtime/hooks/captureErrorHook.test.ts
@@ -0,0 +1,155 @@
+import * as SentryCore from '@sentry/core';
+import { H3Error } from 'h3';
+import type { CapturedErrorContext } from 'nitropack/types';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { sentryCaptureErrorHook } from '../../../src/runtime/hooks/captureErrorHook';
+
+vi.mock('@sentry/core', async importOriginal => {
+  const mod = await importOriginal();
+  return {
+    ...(mod as any),
+    captureException: vi.fn(),
+    flushIfServerless: vi.fn(),
+    getClient: vi.fn(),
+    getCurrentScope: vi.fn(() => ({
+      setTransactionName: vi.fn(),
+    })),
+  };
+});
+
+vi.mock('../../../src/runtime/utils', () => ({
+  extractErrorContext: vi.fn(() => ({ test: 'context' })),
+}));
+
+describe('sentryCaptureErrorHook', () => {
+  const mockErrorContext: CapturedErrorContext = {
+    event: {
+      _method: 'GET',
+      _path: '/test-path',
+    } as any,
+  };
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+    (SentryCore.getClient as any).mockReturnValue({
+      getOptions: () => ({}),
+    });
+    (SentryCore.flushIfServerless as any).mockResolvedValue(undefined);
+  });
+
+  it('should capture regular errors', async () => {
+    const error = new Error('Test error');
+
+    await sentryCaptureErrorHook(error, mockErrorContext);
+
+    expect(SentryCore.captureException).toHaveBeenCalledWith(
+      error,
+      expect.objectContaining({
+        mechanism: { handled: false, type: 'auto.function.nuxt.nitro' },
+      }),
+    );
+  });
+
+  it('should skip H3Error with 4xx status codes', async () => {
+    const error = new H3Error('Not found');
+    error.statusCode = 404;
+
+    await sentryCaptureErrorHook(error, mockErrorContext);
+
+    expect(SentryCore.captureException).not.toHaveBeenCalled();
+  });
+
+  it('should skip H3Error with 3xx status codes', async () => {
+    const error = new H3Error('Redirect');
+    error.statusCode = 302;
+
+    await sentryCaptureErrorHook(error, mockErrorContext);
+
+    expect(SentryCore.captureException).not.toHaveBeenCalled();
+  });
+
+  it('should capture H3Error with 5xx status codes', async () => {
+    const error = new H3Error('Server error');
+    error.statusCode = 500;
+
+    await sentryCaptureErrorHook(error, mockErrorContext);
+
+    expect(SentryCore.captureException).toHaveBeenCalledWith(
+      error,
+      expect.objectContaining({
+        mechanism: { handled: false, type: 'auto.function.nuxt.nitro' },
+      }),
+    );
+  });
+
+  it('should skip H3Error when cause has __sentry_captured__ flag', async () => {
+    const originalError = new Error('Original error');
+    // Mark the original error as already captured by middleware
+    Object.defineProperty(originalError, '__sentry_captured__', {
+      value: true,
+      enumerable: false,
+    });
+
+    const h3Error = new H3Error('Wrapped error', { cause: originalError });
+    h3Error.statusCode = 500;
+
+    await sentryCaptureErrorHook(h3Error, mockErrorContext);
+
+    expect(SentryCore.captureException).not.toHaveBeenCalled();
+  });
+
+  it('should capture H3Error when cause does not have __sentry_captured__ flag', async () => {
+    const originalError = new Error('Original error');
+    const h3Error = new H3Error('Wrapped error', { cause: originalError });
+    h3Error.statusCode = 500;
+
+    await sentryCaptureErrorHook(h3Error, mockErrorContext);
+
+    expect(SentryCore.captureException).toHaveBeenCalledWith(
+      h3Error,
+      expect.objectContaining({
+        mechanism: { handled: false, type: 'auto.function.nuxt.nitro' },
+      }),
+    );
+  });
+
+  it('should capture H3Error when cause is not an object', async () => {
+    const h3Error = new H3Error('Error with string cause', { cause: 'string cause' });
+    h3Error.statusCode = 500;
+
+    await sentryCaptureErrorHook(h3Error, mockErrorContext);
+
+    expect(SentryCore.captureException).toHaveBeenCalledWith(
+      h3Error,
+      expect.objectContaining({
+        mechanism: { handled: false, type: 'auto.function.nuxt.nitro' },
+      }),
+    );
+  });
+
+  it('should capture H3Error when there is no cause', async () => {
+    const h3Error = new H3Error('Error without cause');
+    h3Error.statusCode = 500;
+
+    await sentryCaptureErrorHook(h3Error, mockErrorContext);
+
+    expect(SentryCore.captureException).toHaveBeenCalledWith(
+      h3Error,
+      expect.objectContaining({
+        mechanism: { handled: false, type: 'auto.function.nuxt.nitro' },
+      }),
+    );
+  });
+
+  it('should skip when enableNitroErrorHandler is false', async () => {
+    (SentryCore.getClient as any).mockReturnValue({
+      getOptions: () => ({ enableNitroErrorHandler: false }),
+    });
+
+    const error = new Error('Test error');
+
+    await sentryCaptureErrorHook(error, mockErrorContext);
+
+    expect(SentryCore.captureException).not.toHaveBeenCalled();
+  });
+});

From 14888ab451a140d3aa2c8428388eb03d4781c9b3 Mon Sep 17 00:00:00 2001
From: Kev <6111995+k-fish@users.noreply.github.com>
Date: Tue, 28 Oct 2025 08:16:13 -0400
Subject: [PATCH 006/186] fix(tracemetrics): Bump metrics buffer to 1k (#18039)

---
 packages/core/src/metrics/internal.ts           | 2 +-
 packages/core/test/lib/metrics/internal.test.ts | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/core/src/metrics/internal.ts b/packages/core/src/metrics/internal.ts
index 676814f4d4e6..efa204cac5a3 100644
--- a/packages/core/src/metrics/internal.ts
+++ b/packages/core/src/metrics/internal.ts
@@ -12,7 +12,7 @@ import { timestampInSeconds } from '../utils/time';
 import { _getTraceInfoFromScope } from '../utils/trace-info';
 import { createMetricEnvelope } from './envelope';
 
-const MAX_METRIC_BUFFER_SIZE = 100;
+const MAX_METRIC_BUFFER_SIZE = 1000;
 
 /**
  * Converts a metric attribute to a serialized metric attribute.
diff --git a/packages/core/test/lib/metrics/internal.test.ts b/packages/core/test/lib/metrics/internal.test.ts
index bb2ddcc413c3..c0279c9a270b 100644
--- a/packages/core/test/lib/metrics/internal.test.ts
+++ b/packages/core/test/lib/metrics/internal.test.ts
@@ -249,12 +249,12 @@ describe('_INTERNAL_captureMetric', () => {
     const scope = new Scope();
     scope.setClient(client);
 
-    // Fill the buffer to max size (100 is the MAX_METRIC_BUFFER_SIZE constant)
-    for (let i = 0; i < 100; i++) {
+    // Fill the buffer to max size (1000 is the MAX_METRIC_BUFFER_SIZE constant)
+    for (let i = 0; i < 1000; i++) {
       _INTERNAL_captureMetric({ type: 'counter', name: `metric.${i}`, value: i }, { scope });
     }
 
-    expect(_INTERNAL_getMetricBuffer(client)).toHaveLength(100);
+    expect(_INTERNAL_getMetricBuffer(client)).toHaveLength(1000);
 
     // Add one more to trigger flush
     _INTERNAL_captureMetric({ type: 'counter', name: 'trigger.flush', value: 999 }, { scope });

From e35ca9dd0e5cf4025b1b54912b3a8aaee6dd22c3 Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Tue, 28 Oct 2025 13:52:32 +0100
Subject: [PATCH 007/186] feat(core): Send `user-agent` header with envelope
 requests in server SDKs (#17929)

As a follow-up of an incident, SDKs were asked to send a `user-agent` Http header to
determine by just looking at incoming request headers which SDK the
request is coming from. See [develop
specification](https://develop.sentry.dev/sdk/overview/#user-agent).

This PR makes the following changes to sending user agent HTTP headers
with envelope requests made by the transport:

- Send `user-agent` in all server-runtime SDKs
- Extract the `headers` option from individual transport options to
`BaseTransportOptions`. This allows us to type-safely add the user agent
header to the SDKs transport options which is the easiest way to pass a
header to the transport without having to modify or extend any of the
existing transport APIs. I checked and every transport implementation we
currently export exposed a `headers` option anyway, so this just unifies
it. Given this is an optional property, custom transport implementations
extending `BaseTransportOptions` won't break either. The problem here is
only that they might not actually support this option which all things
considered I think is fine. If reviewers have different opinions, I'm
happy to revisit this.
- Unit and integration/e2e tests for node and cloudflare
---
 .size-limit.js                                |  2 +-
 .../cloudflare-workers/tests/index.test.ts    | 15 ++++++++-
 .../node-express/tests/misc.test.ts           | 15 +++++++++
 .../test-utils/src/event-proxy-server.ts      |  2 ++
 packages/browser/src/transports/types.ts      |  2 --
 packages/bun/src/transports/index.ts          |  7 +---
 packages/bun/src/types.ts                     |  7 ++--
 packages/cloudflare/src/transport.ts          |  2 --
 packages/core/src/server-runtime-client.ts    |  3 ++
 packages/core/src/transports/userAgent.ts     | 22 +++++++++++++
 packages/core/src/types-hoist/transport.ts    |  5 +++
 .../test/lib/server-runtime-client.test.ts    | 33 ++++++++++++++++++-
 packages/deno/src/transports/index.ts         |  7 +---
 packages/deno/src/types.ts                    |  7 ++--
 packages/node-core/src/transports/http.ts     |  2 --
 packages/node-core/test/sdk/client.test.ts    |  5 +++
 packages/node/test/sdk/client.test.ts         |  5 +++
 packages/vercel-edge/src/transports/index.ts  |  2 --
 18 files changed, 112 insertions(+), 31 deletions(-)
 create mode 100644 dev-packages/e2e-tests/test-applications/node-express/tests/misc.test.ts
 create mode 100644 packages/core/src/transports/userAgent.ts

diff --git a/.size-limit.js b/.size-limit.js
index 7106f2e29b03..ed7fbc7ccc80 100644
--- a/.size-limit.js
+++ b/.size-limit.js
@@ -157,7 +157,7 @@ module.exports = [
     name: 'CDN Bundle',
     path: createCDNPath('bundle.min.js'),
     gzip: true,
-    limit: '27 KB',
+    limit: '27.5 KB',
   },
   {
     name: 'CDN Bundle (incl. Tracing)',
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-workers/tests/index.test.ts b/dev-packages/e2e-tests/test-applications/cloudflare-workers/tests/index.test.ts
index ad63c1a0d307..8c09693c81ed 100644
--- a/dev-packages/e2e-tests/test-applications/cloudflare-workers/tests/index.test.ts
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-workers/tests/index.test.ts
@@ -1,5 +1,6 @@
 import { expect, test } from '@playwright/test';
-import { waitForError } from '@sentry-internal/test-utils';
+import { waitForError, waitForRequest } from '@sentry-internal/test-utils';
+import { SDK_VERSION } from '@sentry/cloudflare';
 import { WebSocket } from 'ws';
 
 test('Index page', async ({ baseURL }) => {
@@ -69,3 +70,15 @@ test('Websocket.webSocketClose', async ({ baseURL }) => {
   expect(event.exception?.values?.[0]?.value).toBe('Should be recorded in Sentry: webSocketClose');
   expect(event.exception?.values?.[0]?.mechanism?.type).toBe('auto.faas.cloudflare.durable_object');
 });
+
+test('sends user-agent header with SDK name and version in envelope requests', async ({ baseURL }) => {
+  const requestPromise = waitForRequest('cloudflare-workers', () => true);
+
+  await fetch(`${baseURL}/throwException`);
+
+  const request = await requestPromise;
+
+  expect(request.rawProxyRequestHeaders).toMatchObject({
+    'user-agent': `sentry.javascript.cloudflare/${SDK_VERSION}`,
+  });
+});
diff --git a/dev-packages/e2e-tests/test-applications/node-express/tests/misc.test.ts b/dev-packages/e2e-tests/test-applications/node-express/tests/misc.test.ts
new file mode 100644
index 000000000000..427c70b6fa21
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/node-express/tests/misc.test.ts
@@ -0,0 +1,15 @@
+import { expect, test } from '@playwright/test';
+import { waitForRequest } from '@sentry-internal/test-utils';
+import { SDK_VERSION } from '@sentry/node';
+
+test('sends user-agent header with SDK name and version in envelope requests', async ({ baseURL }) => {
+  const requestPromise = waitForRequest('node-express', () => true);
+
+  await fetch(`${baseURL}/test-exception/123`);
+
+  const request = await requestPromise;
+
+  expect(request.rawProxyRequestHeaders).toMatchObject({
+    'user-agent': `sentry.javascript.node/${SDK_VERSION}`,
+  });
+});
diff --git a/dev-packages/test-utils/src/event-proxy-server.ts b/dev-packages/test-utils/src/event-proxy-server.ts
index 0becf5a743f2..08fa39db950f 100644
--- a/dev-packages/test-utils/src/event-proxy-server.ts
+++ b/dev-packages/test-utils/src/event-proxy-server.ts
@@ -24,6 +24,7 @@ interface EventProxyServerOptions {
 interface SentryRequestCallbackData {
   envelope: Envelope;
   rawProxyRequestBody: string;
+  rawProxyRequestHeaders: Record<string, string | string[] | undefined>;
   rawSentryResponseBody: string;
   sentryResponseStatusCode?: number;
 }
@@ -182,6 +183,7 @@ export async function startEventProxyServer(options: EventProxyServerOptions): P
     const data: SentryRequestCallbackData = {
       envelope: parseEnvelope(proxyRequestBody),
       rawProxyRequestBody: proxyRequestBody,
+      rawProxyRequestHeaders: proxyRequest.headers,
       rawSentryResponseBody: '',
       sentryResponseStatusCode: 200,
     };
diff --git a/packages/browser/src/transports/types.ts b/packages/browser/src/transports/types.ts
index fd8c4a93fdd6..a304e9f93d66 100644
--- a/packages/browser/src/transports/types.ts
+++ b/packages/browser/src/transports/types.ts
@@ -3,6 +3,4 @@ import type { BaseTransportOptions } from '@sentry/core';
 export interface BrowserTransportOptions extends BaseTransportOptions {
   /** Fetch API init parameters. Used by the FetchTransport */
   fetchOptions?: RequestInit;
-  /** Custom headers for the transport. Used by the XHRTransport and FetchTransport */
-  headers?: { [key: string]: string };
 }
diff --git a/packages/bun/src/transports/index.ts b/packages/bun/src/transports/index.ts
index 7a27846548b3..20df5bb4b521 100644
--- a/packages/bun/src/transports/index.ts
+++ b/packages/bun/src/transports/index.ts
@@ -1,15 +1,10 @@
 import type { BaseTransportOptions, Transport, TransportMakeRequestResponse, TransportRequest } from '@sentry/core';
 import { createTransport, suppressTracing } from '@sentry/core';
 
-export interface BunTransportOptions extends BaseTransportOptions {
-  /** Custom headers for the transport. Used by the XHRTransport and FetchTransport */
-  headers?: { [key: string]: string };
-}
-
 /**
  * Creates a Transport that uses the Fetch API to send events to Sentry.
  */
-export function makeFetchTransport(options: BunTransportOptions): Transport {
+export function makeFetchTransport(options: BaseTransportOptions): Transport {
   function makeRequest(request: TransportRequest): PromiseLike<TransportMakeRequestResponse> {
     const requestOptions: RequestInit = {
       body: request.body,
diff --git a/packages/bun/src/types.ts b/packages/bun/src/types.ts
index 755eb3e48a0a..afec75d1ee8d 100644
--- a/packages/bun/src/types.ts
+++ b/packages/bun/src/types.ts
@@ -1,5 +1,4 @@
-import type { ClientOptions, Options, TracePropagationTargets } from '@sentry/core';
-import type { BunTransportOptions } from './transports';
+import type { BaseTransportOptions, ClientOptions, Options, TracePropagationTargets } from '@sentry/core';
 
 export interface BaseBunOptions {
   /**
@@ -43,10 +42,10 @@ export interface BaseBunOptions {
  * Configuration options for the Sentry Bun SDK
  * @see @sentry/core Options for more information.
  */
-export interface BunOptions extends Options<BunTransportOptions>, BaseBunOptions {}
+export interface BunOptions extends Options<BaseTransportOptions>, BaseBunOptions {}
 
 /**
  * Configuration options for the Sentry Bun SDK Client class
  * @see BunClient for more information.
  */
-export interface BunClientOptions extends ClientOptions<BunTransportOptions>, BaseBunOptions {}
+export interface BunClientOptions extends ClientOptions<BaseTransportOptions>, BaseBunOptions {}
diff --git a/packages/cloudflare/src/transport.ts b/packages/cloudflare/src/transport.ts
index 2ac401505fbb..eee54bd7a790 100644
--- a/packages/cloudflare/src/transport.ts
+++ b/packages/cloudflare/src/transport.ts
@@ -4,8 +4,6 @@ import { createTransport, SENTRY_BUFFER_FULL_ERROR, suppressTracing } from '@sen
 export interface CloudflareTransportOptions extends BaseTransportOptions {
   /** Fetch API init parameters. */
   fetchOptions?: RequestInit;
-  /** Custom headers for the transport. */
-  headers?: { [key: string]: string };
 }
 
 const DEFAULT_TRANSPORT_BUFFER_SIZE = 30;
diff --git a/packages/core/src/server-runtime-client.ts b/packages/core/src/server-runtime-client.ts
index 9d037eb3b7c3..988e642d0a27 100644
--- a/packages/core/src/server-runtime-client.ts
+++ b/packages/core/src/server-runtime-client.ts
@@ -4,6 +4,7 @@ import { getIsolationScope } from './currentScopes';
 import { DEBUG_BUILD } from './debug-build';
 import type { Scope } from './scope';
 import { registerSpanErrorInstrumentation } from './tracing';
+import { addUserAgentToTransportHeaders } from './transports/userAgent';
 import type { CheckIn, MonitorConfig, SerializedCheckIn } from './types-hoist/checkin';
 import type { Event, EventHint } from './types-hoist/event';
 import type { ClientOptions } from './types-hoist/options';
@@ -36,6 +37,8 @@ export class ServerRuntimeClient<
     // Server clients always support tracing
     registerSpanErrorInstrumentation();
 
+    addUserAgentToTransportHeaders(options);
+
     super(options);
   }
 
diff --git a/packages/core/src/transports/userAgent.ts b/packages/core/src/transports/userAgent.ts
new file mode 100644
index 000000000000..5508640a855c
--- /dev/null
+++ b/packages/core/src/transports/userAgent.ts
@@ -0,0 +1,22 @@
+import type { ClientOptions } from '../types-hoist/options';
+
+/**
+ * Takes the SDK metadata and adds the user-agent header to the transport options.
+ * This ensures that the SDK sends the user-agent header with SDK name and version to
+ * all requests made by the transport.
+ *
+ * @see https://develop.sentry.dev/sdk/overview/#user-agent
+ */
+export function addUserAgentToTransportHeaders(options: ClientOptions): void {
+  const sdkMetadata = options._metadata?.sdk;
+  const sdkUserAgent =
+    sdkMetadata?.name && sdkMetadata?.version ? `${sdkMetadata?.name}/${sdkMetadata?.version}` : undefined;
+
+  options.transportOptions = {
+    ...options.transportOptions,
+    headers: {
+      ...(sdkUserAgent && { 'user-agent': sdkUserAgent }),
+      ...options.transportOptions?.headers,
+    },
+  };
+}
diff --git a/packages/core/src/types-hoist/transport.ts b/packages/core/src/types-hoist/transport.ts
index 8e0035c93137..320ed98b00e4 100644
--- a/packages/core/src/types-hoist/transport.ts
+++ b/packages/core/src/types-hoist/transport.ts
@@ -30,6 +30,11 @@ export interface BaseTransportOptions extends InternalBaseTransportOptions {
   // transport does not care about dsn specific - client should take care of
   // parsing and figuring that out
   url: string;
+
+  /**
+   * Custom HTTP headers to be added to requests made by the transport.
+   */
+  headers?: { [key: string]: string };
 }
 
 export interface Transport {
diff --git a/packages/core/test/lib/server-runtime-client.test.ts b/packages/core/test/lib/server-runtime-client.test.ts
index 525ee514c1a2..3c5fe874af9f 100644
--- a/packages/core/test/lib/server-runtime-client.test.ts
+++ b/packages/core/test/lib/server-runtime-client.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it, test, vi } from 'vitest';
-import { createTransport, Scope } from '../../src';
+import { applySdkMetadata, createTransport, Scope } from '../../src';
 import type { ServerRuntimeClientOptions } from '../../src/server-runtime-client';
 import { ServerRuntimeClient } from '../../src/server-runtime-client';
 import type { Event, EventHint } from '../../src/types-hoist/event';
@@ -205,4 +205,35 @@ describe('ServerRuntimeClient', () => {
       ]);
     });
   });
+
+  describe('user-agent header', () => {
+    it('sends user-agent header with SDK name and version', () => {
+      const options = getDefaultClientOptions({ dsn: PUBLIC_DSN });
+
+      // this is done in all `init` functions of the respective SDKs:
+      applySdkMetadata(options, 'core');
+
+      client = new ServerRuntimeClient(options);
+
+      expect(client.getOptions().transportOptions?.headers).toEqual({
+        'user-agent': 'sentry.javascript.core/0.0.0-unknown.0',
+      });
+    });
+
+    it('prefers user-passed headers (including user-agent)', () => {
+      const options = getDefaultClientOptions({
+        dsn: PUBLIC_DSN,
+        transportOptions: { headers: { 'x-custom-header': 'custom-value', 'user-agent': 'custom-user-agent' } },
+      });
+
+      applySdkMetadata(options, 'core');
+
+      client = new ServerRuntimeClient(options);
+
+      expect(client.getOptions().transportOptions?.headers).toEqual({
+        'user-agent': 'custom-user-agent',
+        'x-custom-header': 'custom-value',
+      });
+    });
+  });
 });
diff --git a/packages/deno/src/transports/index.ts b/packages/deno/src/transports/index.ts
index c5b6594b1c4d..521011fea6b8 100644
--- a/packages/deno/src/transports/index.ts
+++ b/packages/deno/src/transports/index.ts
@@ -1,15 +1,10 @@
 import type { BaseTransportOptions, Transport, TransportMakeRequestResponse, TransportRequest } from '@sentry/core';
 import { consoleSandbox, createTransport, debug, suppressTracing } from '@sentry/core';
 
-export interface DenoTransportOptions extends BaseTransportOptions {
-  /** Custom headers for the transport. Used by the XHRTransport and FetchTransport */
-  headers?: { [key: string]: string };
-}
-
 /**
  * Creates a Transport that uses the Fetch API to send events to Sentry.
  */
-export function makeFetchTransport(options: DenoTransportOptions): Transport {
+export function makeFetchTransport(options: BaseTransportOptions): Transport {
   const url = new URL(options.url);
 
   Deno.permissions
diff --git a/packages/deno/src/types.ts b/packages/deno/src/types.ts
index 1659e7a635e1..69eee4ae6313 100644
--- a/packages/deno/src/types.ts
+++ b/packages/deno/src/types.ts
@@ -1,5 +1,4 @@
-import type { ClientOptions, Options, TracePropagationTargets } from '@sentry/core';
-import type { DenoTransportOptions } from './transports';
+import type { BaseTransportOptions, ClientOptions, Options, TracePropagationTargets } from '@sentry/core';
 
 export interface BaseDenoOptions {
   /**
@@ -44,10 +43,10 @@ export interface BaseDenoOptions {
  * Configuration options for the Sentry Deno SDK
  * @see @sentry/core Options for more information.
  */
-export interface DenoOptions extends Options<DenoTransportOptions>, BaseDenoOptions {}
+export interface DenoOptions extends Options<BaseTransportOptions>, BaseDenoOptions {}
 
 /**
  * Configuration options for the Sentry Deno SDK Client class
  * @see DenoClient for more information.
  */
-export interface DenoClientOptions extends ClientOptions<DenoTransportOptions>, BaseDenoOptions {}
+export interface DenoClientOptions extends ClientOptions<BaseTransportOptions>, BaseDenoOptions {}
diff --git a/packages/node-core/src/transports/http.ts b/packages/node-core/src/transports/http.ts
index 49897dfa22b1..3319353aff14 100644
--- a/packages/node-core/src/transports/http.ts
+++ b/packages/node-core/src/transports/http.ts
@@ -14,8 +14,6 @@ import { HttpsProxyAgent } from '../proxy';
 import type { HTTPModule } from './http-module';
 
 export interface NodeTransportOptions extends BaseTransportOptions {
-  /** Define custom headers */
-  headers?: Record<string, string>;
   /** Set a proxy that should be used for outbound requests. */
   proxy?: string;
   /** HTTPS proxy CA certificates */
diff --git a/packages/node-core/test/sdk/client.test.ts b/packages/node-core/test/sdk/client.test.ts
index 01623f49f0a3..0bcef2669095 100644
--- a/packages/node-core/test/sdk/client.test.ts
+++ b/packages/node-core/test/sdk/client.test.ts
@@ -32,6 +32,11 @@ describe('NodeClient', () => {
       dsn: expect.any(String),
       integrations: [],
       transport: options.transport,
+      transportOptions: {
+        headers: {
+          'user-agent': `sentry.javascript.node/${SDK_VERSION}`,
+        },
+      },
       stackParser: options.stackParser,
       _metadata: {
         sdk: {
diff --git a/packages/node/test/sdk/client.test.ts b/packages/node/test/sdk/client.test.ts
index 7f57d4772212..ff58698a7931 100644
--- a/packages/node/test/sdk/client.test.ts
+++ b/packages/node/test/sdk/client.test.ts
@@ -31,6 +31,11 @@ describe('NodeClient', () => {
       dsn: expect.any(String),
       integrations: [],
       transport: options.transport,
+      transportOptions: {
+        headers: {
+          'user-agent': `sentry.javascript.node/${SDK_VERSION}`,
+        },
+      },
       stackParser: options.stackParser,
       _metadata: {
         sdk: {
diff --git a/packages/vercel-edge/src/transports/index.ts b/packages/vercel-edge/src/transports/index.ts
index bb8ea807764c..668fb6a4c236 100644
--- a/packages/vercel-edge/src/transports/index.ts
+++ b/packages/vercel-edge/src/transports/index.ts
@@ -4,8 +4,6 @@ import { createTransport, SENTRY_BUFFER_FULL_ERROR, suppressTracing } from '@sen
 export interface VercelEdgeTransportOptions extends BaseTransportOptions {
   /** Fetch API init parameters. */
   fetchOptions?: RequestInit;
-  /** Custom headers for the transport. */
-  headers?: { [key: string]: string };
 }
 
 const DEFAULT_TRANSPORT_BUFFER_SIZE = 30;

From 0e15b3decd3903844211f30eb02632903030692e Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad <aprasad@sentry.io>
Date: Tue, 28 Oct 2025 12:58:06 -0400
Subject: [PATCH 008/186] chore(browser): upgrade fake-indexeddb to v6 (#17975)

changelog:
https://github.com/dumbmatter/fakeIndexedDB/blob/master/CHANGELOG.md

removes a structured clone polyfill, which is fine because we are node
18+ in the SDK. This helps reduce dep count in `yarn.lock`.
---
 packages/browser/package.json |  2 +-
 yarn.lock                     | 73 +++--------------------------------
 2 files changed, 6 insertions(+), 69 deletions(-)

diff --git a/packages/browser/package.json b/packages/browser/package.json
index 2f18a2573c8b..b6f2fa570ce1 100644
--- a/packages/browser/package.json
+++ b/packages/browser/package.json
@@ -47,7 +47,7 @@
   },
   "devDependencies": {
     "@sentry-internal/integration-shims": "10.22.0",
-    "fake-indexeddb": "^4.0.1"
+    "fake-indexeddb": "^6.2.4"
   },
   "scripts": {
     "build": "run-p build:transpile build:bundle build:types",
diff --git a/yarn.lock b/yarn.lock
index 06f8d3741128..0142b73605c8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11447,11 +11447,6 @@ bare-stream@^2.6.4:
   dependencies:
     streamx "^2.21.0"
 
-base64-arraybuffer-es6@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/base64-arraybuffer-es6/-/base64-arraybuffer-es6-0.7.0.tgz#dbe1e6c87b1bf1ca2875904461a7de40f21abc86"
-  integrity sha512-ESyU/U1CFZDJUdr+neHRhNozeCv72Y7Vm0m1DCbjX3KBjT6eYocvAJlSk6+8+HkVwXlT1FNxhGW6q3UKAlCvvw==
-
 base64-arraybuffer@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz#1c37589a7c4b0746e34bd1feb951da2df01c1bdc"
@@ -14501,13 +14496,6 @@ domelementtype@^2.0.1, domelementtype@^2.2.0, domelementtype@^2.3.0:
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
   integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
 
-domexception@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90"
-  integrity sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==
-  dependencies:
-    webidl-conversions "^4.0.2"
-
 domexception@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/domexception/-/domexception-4.0.0.tgz#4ad1be56ccadc86fc76d033353999a8037d03673"
@@ -16720,12 +16708,10 @@ extract-zip@^2.0.1:
   optionalDependencies:
     "@types/yauzl" "^2.9.1"
 
-fake-indexeddb@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/fake-indexeddb/-/fake-indexeddb-4.0.2.tgz#e7a884158fa576e00f03e973b9874619947013e4"
-  integrity sha512-SdTwEhnakbgazc7W3WUXOJfGmhH0YfG4d+dRPOFoYDRTL6U5t8tvrmkf2W/C3W1jk2ylV7Wrnj44RASqpX/lEw==
-  dependencies:
-    realistic-structured-clone "^3.0.0"
+fake-indexeddb@^6.2.4:
+  version "6.2.4"
+  resolved "https://registry.yarnpkg.com/fake-indexeddb/-/fake-indexeddb-6.2.4.tgz#cf3860b6b37ddc3b33e7840be00a61ed094486a5"
+  integrity sha512-INKeIKEtSViN4yVtEWEUqbsqmaIy7Ls+MfU0yxQVXg67pOJ/sH1ZxcVrP8XrKULUFohcPD9gnmym+qBfEybACw==
 
 fast-check@^3.23.1:
   version "3.23.2"
@@ -21093,7 +21079,7 @@ lodash.uniq@^4.2.0, lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0, lodash@~4.17.21:
+lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@~4.17.21:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -26302,15 +26288,6 @@ real-require@^0.2.0:
   resolved "https://registry.yarnpkg.com/real-require/-/real-require-0.2.0.tgz#209632dea1810be2ae063a6ac084fee7e33fba78"
   integrity sha512-57frrGM/OCTLqLOAh0mhVA9VBMHd+9U7Zb2THMGdBUoZVOtGbJzjxsYGDJ3A9AYYCP4hn6y1TVbaOfzWtm5GFg==
 
-realistic-structured-clone@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/realistic-structured-clone/-/realistic-structured-clone-3.0.0.tgz#7b518049ce2dad41ac32b421cd297075b00e3e35"
-  integrity sha512-rOjh4nuWkAqf9PWu6JVpOWD4ndI+JHfgiZeMmujYcPi+fvILUu7g6l26TC1K5aBIp34nV+jE1cDO75EKOfHC5Q==
-  dependencies:
-    domexception "^1.0.1"
-    typeson "^6.1.0"
-    typeson-registry "^1.0.0-alpha.20"
-
 recast@0.23.11, recast@^0.23.4:
   version "0.23.11"
   resolved "https://registry.yarnpkg.com/recast/-/recast-0.23.11.tgz#8885570bb28cf773ba1dc600da7f502f7883f73f"
@@ -29432,13 +29409,6 @@ tough-cookie@^4.1.2:
     universalify "^0.2.0"
     url-parse "^1.5.3"
 
-tr46@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240"
-  integrity sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==
-  dependencies:
-    punycode "^2.1.1"
-
 tr46@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-4.1.1.tgz#281a758dcc82aeb4fe38c7dfe4d11a395aac8469"
@@ -29787,20 +29757,6 @@ typescript@~5.8.0:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.8.3.tgz#92f8a3e5e3cf497356f4178c34cd65a7f5e8440e"
   integrity sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==
 
-typeson-registry@^1.0.0-alpha.20:
-  version "1.0.0-alpha.39"
-  resolved "https://registry.yarnpkg.com/typeson-registry/-/typeson-registry-1.0.0-alpha.39.tgz#9e0f5aabd5eebfcffd65a796487541196f4b1211"
-  integrity sha512-NeGDEquhw+yfwNhguLPcZ9Oj0fzbADiX4R0WxvoY8nGhy98IbzQy1sezjoEFWOywOboj/DWehI+/aUlRVrJnnw==
-  dependencies:
-    base64-arraybuffer-es6 "^0.7.0"
-    typeson "^6.0.0"
-    whatwg-url "^8.4.0"
-
-typeson@^6.0.0, typeson@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/typeson/-/typeson-6.1.0.tgz#5b2a53705a5f58ff4d6f82f965917cabd0d7448b"
-  integrity sha512-6FTtyGr8ldU0pfbvW/eOZrEtEkczHRUtduBnA90Jh9kMPCiFNnXIon3vF41N0S4tV1HHQt4Hk1j4srpESziCaA==
-
 ua-parser-js@^0.7.18:
   version "0.7.33"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.33.tgz#1d04acb4ccef9293df6f70f2c3d22f3030d8b532"
@@ -31115,16 +31071,6 @@ webidl-conversions@^3.0.0:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
   integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
 
-webidl-conversions@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
-  integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
-
-webidl-conversions@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
-  integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
-
 webidl-conversions@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a"
@@ -31379,15 +31325,6 @@ whatwg-url@^5.0.0:
     tr46 "~0.0.3"
     webidl-conversions "^3.0.0"
 
-whatwg-url@^8.4.0:
-  version "8.7.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77"
-  integrity sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==
-  dependencies:
-    lodash "^4.7.0"
-    tr46 "^2.1.0"
-    webidl-conversions "^6.1.0"
-
 which-boxed-primitive@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"

From 993303c935bde04b11a1f081f2981a0684176ab8 Mon Sep 17 00:00:00 2001
From: Billy Vong <billyvg@users.noreply.github.com>
Date: Tue, 28 Oct 2025 16:24:04 -0400
Subject: [PATCH 009/186] fix(replay): Linked errors not resetting session id
 (#17854)

This PR fixes a case where we [correctly] tag an error event w/ replay
id, but something occurs where the replay event does not end up being
flushed. This means the existing session is still in a buffered state,
and will keep its session id until a new error event is sampled and a
replay is created. When this does happen, we can have a replay with a
super long duration (e.g. the time between the two error replays).

We now update the session immediately when we tag an error event w/
replay id so that if the replay event does not successfully flush, the
session will respect its expiration date.
---
 .../replay/bufferStalledRequests/init.js      |  18 ++
 .../replay/bufferStalledRequests/subject.js   |  11 +
 .../bufferStalledRequests/template.html       |  11 +
 .../replay/bufferStalledRequests/test.ts      | 270 ++++++++++++++++++
 .../src/coreHandlers/handleGlobalEvent.ts     |  15 +
 packages/replay-internal/src/replay.ts        |   1 +
 .../replay-internal/src/session/Session.ts    |   2 +
 packages/replay-internal/src/types/replay.ts  |   7 +
 .../src/util/handleRecordingEmit.ts           |   2 +-
 .../test/integration/errorSampleRate.test.ts  |  23 +-
 .../test/unit/session/fetchSession.test.ts    |   4 +-
 .../unit/session/loadOrCreateSession.test.ts  |   9 +-
 12 files changed, 369 insertions(+), 4 deletions(-)
 create mode 100644 dev-packages/browser-integration-tests/suites/replay/bufferStalledRequests/init.js
 create mode 100644 dev-packages/browser-integration-tests/suites/replay/bufferStalledRequests/subject.js
 create mode 100644 dev-packages/browser-integration-tests/suites/replay/bufferStalledRequests/template.html
 create mode 100644 dev-packages/browser-integration-tests/suites/replay/bufferStalledRequests/test.ts

diff --git a/dev-packages/browser-integration-tests/suites/replay/bufferStalledRequests/init.js b/dev-packages/browser-integration-tests/suites/replay/bufferStalledRequests/init.js
new file mode 100644
index 000000000000..f9dccbffb530
--- /dev/null
+++ b/dev-packages/browser-integration-tests/suites/replay/bufferStalledRequests/init.js
@@ -0,0 +1,18 @@
+import * as Sentry from '@sentry/browser';
+
+window.Sentry = Sentry;
+window.Replay = Sentry.replayIntegration({
+  flushMinDelay: 200,
+  flushMaxDelay: 200,
+  minReplayDuration: 0,
+  stickySession: true,
+});
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  sampleRate: 1,
+  replaysSessionSampleRate: 0.0,
+  replaysOnErrorSampleRate: 1.0,
+
+  integrations: [window.Replay],
+});
diff --git a/dev-packages/browser-integration-tests/suites/replay/bufferStalledRequests/subject.js b/dev-packages/browser-integration-tests/suites/replay/bufferStalledRequests/subject.js
new file mode 100644
index 000000000000..1c9b22455261
--- /dev/null
+++ b/dev-packages/browser-integration-tests/suites/replay/bufferStalledRequests/subject.js
@@ -0,0 +1,11 @@
+document.getElementById('error1').addEventListener('click', () => {
+  throw new Error('First Error');
+});
+
+document.getElementById('error2').addEventListener('click', () => {
+  throw new Error('Second Error');
+});
+
+document.getElementById('click').addEventListener('click', () => {
+  // Just a click for interaction
+});
diff --git a/dev-packages/browser-integration-tests/suites/replay/bufferStalledRequests/template.html b/dev-packages/browser-integration-tests/suites/replay/bufferStalledRequests/template.html
new file mode 100644
index 000000000000..1beb4b281b28
--- /dev/null
+++ b/dev-packages/browser-integration-tests/suites/replay/bufferStalledRequests/template.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+  </head>
+  <body>
+    <button id="error1">Throw First Error</button>
+    <button id="error2">Throw Second Error</button>
+    <button id="click">Click me</button>
+  </body>
+</html>
diff --git a/dev-packages/browser-integration-tests/suites/replay/bufferStalledRequests/test.ts b/dev-packages/browser-integration-tests/suites/replay/bufferStalledRequests/test.ts
new file mode 100644
index 000000000000..11154caaaa8b
--- /dev/null
+++ b/dev-packages/browser-integration-tests/suites/replay/bufferStalledRequests/test.ts
@@ -0,0 +1,270 @@
+import { expect } from '@playwright/test';
+import { sentryTest } from '../../../utils/fixtures';
+import { envelopeRequestParser, waitForErrorRequest } from '../../../utils/helpers';
+import {
+  getReplaySnapshot,
+  isReplayEvent,
+  shouldSkipReplayTest,
+  waitForReplayRunning,
+} from '../../../utils/replayHelpers';
+
+sentryTest(
+  'buffer mode remains after interrupting error event ingest',
+  async ({ getLocalTestUrl, page, browserName }) => {
+    if (shouldSkipReplayTest() || browserName === 'webkit') {
+      sentryTest.skip();
+    }
+
+    let errorCount = 0;
+    let replayCount = 0;
+    const errorEventIds: string[] = [];
+    const replayIds: string[] = [];
+    let firstReplayEventResolved: (value?: unknown) => void = () => {};
+    // Need TS 5.7 for withResolvers
+    const firstReplayEventPromise = new Promise(resolve => {
+      firstReplayEventResolved = resolve;
+    });
+
+    const url = await getLocalTestUrl({ testDir: __dirname, skipDsnRouteHandler: true });
+
+    await page.route('https://dsn.ingest.sentry.io/**/*', async route => {
+      const event = envelopeRequestParser(route.request());
+
+      // Track error events
+      if (event && !event.type && event.event_id) {
+        errorCount++;
+        errorEventIds.push(event.event_id);
+        if (event.tags?.replayId) {
+          replayIds.push(event.tags.replayId as string);
+
+          if (errorCount === 1) {
+            firstReplayEventResolved();
+            // intentional so that it never resolves, we'll force a reload instead to interrupt the normal flow
+            await new Promise(resolve => setTimeout(resolve, 100000));
+          }
+        }
+      }
+
+      // Track replay events and simulate failure for the first replay
+      if (event && isReplayEvent(event)) {
+        replayCount++;
+      }
+
+      // Success for other requests
+      return route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ id: 'test-id' }),
+      });
+    });
+
+    await page.goto(url);
+
+    // Wait for replay to initialize
+    await waitForReplayRunning(page);
+
+    waitForErrorRequest(page);
+    await page.locator('#error1').click();
+
+    // This resolves, but the route doesn't get fulfilled as we want the reload to "interrupt" this flow
+    await firstReplayEventPromise;
+    expect(errorCount).toBe(1);
+    expect(replayCount).toBe(0);
+    expect(replayIds).toHaveLength(1);
+
+    const firstSession = await getReplaySnapshot(page);
+    const firstSessionId = firstSession.session?.id;
+    expect(firstSessionId).toBeDefined();
+    expect(firstSession.session?.sampled).toBe('buffer');
+    expect(firstSession.session?.dirty).toBe(true);
+    expect(firstSession.recordingMode).toBe('buffer');
+
+    await page.reload();
+    const secondSession = await getReplaySnapshot(page);
+    expect(secondSession.session?.sampled).toBe('buffer');
+    expect(secondSession.session?.dirty).toBe(true);
+    expect(secondSession.recordingMode).toBe('buffer');
+    expect(secondSession.session?.id).toBe(firstSessionId);
+    expect(secondSession.session?.segmentId).toBe(0);
+  },
+);
+
+sentryTest('buffer mode remains after interrupting replay flush', async ({ getLocalTestUrl, page, browserName }) => {
+  if (shouldSkipReplayTest() || browserName === 'webkit') {
+    sentryTest.skip();
+  }
+
+  let errorCount = 0;
+  let replayCount = 0;
+  const errorEventIds: string[] = [];
+  const replayIds: string[] = [];
+  let firstReplayEventResolved: (value?: unknown) => void = () => {};
+  // Need TS 5.7 for withResolvers
+  const firstReplayEventPromise = new Promise(resolve => {
+    firstReplayEventResolved = resolve;
+  });
+
+  const url = await getLocalTestUrl({ testDir: __dirname, skipDsnRouteHandler: true });
+
+  await page.route('https://dsn.ingest.sentry.io/**/*', async route => {
+    const event = envelopeRequestParser(route.request());
+
+    // Track error events
+    if (event && !event.type && event.event_id) {
+      errorCount++;
+      errorEventIds.push(event.event_id);
+      if (event.tags?.replayId) {
+        replayIds.push(event.tags.replayId as string);
+      }
+    }
+
+    // Track replay events and simulate failure for the first replay
+    if (event && isReplayEvent(event)) {
+      replayCount++;
+      if (replayCount === 1) {
+        firstReplayEventResolved();
+        // intentional so that it never resolves, we'll force a reload instead to interrupt the normal flow
+        await new Promise(resolve => setTimeout(resolve, 100000));
+      }
+    }
+
+    // Success for other requests
+    return route.fulfill({
+      status: 200,
+      contentType: 'application/json',
+      body: JSON.stringify({ id: 'test-id' }),
+    });
+  });
+
+  await page.goto(url);
+
+  // Wait for replay to initialize
+  await waitForReplayRunning(page);
+
+  await page.locator('#error1').click();
+  await firstReplayEventPromise;
+  expect(errorCount).toBe(1);
+  expect(replayCount).toBe(1);
+  expect(replayIds).toHaveLength(1);
+
+  // Get the first session info
+  const firstSession = await getReplaySnapshot(page);
+  const firstSessionId = firstSession.session?.id;
+  expect(firstSessionId).toBeDefined();
+  expect(firstSession.session?.sampled).toBe('buffer');
+  expect(firstSession.session?.dirty).toBe(true);
+  expect(firstSession.recordingMode).toBe('buffer'); // But still in buffer mode
+
+  await page.reload();
+  await waitForReplayRunning(page);
+  const secondSession = await getReplaySnapshot(page);
+  expect(secondSession.session?.sampled).toBe('buffer');
+  expect(secondSession.session?.dirty).toBe(true);
+  expect(secondSession.session?.id).toBe(firstSessionId);
+  expect(secondSession.session?.segmentId).toBe(1);
+  // Because a flush attempt was made and not allowed to complete, segmentId increased from 0,
+  // so we resume in session mode
+  expect(secondSession.recordingMode).toBe('session');
+});
+
+sentryTest(
+  'starts a new session after interrupting replay flush and session "expires"',
+  async ({ getLocalTestUrl, page, browserName }) => {
+    if (shouldSkipReplayTest() || browserName === 'webkit') {
+      sentryTest.skip();
+    }
+
+    let errorCount = 0;
+    let replayCount = 0;
+    const errorEventIds: string[] = [];
+    const replayIds: string[] = [];
+    let firstReplayEventResolved: (value?: unknown) => void = () => {};
+    // Need TS 5.7 for withResolvers
+    const firstReplayEventPromise = new Promise(resolve => {
+      firstReplayEventResolved = resolve;
+    });
+
+    const url = await getLocalTestUrl({ testDir: __dirname, skipDsnRouteHandler: true });
+
+    await page.route('https://dsn.ingest.sentry.io/**/*', async route => {
+      const event = envelopeRequestParser(route.request());
+
+      // Track error events
+      if (event && !event.type && event.event_id) {
+        errorCount++;
+        errorEventIds.push(event.event_id);
+        if (event.tags?.replayId) {
+          replayIds.push(event.tags.replayId as string);
+        }
+      }
+
+      // Track replay events and simulate failure for the first replay
+      if (event && isReplayEvent(event)) {
+        replayCount++;
+        if (replayCount === 1) {
+          firstReplayEventResolved();
+          // intentional so that it never resolves, we'll force a reload instead to interrupt the normal flow
+          await new Promise(resolve => setTimeout(resolve, 100000));
+        }
+      }
+
+      // Success for other requests
+      return route.fulfill({
+        status: 200,
+        contentType: 'application/json',
+        body: JSON.stringify({ id: 'test-id' }),
+      });
+    });
+
+    await page.goto(url);
+
+    // Wait for replay to initialize
+    await waitForReplayRunning(page);
+
+    // Trigger first error - this should change session sampled to "session"
+    await page.locator('#error1').click();
+    await firstReplayEventPromise;
+    expect(errorCount).toBe(1);
+    expect(replayCount).toBe(1);
+    expect(replayIds).toHaveLength(1);
+
+    // Get the first session info
+    const firstSession = await getReplaySnapshot(page);
+    const firstSessionId = firstSession.session?.id;
+    expect(firstSessionId).toBeDefined();
+    expect(firstSession.session?.sampled).toBe('buffer');
+    expect(firstSession.session?.dirty).toBe(true);
+    expect(firstSession.recordingMode).toBe('buffer'); // But still in buffer mode
+
+    // Now expire the session by manipulating session storage
+    // Simulate session expiry by setting lastActivity to a time in the past
+    await page.evaluate(() => {
+      const replayIntegration = (window as any).Replay;
+      const replay = replayIntegration['_replay'];
+
+      // Set session as expired (15 minutes ago)
+      if (replay.session) {
+        const fifteenMinutesAgo = Date.now() - 15 * 60 * 1000;
+        replay.session.lastActivity = fifteenMinutesAgo;
+        replay.session.started = fifteenMinutesAgo;
+
+        // Also update session storage if sticky sessions are enabled
+        const sessionKey = 'sentryReplaySession';
+        const sessionData = sessionStorage.getItem(sessionKey);
+        if (sessionData) {
+          const session = JSON.parse(sessionData);
+          session.lastActivity = fifteenMinutesAgo;
+          session.started = fifteenMinutesAgo;
+          sessionStorage.setItem(sessionKey, JSON.stringify(session));
+        }
+      }
+    });
+
+    await page.reload();
+    const secondSession = await getReplaySnapshot(page);
+    expect(secondSession.session?.sampled).toBe('buffer');
+    expect(secondSession.recordingMode).toBe('buffer');
+    expect(secondSession.session?.id).not.toBe(firstSessionId);
+    expect(secondSession.session?.segmentId).toBe(0);
+  },
+);
diff --git a/packages/replay-internal/src/coreHandlers/handleGlobalEvent.ts b/packages/replay-internal/src/coreHandlers/handleGlobalEvent.ts
index 55559c0d4c01..b28d4547265e 100644
--- a/packages/replay-internal/src/coreHandlers/handleGlobalEvent.ts
+++ b/packages/replay-internal/src/coreHandlers/handleGlobalEvent.ts
@@ -1,5 +1,6 @@
 import type { Event, EventHint } from '@sentry/core';
 import { DEBUG_BUILD } from '../debug-build';
+import { saveSession } from '../session/saveSession';
 import type { ReplayContainer } from '../types';
 import { isErrorEvent, isFeedbackEvent, isReplayEvent, isTransactionEvent } from '../util/eventUtils';
 import { isRrwebError } from '../util/isRrwebError';
@@ -69,6 +70,20 @@ export function handleGlobalEventListener(replay: ReplayContainer): (event: Even
         event.tags = { ...event.tags, replayId: replay.getSessionId() };
       }
 
+      // If we sampled this error in buffer mode, immediately mark the session as "sampled"
+      // by changing the sampled state from 'buffer' to 'session'. Otherwise, if the application is interrupte
+      // before `afterSendEvent` occurs, then the session would remain as "buffer" but we have an error event
+      // that is tagged with a replay id. This could end up creating replays w/ excessive durations because
+      // of the linked error.
+      if (isErrorEventSampled && replay.recordingMode === 'buffer' && replay.session?.sampled === 'buffer') {
+        const session = replay.session;
+        session.dirty = true;
+        // Save the session if sticky sessions are enabled to persist the state change
+        if (replay.getOptions().stickySession) {
+          saveSession(session);
+        }
+      }
+
       return event;
     },
     { id: 'Replay' },
diff --git a/packages/replay-internal/src/replay.ts b/packages/replay-internal/src/replay.ts
index 61676f790b4d..49e8ce092edd 100644
--- a/packages/replay-internal/src/replay.ts
+++ b/packages/replay-internal/src/replay.ts
@@ -606,6 +606,7 @@ export class ReplayContainer implements ReplayContainerInterface {
 
     // Once this session ends, we do not want to refresh it
     if (this.session) {
+      this.session.dirty = false;
       this._updateUserActivity(activityTime);
       this._updateSessionActivity(activityTime);
       this._maybeSaveSession();
diff --git a/packages/replay-internal/src/session/Session.ts b/packages/replay-internal/src/session/Session.ts
index 554f625cc8e9..59e6b09ed43c 100644
--- a/packages/replay-internal/src/session/Session.ts
+++ b/packages/replay-internal/src/session/Session.ts
@@ -13,6 +13,7 @@ export function makeSession(session: Partial<Session> & { sampled: Sampled }): S
   const segmentId = session.segmentId || 0;
   const sampled = session.sampled;
   const previousSessionId = session.previousSessionId;
+  const dirty = session.dirty || false;
 
   return {
     id,
@@ -21,5 +22,6 @@ export function makeSession(session: Partial<Session> & { sampled: Sampled }): S
     segmentId,
     sampled,
     previousSessionId,
+    dirty,
   };
 }
diff --git a/packages/replay-internal/src/types/replay.ts b/packages/replay-internal/src/types/replay.ts
index 1e7891a84e76..a2c84d6c4bbe 100644
--- a/packages/replay-internal/src/types/replay.ts
+++ b/packages/replay-internal/src/types/replay.ts
@@ -383,6 +383,13 @@ export interface Session {
    * Is the session sampled? `false` if not sampled, otherwise, `session` or `buffer`
    */
   sampled: Sampled;
+
+  /**
+   * Session is dirty when its id has been linked to an event (e.g. error event).
+   * This is helpful when a session is mistakenly stuck in "buffer" mode (e.g. network issues preventing it from being converted to "session" mode).
+   * The dirty flag is used to prevent updating the session start time to the earliest event in the buffer so that it can be refreshed if it's been expired.
+   */
+  dirty?: boolean;
 }
 
 export type EventBufferType = 'sync' | 'worker';
diff --git a/packages/replay-internal/src/util/handleRecordingEmit.ts b/packages/replay-internal/src/util/handleRecordingEmit.ts
index 0ae87601637b..aeb49f0cd259 100644
--- a/packages/replay-internal/src/util/handleRecordingEmit.ts
+++ b/packages/replay-internal/src/util/handleRecordingEmit.ts
@@ -72,7 +72,7 @@ export function getHandleRecordingEmit(replay: ReplayContainer): RecordingEmitCa
 
       // When in buffer mode, make sure we adjust the session started date to the current earliest event of the buffer
       // this should usually be the timestamp of the checkout event, but to be safe...
-      if (replay.recordingMode === 'buffer' && session && replay.eventBuffer) {
+      if (replay.recordingMode === 'buffer' && session && replay.eventBuffer && !session.dirty) {
         const earliestEvent = replay.eventBuffer.getEarliestTimestamp();
         if (earliestEvent) {
           DEBUG_BUILD &&
diff --git a/packages/replay-internal/test/integration/errorSampleRate.test.ts b/packages/replay-internal/test/integration/errorSampleRate.test.ts
index f79e393df7e3..b49882b72034 100644
--- a/packages/replay-internal/test/integration/errorSampleRate.test.ts
+++ b/packages/replay-internal/test/integration/errorSampleRate.test.ts
@@ -80,8 +80,21 @@ describe('Integration | errorSampleRate', () => {
 
       captureException(new Error('testing'));
 
+      // session gets immediately marked as dirty since error will
+      // be linked to current session (replay) id. there's a possibility
+      // that replay never gets flushed so we must mark as dirty so we
+      // know to refresh session in the future.
+      expect(replay.recordingMode).toBe('buffer');
+      expect(replay.session?.dirty).toBe(true);
+
+      await vi.advanceTimersToNextTimerAsync();
+      // need 2nd tick to wait for `saveSession` to complete in `handleGlobalEvents
       await vi.advanceTimersToNextTimerAsync();
 
+      // dirty gets reset after replay is flushed
+      expect(replay.recordingMode).toBe('session');
+      expect(replay.session?.dirty).toBe(false);
+
       expect(replay).toHaveLastSentReplay({
         recordingPayloadHeader: { segment_id: 0 },
         replayEventPayload: expect.objectContaining({
@@ -158,6 +171,7 @@ describe('Integration | errorSampleRate', () => {
           segmentId: 0,
           sampled: 'buffer',
           previousSessionId: 'previoussessionid',
+          dirty: false,
         }),
       }));
 
@@ -179,6 +193,8 @@ describe('Integration | errorSampleRate', () => {
 
       captureException(new Error('testing'));
       await vi.advanceTimersToNextTimerAsync();
+      // need 2nd tick to wait for `saveSession` to complete in `handleGlobalEvents
+      await vi.advanceTimersToNextTimerAsync();
 
       // Converts to session mode
       expect(replay.recordingMode).toBe('session');
@@ -508,6 +524,8 @@ describe('Integration | errorSampleRate', () => {
 
       captureException(new Error('testing'));
 
+      await vi.advanceTimersToNextTimerAsync();
+      // need 2nd tick to wait for `saveSession` to complete in `handleGlobalEvents
       await vi.advanceTimersToNextTimerAsync();
 
       expect(replay).toHaveLastSentReplay({
@@ -604,6 +622,8 @@ describe('Integration | errorSampleRate', () => {
       // should still react to errors later on
       captureException(new Error('testing'));
 
+      await vi.advanceTimersToNextTimerAsync();
+      // need 2nd tick to wait for `saveSession` to complete in `handleGlobalEvents
       await vi.advanceTimersToNextTimerAsync();
 
       expect(replay.session?.id).toBe(oldSessionId);
@@ -739,7 +759,8 @@ describe('Integration | errorSampleRate', () => {
       captureException(new Error('testing'));
 
       await vi.advanceTimersToNextTimerAsync();
-      // await vi.advanceTimersToNextTimerAsync();
+      // need 2nd tick to wait for `saveSession` to complete in `handleGlobalEvents
+      await vi.advanceTimersToNextTimerAsync();
 
       // This is still the timestamp from the full snapshot we took earlier
       expect(replay.session?.started).toBe(BASE_TIMESTAMP + ELAPSED);
diff --git a/packages/replay-internal/test/unit/session/fetchSession.test.ts b/packages/replay-internal/test/unit/session/fetchSession.test.ts
index 46f0f05f5c9a..9dee5cb5cee0 100644
--- a/packages/replay-internal/test/unit/session/fetchSession.test.ts
+++ b/packages/replay-internal/test/unit/session/fetchSession.test.ts
@@ -28,6 +28,7 @@ describe('Unit | session | fetchSession', () => {
     );
 
     expect(fetchSession()).toEqual({
+      dirty: false,
       id: 'fd09adfc4117477abc8de643e5a5798a',
       lastActivity: 1648827162658,
       segmentId: 0,
@@ -39,10 +40,11 @@ describe('Unit | session | fetchSession', () => {
   it('fetches an unsampled session', function () {
     WINDOW.sessionStorage.setItem(
       REPLAY_SESSION_KEY,
-      '{"id":"fd09adfc4117477abc8de643e5a5798a","sampled": false,"started":1648827162630,"lastActivity":1648827162658}',
+      '{"id":"fd09adfc4117477abc8de643e5a5798a","sampled": false,"started":1648827162630,"lastActivity":1648827162658,"dirty":true}',
     );
 
     expect(fetchSession()).toEqual({
+      dirty: true,
       id: 'fd09adfc4117477abc8de643e5a5798a',
       lastActivity: 1648827162658,
       segmentId: 0,
diff --git a/packages/replay-internal/test/unit/session/loadOrCreateSession.test.ts b/packages/replay-internal/test/unit/session/loadOrCreateSession.test.ts
index 273d401a7afc..dee44638344b 100644
--- a/packages/replay-internal/test/unit/session/loadOrCreateSession.test.ts
+++ b/packages/replay-internal/test/unit/session/loadOrCreateSession.test.ts
@@ -77,6 +77,7 @@ describe('Unit | session | loadOrCreateSession', () => {
         lastActivity: expect.any(Number),
         sampled: 'session',
         started: expect.any(Number),
+        dirty: false,
       });
 
       // Should not have anything in storage
@@ -104,6 +105,7 @@ describe('Unit | session | loadOrCreateSession', () => {
         lastActivity: expect.any(Number),
         sampled: 'session',
         started: expect.any(Number),
+        dirty: false,
       });
 
       // Should not have anything in storage
@@ -129,10 +131,10 @@ describe('Unit | session | loadOrCreateSession', () => {
         sampled: 'session',
         started: expect.any(Number),
         previousSessionId: 'previous_session_id',
+        dirty: false,
       });
     });
   });
-
   describe('stickySession: true', () => {
     it('creates new session if none exists', function () {
       const session = loadOrCreateSession(
@@ -151,6 +153,7 @@ describe('Unit | session | loadOrCreateSession', () => {
         lastActivity: expect.any(Number),
         sampled: 'session',
         started: expect.any(Number),
+        dirty: false,
       };
       expect(session).toEqual(expectedSession);
 
@@ -181,6 +184,7 @@ describe('Unit | session | loadOrCreateSession', () => {
         sampled: 'session',
         started: expect.any(Number),
         previousSessionId: 'test_old_session_uuid',
+        dirty: false,
       };
       expect(session).toEqual(expectedSession);
       expect(session.lastActivity).toBeGreaterThanOrEqual(now);
@@ -209,6 +213,7 @@ describe('Unit | session | loadOrCreateSession', () => {
         lastActivity: date,
         sampled: 'session',
         started: date,
+        dirty: false,
       });
     });
 
@@ -250,6 +255,7 @@ describe('Unit | session | loadOrCreateSession', () => {
         sampled: 'session',
         started: expect.any(Number),
         previousSessionId: 'previous_session_id',
+        dirty: false,
       };
       expect(session).toEqual(expectedSession);
 
@@ -347,6 +353,7 @@ describe('Unit | session | loadOrCreateSession', () => {
         segmentId: 0,
         lastActivity: expect.any(Number),
         sampled: false,
+        dirty: false,
         started: expect.any(Number),
       };
       expect(session).toEqual(expectedSession);

From f7295093e11884ee738964ad6818336d04842c50 Mon Sep 17 00:00:00 2001
From: Sigrid Huemer <32902192+s1gr1d@users.noreply.github.com>
Date: Wed, 29 Oct 2025 10:32:10 +0100
Subject: [PATCH 010/186] test(browser): Add test for INP target name after
 navigation or DOM changes (#18033)

This test displays the current behavior of getting the element target
name for INP when the DOM changes after clicking on a navigation link.

When the DOM changes after clicking on an element, the element name from
before the navigation is not captured:
```js
description: '<unknown>', // FIXME: currently unable to get the target name when element is removed from DOM
```
---
 .../metrics/web-vitals-inp-navigate/init.js   |  27 +++
 .../web-vitals-inp-navigate/subject.js        |  44 +++++
 .../web-vitals-inp-navigate/template.html     |  16 ++
 .../metrics/web-vitals-inp-navigate/test.ts   | 174 ++++++++++++++++++
 4 files changed, 261 insertions(+)
 create mode 100644 dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-navigate/init.js
 create mode 100644 dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-navigate/subject.js
 create mode 100644 dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-navigate/template.html
 create mode 100644 dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-navigate/test.ts

diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-navigate/init.js b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-navigate/init.js
new file mode 100644
index 000000000000..1044a4b68bda
--- /dev/null
+++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-navigate/init.js
@@ -0,0 +1,27 @@
+import * as Sentry from '@sentry/browser';
+
+window.Sentry = Sentry;
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  integrations: [
+    Sentry.browserTracingIntegration({
+      idleTimeout: 1000,
+      enableLongTask: false,
+      enableInp: true,
+      instrumentPageLoad: false,
+      instrumentNavigation: false,
+    }),
+  ],
+  tracesSampleRate: 1,
+});
+
+const client = Sentry.getClient();
+
+// Force page load transaction name to a testable value
+Sentry.startBrowserTracingPageLoadSpan(client, {
+  name: 'test-url',
+  attributes: {
+    [Sentry.SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
+  },
+});
diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-navigate/subject.js b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-navigate/subject.js
new file mode 100644
index 000000000000..730caa3b381e
--- /dev/null
+++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-navigate/subject.js
@@ -0,0 +1,44 @@
+const simulateNavigationKeepDOM = e => {
+  const startTime = Date.now();
+
+  function getElapsed() {
+    const time = Date.now();
+    return time - startTime;
+  }
+
+  while (getElapsed() < 100) {
+    // Block UI for 100ms to simulate some processing work during navigation
+  }
+
+  const contentDiv = document.getElementById('content');
+  contentDiv.innerHTML = '<h1>Page 1</h1><p>Successfully navigated!</p>';
+
+  contentDiv.classList.add('navigated');
+};
+
+const simulateNavigationChangeDOM = e => {
+  const startTime = Date.now();
+
+  function getElapsed() {
+    const time = Date.now();
+    return time - startTime;
+  }
+
+  while (getElapsed() < 100) {
+    // Block UI for 100ms to simulate some processing work during navigation
+  }
+
+  const navigationHTML =
+    '    <nav id="navigation">\n' +
+    '      <a href="#page1" data-test-id="nav-link-keepDOM" data-sentry-element="NavigationLink">Go to Page 1</a>\n' +
+    '      <a href="#page2" data-test-id="nav-link-changeDOM" data-sentry-element="NavigationLink">Go to Page 2</a>\n' +
+    '    </nav>';
+
+  const body = document.querySelector('body');
+  body.innerHTML = `${navigationHTML}<div id="content"><h1>Page 2</h1><p>Successfully navigated!</p></div>`;
+
+  body.classList.add('navigated');
+};
+
+document.querySelector('[data-test-id=nav-link-keepDOM]').addEventListener('click', simulateNavigationKeepDOM);
+document.querySelector('[data-test-id=nav-link-changeDOM]').addEventListener('click', simulateNavigationChangeDOM);
diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-navigate/template.html b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-navigate/template.html
new file mode 100644
index 000000000000..de677aa9a838
--- /dev/null
+++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-navigate/template.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+  </head>
+  <body>
+    <nav id="navigation">
+      <a href="#page1" data-test-id="nav-link-keepDOM" data-sentry-element="NavigationLink">Go to Page 1</a>
+      <a href="#page2" data-test-id="nav-link-changeDOM" data-sentry-element="NavigationLink">Go to Page 2</a>
+    </nav>
+    <div id="content">
+      <h1>Home Page</h1>
+      <p>Click the navigation link to simulate a route change</p>
+    </div>
+  </body>
+</html>
diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-navigate/test.ts b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-navigate/test.ts
new file mode 100644
index 000000000000..ad7862926ebf
--- /dev/null
+++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-navigate/test.ts
@@ -0,0 +1,174 @@
+import { expect } from '@playwright/test';
+import type { Event as SentryEvent, SpanEnvelope } from '@sentry/core';
+import { sentryTest } from '../../../../utils/fixtures';
+import {
+  getFirstSentryEnvelopeRequest,
+  getMultipleSentryEnvelopeRequests,
+  hidePage,
+  properFullEnvelopeRequestParser,
+  shouldSkipTracingTest,
+} from '../../../../utils/helpers';
+
+const supportedBrowsers = ['chromium'];
+
+sentryTest(
+  'should capture INP with correct target name when navigation keeps DOM element',
+  async ({ browserName, getLocalTestUrl, page }) => {
+    if (shouldSkipTracingTest() || !supportedBrowsers.includes(browserName)) {
+      sentryTest.skip();
+    }
+
+    const url = await getLocalTestUrl({ testDir: __dirname });
+
+    await page.goto(url);
+    await getFirstSentryEnvelopeRequest<SentryEvent>(page); // wait for page load
+
+    const spanEnvelopePromise = getMultipleSentryEnvelopeRequests<SpanEnvelope>(
+      page,
+      1,
+      { envelopeType: 'span' },
+      properFullEnvelopeRequestParser,
+    );
+
+    // Simulating route change (keeping <nav> in DOM)
+    await page.locator('[data-test-id=nav-link-keepDOM]').click();
+    await page.locator('.navigated').isVisible();
+
+    await page.waitForTimeout(500);
+
+    // Page hide to trigger INP
+    await hidePage(page);
+
+    // Get the INP span envelope
+    const spanEnvelope = (await spanEnvelopePromise)[0];
+
+    const spanEnvelopeHeaders = spanEnvelope[0];
+    const spanEnvelopeItem = spanEnvelope[1][0][1];
+
+    const traceId = spanEnvelopeHeaders.trace!.trace_id;
+    expect(traceId).toMatch(/[a-f0-9]{32}/);
+
+    expect(spanEnvelopeHeaders).toEqual({
+      sent_at: expect.any(String),
+      trace: {
+        environment: 'production',
+        public_key: 'public',
+        sample_rate: '1',
+        sampled: 'true',
+        trace_id: traceId,
+        sample_rand: expect.any(String),
+      },
+    });
+
+    const inpValue = spanEnvelopeItem.measurements?.inp.value;
+    expect(inpValue).toBeGreaterThan(0);
+
+    expect(spanEnvelopeItem).toEqual({
+      data: {
+        'sentry.exclusive_time': inpValue,
+        'sentry.op': 'ui.interaction.click',
+        'sentry.origin': 'auto.http.browser.inp',
+        'sentry.source': 'custom',
+        transaction: 'test-url',
+        'user_agent.original': expect.stringContaining('Chrome'),
+      },
+      measurements: {
+        inp: {
+          unit: 'millisecond',
+          value: inpValue,
+        },
+      },
+      description: 'body > nav#navigation > NavigationLink',
+      exclusive_time: inpValue,
+      op: 'ui.interaction.click',
+      origin: 'auto.http.browser.inp',
+      is_segment: true,
+      segment_id: spanEnvelopeItem.span_id,
+      span_id: expect.stringMatching(/[a-f0-9]{16}/),
+      start_timestamp: expect.any(Number),
+      timestamp: expect.any(Number),
+      trace_id: traceId,
+    });
+  },
+);
+
+sentryTest(
+  'should capture INP with unknown target name when navigation removes element from DOM',
+  async ({ browserName, getLocalTestUrl, page }) => {
+    if (shouldSkipTracingTest() || !supportedBrowsers.includes(browserName)) {
+      sentryTest.skip();
+    }
+
+    const url = await getLocalTestUrl({ testDir: __dirname });
+
+    await page.goto(url);
+    await getFirstSentryEnvelopeRequest<SentryEvent>(page); // wait for page load
+
+    const spanEnvelopePromise = getMultipleSentryEnvelopeRequests<SpanEnvelope>(
+      page,
+      1,
+      { envelopeType: 'span' },
+      properFullEnvelopeRequestParser,
+    );
+
+    // Simulating route change (also changing <nav> in DOM)
+    await page.locator('[data-test-id=nav-link-changeDOM]').click();
+    await page.locator('.navigated').isVisible();
+
+    await page.waitForTimeout(500);
+
+    // Page hide to trigger INP
+    await hidePage(page);
+
+    // Get the INP span envelope
+    const spanEnvelope = (await spanEnvelopePromise)[0];
+
+    const spanEnvelopeHeaders = spanEnvelope[0];
+    const spanEnvelopeItem = spanEnvelope[1][0][1];
+
+    const traceId = spanEnvelopeHeaders.trace!.trace_id;
+    expect(traceId).toMatch(/[a-f0-9]{32}/);
+
+    expect(spanEnvelopeHeaders).toEqual({
+      sent_at: expect.any(String),
+      trace: {
+        environment: 'production',
+        public_key: 'public',
+        sample_rate: '1',
+        sampled: 'true',
+        trace_id: traceId,
+        sample_rand: expect.any(String),
+      },
+    });
+
+    const inpValue = spanEnvelopeItem.measurements?.inp.value;
+    expect(inpValue).toBeGreaterThan(0);
+
+    expect(spanEnvelopeItem).toEqual({
+      data: {
+        'sentry.exclusive_time': inpValue,
+        'sentry.op': 'ui.interaction.click',
+        'sentry.origin': 'auto.http.browser.inp',
+        'sentry.source': 'custom',
+        transaction: 'test-url',
+        'user_agent.original': expect.stringContaining('Chrome'),
+      },
+      measurements: {
+        inp: {
+          unit: 'millisecond',
+          value: inpValue,
+        },
+      },
+      description: '<unknown>', // FIXME: currently unable to get the target name when element is removed from DOM
+      exclusive_time: inpValue,
+      op: 'ui.interaction.click',
+      origin: 'auto.http.browser.inp',
+      is_segment: true,
+      segment_id: spanEnvelopeItem.span_id,
+      span_id: expect.stringMatching(/[a-f0-9]{16}/),
+      start_timestamp: expect.any(Number),
+      timestamp: expect.any(Number),
+      trace_id: traceId,
+    });
+  },
+);

From 455c23174f6ddda183e1aa968ab60e19e8dc752c Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Wed, 29 Oct 2025 13:24:34 +0100
Subject: [PATCH 011/186] ref(core): Set span status `internal_error` instead
 of `unknown_error` (#17909)

This PR refactors almost all occurances of our SDK setting a span status
of `unknown_error` to setting `internal_error` instead.
https://github.com/getsentry/sentry-javascript/issues/17814 explains why
we do this.

I left a few selected occurances of `unknown_error` where I think it's
fine to not change them. Worth noting, Relay already converts
`unknown_error` to `internal_error`, so this is rather a "cleanup" and
only has impact on self-hosted Sentry versions for now.

closes https://github.com/getsentry/sentry-javascript/issues/17814
---
 .../suites/integrations/supabase/auth/test.ts             | 2 +-
 .../nestjs-11/tests/transactions.test.ts                  | 2 +-
 .../test-applications/nestjs-8/tests/transactions.test.ts | 2 +-
 .../nestjs-basic/tests/transactions.test.ts               | 2 +-
 .../nestjs-fastify/tests/transactions.test.ts             | 2 +-
 .../nextjs-app-dir/tests/route-handlers.test.ts           | 2 +-
 .../nextjs-pages-dir/tests/edge-route.test.ts             | 2 +-
 .../nextjs-pages-dir/tests/middleware.test.ts             | 2 +-
 .../node-express/tests/transactions.test.ts               | 2 +-
 .../node-otel-sdk-node/tests/transactions.test.ts         | 2 +-
 .../node-otel/tests/transactions.test.ts                  | 2 +-
 .../tsx-express/tests/transactions.test.ts                | 2 +-
 .../suites/fs-instrumentation/test.ts                     | 2 +-
 .../suites/tracing/anthropic/test.ts                      | 8 ++++----
 .../suites/tracing/apollo-graphql/test.ts                 | 2 +-
 .../suites/tracing/google-genai/test.ts                   | 8 ++++----
 .../suites/tracing/langchain/test.ts                      | 4 ++--
 .../node-integration-tests/suites/tracing/openai/test.ts  | 4 ++--
 .../suites/tracing/postgresjs/test.ts                     | 2 +-
 .../suites/tracing/vercelai/test.ts                       | 8 ++++----
 .../suites/tracing/vercelai/v5/test.ts                    | 2 +-
 packages/core/src/tracing/spanstatus.ts                   | 4 ++--
 packages/core/src/utils/anthropic-ai/streaming.ts         | 2 +-
 packages/core/src/utils/anthropic-ai/utils.ts             | 2 +-
 packages/core/src/utils/spanUtils.ts                      | 2 +-
 packages/core/test/lib/tracing/spanstatus.test.ts         | 4 ++--
 packages/node/src/integrations/tracing/postgresjs.ts      | 2 +-
 packages/opentelemetry/src/utils/mapStatus.ts             | 2 +-
 packages/opentelemetry/test/utils/mapStatus.test.ts       | 4 ++--
 29 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/dev-packages/browser-integration-tests/suites/integrations/supabase/auth/test.ts b/dev-packages/browser-integration-tests/suites/integrations/supabase/auth/test.ts
index c145e64bd1da..b37fa79ed97e 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/supabase/auth/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/supabase/auth/test.ts
@@ -143,7 +143,7 @@ sentryTest('should capture Supabase authentication errors', async ({ getLocalTes
     start_timestamp: expect.any(Number),
     timestamp: expect.any(Number),
     trace_id: transactionEvent.contexts?.trace?.trace_id,
-    status: 'unknown_error',
+    status: 'internal_error',
     data: expect.objectContaining({
       'sentry.op': 'db',
       'sentry.origin': 'auto.db.supabase',
diff --git a/dev-packages/e2e-tests/test-applications/nestjs-11/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/nestjs-11/tests/transactions.test.ts
index 2f314a10817d..d0f34311822e 100644
--- a/dev-packages/e2e-tests/test-applications/nestjs-11/tests/transactions.test.ts
+++ b/dev-packages/e2e-tests/test-applications/nestjs-11/tests/transactions.test.ts
@@ -339,7 +339,7 @@ test('API route transaction includes nest pipe span for invalid request', async
           parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
           start_timestamp: expect.any(Number),
           timestamp: expect.any(Number),
-          status: 'unknown_error',
+          status: 'internal_error',
           op: 'middleware.nestjs',
           origin: 'auto.middleware.nestjs',
         },
diff --git a/dev-packages/e2e-tests/test-applications/nestjs-8/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/nestjs-8/tests/transactions.test.ts
index a7d5ed887049..f5f1c64a9726 100644
--- a/dev-packages/e2e-tests/test-applications/nestjs-8/tests/transactions.test.ts
+++ b/dev-packages/e2e-tests/test-applications/nestjs-8/tests/transactions.test.ts
@@ -343,7 +343,7 @@ test('API route transaction includes nest pipe span for invalid request', async
           parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
           start_timestamp: expect.any(Number),
           timestamp: expect.any(Number),
-          status: 'unknown_error',
+          status: 'internal_error',
           op: 'middleware.nestjs',
           origin: 'auto.middleware.nestjs',
         },
diff --git a/dev-packages/e2e-tests/test-applications/nestjs-basic/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/nestjs-basic/tests/transactions.test.ts
index 143ebcd9a9f0..508c1e670946 100644
--- a/dev-packages/e2e-tests/test-applications/nestjs-basic/tests/transactions.test.ts
+++ b/dev-packages/e2e-tests/test-applications/nestjs-basic/tests/transactions.test.ts
@@ -339,7 +339,7 @@ test('API route transaction includes nest pipe span for invalid request', async
           parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
           start_timestamp: expect.any(Number),
           timestamp: expect.any(Number),
-          status: 'unknown_error',
+          status: 'internal_error',
           op: 'middleware.nestjs',
           origin: 'auto.middleware.nestjs',
         },
diff --git a/dev-packages/e2e-tests/test-applications/nestjs-fastify/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/nestjs-fastify/tests/transactions.test.ts
index 9730bfd6fa68..d1c86bac4dfa 100644
--- a/dev-packages/e2e-tests/test-applications/nestjs-fastify/tests/transactions.test.ts
+++ b/dev-packages/e2e-tests/test-applications/nestjs-fastify/tests/transactions.test.ts
@@ -385,7 +385,7 @@ test('API route transaction includes nest pipe span for invalid request', async
           parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
           start_timestamp: expect.any(Number),
           timestamp: expect.any(Number),
-          status: 'unknown_error',
+          status: 'internal_error',
           op: 'middleware.nestjs',
           origin: 'auto.middleware.nestjs',
         },
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-app-dir/tests/route-handlers.test.ts b/dev-packages/e2e-tests/test-applications/nextjs-app-dir/tests/route-handlers.test.ts
index 946f9e20911a..5c92768015b0 100644
--- a/dev-packages/e2e-tests/test-applications/nextjs-app-dir/tests/route-handlers.test.ts
+++ b/dev-packages/e2e-tests/test-applications/nextjs-app-dir/tests/route-handlers.test.ts
@@ -112,7 +112,7 @@ test.describe('Edge runtime', () => {
     expect(routehandlerError.tags?.['my-isolated-tag']).toBe(true);
     expect(routehandlerError.tags?.['my-global-scope-isolated-tag']).not.toBeDefined();
 
-    expect(routehandlerTransaction.contexts?.trace?.status).toBe('unknown_error');
+    expect(routehandlerTransaction.contexts?.trace?.status).toBe('internal_error');
     expect(routehandlerTransaction.contexts?.trace?.op).toBe('http.server');
 
     expect(routehandlerError.exception?.values?.[0].value).toBe('route-handler-edge-error');
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-pages-dir/tests/edge-route.test.ts b/dev-packages/e2e-tests/test-applications/nextjs-pages-dir/tests/edge-route.test.ts
index d2ede428b978..8401c6a5f5d2 100644
--- a/dev-packages/e2e-tests/test-applications/nextjs-pages-dir/tests/edge-route.test.ts
+++ b/dev-packages/e2e-tests/test-applications/nextjs-pages-dir/tests/edge-route.test.ts
@@ -48,7 +48,7 @@ test('Faulty edge routes', async ({ request }) => {
   ]);
 
   test.step('should create transactions with the right fields', () => {
-    expect(edgerouteTransaction.contexts?.trace?.status).toBe('unknown_error');
+    expect(edgerouteTransaction.contexts?.trace?.status).toBe('internal_error');
     expect(edgerouteTransaction.contexts?.trace?.op).toBe('http.server');
   });
 
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-pages-dir/tests/middleware.test.ts b/dev-packages/e2e-tests/test-applications/nextjs-pages-dir/tests/middleware.test.ts
index 45a89f683be4..03539a781ec1 100644
--- a/dev-packages/e2e-tests/test-applications/nextjs-pages-dir/tests/middleware.test.ts
+++ b/dev-packages/e2e-tests/test-applications/nextjs-pages-dir/tests/middleware.test.ts
@@ -36,7 +36,7 @@ test('Faulty middlewares', async ({ request }) => {
 
   await test.step('should record transactions', async () => {
     const middlewareTransaction = await middlewareTransactionPromise;
-    expect(middlewareTransaction.contexts?.trace?.status).toBe('unknown_error');
+    expect(middlewareTransaction.contexts?.trace?.status).toBe('internal_error');
     expect(middlewareTransaction.contexts?.trace?.op).toBe('http.server.middleware');
     expect(middlewareTransaction.contexts?.runtime?.name).toBe('vercel-edge');
     expect(middlewareTransaction.transaction_info?.source).toBe('url');
diff --git a/dev-packages/e2e-tests/test-applications/node-express/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/node-express/tests/transactions.test.ts
index 1ffd9f2e498d..ce809b6ccdee 100644
--- a/dev-packages/e2e-tests/test-applications/node-express/tests/transactions.test.ts
+++ b/dev-packages/e2e-tests/test-applications/node-express/tests/transactions.test.ts
@@ -209,7 +209,7 @@ test('Sends an API route transaction for an errored route', async ({ baseURL })
     parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
     span_id: expect.stringMatching(/[a-f0-9]{16}/),
     start_timestamp: expect.any(Number),
-    status: 'unknown_error',
+    status: 'internal_error',
     timestamp: expect.any(Number),
     trace_id: expect.stringMatching(/[a-f0-9]{32}/),
     measurements: {},
diff --git a/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/tests/transactions.test.ts
index a586146eece5..f724eee3fc64 100644
--- a/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/tests/transactions.test.ts
+++ b/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/tests/transactions.test.ts
@@ -203,7 +203,7 @@ test('Sends an API route transaction for an errored route', async ({ baseURL })
     parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
     span_id: expect.stringMatching(/[a-f0-9]{16}/),
     start_timestamp: expect.any(Number),
-    status: 'unknown_error',
+    status: 'internal_error',
     timestamp: expect.any(Number),
     trace_id: expect.stringMatching(/[a-f0-9]{32}/),
     measurements: {},
diff --git a/dev-packages/e2e-tests/test-applications/node-otel/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/node-otel/tests/transactions.test.ts
index 1f79fd438719..8a561e91a76a 100644
--- a/dev-packages/e2e-tests/test-applications/node-otel/tests/transactions.test.ts
+++ b/dev-packages/e2e-tests/test-applications/node-otel/tests/transactions.test.ts
@@ -203,7 +203,7 @@ test('Sends an API route transaction for an errored route', async ({ baseURL })
     parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
     span_id: expect.stringMatching(/[a-f0-9]{16}/),
     start_timestamp: expect.any(Number),
-    status: 'unknown_error',
+    status: 'internal_error',
     timestamp: expect.any(Number),
     trace_id: expect.stringMatching(/[a-f0-9]{32}/),
     measurements: {},
diff --git a/dev-packages/e2e-tests/test-applications/tsx-express/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/tsx-express/tests/transactions.test.ts
index fca8f1b85528..5957dbfd9738 100644
--- a/dev-packages/e2e-tests/test-applications/tsx-express/tests/transactions.test.ts
+++ b/dev-packages/e2e-tests/test-applications/tsx-express/tests/transactions.test.ts
@@ -195,7 +195,7 @@ test('Sends an API route transaction for an errored route', async ({ baseURL })
     parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
     span_id: expect.stringMatching(/[a-f0-9]{16}/),
     start_timestamp: expect.any(Number),
-    status: 'unknown_error',
+    status: 'internal_error',
     measurements: {},
     timestamp: expect.any(Number),
     trace_id: expect.stringMatching(/[a-f0-9]{32}/),
diff --git a/dev-packages/node-integration-tests/suites/fs-instrumentation/test.ts b/dev-packages/node-integration-tests/suites/fs-instrumentation/test.ts
index 721c569231a0..d64144754772 100644
--- a/dev-packages/node-integration-tests/suites/fs-instrumentation/test.ts
+++ b/dev-packages/node-integration-tests/suites/fs-instrumentation/test.ts
@@ -15,7 +15,7 @@ test('should create spans for fs operations that take target argument', async ()
           expect.objectContaining({
             description: 'fs.readFile',
             op: 'file',
-            status: 'unknown_error',
+            status: 'internal_error',
             data: {
               fs_error: expect.stringMatching('ENOENT: no such file or directory,'),
               path_argument: expect.stringMatching('/fixtures/some-file-that-doesnt-exist.txt'),
diff --git a/dev-packages/node-integration-tests/suites/tracing/anthropic/test.ts b/dev-packages/node-integration-tests/suites/tracing/anthropic/test.ts
index 2c92c6f8d233..3fc3b544b843 100644
--- a/dev-packages/node-integration-tests/suites/tracing/anthropic/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/anthropic/test.ts
@@ -42,7 +42,7 @@ describe('Anthropic integration', () => {
         description: 'messages error-model',
         op: 'gen_ai.messages',
         origin: 'auto.ai.anthropic',
-        status: 'unknown_error',
+        status: 'internal_error',
       }),
       // Third span - token counting (no response.text because recordOutputs=false by default)
       expect.objectContaining({
@@ -117,7 +117,7 @@ describe('Anthropic integration', () => {
         description: 'messages error-model',
         op: 'gen_ai.messages',
         origin: 'auto.ai.anthropic',
-        status: 'unknown_error',
+        status: 'internal_error',
       }),
       // Third span - token counting with PII (response.text is present because sendDefaultPii=true enables recordOutputs)
       expect.objectContaining({
@@ -490,7 +490,7 @@ describe('Anthropic integration', () => {
       expect.objectContaining({
         description: 'messages invalid-format',
         op: 'gen_ai.messages',
-        status: 'unknown_error',
+        status: 'internal_error',
         data: expect.objectContaining({
           'gen_ai.request.model': 'invalid-format',
         }),
@@ -499,7 +499,7 @@ describe('Anthropic integration', () => {
       expect.objectContaining({
         description: 'models nonexistent-model',
         op: 'gen_ai.models',
-        status: 'unknown_error',
+        status: 'internal_error',
         data: expect.objectContaining({
           'gen_ai.request.model': 'nonexistent-model',
         }),
diff --git a/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/test.ts b/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/test.ts
index 4d6661101dc0..9de5308de385 100644
--- a/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/test.ts
@@ -68,7 +68,7 @@ describe('GraphQL/Apollo Tests', () => {
             'sentry.origin': 'auto.graphql.otel.graphql',
           },
           description: 'mutation Mutation',
-          status: 'unknown_error',
+          status: 'internal_error',
           origin: 'auto.graphql.otel.graphql',
         }),
       ]),
diff --git a/dev-packages/node-integration-tests/suites/tracing/google-genai/test.ts b/dev-packages/node-integration-tests/suites/tracing/google-genai/test.ts
index 921f94e78765..7507ca255ae0 100644
--- a/dev-packages/node-integration-tests/suites/tracing/google-genai/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/google-genai/test.ts
@@ -75,7 +75,7 @@ describe('Google GenAI integration', () => {
         description: 'models error-model',
         op: 'gen_ai.models',
         origin: 'auto.ai.google_genai',
-        status: 'unknown_error',
+        status: 'internal_error',
       }),
     ]),
   };
@@ -155,7 +155,7 @@ describe('Google GenAI integration', () => {
         description: 'models error-model',
         op: 'gen_ai.models',
         origin: 'auto.ai.google_genai',
-        status: 'unknown_error',
+        status: 'internal_error',
       }),
     ]),
   };
@@ -351,7 +351,7 @@ describe('Google GenAI integration', () => {
         description: 'models blocked-model stream-response',
         op: 'gen_ai.models',
         origin: 'auto.ai.google_genai',
-        status: 'unknown_error',
+        status: 'internal_error',
       }),
       // Fifth span - error handling for streaming
       expect.objectContaining({
@@ -450,7 +450,7 @@ describe('Google GenAI integration', () => {
         description: 'models blocked-model stream-response',
         op: 'gen_ai.models',
         origin: 'auto.ai.google_genai',
-        status: 'unknown_error',
+        status: 'internal_error',
       }),
       // Fifth span - error handling for streaming with PII
       expect.objectContaining({
diff --git a/dev-packages/node-integration-tests/suites/tracing/langchain/test.ts b/dev-packages/node-integration-tests/suites/tracing/langchain/test.ts
index e3738b61b7a7..4de2f96b5dc5 100644
--- a/dev-packages/node-integration-tests/suites/tracing/langchain/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/langchain/test.ts
@@ -66,7 +66,7 @@ describe('LangChain integration', () => {
         description: 'chat error-model',
         op: 'gen_ai.chat',
         origin: 'auto.ai.langchain',
-        status: 'unknown_error',
+        status: 'internal_error',
       }),
     ]),
   };
@@ -136,7 +136,7 @@ describe('LangChain integration', () => {
         description: 'chat error-model',
         op: 'gen_ai.chat',
         origin: 'auto.ai.langchain',
-        status: 'unknown_error',
+        status: 'internal_error',
       }),
     ]),
   };
diff --git a/dev-packages/node-integration-tests/suites/tracing/openai/test.ts b/dev-packages/node-integration-tests/suites/tracing/openai/test.ts
index 8c788834f126..218e3c7ee61f 100644
--- a/dev-packages/node-integration-tests/suites/tracing/openai/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/openai/test.ts
@@ -72,7 +72,7 @@ describe('OpenAI integration', () => {
         description: 'chat error-model',
         op: 'gen_ai.chat',
         origin: 'auto.ai.openai',
-        status: 'unknown_error',
+        status: 'internal_error',
       }),
       // Fourth span - chat completions streaming
       expect.objectContaining({
@@ -219,7 +219,7 @@ describe('OpenAI integration', () => {
         description: 'chat error-model',
         op: 'gen_ai.chat',
         origin: 'auto.ai.openai',
-        status: 'unknown_error',
+        status: 'internal_error',
       }),
       // Fourth span - chat completions streaming with PII
       expect.objectContaining({
diff --git a/dev-packages/node-integration-tests/suites/tracing/postgresjs/test.ts b/dev-packages/node-integration-tests/suites/tracing/postgresjs/test.ts
index 68b1a82703a0..99203fd75ae6 100644
--- a/dev-packages/node-integration-tests/suites/tracing/postgresjs/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/postgresjs/test.ts
@@ -175,7 +175,7 @@ describe('postgresjs auto instrumentation', () => {
           }),
           description: `SELECT * FROM "User" WHERE "email" = '${NON_EXISTING_TEST_EMAIL}'`,
           op: 'db',
-          status: 'unknown_error',
+          status: 'internal_error',
           origin: 'auto.db.otel.postgres',
           parent_span_id: expect.any(String),
           span_id: expect.any(String),
diff --git a/dev-packages/node-integration-tests/suites/tracing/vercelai/test.ts b/dev-packages/node-integration-tests/suites/tracing/vercelai/test.ts
index 94fd0dde8486..aac243eff11c 100644
--- a/dev-packages/node-integration-tests/suites/tracing/vercelai/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/vercelai/test.ts
@@ -442,7 +442,7 @@ describe('Vercel AI integration', () => {
             description: 'generateText',
             op: 'gen_ai.invoke_agent',
             origin: 'auto.vercelai.otel',
-            status: 'unknown_error',
+            status: 'internal_error',
           }),
           expect.objectContaining({
             data: {
@@ -486,7 +486,7 @@ describe('Vercel AI integration', () => {
             description: 'execute_tool getWeather',
             op: 'gen_ai.execute_tool',
             origin: 'auto.vercelai.otel',
-            status: 'unknown_error',
+            status: 'internal_error',
           }),
         ]),
 
@@ -563,7 +563,7 @@ describe('Vercel AI integration', () => {
             description: 'generateText',
             op: 'gen_ai.invoke_agent',
             origin: 'auto.vercelai.otel',
-            status: 'unknown_error',
+            status: 'internal_error',
           }),
           expect.objectContaining({
             data: {
@@ -607,7 +607,7 @@ describe('Vercel AI integration', () => {
             description: 'execute_tool getWeather',
             op: 'gen_ai.execute_tool',
             origin: 'auto.vercelai.otel',
-            status: 'unknown_error',
+            status: 'internal_error',
           }),
         ]),
 
diff --git a/dev-packages/node-integration-tests/suites/tracing/vercelai/v5/test.ts b/dev-packages/node-integration-tests/suites/tracing/vercelai/v5/test.ts
index 2b697bfedbdb..b5a2b8107326 100644
--- a/dev-packages/node-integration-tests/suites/tracing/vercelai/v5/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/vercelai/v5/test.ts
@@ -499,7 +499,7 @@ describe('Vercel AI integration (V5)', () => {
               description: 'execute_tool getWeather',
               op: 'gen_ai.execute_tool',
               origin: 'auto.vercelai.otel',
-              status: 'unknown_error',
+              status: 'internal_error',
             }),
           ]),
         };
diff --git a/packages/core/src/tracing/spanstatus.ts b/packages/core/src/tracing/spanstatus.ts
index 6d353ae6a326..176e201178de 100644
--- a/packages/core/src/tracing/spanstatus.ts
+++ b/packages/core/src/tracing/spanstatus.ts
@@ -9,7 +9,7 @@ export const SPAN_STATUS_ERROR = 2;
  * Converts a HTTP status code into a sentry status with a message.
  *
  * @param httpStatus The HTTP response status code.
- * @returns The span status or unknown_error.
+ * @returns The span status or internal_error.
  */
 // https://develop.sentry.dev/sdk/event-payloads/span/
 export function getSpanStatusFromHttpCode(httpStatus: number): SpanStatus {
@@ -51,7 +51,7 @@ export function getSpanStatusFromHttpCode(httpStatus: number): SpanStatus {
     }
   }
 
-  return { code: SPAN_STATUS_ERROR, message: 'unknown_error' };
+  return { code: SPAN_STATUS_ERROR, message: 'internal_error' };
 }
 
 /**
diff --git a/packages/core/src/utils/anthropic-ai/streaming.ts b/packages/core/src/utils/anthropic-ai/streaming.ts
index b542cbfda75a..86f5c25baa8a 100644
--- a/packages/core/src/utils/anthropic-ai/streaming.ts
+++ b/packages/core/src/utils/anthropic-ai/streaming.ts
@@ -59,7 +59,7 @@ function isErrorEvent(event: AnthropicAiStreamingEvent, span: Span): boolean {
     // If the event is an error, set the span status and capture the error
     // These error events are not rejected by the API by default, but are sent as metadata of the response
     if (event.type === 'error') {
-      span.setStatus({ code: SPAN_STATUS_ERROR, message: event.error?.type ?? 'unknown_error' });
+      span.setStatus({ code: SPAN_STATUS_ERROR, message: event.error?.type ?? 'internal_error' });
       captureException(event.error, {
         mechanism: {
           handled: false,
diff --git a/packages/core/src/utils/anthropic-ai/utils.ts b/packages/core/src/utils/anthropic-ai/utils.ts
index bce96aa68bcc..16c85908d4f7 100644
--- a/packages/core/src/utils/anthropic-ai/utils.ts
+++ b/packages/core/src/utils/anthropic-ai/utils.ts
@@ -17,7 +17,7 @@ export function shouldInstrument(methodPath: string): methodPath is AnthropicAiI
  */
 export function handleResponseError(span: Span, response: AnthropicAiResponse): void {
   if (response.error) {
-    span.setStatus({ code: SPAN_STATUS_ERROR, message: response.error.type || 'unknown_error' });
+    span.setStatus({ code: SPAN_STATUS_ERROR, message: response.error.type || 'internal_error' });
 
     captureException(response.error, {
       mechanism: {
diff --git a/packages/core/src/utils/spanUtils.ts b/packages/core/src/utils/spanUtils.ts
index 6e7c62c7631a..d7c261ecd73c 100644
--- a/packages/core/src/utils/spanUtils.ts
+++ b/packages/core/src/utils/spanUtils.ts
@@ -234,7 +234,7 @@ export function getStatusMessage(status: SpanStatus | undefined): string | undef
     return 'ok';
   }
 
-  return status.message || 'unknown_error';
+  return status.message || 'internal_error';
 }
 
 const CHILD_SPANS_FIELD = '_sentryChildSpans';
diff --git a/packages/core/test/lib/tracing/spanstatus.test.ts b/packages/core/test/lib/tracing/spanstatus.test.ts
index ee6bfd59443f..109c97d567a9 100644
--- a/packages/core/test/lib/tracing/spanstatus.test.ts
+++ b/packages/core/test/lib/tracing/spanstatus.test.ts
@@ -27,14 +27,14 @@ describe('setHttpStatus', () => {
     expect(data).toMatchObject({ 'http.response.status_code': code });
   });
 
-  it("doesn't set the status for an unknown http status code", () => {
+  it('defaults to internal_error', () => {
     const span = new SentrySpan({ name: 'test' });
 
     setHttpStatus(span, 600);
 
     const { status: spanStatus, data } = spanToJSON(span);
 
-    expect(spanStatus).toBeUndefined();
+    expect(spanStatus).toBe('internal_error');
     expect(data).toMatchObject({ 'http.response.status_code': 600 });
   });
 });
diff --git a/packages/node/src/integrations/tracing/postgresjs.ts b/packages/node/src/integrations/tracing/postgresjs.ts
index 1a0eae973bc6..438a63c804c6 100644
--- a/packages/node/src/integrations/tracing/postgresjs.ts
+++ b/packages/node/src/integrations/tracing/postgresjs.ts
@@ -128,7 +128,7 @@ export class PostgresJsInstrumentation extends InstrumentationBase<PostgresJsIns
           code: SPAN_STATUS_ERROR,
           // This message is the error message from the rejectArgs, when available
           // e.g "relation 'User' does not exist"
-          message: rejectArgs?.[0]?.message || 'unknown_error',
+          message: rejectArgs?.[0]?.message || 'internal_error',
         });
 
         const result = Reflect.apply(rejectTarget, rejectThisArg, rejectArgs);
diff --git a/packages/opentelemetry/src/utils/mapStatus.ts b/packages/opentelemetry/src/utils/mapStatus.ts
index 742bffdb1551..b12abbb4a17f 100644
--- a/packages/opentelemetry/src/utils/mapStatus.ts
+++ b/packages/opentelemetry/src/utils/mapStatus.ts
@@ -56,7 +56,7 @@ export function mapStatus(span: AbstractSpan): SpanStatus {
       if (status.message && isStatusErrorMessageValid(status.message)) {
         return { code: SPAN_STATUS_ERROR, message: status.message };
       } else {
-        return { code: SPAN_STATUS_ERROR, message: 'unknown_error' };
+        return { code: SPAN_STATUS_ERROR, message: 'internal_error' };
       }
     }
   }
diff --git a/packages/opentelemetry/test/utils/mapStatus.test.ts b/packages/opentelemetry/test/utils/mapStatus.test.ts
index 1831ec01fc95..b754e121e276 100644
--- a/packages/opentelemetry/test/utils/mapStatus.test.ts
+++ b/packages/opentelemetry/test/utils/mapStatus.test.ts
@@ -40,7 +40,7 @@ describe('mapStatus', () => {
     [501, undefined, { code: SPAN_STATUS_ERROR, message: 'unimplemented' }],
     [503, undefined, { code: SPAN_STATUS_ERROR, message: 'unavailable' }],
     [504, undefined, { code: SPAN_STATUS_ERROR, message: 'deadline_exceeded' }],
-    [999, undefined, { code: SPAN_STATUS_ERROR, message: 'unknown_error' }],
+    [999, undefined, { code: SPAN_STATUS_ERROR, message: 'internal_error' }],
 
     // grpc codes
     [undefined, '1', { code: SPAN_STATUS_ERROR, message: 'cancelled' }],
@@ -112,7 +112,7 @@ describe('mapStatus', () => {
   it('returns error status when span already has error status without message', () => {
     const span = createSpan('test-span');
     span.setStatus({ code: 2 }); // ERROR
-    expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_ERROR, message: 'unknown_error' });
+    expect(mapStatus(span)).toEqual({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
   });
 
   it('infers error status form attributes when span already has error status without message', () => {

From 98de756506705b60d1ca86cbbcfad3fd76062f8f Mon Sep 17 00:00:00 2001
From: Charly Gomez <charly.gomez@sentry.io>
Date: Wed, 29 Oct 2025 14:14:29 +0100
Subject: [PATCH 012/186] feat(browser): Limit transport buffer size (#18046)

We bumped this in
https://github.com/getsentry/sentry-javascript/pull/11764 but this might
lead to too many concurrent connections in the long run.


closes https://github.com/getsentry/sentry-javascript/issues/17592
---
 packages/browser/src/transports/fetch.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/browser/src/transports/fetch.ts b/packages/browser/src/transports/fetch.ts
index f690f015f281..f6683c7005de 100644
--- a/packages/browser/src/transports/fetch.ts
+++ b/packages/browser/src/transports/fetch.ts
@@ -1,9 +1,11 @@
 import type { Transport, TransportMakeRequestResponse, TransportRequest } from '@sentry/core';
-import { createTransport } from '@sentry/core';
+import { createTransport, makePromiseBuffer } from '@sentry/core';
 import { clearCachedImplementation, getNativeImplementation } from '@sentry-internal/browser-utils';
 import type { WINDOW } from '../helpers';
 import type { BrowserTransportOptions } from './types';
 
+const DEFAULT_BROWSER_TRANSPORT_BUFFER_SIZE = 40;
+
 /**
  * Creates a Transport that uses the Fetch API to send events to Sentry.
  */
@@ -59,5 +61,9 @@ export function makeFetchTransport(
     }
   }
 
-  return createTransport(options, makeRequest);
+  return createTransport(
+    options,
+    makeRequest,
+    makePromiseBuffer(options.bufferSize || DEFAULT_BROWSER_TRANSPORT_BUFFER_SIZE),
+  );
 }

From 2d760ba7375b2ec4670e7acd626a0b5913288685 Mon Sep 17 00:00:00 2001
From: Sigrid Huemer <32902192+s1gr1d@users.noreply.github.com>
Date: Thu, 30 Oct 2025 09:44:53 +0100
Subject: [PATCH 013/186] feat(core): Remove default value of `maxValueLength:
 250` (#18043)

The SDK should only truncate when really necessary on the client.
Therefore, the default value of 250 is removed.

Part of https://github.com/getsentry/sentry-javascript/issues/17389
---
 .../core/src/integrations/extraerrordata.ts   | 13 ++++++++----
 packages/core/src/types-hoist/options.ts      |  2 --
 packages/core/src/utils/prepareEvent.ts       |  4 ++--
 .../lib/integrations/extraerrordata.test.ts   | 21 +++++++++++++++++++
 4 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/packages/core/src/integrations/extraerrordata.ts b/packages/core/src/integrations/extraerrordata.ts
index ae65739aed5f..59bac56908c3 100644
--- a/packages/core/src/integrations/extraerrordata.ts
+++ b/packages/core/src/integrations/extraerrordata.ts
@@ -34,7 +34,7 @@ const _extraErrorDataIntegration = ((options: Partial<ExtraErrorDataOptions> = {
   return {
     name: INTEGRATION_NAME,
     processEvent(event, hint, client) {
-      const { maxValueLength = 250 } = client.getOptions();
+      const { maxValueLength } = client.getOptions();
       return _enhanceEventWithErrorData(event, hint, depth, captureErrorCause, maxValueLength);
     },
   };
@@ -47,7 +47,7 @@ function _enhanceEventWithErrorData(
   hint: EventHint = {},
   depth: number,
   captureErrorCause: boolean,
-  maxValueLength: number,
+  maxValueLength: number | undefined,
 ): Event {
   if (!hint.originalException || !isError(hint.originalException)) {
     return event;
@@ -85,7 +85,7 @@ function _enhanceEventWithErrorData(
 function _extractErrorData(
   error: ExtendedError,
   captureErrorCause: boolean,
-  maxValueLength: number,
+  maxValueLength: number | undefined,
 ): Record<string, unknown> | null {
   // We are trying to enhance already existing event, so no harm done if it won't succeed
   try {
@@ -109,7 +109,12 @@ function _extractErrorData(
         continue;
       }
       const value = error[key];
-      extraErrorInfo[key] = isError(value) || typeof value === 'string' ? truncate(`${value}`, maxValueLength) : value;
+      extraErrorInfo[key] =
+        isError(value) || typeof value === 'string'
+          ? maxValueLength
+            ? truncate(`${value}`, maxValueLength)
+            : `${value}`
+          : value;
     }
 
     // Error.cause is a standard property that is non enumerable, we therefore need to access it separately.
diff --git a/packages/core/src/types-hoist/options.ts b/packages/core/src/types-hoist/options.ts
index 1f172aaa1f4a..2d4c0e6b43a4 100644
--- a/packages/core/src/types-hoist/options.ts
+++ b/packages/core/src/types-hoist/options.ts
@@ -184,8 +184,6 @@ export interface ClientOptions<TO extends BaseTransportOptions = BaseTransportOp
 
   /**
    * Maximum number of chars a single value can have before it will be truncated.
-   *
-   * @default 250
    */
   maxValueLength?: number;
 
diff --git a/packages/core/src/utils/prepareEvent.ts b/packages/core/src/utils/prepareEvent.ts
index 6bff4e8b3d50..9a4c4685e839 100644
--- a/packages/core/src/utils/prepareEvent.ts
+++ b/packages/core/src/utils/prepareEvent.ts
@@ -132,7 +132,7 @@ export function prepareEvent(
  * @param event event instance to be enhanced
  */
 export function applyClientOptions(event: Event, options: ClientOptions): void {
-  const { environment, release, dist, maxValueLength = 250 } = options;
+  const { environment, release, dist, maxValueLength } = options;
 
   // empty strings do not make sense for environment, release, and dist
   // so we handle them the same as if they were not provided
@@ -148,7 +148,7 @@ export function applyClientOptions(event: Event, options: ClientOptions): void {
 
   const request = event.request;
   if (request?.url) {
-    request.url = truncate(request.url, maxValueLength);
+    request.url = maxValueLength ? truncate(request.url, maxValueLength) : request.url;
   }
 }
 
diff --git a/packages/core/test/lib/integrations/extraerrordata.test.ts b/packages/core/test/lib/integrations/extraerrordata.test.ts
index f935acc689f9..95354ea2106f 100644
--- a/packages/core/test/lib/integrations/extraerrordata.test.ts
+++ b/packages/core/test/lib/integrations/extraerrordata.test.ts
@@ -55,6 +55,27 @@ describe('ExtraErrorData()', () => {
     });
   });
 
+  it('should not truncate extra data without maxValueLength', () => {
+    const error = new TypeError('foo') as ExtendedError;
+    error.baz = 42;
+    error.foo = 'a'.repeat(300);
+
+    const enhancedEvent = extraErrorData.processEvent?.(
+      event,
+      {
+        originalException: error,
+      },
+      new TestClient(getDefaultTestClientOptions()),
+    ) as Event;
+
+    expect(enhancedEvent.contexts).toEqual({
+      TypeError: {
+        baz: 42,
+        foo: `${'a'.repeat(300)}`,
+      },
+    });
+  });
+
   it('should extract error data from the error cause with the same policy', () => {
     const error = new TypeError('foo') as ExtendedError;
     error.cause = new SyntaxError('bar') as ExtendedError;

From 296c1ca07085e090f90fa68ec996eb81274dec06 Mon Sep 17 00:00:00 2001
From: Abdelrahman Awad <me@awad.dev>
Date: Fri, 31 Oct 2025 13:45:17 +0200
Subject: [PATCH 014/186] fix(tests): un-override nitro dep version for nuxt-3
 test (#18056)

Nitro `2.10` was failing our tests due to 500 errors, logs didn't show
anything about what was failing but removing the override which then
makes it use nitro `2.12.9` makes the tests pass again.

I tried almost all releases from `2.10` to `2.12.8` and they all fail
the tests due to timeouts, so only the very last release is the one
working, I think we might have a deep dependency causing this, but for
now this works for our tests.

Nitropack shouldn't even be part of user dependencies as it is
determined by the Nuxt version accepted range.
---
 dev-packages/e2e-tests/test-applications/nuxt-3-min/package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev-packages/e2e-tests/test-applications/nuxt-3-min/package.json b/dev-packages/e2e-tests/test-applications/nuxt-3-min/package.json
index 77a0459542be..1d569cf35597 100644
--- a/dev-packages/e2e-tests/test-applications/nuxt-3-min/package.json
+++ b/dev-packages/e2e-tests/test-applications/nuxt-3-min/package.json
@@ -27,7 +27,6 @@
   },
   "pnpm": {
     "overrides": {
-      "nitropack": "2.10.0",
       "ofetch": "1.4.0",
       "@vercel/nft": "0.29.4"
     }

From 41900947e7c7098fd62c0106c9008413d6aa4008 Mon Sep 17 00:00:00 2001
From: Rola Abuhasna <rola.abuhasna@sentry.io>
Date: Fri, 31 Oct 2025 14:37:32 +0100
Subject: [PATCH 015/186] fix(e2e): Add p-map override to fix React Router 7
 test builds (#18068)

Fixes ERR_REQUIRE_ESM error in React Router 7 E2E tests by pinning p-map
to v4 which supports CommonJS, resolving incompatibility with
@react-router/dev v7.5+ that uses require() instead of dynamic import().

React Router should fix this upstream, this is a workaround now.
---
 .../react-router-7-framework-node-20-18/package.json         | 5 +++++
 .../react-router-7-framework-spa-node-20-18/package.json     | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-framework-node-20-18/package.json b/dev-packages/e2e-tests/test-applications/react-router-7-framework-node-20-18/package.json
index e9f1f0d51504..14c507288dc8 100644
--- a/dev-packages/e2e-tests/test-applications/react-router-7-framework-node-20-18/package.json
+++ b/dev-packages/e2e-tests/test-applications/react-router-7-framework-node-20-18/package.json
@@ -55,5 +55,10 @@
   "volta": {
     "extends": "../../package.json",
     "node": "20.18.2"
+  },
+  "pnpm": {
+    "overrides": {
+      "p-map": "^4.0.0"
+    }
   }
 }
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa-node-20-18/package.json b/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa-node-20-18/package.json
index 4ad6fae68416..e48333090c1c 100644
--- a/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa-node-20-18/package.json
+++ b/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa-node-20-18/package.json
@@ -53,5 +53,10 @@
   "volta": {
     "extends": "../../package.json",
     "node": "20.18.2"
+  },
+  "pnpm": {
+    "overrides": {
+      "p-map": "^4.0.0"
+    }
   }
 }

From 9bdd19f20ca377925cd33ac7f435e0306bd3d1dd Mon Sep 17 00:00:00 2001
From: Abdelrahman Awad <me@awad.dev>
Date: Fri, 31 Oct 2025 16:31:58 +0200
Subject: [PATCH 016/186] chore(tests): pass test flags through to the test
 command (#18062)

When running tests, sometimes it is useful to target specific tests or
to pass flags like `--debug` to the playwright test command.

With this PR you can do:

```
yarn test:run app-name -g "captures error thrown on click" --debug
```
---
 dev-packages/e2e-tests/run.ts | 43 +++++++++++++++++++++++++++--------
 1 file changed, 34 insertions(+), 9 deletions(-)

diff --git a/dev-packages/e2e-tests/run.ts b/dev-packages/e2e-tests/run.ts
index cb2685ec0489..5312dc664cee 100644
--- a/dev-packages/e2e-tests/run.ts
+++ b/dev-packages/e2e-tests/run.ts
@@ -12,17 +12,38 @@ const DEFAULT_DSN = 'https://username@domain/123';
 const DEFAULT_SENTRY_ORG_SLUG = 'sentry-javascript-sdks';
 const DEFAULT_SENTRY_PROJECT = 'sentry-javascript-e2e-tests';
 
-function asyncExec(command: string, options: { env: Record<string, string | undefined>; cwd: string }): Promise<void> {
+function asyncExec(
+  command: string | string[],
+  options: { env: Record<string, string | undefined>; cwd: string },
+): Promise<void> {
   return new Promise((resolve, reject) => {
-    const process = spawn(command, { ...options, shell: true });
+    // If command is an array, use spawn with separate command and args (safer)
+    // If command is a string, maintain backward compatibility with shell: true
+    let process: ReturnType<typeof spawn>;
+    if (typeof command === 'string') {
+      process = spawn(command, { ...options, shell: true });
+    } else {
+      if (command.length === 0) {
+        return reject(new Error('Command array cannot be empty'));
+      }
+      const cmd = command[0];
+      if (!cmd) {
+        return reject(new Error('Command array cannot be empty'));
+      }
+      process = spawn(cmd, command.slice(1), { ...options, shell: false });
+    }
 
-    process.stdout.on('data', data => {
-      console.log(`${data}`);
-    });
+    if (process.stdout) {
+      process.stdout.on('data', data => {
+        console.log(`${data}`);
+      });
+    }
 
-    process.stderr.on('data', data => {
-      console.error(`${data}`);
-    });
+    if (process.stderr) {
+      process.stderr.on('data', data => {
+        console.error(`${data}`);
+      });
+    }
 
     process.on('error', error => {
       reject(error);
@@ -43,6 +64,8 @@ async function run(): Promise<void> {
 
   // Allow to run a single app only via `yarn test:run <app-name>`
   const appName = process.argv[2] || '';
+  // Forward any additional flags to the test command
+  const testFlags = process.argv.slice(3);
 
   const dsn = process.env.E2E_TEST_DSN || DEFAULT_DSN;
 
@@ -87,7 +110,9 @@ async function run(): Promise<void> {
       await asyncExec('volta run pnpm test:build', { env, cwd });
 
       console.log(`Testing ${testAppPath}...`);
-      await asyncExec('volta run pnpm test:assert', { env, cwd });
+      // Pass command and arguments as an array to prevent command injection
+      const testCommand = ['volta', 'run', 'pnpm', 'test:assert', ...testFlags];
+      await asyncExec(testCommand, { env, cwd });
 
       // clean up (although this is tmp, still nice to do)
       await rm(tmpDirPath, { recursive: true });

From 94190f8c172155b62e9d6dfea130b00b17a20441 Mon Sep 17 00:00:00 2001
From: Abdelrahman Awad <me@awad.dev>
Date: Fri, 31 Oct 2025 16:32:26 +0200
Subject: [PATCH 017/186] fix(browser-utils): cache element names for INP
 (#18052)

Fixes interaction elements showing up as `<unknown>` in case they get
removed from the DOM.

The implementation adds global listeners to listen for interaction
events and store the most recent 50 events in an LRU-like cache then
matches that with the performance entry timestamp.
---
 .size-limit.js                                |  8 +-
 .../metrics/web-vitals-inp-navigate/test.ts   |  2 +-
 packages/browser-utils/src/metrics/inp.ts     | 86 +++++++++++++++++--
 .../browser-utils/test/metrics/inpt.test.ts   | 31 +++++++
 4 files changed, 113 insertions(+), 14 deletions(-)

diff --git a/.size-limit.js b/.size-limit.js
index ed7fbc7ccc80..cada598de81b 100644
--- a/.size-limit.js
+++ b/.size-limit.js
@@ -38,7 +38,7 @@ module.exports = [
     path: 'packages/browser/build/npm/esm/index.js',
     import: createImport('init', 'browserTracingIntegration'),
     gzip: true,
-    limit: '41 KB',
+    limit: '41.3 KB',
   },
   {
     name: '@sentry/browser (incl. Tracing, Profiling)',
@@ -127,7 +127,7 @@ module.exports = [
     import: createImport('init', 'ErrorBoundary', 'reactRouterV6BrowserTracingIntegration'),
     ignore: ['react/jsx-runtime'],
     gzip: true,
-    limit: '43 KB',
+    limit: '43.3 KB',
   },
   // Vue SDK (ESM)
   {
@@ -142,7 +142,7 @@ module.exports = [
     path: 'packages/vue/build/esm/index.js',
     import: createImport('init', 'browserTracingIntegration'),
     gzip: true,
-    limit: '43 KB',
+    limit: '43.1 KB',
   },
   // Svelte SDK (ESM)
   {
@@ -190,7 +190,7 @@ module.exports = [
     path: createCDNPath('bundle.tracing.min.js'),
     gzip: false,
     brotli: false,
-    limit: '124 KB',
+    limit: '124.1 KB',
   },
   {
     name: 'CDN Bundle (incl. Tracing, Replay) - uncompressed',
diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-navigate/test.ts b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-navigate/test.ts
index ad7862926ebf..cf3cdb552cbf 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-navigate/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-navigate/test.ts
@@ -159,7 +159,7 @@ sentryTest(
           value: inpValue,
         },
       },
-      description: '<unknown>', // FIXME: currently unable to get the target name when element is removed from DOM
+      description: 'body > nav#navigation > NavigationLink',
       exclusive_time: inpValue,
       op: 'ui.interaction.click',
       origin: 'auto.http.browser.inp',
diff --git a/packages/browser-utils/src/metrics/inp.ts b/packages/browser-utils/src/metrics/inp.ts
index 30a628b5997f..831565f07408 100644
--- a/packages/browser-utils/src/metrics/inp.ts
+++ b/packages/browser-utils/src/metrics/inp.ts
@@ -5,6 +5,7 @@ import {
   getCurrentScope,
   getRootSpan,
   htmlTreeAsString,
+  isBrowser,
   SEMANTIC_ATTRIBUTE_EXCLUSIVE_TIME,
   SEMANTIC_ATTRIBUTE_SENTRY_MEASUREMENT_UNIT,
   SEMANTIC_ATTRIBUTE_SENTRY_MEASUREMENT_VALUE,
@@ -12,6 +13,7 @@ import {
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   spanToJSON,
 } from '@sentry/core';
+import { WINDOW } from '../types';
 import type { InstrumentationHandlerCallback } from './instrument';
 import {
   addInpInstrumentationHandler,
@@ -20,8 +22,16 @@ import {
 } from './instrument';
 import { getBrowserPerformanceAPI, msToSec, startStandaloneWebVitalSpan } from './utils';
 
+interface InteractionContext {
+  span: Span | undefined;
+  elementName: string;
+}
+
 const LAST_INTERACTIONS: number[] = [];
-const INTERACTIONS_SPAN_MAP = new Map<number, Span>();
+const INTERACTIONS_SPAN_MAP = new Map<number, InteractionContext>();
+
+// Map to store element names by timestamp, since we get the DOM event before the PerformanceObserver entry
+const ELEMENT_NAME_TIMESTAMP_MAP = new Map<number, string>();
 
 /**
  * 60 seconds is the maximum for a plausible INP value
@@ -111,17 +121,17 @@ export const _onInp: InstrumentationHandlerCallback = ({ metric }) => {
   const activeSpan = getActiveSpan();
   const rootSpan = activeSpan ? getRootSpan(activeSpan) : undefined;
 
-  // We first try to lookup the span from our INTERACTIONS_SPAN_MAP,
-  // where we cache the route per interactionId
-  const cachedSpan = interactionId != null ? INTERACTIONS_SPAN_MAP.get(interactionId) : undefined;
+  // We first try to lookup the interaction context from our INTERACTIONS_SPAN_MAP,
+  // where we cache the route and element name per interactionId
+  const cachedInteractionContext = interactionId != null ? INTERACTIONS_SPAN_MAP.get(interactionId) : undefined;
 
-  const spanToUse = cachedSpan || rootSpan;
+  const spanToUse = cachedInteractionContext?.span || rootSpan;
 
   // Else, we try to use the active span.
   // Finally, we fall back to look at the transactionName on the scope
   const routeName = spanToUse ? spanToJSON(spanToUse).description : getCurrentScope().getScopeData().transactionName;
 
-  const name = htmlTreeAsString(entry.target);
+  const name = cachedInteractionContext?.elementName || htmlTreeAsString(entry.target);
   const attributes: SpanAttributes = {
     [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.browser.inp',
     [SEMANTIC_ATTRIBUTE_SENTRY_OP]: `ui.interaction.${interactionType}`,
@@ -149,12 +159,65 @@ export const _onInp: InstrumentationHandlerCallback = ({ metric }) => {
  * Register a listener to cache route information for INP interactions.
  */
 export function registerInpInteractionListener(): void {
+  // Listen for all interaction events that could contribute to INP
+  const interactionEvents = Object.keys(INP_ENTRY_MAP);
+  if (isBrowser()) {
+    interactionEvents.forEach(eventType => {
+      WINDOW.addEventListener(eventType, captureElementFromEvent, { capture: true, passive: true });
+    });
+  }
+
+  /**
+   * Captures the element name from a DOM event and stores it in the ELEMENT_NAME_TIMESTAMP_MAP.
+   */
+  function captureElementFromEvent(event: Event): void {
+    const target = event.target as HTMLElement | null;
+    if (!target) {
+      return;
+    }
+
+    const elementName = htmlTreeAsString(target);
+    const timestamp = Math.round(event.timeStamp);
+
+    // Store the element name by timestamp so we can match it with the PerformanceEntry
+    ELEMENT_NAME_TIMESTAMP_MAP.set(timestamp, elementName);
+
+    // Clean up old
+    if (ELEMENT_NAME_TIMESTAMP_MAP.size > 50) {
+      const firstKey = ELEMENT_NAME_TIMESTAMP_MAP.keys().next().value;
+      if (firstKey !== undefined) {
+        ELEMENT_NAME_TIMESTAMP_MAP.delete(firstKey);
+      }
+    }
+  }
+
+  /**
+   * Tries to get the element name from the timestamp map.
+   */
+  function resolveElementNameFromEntry(entry: PerformanceEntry): string {
+    const timestamp = Math.round(entry.startTime);
+    let elementName = ELEMENT_NAME_TIMESTAMP_MAP.get(timestamp);
+
+    // try nearby timestamps (±5ms)
+    if (!elementName) {
+      for (let offset = -5; offset <= 5; offset++) {
+        const nearbyName = ELEMENT_NAME_TIMESTAMP_MAP.get(timestamp + offset);
+        if (nearbyName) {
+          elementName = nearbyName;
+          break;
+        }
+      }
+    }
+
+    return elementName || '<unknown>';
+  }
+
   const handleEntries = ({ entries }: { entries: PerformanceEntry[] }): void => {
     const activeSpan = getActiveSpan();
     const activeRootSpan = activeSpan && getRootSpan(activeSpan);
 
     entries.forEach(entry => {
-      if (!isPerformanceEventTiming(entry) || !activeRootSpan) {
+      if (!isPerformanceEventTiming(entry)) {
         return;
       }
 
@@ -168,6 +231,8 @@ export function registerInpInteractionListener(): void {
         return;
       }
 
+      const elementName = entry.target ? htmlTreeAsString(entry.target) : resolveElementNameFromEntry(entry);
+
       // We keep max. 10 interactions in the list, then remove the oldest one & clean up
       if (LAST_INTERACTIONS.length > 10) {
         const last = LAST_INTERACTIONS.shift() as number;
@@ -175,9 +240,12 @@ export function registerInpInteractionListener(): void {
       }
 
       // We add the interaction to the list of recorded interactions
-      // and store the span for this interaction
+      // and store both the span and element name for this interaction
       LAST_INTERACTIONS.push(interactionId);
-      INTERACTIONS_SPAN_MAP.set(interactionId, activeRootSpan);
+      INTERACTIONS_SPAN_MAP.set(interactionId, {
+        span: activeRootSpan,
+        elementName,
+      });
     });
   };
 
diff --git a/packages/browser-utils/test/metrics/inpt.test.ts b/packages/browser-utils/test/metrics/inpt.test.ts
index bfa44b17a5b4..f53fa40bf6da 100644
--- a/packages/browser-utils/test/metrics/inpt.test.ts
+++ b/packages/browser-utils/test/metrics/inpt.test.ts
@@ -113,4 +113,35 @@ describe('_onInp', () => {
       transaction: undefined,
     });
   });
+
+  it('uses <unknown> as element name when entry.target is null and no cached name exists', () => {
+    const startStandaloneWebVitalSpanSpy = vi.spyOn(utils, 'startStandaloneWebVitalSpan');
+
+    const metric = {
+      value: 150,
+      entries: [
+        {
+          name: 'click',
+          duration: 150,
+          interactionId: 999,
+          target: null, // Element was removed from DOM
+          startTime: 1234567,
+        },
+      ],
+    };
+    // @ts-expect-error - incomplete metric object
+    _onInp({ metric });
+
+    expect(startStandaloneWebVitalSpanSpy).toHaveBeenCalledTimes(1);
+    expect(startStandaloneWebVitalSpanSpy).toHaveBeenCalledWith({
+      attributes: {
+        'sentry.exclusive_time': 150,
+        'sentry.op': 'ui.interaction.click',
+        'sentry.origin': 'auto.http.browser.inp',
+      },
+      name: '<unknown>', // Should fall back to <unknown> when element cannot be determined
+      startTime: expect.any(Number),
+      transaction: undefined,
+    });
+  });
 });

From fbadeb81d23c03c3d852531c2deef59a3a992def Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Mon, 3 Nov 2025 11:37:17 +0100
Subject: [PATCH 018/186] fix(vue): Make `options` parameter optional on
 `attachErrorHandler` (#18072)

Looks like our Vue documentation for how to [dynamically attach an
errorHandler](https://docs.sentry.io/platforms/javascript/guides/vue/features/multiple-apps/#dynamic-initialization)
to a Vue app advertised that `attachErrorHandler` can be called without
having to specify options. Intuitively, this makes sense to me since the
only option we actually read is `attachProps`. We can instead default
this to true (just like in the main Vue init option) and make the
`options` parameter optional.

For v11, we should consider gating prop data attachment behind
`sendDefaultPii`. I added a TODO to the code.

closes https://github.com/getsentry/sentry-javascript/issues/18060
---
 packages/vue/src/errorhandler.ts       |  5 ++--
 packages/vue/test/errorHandler.test.ts | 37 +++++++++++++++++++++-----
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/packages/vue/src/errorhandler.ts b/packages/vue/src/errorhandler.ts
index c18a51492c4a..77ecdb52ce17 100644
--- a/packages/vue/src/errorhandler.ts
+++ b/packages/vue/src/errorhandler.ts
@@ -4,7 +4,7 @@ import { formatComponentName, generateComponentTrace } from './vendor/components
 
 type UnknownFunc = (...args: unknown[]) => void;
 
-export const attachErrorHandler = (app: Vue, options: VueOptions): void => {
+export const attachErrorHandler = (app: Vue, options?: Partial<VueOptions>): void => {
   const { errorHandler: originalErrorHandler } = app.config;
 
   app.config.errorHandler = (error: Error, vm: ViewModel, lifecycleHook: string): void => {
@@ -16,7 +16,8 @@ export const attachErrorHandler = (app: Vue, options: VueOptions): void => {
       trace,
     };
 
-    if (options.attachProps && vm) {
+    // TODO(v11): guard via sendDefaultPii?
+    if (options?.attachProps !== false && vm) {
       // Vue2 - $options.propsData
       // Vue3 - $props
       if (vm.$options?.propsData) {
diff --git a/packages/vue/test/errorHandler.test.ts b/packages/vue/test/errorHandler.test.ts
index 54fd80133017..f70c561fcc66 100644
--- a/packages/vue/test/errorHandler.test.ts
+++ b/packages/vue/test/errorHandler.test.ts
@@ -112,6 +112,25 @@ describe('attachErrorHandler', () => {
               // assert
               t.expect.errorToHaveBeenCaptured().withProps(props);
             });
+
+            test('`propsData` is added, if no options are provided to `attachErrorHandler`', () => {
+              // arrange
+              const props = { stubProp: 'stubData' };
+              const t = testHarness({
+                vm: {
+                  $props: props,
+                },
+                optionsUndefined: true,
+              });
+
+              // act
+              vi.useFakeTimers();
+              expect(() => t.run()).toThrow(DummyError);
+              vi.runAllTimers();
+
+              // assert
+              t.expect.errorToHaveBeenCaptured().withProps(props);
+            });
           });
 
           describe('and `vm.$props` is defined', () => {
@@ -220,6 +239,7 @@ type TestHarnessOpts = {
   enableConsole?: boolean;
   silent?: boolean;
   attachProps?: boolean;
+  optionsUndefined?: boolean;
 };
 
 class DummyError extends Error {
@@ -236,6 +256,7 @@ const testHarness = ({
   enableErrorHandler,
   enableConsole,
   vm,
+  optionsUndefined = false,
 }: TestHarnessOpts) => {
   vi.useFakeTimers();
   const providedErrorHandlerSpy = vi.fn();
@@ -274,13 +295,15 @@ const testHarness = ({
   }
   /* eslint-enable no-global-assign */
 
-  const options: Options = {
-    attachProps: !!attachProps,
-    tracingOptions: {},
-    trackComponents: [],
-    timeout: 0,
-    hooks: [] as Operation[],
-  };
+  const options: Options | undefined = optionsUndefined
+    ? undefined
+    : {
+        attachProps: !!attachProps,
+        tracingOptions: {},
+        trackComponents: [],
+        timeout: 0,
+        hooks: [] as Operation[],
+      };
 
   return {
     run: () => {

From 3deeecd8d5e5d3b4be68c7e22982e2d0d26a1a62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Peer=20St=C3=B6cklmair?= <jan.oster94@gmail.com>
Date: Mon, 3 Nov 2025 13:46:51 +0100
Subject: [PATCH 019/186] fix(cloudflare): Ensure types for cloudflare handlers
 (#18064)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is fixing type safety for Cloudflare handlers. With that change the
tests have the correct types and vitest can run through 🚀
---
 .../test-applications/cloudflare-hono/.npmrc       |  2 ++
 .../test-applications/cloudflare-hono/package.json |  2 +-
 packages/cloudflare/src/handler.ts                 | 14 ++++++++++----
 3 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 dev-packages/e2e-tests/test-applications/cloudflare-hono/.npmrc

diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-hono/.npmrc b/dev-packages/e2e-tests/test-applications/cloudflare-hono/.npmrc
new file mode 100644
index 000000000000..070f80f05092
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-hono/.npmrc
@@ -0,0 +1,2 @@
+@sentry:registry=http://127.0.0.1:4873
+@sentry-internal:registry=http://127.0.0.1:4873
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-hono/package.json b/dev-packages/e2e-tests/test-applications/cloudflare-hono/package.json
index b005398a5faf..de22031fdda9 100644
--- a/dev-packages/e2e-tests/test-applications/cloudflare-hono/package.json
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-hono/package.json
@@ -8,7 +8,7 @@
     "cf-typegen": "wrangler types --env-interface CloudflareBindings",
     "test:build": "pnpm install && pnpm build",
     "//": "Just checking if it builds correctly and types don't break",
-    "test:assert": "pnpm typecheck"
+    "test:assert": "pnpm typecheck && vitest run ."
   },
   "dependencies": {
     "@sentry/cloudflare": "latest || *",
diff --git a/packages/cloudflare/src/handler.ts b/packages/cloudflare/src/handler.ts
index e3e108b913d7..8c6d02791d0f 100644
--- a/packages/cloudflare/src/handler.ts
+++ b/packages/cloudflare/src/handler.ts
@@ -29,10 +29,16 @@ import { copyExecutionContext } from './utils/copyExecutionContext';
  * @returns The wrapped handler.
  */
 // eslint-disable-next-line complexity
-export function withSentry<Env = unknown, QueueHandlerMessage = unknown, CfHostMetadata = unknown>(
-  optionsCallback: (env: Env) => CloudflareOptions,
-  handler: ExportedHandler<Env, QueueHandlerMessage, CfHostMetadata>,
-): ExportedHandler<Env, QueueHandlerMessage, CfHostMetadata> {
+export function withSentry<
+  Env = unknown,
+  QueueHandlerMessage = unknown,
+  CfHostMetadata = unknown,
+  T extends ExportedHandler<Env, QueueHandlerMessage, CfHostMetadata> = ExportedHandler<
+    Env,
+    QueueHandlerMessage,
+    CfHostMetadata
+  >,
+>(optionsCallback: (env: Env) => CloudflareOptions, handler: T): T {
   setAsyncLocalStorageAsyncContextStrategy();
 
   try {

From b57ade162d83c3b3893af456082504c24d10bf16 Mon Sep 17 00:00:00 2001
From: Abdelrahman Awad <me@awad.dev>
Date: Mon, 3 Nov 2025 16:58:11 +0200
Subject: [PATCH 020/186] fix(nuxt): Added top-level fallback exports (#18083)

It seems that in some cases where an `environment` in Vite is set to
something other than `node` or `browser`, it won't be able to figure out
the correct import paths.

This PR ensures that when Vite (or other tools) can't determine the
environment from "browser" or "node" conditions alone, then it falls
back to the server bundle similar to what we do in Next.js.

In the issue's case it was set to `nuxt` or rather
`vitest-environment-nuxt` which doesn't seem like a pattern to account
for.

closes #18070
---
 packages/nuxt/package.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json
index 4402f3bc4510..9bcd39309a60 100644
--- a/packages/nuxt/package.json
+++ b/packages/nuxt/package.json
@@ -27,7 +27,9 @@
       "node": {
         "import": "./build/esm/index.server.js",
         "require": "./build/cjs/index.server.js"
-      }
+      },
+      "import": "./build/esm/index.server.js",
+      "require": "./build/cjs/index.server.js"
     },
     "./module": {
       "types": "./build/module/types.d.ts",

From 600e27a62f4931b10ec42fd28a9b5d0929b75808 Mon Sep 17 00:00:00 2001
From: Rola Abuhasna <rola.abuhasna@sentry.io>
Date: Mon, 3 Nov 2025 17:20:41 +0100
Subject: [PATCH 021/186] fix(browser): Capture unhandled rejection errors for
 web worker integration (#18054)

Previously, only synchronous errors thrown in web workers would bubble
up and be captured. Unhandled promise rejections within workers would
fail silently since they don't propagate to the parent thread
automatically. This enhancement ensures complete error coverage for web
worker code.
---
 .../integrations/webWorker/assets/worker.js   |  20 +++
 .../suites/integrations/webWorker/init.js     |  11 +-
 .../integrations/webWorker/template.html      |   1 +
 .../suites/integrations/webWorker/test.ts     |  29 ++++
 .../src/integrations/globalhandlers.ts        |   7 +-
 .../browser/src/integrations/webWorker.ts     | 146 +++++++++++++++---
 .../test/integrations/webWorker.test.ts       |   2 +
 7 files changed, 194 insertions(+), 22 deletions(-)

diff --git a/dev-packages/browser-integration-tests/suites/integrations/webWorker/assets/worker.js b/dev-packages/browser-integration-tests/suites/integrations/webWorker/assets/worker.js
index 59af46d764e2..8b70a34fc46e 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/webWorker/assets/worker.js
+++ b/dev-packages/browser-integration-tests/suites/integrations/webWorker/assets/worker.js
@@ -1,14 +1,34 @@
+// This worker manually replicates what Sentry.registerWebWorker() does
+// (In real code with a bundler, you'd import and call Sentry.registerWebWorker({ self }))
+
 self._sentryDebugIds = {
   'Error at http://sentry-test.io/worker.js': 'worker-debug-id-789',
 };
 
+// Send debug IDs
 self.postMessage({
   _sentryMessage: true,
   _sentryDebugIds: self._sentryDebugIds,
 });
 
+// Set up unhandledrejection handler (same as registerWebWorker)
+self.addEventListener('unhandledrejection', event => {
+  self.postMessage({
+    _sentryMessage: true,
+    _sentryWorkerError: {
+      reason: event.reason,
+      filename: self.location.href,
+    },
+  });
+});
+
 self.addEventListener('message', event => {
   if (event.data.type === 'throw-error') {
     throw new Error('Worker error for testing');
   }
+
+  if (event.data.type === 'throw-rejection') {
+    // Create an unhandled rejection
+    Promise.reject(new Error('Worker unhandled rejection'));
+  }
 });
diff --git a/dev-packages/browser-integration-tests/suites/integrations/webWorker/init.js b/dev-packages/browser-integration-tests/suites/integrations/webWorker/init.js
index aa08cd652418..100b16a2d408 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/webWorker/init.js
+++ b/dev-packages/browser-integration-tests/suites/integrations/webWorker/init.js
@@ -9,10 +9,17 @@ const worker = new Worker('/worker.js');
 
 Sentry.addIntegration(Sentry.webWorkerIntegration({ worker }));
 
-const btn = document.getElementById('errWorker');
+const btnError = document.getElementById('errWorker');
+const btnRejection = document.getElementById('rejectionWorker');
 
-btn.addEventListener('click', () => {
+btnError.addEventListener('click', () => {
   worker.postMessage({
     type: 'throw-error',
   });
 });
+
+btnRejection.addEventListener('click', () => {
+  worker.postMessage({
+    type: 'throw-rejection',
+  });
+});
diff --git a/dev-packages/browser-integration-tests/suites/integrations/webWorker/template.html b/dev-packages/browser-integration-tests/suites/integrations/webWorker/template.html
index 1c36227c5a3d..d1124baa59a9 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/webWorker/template.html
+++ b/dev-packages/browser-integration-tests/suites/integrations/webWorker/template.html
@@ -5,5 +5,6 @@
   </head>
   <body>
     <button id="errWorker">Throw error in worker</button>
+    <button id="rejectionWorker">Throw unhandled rejection in worker</button>
   </body>
 </html>
diff --git a/dev-packages/browser-integration-tests/suites/integrations/webWorker/test.ts b/dev-packages/browser-integration-tests/suites/integrations/webWorker/test.ts
index bb5adf0ac70a..8133a24253f9 100644
--- a/dev-packages/browser-integration-tests/suites/integrations/webWorker/test.ts
+++ b/dev-packages/browser-integration-tests/suites/integrations/webWorker/test.ts
@@ -36,3 +36,32 @@ sentryTest('Assigns web worker debug IDs when using webWorkerIntegration', async
     expect(image.code_file).toEqual('http://sentry-test.io/worker.js');
   });
 });
+
+sentryTest('Captures unhandled rejections from web workers', async ({ getLocalTestUrl, page }) => {
+  const bundle = process.env.PW_BUNDLE;
+  if (bundle != null && !bundle.includes('esm') && !bundle.includes('cjs')) {
+    sentryTest.skip();
+  }
+
+  const url = await getLocalTestUrl({ testDir: __dirname });
+
+  const errorEventPromise = getFirstSentryEnvelopeRequest<Event>(page, url);
+
+  page.route('**/worker.js', route => {
+    route.fulfill({
+      path: `${__dirname}/assets/worker.js`,
+    });
+  });
+
+  const button = page.locator('#rejectionWorker');
+  await button.click();
+
+  const errorEvent = await errorEventPromise;
+
+  // Verify the unhandled rejection was captured
+  expect(errorEvent.exception?.values?.[0]?.value).toContain('Worker unhandled rejection');
+  expect(errorEvent.exception?.values?.[0]?.mechanism?.type).toBe('auto.browser.web_worker.onunhandledrejection');
+  expect(errorEvent.exception?.values?.[0]?.mechanism?.handled).toBe(false);
+  expect(errorEvent.contexts?.worker).toBeDefined();
+  expect(errorEvent.contexts?.worker?.filename).toContain('worker.js');
+});
diff --git a/packages/browser/src/integrations/globalhandlers.ts b/packages/browser/src/integrations/globalhandlers.ts
index fa815db7c15e..aa7b2fa9e412 100644
--- a/packages/browser/src/integrations/globalhandlers.ts
+++ b/packages/browser/src/integrations/globalhandlers.ts
@@ -104,7 +104,10 @@ function _installGlobalOnUnhandledRejectionHandler(client: Client): void {
   });
 }
 
-function _getUnhandledRejectionError(error: unknown): unknown {
+/**
+ *
+ */
+export function _getUnhandledRejectionError(error: unknown): unknown {
   if (isPrimitive(error)) {
     return error;
   }
@@ -138,7 +141,7 @@ function _getUnhandledRejectionError(error: unknown): unknown {
  * @param reason: The `reason` property of the promise rejection
  * @returns An Event object with an appropriate `exception` value
  */
-function _eventFromRejectionWithPrimitive(reason: Primitive): Event {
+export function _eventFromRejectionWithPrimitive(reason: Primitive): Event {
   return {
     exception: {
       values: [
diff --git a/packages/browser/src/integrations/webWorker.ts b/packages/browser/src/integrations/webWorker.ts
index 1f7a266a9c8e..e95e161e703c 100644
--- a/packages/browser/src/integrations/webWorker.ts
+++ b/packages/browser/src/integrations/webWorker.ts
@@ -1,13 +1,21 @@
 import type { Integration, IntegrationFn } from '@sentry/core';
-import { debug, defineIntegration, isPlainObject } from '@sentry/core';
+import { captureEvent, debug, defineIntegration, getClient, isPlainObject, isPrimitive } from '@sentry/core';
 import { DEBUG_BUILD } from '../debug-build';
+import { eventFromUnknownInput } from '../eventbuilder';
 import { WINDOW } from '../helpers';
+import { _eventFromRejectionWithPrimitive, _getUnhandledRejectionError } from './globalhandlers';
 
 export const INTEGRATION_NAME = 'WebWorker';
 
 interface WebWorkerMessage {
   _sentryMessage: boolean;
   _sentryDebugIds?: Record<string, string>;
+  _sentryWorkerError?: SerializedWorkerError;
+}
+
+interface SerializedWorkerError {
+  reason: unknown;
+  filename?: string;
 }
 
 interface WebWorkerIntegrationOptions {
@@ -94,25 +102,75 @@ interface WebWorkerIntegration extends Integration {
 export const webWorkerIntegration = defineIntegration(({ worker }: WebWorkerIntegrationOptions) => ({
   name: INTEGRATION_NAME,
   setupOnce: () => {
-    (Array.isArray(worker) ? worker : [worker]).forEach(w => listenForSentryDebugIdMessages(w));
+    (Array.isArray(worker) ? worker : [worker]).forEach(w => listenForSentryMessages(w));
   },
-  addWorker: (worker: Worker) => listenForSentryDebugIdMessages(worker),
+  addWorker: (worker: Worker) => listenForSentryMessages(worker),
 })) as IntegrationFn<WebWorkerIntegration>;
 
-function listenForSentryDebugIdMessages(worker: Worker): void {
+function listenForSentryMessages(worker: Worker): void {
   worker.addEventListener('message', event => {
-    if (isSentryDebugIdMessage(event.data)) {
+    if (isSentryMessage(event.data)) {
       event.stopImmediatePropagation(); // other listeners should not receive this message
-      DEBUG_BUILD && debug.log('Sentry debugId web worker message received', event.data);
-      WINDOW._sentryDebugIds = {
-        ...event.data._sentryDebugIds,
-        // debugIds of the main thread have precedence over the worker's in case of a collision.
-        ...WINDOW._sentryDebugIds,
-      };
+
+      // Handle debug IDs
+      if (event.data._sentryDebugIds) {
+        DEBUG_BUILD && debug.log('Sentry debugId web worker message received', event.data);
+        WINDOW._sentryDebugIds = {
+          ...event.data._sentryDebugIds,
+          // debugIds of the main thread have precedence over the worker's in case of a collision.
+          ...WINDOW._sentryDebugIds,
+        };
+      }
+
+      // Handle unhandled rejections forwarded from worker
+      if (event.data._sentryWorkerError) {
+        DEBUG_BUILD && debug.log('Sentry worker rejection message received', event.data._sentryWorkerError);
+        handleForwardedWorkerRejection(event.data._sentryWorkerError);
+      }
     }
   });
 }
 
+function handleForwardedWorkerRejection(workerError: SerializedWorkerError): void {
+  const client = getClient();
+  if (!client) {
+    return;
+  }
+
+  const stackParser = client.getOptions().stackParser;
+  const attachStacktrace = client.getOptions().attachStacktrace;
+
+  const error = workerError.reason;
+
+  // Follow same pattern as globalHandlers for unhandledrejection
+  // Handle both primitives and errors the same way
+  const event = isPrimitive(error)
+    ? _eventFromRejectionWithPrimitive(error)
+    : eventFromUnknownInput(stackParser, error, undefined, attachStacktrace, true);
+
+  event.level = 'error';
+
+  // Add worker-specific context
+  if (workerError.filename) {
+    event.contexts = {
+      ...event.contexts,
+      worker: {
+        filename: workerError.filename,
+      },
+    };
+  }
+
+  captureEvent(event, {
+    originalException: error,
+    mechanism: {
+      handled: false,
+      type: 'auto.browser.web_worker.onunhandledrejection',
+    },
+  });
+
+  DEBUG_BUILD && debug.log('Captured worker unhandled rejection', error);
+}
+
 /**
  * Minimal interface for DedicatedWorkerGlobalScope, only requiring the postMessage method.
  * (which is the only thing we need from the worker's global object)
@@ -124,6 +182,8 @@ function listenForSentryDebugIdMessages(worker: Worker): void {
  */
 interface MinimalDedicatedWorkerGlobalScope {
   postMessage: (message: unknown) => void;
+  addEventListener: (type: string, listener: (event: unknown) => void) => void;
+  location?: { href?: string };
 }
 
 interface RegisterWebWorkerOptions {
@@ -133,6 +193,14 @@ interface RegisterWebWorkerOptions {
 /**
  * Use this function to register the worker with the Sentry SDK.
  *
+ * This function will:
+ * - Send debug IDs to the parent thread
+ * - Set up a handler for unhandled rejections in the worker
+ * - Forward unhandled rejections to the parent thread for capture
+ *
+ * Note: Synchronous errors in workers are already captured by globalHandlers.
+ * This only handles unhandled promise rejections which don't bubble to the parent.
+ *
  * @example
  * ```ts filename={worker.js}
  * import * as Sentry from '@sentry/<your-sdk>';
@@ -147,17 +215,59 @@ interface RegisterWebWorkerOptions {
  *   - `self`: The worker instance you're calling this function from (self).
  */
 export function registerWebWorker({ self }: RegisterWebWorkerOptions): void {
+  // Send debug IDs to parent thread
   self.postMessage({
     _sentryMessage: true,
     _sentryDebugIds: self._sentryDebugIds ?? undefined,
   });
+
+  // Set up unhandledrejection handler inside the worker
+  // Following the same pattern as globalHandlers
+  // unhandled rejections don't bubble to the parent thread, so we need to handle them here
+  self.addEventListener('unhandledrejection', (event: unknown) => {
+    const reason = _getUnhandledRejectionError(event);
+
+    // Forward the raw reason to parent thread
+    // The parent will handle primitives vs errors the same way globalHandlers does
+    const serializedError: SerializedWorkerError = {
+      reason: reason,
+      filename: self.location?.href,
+    };
+
+    // Forward to parent thread
+    self.postMessage({
+      _sentryMessage: true,
+      _sentryWorkerError: serializedError,
+    });
+
+    DEBUG_BUILD && debug.log('[Sentry Worker] Forwarding unhandled rejection to parent', serializedError);
+  });
+
+  DEBUG_BUILD && debug.log('[Sentry Worker] Registered worker with unhandled rejection handling');
 }
 
-function isSentryDebugIdMessage(eventData: unknown): eventData is WebWorkerMessage {
-  return (
-    isPlainObject(eventData) &&
-    eventData._sentryMessage === true &&
-    '_sentryDebugIds' in eventData &&
-    (isPlainObject(eventData._sentryDebugIds) || eventData._sentryDebugIds === undefined)
-  );
+function isSentryMessage(eventData: unknown): eventData is WebWorkerMessage {
+  if (!isPlainObject(eventData) || eventData._sentryMessage !== true) {
+    return false;
+  }
+
+  // Must have at least one of: debug IDs or worker error
+  const hasDebugIds = '_sentryDebugIds' in eventData;
+  const hasWorkerError = '_sentryWorkerError' in eventData;
+
+  if (!hasDebugIds && !hasWorkerError) {
+    return false;
+  }
+
+  // Validate debug IDs if present
+  if (hasDebugIds && !(isPlainObject(eventData._sentryDebugIds) || eventData._sentryDebugIds === undefined)) {
+    return false;
+  }
+
+  // Validate worker error if present
+  if (hasWorkerError && !isPlainObject(eventData._sentryWorkerError)) {
+    return false;
+  }
+
+  return true;
 }
diff --git a/packages/browser/test/integrations/webWorker.test.ts b/packages/browser/test/integrations/webWorker.test.ts
index 4dfea4983949..b72895621339 100644
--- a/packages/browser/test/integrations/webWorker.test.ts
+++ b/packages/browser/test/integrations/webWorker.test.ts
@@ -216,6 +216,7 @@ describe('webWorkerIntegration', () => {
 describe('registerWebWorker', () => {
   let mockWorkerSelf: {
     postMessage: ReturnType<typeof vi.fn>;
+    addEventListener: ReturnType<typeof vi.fn>;
     _sentryDebugIds?: Record<string, string>;
   };
 
@@ -224,6 +225,7 @@ describe('registerWebWorker', () => {
 
     mockWorkerSelf = {
       postMessage: vi.fn(),
+      addEventListener: vi.fn(),
     };
   });
 

From 33d58986e8ce32d7899c1b684ef3be513f93eb72 Mon Sep 17 00:00:00 2001
From: Charly Gomez <charly.gomez@sentry.io>
Date: Tue, 4 Nov 2025 10:33:57 +0100
Subject: [PATCH 022/186] fix(nextjs): Update proxy template wrapping (#18086)

This fixes an issue when we are wrapping Next.js 16+ proxy.ts files, the
webpack loader was exporting both middleware and proxy named exports,
causing Next.js to potentially treat proxy files incorrectly as
middleware files.

closes https://github.com/getsentry/sentry-javascript/issues/18001
---
 .../templates/middlewareWrapperTemplate.ts    |  16 +-
 .../nextjs/test/config/wrappingLoader.test.ts | 147 ++++++++++++++++++
 2 files changed, 159 insertions(+), 4 deletions(-)

diff --git a/packages/nextjs/src/config/templates/middlewareWrapperTemplate.ts b/packages/nextjs/src/config/templates/middlewareWrapperTemplate.ts
index 236f4eff3999..30c77cf32952 100644
--- a/packages/nextjs/src/config/templates/middlewareWrapperTemplate.ts
+++ b/packages/nextjs/src/config/templates/middlewareWrapperTemplate.ts
@@ -26,13 +26,17 @@ const userApiModule = origModule as NextApiModule;
 // the case Next.js wil crash during runtime but the Sentry SDK should definitely not crash so we need tohandle it.
 let userProvidedNamedHandler: EdgeRouteHandler | undefined = undefined;
 let userProvidedDefaultHandler: EdgeRouteHandler | undefined = undefined;
+let userProvidedMiddleware = false;
+let userProvidedProxy = false;
 
 if ('middleware' in userApiModule && typeof userApiModule.middleware === 'function') {
   // Handle when user defines via named ESM export: `export { middleware };`
   userProvidedNamedHandler = userApiModule.middleware;
+  userProvidedMiddleware = true;
 } else if ('proxy' in userApiModule && typeof userApiModule.proxy === 'function') {
   // Handle when user defines via named ESM export (Next.js 16): `export { proxy };`
   userProvidedNamedHandler = userApiModule.proxy;
+  userProvidedProxy = true;
 } else if ('default' in userApiModule && typeof userApiModule.default === 'function') {
   // Handle when user defines via ESM export: `export default myFunction;`
   userProvidedDefaultHandler = userApiModule.default;
@@ -41,10 +45,14 @@ if ('middleware' in userApiModule && typeof userApiModule.middleware === 'functi
   userProvidedDefaultHandler = userApiModule;
 }
 
-export const middleware = userProvidedNamedHandler
-  ? Sentry.wrapMiddlewareWithSentry(userProvidedNamedHandler)
-  : undefined;
-export const proxy = userProvidedNamedHandler ? Sentry.wrapMiddlewareWithSentry(userProvidedNamedHandler) : undefined;
+// Wrap the handler that the user provided (middleware, proxy, or default)
+// We preserve the original export names so Next.js can handle its internal renaming logic
+const wrappedHandler = userProvidedNamedHandler ? Sentry.wrapMiddlewareWithSentry(userProvidedNamedHandler) : undefined;
+
+// Only export the named export that the user actually provided
+// This ensures Next.js sees the same export structure and can apply its renaming logic
+export const middleware = userProvidedMiddleware ? wrappedHandler : undefined;
+export const proxy = userProvidedProxy ? wrappedHandler : undefined;
 export default userProvidedDefaultHandler ? Sentry.wrapMiddlewareWithSentry(userProvidedDefaultHandler) : undefined;
 
 // Re-export anything exported by the page module we're wrapping. When processing this code, Rollup is smart enough to
diff --git a/packages/nextjs/test/config/wrappingLoader.test.ts b/packages/nextjs/test/config/wrappingLoader.test.ts
index 7f6e5f3a3c66..ab33450790bb 100644
--- a/packages/nextjs/test/config/wrappingLoader.test.ts
+++ b/packages/nextjs/test/config/wrappingLoader.test.ts
@@ -102,4 +102,151 @@ describe('wrappingLoader', () => {
 
     expect(callback).toHaveBeenCalledWith(null, expect.stringContaining("'/my/route'"), expect.anything());
   });
+
+  describe('middleware wrapping', () => {
+    it('should export proxy when user exports named "proxy" export', async () => {
+      const callback = vi.fn();
+
+      const userCode = `
+        export function proxy(request) {
+          return new Response('ok');
+        }
+      `;
+      const userCodeSourceMap = undefined;
+
+      const loaderPromise = new Promise<void>(resolve => {
+        const loaderThis = {
+          ...defaultLoaderThis,
+          resourcePath: '/my/src/proxy.ts',
+          callback: callback.mockImplementation(() => {
+            resolve();
+          }),
+          getOptions() {
+            return {
+              pagesDir: '/my/pages',
+              appDir: '/my/app',
+              pageExtensionRegex: DEFAULT_PAGE_EXTENSION_REGEX,
+              excludeServerRoutes: [],
+              wrappingTargetKind: 'middleware',
+              vercelCronsConfig: undefined,
+              nextjsRequestAsyncStorageModulePath: '/my/request-async-storage.js',
+            };
+          },
+        } satisfies LoaderThis<WrappingLoaderOptions>;
+
+        wrappingLoader.call(loaderThis, userCode, userCodeSourceMap);
+      });
+
+      await loaderPromise;
+
+      const wrappedCode = callback.mock.calls[0][1];
+
+      // Verify both exports are present in export statement (Rollup bundles this way)
+      expect(wrappedCode).toMatch(/export \{[^}]*\bmiddleware\b[^}]*\bproxy\b[^}]*\}/);
+
+      // Should detect proxy export
+      expect(wrappedCode).toContain('userProvidedProxy = true');
+
+      // Proxy should be wrapped, middleware should be undefined
+      expect(wrappedCode).toMatch(/const proxy = userProvidedProxy \? wrappedHandler : undefined/);
+      expect(wrappedCode).toMatch(/const middleware = userProvidedMiddleware \? wrappedHandler : undefined/);
+    });
+
+    it('should export middleware when user exports named "middleware" export', async () => {
+      const callback = vi.fn();
+
+      const userCode = `
+        export function middleware(request) {
+          return new Response('ok');
+        }
+      `;
+      const userCodeSourceMap = undefined;
+
+      const loaderPromise = new Promise<void>(resolve => {
+        const loaderThis = {
+          ...defaultLoaderThis,
+          resourcePath: '/my/src/middleware.ts',
+          callback: callback.mockImplementation(() => {
+            resolve();
+          }),
+          getOptions() {
+            return {
+              pagesDir: '/my/pages',
+              appDir: '/my/app',
+              pageExtensionRegex: DEFAULT_PAGE_EXTENSION_REGEX,
+              excludeServerRoutes: [],
+              wrappingTargetKind: 'middleware',
+              vercelCronsConfig: undefined,
+              nextjsRequestAsyncStorageModulePath: '/my/request-async-storage.js',
+            };
+          },
+        } satisfies LoaderThis<WrappingLoaderOptions>;
+
+        wrappingLoader.call(loaderThis, userCode, userCodeSourceMap);
+      });
+
+      await loaderPromise;
+
+      const wrappedCode = callback.mock.calls[0][1];
+
+      // Should detect middleware export
+      expect(wrappedCode).toContain('userProvidedMiddleware = true');
+
+      // Should NOT detect proxy export
+      expect(wrappedCode).toContain('userProvidedProxy = false');
+
+      // Middleware should be wrapped, proxy should be undefined
+      expect(wrappedCode).toMatch(/const middleware = userProvidedMiddleware \? wrappedHandler : undefined/);
+      expect(wrappedCode).toMatch(/const proxy = userProvidedProxy \? wrappedHandler : undefined/);
+    });
+
+    it('should export undefined middleware/proxy when user only exports default', async () => {
+      const callback = vi.fn();
+
+      const userCode = `
+        export default function(request) {
+          return new Response('ok');
+        }
+      `;
+      const userCodeSourceMap = undefined;
+
+      const loaderPromise = new Promise<void>(resolve => {
+        const loaderThis = {
+          ...defaultLoaderThis,
+          resourcePath: '/my/src/middleware.ts',
+          callback: callback.mockImplementation(() => {
+            resolve();
+          }),
+          getOptions() {
+            return {
+              pagesDir: '/my/pages',
+              appDir: '/my/app',
+              pageExtensionRegex: DEFAULT_PAGE_EXTENSION_REGEX,
+              excludeServerRoutes: [],
+              wrappingTargetKind: 'middleware',
+              vercelCronsConfig: undefined,
+              nextjsRequestAsyncStorageModulePath: '/my/request-async-storage.js',
+            };
+          },
+        } satisfies LoaderThis<WrappingLoaderOptions>;
+
+        wrappingLoader.call(loaderThis, userCode, userCodeSourceMap);
+      });
+
+      await loaderPromise;
+
+      const wrappedCode = callback.mock.calls[0][1];
+
+      // Should export default
+      expect(wrappedCode).toMatch(/export \{[^}]* as default[^}]*\}/);
+
+      // Both flags should be false (no named exports provided by user)
+      expect(wrappedCode).toContain('userProvidedMiddleware = false');
+      expect(wrappedCode).toContain('userProvidedProxy = false');
+
+      // Both middleware and proxy should be undefined (conditionals evaluate to false)
+      expect(wrappedCode).toMatch(/const middleware = userProvidedMiddleware \? wrappedHandler : undefined/);
+      expect(wrappedCode).toMatch(/const proxy = userProvidedProxy \? wrappedHandler : undefined/);
+    });
+  });
 });

From ddaec08b0bc600a4c25e532bafe7c2e8735fd3d4 Mon Sep 17 00:00:00 2001
From: Charly Gomez <charly.gomez@sentry.io>
Date: Tue, 4 Nov 2025 14:20:14 +0100
Subject: [PATCH 023/186] meta(changelog): Update changelog for 10.23.0

---
 CHANGELOG.md | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5b3b35020083..c98188d73b5c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,37 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 10.23.0
+
+- feat(core): Send `user-agent` header with envelope requests in server SDKs ([#17929](https://github.com/getsentry/sentry-javascript/pull/17929))
+- feat(browser): Limit transport buffer size ([#18046](https://github.com/getsentry/sentry-javascript/pull/18046))
+- feat(core): Remove default value of `maxValueLength: 250` ([#18043](https://github.com/getsentry/sentry-javascript/pull/18043))
+- feat(react-router): Align options with shared build time options type ([#18014](https://github.com/getsentry/sentry-javascript/pull/18014))
+- fix(browser-utils): cache element names for INP ([#18052](https://github.com/getsentry/sentry-javascript/pull/18052))
+- fix(browser): Capture unhandled rejection errors for web worker integration ([#18054](https://github.com/getsentry/sentry-javascript/pull/18054))
+- fix(cloudflare): Ensure types for cloudflare handlers ([#18064](https://github.com/getsentry/sentry-javascript/pull/18064))
+- fix(nextjs): Update proxy template wrapping ([#18086](https://github.com/getsentry/sentry-javascript/pull/18086))
+- fix(nuxt): Added top-level fallback exports ([#18083](https://github.com/getsentry/sentry-javascript/pull/18083))
+- fix(nuxt): check for H3 error cause before re-capturing ([#18035](https://github.com/getsentry/sentry-javascript/pull/18035))
+- fix(replay): Linked errors not resetting session id ([#17854](https://github.com/getsentry/sentry-javascript/pull/17854))
+- fix(tracemetrics): Bump metrics buffer to 1k ([#18039](https://github.com/getsentry/sentry-javascript/pull/18039))
+- fix(vue): Make `options` parameter optional on `attachErrorHandler` ([#18072](https://github.com/getsentry/sentry-javascript/pull/18072))
+- ref(core): Set span status `internal_error` instead of `unknown_error` ([#17909](https://github.com/getsentry/sentry-javascript/pull/17909))
+
+<details>
+  <summary> <strong>Internal Changes</strong> </summary>
+
+- fix(tests): un-override nitro dep version for nuxt-3 test ([#18056](https://github.com/getsentry/sentry-javascript/pull/18056))
+- fix(e2e): Add p-map override to fix React Router 7 test builds ([#18068](https://github.com/getsentry/sentry-javascript/pull/18068))
+- feat: Add a note to save changes before starting ([#17987](https://github.com/getsentry/sentry-javascript/pull/17987))
+- test(browser): Add test for INP target name after navigation or DOM changes ([#18033](https://github.com/getsentry/sentry-javascript/pull/18033))
+- chore: Add external contributor to CHANGELOG.md ([#18032](https://github.com/getsentry/sentry-javascript/pull/18032))
+- chore(aws-serverless): Fix typo in timeout warning function name ([#18031](https://github.com/getsentry/sentry-javascript/pull/18031))
+- chore(browser): upgrade fake-indexeddb to v6 ([#17975](https://github.com/getsentry/sentry-javascript/pull/17975))
+- chore(tests): pass test flags through to the test command ([#18062](https://github.com/getsentry/sentry-javascript/pull/18062))
+
+</details>
+
 Work in this release was contributed by @hanseo0507. Thank you for your contribution!
 
 ## 10.22.0

From ea20d8db38f334f01e7c1581ddc0ded16c3bbb27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Peer=20St=C3=B6cklmair?= <jan.peer@sentry.io>
Date: Tue, 4 Nov 2025 16:54:07 +0100
Subject: [PATCH 024/186] test(node-core): Proof that withMonitor doesn't
 create a new trace (#18057)

In #18029 the expectation is that the `withMonitor` is creating a new
trace. Currently it is not reflected in the docs what is expected when
`withMonitor` is executed. This test proofs that this is the case.
---
 .../test/integration/transactions.test.ts     | 64 ++++++++++++++++++-
 1 file changed, 63 insertions(+), 1 deletion(-)

diff --git a/packages/node-core/test/integration/transactions.test.ts b/packages/node-core/test/integration/transactions.test.ts
index 7b13a400dedb..e00cbc8580d1 100644
--- a/packages/node-core/test/integration/transactions.test.ts
+++ b/packages/node-core/test/integration/transactions.test.ts
@@ -1,5 +1,5 @@
 import { context, trace, TraceFlags } from '@opentelemetry/api';
-import type { TransactionEvent } from '@sentry/core';
+import type { ErrorEvent, TransactionEvent } from '@sentry/core';
 import { debug, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
 import { afterEach, describe, expect, it, vi } from 'vitest';
 import * as Sentry from '../../src';
@@ -9,6 +9,7 @@ describe('Integration | Transactions', () => {
   afterEach(() => {
     vi.restoreAllMocks();
     cleanupOtel();
+    vi.useRealTimers();
   });
 
   it('correctly creates transaction & spans', async () => {
@@ -674,4 +675,65 @@ describe('Integration | Transactions', () => {
     expect(spans).toContainEqual(expect.objectContaining({ description: 'inner span 1' }));
     expect(spans).toContainEqual(expect.objectContaining({ description: 'inner span 2' }));
   });
+
+  it('withMonitor should use the same traces for each monitor', async () => {
+    const sendEvents: ErrorEvent[] = [];
+    const transactionEvents: TransactionEvent[] = [];
+    const beforeSendTransaction = vi.fn((event: TransactionEvent) => {
+      transactionEvents.push(event);
+      return null;
+    });
+    const beforeSend = vi.fn((event: ErrorEvent) => {
+      sendEvents.push(event);
+      return null;
+    });
+
+    mockSdkInit({
+      tracesSampleRate: 1,
+      beforeSendTransaction,
+      beforeSend,
+      debug: true,
+    });
+
+    const client = Sentry.getClient();
+    const errorMessage = 'Error outside withMonitor';
+
+    Sentry.startSpan({ name: 'span outside error' }, () => {
+      Sentry.withMonitor('cron-job-1', () => Sentry.startSpan({ name: 'inner span 1' }, () => undefined));
+
+      try {
+        throw new Error(errorMessage);
+      } catch (e) {
+        Sentry.startSpan({ name: 'span inside error' }, () => undefined);
+        Sentry.captureException(e);
+      }
+
+      Sentry.withMonitor('cron-job-2', () => {
+        Sentry.startSpan({ name: 'inner span 2' }, () => undefined);
+      });
+    });
+
+    await client?.flush();
+
+    const transactionTraceId = transactionEvents[0]?.contexts?.trace?.trace_id;
+    const errorTraceId = sendEvents[0]?.contexts?.trace?.trace_id;
+
+    expect(beforeSendTransaction).toHaveBeenCalledTimes(1);
+    expect(beforeSend).toHaveBeenCalledTimes(1);
+    expect(transactionEvents).toHaveLength(1);
+    expect(transactionTraceId).toBe(errorTraceId);
+    expect(transactionEvents[0]?.spans).toHaveLength(3);
+    expect(transactionEvents).toMatchObject([
+      {
+        spans: [{ description: 'inner span 1' }, { description: 'span inside error' }, { description: 'inner span 2' }],
+      },
+    ]);
+    expect(sendEvents).toMatchObject([
+      {
+        exception: {
+          values: [{ value: errorMessage }],
+        },
+      },
+    ]);
+  });
 });

From 1feb97ef964d67f8f387aa9c904ddb42ebf293b2 Mon Sep 17 00:00:00 2001
From: getsentry-bot <bot@sentry.io>
Date: Tue, 4 Nov 2025 16:45:49 +0000
Subject: [PATCH 025/186] release: 10.23.0

---
 .../browser-integration-tests/package.json         |  4 ++--
 .../bundle-analyzer-scenarios/package.json         |  2 +-
 dev-packages/clear-cache-gh-action/package.json    |  2 +-
 .../cloudflare-integration-tests/package.json      |  6 +++---
 dev-packages/e2e-tests/package.json                |  2 +-
 .../external-contributor-gh-action/package.json    |  2 +-
 .../node-core-integration-tests/package.json       |  6 +++---
 dev-packages/node-integration-tests/package.json   | 10 +++++-----
 dev-packages/node-overhead-gh-action/package.json  |  4 ++--
 dev-packages/rollup-utils/package.json             |  2 +-
 dev-packages/size-limit-gh-action/package.json     |  2 +-
 dev-packages/test-utils/package.json               |  4 ++--
 lerna.json                                         |  2 +-
 packages/angular/package.json                      |  6 +++---
 packages/astro/package.json                        |  8 ++++----
 packages/aws-serverless/package.json               |  6 +++---
 packages/browser-utils/package.json                |  4 ++--
 packages/browser/package.json                      | 14 +++++++-------
 packages/bun/package.json                          |  6 +++---
 packages/cloudflare/package.json                   |  4 ++--
 packages/core/package.json                         |  2 +-
 packages/deno/package.json                         |  4 ++--
 packages/ember/package.json                        |  6 +++---
 packages/eslint-config-sdk/package.json            |  6 +++---
 packages/eslint-plugin-sdk/package.json            |  2 +-
 packages/feedback/package.json                     |  4 ++--
 packages/gatsby/package.json                       |  6 +++---
 packages/google-cloud-serverless/package.json      |  6 +++---
 packages/integration-shims/package.json            |  4 ++--
 packages/nestjs/package.json                       |  6 +++---
 packages/nextjs/package.json                       | 14 +++++++-------
 packages/node-core/package.json                    |  6 +++---
 packages/node-native/package.json                  |  6 +++---
 packages/node/package.json                         |  8 ++++----
 packages/nuxt/package.json                         | 12 ++++++------
 packages/opentelemetry/package.json                |  4 ++--
 packages/profiling-node/package.json               |  6 +++---
 packages/react-router/package.json                 | 10 +++++-----
 packages/react/package.json                        |  6 +++---
 packages/remix/package.json                        |  8 ++++----
 packages/replay-canvas/package.json                |  6 +++---
 packages/replay-internal/package.json              |  8 ++++----
 packages/replay-worker/package.json                |  2 +-
 packages/solid/package.json                        |  6 +++---
 packages/solidstart/package.json                   |  8 ++++----
 packages/svelte/package.json                       |  6 +++---
 packages/sveltekit/package.json                    | 10 +++++-----
 packages/tanstackstart-react/package.json          | 10 +++++-----
 packages/tanstackstart/package.json                |  2 +-
 packages/types/package.json                        |  4 ++--
 packages/typescript/package.json                   |  2 +-
 packages/vercel-edge/package.json                  |  6 +++---
 packages/vue/package.json                          |  6 +++---
 packages/wasm/package.json                         |  6 +++---
 54 files changed, 152 insertions(+), 152 deletions(-)

diff --git a/dev-packages/browser-integration-tests/package.json b/dev-packages/browser-integration-tests/package.json
index 6de23391a0ba..665e7e9b6e17 100644
--- a/dev-packages/browser-integration-tests/package.json
+++ b/dev-packages/browser-integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/browser-integration-tests",
-  "version": "10.22.0",
+  "version": "10.23.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": "10.22.0",
+    "@sentry/browser": "10.23.0",
     "@supabase/supabase-js": "2.49.3",
     "axios": "^1.12.2",
     "babel-loader": "^8.2.2",
diff --git a/dev-packages/bundle-analyzer-scenarios/package.json b/dev-packages/bundle-analyzer-scenarios/package.json
index 2286f4a6266e..e869e1fcf85b 100644
--- a/dev-packages/bundle-analyzer-scenarios/package.json
+++ b/dev-packages/bundle-analyzer-scenarios/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/bundle-analyzer-scenarios",
-  "version": "10.22.0",
+  "version": "10.23.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",
diff --git a/dev-packages/clear-cache-gh-action/package.json b/dev-packages/clear-cache-gh-action/package.json
index c4700fe531bb..5dbba5b9f66c 100644
--- a/dev-packages/clear-cache-gh-action/package.json
+++ b/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.22.0",
+  "version": "10.23.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
diff --git a/dev-packages/cloudflare-integration-tests/package.json b/dev-packages/cloudflare-integration-tests/package.json
index 6681839f6106..b3e8fad26a6a 100644
--- a/dev-packages/cloudflare-integration-tests/package.json
+++ b/dev-packages/cloudflare-integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/cloudflare-integration-tests",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
@@ -13,11 +13,11 @@
     "test:watch": "yarn test --watch"
   },
   "dependencies": {
-    "@sentry/cloudflare": "10.22.0"
+    "@sentry/cloudflare": "10.23.0"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20250922.0",
-    "@sentry-internal/test-utils": "10.22.0",
+    "@sentry-internal/test-utils": "10.23.0",
     "vitest": "^3.2.4",
     "wrangler": "4.22.0"
   },
diff --git a/dev-packages/e2e-tests/package.json b/dev-packages/e2e-tests/package.json
index 2f39a0978697..eab86ffb8ff5 100644
--- a/dev-packages/e2e-tests/package.json
+++ b/dev-packages/e2e-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/e2e-tests",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "license": "MIT",
   "private": true,
   "scripts": {
diff --git a/dev-packages/external-contributor-gh-action/package.json b/dev-packages/external-contributor-gh-action/package.json
index 84c7a5d60b64..04b10a3980c6 100644
--- a/dev-packages/external-contributor-gh-action/package.json
+++ b/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": "10.22.0",
+  "version": "10.23.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
diff --git a/dev-packages/node-core-integration-tests/package.json b/dev-packages/node-core-integration-tests/package.json
index 4d0b8bbf2e5e..8c982e61663c 100644
--- a/dev-packages/node-core-integration-tests/package.json
+++ b/dev-packages/node-core-integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/node-core-integration-tests",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
@@ -34,8 +34,8 @@
     "@opentelemetry/resources": "^2.1.0",
     "@opentelemetry/sdk-trace-base": "^2.1.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry/core": "10.22.0",
-    "@sentry/node-core": "10.22.0",
+    "@sentry/core": "10.23.0",
+    "@sentry/node-core": "10.23.0",
     "body-parser": "^1.20.3",
     "cors": "^2.8.5",
     "cron": "^3.1.6",
diff --git a/dev-packages/node-integration-tests/package.json b/dev-packages/node-integration-tests/package.json
index 31554947e8c8..4ed3a7a25e79 100644
--- a/dev-packages/node-integration-tests/package.json
+++ b/dev-packages/node-integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/node-integration-tests",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
@@ -35,9 +35,9 @@
     "@nestjs/core": "^11",
     "@nestjs/platform-express": "^11",
     "@prisma/client": "6.15.0",
-    "@sentry/aws-serverless": "10.22.0",
-    "@sentry/core": "10.22.0",
-    "@sentry/node": "10.22.0",
+    "@sentry/aws-serverless": "10.23.0",
+    "@sentry/core": "10.23.0",
+    "@sentry/node": "10.23.0",
     "@types/mongodb": "^3.6.20",
     "@types/mysql": "^2.15.21",
     "@types/pg": "^8.6.5",
@@ -82,7 +82,7 @@
     "yargs": "^16.2.0"
   },
   "devDependencies": {
-    "@sentry-internal/test-utils": "10.22.0",
+    "@sentry-internal/test-utils": "10.23.0",
     "@types/amqplib": "^0.10.5",
     "@types/node-cron": "^3.0.11",
     "@types/node-schedule": "^2.1.7",
diff --git a/dev-packages/node-overhead-gh-action/package.json b/dev-packages/node-overhead-gh-action/package.json
index d176e5d8475c..505fe9a8d683 100644
--- a/dev-packages/node-overhead-gh-action/package.json
+++ b/dev-packages/node-overhead-gh-action/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/node-overhead-gh-action",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
@@ -23,7 +23,7 @@
     "fix": "eslint . --format stylish --fix"
   },
   "dependencies": {
-    "@sentry/node": "10.22.0",
+    "@sentry/node": "10.23.0",
     "express": "^4.21.1",
     "mysql2": "^3.14.4"
   },
diff --git a/dev-packages/rollup-utils/package.json b/dev-packages/rollup-utils/package.json
index 7e3421b5488b..60600af2d12e 100644
--- a/dev-packages/rollup-utils/package.json
+++ b/dev-packages/rollup-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/rollup-utils",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "description": "Rollup utilities used at Sentry for the Sentry JavaScript SDK",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/rollup-utils",
diff --git a/dev-packages/size-limit-gh-action/package.json b/dev-packages/size-limit-gh-action/package.json
index 803c96cbac75..b1a290f4d93b 100644
--- a/dev-packages/size-limit-gh-action/package.json
+++ b/dev-packages/size-limit-gh-action/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@sentry-internal/size-limit-gh-action",
   "description": "An internal Github Action to compare the current size of a PR against the one on develop.",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
diff --git a/dev-packages/test-utils/package.json b/dev-packages/test-utils/package.json
index 806a03601188..70e3e1fd9263 100644
--- a/dev-packages/test-utils/package.json
+++ b/dev-packages/test-utils/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "10.22.0",
+  "version": "10.23.0",
   "name": "@sentry-internal/test-utils",
   "author": "Sentry",
   "license": "MIT",
@@ -48,7 +48,7 @@
   },
   "devDependencies": {
     "@playwright/test": "~1.53.2",
-    "@sentry/core": "10.22.0"
+    "@sentry/core": "10.23.0"
   },
   "volta": {
     "extends": "../../package.json"
diff --git a/lerna.json b/lerna.json
index 473fa5d48de0..addd8722cf5c 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "npmClient": "yarn"
 }
diff --git a/packages/angular/package.json b/packages/angular/package.json
index 3c66c4a0912c..af3e2b0c1f3a 100644
--- a/packages/angular/package.json
+++ b/packages/angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/angular",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "description": "Official Sentry SDK for Angular",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/angular",
@@ -21,8 +21,8 @@
     "rxjs": "^6.5.5 || ^7.x"
   },
   "dependencies": {
-    "@sentry/browser": "10.22.0",
-    "@sentry/core": "10.22.0",
+    "@sentry/browser": "10.23.0",
+    "@sentry/core": "10.23.0",
     "tslib": "^2.4.1"
   },
   "devDependencies": {
diff --git a/packages/astro/package.json b/packages/astro/package.json
index 1bdb0f423802..546b889f2ce6 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/astro",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "description": "Official Sentry SDK for Astro",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/astro",
@@ -56,9 +56,9 @@
     "astro": ">=3.x || >=4.0.0-beta || >=5.x"
   },
   "dependencies": {
-    "@sentry/browser": "10.22.0",
-    "@sentry/core": "10.22.0",
-    "@sentry/node": "10.22.0",
+    "@sentry/browser": "10.23.0",
+    "@sentry/core": "10.23.0",
+    "@sentry/node": "10.23.0",
     "@sentry/vite-plugin": "^4.1.0"
   },
   "devDependencies": {
diff --git a/packages/aws-serverless/package.json b/packages/aws-serverless/package.json
index 6b29b5e34d56..b4763f675a35 100644
--- a/packages/aws-serverless/package.json
+++ b/packages/aws-serverless/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/aws-serverless",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "description": "Official Sentry SDK for AWS Lambda and AWS Serverless Environments",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/aws-serverless",
@@ -69,8 +69,8 @@
     "@opentelemetry/instrumentation": "^0.204.0",
     "@opentelemetry/instrumentation-aws-sdk": "0.59.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry/core": "10.22.0",
-    "@sentry/node": "10.22.0",
+    "@sentry/core": "10.23.0",
+    "@sentry/node": "10.23.0",
     "@types/aws-lambda": "^8.10.62"
   },
   "devDependencies": {
diff --git a/packages/browser-utils/package.json b/packages/browser-utils/package.json
index 0f8ad407f901..ceb69e2d06cc 100644
--- a/packages/browser-utils/package.json
+++ b/packages/browser-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/browser-utils",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "description": "Browser Utilities for all Sentry JavaScript SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/browser-utils",
@@ -39,7 +39,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.22.0"
+    "@sentry/core": "10.23.0"
   },
   "scripts": {
     "build": "run-p build:transpile build:types",
diff --git a/packages/browser/package.json b/packages/browser/package.json
index b6f2fa570ce1..addb646dec4b 100644
--- a/packages/browser/package.json
+++ b/packages/browser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/browser",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "description": "Official Sentry SDK for browsers",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/browser",
@@ -39,14 +39,14 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry-internal/browser-utils": "10.22.0",
-    "@sentry-internal/feedback": "10.22.0",
-    "@sentry-internal/replay": "10.22.0",
-    "@sentry-internal/replay-canvas": "10.22.0",
-    "@sentry/core": "10.22.0"
+    "@sentry-internal/browser-utils": "10.23.0",
+    "@sentry-internal/feedback": "10.23.0",
+    "@sentry-internal/replay": "10.23.0",
+    "@sentry-internal/replay-canvas": "10.23.0",
+    "@sentry/core": "10.23.0"
   },
   "devDependencies": {
-    "@sentry-internal/integration-shims": "10.22.0",
+    "@sentry-internal/integration-shims": "10.23.0",
     "fake-indexeddb": "^6.2.4"
   },
   "scripts": {
diff --git a/packages/bun/package.json b/packages/bun/package.json
index 73dcefe1fb70..6bf6c10af3df 100644
--- a/packages/bun/package.json
+++ b/packages/bun/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/bun",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "description": "Official Sentry SDK for bun",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/bun",
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.22.0",
-    "@sentry/node": "10.22.0"
+    "@sentry/core": "10.23.0",
+    "@sentry/node": "10.23.0"
   },
   "devDependencies": {
     "bun-types": "^1.2.9"
diff --git a/packages/cloudflare/package.json b/packages/cloudflare/package.json
index 674e090a8265..062cf1735b05 100644
--- a/packages/cloudflare/package.json
+++ b/packages/cloudflare/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/cloudflare",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "description": "Official Sentry SDK for Cloudflare Workers and Pages",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/cloudflare",
@@ -50,7 +50,7 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@sentry/core": "10.22.0"
+    "@sentry/core": "10.23.0"
   },
   "peerDependencies": {
     "@cloudflare/workers-types": "^4.x"
diff --git a/packages/core/package.json b/packages/core/package.json
index 9b9d69abec7e..27b4db779860 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/core",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "description": "Base implementation for all Sentry JavaScript SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/core",
diff --git a/packages/deno/package.json b/packages/deno/package.json
index 1727ae8e2d1a..9ff481e8b0ee 100644
--- a/packages/deno/package.json
+++ b/packages/deno/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/deno",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "description": "Official Sentry SDK for Deno",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/deno",
@@ -25,7 +25,7 @@
   ],
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@sentry/core": "10.22.0"
+    "@sentry/core": "10.23.0"
   },
   "scripts": {
     "deno-types": "node ./scripts/download-deno-types.mjs",
diff --git a/packages/ember/package.json b/packages/ember/package.json
index 5aa4a958f924..84eb175cff50 100644
--- a/packages/ember/package.json
+++ b/packages/ember/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/ember",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "description": "Official Sentry SDK for Ember.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/ember",
@@ -32,8 +32,8 @@
   "dependencies": {
     "@babel/core": "^7.27.7",
     "@embroider/macros": "^1.16.0",
-    "@sentry/browser": "10.22.0",
-    "@sentry/core": "10.22.0",
+    "@sentry/browser": "10.23.0",
+    "@sentry/core": "10.23.0",
     "ember-auto-import": "^2.7.2",
     "ember-cli-babel": "^8.2.0",
     "ember-cli-htmlbars": "^6.1.1",
diff --git a/packages/eslint-config-sdk/package.json b/packages/eslint-config-sdk/package.json
index eb1ec1b22117..92f988ab07f4 100644
--- a/packages/eslint-config-sdk/package.json
+++ b/packages/eslint-config-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/eslint-config-sdk",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "description": "Official Sentry SDK eslint config",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-config-sdk",
@@ -22,8 +22,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry-internal/eslint-plugin-sdk": "10.22.0",
-    "@sentry-internal/typescript": "10.22.0",
+    "@sentry-internal/eslint-plugin-sdk": "10.23.0",
+    "@sentry-internal/typescript": "10.23.0",
     "@typescript-eslint/eslint-plugin": "^5.48.0",
     "@typescript-eslint/parser": "^5.48.0",
     "eslint-config-prettier": "^6.11.0",
diff --git a/packages/eslint-plugin-sdk/package.json b/packages/eslint-plugin-sdk/package.json
index b04194d84bb5..921e5d9a8326 100644
--- a/packages/eslint-plugin-sdk/package.json
+++ b/packages/eslint-plugin-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/eslint-plugin-sdk",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "description": "Official Sentry SDK eslint plugin",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-plugin-sdk",
diff --git a/packages/feedback/package.json b/packages/feedback/package.json
index 297d70ed3d4c..781d9c4e38e4 100644
--- a/packages/feedback/package.json
+++ b/packages/feedback/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/feedback",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "description": "Sentry SDK integration for user feedback",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/feedback",
@@ -39,7 +39,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.22.0"
+    "@sentry/core": "10.23.0"
   },
   "devDependencies": {
     "preact": "^10.19.4"
diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json
index d67b4b423738..5fbfa9838fc6 100644
--- a/packages/gatsby/package.json
+++ b/packages/gatsby/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/gatsby",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "description": "Official Sentry SDK for Gatsby.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/gatsby",
@@ -45,8 +45,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.22.0",
-    "@sentry/react": "10.22.0",
+    "@sentry/core": "10.23.0",
+    "@sentry/react": "10.23.0",
     "@sentry/webpack-plugin": "^4.1.1"
   },
   "peerDependencies": {
diff --git a/packages/google-cloud-serverless/package.json b/packages/google-cloud-serverless/package.json
index 35d11e2732d6..b7f9641ae71a 100644
--- a/packages/google-cloud-serverless/package.json
+++ b/packages/google-cloud-serverless/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/google-cloud-serverless",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "description": "Official Sentry SDK for Google Cloud Functions",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/google-cloud-serverless",
@@ -48,8 +48,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.22.0",
-    "@sentry/node": "10.22.0",
+    "@sentry/core": "10.23.0",
+    "@sentry/node": "10.23.0",
     "@types/express": "^4.17.14"
   },
   "devDependencies": {
diff --git a/packages/integration-shims/package.json b/packages/integration-shims/package.json
index 6e1f495b83c7..ed752f00adda 100644
--- a/packages/integration-shims/package.json
+++ b/packages/integration-shims/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/integration-shims",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "description": "Shims for integrations in Sentry SDK.",
   "main": "build/cjs/index.js",
   "module": "build/esm/index.js",
@@ -56,7 +56,7 @@
     "url": "https://github.com/getsentry/sentry-javascript/issues"
   },
   "dependencies": {
-    "@sentry/core": "10.22.0"
+    "@sentry/core": "10.23.0"
   },
   "engines": {
     "node": ">=18"
diff --git a/packages/nestjs/package.json b/packages/nestjs/package.json
index b5ef30c20df9..63e85d4e745d 100644
--- a/packages/nestjs/package.json
+++ b/packages/nestjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/nestjs",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "description": "Official Sentry SDK for NestJS",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/nestjs",
@@ -49,8 +49,8 @@
     "@opentelemetry/instrumentation": "^0.204.0",
     "@opentelemetry/instrumentation-nestjs-core": "0.50.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry/core": "10.22.0",
-    "@sentry/node": "10.22.0"
+    "@sentry/core": "10.23.0",
+    "@sentry/node": "10.23.0"
   },
   "devDependencies": {
     "@nestjs/common": "^10.0.0",
diff --git a/packages/nextjs/package.json b/packages/nextjs/package.json
index 4815b2e1a723..fe42e9c605e4 100644
--- a/packages/nextjs/package.json
+++ b/packages/nextjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/nextjs",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "description": "Official Sentry SDK for Next.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/nextjs",
@@ -79,13 +79,13 @@
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
     "@rollup/plugin-commonjs": "28.0.1",
-    "@sentry-internal/browser-utils": "10.22.0",
+    "@sentry-internal/browser-utils": "10.23.0",
     "@sentry/bundler-plugin-core": "^4.3.0",
-    "@sentry/core": "10.22.0",
-    "@sentry/node": "10.22.0",
-    "@sentry/opentelemetry": "10.22.0",
-    "@sentry/react": "10.22.0",
-    "@sentry/vercel-edge": "10.22.0",
+    "@sentry/core": "10.23.0",
+    "@sentry/node": "10.23.0",
+    "@sentry/opentelemetry": "10.23.0",
+    "@sentry/react": "10.23.0",
+    "@sentry/vercel-edge": "10.23.0",
     "@sentry/webpack-plugin": "^4.3.0",
     "resolve": "1.22.8",
     "rollup": "^4.35.0",
diff --git a/packages/node-core/package.json b/packages/node-core/package.json
index f13d86c08f6a..55d0b7e2a29b 100644
--- a/packages/node-core/package.json
+++ b/packages/node-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/node-core",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "description": "Sentry Node-Core SDK",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/node-core",
@@ -67,8 +67,8 @@
   },
   "dependencies": {
     "@apm-js-collab/tracing-hooks": "^0.3.1",
-    "@sentry/core": "10.22.0",
-    "@sentry/opentelemetry": "10.22.0",
+    "@sentry/core": "10.23.0",
+    "@sentry/opentelemetry": "10.23.0",
     "import-in-the-middle": "^1.14.2"
   },
   "devDependencies": {
diff --git a/packages/node-native/package.json b/packages/node-native/package.json
index 2a1343389ee3..29c6e426452d 100644
--- a/packages/node-native/package.json
+++ b/packages/node-native/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/node-native",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "description": "Native Tools for the Official Sentry Node.js SDK",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/node-native",
@@ -64,8 +64,8 @@
   },
   "dependencies": {
     "@sentry-internal/node-native-stacktrace": "^0.2.2",
-    "@sentry/core": "10.22.0",
-    "@sentry/node": "10.22.0"
+    "@sentry/core": "10.23.0",
+    "@sentry/node": "10.23.0"
   },
   "devDependencies": {
     "@types/node": "^18.19.1"
diff --git a/packages/node/package.json b/packages/node/package.json
index 93fcb37b500f..a7d5f24ef432 100644
--- a/packages/node/package.json
+++ b/packages/node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/node",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "description": "Sentry Node SDK using OpenTelemetry for performance instrumentation",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/node",
@@ -95,9 +95,9 @@
     "@opentelemetry/sdk-trace-base": "^2.1.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
     "@prisma/instrumentation": "6.15.0",
-    "@sentry/core": "10.22.0",
-    "@sentry/node-core": "10.22.0",
-    "@sentry/opentelemetry": "10.22.0",
+    "@sentry/core": "10.23.0",
+    "@sentry/node-core": "10.23.0",
+    "@sentry/opentelemetry": "10.23.0",
     "import-in-the-middle": "^1.14.2",
     "minimatch": "^9.0.0"
   },
diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json
index 9bcd39309a60..08457351d476 100644
--- a/packages/nuxt/package.json
+++ b/packages/nuxt/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/nuxt",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "description": "Official Sentry SDK for Nuxt",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/nuxt",
@@ -49,13 +49,13 @@
   },
   "dependencies": {
     "@nuxt/kit": "^3.13.2",
-    "@sentry/browser": "10.22.0",
-    "@sentry/cloudflare": "10.22.0",
-    "@sentry/core": "10.22.0",
-    "@sentry/node": "10.22.0",
+    "@sentry/browser": "10.23.0",
+    "@sentry/cloudflare": "10.23.0",
+    "@sentry/core": "10.23.0",
+    "@sentry/node": "10.23.0",
     "@sentry/rollup-plugin": "^4.3.0",
     "@sentry/vite-plugin": "^4.3.0",
-    "@sentry/vue": "10.22.0"
+    "@sentry/vue": "10.23.0"
   },
   "devDependencies": {
     "@nuxt/module-builder": "^0.8.4",
diff --git a/packages/opentelemetry/package.json b/packages/opentelemetry/package.json
index fe2acbc29335..cf4de93c1edc 100644
--- a/packages/opentelemetry/package.json
+++ b/packages/opentelemetry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/opentelemetry",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "description": "Official Sentry utilities for OpenTelemetry",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/opentelemetry",
@@ -39,7 +39,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.22.0"
+    "@sentry/core": "10.23.0"
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.9.0",
diff --git a/packages/profiling-node/package.json b/packages/profiling-node/package.json
index b74d18c152aa..437dd54205c9 100644
--- a/packages/profiling-node/package.json
+++ b/packages/profiling-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/profiling-node",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "description": "Official Sentry SDK for Node.js Profiling",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/profiling-node",
@@ -63,8 +63,8 @@
   },
   "dependencies": {
     "@sentry-internal/node-cpu-profiler": "^2.2.0",
-    "@sentry/core": "10.22.0",
-    "@sentry/node": "10.22.0"
+    "@sentry/core": "10.23.0",
+    "@sentry/node": "10.23.0"
   },
   "devDependencies": {
     "@types/node": "^18.19.1"
diff --git a/packages/react-router/package.json b/packages/react-router/package.json
index 9791d3f4c0d3..336644436064 100644
--- a/packages/react-router/package.json
+++ b/packages/react-router/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/react-router",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "description": "Official Sentry SDK for React Router (Framework)",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/react-router",
@@ -49,11 +49,11 @@
     "@opentelemetry/core": "^2.1.0",
     "@opentelemetry/instrumentation": "^0.204.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry/browser": "10.22.0",
+    "@sentry/browser": "10.23.0",
     "@sentry/cli": "^2.56.0",
-    "@sentry/core": "10.22.0",
-    "@sentry/node": "10.22.0",
-    "@sentry/react": "10.22.0",
+    "@sentry/core": "10.23.0",
+    "@sentry/node": "10.23.0",
+    "@sentry/react": "10.23.0",
     "@sentry/vite-plugin": "^4.1.0",
     "glob": "11.0.1"
   },
diff --git a/packages/react/package.json b/packages/react/package.json
index 02d02a9a8211..5ce6ac2a293b 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/react",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "description": "Official Sentry SDK for React.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/react",
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "10.22.0",
-    "@sentry/core": "10.22.0",
+    "@sentry/browser": "10.23.0",
+    "@sentry/core": "10.23.0",
     "hoist-non-react-statics": "^3.3.2"
   },
   "peerDependencies": {
diff --git a/packages/remix/package.json b/packages/remix/package.json
index 8c50c67f7264..e68492dbcec9 100644
--- a/packages/remix/package.json
+++ b/packages/remix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/remix",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "description": "Official Sentry SDK for Remix",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/remix",
@@ -69,9 +69,9 @@
     "@opentelemetry/semantic-conventions": "^1.37.0",
     "@remix-run/router": "1.x",
     "@sentry/cli": "^2.56.0",
-    "@sentry/core": "10.22.0",
-    "@sentry/node": "10.22.0",
-    "@sentry/react": "10.22.0",
+    "@sentry/core": "10.23.0",
+    "@sentry/node": "10.23.0",
+    "@sentry/react": "10.23.0",
     "glob": "^10.3.4",
     "yargs": "^17.6.0"
   },
diff --git a/packages/replay-canvas/package.json b/packages/replay-canvas/package.json
index 4f87d64087f9..a03b3e2fa712 100644
--- a/packages/replay-canvas/package.json
+++ b/packages/replay-canvas/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/replay-canvas",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "description": "Replay canvas integration",
   "main": "build/npm/cjs/index.js",
   "module": "build/npm/esm/index.js",
@@ -69,8 +69,8 @@
     "@sentry-internal/rrweb": "2.37.0"
   },
   "dependencies": {
-    "@sentry-internal/replay": "10.22.0",
-    "@sentry/core": "10.22.0"
+    "@sentry-internal/replay": "10.23.0",
+    "@sentry/core": "10.23.0"
   },
   "engines": {
     "node": ">=18"
diff --git a/packages/replay-internal/package.json b/packages/replay-internal/package.json
index bb6c95a525f5..f069f9e02d29 100644
--- a/packages/replay-internal/package.json
+++ b/packages/replay-internal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/replay",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "description": "User replays for Sentry",
   "main": "build/npm/cjs/index.js",
   "module": "build/npm/esm/index.js",
@@ -81,7 +81,7 @@
   "homepage": "https://docs.sentry.io/platforms/javascript/session-replay/",
   "devDependencies": {
     "@babel/core": "^7.27.7",
-    "@sentry-internal/replay-worker": "10.22.0",
+    "@sentry-internal/replay-worker": "10.23.0",
     "@sentry-internal/rrweb": "2.37.0",
     "@sentry-internal/rrweb-snapshot": "2.37.0",
     "fflate": "0.8.2",
@@ -90,8 +90,8 @@
     "node-fetch": "^2.6.7"
   },
   "dependencies": {
-    "@sentry-internal/browser-utils": "10.22.0",
-    "@sentry/core": "10.22.0"
+    "@sentry-internal/browser-utils": "10.23.0",
+    "@sentry/core": "10.23.0"
   },
   "engines": {
     "node": ">=18"
diff --git a/packages/replay-worker/package.json b/packages/replay-worker/package.json
index e1c7b26f1ea9..d9a63ee257e2 100644
--- a/packages/replay-worker/package.json
+++ b/packages/replay-worker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/replay-worker",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "description": "Worker for @sentry-internal/replay",
   "main": "build/esm/index.js",
   "module": "build/esm/index.js",
diff --git a/packages/solid/package.json b/packages/solid/package.json
index 550ecd50640e..7985d4426d06 100644
--- a/packages/solid/package.json
+++ b/packages/solid/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/solid",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "description": "Official Sentry SDK for Solid",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/solid",
@@ -54,8 +54,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "10.22.0",
-    "@sentry/core": "10.22.0"
+    "@sentry/browser": "10.23.0",
+    "@sentry/core": "10.23.0"
   },
   "peerDependencies": {
     "@solidjs/router": "^0.13.4",
diff --git a/packages/solidstart/package.json b/packages/solidstart/package.json
index 3d3f08da76ce..a5cc37631eb3 100644
--- a/packages/solidstart/package.json
+++ b/packages/solidstart/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/solidstart",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "description": "Official Sentry SDK for Solid Start",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/solidstart",
@@ -66,9 +66,9 @@
     }
   },
   "dependencies": {
-    "@sentry/core": "10.22.0",
-    "@sentry/node": "10.22.0",
-    "@sentry/solid": "10.22.0",
+    "@sentry/core": "10.23.0",
+    "@sentry/node": "10.23.0",
+    "@sentry/solid": "10.23.0",
     "@sentry/vite-plugin": "^4.1.0"
   },
   "devDependencies": {
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 03d8b4aa3b01..c8edb0f9e39d 100644
--- a/packages/svelte/package.json
+++ b/packages/svelte/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/svelte",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "description": "Official Sentry SDK for Svelte",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/svelte",
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "10.22.0",
-    "@sentry/core": "10.22.0",
+    "@sentry/browser": "10.23.0",
+    "@sentry/core": "10.23.0",
     "magic-string": "^0.30.0"
   },
   "peerDependencies": {
diff --git a/packages/sveltekit/package.json b/packages/sveltekit/package.json
index 912aab01aa3d..954960636edf 100644
--- a/packages/sveltekit/package.json
+++ b/packages/sveltekit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/sveltekit",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "description": "Official Sentry SDK for SvelteKit",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/sveltekit",
@@ -48,10 +48,10 @@
   },
   "dependencies": {
     "@babel/parser": "7.26.9",
-    "@sentry/cloudflare": "10.22.0",
-    "@sentry/core": "10.22.0",
-    "@sentry/node": "10.22.0",
-    "@sentry/svelte": "10.22.0",
+    "@sentry/cloudflare": "10.23.0",
+    "@sentry/core": "10.23.0",
+    "@sentry/node": "10.23.0",
+    "@sentry/svelte": "10.23.0",
     "@sentry/vite-plugin": "^4.1.0",
     "magic-string": "0.30.7",
     "recast": "0.23.11",
diff --git a/packages/tanstackstart-react/package.json b/packages/tanstackstart-react/package.json
index 4030d36ce0e7..cb091835d747 100644
--- a/packages/tanstackstart-react/package.json
+++ b/packages/tanstackstart-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/tanstackstart-react",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "description": "Official Sentry SDK for TanStack Start React",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/tanstackstart-react",
@@ -52,10 +52,10 @@
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry-internal/browser-utils": "10.22.0",
-    "@sentry/core": "10.22.0",
-    "@sentry/node": "10.22.0",
-    "@sentry/react": "10.22.0"
+    "@sentry-internal/browser-utils": "10.23.0",
+    "@sentry/core": "10.23.0",
+    "@sentry/node": "10.23.0",
+    "@sentry/react": "10.23.0"
   },
   "scripts": {
     "build": "run-p build:transpile build:types",
diff --git a/packages/tanstackstart/package.json b/packages/tanstackstart/package.json
index 9960a534ab56..5fd902bb2784 100644
--- a/packages/tanstackstart/package.json
+++ b/packages/tanstackstart/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/tanstackstart",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "description": "Utilities for the Sentry TanStack Start SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/tanstackstart",
diff --git a/packages/types/package.json b/packages/types/package.json
index d1d75ad623a2..9fa59c5c8587 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/types",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "description": "Types for all Sentry JavaScript SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/types",
@@ -57,7 +57,7 @@
     "yalc:publish": "yalc publish --push --sig"
   },
   "dependencies": {
-    "@sentry/core": "10.22.0"
+    "@sentry/core": "10.23.0"
   },
   "volta": {
     "extends": "../../package.json"
diff --git a/packages/typescript/package.json b/packages/typescript/package.json
index b5def3056ebe..2fe4c5a359cf 100644
--- a/packages/typescript/package.json
+++ b/packages/typescript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/typescript",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "description": "Typescript configuration used at Sentry",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/typescript",
diff --git a/packages/vercel-edge/package.json b/packages/vercel-edge/package.json
index cb86bc927053..9e6174f0bd6a 100644
--- a/packages/vercel-edge/package.json
+++ b/packages/vercel-edge/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/vercel-edge",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "description": "Official Sentry SDK for the Vercel Edge Runtime",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/vercel-edge",
@@ -41,14 +41,14 @@
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/resources": "^2.1.0",
-    "@sentry/core": "10.22.0"
+    "@sentry/core": "10.23.0"
   },
   "devDependencies": {
     "@edge-runtime/types": "3.0.1",
     "@opentelemetry/core": "^2.1.0",
     "@opentelemetry/sdk-trace-base": "^2.1.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry/opentelemetry": "10.22.0"
+    "@sentry/opentelemetry": "10.23.0"
   },
   "scripts": {
     "build": "run-p build:transpile build:types",
diff --git a/packages/vue/package.json b/packages/vue/package.json
index 5562ee80eac2..e078c527719b 100644
--- a/packages/vue/package.json
+++ b/packages/vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/vue",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "description": "Official Sentry SDK for Vue.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/vue",
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "10.22.0",
-    "@sentry/core": "10.22.0"
+    "@sentry/browser": "10.23.0",
+    "@sentry/core": "10.23.0"
   },
   "peerDependencies": {
     "pinia": "2.x || 3.x",
diff --git a/packages/wasm/package.json b/packages/wasm/package.json
index 4b62e7ac5918..ed487df8ebe1 100644
--- a/packages/wasm/package.json
+++ b/packages/wasm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/wasm",
-  "version": "10.22.0",
+  "version": "10.23.0",
   "description": "Support for WASM.",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/wasm",
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "10.22.0",
-    "@sentry/core": "10.22.0"
+    "@sentry/browser": "10.23.0",
+    "@sentry/core": "10.23.0"
   },
   "scripts": {
     "build": "run-p build:transpile build:bundle build:types",

From 6360009e8ec3888b7835b8ec2980bae020b9bd91 Mon Sep 17 00:00:00 2001
From: Billy Vong <billyvg@users.noreply.github.com>
Date: Wed, 5 Nov 2025 18:14:07 -0500
Subject: [PATCH 026/186] feat(replay): ignore `background-image` when
 `blockAllMedia` is enabled (#18019)

Pass `ignoreCSSAttributes` with `background-imgae` to ignore background
images when `blockAllMedia` is enabled. `ignoreCSSAttributes` was
expanded in [this PR](https://github.com/getsentry/rrweb/pull/252) so
that it also works for inline styles.
---
 .size-limit.js                                |  2 +-
 packages/replay-canvas/package.json           |  2 +-
 packages/replay-internal/package.json         |  4 +-
 packages/replay-internal/src/integration.ts   |  1 +
 .../test/integration/rrweb.test.ts            |  9 ++++
 yarn.lock                                     | 42 +++++++++----------
 6 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/.size-limit.js b/.size-limit.js
index cada598de81b..c3f0e79d35fa 100644
--- a/.size-limit.js
+++ b/.size-limit.js
@@ -197,7 +197,7 @@ module.exports = [
     path: createCDNPath('bundle.tracing.replay.min.js'),
     gzip: false,
     brotli: false,
-    limit: '240 KB',
+    limit: '245 KB',
   },
   {
     name: 'CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed',
diff --git a/packages/replay-canvas/package.json b/packages/replay-canvas/package.json
index a03b3e2fa712..02e80ec8f265 100644
--- a/packages/replay-canvas/package.json
+++ b/packages/replay-canvas/package.json
@@ -66,7 +66,7 @@
   },
   "homepage": "https://docs.sentry.io/platforms/javascript/session-replay/",
   "devDependencies": {
-    "@sentry-internal/rrweb": "2.37.0"
+    "@sentry-internal/rrweb": "2.40.0"
   },
   "dependencies": {
     "@sentry-internal/replay": "10.23.0",
diff --git a/packages/replay-internal/package.json b/packages/replay-internal/package.json
index f069f9e02d29..4dfa1171ea8d 100644
--- a/packages/replay-internal/package.json
+++ b/packages/replay-internal/package.json
@@ -82,8 +82,8 @@
   "devDependencies": {
     "@babel/core": "^7.27.7",
     "@sentry-internal/replay-worker": "10.23.0",
-    "@sentry-internal/rrweb": "2.37.0",
-    "@sentry-internal/rrweb-snapshot": "2.37.0",
+    "@sentry-internal/rrweb": "2.40.0",
+    "@sentry-internal/rrweb-snapshot": "2.40.0",
     "fflate": "0.8.2",
     "jest-matcher-utils": "^29.0.0",
     "jsdom-worker": "^0.3.0",
diff --git a/packages/replay-internal/src/integration.ts b/packages/replay-internal/src/integration.ts
index 41c5966b88c5..17129bd57445 100644
--- a/packages/replay-internal/src/integration.ts
+++ b/packages/replay-internal/src/integration.ts
@@ -187,6 +187,7 @@ export class Replay implements Integration {
       this._recordingOptions.blockSelector = !this._recordingOptions.blockSelector
         ? MEDIA_SELECTORS
         : `${this._recordingOptions.blockSelector},${MEDIA_SELECTORS}`;
+      this._recordingOptions.ignoreCSSAttributes = new Set(['background-image']);
     }
 
     if (this._isInitialized && isBrowser()) {
diff --git a/packages/replay-internal/test/integration/rrweb.test.ts b/packages/replay-internal/test/integration/rrweb.test.ts
index 7dafb3574a31..8e889f53da52 100644
--- a/packages/replay-internal/test/integration/rrweb.test.ts
+++ b/packages/replay-internal/test/integration/rrweb.test.ts
@@ -28,6 +28,9 @@ describe('Integration | rrweb', () => {
         "collectFonts": true,
         "emit": [Function],
         "errorHandler": [Function],
+        "ignoreCSSAttributes": Set {
+          "background-image",
+        },
         "ignoreSelector": ".sentry-test-ignore,.sentry-ignore,[data-sentry-ignore],input[type="file"]",
         "inlineImages": false,
         "inlineStylesheet": true,
@@ -69,6 +72,9 @@ describe('Integration | rrweb', () => {
         "collectFonts": true,
         "emit": [Function],
         "errorHandler": [Function],
+        "ignoreCSSAttributes": Set {
+          "background-image",
+        },
         "ignoreSelector": ".sentry-ignore,[data-sentry-ignore],input[type="file"]",
         "inlineImages": false,
         "inlineStylesheet": true,
@@ -121,6 +127,9 @@ describe('Integration | rrweb', () => {
         "collectFonts": true,
         "emit": [Function],
         "errorHandler": [Function],
+        "ignoreCSSAttributes": Set {
+          "background-image",
+        },
         "ignoreSelector": ".sentry-ignore,[data-sentry-ignore],input[type="file"]",
         "inlineImages": false,
         "inlineStylesheet": true,
diff --git a/yarn.lock b/yarn.lock
index 0142b73605c8..a94b2263b7f1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6951,22 +6951,22 @@
   dependencies:
     "@sentry-internal/rrweb-snapshot" "2.34.0"
 
-"@sentry-internal/rrdom@2.37.0":
-  version "2.37.0"
-  resolved "https://registry.yarnpkg.com/@sentry-internal/rrdom/-/rrdom-2.37.0.tgz#1aaf382eb7b543d7c256d31b73868e81e6649fbb"
-  integrity sha512-Wj6W4HP6kVYL1oenYq+Ec7QKtsq1Btk/acFLfZ/O7fygLVeAM0KZ4JZirPWdJmpeNNIk1YN7a8C7CfCiM014Ag==
+"@sentry-internal/rrdom@2.40.0":
+  version "2.40.0"
+  resolved "https://registry.yarnpkg.com/@sentry-internal/rrdom/-/rrdom-2.40.0.tgz#2afd76ab6695a63e7b000cb3c101029cd2ccd48b"
+  integrity sha512-QBnn2F0qi4Lx7TZW41CdRek/vWWLZCDx1Ywc1SimBX+byuVmNP84qvnVI4wKMoDvU6AcQiWHAgX2tGoa3Ol8pw==
   dependencies:
-    "@sentry-internal/rrweb-snapshot" "2.37.0"
+    "@sentry-internal/rrweb-snapshot" "2.40.0"
 
 "@sentry-internal/rrweb-snapshot@2.34.0":
   version "2.34.0"
   resolved "https://registry.yarnpkg.com/@sentry-internal/rrweb-snapshot/-/rrweb-snapshot-2.34.0.tgz#79c2049b6c887e3c128d5fa80d6f745a61dd0e68"
   integrity sha512-9Tb8jwVufn5GLV0d/CTuoZWo2O06ZB+xWeTJdEkbtJ6PAmO/Q7GQI3uNIx0pfFEnXP+0Km8CKKxpwkEM0z2m6w==
 
-"@sentry-internal/rrweb-snapshot@2.37.0":
-  version "2.37.0"
-  resolved "https://registry.yarnpkg.com/@sentry-internal/rrweb-snapshot/-/rrweb-snapshot-2.37.0.tgz#2081d1827a108a08cab219234952744e6e79c06b"
-  integrity sha512-fu2/Fd5J5gJrAgQgl9WykVPQkMjo+9MVFy4Y88STTP3WWsLu1u75YAQM6Lr1/tLEykoQ4NecmNDdcz/DiB/nNg==
+"@sentry-internal/rrweb-snapshot@2.40.0":
+  version "2.40.0"
+  resolved "https://registry.yarnpkg.com/@sentry-internal/rrweb-snapshot/-/rrweb-snapshot-2.40.0.tgz#873e9be9967d7e4b6518beb7d9dfbdf5bbe043ac"
+  integrity sha512-uxYlYUIiybRqcyp5go46G5lcOswTFfeen8PelYVQsiLX34I7eugNfLgFchpBdiWv1FXwsautBWyOsZlxCPc3Zw==
 
 "@sentry-internal/rrweb-types@2.34.0":
   version "2.34.0"
@@ -6976,12 +6976,12 @@
     "@sentry-internal/rrweb-snapshot" "2.34.0"
     "@types/css-font-loading-module" "0.0.7"
 
-"@sentry-internal/rrweb-types@2.37.0":
-  version "2.37.0"
-  resolved "https://registry.yarnpkg.com/@sentry-internal/rrweb-types/-/rrweb-types-2.37.0.tgz#edc91ee032896788fa9a6f96c76f1f6dd7c9f538"
-  integrity sha512-ydtHzfGFO6Tyw4n7yOLUrdaNKmRdyaVfqNgObEbEgO/qobzxBV5zf8eNApTayy6SOji3NrF8PpJzm55OX/ChNA==
+"@sentry-internal/rrweb-types@2.40.0":
+  version "2.40.0"
+  resolved "https://registry.yarnpkg.com/@sentry-internal/rrweb-types/-/rrweb-types-2.40.0.tgz#0c16376b83d264548f67e757dc28ae01d2e46991"
+  integrity sha512-d4MB1NI7KeomX0vRy0E7OQJHI+WvbeKvwAHqG/xV94A4ZscKkF7DoAQUvyeBsFf3tED/SuwV75HNEnq2uwk/cQ==
   dependencies:
-    "@sentry-internal/rrweb-snapshot" "2.37.0"
+    "@sentry-internal/rrweb-snapshot" "2.40.0"
     "@types/css-font-loading-module" "0.0.7"
 
 "@sentry-internal/rrweb@2.34.0":
@@ -6998,14 +6998,14 @@
     fflate "^0.4.4"
     mitt "^3.0.0"
 
-"@sentry-internal/rrweb@2.37.0":
-  version "2.37.0"
-  resolved "https://registry.yarnpkg.com/@sentry-internal/rrweb/-/rrweb-2.37.0.tgz#8ea0eb906e194060c60f4a6af4a0d3a16d52cdec"
-  integrity sha512-erN53M1WSPGpsMw+iVX6qWhI4id41+2AXcnALoB2JIyL/Q1W8f2loq/a4PxWkhaaq7mtGiHTmNTbks8Qgrsl9g==
+"@sentry-internal/rrweb@2.40.0":
+  version "2.40.0"
+  resolved "https://registry.yarnpkg.com/@sentry-internal/rrweb/-/rrweb-2.40.0.tgz#9d60899800f21f061f38b1b62ddc64df1ff525bb"
+  integrity sha512-niFva5QmCTfavotLvIeFSvO0rfzbJwW04igcPaWAqTDATi+Xife27iBeVMBmjpHEWygGYkBaGyBQUUi8zUdAyg==
   dependencies:
-    "@sentry-internal/rrdom" "2.37.0"
-    "@sentry-internal/rrweb-snapshot" "2.37.0"
-    "@sentry-internal/rrweb-types" "2.37.0"
+    "@sentry-internal/rrdom" "2.40.0"
+    "@sentry-internal/rrweb-snapshot" "2.40.0"
+    "@sentry-internal/rrweb-types" "2.40.0"
     "@types/css-font-loading-module" "0.0.7"
     "@xstate/fsm" "^1.4.0"
     base64-arraybuffer "^1.0.1"

From de5c5cbe177b4334386e747857225eec36a91ea1 Mon Sep 17 00:00:00 2001
From: Sigrid Huemer <32902192+s1gr1d@users.noreply.github.com>
Date: Thu, 6 Nov 2025 10:48:41 +0100
Subject: [PATCH 027/186] feat(core): Include all exception object keys instead
 of truncating (#18044)

The exception keys can be left without truncation to leave this decision
on Relay.

part of https://github.com/getsentry/sentry-javascript/issues/17389
---
 packages/core/src/utils/object.ts           | 26 ++-------------
 packages/core/test/lib/utils/object.test.ts | 35 ++++++++++-----------
 2 files changed, 18 insertions(+), 43 deletions(-)

diff --git a/packages/core/src/utils/object.ts b/packages/core/src/utils/object.ts
index e212b9f3b833..06f80e12d7f7 100644
--- a/packages/core/src/utils/object.ts
+++ b/packages/core/src/utils/object.ts
@@ -4,7 +4,6 @@ import type { WrappedFunction } from '../types-hoist/wrappedfunction';
 import { htmlTreeAsString } from './browser';
 import { debug } from './debug-logger';
 import { isElement, isError, isEvent, isInstanceOf, isPrimitive } from './is';
-import { truncate } from './string';
 
 /**
  * Replace a method in an object with a wrapped version of itself.
@@ -176,32 +175,11 @@ function getOwnProperties(obj: unknown): { [key: string]: unknown } {
  * and truncated list that will be used inside the event message.
  * eg. `Non-error exception captured with keys: foo, bar, baz`
  */
-export function extractExceptionKeysForMessage(exception: Record<string, unknown>, maxLength: number = 40): string {
+export function extractExceptionKeysForMessage(exception: Record<string, unknown>): string {
   const keys = Object.keys(convertToPlainObject(exception));
   keys.sort();
 
-  const firstKey = keys[0];
-
-  if (!firstKey) {
-    return '[object has no keys]';
-  }
-
-  if (firstKey.length >= maxLength) {
-    return truncate(firstKey, maxLength);
-  }
-
-  for (let includedKeys = keys.length; includedKeys > 0; includedKeys--) {
-    const serialized = keys.slice(0, includedKeys).join(', ');
-    if (serialized.length > maxLength) {
-      continue;
-    }
-    if (includedKeys === keys.length) {
-      return serialized;
-    }
-    return truncate(serialized, maxLength);
-  }
-
-  return '';
+  return !keys[0] ? '[object has no keys]' : keys.join(', ');
 }
 
 /**
diff --git a/packages/core/test/lib/utils/object.test.ts b/packages/core/test/lib/utils/object.test.ts
index bc8c7611abb8..a4d2a4b56ea3 100644
--- a/packages/core/test/lib/utils/object.test.ts
+++ b/packages/core/test/lib/utils/object.test.ts
@@ -142,29 +142,26 @@ describe('fill()', () => {
 
 describe('extractExceptionKeysForMessage()', () => {
   test('no keys', () => {
-    expect(extractExceptionKeysForMessage({}, 10)).toEqual('[object has no keys]');
+    expect(extractExceptionKeysForMessage({})).toEqual('[object has no keys]');
   });
 
-  test('one key should be returned as a whole if not over the length limit', () => {
-    expect(extractExceptionKeysForMessage({ foo: '_' }, 10)).toEqual('foo');
-    expect(extractExceptionKeysForMessage({ foobarbazx: '_' }, 10)).toEqual('foobarbazx');
+  test('one key should be returned as a whole', () => {
+    expect(extractExceptionKeysForMessage({ foo: '_' })).toEqual('foo');
+    expect(extractExceptionKeysForMessage({ foobarbazx: '_' })).toEqual('foobarbazx');
   });
 
-  test('one key should be appended with ... and truncated when over the limit', () => {
-    expect(extractExceptionKeysForMessage({ foobarbazqux: '_' }, 10)).toEqual('foobarbazq...');
-  });
-
-  test('multiple keys should be sorted and joined as a whole if not over the length limit', () => {
-    expect(extractExceptionKeysForMessage({ foo: '_', bar: '_' }, 10)).toEqual('bar, foo');
-  });
-
-  test('multiple keys should include only as much keys as can fit into the limit', () => {
-    expect(extractExceptionKeysForMessage({ foo: '_', bar: '_', baz: '_' }, 10)).toEqual('bar, baz');
-    expect(extractExceptionKeysForMessage({ footoolong: '_', verylongkey: '_', baz: '_' }, 10)).toEqual('baz');
-  });
-
-  test('multiple keys should truncate first key if its too long', () => {
-    expect(extractExceptionKeysForMessage({ barbazquxfoo: '_', baz: '_', qux: '_' }, 10)).toEqual('barbazquxf...');
+  test('multiple keys should be sorted and joined as a whole (without truncating)', () => {
+    const exception = {
+      property1: 'a',
+      thisIsAnExtremelyLongPropertyNameThatExceedsFortyCharacters: 'b',
+      barbazquxfooabc: 'x',
+      property3: 'c',
+      property4: 'd',
+      property5: 'e',
+    };
+    expect(extractExceptionKeysForMessage(exception)).toEqual(
+      'barbazquxfooabc, property1, property3, property4, property5, thisIsAnExtremelyLongPropertyNameThatExceedsFortyCharacters',
+    );
   });
 });
 

From 1a7189dd1d8784c60273f4ed9a6854fb7e70f6e8 Mon Sep 17 00:00:00 2001
From: Sigrid Huemer <32902192+s1gr1d@users.noreply.github.com>
Date: Thu, 6 Nov 2025 13:19:20 +0100
Subject: [PATCH 028/186] chore(eslint): Add eslint-plugin-regexp rule
 (dev-packages) (#18063)

Enabling eslint rules for RegEx in `dev-packages`.

This is a part of this (now closed) PR:
https://github.com/getsentry/sentry-javascript/pull/18053

The first commit contains all changes that were automatically made with
`--fix`, the second commit contains the manual changes.
---
 .../browser-integration-tests/.eslintrc.js    |  4 +-
 .../browser-integration-tests/package.json    |  1 +
 .../manual-client/browser-context/test.ts     |  2 +-
 .../test.ts                                   |  8 +--
 .../test.ts                                   |  6 +-
 .../standalone-mixed-transaction/test.ts      |  8 +--
 .../public-api/startSpan/standalone/test.ts   |  4 +-
 .../suites/replay/dsc/test.ts                 | 12 ++--
 .../http-timings/test.ts                      |  2 +-
 .../consistent-sampling/meta-negative/test.ts |  2 +-
 .../meta-precedence/test.ts                   |  2 +-
 .../tracesSampler-precedence/test.ts          |  4 +-
 .../linked-traces/negatively-sampled/test.ts  |  6 +-
 .../twp-errors-meta/test.ts                   |  4 +-
 .../twp-errors/test.ts                        |  8 +--
 .../tracing/dsc-txn-name-update/test.ts       |  8 +--
 .../envelope-header-transaction-name/test.ts  |  2 +-
 .../suites/tracing/envelope-header/test.ts    |  2 +-
 .../metrics/pageload-resource-spans/test.ts   |  6 +-
 .../web-vitals-cls-standalone-spans/test.ts   | 46 ++++++-------
 .../metrics/web-vitals-inp-late/test.ts       |  4 +-
 .../metrics/web-vitals-inp-navigate/test.ts   |  8 +--
 .../web-vitals-inp-parametrized-late/test.ts  |  4 +-
 .../web-vitals-inp-parametrized/test.ts       |  6 +-
 .../tracing/metrics/web-vitals-inp/test.ts    |  6 +-
 .../web-vitals-lcp-standalone-spans/test.ts   | 14 ++--
 .../tracing/request/fetch-immediate/test.ts   |  2 +-
 .../fetch-propagateTraceparent/test.ts        |  4 +-
 .../request/fetch-relative-url/test.ts        |  8 +--
 .../fetch-strip-query-and-fragment/test.ts    |  8 +--
 .../test.ts                                   |  4 +-
 .../request/fetch-tracing-unsampled/test.ts   |  6 +-
 .../test.ts                                   |  4 +-
 .../fetch-tracing-without-performance/test.ts |  6 +-
 .../suites/tracing/request/fetch/test.ts      |  8 +--
 .../request/xhr-propagateTraceparent/test.ts  |  4 +-
 .../tracing/request/xhr-relative-url/test.ts  |  8 +--
 .../xhr-strip-query-and-fragment/test.ts      |  8 +--
 .../request/xhr-tracing-unsampled/test.ts     |  6 +-
 .../test.ts                                   |  4 +-
 .../xhr-tracing-without-performance/test.ts   |  6 +-
 .../suites/tracing/request/xhr/test.ts        |  8 +--
 .../tracing/setSpanActive/default/test.ts     |  2 +-
 .../nested-parentAlwaysRoot/test.ts           |  4 +-
 .../tracing/setSpanActive/nested/test.ts      |  4 +-
 .../tracing/trace-lifetime/navigation/test.ts | 34 +++++-----
 .../trace-lifetime/pageload-meta/test.ts      | 24 +++----
 .../tracing/trace-lifetime/pageload/test.ts   | 34 +++++-----
 .../trace-lifetime/startNewTrace/test.ts      | 12 ++--
 .../startNewTraceSampling/test.ts             |  8 +--
 .../test.ts                                   |  9 +--
 .../tracing-without-performance/test.ts       | 18 ++---
 .../utils/replayHelpers.ts                    |  7 +-
 .../bundle-analyzer-scenarios/package.json    |  3 +
 .../clear-cache-gh-action/.eslintrc.cjs       |  4 +-
 .../clear-cache-gh-action/package.json        |  3 +
 .../cloudflare-integration-tests/.eslintrc.js |  4 +-
 .../cloudflare-integration-tests/expect.ts    |  6 +-
 .../cloudflare-integration-tests/package.json |  1 +
 dev-packages/e2e-tests/.eslintrc.js           |  4 +-
 dev-packages/e2e-tests/package.json           |  1 +
 .../aws-serverless/package.json               |  1 +
 .../.eslintrc.cjs                             |  4 +-
 .../external-contributor-gh-action/index.mjs  |  2 +-
 .../package.json                              |  3 +
 .../node-core-integration-tests/.eslintrc.js  |  4 +-
 .../node-core-integration-tests/package.json  |  1 +
 .../suites/anr/test.ts                        |  4 +-
 .../suites/cron/cron/test.ts                  | 16 ++---
 .../suites/cron/node-cron/test.ts             | 16 ++---
 .../suites/cron/node-schedule/test.ts         | 16 ++---
 .../tracing/dsc-txn-name-update/test.ts       | 16 ++---
 .../error-active-span-unsampled/test.ts       |  2 +-
 .../envelope-header/error-active-span/test.ts |  2 +-
 .../tracing/envelope-header/error/test.ts     |  2 +-
 .../envelope-header/transaction-route/test.ts |  2 +-
 .../envelope-header/transaction-url/test.ts   |  2 +-
 .../envelope-header/transaction/test.ts       |  2 +-
 .../tracing/meta-tags-twp-errors/test.ts      | 12 ++--
 .../suites/tracing/meta-tags/test.ts          |  4 +-
 .../fetch-no-tracing-no-spans/test.ts         |  4 +-
 .../tracing/requests/fetch-no-tracing/test.ts |  4 +-
 .../fetch-sampled-no-active-span/test.ts      |  4 +-
 .../tracing/requests/fetch-unsampled/test.ts  |  4 +-
 .../requests/http-no-tracing-no-spans/test.ts |  4 +-
 .../tracing/requests/http-no-tracing/test.ts  |  4 +-
 .../http-sampled-no-active-span/test.ts       |  4 +-
 .../tracing/requests/http-sampled/test.ts     |  4 +-
 .../tracing/requests/http-unsampled/test.ts   |  4 +-
 .../tracing/sample-rand-propagation/test.ts   |  8 +--
 .../tracing/tracePropagationTargets/test.ts   |  4 +-
 .../utils/runner.ts                           |  3 +-
 .../node-integration-tests/.eslintrc.js       |  4 +-
 .../node-integration-tests/package.json       |  1 +
 .../node-integration-tests/suites/anr/test.ts |  4 +-
 .../suites/cron/cron/test.ts                  | 16 ++---
 .../suites/cron/node-cron/test.ts             | 16 ++---
 .../suites/cron/node-schedule/test.ts         | 16 ++---
 .../baggage-header-assign/test.ts             |  8 +--
 .../sentry-trace/baggage-header-out/test.ts   |  2 +-
 .../test.ts                                   |  6 +-
 .../suites/express/tracing/scenario.mjs       |  2 +-
 .../suites/express/tracing/test.ts            | 26 ++++----
 .../featureFlags/growthbook/onSpan/test.ts    |  4 +-
 .../tracing/dsc-txn-name-update/test.ts       | 16 ++---
 .../error-active-span-unsampled/test.ts       |  2 +-
 .../envelope-header/error-active-span/test.ts |  2 +-
 .../tracing/envelope-header/error/test.ts     |  2 +-
 .../envelope-header/transaction-route/test.ts |  2 +-
 .../envelope-header/transaction-url/test.ts   |  2 +-
 .../envelope-header/transaction/test.ts       |  2 +-
 .../fetch-strip-query/test.ts                 |  2 +-
 .../http-strip-query/test.ts                  |  2 +-
 .../suites/tracing/httpIntegration/test.ts    | 64 +++++++++---------
 .../tracing/meta-tags-twp-errors/test.ts      | 12 ++--
 .../suites/tracing/meta-tags-twp/test.ts      |  2 +-
 .../suites/tracing/meta-tags/test.ts          |  6 +-
 .../fetch-no-tracing-no-spans/test.ts         |  4 +-
 .../tracing/requests/fetch-no-tracing/test.ts |  4 +-
 .../fetch-sampled-no-active-span/test.ts      |  4 +-
 .../tracing/requests/fetch-unsampled/test.ts  |  4 +-
 .../requests/http-no-tracing-no-spans/test.ts |  4 +-
 .../tracing/requests/http-no-tracing/test.ts  |  4 +-
 .../http-sampled-no-active-span/test.ts       |  4 +-
 .../tracing/requests/http-sampled/test.ts     |  4 +-
 .../tracing/requests/http-unsampled/test.ts   |  4 +-
 .../tracing/sample-rand-propagation/test.ts   | 12 ++--
 .../tracing/tracePropagationTargets/test.ts   |  4 +-
 .../node-integration-tests/utils/runner.ts    |  3 +-
 .../node-overhead-gh-action/.eslintrc.cjs     |  4 +-
 .../node-overhead-gh-action/package.json      |  1 +
 dev-packages/rollup-utils/.eslintrc.cjs       |  4 +-
 dev-packages/rollup-utils/package.json        |  3 +
 .../size-limit-gh-action/.eslintrc.cjs        |  4 +-
 dev-packages/test-utils/.eslintrc.js          |  4 +-
 dev-packages/test-utils/package.json          |  3 +-
 yarn.lock                                     | 65 +++++++++++++++++--
 137 files changed, 542 insertions(+), 439 deletions(-)

diff --git a/dev-packages/browser-integration-tests/.eslintrc.js b/dev-packages/browser-integration-tests/.eslintrc.js
index a19cfba8812a..8c07222e9a7c 100644
--- a/dev-packages/browser-integration-tests/.eslintrc.js
+++ b/dev-packages/browser-integration-tests/.eslintrc.js
@@ -3,7 +3,9 @@ module.exports = {
     browser: true,
     node: true,
   },
-  extends: ['../../.eslintrc.js'],
+  // todo: remove regexp plugin from here once we add it to base.js eslint config for the whole project
+  extends: ['../../.eslintrc.js', 'plugin:regexp/recommended'],
+  plugins: ['regexp'],
   ignorePatterns: [
     'suites/**/subject.js',
     'suites/**/dist/*',
diff --git a/dev-packages/browser-integration-tests/package.json b/dev-packages/browser-integration-tests/package.json
index 665e7e9b6e17..8e005588537a 100644
--- a/dev-packages/browser-integration-tests/package.json
+++ b/dev-packages/browser-integration-tests/package.json
@@ -54,6 +54,7 @@
   "devDependencies": {
     "@types/glob": "8.0.0",
     "@types/node": "^18.19.1",
+    "eslint-plugin-regexp": "^1.15.0",
     "glob": "8.0.3"
   },
   "volta": {
diff --git a/dev-packages/browser-integration-tests/suites/manual-client/browser-context/test.ts b/dev-packages/browser-integration-tests/suites/manual-client/browser-context/test.ts
index 4637fcc5555d..bb963a975049 100644
--- a/dev-packages/browser-integration-tests/suites/manual-client/browser-context/test.ts
+++ b/dev-packages/browser-integration-tests/suites/manual-client/browser-context/test.ts
@@ -46,7 +46,7 @@ sentryTest('allows to setup a client manually & capture exceptions', async ({ ge
       },
     },
     contexts: {
-      trace: { trace_id: expect.stringMatching(/[a-f0-9]{32}/), span_id: expect.stringMatching(/[a-f0-9]{16}/) },
+      trace: { trace_id: expect.stringMatching(/[a-f\d]{32}/), span_id: expect.stringMatching(/[a-f\d]{16}/) },
     },
   });
 });
diff --git a/dev-packages/browser-integration-tests/suites/profiling/traceLifecycleMode_multiple-chunks/test.ts b/dev-packages/browser-integration-tests/suites/profiling/traceLifecycleMode_multiple-chunks/test.ts
index 702140b8823e..421cdfc1e645 100644
--- a/dev-packages/browser-integration-tests/suites/profiling/traceLifecycleMode_multiple-chunks/test.ts
+++ b/dev-packages/browser-integration-tests/suites/profiling/traceLifecycleMode_multiple-chunks/test.ts
@@ -58,9 +58,9 @@ sentryTest(
 
     // Required profile metadata (Sample Format V2)
     expect(typeof envelopeItemPayload1.profiler_id).toBe('string');
-    expect(envelopeItemPayload1.profiler_id).toMatch(/^[a-f0-9]{32}$/);
+    expect(envelopeItemPayload1.profiler_id).toMatch(/^[a-f\d]{32}$/);
     expect(typeof envelopeItemPayload1.chunk_id).toBe('string');
-    expect(envelopeItemPayload1.chunk_id).toMatch(/^[a-f0-9]{32}$/);
+    expect(envelopeItemPayload1.chunk_id).toMatch(/^[a-f\d]{32}$/);
     expect(envelopeItemPayload1.client_sdk).toBeDefined();
     expect(typeof envelopeItemPayload1.client_sdk.name).toBe('string');
     expect(typeof envelopeItemPayload1.client_sdk.version).toBe('string');
@@ -170,9 +170,9 @@ sentryTest(
     // Required profile metadata (Sample Format V2)
     // https://develop.sentry.dev/sdk/telemetry/profiles/sample-format-v2/
     expect(typeof envelopeItemPayload2.profiler_id).toBe('string');
-    expect(envelopeItemPayload2.profiler_id).toMatch(/^[a-f0-9]{32}$/);
+    expect(envelopeItemPayload2.profiler_id).toMatch(/^[a-f\d]{32}$/);
     expect(typeof envelopeItemPayload2.chunk_id).toBe('string');
-    expect(envelopeItemPayload2.chunk_id).toMatch(/^[a-f0-9]{32}$/);
+    expect(envelopeItemPayload2.chunk_id).toMatch(/^[a-f\d]{32}$/);
     expect(envelopeItemPayload2.client_sdk).toBeDefined();
     expect(typeof envelopeItemPayload2.client_sdk.name).toBe('string');
     expect(typeof envelopeItemPayload2.client_sdk.version).toBe('string');
diff --git a/dev-packages/browser-integration-tests/suites/profiling/traceLifecycleMode_overlapping-spans/test.ts b/dev-packages/browser-integration-tests/suites/profiling/traceLifecycleMode_overlapping-spans/test.ts
index 60744def96cd..161f74d64e83 100644
--- a/dev-packages/browser-integration-tests/suites/profiling/traceLifecycleMode_overlapping-spans/test.ts
+++ b/dev-packages/browser-integration-tests/suites/profiling/traceLifecycleMode_overlapping-spans/test.ts
@@ -60,9 +60,9 @@ sentryTest(
     // Required profile metadata (Sample Format V2)
     // https://develop.sentry.dev/sdk/telemetry/profiles/sample-format-v2/
     expect(typeof envelopeItemPayload.profiler_id).toBe('string');
-    expect(envelopeItemPayload.profiler_id).toMatch(/^[a-f0-9]{32}$/);
+    expect(envelopeItemPayload.profiler_id).toMatch(/^[a-f\d]{32}$/);
     expect(typeof envelopeItemPayload.chunk_id).toBe('string');
-    expect(envelopeItemPayload.chunk_id).toMatch(/^[a-f0-9]{32}$/);
+    expect(envelopeItemPayload.chunk_id).toMatch(/^[a-f\d]{32}$/);
     expect(envelopeItemPayload.client_sdk).toBeDefined();
     expect(typeof envelopeItemPayload.client_sdk.name).toBe('string');
     expect(typeof envelopeItemPayload.client_sdk.version).toBe('string');
@@ -175,7 +175,7 @@ sentryTest('attaches thread data to child spans (trace mode)', async ({ page, ge
   const profilerId = rootSpan?.contexts?.profile?.profiler_id as string | undefined;
   expect(typeof profilerId).toBe('string');
 
-  expect(profilerId).toMatch(/^[a-f0-9]{32}$/);
+  expect(profilerId).toMatch(/^[a-f\d]{32}$/);
 
   const spans = (rootSpan?.spans ?? []) as Array<{ data?: Record<string, unknown> }>;
   expect(spans.length).toBeGreaterThan(0);
diff --git a/dev-packages/browser-integration-tests/suites/public-api/startSpan/standalone-mixed-transaction/test.ts b/dev-packages/browser-integration-tests/suites/public-api/startSpan/standalone-mixed-transaction/test.ts
index 8493f4e5fd97..c1e641204b81 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/startSpan/standalone-mixed-transaction/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/startSpan/standalone-mixed-transaction/test.ts
@@ -34,8 +34,8 @@ sentryTest(
     const traceId = transactionEnvelopeHeader.trace!.trace_id!;
     const parentSpanId = transactionEnvelopeItem.contexts?.trace?.span_id;
 
-    expect(traceId).toMatch(/[a-f0-9]{32}/);
-    expect(parentSpanId).toMatch(/[a-f0-9]{16}/);
+    expect(traceId).toMatch(/[a-f\d]{32}/);
+    expect(parentSpanId).toMatch(/[a-f\d]{16}/);
 
     expect(spanEnvelopeHeader).toEqual({
       sent_at: expect.any(String),
@@ -76,7 +76,7 @@ sentryTest(
       segment_id: transactionEnvelopeItem.contexts?.trace?.span_id,
       parent_span_id: parentSpanId,
       origin: 'manual',
-      span_id: expect.stringMatching(/[a-f0-9]{16}/),
+      span_id: expect.stringMatching(/[a-f\d]{16}/),
       start_timestamp: expect.any(Number),
       timestamp: expect.any(Number),
       trace_id: traceId,
@@ -111,7 +111,7 @@ sentryTest(
           description: 'inner',
           origin: 'manual',
           parent_span_id: parentSpanId,
-          span_id: expect.stringMatching(/[a-f0-9]{16}/),
+          span_id: expect.stringMatching(/[a-f\d]{16}/),
           start_timestamp: expect.any(Number),
           timestamp: expect.any(Number),
           trace_id: traceId,
diff --git a/dev-packages/browser-integration-tests/suites/public-api/startSpan/standalone/test.ts b/dev-packages/browser-integration-tests/suites/public-api/startSpan/standalone/test.ts
index aaafd99c91d5..289e907e09b3 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/startSpan/standalone/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/startSpan/standalone/test.ts
@@ -48,10 +48,10 @@ sentryTest('sends a segment span envelope', async ({ getLocalTestUrl, page }) =>
     },
     description: 'standalone_segment_span',
     origin: 'manual',
-    span_id: expect.stringMatching(/^[0-9a-f]{16}$/),
+    span_id: expect.stringMatching(/^[\da-f]{16}$/),
     start_timestamp: expect.any(Number),
     timestamp: expect.any(Number),
-    trace_id: expect.stringMatching(/^[0-9a-f]{32}$/),
+    trace_id: expect.stringMatching(/^[\da-f]{32}$/),
     is_segment: true,
     segment_id: spanJson.span_id,
   });
diff --git a/dev-packages/browser-integration-tests/suites/replay/dsc/test.ts b/dev-packages/browser-integration-tests/suites/replay/dsc/test.ts
index ef0882e0206b..e63c45e42293 100644
--- a/dev-packages/browser-integration-tests/suites/replay/dsc/test.ts
+++ b/dev-packages/browser-integration-tests/suites/replay/dsc/test.ts
@@ -57,7 +57,7 @@ sentryTest(
     expect(envHeader.trace).toEqual({
       environment: 'production',
       sample_rate: '1',
-      trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+      trace_id: expect.stringMatching(/[a-f\d]{32}/),
       public_key: 'public',
       replay_id: replay.session?.id,
       sampled: 'true',
@@ -105,7 +105,7 @@ sentryTest(
     expect(envHeader.trace).toEqual({
       environment: 'production',
       sample_rate: '1',
-      trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+      trace_id: expect.stringMatching(/[a-f\d]{32}/),
       public_key: 'public',
       sampled: 'true',
       sample_rand: expect.any(String),
@@ -158,7 +158,7 @@ sentryTest(
     expect(envHeader.trace).toEqual({
       environment: 'production',
       sample_rate: '1',
-      trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+      trace_id: expect.stringMatching(/[a-f\d]{32}/),
       public_key: 'public',
       replay_id: replay.session?.id,
       sampled: 'true',
@@ -201,7 +201,7 @@ sentryTest(
     expect(envHeader.trace).toEqual({
       environment: 'production',
       sample_rate: '1',
-      trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+      trace_id: expect.stringMatching(/[a-f\d]{32}/),
       public_key: 'public',
       sampled: 'true',
       sample_rand: expect.any(String),
@@ -243,7 +243,7 @@ sentryTest('should add replay_id to error DSC while replay is active', async ({
   expect(error1Header.trace).toBeDefined();
   expect(error1Header.trace).toEqual({
     environment: 'production',
-    trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+    trace_id: expect.stringMatching(/[a-f\d]{32}/),
     public_key: 'public',
     replay_id: replay.session?.id,
     ...(hasTracing
@@ -265,7 +265,7 @@ sentryTest('should add replay_id to error DSC while replay is active', async ({
   expect(error2Header.trace).toBeDefined();
   expect(error2Header.trace).toEqual({
     environment: 'production',
-    trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+    trace_id: expect.stringMatching(/[a-f\d]{32}/),
     public_key: 'public',
     ...(hasTracing
       ? {
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/http-timings/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/http-timings/test.ts
index 633be5f570b5..6894d7407349 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/http-timings/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/http-timings/test.ts
@@ -34,7 +34,7 @@ sentryTest('creates fetch spans with http timing', async ({ browserName, getLoca
     expect(span).toMatchObject({
       description: `GET http://sentry-test-site.example/${index}`,
       parent_span_id: tracingEvent.contexts?.trace?.span_id,
-      span_id: expect.stringMatching(/[a-f0-9]{16}/),
+      span_id: expect.stringMatching(/[a-f\d]{16}/),
       start_timestamp: expect.any(Number),
       timestamp: expect.any(Number),
       trace_id: tracingEvent.contexts?.trace?.trace_id,
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/linked-traces/consistent-sampling/meta-negative/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/linked-traces/consistent-sampling/meta-negative/test.ts
index 6ec7985b9dad..c8faee2f5feb 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/linked-traces/consistent-sampling/meta-negative/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/linked-traces/consistent-sampling/meta-negative/test.ts
@@ -60,7 +60,7 @@ sentryTest.describe('When `consistentTraceSampling` is `true` and page contains
 
         expect(extractTraceparentData(sentryTrace)).toEqual({
           traceId: expect.not.stringContaining(metaTagTraceId),
-          parentSpanId: expect.stringMatching(/^[0-9a-f]{16}$/),
+          parentSpanId: expect.stringMatching(/^[\da-f]{16}$/),
           parentSampled: false,
         });
 
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/linked-traces/consistent-sampling/meta-precedence/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/linked-traces/consistent-sampling/meta-precedence/test.ts
index ece2b1f85790..3dab9594ba7c 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/linked-traces/consistent-sampling/meta-precedence/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/linked-traces/consistent-sampling/meta-precedence/test.ts
@@ -48,7 +48,7 @@ sentryTest.describe('When `consistentTraceSampling` is `true` and page contains
 
         expect(extractTraceparentData(sentryTrace)).toEqual({
           traceId: expect.not.stringContaining(metaTagTraceIdIndex),
-          parentSpanId: expect.stringMatching(/^[0-9a-f]{16}$/),
+          parentSpanId: expect.stringMatching(/^[\da-f]{16}$/),
           parentSampled: false,
         });
 
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/linked-traces/consistent-sampling/tracesSampler-precedence/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/linked-traces/consistent-sampling/tracesSampler-precedence/test.ts
index 9e896798be90..2bb196c898fd 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/linked-traces/consistent-sampling/tracesSampler-precedence/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/linked-traces/consistent-sampling/tracesSampler-precedence/test.ts
@@ -104,8 +104,8 @@ sentryTest.describe('When `consistentTraceSampling` is `true`', () => {
           {
             attributes: { 'sentry.link.type': 'previous_trace' },
             sampled: false,
-            span_id: expect.stringMatching(/^[0-9a-f]{16}$/),
-            trace_id: expect.stringMatching(/^[0-9a-f]{32}$/),
+            span_id: expect.stringMatching(/^[\da-f]{16}$/),
+            trace_id: expect.stringMatching(/^[\da-f]{32}$/),
           },
         ]);
 
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/linked-traces/negatively-sampled/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/linked-traces/negatively-sampled/test.ts
index 7a8b69fdb364..b84aefb8887d 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/linked-traces/negatively-sampled/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/linked-traces/negatively-sampled/test.ts
@@ -24,8 +24,8 @@ sentryTest('includes a span link to a previously negatively sampled span', async
     expect(navigationTraceContext?.op).toBe('navigation');
     expect(navigationTraceContext?.links).toEqual([
       {
-        trace_id: expect.stringMatching(/[a-f0-9]{32}/),
-        span_id: expect.stringMatching(/[a-f0-9]{16}/),
+        trace_id: expect.stringMatching(/[a-f\d]{32}/),
+        span_id: expect.stringMatching(/[a-f\d]{16}/),
         sampled: false,
         attributes: {
           [SEMANTIC_LINK_ATTRIBUTE_LINK_TYPE]: 'previous_trace',
@@ -34,7 +34,7 @@ sentryTest('includes a span link to a previously negatively sampled span', async
     ]);
 
     expect(navigationTraceContext?.data).toMatchObject({
-      'sentry.previous_trace': expect.stringMatching(/[a-f0-9]{32}-[a-f0-9]{16}-0/),
+      'sentry.previous_trace': expect.stringMatching(/[a-f\d]{32}-[a-f\d]{16}-0/),
     });
 
     expect(navigationTraceContext?.trace_id).not.toEqual(navigationTraceContext?.links![0].trace_id);
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/twp-errors-meta/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/twp-errors-meta/test.ts
index 5bed055dbc0a..ca716b2e2648 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/twp-errors-meta/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/twp-errors-meta/test.ts
@@ -24,12 +24,12 @@ sentryTest('errors in TwP mode have same trace ID & span IDs', async ({ getLocal
 
   // Span ID is a virtual span, not the propagated one
   expect(spanId1).not.toEqual(spanId);
-  expect(spanId1).toMatch(/^[a-f0-9]{16}$/);
+  expect(spanId1).toMatch(/^[a-f\d]{16}$/);
 
   const contexts2 = event2.contexts;
   const { trace_id: traceId2, span_id: spanId2 } = contexts2?.trace || {};
   expect(traceId2).toEqual(traceId);
-  expect(spanId2).toMatch(/^[a-f0-9]{16}$/);
+  expect(spanId2).toMatch(/^[a-f\d]{16}$/);
 
   expect(spanId2).toEqual(spanId1);
 });
diff --git a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/twp-errors/test.ts b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/twp-errors/test.ts
index 3048de92b2f1..fa579509ba87 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/twp-errors/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/browserTracingIntegration/twp-errors/test.ts
@@ -17,13 +17,13 @@ sentryTest('errors in TwP mode have same trace ID & span IDs', async ({ getLocal
 
   const contexts1 = event1.contexts;
   const { trace_id: traceId1, span_id: spanId1 } = contexts1?.trace || {};
-  expect(traceId1).toMatch(/^[a-f0-9]{32}$/);
-  expect(spanId1).toMatch(/^[a-f0-9]{16}$/);
+  expect(traceId1).toMatch(/^[a-f\d]{32}$/);
+  expect(spanId1).toMatch(/^[a-f\d]{16}$/);
 
   const contexts2 = event2.contexts;
   const { trace_id: traceId2, span_id: spanId2 } = contexts2?.trace || {};
-  expect(traceId2).toMatch(/^[a-f0-9]{32}$/);
-  expect(spanId2).toMatch(/^[a-f0-9]{16}$/);
+  expect(traceId2).toMatch(/^[a-f\d]{32}$/);
+  expect(spanId2).toMatch(/^[a-f\d]{16}$/);
 
   expect(traceId2).toEqual(traceId1);
   expect(spanId2).toEqual(spanId1);
diff --git a/dev-packages/browser-integration-tests/suites/tracing/dsc-txn-name-update/test.ts b/dev-packages/browser-integration-tests/suites/tracing/dsc-txn-name-update/test.ts
index 0136b1043617..7d33497a988b 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/dsc-txn-name-update/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/dsc-txn-name-update/test.ts
@@ -48,7 +48,7 @@ sentryTest('updates the DSC when the txn name is updated and high-quality', asyn
     return (window as any).__traceId;
   });
 
-  expect(traceId).toMatch(/^[0-9a-f]{32}$/);
+  expect(traceId).toMatch(/^[\da-f]{32}$/);
 
   // 2
   const baggageItems = await makeRequestAndGetBaggageItems(page);
@@ -56,7 +56,7 @@ sentryTest('updates the DSC when the txn name is updated and high-quality', asyn
     'sentry-environment=production',
     'sentry-public_key=public',
     'sentry-release=1.1.1',
-    expect.stringMatching(/sentry-sample_rand=0\.[0-9]+/),
+    expect.stringMatching(/sentry-sample_rand=0\.\d+/),
     'sentry-sample_rate=1',
     'sentry-sampled=true',
     `sentry-trace_id=${traceId}`,
@@ -83,7 +83,7 @@ sentryTest('updates the DSC when the txn name is updated and high-quality', asyn
     'sentry-environment=production',
     'sentry-public_key=public',
     'sentry-release=1.1.1',
-    expect.stringMatching(/sentry-sample_rand=0\.[0-9]+/),
+    expect.stringMatching(/sentry-sample_rand=0\.\d+/),
     'sentry-sample_rate=1',
     'sentry-sampled=true',
     `sentry-trace_id=${traceId}`,
@@ -112,7 +112,7 @@ sentryTest('updates the DSC when the txn name is updated and high-quality', asyn
     'sentry-environment=production',
     'sentry-public_key=public',
     'sentry-release=1.1.1',
-    expect.stringMatching(/sentry-sample_rand=0\.[0-9]+/),
+    expect.stringMatching(/sentry-sample_rand=0\.\d+/),
     'sentry-sample_rate=1',
     'sentry-sampled=true',
     `sentry-trace_id=${traceId}`,
diff --git a/dev-packages/browser-integration-tests/suites/tracing/envelope-header-transaction-name/test.ts b/dev-packages/browser-integration-tests/suites/tracing/envelope-header-transaction-name/test.ts
index 88a268e69ea2..23043ebc770d 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/envelope-header-transaction-name/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/envelope-header-transaction-name/test.ts
@@ -23,7 +23,7 @@ sentryTest(
       environment: 'production',
       sample_rate: '1',
       transaction: expect.stringContaining('/index.html'),
-      trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+      trace_id: expect.stringMatching(/[a-f\d]{32}/),
       public_key: 'public',
       sampled: 'true',
       sample_rand: expect.any(String),
diff --git a/dev-packages/browser-integration-tests/suites/tracing/envelope-header/test.ts b/dev-packages/browser-integration-tests/suites/tracing/envelope-header/test.ts
index 9274cd0bb8ba..7617b498efb2 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/envelope-header/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/envelope-header/test.ts
@@ -26,7 +26,7 @@ sentryTest(
     expect(envHeader.trace).toEqual({
       environment: 'production',
       sample_rate: '1',
-      trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+      trace_id: expect.stringMatching(/[a-f\d]{32}/),
       public_key: 'public',
       sampled: 'true',
       sample_rand: expect.any(String),
diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/pageload-resource-spans/test.ts b/dev-packages/browser-integration-tests/suites/tracing/metrics/pageload-resource-spans/test.ts
index f748c339ce14..91c8ec9ff216 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/metrics/pageload-resource-spans/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/pageload-resource-spans/test.ts
@@ -104,7 +104,7 @@ sentryTest('adds resource spans to pageload transaction', async ({ getLocalTestU
     op: 'resource.img',
     origin: 'auto.resource.browser.metrics',
     parent_span_id: spanId,
-    span_id: expect.stringMatching(/^[a-f0-9]{16}$/),
+    span_id: expect.stringMatching(/^[a-f\d]{16}$/),
     start_timestamp: expect.any(Number),
     timestamp: expect.any(Number),
     trace_id: traceId,
@@ -151,7 +151,7 @@ sentryTest('adds resource spans to pageload transaction', async ({ getLocalTestU
     op: 'resource.link',
     origin: 'auto.resource.browser.metrics',
     parent_span_id: spanId,
-    span_id: expect.stringMatching(/^[a-f0-9]{16}$/),
+    span_id: expect.stringMatching(/^[a-f\d]{16}$/),
     start_timestamp: expect.any(Number),
     timestamp: expect.any(Number),
     trace_id: traceId,
@@ -192,7 +192,7 @@ sentryTest('adds resource spans to pageload transaction', async ({ getLocalTestU
     op: 'resource.script',
     origin: 'auto.resource.browser.metrics',
     parent_span_id: spanId,
-    span_id: expect.stringMatching(/^[a-f0-9]{16}$/),
+    span_id: expect.stringMatching(/^[a-f\d]{16}$/),
     start_timestamp: expect.any(Number),
     timestamp: expect.any(Number),
     trace_id: traceId,
diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-cls-standalone-spans/test.ts b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-cls-standalone-spans/test.ts
index 24c949c63afa..fd4b3b8fa06b 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-cls-standalone-spans/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-cls-standalone-spans/test.ts
@@ -68,7 +68,7 @@ sentryTest('captures a "GOOD" CLS vital with its source as a standalone span', a
       'sentry.report_event': 'pagehide',
       transaction: expect.stringContaining('index.html'),
       'user_agent.original': expect.stringContaining('Chrome'),
-      'sentry.pageload.span_id': expect.stringMatching(/[a-f0-9]{16}/),
+      'sentry.pageload.span_id': expect.stringMatching(/[a-f\d]{16}/),
       'cls.source.1': expect.stringContaining('body > div#content > p'),
     },
     description: expect.stringContaining('body > div#content > p'),
@@ -81,12 +81,12 @@ sentryTest('captures a "GOOD" CLS vital with its source as a standalone span', a
     },
     op: 'ui.webvital.cls',
     origin: 'auto.http.browser.cls',
-    parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
-    span_id: expect.stringMatching(/[a-f0-9]{16}/),
-    segment_id: expect.stringMatching(/[a-f0-9]{16}/),
+    parent_span_id: expect.stringMatching(/[a-f\d]{16}/),
+    span_id: expect.stringMatching(/[a-f\d]{16}/),
+    segment_id: expect.stringMatching(/[a-f\d]{16}/),
     start_timestamp: expect.any(Number),
     timestamp: spanEnvelopeItem.start_timestamp,
-    trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+    trace_id: expect.stringMatching(/[a-f\d]{32}/),
   });
 
   // Flakey value dependent on timings -> we check for a range
@@ -138,7 +138,7 @@ sentryTest('captures a "MEH" CLS vital with its source as a standalone span', as
       'sentry.report_event': 'pagehide',
       transaction: expect.stringContaining('index.html'),
       'user_agent.original': expect.stringContaining('Chrome'),
-      'sentry.pageload.span_id': expect.stringMatching(/[a-f0-9]{16}/),
+      'sentry.pageload.span_id': expect.stringMatching(/[a-f\d]{16}/),
       'cls.source.1': expect.stringContaining('body > div#content > p'),
     },
     description: expect.stringContaining('body > div#content > p'),
@@ -151,12 +151,12 @@ sentryTest('captures a "MEH" CLS vital with its source as a standalone span', as
     },
     op: 'ui.webvital.cls',
     origin: 'auto.http.browser.cls',
-    parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
-    span_id: expect.stringMatching(/[a-f0-9]{16}/),
-    segment_id: expect.stringMatching(/[a-f0-9]{16}/),
+    parent_span_id: expect.stringMatching(/[a-f\d]{16}/),
+    span_id: expect.stringMatching(/[a-f\d]{16}/),
+    segment_id: expect.stringMatching(/[a-f\d]{16}/),
     start_timestamp: expect.any(Number),
     timestamp: spanEnvelopeItem.start_timestamp,
-    trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+    trace_id: expect.stringMatching(/[a-f\d]{32}/),
   });
 
   // Flakey value dependent on timings -> we check for a range
@@ -206,7 +206,7 @@ sentryTest('captures a "POOR" CLS vital with its source as a standalone span.',
       'sentry.report_event': 'pagehide',
       transaction: expect.stringContaining('index.html'),
       'user_agent.original': expect.stringContaining('Chrome'),
-      'sentry.pageload.span_id': expect.stringMatching(/[a-f0-9]{16}/),
+      'sentry.pageload.span_id': expect.stringMatching(/[a-f\d]{16}/),
       'cls.source.1': expect.stringContaining('body > div#content > p'),
     },
     description: expect.stringContaining('body > div#content > p'),
@@ -219,12 +219,12 @@ sentryTest('captures a "POOR" CLS vital with its source as a standalone span.',
     },
     op: 'ui.webvital.cls',
     origin: 'auto.http.browser.cls',
-    parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
-    span_id: expect.stringMatching(/[a-f0-9]{16}/),
-    segment_id: expect.stringMatching(/[a-f0-9]{16}/),
+    parent_span_id: expect.stringMatching(/[a-f\d]{16}/),
+    span_id: expect.stringMatching(/[a-f\d]{16}/),
+    segment_id: expect.stringMatching(/[a-f\d]{16}/),
     start_timestamp: expect.any(Number),
     timestamp: spanEnvelopeItem.start_timestamp,
-    trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+    trace_id: expect.stringMatching(/[a-f\d]{32}/),
   });
 
   // Flakey value dependent on timings -> we check for a range
@@ -275,7 +275,7 @@ sentryTest(
         'sentry.report_event': 'pagehide',
         transaction: expect.stringContaining('index.html'),
         'user_agent.original': expect.stringContaining('Chrome'),
-        'sentry.pageload.span_id': expect.stringMatching(/[a-f0-9]{16}/),
+        'sentry.pageload.span_id': expect.stringMatching(/[a-f\d]{16}/),
       },
       description: 'Layout shift',
       exclusive_time: 0,
@@ -287,12 +287,12 @@ sentryTest(
       },
       op: 'ui.webvital.cls',
       origin: 'auto.http.browser.cls',
-      parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
-      span_id: expect.stringMatching(/[a-f0-9]{16}/),
-      segment_id: expect.stringMatching(/[a-f0-9]{16}/),
+      parent_span_id: expect.stringMatching(/[a-f\d]{16}/),
+      span_id: expect.stringMatching(/[a-f\d]{16}/),
+      segment_id: expect.stringMatching(/[a-f\d]{16}/),
       start_timestamp: expect.any(Number),
       timestamp: spanEnvelopeItem.start_timestamp,
-      trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+      trace_id: expect.stringMatching(/[a-f\d]{32}/),
     });
 
     expect(spanEnvelopeHeaders).toEqual({
@@ -323,8 +323,8 @@ sentryTest(
     const pageloadSpanId = eventData.contexts?.trace?.span_id;
     const pageloadTraceId = eventData.contexts?.trace?.trace_id;
 
-    expect(pageloadSpanId).toMatch(/[a-f0-9]{16}/);
-    expect(pageloadTraceId).toMatch(/[a-f0-9]{32}/);
+    expect(pageloadSpanId).toMatch(/[a-f\d]{16}/);
+    expect(pageloadTraceId).toMatch(/[a-f\d]{32}/);
 
     const spanEnvelopePromise = getMultipleSentryEnvelopeRequests<SpanEnvelope>(
       page,
@@ -371,7 +371,7 @@ sentryTest('sends CLS of the initial page when soft-navigating to a new page', a
   await page.goto(`${url}#soft-navigation`);
 
   const pageloadTraceId = pageloadEventData.contexts?.trace?.trace_id;
-  expect(pageloadTraceId).toMatch(/[a-f0-9]{32}/);
+  expect(pageloadTraceId).toMatch(/[a-f\d]{32}/);
 
   const spanEnvelope = (await spanEnvelopePromise)[0];
   const spanEnvelopeItem = spanEnvelope[1][0][1];
diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-late/test.ts b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-late/test.ts
index 942230b4594e..a882c06c1e11 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-late/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-late/test.ts
@@ -43,7 +43,7 @@ sentryTest('should capture an INP click event span after pageload', async ({ bro
   const spanEnvelopeItem = spanEnvelope[1][0][1];
 
   const traceId = spanEnvelopeHeaders.trace!.trace_id;
-  expect(traceId).toMatch(/[a-f0-9]{32}/);
+  expect(traceId).toMatch(/[a-f\d]{32}/);
 
   expect(spanEnvelopeHeaders).toEqual({
     sent_at: expect.any(String),
@@ -81,7 +81,7 @@ sentryTest('should capture an INP click event span after pageload', async ({ bro
     origin: 'auto.http.browser.inp',
     is_segment: true,
     segment_id: spanEnvelopeItem.span_id,
-    span_id: expect.stringMatching(/[a-f0-9]{16}/),
+    span_id: expect.stringMatching(/[a-f\d]{16}/),
     start_timestamp: expect.any(Number),
     timestamp: expect.any(Number),
     trace_id: traceId,
diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-navigate/test.ts b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-navigate/test.ts
index cf3cdb552cbf..d1cc7cce020d 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-navigate/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-navigate/test.ts
@@ -46,7 +46,7 @@ sentryTest(
     const spanEnvelopeItem = spanEnvelope[1][0][1];
 
     const traceId = spanEnvelopeHeaders.trace!.trace_id;
-    expect(traceId).toMatch(/[a-f0-9]{32}/);
+    expect(traceId).toMatch(/[a-f\d]{32}/);
 
     expect(spanEnvelopeHeaders).toEqual({
       sent_at: expect.any(String),
@@ -84,7 +84,7 @@ sentryTest(
       origin: 'auto.http.browser.inp',
       is_segment: true,
       segment_id: spanEnvelopeItem.span_id,
-      span_id: expect.stringMatching(/[a-f0-9]{16}/),
+      span_id: expect.stringMatching(/[a-f\d]{16}/),
       start_timestamp: expect.any(Number),
       timestamp: expect.any(Number),
       trace_id: traceId,
@@ -127,7 +127,7 @@ sentryTest(
     const spanEnvelopeItem = spanEnvelope[1][0][1];
 
     const traceId = spanEnvelopeHeaders.trace!.trace_id;
-    expect(traceId).toMatch(/[a-f0-9]{32}/);
+    expect(traceId).toMatch(/[a-f\d]{32}/);
 
     expect(spanEnvelopeHeaders).toEqual({
       sent_at: expect.any(String),
@@ -165,7 +165,7 @@ sentryTest(
       origin: 'auto.http.browser.inp',
       is_segment: true,
       segment_id: spanEnvelopeItem.span_id,
-      span_id: expect.stringMatching(/[a-f0-9]{16}/),
+      span_id: expect.stringMatching(/[a-f\d]{16}/),
       start_timestamp: expect.any(Number),
       timestamp: expect.any(Number),
       trace_id: traceId,
diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-parametrized-late/test.ts b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-parametrized-late/test.ts
index 435ed8398668..d1dea39f0231 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-parametrized-late/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-parametrized-late/test.ts
@@ -45,7 +45,7 @@ sentryTest(
     const spanEnvelopeItem = spanEnvelope[1][0][1];
 
     const traceId = spanEnvelopeHeaders.trace!.trace_id;
-    expect(traceId).toMatch(/[a-f0-9]{32}/);
+    expect(traceId).toMatch(/[a-f\d]{32}/);
 
     expect(spanEnvelopeHeaders).toEqual({
       sent_at: expect.any(String),
@@ -84,7 +84,7 @@ sentryTest(
       origin: 'auto.http.browser.inp',
       is_segment: true,
       segment_id: spanEnvelopeItem.span_id,
-      span_id: expect.stringMatching(/[a-f0-9]{16}/),
+      span_id: expect.stringMatching(/[a-f\d]{16}/),
       start_timestamp: expect.any(Number),
       timestamp: expect.any(Number),
       trace_id: traceId,
diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-parametrized/test.ts b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-parametrized/test.ts
index 9d83d2608893..a7d614147f83 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-parametrized/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp-parametrized/test.ts
@@ -43,7 +43,7 @@ sentryTest(
     const spanEnvelopeItem = spanEnvelope[1][0][1];
 
     const traceId = spanEnvelopeHeaders.trace!.trace_id;
-    expect(traceId).toMatch(/[a-f0-9]{32}/);
+    expect(traceId).toMatch(/[a-f\d]{32}/);
 
     expect(spanEnvelopeHeaders).toEqual({
       sent_at: expect.any(String),
@@ -81,8 +81,8 @@ sentryTest(
       origin: 'auto.http.browser.inp',
       segment_id: expect.not.stringMatching(spanEnvelopeItem.span_id!),
       // parent is the pageload span
-      parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
-      span_id: expect.stringMatching(/[a-f0-9]{16}/),
+      parent_span_id: expect.stringMatching(/[a-f\d]{16}/),
+      span_id: expect.stringMatching(/[a-f\d]{16}/),
       start_timestamp: expect.any(Number),
       timestamp: expect.any(Number),
       trace_id: traceId,
diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp/test.ts b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp/test.ts
index bf85d0ad99af..ee92b13802ec 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-inp/test.ts
@@ -42,7 +42,7 @@ sentryTest('should capture an INP click event span during pageload', async ({ br
   const spanEnvelopeItem = spanEnvelope[1][0][1];
 
   const traceId = spanEnvelopeHeaders.trace!.trace_id;
-  expect(traceId).toMatch(/[a-f0-9]{32}/);
+  expect(traceId).toMatch(/[a-f\d]{32}/);
 
   expect(spanEnvelopeHeaders).toEqual({
     sent_at: expect.any(String),
@@ -80,8 +80,8 @@ sentryTest('should capture an INP click event span during pageload', async ({ br
     origin: 'auto.http.browser.inp',
     segment_id: expect.not.stringMatching(spanEnvelopeItem.span_id!),
     // Parent is the pageload span
-    parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
-    span_id: expect.stringMatching(/[a-f0-9]{16}/),
+    parent_span_id: expect.stringMatching(/[a-f\d]{16}/),
+    span_id: expect.stringMatching(/[a-f\d]{16}/),
     start_timestamp: expect.any(Number),
     timestamp: expect.any(Number),
     trace_id: traceId,
diff --git a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-lcp-standalone-spans/test.ts b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-lcp-standalone-spans/test.ts
index ad21a6240793..e2b8a3e66e44 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-lcp-standalone-spans/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/metrics/web-vitals-lcp-standalone-spans/test.ts
@@ -57,7 +57,7 @@ sentryTest('captures LCP vital as a standalone span', async ({ getLocalTestUrl,
   const spanEnvelopeItem = spanEnvelope[1][0][1];
 
   const pageloadTraceId = pageloadTransactionEvent.contexts?.trace?.trace_id;
-  expect(pageloadTraceId).toMatch(/[a-f0-9]{32}/);
+  expect(pageloadTraceId).toMatch(/[a-f\d]{32}/);
 
   expect(spanEnvelopeItem).toEqual({
     data: {
@@ -67,7 +67,7 @@ sentryTest('captures LCP vital as a standalone span', async ({ getLocalTestUrl,
       'sentry.report_event': 'pagehide',
       transaction: expect.stringContaining('index.html'),
       'user_agent.original': expect.stringContaining('Chrome'),
-      'sentry.pageload.span_id': expect.stringMatching(/[a-f0-9]{16}/),
+      'sentry.pageload.span_id': expect.stringMatching(/[a-f\d]{16}/),
       'lcp.element': 'body > img',
       'lcp.loadTime': expect.any(Number),
       'lcp.renderTime': expect.any(Number),
@@ -84,9 +84,9 @@ sentryTest('captures LCP vital as a standalone span', async ({ getLocalTestUrl,
     },
     op: 'ui.webvital.lcp',
     origin: 'auto.http.browser.lcp',
-    parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
-    span_id: expect.stringMatching(/[a-f0-9]{16}/),
-    segment_id: expect.stringMatching(/[a-f0-9]{16}/),
+    parent_span_id: expect.stringMatching(/[a-f\d]{16}/),
+    span_id: expect.stringMatching(/[a-f\d]{16}/),
+    segment_id: expect.stringMatching(/[a-f\d]{16}/),
     start_timestamp: expect.any(Number),
     timestamp: spanEnvelopeItem.start_timestamp, // LCP is a point-in-time metric
     trace_id: pageloadTraceId,
@@ -126,8 +126,8 @@ sentryTest('LCP span is linked to pageload transaction', async ({ getLocalTestUr
   const pageloadSpanId = eventData.contexts?.trace?.span_id;
   const pageloadTraceId = eventData.contexts?.trace?.trace_id;
 
-  expect(pageloadSpanId).toMatch(/[a-f0-9]{16}/);
-  expect(pageloadTraceId).toMatch(/[a-f0-9]{32}/);
+  expect(pageloadSpanId).toMatch(/[a-f\d]{16}/);
+  expect(pageloadTraceId).toMatch(/[a-f\d]{32}/);
 
   const spanEnvelopePromise = getMultipleSentryEnvelopeRequests<SpanEnvelope>(
     page,
diff --git a/dev-packages/browser-integration-tests/suites/tracing/request/fetch-immediate/test.ts b/dev-packages/browser-integration-tests/suites/tracing/request/fetch-immediate/test.ts
index 7d11168acb1a..f73689554e91 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/request/fetch-immediate/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/request/fetch-immediate/test.ts
@@ -25,7 +25,7 @@ sentryTest('should create spans for fetch requests called directly after init',
   expect(requestSpans![0]).toMatchObject({
     description: 'GET http://sentry-test-site.example/0',
     parent_span_id: tracingEvent.contexts?.trace?.span_id,
-    span_id: expect.stringMatching(/[a-f0-9]{16}/),
+    span_id: expect.stringMatching(/[a-f\d]{16}/),
     start_timestamp: expect.any(Number),
     timestamp: expect.any(Number),
     trace_id: tracingEvent.contexts?.trace?.trace_id,
diff --git a/dev-packages/browser-integration-tests/suites/tracing/request/fetch-propagateTraceparent/test.ts b/dev-packages/browser-integration-tests/suites/tracing/request/fetch-propagateTraceparent/test.ts
index d0aedc65bac8..a580e75415ce 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/request/fetch-propagateTraceparent/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/request/fetch-propagateTraceparent/test.ts
@@ -27,8 +27,8 @@ sentryTest(
     const requestHeaders1 = request1.headers();
     const traceparentData1 = extractTraceparentData(requestHeaders1['sentry-trace']);
     expect(traceparentData1).toMatchObject({
-      traceId: expect.stringMatching(/^([a-f0-9]{32})$/),
-      parentSpanId: expect.stringMatching(/^([a-f0-9]{16})$/),
+      traceId: expect.stringMatching(/^([a-f\d]{32})$/),
+      parentSpanId: expect.stringMatching(/^([a-f\d]{16})$/),
       parentSampled: true,
     });
 
diff --git a/dev-packages/browser-integration-tests/suites/tracing/request/fetch-relative-url/test.ts b/dev-packages/browser-integration-tests/suites/tracing/request/fetch-relative-url/test.ts
index b1883896100c..0473f01e5015 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/request/fetch-relative-url/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/request/fetch-relative-url/test.ts
@@ -23,7 +23,7 @@ sentryTest('should create spans for fetch requests', async ({ getLocalTestUrl, p
     expect(span).toMatchObject({
       description: `GET /test-req/${index}`,
       parent_span_id: tracingEvent.contexts?.trace?.span_id,
-      span_id: expect.stringMatching(/[a-f0-9]{16}/),
+      span_id: expect.stringMatching(/[a-f\d]{16}/),
       start_timestamp: expect.any(Number),
       timestamp: expect.any(Number),
       trace_id: tracingEvent.contexts?.trace?.trace_id,
@@ -57,14 +57,14 @@ sentryTest('should attach `sentry-trace` header to fetch requests', async ({ get
   const request1 = requests[0];
   const requestHeaders1 = request1.headers();
   expect(requestHeaders1).toMatchObject({
-    'sentry-trace': expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})-1$/),
+    'sentry-trace': expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})-1$/),
     baggage: expect.any(String),
   });
 
   const request2 = requests[1];
   const requestHeaders2 = request2.headers();
   expect(requestHeaders2).toMatchObject({
-    'sentry-trace': expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})-1$/),
+    'sentry-trace': expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})-1$/),
     baggage: expect.any(String),
     'x-test-header': 'existing-header',
   });
@@ -72,7 +72,7 @@ sentryTest('should attach `sentry-trace` header to fetch requests', async ({ get
   const request3 = requests[2];
   const requestHeaders3 = request3.headers();
   expect(requestHeaders3).toMatchObject({
-    'sentry-trace': expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})-1$/),
+    'sentry-trace': expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})-1$/),
     baggage: expect.any(String),
   });
 });
diff --git a/dev-packages/browser-integration-tests/suites/tracing/request/fetch-strip-query-and-fragment/test.ts b/dev-packages/browser-integration-tests/suites/tracing/request/fetch-strip-query-and-fragment/test.ts
index a0fea6e6af29..0ac0731d3537 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/request/fetch-strip-query-and-fragment/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/request/fetch-strip-query-and-fragment/test.ts
@@ -24,7 +24,7 @@ sentryTest('strips query params in fetch request spans', async ({ getLocalTestUr
   expect(requestSpan).toMatchObject({
     description: 'GET http://sentry-test-site.example/0',
     parent_span_id: transactionEvent.contexts?.trace?.span_id,
-    span_id: expect.stringMatching(/[a-f0-9]{16}/),
+    span_id: expect.stringMatching(/[a-f\d]{16}/),
     start_timestamp: expect.any(Number),
     timestamp: expect.any(Number),
     trace_id: transactionEvent.contexts?.trace?.trace_id,
@@ -67,7 +67,7 @@ sentryTest('strips hash fragment in fetch request spans', async ({ getLocalTestU
   expect(requestSpan).toMatchObject({
     description: 'GET http://sentry-test-site.example/1',
     parent_span_id: transactionEvent.contexts?.trace?.span_id,
-    span_id: expect.stringMatching(/[a-f0-9]{16}/),
+    span_id: expect.stringMatching(/[a-f\d]{16}/),
     start_timestamp: expect.any(Number),
     timestamp: expect.any(Number),
     trace_id: transactionEvent.contexts?.trace?.trace_id,
@@ -110,7 +110,7 @@ sentryTest('strips hash fragment and query params in fetch request spans', async
   expect(requestSpan).toMatchObject({
     description: 'GET http://sentry-test-site.example/2',
     parent_span_id: transactionEvent.contexts?.trace?.span_id,
-    span_id: expect.stringMatching(/[a-f0-9]{16}/),
+    span_id: expect.stringMatching(/[a-f\d]{16}/),
     start_timestamp: expect.any(Number),
     timestamp: expect.any(Number),
     trace_id: transactionEvent.contexts?.trace?.trace_id,
@@ -154,7 +154,7 @@ sentryTest(
     expect(requestSpan).toMatchObject({
       description: 'GET /api/users',
       parent_span_id: transactionEvent.contexts?.trace?.span_id,
-      span_id: expect.stringMatching(/[a-f0-9]{16}/),
+      span_id: expect.stringMatching(/[a-f\d]{16}/),
       start_timestamp: expect.any(Number),
       timestamp: expect.any(Number),
       trace_id: transactionEvent.contexts?.trace?.trace_id,
diff --git a/dev-packages/browser-integration-tests/suites/tracing/request/fetch-tracing-unsampled-propagateTraceparent/test.ts b/dev-packages/browser-integration-tests/suites/tracing/request/fetch-tracing-unsampled-propagateTraceparent/test.ts
index 26815021f0e3..b8fd2b92ad01 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/request/fetch-tracing-unsampled-propagateTraceparent/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/request/fetch-tracing-unsampled-propagateTraceparent/test.ts
@@ -18,8 +18,8 @@ sentryTest(
 
     const traceparentData = extractTraceparentData(requestHeaders['sentry-trace']);
     expect(traceparentData).toMatchObject({
-      traceId: expect.stringMatching(/^([a-f0-9]{32})$/),
-      parentSpanId: expect.stringMatching(/^([a-f0-9]{16})$/),
+      traceId: expect.stringMatching(/^([a-f\d]{32})$/),
+      parentSpanId: expect.stringMatching(/^([a-f\d]{16})$/),
       parentSampled: false,
     });
 
diff --git a/dev-packages/browser-integration-tests/suites/tracing/request/fetch-tracing-unsampled/test.ts b/dev-packages/browser-integration-tests/suites/tracing/request/fetch-tracing-unsampled/test.ts
index e1f69cb0fdf1..4d65cfcd78ea 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/request/fetch-tracing-unsampled/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/request/fetch-tracing-unsampled/test.ts
@@ -21,14 +21,14 @@ sentryTest('should attach `sentry-trace` header to unsampled fetch requests', as
   const request1 = requests[0];
   const requestHeaders1 = request1.headers();
   expect(requestHeaders1).toMatchObject({
-    'sentry-trace': expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})-0$/),
+    'sentry-trace': expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})-0$/),
     baggage: expect.any(String),
   });
 
   const request2 = requests[1];
   const requestHeaders2 = request2.headers();
   expect(requestHeaders2).toMatchObject({
-    'sentry-trace': expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})-0$/),
+    'sentry-trace': expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})-0$/),
     baggage: expect.any(String),
     'x-test-header': 'existing-header',
   });
@@ -36,7 +36,7 @@ sentryTest('should attach `sentry-trace` header to unsampled fetch requests', as
   const request3 = requests[2];
   const requestHeaders3 = request3.headers();
   expect(requestHeaders3).toMatchObject({
-    'sentry-trace': expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})-0$/),
+    'sentry-trace': expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})-0$/),
     baggage: expect.any(String),
   });
 });
diff --git a/dev-packages/browser-integration-tests/suites/tracing/request/fetch-tracing-without-performance-propagateTraceparent/test.ts b/dev-packages/browser-integration-tests/suites/tracing/request/fetch-tracing-without-performance-propagateTraceparent/test.ts
index 718cca0c8701..5ecb32caa07f 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/request/fetch-tracing-without-performance-propagateTraceparent/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/request/fetch-tracing-without-performance-propagateTraceparent/test.ts
@@ -22,8 +22,8 @@ sentryTest(
 
     const traceparentData = extractTraceparentData(requestHeaders0['sentry-trace']);
     expect(traceparentData).toMatchObject({
-      traceId: expect.stringMatching(/^([a-f0-9]{32})$/),
-      parentSpanId: expect.stringMatching(/^([a-f0-9]{16})$/),
+      traceId: expect.stringMatching(/^([a-f\d]{32})$/),
+      parentSpanId: expect.stringMatching(/^([a-f\d]{16})$/),
       parentSampled: undefined,
     });
 
diff --git a/dev-packages/browser-integration-tests/suites/tracing/request/fetch-tracing-without-performance/test.ts b/dev-packages/browser-integration-tests/suites/tracing/request/fetch-tracing-without-performance/test.ts
index c2ebf52d18f6..c16c1d90ddda 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/request/fetch-tracing-without-performance/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/request/fetch-tracing-without-performance/test.ts
@@ -23,14 +23,14 @@ sentryTest(
     const request1 = requests[0];
     const requestHeaders1 = request1.headers();
     expect(requestHeaders1).toMatchObject({
-      'sentry-trace': expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})$/),
+      'sentry-trace': expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})$/),
       baggage: expect.any(String),
     });
 
     const request2 = requests[1];
     const requestHeaders2 = request2.headers();
     expect(requestHeaders2).toMatchObject({
-      'sentry-trace': expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})$/),
+      'sentry-trace': expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})$/),
       baggage: expect.any(String),
       'x-test-header': 'existing-header',
     });
@@ -38,7 +38,7 @@ sentryTest(
     const request3 = requests[2];
     const requestHeaders3 = request3.headers();
     expect(requestHeaders3).toMatchObject({
-      'sentry-trace': expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})$/),
+      'sentry-trace': expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})$/),
       baggage: expect.any(String),
     });
   },
diff --git a/dev-packages/browser-integration-tests/suites/tracing/request/fetch/test.ts b/dev-packages/browser-integration-tests/suites/tracing/request/fetch/test.ts
index 72a196d5d8e9..7955676bf0c8 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/request/fetch/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/request/fetch/test.ts
@@ -26,7 +26,7 @@ sentryTest('should create spans for fetch requests', async ({ getLocalTestUrl, p
     expect(span).toMatchObject({
       description: `GET http://sentry-test-site.example/${index}`,
       parent_span_id: tracingEvent.contexts?.trace?.span_id,
-      span_id: expect.stringMatching(/[a-f0-9]{16}/),
+      span_id: expect.stringMatching(/[a-f\d]{16}/),
       start_timestamp: expect.any(Number),
       timestamp: expect.any(Number),
       trace_id: tracingEvent.contexts?.trace?.trace_id,
@@ -62,7 +62,7 @@ sentryTest('attaches `sentry-trace` and `baggage` headers to fetch requests', as
   const request1 = requests[0];
   const requestHeaders1 = request1.headers();
   expect(requestHeaders1).toMatchObject({
-    'sentry-trace': expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})-1$/),
+    'sentry-trace': expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})-1$/),
     baggage: expect.any(String),
   });
   // traceparent must only be attached if propagateTraceparent is `true`
@@ -71,7 +71,7 @@ sentryTest('attaches `sentry-trace` and `baggage` headers to fetch requests', as
   const request2 = requests[1];
   const requestHeaders2 = request2.headers();
   expect(requestHeaders2).toMatchObject({
-    'sentry-trace': expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})-1$/),
+    'sentry-trace': expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})-1$/),
     baggage: expect.any(String),
     'x-test-header': 'existing-header',
   });
@@ -80,7 +80,7 @@ sentryTest('attaches `sentry-trace` and `baggage` headers to fetch requests', as
   const request3 = requests[2];
   const requestHeaders3 = request3.headers();
   expect(requestHeaders3).toMatchObject({
-    'sentry-trace': expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})-1$/),
+    'sentry-trace': expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})-1$/),
     baggage: expect.any(String),
   });
   expect(requestHeaders3).not.toHaveProperty('traceparent');
diff --git a/dev-packages/browser-integration-tests/suites/tracing/request/xhr-propagateTraceparent/test.ts b/dev-packages/browser-integration-tests/suites/tracing/request/xhr-propagateTraceparent/test.ts
index 1289dfb6cdcc..b97a6a70479b 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/request/xhr-propagateTraceparent/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/request/xhr-propagateTraceparent/test.ts
@@ -25,8 +25,8 @@ sentryTest(
     const requestHeaders1 = request1.headers();
     const traceparentData1 = extractTraceparentData(requestHeaders1['sentry-trace']);
     expect(traceparentData1).toMatchObject({
-      traceId: expect.stringMatching(/^([a-f0-9]{32})$/),
-      parentSpanId: expect.stringMatching(/^([a-f0-9]{16})$/),
+      traceId: expect.stringMatching(/^([a-f\d]{32})$/),
+      parentSpanId: expect.stringMatching(/^([a-f\d]{16})$/),
       parentSampled: true,
     });
 
diff --git a/dev-packages/browser-integration-tests/suites/tracing/request/xhr-relative-url/test.ts b/dev-packages/browser-integration-tests/suites/tracing/request/xhr-relative-url/test.ts
index ef180c0dcb6d..e207d3db04b2 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/request/xhr-relative-url/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/request/xhr-relative-url/test.ts
@@ -23,7 +23,7 @@ sentryTest('should create spans for xhr requests', async ({ getLocalTestUrl, pag
     expect(span).toMatchObject({
       description: `GET /test-req/${index}`,
       parent_span_id: tracingEvent.contexts?.trace?.span_id,
-      span_id: expect.stringMatching(/[a-f0-9]{16}/),
+      span_id: expect.stringMatching(/[a-f\d]{16}/),
       start_timestamp: expect.any(Number),
       timestamp: expect.any(Number),
       trace_id: tracingEvent.contexts?.trace?.trace_id,
@@ -57,14 +57,14 @@ sentryTest('should attach `sentry-trace` header to xhr requests', async ({ getLo
   const request1 = requests[0];
   const requestHeaders1 = request1.headers();
   expect(requestHeaders1).toMatchObject({
-    'sentry-trace': expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})-1$/),
+    'sentry-trace': expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})-1$/),
     baggage: expect.any(String),
   });
 
   const request2 = requests[1];
   const requestHeaders2 = request2.headers();
   expect(requestHeaders2).toMatchObject({
-    'sentry-trace': expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})-1$/),
+    'sentry-trace': expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})-1$/),
     baggage: expect.any(String),
     'x-test-header': 'existing-header',
   });
@@ -72,7 +72,7 @@ sentryTest('should attach `sentry-trace` header to xhr requests', async ({ getLo
   const request3 = requests[2];
   const requestHeaders3 = request3.headers();
   expect(requestHeaders3).toMatchObject({
-    'sentry-trace': expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})-1$/),
+    'sentry-trace': expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})-1$/),
     baggage: expect.any(String),
   });
 });
diff --git a/dev-packages/browser-integration-tests/suites/tracing/request/xhr-strip-query-and-fragment/test.ts b/dev-packages/browser-integration-tests/suites/tracing/request/xhr-strip-query-and-fragment/test.ts
index d4ed06fcdd4e..fb96465b8b5b 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/request/xhr-strip-query-and-fragment/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/request/xhr-strip-query-and-fragment/test.ts
@@ -24,7 +24,7 @@ sentryTest('strips query params in XHR request spans', async ({ getLocalTestUrl,
   expect(requestSpan).toMatchObject({
     description: 'GET http://sentry-test-site.example/0',
     parent_span_id: transactionEvent.contexts?.trace?.span_id,
-    span_id: expect.stringMatching(/[a-f0-9]{16}/),
+    span_id: expect.stringMatching(/[a-f\d]{16}/),
     start_timestamp: expect.any(Number),
     timestamp: expect.any(Number),
     trace_id: transactionEvent.contexts?.trace?.trace_id,
@@ -66,7 +66,7 @@ sentryTest('strips hash fragment in XHR request spans', async ({ getLocalTestUrl
   expect(requestSpan).toMatchObject({
     description: 'GET http://sentry-test-site.example/1',
     parent_span_id: transactionEvent.contexts?.trace?.span_id,
-    span_id: expect.stringMatching(/[a-f0-9]{16}/),
+    span_id: expect.stringMatching(/[a-f\d]{16}/),
     start_timestamp: expect.any(Number),
     timestamp: expect.any(Number),
     trace_id: transactionEvent.contexts?.trace?.trace_id,
@@ -108,7 +108,7 @@ sentryTest('strips hash fragment and query params in XHR request spans', async (
   expect(requestSpan).toMatchObject({
     description: 'GET http://sentry-test-site.example/2',
     parent_span_id: transactionEvent.contexts?.trace?.span_id,
-    span_id: expect.stringMatching(/[a-f0-9]{16}/),
+    span_id: expect.stringMatching(/[a-f\d]{16}/),
     start_timestamp: expect.any(Number),
     timestamp: expect.any(Number),
     trace_id: transactionEvent.contexts?.trace?.trace_id,
@@ -151,7 +151,7 @@ sentryTest(
     expect(requestSpan).toMatchObject({
       description: 'GET /api/users',
       parent_span_id: transactionEvent.contexts?.trace?.span_id,
-      span_id: expect.stringMatching(/[a-f0-9]{16}/),
+      span_id: expect.stringMatching(/[a-f\d]{16}/),
       start_timestamp: expect.any(Number),
       timestamp: expect.any(Number),
       trace_id: transactionEvent.contexts?.trace?.trace_id,
diff --git a/dev-packages/browser-integration-tests/suites/tracing/request/xhr-tracing-unsampled/test.ts b/dev-packages/browser-integration-tests/suites/tracing/request/xhr-tracing-unsampled/test.ts
index 786ce872d349..ba4fd377fc1c 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/request/xhr-tracing-unsampled/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/request/xhr-tracing-unsampled/test.ts
@@ -21,14 +21,14 @@ sentryTest('should attach `sentry-trace` header to unsampled xhr requests', asyn
   const request1 = requests[0];
   const requestHeaders1 = request1.headers();
   expect(requestHeaders1).toMatchObject({
-    'sentry-trace': expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})-0$/),
+    'sentry-trace': expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})-0$/),
     baggage: expect.any(String),
   });
 
   const request2 = requests[1];
   const requestHeaders2 = request2.headers();
   expect(requestHeaders2).toMatchObject({
-    'sentry-trace': expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})-0$/),
+    'sentry-trace': expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})-0$/),
     baggage: expect.any(String),
     'x-test-header': 'existing-header',
   });
@@ -36,7 +36,7 @@ sentryTest('should attach `sentry-trace` header to unsampled xhr requests', asyn
   const request3 = requests[2];
   const requestHeaders3 = request3.headers();
   expect(requestHeaders3).toMatchObject({
-    'sentry-trace': expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})-0$/),
+    'sentry-trace': expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})-0$/),
     baggage: expect.any(String),
   });
 });
diff --git a/dev-packages/browser-integration-tests/suites/tracing/request/xhr-tracing-without-performance-propagateTraceparent/test.ts b/dev-packages/browser-integration-tests/suites/tracing/request/xhr-tracing-without-performance-propagateTraceparent/test.ts
index de1afa51f962..23bf6e6ccac9 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/request/xhr-tracing-without-performance-propagateTraceparent/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/request/xhr-tracing-without-performance-propagateTraceparent/test.ts
@@ -18,8 +18,8 @@ sentryTest(
     const traceparentData = extractTraceparentData(requestHeaders['sentry-trace']);
 
     expect(traceparentData).toEqual({
-      traceId: expect.stringMatching(/^([a-f0-9]{32})$/),
-      parentSpanId: expect.stringMatching(/^([a-f0-9]{16})$/),
+      traceId: expect.stringMatching(/^([a-f\d]{32})$/),
+      parentSpanId: expect.stringMatching(/^([a-f\d]{16})$/),
       parentSampled: undefined,
     });
 
diff --git a/dev-packages/browser-integration-tests/suites/tracing/request/xhr-tracing-without-performance/test.ts b/dev-packages/browser-integration-tests/suites/tracing/request/xhr-tracing-without-performance/test.ts
index 728133a2ac4c..1806fcad21b5 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/request/xhr-tracing-without-performance/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/request/xhr-tracing-without-performance/test.ts
@@ -23,14 +23,14 @@ sentryTest(
     const request1 = requests[0];
     const requestHeaders1 = request1.headers();
     expect(requestHeaders1).toMatchObject({
-      'sentry-trace': expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})$/),
+      'sentry-trace': expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})$/),
       baggage: expect.any(String),
     });
 
     const request2 = requests[1];
     const requestHeaders2 = request2.headers();
     expect(requestHeaders2).toMatchObject({
-      'sentry-trace': expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})$/),
+      'sentry-trace': expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})$/),
       baggage: expect.any(String),
       'x-test-header': 'existing-header',
     });
@@ -38,7 +38,7 @@ sentryTest(
     const request3 = requests[2];
     const requestHeaders3 = request3.headers();
     expect(requestHeaders3).toMatchObject({
-      'sentry-trace': expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})$/),
+      'sentry-trace': expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})$/),
       baggage: expect.any(String),
     });
   },
diff --git a/dev-packages/browser-integration-tests/suites/tracing/request/xhr/test.ts b/dev-packages/browser-integration-tests/suites/tracing/request/xhr/test.ts
index cf3b11c02260..ccf40203281a 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/request/xhr/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/request/xhr/test.ts
@@ -21,7 +21,7 @@ sentryTest('should create spans for XHR requests', async ({ getLocalTestUrl, pag
     expect(span).toMatchObject({
       description: `GET http://sentry-test-site.example/${index}`,
       parent_span_id: eventData.contexts?.trace?.span_id,
-      span_id: expect.stringMatching(/[a-f0-9]{16}/),
+      span_id: expect.stringMatching(/[a-f\d]{16}/),
       start_timestamp: expect.any(Number),
       timestamp: expect.any(Number),
       trace_id: eventData.contexts?.trace?.trace_id,
@@ -55,14 +55,14 @@ sentryTest('should attach `sentry-trace` header to XHR requests', async ({ getLo
   const request1 = requests[0];
   const requestHeaders1 = request1.headers();
   expect(requestHeaders1).toMatchObject({
-    'sentry-trace': expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})-1$/),
+    'sentry-trace': expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})-1$/),
     baggage: expect.any(String),
   });
 
   const request2 = requests[1];
   const requestHeaders2 = request2.headers();
   expect(requestHeaders2).toMatchObject({
-    'sentry-trace': expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})-1$/),
+    'sentry-trace': expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})-1$/),
     baggage: expect.any(String),
     'x-test-header': 'existing-header',
   });
@@ -70,7 +70,7 @@ sentryTest('should attach `sentry-trace` header to XHR requests', async ({ getLo
   const request3 = requests[2];
   const requestHeaders3 = request3.headers();
   expect(requestHeaders3).toMatchObject({
-    'sentry-trace': expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})-1$/),
+    'sentry-trace': expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})-1$/),
     baggage: expect.any(String),
   });
 });
diff --git a/dev-packages/browser-integration-tests/suites/tracing/setSpanActive/default/test.ts b/dev-packages/browser-integration-tests/suites/tracing/setSpanActive/default/test.ts
index 080ebbfa6e84..2019c78c837f 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/setSpanActive/default/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/setSpanActive/default/test.ts
@@ -14,7 +14,7 @@ sentryTest('sets an inactive span active and adds child spans to it', async ({ g
 
   const checkoutEvent = envelopeRequestParser(await req);
   const checkoutSpanId = checkoutEvent.contexts?.trace?.span_id;
-  expect(checkoutSpanId).toMatch(/[a-f0-9]{16}/);
+  expect(checkoutSpanId).toMatch(/[a-f\d]{16}/);
 
   expect(checkoutEvent.spans).toHaveLength(3);
 
diff --git a/dev-packages/browser-integration-tests/suites/tracing/setSpanActive/nested-parentAlwaysRoot/test.ts b/dev-packages/browser-integration-tests/suites/tracing/setSpanActive/nested-parentAlwaysRoot/test.ts
index 2270b470123b..5132178d1981 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/setSpanActive/nested-parentAlwaysRoot/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/setSpanActive/nested-parentAlwaysRoot/test.ts
@@ -21,8 +21,8 @@ sentryTest(
     const checkoutSpanId = checkoutEvent.contexts?.trace?.span_id;
     const postCheckoutSpanId = postCheckoutEvent.contexts?.trace?.span_id;
 
-    expect(checkoutSpanId).toMatch(/[a-f0-9]{16}/);
-    expect(postCheckoutSpanId).toMatch(/[a-f0-9]{16}/);
+    expect(checkoutSpanId).toMatch(/[a-f\d]{16}/);
+    expect(postCheckoutSpanId).toMatch(/[a-f\d]{16}/);
 
     expect(checkoutEvent.spans).toHaveLength(4);
     expect(postCheckoutEvent.spans).toHaveLength(1);
diff --git a/dev-packages/browser-integration-tests/suites/tracing/setSpanActive/nested/test.ts b/dev-packages/browser-integration-tests/suites/tracing/setSpanActive/nested/test.ts
index 094bb0ed3dd8..cea01f304691 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/setSpanActive/nested/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/setSpanActive/nested/test.ts
@@ -21,8 +21,8 @@ sentryTest(
     const checkoutSpanId = checkoutEvent.contexts?.trace?.span_id;
     const postCheckoutSpanId = postCheckoutEvent.contexts?.trace?.span_id;
 
-    expect(checkoutSpanId).toMatch(/[a-f0-9]{16}/);
-    expect(postCheckoutSpanId).toMatch(/[a-f0-9]{16}/);
+    expect(checkoutSpanId).toMatch(/[a-f\d]{16}/);
+    expect(postCheckoutSpanId).toMatch(/[a-f\d]{16}/);
 
     expect(checkoutEvent.spans).toHaveLength(4);
     expect(postCheckoutEvent.spans).toHaveLength(1);
diff --git a/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/navigation/test.ts b/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/navigation/test.ts
index 42547709e928..0255507287d3 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/navigation/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/navigation/test.ts
@@ -38,8 +38,8 @@ sentryTest('creates a new trace and sample_rand on each navigation', async ({ ge
 
   expect(navigation1TraceContext).toMatchObject({
     op: 'navigation',
-    trace_id: expect.stringMatching(/^[0-9a-f]{32}$/),
-    span_id: expect.stringMatching(/^[0-9a-f]{16}$/),
+    trace_id: expect.stringMatching(/^[\da-f]{32}$/),
+    span_id: expect.stringMatching(/^[\da-f]{16}$/),
   });
   expect(navigation1TraceContext).not.toHaveProperty('parent_span_id');
 
@@ -54,8 +54,8 @@ sentryTest('creates a new trace and sample_rand on each navigation', async ({ ge
 
   expect(navigation2TraceContext).toMatchObject({
     op: 'navigation',
-    trace_id: expect.stringMatching(/^[0-9a-f]{32}$/),
-    span_id: expect.stringMatching(/^[0-9a-f]{16}$/),
+    trace_id: expect.stringMatching(/^[\da-f]{32}$/),
+    span_id: expect.stringMatching(/^[\da-f]{16}$/),
   });
   expect(navigation2TraceContext).not.toHaveProperty('parent_span_id');
 
@@ -93,8 +93,8 @@ sentryTest('error after navigation has navigation traceId', async ({ getLocalTes
 
   expect(navigationTraceContext).toMatchObject({
     op: 'navigation',
-    trace_id: expect.stringMatching(/^[0-9a-f]{32}$/),
-    span_id: expect.stringMatching(/^[0-9a-f]{16}$/),
+    trace_id: expect.stringMatching(/^[\da-f]{32}$/),
+    span_id: expect.stringMatching(/^[\da-f]{16}$/),
   });
   expect(navigationTraceContext).not.toHaveProperty('parent_span_id');
 
@@ -120,7 +120,7 @@ sentryTest('error after navigation has navigation traceId', async ({ getLocalTes
   const errorTraceContext = errorEvent.contexts?.trace;
   expect(errorTraceContext).toEqual({
     trace_id: navigationTraceContext?.trace_id,
-    span_id: expect.stringMatching(/^[0-9a-f]{16}$/),
+    span_id: expect.stringMatching(/^[\da-f]{16}$/),
   });
   expect(errorTraceHeader).toEqual({
     environment: 'production',
@@ -162,8 +162,8 @@ sentryTest('error during navigation has new navigation traceId', async ({ getLoc
   const navigationTraceContext = navigationEvent?.contexts?.trace;
   expect(navigationTraceContext).toMatchObject({
     op: 'navigation',
-    trace_id: expect.stringMatching(/^[0-9a-f]{32}$/),
-    span_id: expect.stringMatching(/^[0-9a-f]{16}$/),
+    trace_id: expect.stringMatching(/^[\da-f]{32}$/),
+    span_id: expect.stringMatching(/^[\da-f]{16}$/),
   });
   expect(navigationTraceContext).not.toHaveProperty('parent_span_id');
 
@@ -179,7 +179,7 @@ sentryTest('error during navigation has new navigation traceId', async ({ getLoc
   const errorTraceContext = errorEvent?.contexts?.trace;
   expect(errorTraceContext).toEqual({
     trace_id: navigationTraceContext?.trace_id,
-    span_id: expect.stringMatching(/^[0-9a-f]{16}$/),
+    span_id: expect.stringMatching(/^[\da-f]{16}$/),
   });
 
   expect(errorTraceHeader).toEqual({
@@ -230,8 +230,8 @@ sentryTest(
     expect(navigationEvent.type).toEqual('transaction');
     expect(navigationTraceContext).toMatchObject({
       op: 'navigation',
-      trace_id: expect.stringMatching(/^[0-9a-f]{32}$/),
-      span_id: expect.stringMatching(/^[0-9a-f]{16}$/),
+      trace_id: expect.stringMatching(/^[\da-f]{32}$/),
+      span_id: expect.stringMatching(/^[\da-f]{16}$/),
     });
     expect(navigationTraceContext).not.toHaveProperty('parent_span_id');
 
@@ -293,8 +293,8 @@ sentryTest(
     expect(navigationEvent.type).toEqual('transaction');
     expect(navigationTraceContext).toMatchObject({
       op: 'navigation',
-      trace_id: expect.stringMatching(/^[0-9a-f]{32}$/),
-      span_id: expect.stringMatching(/^[0-9a-f]{16}$/),
+      trace_id: expect.stringMatching(/^[\da-f]{32}$/),
+      span_id: expect.stringMatching(/^[\da-f]{16}$/),
     });
     expect(navigationTraceContext).not.toHaveProperty('parent_span_id');
 
@@ -335,8 +335,8 @@ sentryTest(
     const navigationTraceContext = navigationEvent.contexts?.trace;
     expect(navigationTraceContext).toMatchObject({
       op: 'navigation',
-      trace_id: expect.stringMatching(/^[0-9a-f]{32}$/),
-      span_id: expect.stringMatching(/^[0-9a-f]{16}$/),
+      trace_id: expect.stringMatching(/^[\da-f]{32}$/),
+      span_id: expect.stringMatching(/^[\da-f]{16}$/),
     });
     expect(navigationTraceContext).not.toHaveProperty('parent_span_id');
 
@@ -357,7 +357,7 @@ sentryTest(
 
     expect(feedbackTraceContext).toMatchObject({
       trace_id: navigationTraceContext?.trace_id,
-      span_id: expect.stringMatching(/^[0-9a-f]{16}$/),
+      span_id: expect.stringMatching(/^[\da-f]{16}$/),
     });
   },
 );
diff --git a/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/pageload-meta/test.ts b/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/pageload-meta/test.ts
index 98f468818d51..4269f91c2c07 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/pageload-meta/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/pageload-meta/test.ts
@@ -43,7 +43,7 @@ sentryTest(
       op: 'pageload',
       trace_id: META_TAG_TRACE_ID,
       parent_span_id: META_TAG_PARENT_SPAN_ID,
-      span_id: expect.stringMatching(/^[0-9a-f]{16}$/),
+      span_id: expect.stringMatching(/^[\da-f]{16}$/),
     });
 
     expect(pageloadTraceHeader).toEqual({
@@ -60,8 +60,8 @@ sentryTest(
     expect(navigationEvent.type).toEqual('transaction');
     expect(navigationTraceContext).toMatchObject({
       op: 'navigation',
-      trace_id: expect.stringMatching(/^[0-9a-f]{32}$/),
-      span_id: expect.stringMatching(/^[0-9a-f]{16}$/),
+      trace_id: expect.stringMatching(/^[\da-f]{32}$/),
+      span_id: expect.stringMatching(/^[\da-f]{16}$/),
     });
     // navigation span is head of trace, so there's no parent span:
     expect(navigationTraceContext?.trace_id).not.toHaveProperty('parent_span_id');
@@ -97,7 +97,7 @@ sentryTest('error after <meta> tag pageload has pageload traceId', async ({ getL
     op: 'pageload',
     trace_id: META_TAG_TRACE_ID,
     parent_span_id: META_TAG_PARENT_SPAN_ID,
-    span_id: expect.stringMatching(/^[0-9a-f]{16}$/),
+    span_id: expect.stringMatching(/^[\da-f]{16}$/),
   });
 
   expect(pageloadTraceHeader).toEqual({
@@ -123,7 +123,7 @@ sentryTest('error after <meta> tag pageload has pageload traceId', async ({ getL
   expect(errorEvent.contexts?.trace).toEqual({
     trace_id: META_TAG_TRACE_ID,
     parent_span_id: META_TAG_PARENT_SPAN_ID,
-    span_id: expect.stringMatching(/^[0-9a-f]{16}$/),
+    span_id: expect.stringMatching(/^[\da-f]{16}$/),
   });
 
   expect(errorTraceHeader).toEqual({
@@ -165,7 +165,7 @@ sentryTest('error during <meta> tag pageload has pageload traceId', async ({ get
     op: 'pageload',
     trace_id: META_TAG_TRACE_ID,
     parent_span_id: META_TAG_PARENT_SPAN_ID,
-    span_id: expect.stringMatching(/^[0-9a-f]{16}$/),
+    span_id: expect.stringMatching(/^[\da-f]{16}$/),
   });
 
   expect(pageloadTraceHeader).toEqual({
@@ -183,7 +183,7 @@ sentryTest('error during <meta> tag pageload has pageload traceId', async ({ get
   expect(errorEvent?.contexts?.trace).toEqual({
     trace_id: META_TAG_TRACE_ID,
     parent_span_id: META_TAG_PARENT_SPAN_ID,
-    span_id: expect.stringMatching(/^[0-9a-f]{16}$/),
+    span_id: expect.stringMatching(/^[\da-f]{16}$/),
   });
 
   expect(errorTraceHeader).toEqual({
@@ -230,7 +230,7 @@ sentryTest(
       op: 'pageload',
       trace_id: META_TAG_TRACE_ID,
       parent_span_id: META_TAG_PARENT_SPAN_ID,
-      span_id: expect.stringMatching(/^[0-9a-f]{16}$/),
+      span_id: expect.stringMatching(/^[\da-f]{16}$/),
     });
 
     expect(pageloadTraceHeader).toEqual({
@@ -247,6 +247,7 @@ sentryTest(
     const headers = request.headers();
 
     // sampling decision is propagated from meta tag's sentry-trace sampled flag
+    // eslint-disable-next-line regexp/prefer-d
     expect(headers['sentry-trace']).toMatch(new RegExp(`^${META_TAG_TRACE_ID}-[0-9a-f]{16}-1$`));
     expect(headers['baggage']).toBe(META_TAG_BAGGAGE);
   },
@@ -284,7 +285,7 @@ sentryTest(
       op: 'pageload',
       trace_id: META_TAG_TRACE_ID,
       parent_span_id: META_TAG_PARENT_SPAN_ID,
-      span_id: expect.stringMatching(/^[0-9a-f]{16}$/),
+      span_id: expect.stringMatching(/^[\da-f]{16}$/),
     });
 
     expect(pageloadTraceHeader).toEqual({
@@ -301,6 +302,7 @@ sentryTest(
     const headers = request.headers();
 
     // sampling decision is propagated from meta tag's sentry-trace sampled flag
+    // eslint-disable-next-line regexp/prefer-d
     expect(headers['sentry-trace']).toMatch(new RegExp(`^${META_TAG_TRACE_ID}-[0-9a-f]{16}-1$`));
     expect(headers['baggage']).toBe(META_TAG_BAGGAGE);
   },
@@ -320,7 +322,7 @@ sentryTest('user feedback event after pageload has pageload traceId in headers',
     op: 'pageload',
     trace_id: META_TAG_TRACE_ID,
     parent_span_id: META_TAG_PARENT_SPAN_ID,
-    span_id: expect.stringMatching(/^[0-9a-f]{16}$/),
+    span_id: expect.stringMatching(/^[\da-f]{16}$/),
   });
 
   const feedbackEventPromise = getFirstSentryEnvelopeRequest<Event>(page);
@@ -340,6 +342,6 @@ sentryTest('user feedback event after pageload has pageload traceId in headers',
   expect(feedbackTraceContext).toMatchObject({
     trace_id: META_TAG_TRACE_ID,
     parent_span_id: META_TAG_PARENT_SPAN_ID,
-    span_id: expect.stringMatching(/^[0-9a-f]{16}$/),
+    span_id: expect.stringMatching(/^[\da-f]{16}$/),
   });
 });
diff --git a/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/pageload/test.ts b/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/pageload/test.ts
index e889be038bdd..e6edd02cf360 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/pageload/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/pageload/test.ts
@@ -38,8 +38,8 @@ sentryTest(
 
     expect(pageloadTraceContext).toMatchObject({
       op: 'pageload',
-      trace_id: expect.stringMatching(/^[0-9a-f]{32}$/),
-      span_id: expect.stringMatching(/^[0-9a-f]{16}$/),
+      trace_id: expect.stringMatching(/^[\da-f]{32}$/),
+      span_id: expect.stringMatching(/^[\da-f]{16}$/),
     });
     expect(pageloadTraceContext).not.toHaveProperty('parent_span_id');
 
@@ -54,8 +54,8 @@ sentryTest(
 
     expect(navigationTraceContext).toMatchObject({
       op: 'navigation',
-      trace_id: expect.stringMatching(/^[0-9a-f]{32}$/),
-      span_id: expect.stringMatching(/^[0-9a-f]{16}$/),
+      trace_id: expect.stringMatching(/^[\da-f]{32}$/),
+      span_id: expect.stringMatching(/^[\da-f]{16}$/),
     });
     expect(navigationTraceContext).not.toHaveProperty('parent_span_id');
 
@@ -89,8 +89,8 @@ sentryTest('error after pageload has pageload traceId', async ({ getLocalTestUrl
   expect(pageloadEvent.type).toEqual('transaction');
   expect(pageloadTraceContext).toMatchObject({
     op: 'pageload',
-    trace_id: expect.stringMatching(/^[0-9a-f]{32}$/),
-    span_id: expect.stringMatching(/^[0-9a-f]{16}$/),
+    trace_id: expect.stringMatching(/^[\da-f]{32}$/),
+    span_id: expect.stringMatching(/^[\da-f]{16}$/),
   });
   expect(pageloadTraceContext).not.toHaveProperty('parent_span_id');
 
@@ -116,7 +116,7 @@ sentryTest('error after pageload has pageload traceId', async ({ getLocalTestUrl
 
   expect(errorTraceContext).toEqual({
     trace_id: pageloadTraceContext?.trace_id,
-    span_id: expect.stringMatching(/^[0-9a-f]{16}$/),
+    span_id: expect.stringMatching(/^[\da-f]{16}$/),
   });
 
   expect(errorTraceHeader).toEqual({
@@ -156,8 +156,8 @@ sentryTest('error during pageload has pageload traceId', async ({ getLocalTestUr
   expect(pageloadEvent.type).toEqual('transaction');
   expect(pageloadTraceContext).toMatchObject({
     op: 'pageload',
-    trace_id: expect.stringMatching(/^[0-9a-f]{32}$/),
-    span_id: expect.stringMatching(/^[0-9a-f]{16}$/),
+    trace_id: expect.stringMatching(/^[\da-f]{32}$/),
+    span_id: expect.stringMatching(/^[\da-f]{16}$/),
   });
   expect(pageloadTraceContext).not.toHaveProperty('parent_span_id');
 
@@ -175,7 +175,7 @@ sentryTest('error during pageload has pageload traceId', async ({ getLocalTestUr
   expect(errorEvent.type).toEqual(undefined);
   expect(errorTraceContext).toEqual({
     trace_id: pageloadTraceContext?.trace_id,
-    span_id: expect.stringMatching(/^[0-9a-f]{16}$/),
+    span_id: expect.stringMatching(/^[\da-f]{16}$/),
   });
 
   expect(errorTraceHeader).toEqual({
@@ -221,8 +221,8 @@ sentryTest(
     expect(pageloadEvent.type).toEqual('transaction');
     expect(pageloadTraceContext).toMatchObject({
       op: 'pageload',
-      trace_id: expect.stringMatching(/^[0-9a-f]{32}$/),
-      span_id: expect.stringMatching(/^[0-9a-f]{16}$/),
+      trace_id: expect.stringMatching(/^[\da-f]{32}$/),
+      span_id: expect.stringMatching(/^[\da-f]{16}$/),
     });
     expect(pageloadTraceContext).not.toHaveProperty('parent_span_id');
 
@@ -278,8 +278,8 @@ sentryTest(
     expect(pageloadEvent.type).toEqual('transaction');
     expect(pageloadTraceContext).toMatchObject({
       op: 'pageload',
-      trace_id: expect.stringMatching(/^[0-9a-f]{32}$/),
-      span_id: expect.stringMatching(/^[0-9a-f]{16}$/),
+      trace_id: expect.stringMatching(/^[\da-f]{32}$/),
+      span_id: expect.stringMatching(/^[\da-f]{16}$/),
     });
     expect(pageloadTraceContext).not.toHaveProperty('parent_span_id');
 
@@ -457,8 +457,8 @@ sentryTest('user feedback event after pageload has pageload traceId in headers',
 
   expect(pageloadTraceContext).toMatchObject({
     op: 'pageload',
-    trace_id: expect.stringMatching(/^[0-9a-f]{32}$/),
-    span_id: expect.stringMatching(/^[0-9a-f]{16}$/),
+    trace_id: expect.stringMatching(/^[\da-f]{32}$/),
+    span_id: expect.stringMatching(/^[\da-f]{16}$/),
   });
   expect(pageloadTraceContext).not.toHaveProperty('parent_span_id');
 
@@ -479,6 +479,6 @@ sentryTest('user feedback event after pageload has pageload traceId in headers',
 
   expect(feedbackTraceContext).toMatchObject({
     trace_id: pageloadTraceContext?.trace_id,
-    span_id: expect.stringMatching(/^[0-9a-f]{16}$/),
+    span_id: expect.stringMatching(/^[\da-f]{16}$/),
   });
 });
diff --git a/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/startNewTrace/test.ts b/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/startNewTrace/test.ts
index 6f5ede5eccf8..40cc8a64d75f 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/startNewTrace/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/startNewTrace/test.ts
@@ -37,8 +37,8 @@ sentryTest(
 
     expect(pageloadTraceContext).toMatchObject({
       op: 'pageload',
-      trace_id: expect.stringMatching(/^[0-9a-f]{32}$/),
-      span_id: expect.stringMatching(/^[0-9a-f]{16}$/),
+      trace_id: expect.stringMatching(/^[\da-f]{32}$/),
+      span_id: expect.stringMatching(/^[\da-f]{16}$/),
     });
     expect(pageloadTraceContext).not.toHaveProperty('parent_span_id');
 
@@ -71,8 +71,8 @@ sentryTest(
     const newTraceTransactionTraceContext = newTraceTransactionEvent.contexts?.trace;
     expect(newTraceTransactionTraceContext).toMatchObject({
       op: 'ui.interaction.click',
-      trace_id: expect.stringMatching(/^[0-9a-f]{32}$/),
-      span_id: expect.stringMatching(/^[0-9a-f]{16}$/),
+      trace_id: expect.stringMatching(/^[\da-f]{32}$/),
+      span_id: expect.stringMatching(/^[\da-f]{16}$/),
     });
 
     expect(newTraceTransactionTraceHeaders).toEqual({
@@ -88,8 +88,8 @@ sentryTest(
     const oldTraceTransactionEventTraceContext = oldTraceTransactionEvent.contexts?.trace;
     expect(oldTraceTransactionEventTraceContext).toMatchObject({
       op: 'ui.interaction.click',
-      trace_id: expect.stringMatching(/^[0-9a-f]{32}$/),
-      span_id: expect.stringMatching(/^[0-9a-f]{16}$/),
+      trace_id: expect.stringMatching(/^[\da-f]{32}$/),
+      span_id: expect.stringMatching(/^[\da-f]{16}$/),
     });
 
     expect(oldTraceTransactionTraceHeaders).toEqual({
diff --git a/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/startNewTraceSampling/test.ts b/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/startNewTraceSampling/test.ts
index 616c89cd66f8..dc3d75f54799 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/startNewTraceSampling/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/startNewTraceSampling/test.ts
@@ -37,8 +37,8 @@ sentryTest(
 
     expect(pageloadTraceContext).toMatchObject({
       op: 'pageload',
-      trace_id: expect.stringMatching(/^[0-9a-f]{32}$/),
-      span_id: expect.stringMatching(/^[0-9a-f]{16}$/),
+      trace_id: expect.stringMatching(/^[\da-f]{32}$/),
+      span_id: expect.stringMatching(/^[\da-f]{16}$/),
       data: {
         'sentry.sample_rate': 0.5,
       },
@@ -67,8 +67,8 @@ sentryTest(
     const newTraceTransactionTraceContext = newTraceTransactionEvent.contexts?.trace;
     expect(newTraceTransactionTraceContext).toMatchObject({
       op: 'ui.interaction.click',
-      trace_id: expect.stringMatching(/^[0-9a-f]{32}$/),
-      span_id: expect.stringMatching(/^[0-9a-f]{16}$/),
+      trace_id: expect.stringMatching(/^[\da-f]{32}$/),
+      span_id: expect.stringMatching(/^[\da-f]{16}$/),
       data: {
         'sentry.sample_rate': 0.9,
       },
diff --git a/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/tracing-without-performance-propagateTraceparent/test.ts b/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/tracing-without-performance-propagateTraceparent/test.ts
index d2106b892b7b..8ce78c869179 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/tracing-without-performance-propagateTraceparent/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/tracing-without-performance-propagateTraceparent/test.ts
@@ -36,7 +36,7 @@ sentryTest(
     // sampling decision is deferred because TwP means we didn't sample any span
     expect(sentryTraceParentData).toEqual({
       traceId: META_TAG_TRACE_ID,
-      parentSpanId: expect.stringMatching(/^[0-9a-f]{16}$/),
+      parentSpanId: expect.stringMatching(/^[\da-f]{16}$/),
       parentSampled: undefined,
     });
     expect(headers['baggage']).toBe(META_TAG_BAGGAGE);
@@ -69,7 +69,7 @@ sentryTest(
     });
 
     expect(headers3['baggage']).toMatch(
-      /sentry-environment=production,sentry-public_key=public,sentry-trace_id=[0-9a-f]{32}/,
+      /sentry-environment=production,sentry-public_key=public,sentry-trace_id=[\da-f]{32}/,
     );
     expect(headers3['baggage']).not.toContain(`sentry-trace_id=${META_TAG_TRACE_ID}`);
     // but traceparent propagates a negative sampling decision because it has no concept of deferred sampling
@@ -110,6 +110,7 @@ sentryTest('outgoing XHR requests have new traceId after navigation', async ({ g
   const headers = request.headers();
 
   // sampling decision is deferred because TwP means we didn't sample any span
+  // eslint-disable-next-line regexp/prefer-d
   expect(headers['sentry-trace']).toMatch(new RegExp(`^${META_TAG_TRACE_ID}-[0-9a-f]{16}$`));
   expect(headers['baggage']).toBe(META_TAG_BAGGAGE);
 
@@ -121,10 +122,10 @@ sentryTest('outgoing XHR requests have new traceId after navigation', async ({ g
   const headers2 = request2.headers();
 
   // sampling decision is deferred because TwP means we didn't sample any span
-  expect(headers2['sentry-trace']).toMatch(/^[0-9a-f]{32}-[0-9a-f]{16}$/);
+  expect(headers2['sentry-trace']).toMatch(/^[\da-f]{32}-[\da-f]{16}$/);
   expect(headers2['baggage']).not.toBe(`${META_TAG_TRACE_ID}-${META_TAG_PARENT_SPAN_ID}`);
   expect(headers2['baggage']).toMatch(
-    /sentry-environment=production,sentry-public_key=public,sentry-trace_id=[0-9a-f]{32}/,
+    /sentry-environment=production,sentry-public_key=public,sentry-trace_id=[\da-f]{32}/,
   );
   expect(headers2['baggage']).not.toContain(`sentry-trace_id=${META_TAG_TRACE_ID}`);
 });
diff --git a/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/tracing-without-performance/test.ts b/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/tracing-without-performance/test.ts
index 686f65227aa7..51cc61e0de0c 100644
--- a/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/tracing-without-performance/test.ts
+++ b/dev-packages/browser-integration-tests/suites/tracing/trace-lifetime/tracing-without-performance/test.ts
@@ -33,7 +33,7 @@ sentryTest('error on initial page has traceId from meta tag', async ({ getLocalT
   expect(errorEvent.contexts?.trace).toEqual({
     trace_id: META_TAG_TRACE_ID,
     parent_span_id: META_TAG_PARENT_SPAN_ID,
-    span_id: expect.stringMatching(/^[0-9a-f]{16}$/),
+    span_id: expect.stringMatching(/^[\da-f]{16}$/),
   });
 
   expect(errorTraceHeader).toEqual({
@@ -65,7 +65,7 @@ sentryTest('error has new traceId after navigation', async ({ getLocalTestUrl, p
   expect(errorEvent.contexts?.trace).toEqual({
     trace_id: META_TAG_TRACE_ID,
     parent_span_id: META_TAG_PARENT_SPAN_ID,
-    span_id: expect.stringMatching(/^[0-9a-f]{16}$/),
+    span_id: expect.stringMatching(/^[\da-f]{16}$/),
   });
 
   expect(errorTraceHeader).toEqual({
@@ -85,8 +85,8 @@ sentryTest('error has new traceId after navigation', async ({ getLocalTestUrl, p
   const [errorEvent2, errorTraceHeader2] = await errorEventPromise2;
 
   expect(errorEvent2.contexts?.trace).toEqual({
-    trace_id: expect.stringMatching(/^[0-9a-f]{32}$/),
-    span_id: expect.stringMatching(/^[0-9a-f]{16}$/),
+    trace_id: expect.stringMatching(/^[\da-f]{32}$/),
+    span_id: expect.stringMatching(/^[\da-f]{16}$/),
   });
 
   expect(errorTraceHeader2).toEqual({
@@ -121,6 +121,7 @@ sentryTest('outgoing fetch requests have new traceId after navigation', async ({
   const headers = request.headers();
 
   // sampling decision is deferred because TwP means we didn't sample any span
+  // eslint-disable-next-line regexp/prefer-d
   expect(headers['sentry-trace']).toMatch(new RegExp(`^${META_TAG_TRACE_ID}-[0-9a-f]{16}$`));
   expect(headers['baggage']).toBe(META_TAG_BAGGAGE);
 
@@ -132,10 +133,10 @@ sentryTest('outgoing fetch requests have new traceId after navigation', async ({
   const headers2 = request2.headers();
 
   // sampling decision is deferred because TwP means we didn't sample any span
-  expect(headers2['sentry-trace']).toMatch(/^[0-9a-f]{32}-[0-9a-f]{16}$/);
+  expect(headers2['sentry-trace']).toMatch(/^[\da-f]{32}-[\da-f]{16}$/);
   expect(headers2['baggage']).not.toBe(`${META_TAG_TRACE_ID}-${META_TAG_PARENT_SPAN_ID}`);
   expect(headers2['baggage']).toMatch(
-    /sentry-environment=production,sentry-public_key=public,sentry-trace_id=[0-9a-f]{32}/,
+    /sentry-environment=production,sentry-public_key=public,sentry-trace_id=[\da-f]{32}/,
   );
   expect(headers2['baggage']).not.toContain(`sentry-trace_id=${META_TAG_TRACE_ID}`);
 });
@@ -163,6 +164,7 @@ sentryTest('outgoing XHR requests have new traceId after navigation', async ({ g
   const headers = request.headers();
 
   // sampling decision is deferred because TwP means we didn't sample any span
+  // eslint-disable-next-line regexp/prefer-d
   expect(headers['sentry-trace']).toMatch(new RegExp(`^${META_TAG_TRACE_ID}-[0-9a-f]{16}$`));
   expect(headers['baggage']).toBe(META_TAG_BAGGAGE);
 
@@ -174,10 +176,10 @@ sentryTest('outgoing XHR requests have new traceId after navigation', async ({ g
   const headers2 = request2.headers();
 
   // sampling decision is deferred because TwP means we didn't sample any span
-  expect(headers2['sentry-trace']).toMatch(/^[0-9a-f]{32}-[0-9a-f]{16}$/);
+  expect(headers2['sentry-trace']).toMatch(/^[\da-f]{32}-[\da-f]{16}$/);
   expect(headers2['baggage']).not.toBe(`${META_TAG_TRACE_ID}-${META_TAG_PARENT_SPAN_ID}`);
   expect(headers2['baggage']).toMatch(
-    /sentry-environment=production,sentry-public_key=public,sentry-trace_id=[0-9a-f]{32}/,
+    /sentry-environment=production,sentry-public_key=public,sentry-trace_id=[\da-f]{32}/,
   );
   expect(headers2['baggage']).not.toContain(`sentry-trace_id=${META_TAG_TRACE_ID}`);
 });
diff --git a/dev-packages/browser-integration-tests/utils/replayHelpers.ts b/dev-packages/browser-integration-tests/utils/replayHelpers.ts
index 86a9e5ba3d78..72e98cb3e9d1 100644
--- a/dev-packages/browser-integration-tests/utils/replayHelpers.ts
+++ b/dev-packages/browser-integration-tests/utils/replayHelpers.ts
@@ -447,9 +447,10 @@ export function normalize(
 ): string {
   const rawString = JSON.stringify(obj, null, 2);
   let normalizedString = rawString
-    .replace(/"file:\/\/.+(\/.*\.html)"/gm, '"$1"')
-    .replace(/"timeOffset":\s*-?\d+/gm, '"timeOffset": [timeOffset]')
-    .replace(/"timestamp":\s*0/gm, '"timestamp": [timestamp]');
+    // eslint-disable-next-line regexp/no-super-linear-backtracking
+    .replace(/"file:\/\/.+(\/.*\.html)"/g, '"$1"')
+    .replace(/"timeOffset":\s*-?\d+/g, '"timeOffset": [timeOffset]')
+    .replace(/"timestamp":\s*0/g, '"timestamp": [timestamp]');
 
   if (normalizeNumberAttributes?.length) {
     // We look for: "attr": "123px", "123", "123%", "123em", "123rem"
diff --git a/dev-packages/bundle-analyzer-scenarios/package.json b/dev-packages/bundle-analyzer-scenarios/package.json
index e869e1fcf85b..f986cf4208f4 100644
--- a/dev-packages/bundle-analyzer-scenarios/package.json
+++ b/dev-packages/bundle-analyzer-scenarios/package.json
@@ -12,6 +12,9 @@
     "webpack": "^5.95.0",
     "webpack-bundle-analyzer": "^4.10.2"
   },
+  "devDependencies": {
+    "eslint-plugin-regexp": "^1.15.0"
+  },
   "scripts": {
     "analyze": "node webpack.cjs"
   },
diff --git a/dev-packages/clear-cache-gh-action/.eslintrc.cjs b/dev-packages/clear-cache-gh-action/.eslintrc.cjs
index dfc1b926f803..9472d27555a3 100644
--- a/dev-packages/clear-cache-gh-action/.eslintrc.cjs
+++ b/dev-packages/clear-cache-gh-action/.eslintrc.cjs
@@ -1,5 +1,7 @@
 module.exports = {
-  extends: ['../../.eslintrc.js'],
+  // todo: remove regexp plugin from here once we add it to base.js eslint config for the whole project
+  extends: ['../../.eslintrc.js', 'plugin:regexp/recommended'],
+  plugins: ['regexp'],
   parserOptions: {
     sourceType: 'module',
     ecmaVersion: 'latest',
diff --git a/dev-packages/clear-cache-gh-action/package.json b/dev-packages/clear-cache-gh-action/package.json
index 5dbba5b9f66c..28666e974eca 100644
--- a/dev-packages/clear-cache-gh-action/package.json
+++ b/dev-packages/clear-cache-gh-action/package.json
@@ -17,6 +17,9 @@
     "@actions/core": "1.10.1",
     "@actions/github": "^5.0.0"
   },
+  "devDependencies": {
+    "eslint-plugin-regexp": "^1.15.0"
+  },
   "volta": {
     "extends": "../../package.json"
   }
diff --git a/dev-packages/cloudflare-integration-tests/.eslintrc.js b/dev-packages/cloudflare-integration-tests/.eslintrc.js
index 899a60f9a2bd..5ce331e4074a 100644
--- a/dev-packages/cloudflare-integration-tests/.eslintrc.js
+++ b/dev-packages/cloudflare-integration-tests/.eslintrc.js
@@ -2,7 +2,9 @@ module.exports = {
   env: {
     node: true,
   },
-  extends: ['../../.eslintrc.js'],
+  // todo: remove regexp plugin from here once we add it to base.js eslint config for the whole project
+  extends: ['../../.eslintrc.js', 'plugin:regexp/recommended'],
+  plugins: ['regexp'],
   overrides: [
     {
       files: ['*.ts'],
diff --git a/dev-packages/cloudflare-integration-tests/expect.ts b/dev-packages/cloudflare-integration-tests/expect.ts
index 6050ff6816c4..5caec668cd13 100644
--- a/dev-packages/cloudflare-integration-tests/expect.ts
+++ b/dev-packages/cloudflare-integration-tests/expect.ts
@@ -2,11 +2,11 @@ import type { Contexts, Envelope, Event, SdkInfo } from '@sentry/core';
 import { SDK_VERSION } from '@sentry/core';
 import { expect } from 'vitest';
 
-export const UUID_MATCHER = expect.stringMatching(/^[0-9a-f]{32}$/);
+export const UUID_MATCHER = expect.stringMatching(/^[\da-f]{32}$/);
 export const UUID_V4_MATCHER = expect.stringMatching(
-  /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/,
+  /^[\da-f]{8}-[\da-f]{4}-4[\da-f]{3}-[89ab][\da-f]{3}-[\da-f]{12}$/,
 );
-export const SHORT_UUID_MATCHER = expect.stringMatching(/^[0-9a-f]{16}$/);
+export const SHORT_UUID_MATCHER = expect.stringMatching(/^[\da-f]{16}$/);
 export const ISO_DATE_MATCHER = expect.stringMatching(/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/);
 
 function dropUndefinedKeys<T extends Record<string, unknown>>(obj: T): T {
diff --git a/dev-packages/cloudflare-integration-tests/package.json b/dev-packages/cloudflare-integration-tests/package.json
index b3e8fad26a6a..97bf49dfce5e 100644
--- a/dev-packages/cloudflare-integration-tests/package.json
+++ b/dev-packages/cloudflare-integration-tests/package.json
@@ -18,6 +18,7 @@
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20250922.0",
     "@sentry-internal/test-utils": "10.23.0",
+    "eslint-plugin-regexp": "^1.15.0",
     "vitest": "^3.2.4",
     "wrangler": "4.22.0"
   },
diff --git a/dev-packages/e2e-tests/.eslintrc.js b/dev-packages/e2e-tests/.eslintrc.js
index 5ba76262baaf..9c0a56bca5f4 100644
--- a/dev-packages/e2e-tests/.eslintrc.js
+++ b/dev-packages/e2e-tests/.eslintrc.js
@@ -2,7 +2,9 @@ module.exports = {
   env: {
     node: true,
   },
-  extends: ['../../.eslintrc.js'],
+  // todo: remove regexp plugin from here once we add it to base.js eslint config for the whole project
+  extends: ['../../.eslintrc.js', 'plugin:regexp/recommended'],
+  plugins: ['regexp'],
   ignorePatterns: ['test-applications/**', 'tmp/**'],
   parserOptions: {
     sourceType: 'module',
diff --git a/dev-packages/e2e-tests/package.json b/dev-packages/e2e-tests/package.json
index eab86ffb8ff5..169508d15e55 100644
--- a/dev-packages/e2e-tests/package.json
+++ b/dev-packages/e2e-tests/package.json
@@ -25,6 +25,7 @@
     "@types/node": "^18.19.1",
     "dotenv": "16.0.3",
     "esbuild": "0.20.0",
+    "eslint-plugin-regexp": "^1.15.0",
     "glob": "8.0.3",
     "rimraf": "^5.0.10",
     "ts-node": "10.9.1",
diff --git a/dev-packages/e2e-tests/test-applications/aws-serverless/package.json b/dev-packages/e2e-tests/test-applications/aws-serverless/package.json
index bf8085c4e892..d24bc1b78805 100644
--- a/dev-packages/e2e-tests/test-applications/aws-serverless/package.json
+++ b/dev-packages/e2e-tests/test-applications/aws-serverless/package.json
@@ -19,6 +19,7 @@
     "aws-cdk-lib": "^2.210.0",
     "constructs": "^10.4.2",
     "glob": "^11.0.3",
+    "rimraf": "^5.0.10",
     "tmp": "^0.2.5"
   },
   "volta": {
diff --git a/dev-packages/external-contributor-gh-action/.eslintrc.cjs b/dev-packages/external-contributor-gh-action/.eslintrc.cjs
index dfc1b926f803..9472d27555a3 100644
--- a/dev-packages/external-contributor-gh-action/.eslintrc.cjs
+++ b/dev-packages/external-contributor-gh-action/.eslintrc.cjs
@@ -1,5 +1,7 @@
 module.exports = {
-  extends: ['../../.eslintrc.js'],
+  // todo: remove regexp plugin from here once we add it to base.js eslint config for the whole project
+  extends: ['../../.eslintrc.js', 'plugin:regexp/recommended'],
+  plugins: ['regexp'],
   parserOptions: {
     sourceType: 'module',
     ecmaVersion: 'latest',
diff --git a/dev-packages/external-contributor-gh-action/index.mjs b/dev-packages/external-contributor-gh-action/index.mjs
index 2bad8a16f0bd..ef2e14ad32b6 100644
--- a/dev-packages/external-contributor-gh-action/index.mjs
+++ b/dev-packages/external-contributor-gh-action/index.mjs
@@ -35,7 +35,7 @@ async function run() {
 
   // If the contributor message already exists, add the new contributor to the list
   if (existing) {
-    const users = existing[1].split(/(?:,? and )|(?:, )/);
+    const users = existing[1].split(/,? and |, /);
     if (!users.includes(ghUserName)) {
       users.push(ghUserName);
     }
diff --git a/dev-packages/external-contributor-gh-action/package.json b/dev-packages/external-contributor-gh-action/package.json
index 04b10a3980c6..3640bb7c29d2 100644
--- a/dev-packages/external-contributor-gh-action/package.json
+++ b/dev-packages/external-contributor-gh-action/package.json
@@ -16,6 +16,9 @@
   "dependencies": {
     "@actions/core": "1.10.1"
   },
+  "devDependencies": {
+    "eslint-plugin-regexp": "^1.15.0"
+  },
   "volta": {
     "extends": "../../package.json"
   }
diff --git a/dev-packages/node-core-integration-tests/.eslintrc.js b/dev-packages/node-core-integration-tests/.eslintrc.js
index 0598ba3f5ca1..e307575fe52e 100644
--- a/dev-packages/node-core-integration-tests/.eslintrc.js
+++ b/dev-packages/node-core-integration-tests/.eslintrc.js
@@ -2,7 +2,9 @@ module.exports = {
   env: {
     node: true,
   },
-  extends: ['../../.eslintrc.js'],
+  // todo: remove regexp plugin from here once we add it to base.js eslint config for the whole project
+  extends: ['../../.eslintrc.js', 'plugin:regexp/recommended'],
+  plugins: ['regexp'],
   overrides: [
     {
       files: ['utils/**/*.ts', 'src/**/*.ts'],
diff --git a/dev-packages/node-core-integration-tests/package.json b/dev-packages/node-core-integration-tests/package.json
index 8c982e61663c..3b27b2ffd3d7 100644
--- a/dev-packages/node-core-integration-tests/package.json
+++ b/dev-packages/node-core-integration-tests/package.json
@@ -53,6 +53,7 @@
   "devDependencies": {
     "@types/node-cron": "^3.0.11",
     "@types/node-schedule": "^2.1.7",
+    "eslint-plugin-regexp": "^1.15.0",
     "globby": "11"
   },
   "config": {
diff --git a/dev-packages/node-core-integration-tests/suites/anr/test.ts b/dev-packages/node-core-integration-tests/suites/anr/test.ts
index 08b6a6571e17..c9a81ccb5db0 100644
--- a/dev-packages/node-core-integration-tests/suites/anr/test.ts
+++ b/dev-packages/node-core-integration-tests/suites/anr/test.ts
@@ -6,8 +6,8 @@ const ANR_EVENT = {
   // Ensure we have context
   contexts: {
     trace: {
-      span_id: expect.stringMatching(/[a-f0-9]{16}/),
-      trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+      span_id: expect.stringMatching(/[a-f\d]{16}/),
+      trace_id: expect.stringMatching(/[a-f\d]{32}/),
     },
     device: {
       arch: expect.any(String),
diff --git a/dev-packages/node-core-integration-tests/suites/cron/cron/test.ts b/dev-packages/node-core-integration-tests/suites/cron/cron/test.ts
index c7d0ca5239fc..60edd2812b4b 100644
--- a/dev-packages/node-core-integration-tests/suites/cron/cron/test.ts
+++ b/dev-packages/node-core-integration-tests/suites/cron/cron/test.ts
@@ -16,8 +16,8 @@ test('cron instrumentation', async () => {
         monitor_config: { schedule: { type: 'crontab', value: '* * * * * *' } },
         contexts: {
           trace: {
-            trace_id: expect.stringMatching(/[a-f0-9]{32}/),
-            span_id: expect.stringMatching(/[a-f0-9]{16}/),
+            trace_id: expect.stringMatching(/[a-f\d]{32}/),
+            span_id: expect.stringMatching(/[a-f\d]{16}/),
           },
         },
       },
@@ -31,8 +31,8 @@ test('cron instrumentation', async () => {
         duration: expect.any(Number),
         contexts: {
           trace: {
-            trace_id: expect.stringMatching(/[a-f0-9]{32}/),
-            span_id: expect.stringMatching(/[a-f0-9]{16}/),
+            trace_id: expect.stringMatching(/[a-f\d]{32}/),
+            span_id: expect.stringMatching(/[a-f\d]{16}/),
           },
         },
       },
@@ -46,8 +46,8 @@ test('cron instrumentation', async () => {
         monitor_config: { schedule: { type: 'crontab', value: '* * * * * *' } },
         contexts: {
           trace: {
-            trace_id: expect.stringMatching(/[a-f0-9]{32}/),
-            span_id: expect.stringMatching(/[a-f0-9]{16}/),
+            trace_id: expect.stringMatching(/[a-f\d]{32}/),
+            span_id: expect.stringMatching(/[a-f\d]{16}/),
           },
         },
       },
@@ -61,8 +61,8 @@ test('cron instrumentation', async () => {
         duration: expect.any(Number),
         contexts: {
           trace: {
-            trace_id: expect.stringMatching(/[a-f0-9]{32}/),
-            span_id: expect.stringMatching(/[a-f0-9]{16}/),
+            trace_id: expect.stringMatching(/[a-f\d]{32}/),
+            span_id: expect.stringMatching(/[a-f\d]{16}/),
           },
         },
       },
diff --git a/dev-packages/node-core-integration-tests/suites/cron/node-cron/test.ts b/dev-packages/node-core-integration-tests/suites/cron/node-cron/test.ts
index fb3e7bacbf45..dcdb1ba4c4d9 100644
--- a/dev-packages/node-core-integration-tests/suites/cron/node-cron/test.ts
+++ b/dev-packages/node-core-integration-tests/suites/cron/node-cron/test.ts
@@ -16,8 +16,8 @@ test('node-cron instrumentation', async () => {
         monitor_config: { schedule: { type: 'crontab', value: '* * * * * *' } },
         contexts: {
           trace: {
-            trace_id: expect.stringMatching(/[a-f0-9]{32}/),
-            span_id: expect.stringMatching(/[a-f0-9]{16}/),
+            trace_id: expect.stringMatching(/[a-f\d]{32}/),
+            span_id: expect.stringMatching(/[a-f\d]{16}/),
           },
         },
       },
@@ -31,8 +31,8 @@ test('node-cron instrumentation', async () => {
         duration: expect.any(Number),
         contexts: {
           trace: {
-            trace_id: expect.stringMatching(/[a-f0-9]{32}/),
-            span_id: expect.stringMatching(/[a-f0-9]{16}/),
+            trace_id: expect.stringMatching(/[a-f\d]{32}/),
+            span_id: expect.stringMatching(/[a-f\d]{16}/),
           },
         },
       },
@@ -46,8 +46,8 @@ test('node-cron instrumentation', async () => {
         monitor_config: { schedule: { type: 'crontab', value: '* * * * * *' } },
         contexts: {
           trace: {
-            trace_id: expect.stringMatching(/[a-f0-9]{32}/),
-            span_id: expect.stringMatching(/[a-f0-9]{16}/),
+            trace_id: expect.stringMatching(/[a-f\d]{32}/),
+            span_id: expect.stringMatching(/[a-f\d]{16}/),
           },
         },
       },
@@ -61,8 +61,8 @@ test('node-cron instrumentation', async () => {
         duration: expect.any(Number),
         contexts: {
           trace: {
-            trace_id: expect.stringMatching(/[a-f0-9]{32}/),
-            span_id: expect.stringMatching(/[a-f0-9]{16}/),
+            trace_id: expect.stringMatching(/[a-f\d]{32}/),
+            span_id: expect.stringMatching(/[a-f\d]{16}/),
           },
         },
       },
diff --git a/dev-packages/node-core-integration-tests/suites/cron/node-schedule/test.ts b/dev-packages/node-core-integration-tests/suites/cron/node-schedule/test.ts
index 285e41cee304..220f388d65d0 100644
--- a/dev-packages/node-core-integration-tests/suites/cron/node-schedule/test.ts
+++ b/dev-packages/node-core-integration-tests/suites/cron/node-schedule/test.ts
@@ -16,8 +16,8 @@ test('node-schedule instrumentation', async () => {
         monitor_config: { schedule: { type: 'crontab', value: '* * * * * *' } },
         contexts: {
           trace: {
-            trace_id: expect.stringMatching(/[a-f0-9]{32}/),
-            span_id: expect.stringMatching(/[a-f0-9]{16}/),
+            trace_id: expect.stringMatching(/[a-f\d]{32}/),
+            span_id: expect.stringMatching(/[a-f\d]{16}/),
           },
         },
       },
@@ -31,8 +31,8 @@ test('node-schedule instrumentation', async () => {
         duration: expect.any(Number),
         contexts: {
           trace: {
-            trace_id: expect.stringMatching(/[a-f0-9]{32}/),
-            span_id: expect.stringMatching(/[a-f0-9]{16}/),
+            trace_id: expect.stringMatching(/[a-f\d]{32}/),
+            span_id: expect.stringMatching(/[a-f\d]{16}/),
           },
         },
       },
@@ -46,8 +46,8 @@ test('node-schedule instrumentation', async () => {
         monitor_config: { schedule: { type: 'crontab', value: '* * * * * *' } },
         contexts: {
           trace: {
-            trace_id: expect.stringMatching(/[a-f0-9]{32}/),
-            span_id: expect.stringMatching(/[a-f0-9]{16}/),
+            trace_id: expect.stringMatching(/[a-f\d]{32}/),
+            span_id: expect.stringMatching(/[a-f\d]{16}/),
           },
         },
       },
@@ -61,8 +61,8 @@ test('node-schedule instrumentation', async () => {
         duration: expect.any(Number),
         contexts: {
           trace: {
-            trace_id: expect.stringMatching(/[a-f0-9]{32}/),
-            span_id: expect.stringMatching(/[a-f0-9]{16}/),
+            trace_id: expect.stringMatching(/[a-f\d]{32}/),
+            span_id: expect.stringMatching(/[a-f\d]{16}/),
           },
         },
       },
diff --git a/dev-packages/node-core-integration-tests/suites/tracing/dsc-txn-name-update/test.ts b/dev-packages/node-core-integration-tests/suites/tracing/dsc-txn-name-update/test.ts
index 9fe401badaa7..b9b2327497f5 100644
--- a/dev-packages/node-core-integration-tests/suites/tracing/dsc-txn-name-update/test.ts
+++ b/dev-packages/node-core-integration-tests/suites/tracing/dsc-txn-name-update/test.ts
@@ -16,13 +16,13 @@ conditionalTest({ min: 22 })('node >=22', () => {
         const baggageItems = getBaggageHeaderItems(headers);
         traceId = baggageItems.find(item => item.startsWith('sentry-trace_id='))?.split('=')[1] as string;
 
-        expect(traceId).toMatch(/^[0-9a-f]{32}$/);
+        expect(traceId).toMatch(/^[\da-f]{32}$/);
 
         expect(baggageItems).toEqual([
           'sentry-environment=production',
           'sentry-public_key=public',
           'sentry-release=1.0',
-          expect.stringMatching(/sentry-sample_rand=0\.[0-9]+/),
+          expect.stringMatching(/sentry-sample_rand=0\.\d+/),
           'sentry-sample_rate=1',
           'sentry-sampled=true',
           `sentry-trace_id=${traceId}`,
@@ -33,7 +33,7 @@ conditionalTest({ min: 22 })('node >=22', () => {
           'sentry-environment=production',
           'sentry-public_key=public',
           'sentry-release=1.0',
-          expect.stringMatching(/sentry-sample_rand=0\.[0-9]+/),
+          expect.stringMatching(/sentry-sample_rand=0\.\d+/),
           'sentry-sample_rate=1',
           'sentry-sampled=true',
           `sentry-trace_id=${traceId}`,
@@ -45,7 +45,7 @@ conditionalTest({ min: 22 })('node >=22', () => {
           'sentry-environment=production',
           'sentry-public_key=public',
           'sentry-release=1.0',
-          expect.stringMatching(/sentry-sample_rand=0\.[0-9]+/),
+          expect.stringMatching(/sentry-sample_rand=0\.\d+/),
           'sentry-sample_rate=1',
           'sentry-sampled=true',
           `sentry-trace_id=${traceId}`,
@@ -77,7 +77,7 @@ test('adds current transaction name to trace envelope header when the txn name i
           release: '1.0',
           sample_rate: '1',
           sampled: 'true',
-          trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+          trace_id: expect.stringMatching(/[a-f\d]{32}/),
           sample_rand: expect.any(String),
         },
       },
@@ -90,7 +90,7 @@ test('adds current transaction name to trace envelope header when the txn name i
           release: '1.0',
           sample_rate: '1',
           sampled: 'true',
-          trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+          trace_id: expect.stringMatching(/[a-f\d]{32}/),
           transaction: 'updated-name-1',
           sample_rand: expect.any(String),
         },
@@ -104,7 +104,7 @@ test('adds current transaction name to trace envelope header when the txn name i
           release: '1.0',
           sample_rate: '1',
           sampled: 'true',
-          trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+          trace_id: expect.stringMatching(/[a-f\d]{32}/),
           transaction: 'updated-name-2',
           sample_rand: expect.any(String),
         },
@@ -118,7 +118,7 @@ test('adds current transaction name to trace envelope header when the txn name i
           release: '1.0',
           sample_rate: '1',
           sampled: 'true',
-          trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+          trace_id: expect.stringMatching(/[a-f\d]{32}/),
           transaction: 'updated-name-2',
           sample_rand: expect.any(String),
         },
diff --git a/dev-packages/node-core-integration-tests/suites/tracing/envelope-header/error-active-span-unsampled/test.ts b/dev-packages/node-core-integration-tests/suites/tracing/envelope-header/error-active-span-unsampled/test.ts
index bba04c788282..9fe5f34ef8e5 100644
--- a/dev-packages/node-core-integration-tests/suites/tracing/envelope-header/error-active-span-unsampled/test.ts
+++ b/dev-packages/node-core-integration-tests/suites/tracing/envelope-header/error-active-span-unsampled/test.ts
@@ -7,7 +7,7 @@ test('envelope header for error event during active unsampled span is correct',
     .expectHeader({
       event: {
         trace: {
-          trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+          trace_id: expect.stringMatching(/[a-f\d]{32}/),
           public_key: 'public',
           environment: 'production',
           release: '1.0',
diff --git a/dev-packages/node-core-integration-tests/suites/tracing/envelope-header/error-active-span/test.ts b/dev-packages/node-core-integration-tests/suites/tracing/envelope-header/error-active-span/test.ts
index f11defc490c8..4b103c7e7d79 100644
--- a/dev-packages/node-core-integration-tests/suites/tracing/envelope-header/error-active-span/test.ts
+++ b/dev-packages/node-core-integration-tests/suites/tracing/envelope-header/error-active-span/test.ts
@@ -7,7 +7,7 @@ test('envelope header for error event during active span is correct', async () =
     .expectHeader({
       event: {
         trace: {
-          trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+          trace_id: expect.stringMatching(/[a-f\d]{32}/),
           public_key: 'public',
           environment: 'production',
           release: '1.0',
diff --git a/dev-packages/node-core-integration-tests/suites/tracing/envelope-header/error/test.ts b/dev-packages/node-core-integration-tests/suites/tracing/envelope-header/error/test.ts
index 9d39209d456f..29a487949adb 100644
--- a/dev-packages/node-core-integration-tests/suites/tracing/envelope-header/error/test.ts
+++ b/dev-packages/node-core-integration-tests/suites/tracing/envelope-header/error/test.ts
@@ -6,7 +6,7 @@ test('envelope header for error events is correct', async () => {
     .expectHeader({
       event: {
         trace: {
-          trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+          trace_id: expect.stringMatching(/[a-f\d]{32}/),
           environment: 'production',
           public_key: 'public',
           release: '1.0',
diff --git a/dev-packages/node-core-integration-tests/suites/tracing/envelope-header/transaction-route/test.ts b/dev-packages/node-core-integration-tests/suites/tracing/envelope-header/transaction-route/test.ts
index f4bb6e2b4293..9798194b0c1c 100644
--- a/dev-packages/node-core-integration-tests/suites/tracing/envelope-header/transaction-route/test.ts
+++ b/dev-packages/node-core-integration-tests/suites/tracing/envelope-header/transaction-route/test.ts
@@ -6,7 +6,7 @@ test('envelope header for transaction event of route correct', async () => {
     .expectHeader({
       transaction: {
         trace: {
-          trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+          trace_id: expect.stringMatching(/[a-f\d]{32}/),
           public_key: 'public',
           transaction: 'GET /route',
           environment: 'production',
diff --git a/dev-packages/node-core-integration-tests/suites/tracing/envelope-header/transaction-url/test.ts b/dev-packages/node-core-integration-tests/suites/tracing/envelope-header/transaction-url/test.ts
index c4ed5ae4983f..7b6b07191c44 100644
--- a/dev-packages/node-core-integration-tests/suites/tracing/envelope-header/transaction-url/test.ts
+++ b/dev-packages/node-core-integration-tests/suites/tracing/envelope-header/transaction-url/test.ts
@@ -6,7 +6,7 @@ test('envelope header for transaction event with source=url correct', async () =
     .expectHeader({
       transaction: {
         trace: {
-          trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+          trace_id: expect.stringMatching(/[a-f\d]{32}/),
           public_key: 'public',
           environment: 'production',
           release: '1.0',
diff --git a/dev-packages/node-core-integration-tests/suites/tracing/envelope-header/transaction/test.ts b/dev-packages/node-core-integration-tests/suites/tracing/envelope-header/transaction/test.ts
index 104761d52c86..24276f57f212 100644
--- a/dev-packages/node-core-integration-tests/suites/tracing/envelope-header/transaction/test.ts
+++ b/dev-packages/node-core-integration-tests/suites/tracing/envelope-header/transaction/test.ts
@@ -6,7 +6,7 @@ test('envelope header for transaction event is correct', async () => {
     .expectHeader({
       transaction: {
         trace: {
-          trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+          trace_id: expect.stringMatching(/[a-f\d]{32}/),
           public_key: 'public',
           environment: 'production',
           release: '1.0',
diff --git a/dev-packages/node-core-integration-tests/suites/tracing/meta-tags-twp-errors/test.ts b/dev-packages/node-core-integration-tests/suites/tracing/meta-tags-twp-errors/test.ts
index 7c6612a0f4f7..d58f35b02972 100644
--- a/dev-packages/node-core-integration-tests/suites/tracing/meta-tags-twp-errors/test.ts
+++ b/dev-packages/node-core-integration-tests/suites/tracing/meta-tags-twp-errors/test.ts
@@ -13,8 +13,8 @@ describe('errors in TwP mode have same trace in trace context and getTraceData()
         event: event => {
           const { contexts } = event;
           const { trace_id, span_id } = contexts?.trace || {};
-          expect(trace_id).toMatch(/^[a-f0-9]{32}$/);
-          expect(span_id).toMatch(/^[a-f0-9]{16}$/);
+          expect(trace_id).toMatch(/^[a-f\d]{32}$/);
+          expect(span_id).toMatch(/^[a-f\d]{16}$/);
 
           const traceData = contexts?.traceData || {};
 
@@ -40,12 +40,12 @@ describe('errors in TwP mode have same trace in trace context and getTraceData()
         event: event => {
           const { contexts } = event;
           const { trace_id, span_id } = contexts?.trace || {};
-          expect(trace_id).toMatch(/^[a-f0-9]{32}$/);
-          expect(span_id).toMatch(/^[a-f0-9]{16}$/);
+          expect(trace_id).toMatch(/^[a-f\d]{32}$/);
+          expect(span_id).toMatch(/^[a-f\d]{16}$/);
 
           const traceData = contexts?.traceData || {};
 
-          expect(traceData['sentry-trace']).toMatch(/^[a-f0-9]{32}-[a-f0-9]{16}$/);
+          expect(traceData['sentry-trace']).toMatch(/^[a-f\d]{32}-[a-f\d]{16}$/);
           expect(traceData['sentry-trace']).toContain(`${trace_id}-`);
           // span_id is a random span ID
           expect(traceData['sentry-trace']).not.toContain(span_id);
@@ -53,7 +53,7 @@ describe('errors in TwP mode have same trace in trace context and getTraceData()
           expect(traceData.baggage).toContain(`sentry-trace_id=${trace_id}`);
           expect(traceData.baggage).not.toContain('sentry-sampled=');
 
-          expect(traceData.metaTags).toMatch(/<meta name="sentry-trace" content="[a-f0-9]{32}-[a-f0-9]{16}"\/>/);
+          expect(traceData.metaTags).toMatch(/<meta name="sentry-trace" content="[a-f\d]{32}-[a-f\d]{16}"\/>/);
           expect(traceData.metaTags).toContain(`<meta name="sentry-trace" content="${trace_id}-`);
           // span_id is a random span ID
           expect(traceData.metaTags).not.toContain(span_id);
diff --git a/dev-packages/node-core-integration-tests/suites/tracing/meta-tags/test.ts b/dev-packages/node-core-integration-tests/suites/tracing/meta-tags/test.ts
index e7d98485bd33..c0611f47ca77 100644
--- a/dev-packages/node-core-integration-tests/suites/tracing/meta-tags/test.ts
+++ b/dev-packages/node-core-integration-tests/suites/tracing/meta-tags/test.ts
@@ -21,7 +21,7 @@ describe('getTraceMetaTags', () => {
 
     const html = response?.response;
 
-    expect(html).toMatch(/<meta name="sentry-trace" content="cd7ee7a6fe3ebe7ab9c3271559bc203c-[a-z0-9]{16}-1"\/>/);
+    expect(html).toMatch(/<meta name="sentry-trace" content="cd7ee7a6fe3ebe7ab9c3271559bc203c-[a-z\d]{16}-1"\/>/);
     expect(html).toContain('<meta name="baggage" content="sentry-environment=production,sentry-sample_rand=0.42"/>');
   });
 
@@ -32,7 +32,7 @@ describe('getTraceMetaTags', () => {
 
     const html = response?.response;
 
-    const traceId = html?.match(/<meta name="sentry-trace" content="([a-z0-9]{32})-[a-z0-9]{16}"\/>/)?.[1];
+    const traceId = html?.match(/<meta name="sentry-trace" content="([a-z\d]{32})-[a-z\d]{16}"\/>/)?.[1];
     expect(traceId).not.toBeUndefined();
 
     expect(html).toContain('<meta name="baggage"');
diff --git a/dev-packages/node-core-integration-tests/suites/tracing/requests/fetch-no-tracing-no-spans/test.ts b/dev-packages/node-core-integration-tests/suites/tracing/requests/fetch-no-tracing-no-spans/test.ts
index f61532d9de8b..61dfe4c4ba88 100644
--- a/dev-packages/node-core-integration-tests/suites/tracing/requests/fetch-no-tracing-no-spans/test.ts
+++ b/dev-packages/node-core-integration-tests/suites/tracing/requests/fetch-no-tracing-no-spans/test.ts
@@ -9,12 +9,12 @@ describe('outgoing fetch', () => {
 
       const [SERVER_URL, closeTestServer] = await createTestServer()
         .get('/api/v0', headers => {
-          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})$/));
+          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})$/));
           expect(headers['sentry-trace']).not.toEqual('00000000000000000000000000000000-0000000000000000');
           expect(headers['baggage']).toEqual(expect.any(String));
         })
         .get('/api/v1', headers => {
-          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})$/));
+          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})$/));
           expect(headers['sentry-trace']).not.toEqual('00000000000000000000000000000000-0000000000000000');
           expect(headers['baggage']).toEqual(expect.any(String));
         })
diff --git a/dev-packages/node-core-integration-tests/suites/tracing/requests/fetch-no-tracing/test.ts b/dev-packages/node-core-integration-tests/suites/tracing/requests/fetch-no-tracing/test.ts
index b4594c4d9c41..046763a0b55a 100644
--- a/dev-packages/node-core-integration-tests/suites/tracing/requests/fetch-no-tracing/test.ts
+++ b/dev-packages/node-core-integration-tests/suites/tracing/requests/fetch-no-tracing/test.ts
@@ -9,12 +9,12 @@ describe('outgoing fetch', () => {
 
       const [SERVER_URL, closeTestServer] = await createTestServer()
         .get('/api/v0', headers => {
-          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})$/));
+          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})$/));
           expect(headers['sentry-trace']).not.toEqual('00000000000000000000000000000000-0000000000000000');
           expect(headers['baggage']).toEqual(expect.any(String));
         })
         .get('/api/v1', headers => {
-          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})$/));
+          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})$/));
           expect(headers['sentry-trace']).not.toEqual('00000000000000000000000000000000-0000000000000000');
           expect(headers['baggage']).toEqual(expect.any(String));
         })
diff --git a/dev-packages/node-core-integration-tests/suites/tracing/requests/fetch-sampled-no-active-span/test.ts b/dev-packages/node-core-integration-tests/suites/tracing/requests/fetch-sampled-no-active-span/test.ts
index 32f24517b3f6..acc1d6c89a25 100644
--- a/dev-packages/node-core-integration-tests/suites/tracing/requests/fetch-sampled-no-active-span/test.ts
+++ b/dev-packages/node-core-integration-tests/suites/tracing/requests/fetch-sampled-no-active-span/test.ts
@@ -10,12 +10,12 @@ describe('outgoing fetch', () => {
       const [SERVER_URL, closeTestServer] = await createTestServer()
         .get('/api/v0', headers => {
           expect(headers['baggage']).toEqual(expect.any(String));
-          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})$/));
+          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})$/));
           expect(headers['sentry-trace']).not.toEqual('00000000000000000000000000000000-0000000000000000');
         })
         .get('/api/v1', headers => {
           expect(headers['baggage']).toEqual(expect.any(String));
-          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})$/));
+          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})$/));
           expect(headers['sentry-trace']).not.toEqual('00000000000000000000000000000000-0000000000000000');
         })
         .get('/api/v2', headers => {
diff --git a/dev-packages/node-core-integration-tests/suites/tracing/requests/fetch-unsampled/test.ts b/dev-packages/node-core-integration-tests/suites/tracing/requests/fetch-unsampled/test.ts
index 097236ba4e7f..4507a360006c 100644
--- a/dev-packages/node-core-integration-tests/suites/tracing/requests/fetch-unsampled/test.ts
+++ b/dev-packages/node-core-integration-tests/suites/tracing/requests/fetch-unsampled/test.ts
@@ -10,12 +10,12 @@ describe('outgoing fetch', () => {
       const [SERVER_URL, closeTestServer] = await createTestServer()
         .get('/api/v0', headers => {
           expect(headers['baggage']).toEqual(expect.any(String));
-          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})-0$/));
+          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})-0$/));
           expect(headers['sentry-trace']).not.toEqual('00000000000000000000000000000000-0000000000000000-0');
         })
         .get('/api/v1', headers => {
           expect(headers['baggage']).toEqual(expect.any(String));
-          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})-0$/));
+          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})-0$/));
           expect(headers['sentry-trace']).not.toEqual('00000000000000000000000000000000-0000000000000000-0');
         })
         .get('/api/v2', headers => {
diff --git a/dev-packages/node-core-integration-tests/suites/tracing/requests/http-no-tracing-no-spans/test.ts b/dev-packages/node-core-integration-tests/suites/tracing/requests/http-no-tracing-no-spans/test.ts
index fe9cba032344..1cad4abf9a99 100644
--- a/dev-packages/node-core-integration-tests/suites/tracing/requests/http-no-tracing-no-spans/test.ts
+++ b/dev-packages/node-core-integration-tests/suites/tracing/requests/http-no-tracing-no-spans/test.ts
@@ -11,12 +11,12 @@ describe('outgoing http requests with tracing & spans disabled', () => {
 
         const [SERVER_URL, closeTestServer] = await createTestServer()
           .get('/api/v0', headers => {
-            expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})$/));
+            expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})$/));
             expect(headers['sentry-trace']).not.toEqual('00000000000000000000000000000000-0000000000000000');
             expect(headers['baggage']).toEqual(expect.any(String));
           })
           .get('/api/v1', headers => {
-            expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})$/));
+            expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})$/));
             expect(headers['sentry-trace']).not.toEqual('00000000000000000000000000000000-0000000000000000');
             expect(headers['baggage']).toEqual(expect.any(String));
           })
diff --git a/dev-packages/node-core-integration-tests/suites/tracing/requests/http-no-tracing/test.ts b/dev-packages/node-core-integration-tests/suites/tracing/requests/http-no-tracing/test.ts
index 8727f1cad0de..55882d18830a 100644
--- a/dev-packages/node-core-integration-tests/suites/tracing/requests/http-no-tracing/test.ts
+++ b/dev-packages/node-core-integration-tests/suites/tracing/requests/http-no-tracing/test.ts
@@ -11,12 +11,12 @@ describe('outgoing http', () => {
 
         const [SERVER_URL, closeTestServer] = await createTestServer()
           .get('/api/v0', headers => {
-            expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})$/));
+            expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})$/));
             expect(headers['sentry-trace']).not.toEqual('00000000000000000000000000000000-0000000000000000');
             expect(headers['baggage']).toEqual(expect.any(String));
           })
           .get('/api/v1', headers => {
-            expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})$/));
+            expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})$/));
             expect(headers['sentry-trace']).not.toEqual('00000000000000000000000000000000-0000000000000000');
             expect(headers['baggage']).toEqual(expect.any(String));
           })
diff --git a/dev-packages/node-core-integration-tests/suites/tracing/requests/http-sampled-no-active-span/test.ts b/dev-packages/node-core-integration-tests/suites/tracing/requests/http-sampled-no-active-span/test.ts
index d89992dd362e..8cf07571fe24 100644
--- a/dev-packages/node-core-integration-tests/suites/tracing/requests/http-sampled-no-active-span/test.ts
+++ b/dev-packages/node-core-integration-tests/suites/tracing/requests/http-sampled-no-active-span/test.ts
@@ -12,12 +12,12 @@ describe('outgoing http', () => {
         const [SERVER_URL, closeTestServer] = await createTestServer()
           .get('/api/v0', headers => {
             expect(headers['baggage']).toEqual(expect.any(String));
-            expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})$/));
+            expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})$/));
             expect(headers['sentry-trace']).not.toEqual('00000000000000000000000000000000-0000000000000000');
           })
           .get('/api/v1', headers => {
             expect(headers['baggage']).toEqual(expect.any(String));
-            expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})$/));
+            expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})$/));
             expect(headers['sentry-trace']).not.toEqual('00000000000000000000000000000000-0000000000000000');
           })
           .get('/api/v2', headers => {
diff --git a/dev-packages/node-core-integration-tests/suites/tracing/requests/http-sampled/test.ts b/dev-packages/node-core-integration-tests/suites/tracing/requests/http-sampled/test.ts
index 1189afc502e5..a1ac7ca292e4 100644
--- a/dev-packages/node-core-integration-tests/suites/tracing/requests/http-sampled/test.ts
+++ b/dev-packages/node-core-integration-tests/suites/tracing/requests/http-sampled/test.ts
@@ -12,12 +12,12 @@ describe('outgoing http', () => {
         const [SERVER_URL, closeTestServer] = await createTestServer()
           .get('/api/v0', headers => {
             expect(headers['baggage']).toEqual(expect.any(String));
-            expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})-1$/));
+            expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})-1$/));
             expect(headers['sentry-trace']).not.toEqual('00000000000000000000000000000000-0000000000000000-1');
           })
           .get('/api/v1', headers => {
             expect(headers['baggage']).toEqual(expect.any(String));
-            expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})-1$/));
+            expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})-1$/));
             expect(headers['sentry-trace']).not.toEqual('00000000000000000000000000000000-0000000000000000-1');
           })
           .get('/api/v2', headers => {
diff --git a/dev-packages/node-core-integration-tests/suites/tracing/requests/http-unsampled/test.ts b/dev-packages/node-core-integration-tests/suites/tracing/requests/http-unsampled/test.ts
index 60d3345dcb51..63ae25f32a0c 100644
--- a/dev-packages/node-core-integration-tests/suites/tracing/requests/http-unsampled/test.ts
+++ b/dev-packages/node-core-integration-tests/suites/tracing/requests/http-unsampled/test.ts
@@ -12,12 +12,12 @@ describe('outgoing http', () => {
         const [SERVER_URL, closeTestServer] = await createTestServer()
           .get('/api/v0', headers => {
             expect(headers['baggage']).toEqual(expect.any(String));
-            expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})-0$/));
+            expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})-0$/));
             expect(headers['sentry-trace']).not.toEqual('00000000000000000000000000000000-0000000000000000-0');
           })
           .get('/api/v1', headers => {
             expect(headers['baggage']).toEqual(expect.any(String));
-            expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})-0$/));
+            expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})-0$/));
             expect(headers['sentry-trace']).not.toEqual('00000000000000000000000000000000-0000000000000000-0');
           })
           .get('/api/v2', headers => {
diff --git a/dev-packages/node-core-integration-tests/suites/tracing/sample-rand-propagation/test.ts b/dev-packages/node-core-integration-tests/suites/tracing/sample-rand-propagation/test.ts
index 40001a9f62f5..6bb8f3dfc3f6 100644
--- a/dev-packages/node-core-integration-tests/suites/tracing/sample-rand-propagation/test.ts
+++ b/dev-packages/node-core-integration-tests/suites/tracing/sample-rand-propagation/test.ts
@@ -30,7 +30,7 @@ describe('sample_rand propagation', () => {
     });
     expect(response).toEqual({
       propagatedData: {
-        baggage: expect.not.stringMatching(/sentry-sample_rand=0\.[0-9]+/),
+        baggage: expect.not.stringMatching(/sentry-sample_rand=0\.\d+/),
       },
     });
   });
@@ -44,7 +44,7 @@ describe('sample_rand propagation', () => {
       },
     });
 
-    const sampleRand = Number((response as any).propagatedData.baggage.match(/sentry-sample_rand=(0\.[0-9]+)/)[1]);
+    const sampleRand = Number((response as any).propagatedData.baggage.match(/sentry-sample_rand=(0\.\d+)/)[1]);
 
     expect(sampleRand).toStrictEqual(expect.any(Number));
     expect(sampleRand).not.toBeNaN();
@@ -61,7 +61,7 @@ describe('sample_rand propagation', () => {
       },
     });
 
-    const sampleRand = Number((response as any).propagatedData.baggage.match(/sentry-sample_rand=(0\.[0-9]+)/)[1]);
+    const sampleRand = Number((response as any).propagatedData.baggage.match(/sentry-sample_rand=(0\.\d+)/)[1]);
 
     expect(sampleRand).toStrictEqual(expect.any(Number));
     expect(sampleRand).not.toBeNaN();
@@ -77,6 +77,6 @@ describe('sample_rand propagation', () => {
       },
     });
 
-    expect((response as any).propagatedData.baggage).not.toMatch(/sentry-sample_rand=0\.[0-9]+/);
+    expect((response as any).propagatedData.baggage).not.toMatch(/sentry-sample_rand=0\.\d+/);
   });
 });
diff --git a/dev-packages/node-core-integration-tests/suites/tracing/tracePropagationTargets/test.ts b/dev-packages/node-core-integration-tests/suites/tracing/tracePropagationTargets/test.ts
index 8ae06f883b38..a136eb770a8d 100644
--- a/dev-packages/node-core-integration-tests/suites/tracing/tracePropagationTargets/test.ts
+++ b/dev-packages/node-core-integration-tests/suites/tracing/tracePropagationTargets/test.ts
@@ -12,12 +12,12 @@ conditionalTest({ min: 22 })('node >=22', () => {
     const [SERVER_URL, closeTestServer] = await createTestServer()
       .get('/api/v0', headers => {
         expect(headers['baggage']).toEqual(expect.any(String));
-        expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})-1$/));
+        expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})-1$/));
         expect(headers['sentry-trace']).not.toEqual('00000000000000000000000000000000-0000000000000000-1');
       })
       .get('/api/v1', headers => {
         expect(headers['baggage']).toEqual(expect.any(String));
-        expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})-1$/));
+        expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})-1$/));
         expect(headers['sentry-trace']).not.toEqual('00000000000000000000000000000000-0000000000000000-1');
       })
       .get('/api/v2', headers => {
diff --git a/dev-packages/node-core-integration-tests/utils/runner.ts b/dev-packages/node-core-integration-tests/utils/runner.ts
index 22a600efa63b..416d55d803a1 100644
--- a/dev-packages/node-core-integration-tests/utils/runner.ts
+++ b/dev-packages/node-core-integration-tests/utils/runner.ts
@@ -489,7 +489,7 @@ export function createRunner(...paths: string[]) {
 
           function tryParseEnvelopeFromStdoutLine(line: string): void {
             // Lines can have leading '[something] [{' which we need to remove
-            const cleanedLine = line.replace(/^.*?] \[{"/, '[{"');
+            const cleanedLine = line.replace(/^.*?\] \[\{"/, '[{"');
 
             // See if we have a port message
             if (cleanedLine.startsWith('{"port":')) {
@@ -676,6 +676,7 @@ function convertEsmToCjs(content: string): string {
 
   // Handle default imports: import x from 'y' -> const x = require('y')
   newContent = newContent.replace(
+    // eslint-disable-next-line regexp/no-super-linear-backtracking, regexp/optimal-quantifier-concatenation
     /import\s+([\w*{}\s,]+)\s+from\s+['"]([^'"]+)['"]/g,
     (_, imports: string, module: string) => {
       if (imports.includes('* as')) {
diff --git a/dev-packages/node-integration-tests/.eslintrc.js b/dev-packages/node-integration-tests/.eslintrc.js
index 0598ba3f5ca1..e307575fe52e 100644
--- a/dev-packages/node-integration-tests/.eslintrc.js
+++ b/dev-packages/node-integration-tests/.eslintrc.js
@@ -2,7 +2,9 @@ module.exports = {
   env: {
     node: true,
   },
-  extends: ['../../.eslintrc.js'],
+  // todo: remove regexp plugin from here once we add it to base.js eslint config for the whole project
+  extends: ['../../.eslintrc.js', 'plugin:regexp/recommended'],
+  plugins: ['regexp'],
   overrides: [
     {
       files: ['utils/**/*.ts', 'src/**/*.ts'],
diff --git a/dev-packages/node-integration-tests/package.json b/dev-packages/node-integration-tests/package.json
index 4ed3a7a25e79..62c3a63793c2 100644
--- a/dev-packages/node-integration-tests/package.json
+++ b/dev-packages/node-integration-tests/package.json
@@ -86,6 +86,7 @@
     "@types/amqplib": "^0.10.5",
     "@types/node-cron": "^3.0.11",
     "@types/node-schedule": "^2.1.7",
+    "eslint-plugin-regexp": "^1.15.0",
     "file-type": "^20.4.1",
     "globby": "11",
     "react": "^18.3.1",
diff --git a/dev-packages/node-integration-tests/suites/anr/test.ts b/dev-packages/node-integration-tests/suites/anr/test.ts
index 08b6a6571e17..c9a81ccb5db0 100644
--- a/dev-packages/node-integration-tests/suites/anr/test.ts
+++ b/dev-packages/node-integration-tests/suites/anr/test.ts
@@ -6,8 +6,8 @@ const ANR_EVENT = {
   // Ensure we have context
   contexts: {
     trace: {
-      span_id: expect.stringMatching(/[a-f0-9]{16}/),
-      trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+      span_id: expect.stringMatching(/[a-f\d]{16}/),
+      trace_id: expect.stringMatching(/[a-f\d]{32}/),
     },
     device: {
       arch: expect.any(String),
diff --git a/dev-packages/node-integration-tests/suites/cron/cron/test.ts b/dev-packages/node-integration-tests/suites/cron/cron/test.ts
index 8b9fdfd5c593..a9febf9efbe4 100644
--- a/dev-packages/node-integration-tests/suites/cron/cron/test.ts
+++ b/dev-packages/node-integration-tests/suites/cron/cron/test.ts
@@ -16,8 +16,8 @@ test('cron instrumentation', async () => {
         monitor_config: { schedule: { type: 'crontab', value: '* * * * * *' } },
         contexts: {
           trace: {
-            trace_id: expect.stringMatching(/[a-f0-9]{32}/),
-            span_id: expect.stringMatching(/[a-f0-9]{16}/),
+            trace_id: expect.stringMatching(/[a-f\d]{32}/),
+            span_id: expect.stringMatching(/[a-f\d]{16}/),
           },
         },
       },
@@ -31,8 +31,8 @@ test('cron instrumentation', async () => {
         duration: expect.any(Number),
         contexts: {
           trace: {
-            trace_id: expect.stringMatching(/[a-f0-9]{32}/),
-            span_id: expect.stringMatching(/[a-f0-9]{16}/),
+            trace_id: expect.stringMatching(/[a-f\d]{32}/),
+            span_id: expect.stringMatching(/[a-f\d]{16}/),
           },
         },
       },
@@ -46,8 +46,8 @@ test('cron instrumentation', async () => {
         monitor_config: { schedule: { type: 'crontab', value: '* * * * * *' } },
         contexts: {
           trace: {
-            trace_id: expect.stringMatching(/[a-f0-9]{32}/),
-            span_id: expect.stringMatching(/[a-f0-9]{16}/),
+            trace_id: expect.stringMatching(/[a-f\d]{32}/),
+            span_id: expect.stringMatching(/[a-f\d]{16}/),
           },
         },
       },
@@ -61,8 +61,8 @@ test('cron instrumentation', async () => {
         duration: expect.any(Number),
         contexts: {
           trace: {
-            trace_id: expect.stringMatching(/[a-f0-9]{32}/),
-            span_id: expect.stringMatching(/[a-f0-9]{16}/),
+            trace_id: expect.stringMatching(/[a-f\d]{32}/),
+            span_id: expect.stringMatching(/[a-f\d]{16}/),
           },
         },
       },
diff --git a/dev-packages/node-integration-tests/suites/cron/node-cron/test.ts b/dev-packages/node-integration-tests/suites/cron/node-cron/test.ts
index 1c5fa515e208..a986e3f83d92 100644
--- a/dev-packages/node-integration-tests/suites/cron/node-cron/test.ts
+++ b/dev-packages/node-integration-tests/suites/cron/node-cron/test.ts
@@ -16,8 +16,8 @@ test('node-cron instrumentation', async () => {
         monitor_config: { schedule: { type: 'crontab', value: '* * * * * *' } },
         contexts: {
           trace: {
-            trace_id: expect.stringMatching(/[a-f0-9]{32}/),
-            span_id: expect.stringMatching(/[a-f0-9]{16}/),
+            trace_id: expect.stringMatching(/[a-f\d]{32}/),
+            span_id: expect.stringMatching(/[a-f\d]{16}/),
           },
         },
       },
@@ -31,8 +31,8 @@ test('node-cron instrumentation', async () => {
         duration: expect.any(Number),
         contexts: {
           trace: {
-            trace_id: expect.stringMatching(/[a-f0-9]{32}/),
-            span_id: expect.stringMatching(/[a-f0-9]{16}/),
+            trace_id: expect.stringMatching(/[a-f\d]{32}/),
+            span_id: expect.stringMatching(/[a-f\d]{16}/),
           },
         },
       },
@@ -46,8 +46,8 @@ test('node-cron instrumentation', async () => {
         monitor_config: { schedule: { type: 'crontab', value: '* * * * * *' } },
         contexts: {
           trace: {
-            trace_id: expect.stringMatching(/[a-f0-9]{32}/),
-            span_id: expect.stringMatching(/[a-f0-9]{16}/),
+            trace_id: expect.stringMatching(/[a-f\d]{32}/),
+            span_id: expect.stringMatching(/[a-f\d]{16}/),
           },
         },
       },
@@ -61,8 +61,8 @@ test('node-cron instrumentation', async () => {
         duration: expect.any(Number),
         contexts: {
           trace: {
-            trace_id: expect.stringMatching(/[a-f0-9]{32}/),
-            span_id: expect.stringMatching(/[a-f0-9]{16}/),
+            trace_id: expect.stringMatching(/[a-f\d]{32}/),
+            span_id: expect.stringMatching(/[a-f\d]{16}/),
           },
         },
       },
diff --git a/dev-packages/node-integration-tests/suites/cron/node-schedule/test.ts b/dev-packages/node-integration-tests/suites/cron/node-schedule/test.ts
index a2019253203f..2b46e04d50a4 100644
--- a/dev-packages/node-integration-tests/suites/cron/node-schedule/test.ts
+++ b/dev-packages/node-integration-tests/suites/cron/node-schedule/test.ts
@@ -16,8 +16,8 @@ test('node-schedule instrumentation', async () => {
         monitor_config: { schedule: { type: 'crontab', value: '* * * * * *' } },
         contexts: {
           trace: {
-            trace_id: expect.stringMatching(/[a-f0-9]{32}/),
-            span_id: expect.stringMatching(/[a-f0-9]{16}/),
+            trace_id: expect.stringMatching(/[a-f\d]{32}/),
+            span_id: expect.stringMatching(/[a-f\d]{16}/),
           },
         },
       },
@@ -31,8 +31,8 @@ test('node-schedule instrumentation', async () => {
         duration: expect.any(Number),
         contexts: {
           trace: {
-            trace_id: expect.stringMatching(/[a-f0-9]{32}/),
-            span_id: expect.stringMatching(/[a-f0-9]{16}/),
+            trace_id: expect.stringMatching(/[a-f\d]{32}/),
+            span_id: expect.stringMatching(/[a-f\d]{16}/),
           },
         },
       },
@@ -46,8 +46,8 @@ test('node-schedule instrumentation', async () => {
         monitor_config: { schedule: { type: 'crontab', value: '* * * * * *' } },
         contexts: {
           trace: {
-            trace_id: expect.stringMatching(/[a-f0-9]{32}/),
-            span_id: expect.stringMatching(/[a-f0-9]{16}/),
+            trace_id: expect.stringMatching(/[a-f\d]{32}/),
+            span_id: expect.stringMatching(/[a-f\d]{16}/),
           },
         },
       },
@@ -61,8 +61,8 @@ test('node-schedule instrumentation', async () => {
         duration: expect.any(Number),
         contexts: {
           trace: {
-            trace_id: expect.stringMatching(/[a-f0-9]{32}/),
-            span_id: expect.stringMatching(/[a-f0-9]{16}/),
+            trace_id: expect.stringMatching(/[a-f\d]{32}/),
+            span_id: expect.stringMatching(/[a-f\d]{16}/),
           },
         },
       },
diff --git a/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-header-assign/test.ts b/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-header-assign/test.ts
index 8b8d648513e4..20f19dccf3ea 100644
--- a/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-header-assign/test.ts
+++ b/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-header-assign/test.ts
@@ -113,8 +113,8 @@ test('Should populate and propagate sentry baggage if sentry-trace header does n
     'sentry-release': '1.0',
     'sentry-public_key': 'public',
     // TraceId changes, hence we only expect that the string contains the traceid key
-    'sentry-trace_id': expect.stringMatching(/[\S]*/),
-    'sentry-sample_rand': expect.stringMatching(/[\S]*/),
+    'sentry-trace_id': expect.stringMatching(/\S*/),
+    'sentry-sample_rand': expect.stringMatching(/\S*/),
     'sentry-sample_rate': '1',
     'sentry-sampled': 'true',
     'sentry-transaction': 'GET /test/express',
@@ -139,8 +139,8 @@ test('Should populate Sentry and ignore 3rd party content if sentry-trace header
     'sentry-release': '1.0',
     'sentry-public_key': 'public',
     // TraceId changes, hence we only expect that the string contains the traceid key
-    'sentry-trace_id': expect.stringMatching(/[\S]*/),
-    'sentry-sample_rand': expect.stringMatching(/[\S]*/),
+    'sentry-trace_id': expect.stringMatching(/\S*/),
+    'sentry-sample_rand': expect.stringMatching(/\S*/),
     'sentry-sample_rate': '1',
     'sentry-sampled': 'true',
     'sentry-transaction': 'GET /test/express',
diff --git a/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-header-out/test.ts b/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-header-out/test.ts
index 913fcd5e2038..4551baa06e23 100644
--- a/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-header-out/test.ts
+++ b/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-header-out/test.ts
@@ -23,7 +23,7 @@ test('should attach a baggage header to an outgoing request.', async () => {
     'sentry-sampled=true',
     'sentry-trace_id=__SENTRY_TRACE_ID__',
     'sentry-transaction=GET%20%2Ftest%2Fexpress',
-    expect.stringMatching(/sentry-sample_rand=0\.[0-9]+/),
+    expect.stringMatching(/sentry-sample_rand=0\.\d+/),
   ].forEach(item => {
     expect(baggage).toContainEqual(item);
   });
diff --git a/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-other-vendors-with-sentry-entries/test.ts b/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-other-vendors-with-sentry-entries/test.ts
index 2d2074be773c..dbdd69ffb45b 100644
--- a/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-other-vendors-with-sentry-entries/test.ts
+++ b/dev-packages/node-integration-tests/suites/express/sentry-trace/baggage-other-vendors-with-sentry-entries/test.ts
@@ -32,7 +32,7 @@ test('should ignore sentry-values in `baggage` header of a third party vendor an
     'other=vendor',
     'sentry-environment=myEnv',
     'sentry-release=2.1.0',
-    expect.stringMatching(/sentry-sample_rand=[0-9]+/),
+    expect.stringMatching(/sentry-sample_rand=\d+/),
     'sentry-sample_rate=0.54',
     'third=party',
   ]);
@@ -60,10 +60,10 @@ test('should ignore sentry-values in `baggage` header of a third party vendor an
     'sentry-environment=prod',
     'sentry-public_key=public',
     'sentry-release=1.0',
-    expect.stringMatching(/sentry-sample_rand=[0-9]+/),
+    expect.stringMatching(/sentry-sample_rand=\d+/),
     'sentry-sample_rate=1',
     'sentry-sampled=true',
-    expect.stringMatching(/sentry-trace_id=[0-9a-f]{32}/),
+    expect.stringMatching(/sentry-trace_id=[\da-f]{32}/),
     'sentry-transaction=GET%20%2Ftest%2Fexpress',
     'third=party',
   ]);
diff --git a/dev-packages/node-integration-tests/suites/express/tracing/scenario.mjs b/dev-packages/node-integration-tests/suites/express/tracing/scenario.mjs
index 4e32a052908d..e307319a1fd0 100644
--- a/dev-packages/node-integration-tests/suites/express/tracing/scenario.mjs
+++ b/dev-packages/node-integration-tests/suites/express/tracing/scenario.mjs
@@ -39,7 +39,7 @@ app.get(['/test/array1', /\/test\/array[2-9]/], (_req, res) => {
   res.send({ response: 'response 3' });
 });
 
-app.get(['/test/arr/:id', /\/test\/arr[0-9]*\/required(path)?(\/optionalPath)?\/(lastParam)?/], (_req, res) => {
+app.get(['/test/arr/:id', /\/test\/arr\d*\/required(path)?(\/optionalPath)?\/(lastParam)?/], (_req, res) => {
   res.send({ response: 'response 4' });
 });
 
diff --git a/dev-packages/node-integration-tests/suites/express/tracing/test.ts b/dev-packages/node-integration-tests/suites/express/tracing/test.ts
index 4476c76a3933..759df300181a 100644
--- a/dev-packages/node-integration-tests/suites/express/tracing/test.ts
+++ b/dev-packages/node-integration-tests/suites/express/tracing/test.ts
@@ -14,8 +14,8 @@ describe('express tracing', () => {
           transaction: {
             contexts: {
               trace: {
-                span_id: expect.stringMatching(/[a-f0-9]{16}/),
-                trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+                span_id: expect.stringMatching(/[a-f\d]{16}/),
+                trace_id: expect.stringMatching(/[a-f\d]{32}/),
                 data: {
                   url: expect.stringMatching(/\/test\/express$/),
                   'http.response.status_code': 200,
@@ -61,8 +61,8 @@ describe('express tracing', () => {
             },
             contexts: {
               trace: {
-                trace_id: expect.stringMatching(/[a-f0-9]{32}/),
-                span_id: expect.stringMatching(/[a-f0-9]{16}/),
+                trace_id: expect.stringMatching(/[a-f\d]{32}/),
+                span_id: expect.stringMatching(/[a-f\d]{16}/),
                 data: {
                   url: expect.stringMatching(/\/test\/regex$/),
                   'http.response.status_code': 200,
@@ -85,8 +85,8 @@ describe('express tracing', () => {
             transaction: 'GET /',
             contexts: {
               trace: {
-                span_id: expect.stringMatching(/[a-f0-9]{16}/),
-                trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+                span_id: expect.stringMatching(/[a-f\d]{16}/),
+                trace_id: expect.stringMatching(/[a-f\d]{32}/),
                 data: {
                   'http.response.status_code': 200,
                   url: expect.stringMatching(/\/$/),
@@ -132,8 +132,8 @@ describe('express tracing', () => {
               },
               contexts: {
                 trace: {
-                  trace_id: expect.stringMatching(/[a-f0-9]{32}/),
-                  span_id: expect.stringMatching(/[a-f0-9]{16}/),
+                  trace_id: expect.stringMatching(/[a-f\d]{32}/),
+                  span_id: expect.stringMatching(/[a-f\d]{16}/),
                   data: {
                     url: expect.stringMatching(`/test/${segment}$`),
                     'http.response.status_code': 200,
@@ -163,14 +163,14 @@ describe('express tracing', () => {
       const runner = await createRunner()
         .expect({
           transaction: {
-            transaction: 'GET /test/arr/:id,/\\/test\\/arr[0-9]*\\/required(path)?(\\/optionalPath)?\\/(lastParam)?/',
+            transaction: 'GET /test/arr/:id,/\\/test\\/arr\\d*\\/required(path)?(\\/optionalPath)?\\/(lastParam)?/',
             transaction_info: {
               source: 'route',
             },
             contexts: {
               trace: {
-                trace_id: expect.stringMatching(/[a-f0-9]{32}/),
-                span_id: expect.stringMatching(/[a-f0-9]{16}/),
+                trace_id: expect.stringMatching(/[a-f\d]{32}/),
+                span_id: expect.stringMatching(/[a-f\d]{16}/),
                 data: {
                   url: expect.stringMatching(`/test/${segment}$`),
                   'http.response.status_code': 200,
@@ -346,8 +346,8 @@ describe('express tracing', () => {
                   transaction: `GET ${url}`,
                   contexts: {
                     trace: {
-                      span_id: expect.stringMatching(/[a-f0-9]{16}/),
-                      trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+                      span_id: expect.stringMatching(/[a-f\d]{16}/),
+                      trace_id: expect.stringMatching(/[a-f\d]{32}/),
                       data: {
                         'http.response.status_code': status_code,
                         url: expect.stringMatching(url),
diff --git a/dev-packages/node-integration-tests/suites/featureFlags/growthbook/onSpan/test.ts b/dev-packages/node-integration-tests/suites/featureFlags/growthbook/onSpan/test.ts
index fbb084b98928..3f0011b4f617 100644
--- a/dev-packages/node-integration-tests/suites/featureFlags/growthbook/onSpan/test.ts
+++ b/dev-packages/node-integration-tests/suites/featureFlags/growthbook/onSpan/test.ts
@@ -20,8 +20,8 @@ test('GrowthBook flags are added to active span attributes on span end', async (
             op: 'function',
             origin: 'manual',
             status: 'ok',
-            span_id: expect.stringMatching(/[a-f0-9]{16}/),
-            trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+            span_id: expect.stringMatching(/[a-f\d]{16}/),
+            trace_id: expect.stringMatching(/[a-f\d]{32}/),
           },
         },
         spans: [],
diff --git a/dev-packages/node-integration-tests/suites/tracing/dsc-txn-name-update/test.ts b/dev-packages/node-integration-tests/suites/tracing/dsc-txn-name-update/test.ts
index f450d2150e31..aa74bea7d79e 100644
--- a/dev-packages/node-integration-tests/suites/tracing/dsc-txn-name-update/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/dsc-txn-name-update/test.ts
@@ -12,13 +12,13 @@ test('adds current transaction name to baggage when the txn name is high-quality
       const baggageItems = getBaggageHeaderItems(headers);
       traceId = baggageItems.find(item => item.startsWith('sentry-trace_id='))?.split('=')[1] as string;
 
-      expect(traceId).toMatch(/^[0-9a-f]{32}$/);
+      expect(traceId).toMatch(/^[\da-f]{32}$/);
 
       expect(baggageItems).toEqual([
         'sentry-environment=production',
         'sentry-public_key=public',
         'sentry-release=1.0',
-        expect.stringMatching(/sentry-sample_rand=0\.[0-9]+/),
+        expect.stringMatching(/sentry-sample_rand=0\.\d+/),
         'sentry-sample_rate=1',
         'sentry-sampled=true',
         `sentry-trace_id=${traceId}`,
@@ -29,7 +29,7 @@ test('adds current transaction name to baggage when the txn name is high-quality
         'sentry-environment=production',
         'sentry-public_key=public',
         'sentry-release=1.0',
-        expect.stringMatching(/sentry-sample_rand=0\.[0-9]+/),
+        expect.stringMatching(/sentry-sample_rand=0\.\d+/),
         'sentry-sample_rate=1',
         'sentry-sampled=true',
         `sentry-trace_id=${traceId}`,
@@ -41,7 +41,7 @@ test('adds current transaction name to baggage when the txn name is high-quality
         'sentry-environment=production',
         'sentry-public_key=public',
         'sentry-release=1.0',
-        expect.stringMatching(/sentry-sample_rand=0\.[0-9]+/),
+        expect.stringMatching(/sentry-sample_rand=0\.\d+/),
         'sentry-sample_rate=1',
         'sentry-sampled=true',
         `sentry-trace_id=${traceId}`,
@@ -72,7 +72,7 @@ test('adds current transaction name to trace envelope header when the txn name i
           release: '1.0',
           sample_rate: '1',
           sampled: 'true',
-          trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+          trace_id: expect.stringMatching(/[a-f\d]{32}/),
           sample_rand: expect.any(String),
         },
       },
@@ -85,7 +85,7 @@ test('adds current transaction name to trace envelope header when the txn name i
           release: '1.0',
           sample_rate: '1',
           sampled: 'true',
-          trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+          trace_id: expect.stringMatching(/[a-f\d]{32}/),
           transaction: 'updated-name-1',
           sample_rand: expect.any(String),
         },
@@ -99,7 +99,7 @@ test('adds current transaction name to trace envelope header when the txn name i
           release: '1.0',
           sample_rate: '1',
           sampled: 'true',
-          trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+          trace_id: expect.stringMatching(/[a-f\d]{32}/),
           transaction: 'updated-name-2',
           sample_rand: expect.any(String),
         },
@@ -113,7 +113,7 @@ test('adds current transaction name to trace envelope header when the txn name i
           release: '1.0',
           sample_rate: '1',
           sampled: 'true',
-          trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+          trace_id: expect.stringMatching(/[a-f\d]{32}/),
           transaction: 'updated-name-2',
           sample_rand: expect.any(String),
         },
diff --git a/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span-unsampled/test.ts b/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span-unsampled/test.ts
index bba04c788282..9fe5f34ef8e5 100644
--- a/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span-unsampled/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span-unsampled/test.ts
@@ -7,7 +7,7 @@ test('envelope header for error event during active unsampled span is correct',
     .expectHeader({
       event: {
         trace: {
-          trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+          trace_id: expect.stringMatching(/[a-f\d]{32}/),
           public_key: 'public',
           environment: 'production',
           release: '1.0',
diff --git a/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span/test.ts b/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span/test.ts
index f11defc490c8..4b103c7e7d79 100644
--- a/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/envelope-header/error-active-span/test.ts
@@ -7,7 +7,7 @@ test('envelope header for error event during active span is correct', async () =
     .expectHeader({
       event: {
         trace: {
-          trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+          trace_id: expect.stringMatching(/[a-f\d]{32}/),
           public_key: 'public',
           environment: 'production',
           release: '1.0',
diff --git a/dev-packages/node-integration-tests/suites/tracing/envelope-header/error/test.ts b/dev-packages/node-integration-tests/suites/tracing/envelope-header/error/test.ts
index 9d39209d456f..29a487949adb 100644
--- a/dev-packages/node-integration-tests/suites/tracing/envelope-header/error/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/envelope-header/error/test.ts
@@ -6,7 +6,7 @@ test('envelope header for error events is correct', async () => {
     .expectHeader({
       event: {
         trace: {
-          trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+          trace_id: expect.stringMatching(/[a-f\d]{32}/),
           environment: 'production',
           public_key: 'public',
           release: '1.0',
diff --git a/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-route/test.ts b/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-route/test.ts
index f4bb6e2b4293..9798194b0c1c 100644
--- a/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-route/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-route/test.ts
@@ -6,7 +6,7 @@ test('envelope header for transaction event of route correct', async () => {
     .expectHeader({
       transaction: {
         trace: {
-          trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+          trace_id: expect.stringMatching(/[a-f\d]{32}/),
           public_key: 'public',
           transaction: 'GET /route',
           environment: 'production',
diff --git a/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-url/test.ts b/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-url/test.ts
index c4ed5ae4983f..7b6b07191c44 100644
--- a/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-url/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction-url/test.ts
@@ -6,7 +6,7 @@ test('envelope header for transaction event with source=url correct', async () =
     .expectHeader({
       transaction: {
         trace: {
-          trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+          trace_id: expect.stringMatching(/[a-f\d]{32}/),
           public_key: 'public',
           environment: 'production',
           release: '1.0',
diff --git a/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction/test.ts b/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction/test.ts
index 104761d52c86..24276f57f212 100644
--- a/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/envelope-header/transaction/test.ts
@@ -6,7 +6,7 @@ test('envelope header for transaction event is correct', async () => {
     .expectHeader({
       transaction: {
         trace: {
-          trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+          trace_id: expect.stringMatching(/[a-f\d]{32}/),
           public_key: 'public',
           environment: 'production',
           release: '1.0',
diff --git a/dev-packages/node-integration-tests/suites/tracing/http-client-spans/fetch-strip-query/test.ts b/dev-packages/node-integration-tests/suites/tracing/http-client-spans/fetch-strip-query/test.ts
index 797047080283..580a63a52e90 100644
--- a/dev-packages/node-integration-tests/suites/tracing/http-client-spans/fetch-strip-query/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/http-client-spans/fetch-strip-query/test.ts
@@ -44,7 +44,7 @@ test('strips and handles query params in spans of outgoing fetch requests', asyn
           origin: 'auto.http.otel.node_fetch',
           status: 'ok',
           parent_span_id: txn.contexts?.trace?.span_id,
-          span_id: expect.stringMatching(/[a-f0-9]{16}/),
+          span_id: expect.stringMatching(/[a-f\d]{16}/),
           trace_id: txn.contexts?.trace?.trace_id,
         });
       },
diff --git a/dev-packages/node-integration-tests/suites/tracing/http-client-spans/http-strip-query/test.ts b/dev-packages/node-integration-tests/suites/tracing/http-client-spans/http-strip-query/test.ts
index ebe2eff07013..edfac9fe2081 100644
--- a/dev-packages/node-integration-tests/suites/tracing/http-client-spans/http-strip-query/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/http-client-spans/http-strip-query/test.ts
@@ -44,7 +44,7 @@ test('strips and handles query params in spans of outgoing http requests', async
           origin: 'auto.http.otel.http',
           status: 'ok',
           parent_span_id: txn.contexts?.trace?.span_id,
-          span_id: expect.stringMatching(/[a-f0-9]{16}/),
+          span_id: expect.stringMatching(/[a-f\d]{16}/),
           trace_id: txn.contexts?.trace?.trace_id,
         });
       },
diff --git a/dev-packages/node-integration-tests/suites/tracing/httpIntegration/test.ts b/dev-packages/node-integration-tests/suites/tracing/httpIntegration/test.ts
index 48fab1be2e9d..15c354e45533 100644
--- a/dev-packages/node-integration-tests/suites/tracing/httpIntegration/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/httpIntegration/test.ts
@@ -27,8 +27,8 @@ describe('httpIntegration', () => {
             transaction: {
               contexts: {
                 trace: {
-                  span_id: expect.stringMatching(/[a-f0-9]{16}/),
-                  trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+                  span_id: expect.stringMatching(/[a-f\d]{16}/),
+                  trace_id: expect.stringMatching(/[a-f\d]{32}/),
                   data: {
                     url: expect.stringMatching(/\/test$/),
                     'http.response.status_code': 200,
@@ -69,8 +69,8 @@ describe('httpIntegration', () => {
             transaction: {
               contexts: {
                 trace: {
-                  span_id: expect.stringMatching(/[a-f0-9]{16}/),
-                  trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+                  span_id: expect.stringMatching(/[a-f\d]{16}/),
+                  trace_id: expect.stringMatching(/[a-f\d]{32}/),
                   data: {
                     url: expect.stringMatching(/\/test$/),
                     'http.response.status_code': 200,
@@ -198,8 +198,8 @@ describe('httpIntegration', () => {
                   transaction: 'GET /test1',
                   contexts: {
                     trace: {
-                      span_id: expect.stringMatching(/[a-f0-9]{16}/),
-                      trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+                      span_id: expect.stringMatching(/[a-f\d]{16}/),
+                      trace_id: expect.stringMatching(/[a-f\d]{32}/),
                       data: {
                         'http.response.status_code': 200,
                         'sentry.op': 'http.server',
@@ -214,8 +214,8 @@ describe('httpIntegration', () => {
                   transaction: 'GET /test2',
                   contexts: {
                     trace: {
-                      span_id: expect.stringMatching(/[a-f0-9]{16}/),
-                      trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+                      span_id: expect.stringMatching(/[a-f\d]{16}/),
+                      trace_id: expect.stringMatching(/[a-f\d]{32}/),
                       data: {
                         'http.response.status_code': 200,
                         'sentry.op': 'http.server',
@@ -230,8 +230,8 @@ describe('httpIntegration', () => {
                   transaction: 'GET /test3',
                   contexts: {
                     trace: {
-                      span_id: expect.stringMatching(/[a-f0-9]{16}/),
-                      trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+                      span_id: expect.stringMatching(/[a-f\d]{16}/),
+                      trace_id: expect.stringMatching(/[a-f\d]{32}/),
                       data: {
                         'http.response.status_code': 200,
                         'sentry.op': 'http.server',
@@ -256,8 +256,8 @@ describe('httpIntegration', () => {
                   transaction: 'GET /test1-proxy',
                   contexts: {
                     trace: {
-                      span_id: expect.stringMatching(/[a-f0-9]{16}/),
-                      trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+                      span_id: expect.stringMatching(/[a-f\d]{16}/),
+                      trace_id: expect.stringMatching(/[a-f\d]{32}/),
                       data: {
                         'http.response.status_code': 200,
                         'sentry.op': 'http.server',
@@ -272,8 +272,8 @@ describe('httpIntegration', () => {
                   transaction: 'GET /test2-proxy',
                   contexts: {
                     trace: {
-                      span_id: expect.stringMatching(/[a-f0-9]{16}/),
-                      trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+                      span_id: expect.stringMatching(/[a-f\d]{16}/),
+                      trace_id: expect.stringMatching(/[a-f\d]{32}/),
                       data: {
                         'http.response.status_code': 200,
                         'sentry.op': 'http.server',
@@ -288,8 +288,8 @@ describe('httpIntegration', () => {
                   transaction: 'GET /test3-proxy',
                   contexts: {
                     trace: {
-                      span_id: expect.stringMatching(/[a-f0-9]{16}/),
-                      trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+                      span_id: expect.stringMatching(/[a-f\d]{16}/),
+                      trace_id: expect.stringMatching(/[a-f\d]{32}/),
                       data: {
                         'http.response.status_code': 200,
                         'sentry.op': 'http.server',
@@ -313,8 +313,8 @@ describe('httpIntegration', () => {
                   transaction: 'GET /test1-original',
                   contexts: {
                     trace: {
-                      span_id: expect.stringMatching(/[a-f0-9]{16}/),
-                      trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+                      span_id: expect.stringMatching(/[a-f\d]{16}/),
+                      trace_id: expect.stringMatching(/[a-f\d]{32}/),
                       data: {
                         'http.response.status_code': 200,
                         'sentry.op': 'http.server',
@@ -329,8 +329,8 @@ describe('httpIntegration', () => {
                   transaction: 'GET /test2-original',
                   contexts: {
                     trace: {
-                      span_id: expect.stringMatching(/[a-f0-9]{16}/),
-                      trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+                      span_id: expect.stringMatching(/[a-f\d]{16}/),
+                      trace_id: expect.stringMatching(/[a-f\d]{32}/),
                       data: {
                         'http.response.status_code': 200,
                         'sentry.op': 'http.server',
@@ -345,8 +345,8 @@ describe('httpIntegration', () => {
                   transaction: 'GET /test3-original',
                   contexts: {
                     trace: {
-                      span_id: expect.stringMatching(/[a-f0-9]{16}/),
-                      trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+                      span_id: expect.stringMatching(/[a-f\d]{16}/),
+                      trace_id: expect.stringMatching(/[a-f\d]{32}/),
                       data: {
                         'http.response.status_code': 200,
                         'sentry.op': 'http.server',
@@ -371,8 +371,8 @@ describe('httpIntegration', () => {
                   transaction: 'GET /test1-proxy-original',
                   contexts: {
                     trace: {
-                      span_id: expect.stringMatching(/[a-f0-9]{16}/),
-                      trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+                      span_id: expect.stringMatching(/[a-f\d]{16}/),
+                      trace_id: expect.stringMatching(/[a-f\d]{32}/),
                       data: {
                         'http.response.status_code': 200,
                         'sentry.op': 'http.server',
@@ -387,8 +387,8 @@ describe('httpIntegration', () => {
                   transaction: 'GET /test2-proxy-original',
                   contexts: {
                     trace: {
-                      span_id: expect.stringMatching(/[a-f0-9]{16}/),
-                      trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+                      span_id: expect.stringMatching(/[a-f\d]{16}/),
+                      trace_id: expect.stringMatching(/[a-f\d]{32}/),
                       data: {
                         'http.response.status_code': 200,
                         'sentry.op': 'http.server',
@@ -403,8 +403,8 @@ describe('httpIntegration', () => {
                   transaction: 'GET /test3-proxy-original',
                   contexts: {
                     trace: {
-                      span_id: expect.stringMatching(/[a-f0-9]{16}/),
-                      trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+                      span_id: expect.stringMatching(/[a-f\d]{16}/),
+                      trace_id: expect.stringMatching(/[a-f\d]{32}/),
                       data: {
                         'http.response.status_code': 200,
                         'sentry.op': 'http.server',
@@ -433,8 +433,8 @@ describe('httpIntegration', () => {
           transaction: {
             contexts: {
               trace: {
-                span_id: expect.stringMatching(/[a-f0-9]{16}/),
-                trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+                span_id: expect.stringMatching(/[a-f\d]{16}/),
+                trace_id: expect.stringMatching(/[a-f\d]{32}/),
                 data: {
                   url: expect.stringMatching(/\/test$/),
                   'http.response.status_code': 200,
@@ -459,8 +459,8 @@ describe('httpIntegration', () => {
           transaction: {
             contexts: {
               trace: {
-                span_id: expect.stringMatching(/[a-f0-9]{16}/),
-                trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+                span_id: expect.stringMatching(/[a-f\d]{16}/),
+                trace_id: expect.stringMatching(/[a-f\d]{32}/),
                 data: {
                   url: expect.stringMatching(/\/test$/),
                   'http.response.status_code': 200,
diff --git a/dev-packages/node-integration-tests/suites/tracing/meta-tags-twp-errors/test.ts b/dev-packages/node-integration-tests/suites/tracing/meta-tags-twp-errors/test.ts
index 7c6612a0f4f7..d58f35b02972 100644
--- a/dev-packages/node-integration-tests/suites/tracing/meta-tags-twp-errors/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/meta-tags-twp-errors/test.ts
@@ -13,8 +13,8 @@ describe('errors in TwP mode have same trace in trace context and getTraceData()
         event: event => {
           const { contexts } = event;
           const { trace_id, span_id } = contexts?.trace || {};
-          expect(trace_id).toMatch(/^[a-f0-9]{32}$/);
-          expect(span_id).toMatch(/^[a-f0-9]{16}$/);
+          expect(trace_id).toMatch(/^[a-f\d]{32}$/);
+          expect(span_id).toMatch(/^[a-f\d]{16}$/);
 
           const traceData = contexts?.traceData || {};
 
@@ -40,12 +40,12 @@ describe('errors in TwP mode have same trace in trace context and getTraceData()
         event: event => {
           const { contexts } = event;
           const { trace_id, span_id } = contexts?.trace || {};
-          expect(trace_id).toMatch(/^[a-f0-9]{32}$/);
-          expect(span_id).toMatch(/^[a-f0-9]{16}$/);
+          expect(trace_id).toMatch(/^[a-f\d]{32}$/);
+          expect(span_id).toMatch(/^[a-f\d]{16}$/);
 
           const traceData = contexts?.traceData || {};
 
-          expect(traceData['sentry-trace']).toMatch(/^[a-f0-9]{32}-[a-f0-9]{16}$/);
+          expect(traceData['sentry-trace']).toMatch(/^[a-f\d]{32}-[a-f\d]{16}$/);
           expect(traceData['sentry-trace']).toContain(`${trace_id}-`);
           // span_id is a random span ID
           expect(traceData['sentry-trace']).not.toContain(span_id);
@@ -53,7 +53,7 @@ describe('errors in TwP mode have same trace in trace context and getTraceData()
           expect(traceData.baggage).toContain(`sentry-trace_id=${trace_id}`);
           expect(traceData.baggage).not.toContain('sentry-sampled=');
 
-          expect(traceData.metaTags).toMatch(/<meta name="sentry-trace" content="[a-f0-9]{32}-[a-f0-9]{16}"\/>/);
+          expect(traceData.metaTags).toMatch(/<meta name="sentry-trace" content="[a-f\d]{32}-[a-f\d]{16}"\/>/);
           expect(traceData.metaTags).toContain(`<meta name="sentry-trace" content="${trace_id}-`);
           // span_id is a random span ID
           expect(traceData.metaTags).not.toContain(span_id);
diff --git a/dev-packages/node-integration-tests/suites/tracing/meta-tags-twp/test.ts b/dev-packages/node-integration-tests/suites/tracing/meta-tags-twp/test.ts
index c719a82ceb36..c1332a07fb4c 100644
--- a/dev-packages/node-integration-tests/suites/tracing/meta-tags-twp/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/meta-tags-twp/test.ts
@@ -14,7 +14,7 @@ describe('getTraceMetaTags', () => {
     // @ts-ignore - response is defined, types just don't reflect it
     const html = response?.response as unknown as string;
 
-    const [, traceId, spanId] = html.match(/<meta name="sentry-trace" content="([a-f0-9]{32})-([a-f0-9]{16})"\/>/) || [
+    const [, traceId, spanId] = html.match(/<meta name="sentry-trace" content="([a-f\d]{32})-([a-f\d]{16})"\/>/) || [
       undefined,
       undefined,
       undefined,
diff --git a/dev-packages/node-integration-tests/suites/tracing/meta-tags/test.ts b/dev-packages/node-integration-tests/suites/tracing/meta-tags/test.ts
index c1b88699d8a0..a8d88fdd7cb4 100644
--- a/dev-packages/node-integration-tests/suites/tracing/meta-tags/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/meta-tags/test.ts
@@ -21,7 +21,7 @@ describe('getTraceMetaTags', () => {
 
     const html = response?.response;
 
-    expect(html).toMatch(/<meta name="sentry-trace" content="cd7ee7a6fe3ebe7ab9c3271559bc203c-[a-z0-9]{16}-1"\/>/);
+    expect(html).toMatch(/<meta name="sentry-trace" content="cd7ee7a6fe3ebe7ab9c3271559bc203c-[a-z\d]{16}-1"\/>/);
     expect(html).toContain('<meta name="baggage" content="sentry-environment=production,sentry-sample_rand=0.42"/>');
   });
 
@@ -32,7 +32,7 @@ describe('getTraceMetaTags', () => {
 
     const html = response?.response;
 
-    const traceId = html?.match(/<meta name="sentry-trace" content="([a-z0-9]{32})-[a-z0-9]{16}-1"\/>/)?.[1];
+    const traceId = html?.match(/<meta name="sentry-trace" content="([a-z\d]{32})-[a-z\d]{16}-1"\/>/)?.[1];
     expect(traceId).not.toBeUndefined();
 
     expect(html).toContain('<meta name="baggage"');
@@ -46,7 +46,7 @@ describe('getTraceMetaTags', () => {
 
     const html = response?.response;
 
-    const traceId = html?.match(/<meta name="sentry-trace" content="([a-z0-9]{32})-[a-z0-9]{16}-0"\/>/)?.[1];
+    const traceId = html?.match(/<meta name="sentry-trace" content="([a-z\d]{32})-[a-z\d]{16}-0"\/>/)?.[1];
     expect(traceId).not.toBeUndefined();
 
     expect(html).toContain('<meta name="baggage"');
diff --git a/dev-packages/node-integration-tests/suites/tracing/requests/fetch-no-tracing-no-spans/test.ts b/dev-packages/node-integration-tests/suites/tracing/requests/fetch-no-tracing-no-spans/test.ts
index f61532d9de8b..61dfe4c4ba88 100644
--- a/dev-packages/node-integration-tests/suites/tracing/requests/fetch-no-tracing-no-spans/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/requests/fetch-no-tracing-no-spans/test.ts
@@ -9,12 +9,12 @@ describe('outgoing fetch', () => {
 
       const [SERVER_URL, closeTestServer] = await createTestServer()
         .get('/api/v0', headers => {
-          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})$/));
+          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})$/));
           expect(headers['sentry-trace']).not.toEqual('00000000000000000000000000000000-0000000000000000');
           expect(headers['baggage']).toEqual(expect.any(String));
         })
         .get('/api/v1', headers => {
-          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})$/));
+          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})$/));
           expect(headers['sentry-trace']).not.toEqual('00000000000000000000000000000000-0000000000000000');
           expect(headers['baggage']).toEqual(expect.any(String));
         })
diff --git a/dev-packages/node-integration-tests/suites/tracing/requests/fetch-no-tracing/test.ts b/dev-packages/node-integration-tests/suites/tracing/requests/fetch-no-tracing/test.ts
index b4594c4d9c41..046763a0b55a 100644
--- a/dev-packages/node-integration-tests/suites/tracing/requests/fetch-no-tracing/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/requests/fetch-no-tracing/test.ts
@@ -9,12 +9,12 @@ describe('outgoing fetch', () => {
 
       const [SERVER_URL, closeTestServer] = await createTestServer()
         .get('/api/v0', headers => {
-          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})$/));
+          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})$/));
           expect(headers['sentry-trace']).not.toEqual('00000000000000000000000000000000-0000000000000000');
           expect(headers['baggage']).toEqual(expect.any(String));
         })
         .get('/api/v1', headers => {
-          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})$/));
+          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})$/));
           expect(headers['sentry-trace']).not.toEqual('00000000000000000000000000000000-0000000000000000');
           expect(headers['baggage']).toEqual(expect.any(String));
         })
diff --git a/dev-packages/node-integration-tests/suites/tracing/requests/fetch-sampled-no-active-span/test.ts b/dev-packages/node-integration-tests/suites/tracing/requests/fetch-sampled-no-active-span/test.ts
index 32f24517b3f6..acc1d6c89a25 100644
--- a/dev-packages/node-integration-tests/suites/tracing/requests/fetch-sampled-no-active-span/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/requests/fetch-sampled-no-active-span/test.ts
@@ -10,12 +10,12 @@ describe('outgoing fetch', () => {
       const [SERVER_URL, closeTestServer] = await createTestServer()
         .get('/api/v0', headers => {
           expect(headers['baggage']).toEqual(expect.any(String));
-          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})$/));
+          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})$/));
           expect(headers['sentry-trace']).not.toEqual('00000000000000000000000000000000-0000000000000000');
         })
         .get('/api/v1', headers => {
           expect(headers['baggage']).toEqual(expect.any(String));
-          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})$/));
+          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})$/));
           expect(headers['sentry-trace']).not.toEqual('00000000000000000000000000000000-0000000000000000');
         })
         .get('/api/v2', headers => {
diff --git a/dev-packages/node-integration-tests/suites/tracing/requests/fetch-unsampled/test.ts b/dev-packages/node-integration-tests/suites/tracing/requests/fetch-unsampled/test.ts
index 097236ba4e7f..4507a360006c 100644
--- a/dev-packages/node-integration-tests/suites/tracing/requests/fetch-unsampled/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/requests/fetch-unsampled/test.ts
@@ -10,12 +10,12 @@ describe('outgoing fetch', () => {
       const [SERVER_URL, closeTestServer] = await createTestServer()
         .get('/api/v0', headers => {
           expect(headers['baggage']).toEqual(expect.any(String));
-          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})-0$/));
+          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})-0$/));
           expect(headers['sentry-trace']).not.toEqual('00000000000000000000000000000000-0000000000000000-0');
         })
         .get('/api/v1', headers => {
           expect(headers['baggage']).toEqual(expect.any(String));
-          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})-0$/));
+          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})-0$/));
           expect(headers['sentry-trace']).not.toEqual('00000000000000000000000000000000-0000000000000000-0');
         })
         .get('/api/v2', headers => {
diff --git a/dev-packages/node-integration-tests/suites/tracing/requests/http-no-tracing-no-spans/test.ts b/dev-packages/node-integration-tests/suites/tracing/requests/http-no-tracing-no-spans/test.ts
index fe9cba032344..1cad4abf9a99 100644
--- a/dev-packages/node-integration-tests/suites/tracing/requests/http-no-tracing-no-spans/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/requests/http-no-tracing-no-spans/test.ts
@@ -11,12 +11,12 @@ describe('outgoing http requests with tracing & spans disabled', () => {
 
         const [SERVER_URL, closeTestServer] = await createTestServer()
           .get('/api/v0', headers => {
-            expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})$/));
+            expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})$/));
             expect(headers['sentry-trace']).not.toEqual('00000000000000000000000000000000-0000000000000000');
             expect(headers['baggage']).toEqual(expect.any(String));
           })
           .get('/api/v1', headers => {
-            expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})$/));
+            expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})$/));
             expect(headers['sentry-trace']).not.toEqual('00000000000000000000000000000000-0000000000000000');
             expect(headers['baggage']).toEqual(expect.any(String));
           })
diff --git a/dev-packages/node-integration-tests/suites/tracing/requests/http-no-tracing/test.ts b/dev-packages/node-integration-tests/suites/tracing/requests/http-no-tracing/test.ts
index 7922fe3a443f..d0b13513d1de 100644
--- a/dev-packages/node-integration-tests/suites/tracing/requests/http-no-tracing/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/requests/http-no-tracing/test.ts
@@ -9,12 +9,12 @@ describe('outgoing http', () => {
 
       const [SERVER_URL, closeTestServer] = await createTestServer()
         .get('/api/v0', headers => {
-          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})$/));
+          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})$/));
           expect(headers['sentry-trace']).not.toEqual('00000000000000000000000000000000-0000000000000000');
           expect(headers['baggage']).toEqual(expect.any(String));
         })
         .get('/api/v1', headers => {
-          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})$/));
+          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})$/));
           expect(headers['sentry-trace']).not.toEqual('00000000000000000000000000000000-0000000000000000');
           expect(headers['baggage']).toEqual(expect.any(String));
         })
diff --git a/dev-packages/node-integration-tests/suites/tracing/requests/http-sampled-no-active-span/test.ts b/dev-packages/node-integration-tests/suites/tracing/requests/http-sampled-no-active-span/test.ts
index 8d1afff8c867..932f379ec23e 100644
--- a/dev-packages/node-integration-tests/suites/tracing/requests/http-sampled-no-active-span/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/requests/http-sampled-no-active-span/test.ts
@@ -10,12 +10,12 @@ describe('outgoing http', () => {
       const [SERVER_URL, closeTestServer] = await createTestServer()
         .get('/api/v0', headers => {
           expect(headers['baggage']).toEqual(expect.any(String));
-          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})$/));
+          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})$/));
           expect(headers['sentry-trace']).not.toEqual('00000000000000000000000000000000-0000000000000000');
         })
         .get('/api/v1', headers => {
           expect(headers['baggage']).toEqual(expect.any(String));
-          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})$/));
+          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})$/));
           expect(headers['sentry-trace']).not.toEqual('00000000000000000000000000000000-0000000000000000');
         })
         .get('/api/v2', headers => {
diff --git a/dev-packages/node-integration-tests/suites/tracing/requests/http-sampled/test.ts b/dev-packages/node-integration-tests/suites/tracing/requests/http-sampled/test.ts
index 5951db7f51b7..9a7b13a34332 100644
--- a/dev-packages/node-integration-tests/suites/tracing/requests/http-sampled/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/requests/http-sampled/test.ts
@@ -10,12 +10,12 @@ describe('outgoing http', () => {
       const [SERVER_URL, closeTestServer] = await createTestServer()
         .get('/api/v0', headers => {
           expect(headers['baggage']).toEqual(expect.any(String));
-          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})-1$/));
+          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})-1$/));
           expect(headers['sentry-trace']).not.toEqual('00000000000000000000000000000000-0000000000000000-1');
         })
         .get('/api/v1', headers => {
           expect(headers['baggage']).toEqual(expect.any(String));
-          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})-1$/));
+          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})-1$/));
           expect(headers['sentry-trace']).not.toEqual('00000000000000000000000000000000-0000000000000000-1');
         })
         .get('/api/v2', headers => {
diff --git a/dev-packages/node-integration-tests/suites/tracing/requests/http-unsampled/test.ts b/dev-packages/node-integration-tests/suites/tracing/requests/http-unsampled/test.ts
index 4e83d2e3feb1..28fb877d0425 100644
--- a/dev-packages/node-integration-tests/suites/tracing/requests/http-unsampled/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/requests/http-unsampled/test.ts
@@ -10,12 +10,12 @@ describe('outgoing http', () => {
       const [SERVER_URL, closeTestServer] = await createTestServer()
         .get('/api/v0', headers => {
           expect(headers['baggage']).toEqual(expect.any(String));
-          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})-0$/));
+          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})-0$/));
           expect(headers['sentry-trace']).not.toEqual('00000000000000000000000000000000-0000000000000000-0');
         })
         .get('/api/v1', headers => {
           expect(headers['baggage']).toEqual(expect.any(String));
-          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})-0$/));
+          expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})-0$/));
           expect(headers['sentry-trace']).not.toEqual('00000000000000000000000000000000-0000000000000000-0');
         })
         .get('/api/v2', headers => {
diff --git a/dev-packages/node-integration-tests/suites/tracing/sample-rand-propagation/test.ts b/dev-packages/node-integration-tests/suites/tracing/sample-rand-propagation/test.ts
index df25a261ab2c..a63efe51adbd 100644
--- a/dev-packages/node-integration-tests/suites/tracing/sample-rand-propagation/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/sample-rand-propagation/test.ts
@@ -11,7 +11,7 @@ describe('sample_rand propagation', () => {
     const response = await runner.makeRequest('get', '/check');
     expect(response).toEqual({
       propagatedData: {
-        baggage: expect.stringMatching(/sentry-sample_rand=0\.[0-9]+/),
+        baggage: expect.stringMatching(/sentry-sample_rand=0\.\d+/),
       },
     });
   });
@@ -40,7 +40,7 @@ describe('sample_rand propagation', () => {
     });
     expect(response).toEqual({
       propagatedData: {
-        baggage: expect.stringMatching(/sentry-sample_rand=0\.[0-9]+/),
+        baggage: expect.stringMatching(/sentry-sample_rand=0\.\d+/),
       },
     });
   });
@@ -54,7 +54,7 @@ describe('sample_rand propagation', () => {
       },
     });
 
-    const sampleRand = Number((response as any).propagatedData.baggage.match(/sentry-sample_rand=(0\.[0-9]+)/)[1]);
+    const sampleRand = Number((response as any).propagatedData.baggage.match(/sentry-sample_rand=(0\.\d+)/)[1]);
 
     expect(sampleRand).toStrictEqual(expect.any(Number));
     expect(sampleRand).not.toBeNaN();
@@ -71,7 +71,7 @@ describe('sample_rand propagation', () => {
       },
     });
 
-    const sampleRand = Number((response as any).propagatedData.baggage.match(/sentry-sample_rand=(0\.[0-9]+)/)[1]);
+    const sampleRand = Number((response as any).propagatedData.baggage.match(/sentry-sample_rand=(0\.\d+)/)[1]);
 
     expect(sampleRand).toStrictEqual(expect.any(Number));
     expect(sampleRand).not.toBeNaN();
@@ -87,8 +87,8 @@ describe('sample_rand propagation', () => {
       },
     });
 
-    expect((response as any).propagatedData.baggage).toMatch(/sentry-sample_rand=0\.[0-9]+/);
-    const sampleRandStr = (response as any).propagatedData.baggage.match(/sentry-sample_rand=(0\.[0-9]+)/)[1];
+    expect((response as any).propagatedData.baggage).toMatch(/sentry-sample_rand=0\.\d+/);
+    const sampleRandStr = (response as any).propagatedData.baggage.match(/sentry-sample_rand=(0\.\d+)/)[1];
     expect(sampleRandStr).not.toBe('0.5');
   });
 });
diff --git a/dev-packages/node-integration-tests/suites/tracing/tracePropagationTargets/test.ts b/dev-packages/node-integration-tests/suites/tracing/tracePropagationTargets/test.ts
index 4185dec46afb..9fb39a1ec8f2 100644
--- a/dev-packages/node-integration-tests/suites/tracing/tracePropagationTargets/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/tracePropagationTargets/test.ts
@@ -8,12 +8,12 @@ test('HttpIntegration should instrument correct requests when tracePropagationTa
   const [SERVER_URL, closeTestServer] = await createTestServer()
     .get('/api/v0', headers => {
       expect(headers['baggage']).toEqual(expect.any(String));
-      expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})-1$/));
+      expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})-1$/));
       expect(headers['sentry-trace']).not.toEqual('00000000000000000000000000000000-0000000000000000-1');
     })
     .get('/api/v1', headers => {
       expect(headers['baggage']).toEqual(expect.any(String));
-      expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f0-9]{32})-([a-f0-9]{16})-1$/));
+      expect(headers['sentry-trace']).toEqual(expect.stringMatching(/^([a-f\d]{32})-([a-f\d]{16})-1$/));
       expect(headers['sentry-trace']).not.toEqual('00000000000000000000000000000000-0000000000000000-1');
     })
     .get('/api/v2', headers => {
diff --git a/dev-packages/node-integration-tests/utils/runner.ts b/dev-packages/node-integration-tests/utils/runner.ts
index ac15a944ee0b..97c4021ccc89 100644
--- a/dev-packages/node-integration-tests/utils/runner.ts
+++ b/dev-packages/node-integration-tests/utils/runner.ts
@@ -611,7 +611,7 @@ export function createRunner(...paths: string[]) {
 
           function tryParseEnvelopeFromStdoutLine(line: string): void {
             // Lines can have leading '[something] [{' which we need to remove
-            const cleanedLine = line.replace(/^.*?] \[{"/, '[{"');
+            const cleanedLine = line.replace(/^.*?\] \[\{"/, '[{"');
 
             // See if we have a port message
             if (cleanedLine.startsWith('{"port":')) {
@@ -801,6 +801,7 @@ function convertEsmToCjs(content: string): string {
 
   // Handle default imports: import x from 'y' -> const x = require('y')
   newContent = newContent.replace(
+    // eslint-disable-next-line regexp/optimal-quantifier-concatenation, regexp/no-super-linear-backtracking
     /import\s+([\w*{}\s,]+)\s+from\s+['"]([^'"]+)['"]/g,
     (_, imports: string, module: string) => {
       if (imports.includes('* as')) {
diff --git a/dev-packages/node-overhead-gh-action/.eslintrc.cjs b/dev-packages/node-overhead-gh-action/.eslintrc.cjs
index 381653af6ece..a1c4f5968e46 100644
--- a/dev-packages/node-overhead-gh-action/.eslintrc.cjs
+++ b/dev-packages/node-overhead-gh-action/.eslintrc.cjs
@@ -2,7 +2,9 @@ module.exports = {
   env: {
     node: true,
   },
-  extends: ['../../.eslintrc.js'],
+  // todo: remove regexp plugin from here once we add it to base.js eslint config for the whole project
+  extends: ['../../.eslintrc.js', 'plugin:regexp/recommended'],
+  plugins: ['regexp'],
   overrides: [
     {
       files: ['**/*.mjs'],
diff --git a/dev-packages/node-overhead-gh-action/package.json b/dev-packages/node-overhead-gh-action/package.json
index 505fe9a8d683..6b01633f742d 100644
--- a/dev-packages/node-overhead-gh-action/package.json
+++ b/dev-packages/node-overhead-gh-action/package.json
@@ -35,6 +35,7 @@
     "@actions/glob": "0.4.0",
     "@actions/io": "1.1.3",
     "autocannon": "^8.0.0",
+    "eslint-plugin-regexp": "^1.15.0",
     "markdown-table": "3.0.3",
     "tree-kill": "1.2.2"
   },
diff --git a/dev-packages/rollup-utils/.eslintrc.cjs b/dev-packages/rollup-utils/.eslintrc.cjs
index 0939c10d3812..f4a3ac1b8cb7 100644
--- a/dev-packages/rollup-utils/.eslintrc.cjs
+++ b/dev-packages/rollup-utils/.eslintrc.cjs
@@ -1,5 +1,7 @@
 module.exports = {
-  extends: ['../../.eslintrc.js'],
+  // todo: remove regexp plugin from here once we add it to base.js eslint config for the whole project
+  extends: ['../../.eslintrc.js', 'plugin:regexp/recommended'],
+  plugins: ['regexp'],
   ignorePatterns: ['otelLoaderTemplate.js.tmpl'],
   sourceType: 'module',
 };
diff --git a/dev-packages/rollup-utils/package.json b/dev-packages/rollup-utils/package.json
index 60600af2d12e..bfe5f6fe498e 100644
--- a/dev-packages/rollup-utils/package.json
+++ b/dev-packages/rollup-utils/package.json
@@ -12,6 +12,9 @@
     "acorn": "^8.7.0",
     "recast": "^0.20.5"
   },
+  "devDependencies": {
+    "eslint-plugin-regexp": "^1.15.0"
+  },
   "volta": {
     "extends": "../../package.json"
   },
diff --git a/dev-packages/size-limit-gh-action/.eslintrc.cjs b/dev-packages/size-limit-gh-action/.eslintrc.cjs
index bc17bc85b4ab..fbc38a65db9c 100644
--- a/dev-packages/size-limit-gh-action/.eslintrc.cjs
+++ b/dev-packages/size-limit-gh-action/.eslintrc.cjs
@@ -1,5 +1,7 @@
 module.exports = {
-  extends: ['../../.eslintrc.js'],
+  // todo: remove regexp plugin from here once we add it to base.js eslint config for the whole project
+  extends: ['../../.eslintrc.js', 'plugin:regexp/recommended'],
+  plugins: ['regexp'],
   parserOptions: {
     sourceType: 'module',
     ecmaVersion: 'latest',
diff --git a/dev-packages/test-utils/.eslintrc.js b/dev-packages/test-utils/.eslintrc.js
index fdb9952bae52..3be74e6c3f9d 100644
--- a/dev-packages/test-utils/.eslintrc.js
+++ b/dev-packages/test-utils/.eslintrc.js
@@ -2,5 +2,7 @@ module.exports = {
   env: {
     node: true,
   },
-  extends: ['../../.eslintrc.js'],
+  // todo: remove regexp plugin from here once we add it to base.js eslint config for the whole project
+  extends: ['../../.eslintrc.js', 'plugin:regexp/recommended'],
+  plugins: ['regexp'],
 };
diff --git a/dev-packages/test-utils/package.json b/dev-packages/test-utils/package.json
index 70e3e1fd9263..fa30f4a3c0eb 100644
--- a/dev-packages/test-utils/package.json
+++ b/dev-packages/test-utils/package.json
@@ -48,7 +48,8 @@
   },
   "devDependencies": {
     "@playwright/test": "~1.53.2",
-    "@sentry/core": "10.23.0"
+    "@sentry/core": "10.23.0",
+    "eslint-plugin-regexp": "^1.15.0"
   },
   "volta": {
     "extends": "../../package.json"
diff --git a/yarn.lock b/yarn.lock
index a94b2263b7f1..a49764ebb218 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4092,12 +4092,17 @@
   resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.25.6.tgz#4276edd5c105bc28b11c6a1f76fb9d29d1bd25c1"
   integrity sha512-NgJPHHbEpLQgDH2MjQu90pzW/5vvXIZ7KOnPyNBm92A6WgZ/7b6fJyUBjoumLqeOQQGqY2QjQxRo97ah4Sj0cA==
 
-"@eslint-community/eslint-utils@^4.4.0":
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
-  integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==
+"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
+  version "4.9.0"
+  resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz#7308df158e064f0dd8b8fdb58aa14fa2a7f913b3"
+  integrity sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==
   dependencies:
-    eslint-visitor-keys "^3.3.0"
+    eslint-visitor-keys "^3.4.3"
+
+"@eslint-community/regexpp@^4.4.0", "@eslint-community/regexpp@^4.5.0":
+  version "4.12.2"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.12.2.tgz#bccdf615bcf7b6e8db830ec0b8d21c9a25de597b"
+  integrity sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==
 
 "@eslint/eslintrc@^0.4.3":
   version "0.4.3"
@@ -13117,6 +13122,11 @@ comment-parser@^0.7.6:
   resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-0.7.6.tgz#0e743a53c8e646c899a1323db31f6cd337b10f12"
   integrity sha512-GKNxVA7/iuTnAqGADlTWX4tkhzxZKXp5fLJqKTlQLHkE65XDUKutZ3BHaJC5IGcper2tT3QRD1xr4o3jNpgXXg==
 
+comment-parser@^1.1.2:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.4.1.tgz#bdafead37961ac079be11eb7ec65c4d021eaf9cc"
+  integrity sha512-buhp5kePrmda3vhc5B9t7pUQXAb2Tnd0qgpkIhPhkHXxJpiPJ11H0ZEU0oBpJ2QztSbzG/ZxMj/CHsYJqRHmyg==
+
 commenting@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/commenting/-/commenting-1.1.0.tgz#fae14345c6437b8554f30bc6aa6c1e1633033590"
@@ -16208,6 +16218,20 @@ eslint-plugin-react@^7.20.5, eslint-plugin-react@^7.31.11:
     semver "^6.3.0"
     string.prototype.matchall "^4.0.8"
 
+eslint-plugin-regexp@^1.15.0:
+  version "1.15.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-regexp/-/eslint-plugin-regexp-1.15.0.tgz#2717cd4867418287b36d9569c72fca7d242c59b3"
+  integrity sha512-YEtQPfdudafU7RBIFci81R/Q1yErm0mVh3BkGnXD2Dk8DLwTFdc2ITYH1wCnHKim2gnHfPFgrkh+b2ozyyU7ag==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.2.0"
+    "@eslint-community/regexpp" "^4.4.0"
+    comment-parser "^1.1.2"
+    grapheme-splitter "^1.0.4"
+    jsdoctypeparser "^9.0.0"
+    refa "^0.11.0"
+    regexp-ast-analysis "^0.6.0"
+    scslre "^0.2.0"
+
 eslint-plugin-simple-import-sort@^6.0.0:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-6.0.1.tgz#24a3af3b745dcd389c060db28e22d0f5e3edf86e"
@@ -16245,7 +16269,7 @@ eslint-visitor-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
   integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
 
-eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1:
+eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:
   version "3.4.3"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
   integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
@@ -18086,6 +18110,11 @@ graceful-fs@4.2.11, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2
   resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
   integrity sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=
 
+grapheme-splitter@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
+  integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
+
 graphql-tag@^2.11.0:
   version "2.12.6"
   resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.12.6.tgz#d441a569c1d2537ef10ca3d1633b48725329b5f1"
@@ -26380,6 +26409,13 @@ redux@^4.0.5:
     loose-envify "^1.4.0"
     symbol-observable "^1.2.0"
 
+refa@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/refa/-/refa-0.11.0.tgz#07d57a9f5f3ee2dd58e0d145a6a489fda2591ed0"
+  integrity sha512-486O8/pQXwj9jV0mVvUnTsxq0uknpBnNJ0eCUhkZqJRQ8KutrT1PhzmumdCeM1hSBF2eMlFPmwECRER4IbKXlQ==
+  dependencies:
+    "@eslint-community/regexpp" "^4.5.0"
+
 reflect-metadata@0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.2.1.tgz#8d5513c0f5ef2b4b9c3865287f3c0940c1f67f74"
@@ -26437,6 +26473,14 @@ regex-parser@^2.2.11:
   resolved "https://registry.yarnpkg.com/regex-parser/-/regex-parser-2.2.11.tgz#3b37ec9049e19479806e878cabe7c1ca83ccfe58"
   integrity sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q==
 
+regexp-ast-analysis@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/regexp-ast-analysis/-/regexp-ast-analysis-0.6.0.tgz#c0b648728c85d266a409ce00a6440c01c9834c61"
+  integrity sha512-OLxjyjPkVH+rQlBLb1I/P/VTmamSjGkvN5PTV5BXP432k3uVz727J7H29GA5IFiY0m7e1xBN7049Wn59FY3DEQ==
+  dependencies:
+    "@eslint-community/regexpp" "^4.5.0"
+    refa "^0.11.0"
+
 regexp-clone@1.0.0, regexp-clone@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/regexp-clone/-/regexp-clone-1.0.0.tgz#222db967623277056260b992626354a04ce9bf63"
@@ -27305,6 +27349,15 @@ schema-utils@^4.0.0, schema-utils@^4.3.0, schema-utils@^4.3.2:
     ajv-formats "^2.1.1"
     ajv-keywords "^5.1.0"
 
+scslre@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/scslre/-/scslre-0.2.0.tgz#b604eedbab76f87003738d00de44d7601a78609e"
+  integrity sha512-4hc49fUMmX3jM0XdFUAPBrs1xwEcdHa0KyjEsjFs+Zfc66mpFpq5YmRgDtl+Ffo6AtJIilfei+yKw8fUn3N88w==
+  dependencies:
+    "@eslint-community/regexpp" "^4.5.0"
+    refa "^0.11.0"
+    regexp-ast-analysis "^0.6.0"
+
 scule@^1.0.0, scule@^1.2.0, scule@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/scule/-/scule-1.3.0.tgz#6efbd22fd0bb801bdcc585c89266a7d2daa8fbd3"

From ad870cf18d21b5ef8684ee6ab581169e1de308f7 Mon Sep 17 00:00:00 2001
From: Charly Gomez <charly.gomez@sentry.io>
Date: Thu, 6 Nov 2025 17:32:53 +0100
Subject: [PATCH 029/186] feat(metrics)!: Update types (#17907)

- Fixing some of the types according to the specs.
---
 packages/core/src/client.ts             | 8 ++------
 packages/core/src/metrics/internal.ts   | 2 +-
 packages/core/src/metrics/public-api.ts | 2 +-
 packages/core/src/types-hoist/metric.ts | 6 +++---
 packages/core/test/lib/client.test.ts   | 5 ++++-
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/packages/core/src/client.ts b/packages/core/src/client.ts
index 6a269a969c8d..e0294ef26c59 100644
--- a/packages/core/src/client.ts
+++ b/packages/core/src/client.ts
@@ -1521,12 +1521,8 @@ function estimateMetricSizeInBytes(metric: Metric): number {
     weight += metric.name.length * 2;
   }
 
-  // Add weight for the value
-  if (typeof metric.value === 'string') {
-    weight += metric.value.length * 2;
-  } else {
-    weight += 8; // number
-  }
+  // Add weight for number
+  weight += 8;
 
   return weight + estimateAttributesSizeInBytes(metric.attributes);
 }
diff --git a/packages/core/src/metrics/internal.ts b/packages/core/src/metrics/internal.ts
index efa204cac5a3..ff097180c6ec 100644
--- a/packages/core/src/metrics/internal.ts
+++ b/packages/core/src/metrics/internal.ts
@@ -201,7 +201,7 @@ export function _INTERNAL_captureMetric(beforeMetric: Metric, options?: Internal
 
   const serializedMetric: SerializedMetric = {
     timestamp: timestampInSeconds(),
-    trace_id: traceId,
+    trace_id: traceId ?? '',
     span_id: spanId,
     name: processedMetric.name,
     type: processedMetric.type,
diff --git a/packages/core/src/metrics/public-api.ts b/packages/core/src/metrics/public-api.ts
index e508fcb9e6d0..7dcfe74dfdb0 100644
--- a/packages/core/src/metrics/public-api.ts
+++ b/packages/core/src/metrics/public-api.ts
@@ -30,7 +30,7 @@ export interface MetricOptions {
  * @param value - The value of the metric.
  * @param options - Options for capturing the metric.
  */
-function captureMetric(type: MetricType, name: string, value: number | string, options?: MetricOptions): void {
+function captureMetric(type: MetricType, name: string, value: number, options?: MetricOptions): void {
   _INTERNAL_captureMetric(
     { type, name, value, unit: options?.unit, attributes: options?.attributes },
     { scope: options?.scope },
diff --git a/packages/core/src/types-hoist/metric.ts b/packages/core/src/types-hoist/metric.ts
index 9201243c4a38..6ac63da6032b 100644
--- a/packages/core/src/types-hoist/metric.ts
+++ b/packages/core/src/types-hoist/metric.ts
@@ -9,7 +9,7 @@ export interface Metric {
   /**
    * The value of the metric.
    */
-  value: number | string;
+  value: number;
 
   /**
    * The type of metric.
@@ -42,7 +42,7 @@ export interface SerializedMetric {
   /**
    * The trace ID for this metric.
    */
-  trace_id?: string;
+  trace_id: string;
 
   /**
    * The span ID for this metric.
@@ -67,7 +67,7 @@ export interface SerializedMetric {
   /**
    * The value of the metric.
    */
-  value: number | string;
+  value: number;
 
   /**
    * Arbitrary structured data that stores information about the metric.
diff --git a/packages/core/test/lib/client.test.ts b/packages/core/test/lib/client.test.ts
index ae324aa40f9f..d50d6da911b8 100644
--- a/packages/core/test/lib/client.test.ts
+++ b/packages/core/test/lib/client.test.ts
@@ -2763,7 +2763,10 @@ describe('Client', () => {
 
       // Create large metrics that will exceed the 800KB threshold
       const largeValue = 'x'.repeat(400_000); // 400KB string
-      _INTERNAL_captureMetric({ name: 'large_metric', value: largeValue, type: 'counter', attributes: {} }, { scope });
+      _INTERNAL_captureMetric(
+        { name: 'large_metric', value: 1, type: 'counter', attributes: { large_value: largeValue } },
+        { scope },
+      );
 
       expect(sendEnvelopeSpy).toHaveBeenCalledTimes(1);
     });

From c2530dd879b806675360216ae7b9d73bf0c88780 Mon Sep 17 00:00:00 2001
From: Charly Gomez <charly.gomez@sentry.io>
Date: Thu, 6 Nov 2025 19:26:51 +0100
Subject: [PATCH 030/186] feat(metrics): Add top level option `enableMetrics`
 and `beforeSendMetric` (#18088)

- Adds top level options for `enableMetrics` and `beforeSendMetric`.
- Kept the experimental flags for now to stay backwards compatible, but
added a deprecation note and todo comments for removing them in v11.
- Updated all the tests to use the top-level flag.
- Had to refactor the `_INTERNAL_captureMetric` function since it broke
the complexity threshold of our linter

> [!WARNING]
> `enableMetrics` now defaults to `true`, so theoretically this PR is
behaviourally breaking.
---
 .size-limit.js                                |   2 +-
 .../suites/public-api/metrics/init.js         |   3 -
 .../suites/public-api/metrics/scenario.ts     |   3 -
 .../suites/public-api/metrics/scenario.ts     |   3 -
 packages/browser/src/client.ts                |  19 ++-
 packages/core/src/client.ts                   |   6 +-
 packages/core/src/metrics/internal.ts         | 113 +++++++++++-------
 packages/core/src/types-hoist/options.ts      |  23 ++++
 packages/core/test/lib/client.test.ts         |   3 -
 .../core/test/lib/metrics/internal.test.ts    |  56 ++++-----
 .../core/test/lib/metrics/public-api.test.ts  |  28 ++---
 11 files changed, 152 insertions(+), 107 deletions(-)

diff --git a/.size-limit.js b/.size-limit.js
index c3f0e79d35fa..b4819fc83126 100644
--- a/.size-limit.js
+++ b/.size-limit.js
@@ -190,7 +190,7 @@ module.exports = [
     path: createCDNPath('bundle.tracing.min.js'),
     gzip: false,
     brotli: false,
-    limit: '124.1 KB',
+    limit: '125 KB',
   },
   {
     name: 'CDN Bundle (incl. Tracing, Replay) - uncompressed',
diff --git a/dev-packages/browser-integration-tests/suites/public-api/metrics/init.js b/dev-packages/browser-integration-tests/suites/public-api/metrics/init.js
index df4fda70e4c7..73c6e63ed335 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/metrics/init.js
+++ b/dev-packages/browser-integration-tests/suites/public-api/metrics/init.js
@@ -4,9 +4,6 @@ window.Sentry = Sentry;
 
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
-  _experiments: {
-    enableMetrics: true,
-  },
   release: '1.0.0',
   environment: 'test',
   integrations: integrations => {
diff --git a/dev-packages/node-core-integration-tests/suites/public-api/metrics/scenario.ts b/dev-packages/node-core-integration-tests/suites/public-api/metrics/scenario.ts
index 9ab9fed7d22b..77adfae79802 100644
--- a/dev-packages/node-core-integration-tests/suites/public-api/metrics/scenario.ts
+++ b/dev-packages/node-core-integration-tests/suites/public-api/metrics/scenario.ts
@@ -6,9 +6,6 @@ const client = Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   release: '1.0.0',
   environment: 'test',
-  _experiments: {
-    enableMetrics: true,
-  },
   transport: loggingTransport,
 });
 
diff --git a/dev-packages/node-integration-tests/suites/public-api/metrics/scenario.ts b/dev-packages/node-integration-tests/suites/public-api/metrics/scenario.ts
index 9c776eb14d59..8d02a1fcd17c 100644
--- a/dev-packages/node-integration-tests/suites/public-api/metrics/scenario.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/metrics/scenario.ts
@@ -5,9 +5,6 @@ Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   release: '1.0.0',
   environment: 'test',
-  _experiments: {
-    enableMetrics: true,
-  },
   transport: loggingTransport,
 });
 
diff --git a/packages/browser/src/client.ts b/packages/browser/src/client.ts
index 1b4289d66992..dddaa440b198 100644
--- a/packages/browser/src/client.ts
+++ b/packages/browser/src/client.ts
@@ -104,10 +104,22 @@ export class BrowserClient extends Client<BrowserClientOptions> {
 
     super(opts);
 
-    const { sendDefaultPii, sendClientReports, enableLogs, _experiments } = this._options;
+    const {
+      sendDefaultPii,
+      sendClientReports,
+      enableLogs,
+      _experiments,
+      enableMetrics: enableMetricsOption,
+    } = this._options;
+
+    // todo(v11): Remove the experimental flag
+    // eslint-disable-next-line deprecation/deprecation
+    const enableMetrics = enableMetricsOption ?? _experiments?.enableMetrics ?? true;
 
     // Flush logs and metrics when page becomes hidden (e.g., tab switch, navigation)
-    if (WINDOW.document && (sendClientReports || enableLogs || _experiments?.enableMetrics)) {
+    // todo(v11): Remove the experimental flag
+    // eslint-disable-next-line deprecation/deprecation
+    if (WINDOW.document && (sendClientReports || enableLogs || enableMetrics)) {
       WINDOW.document.addEventListener('visibilitychange', () => {
         if (WINDOW.document.visibilityState === 'hidden') {
           if (sendClientReports) {
@@ -116,7 +128,8 @@ export class BrowserClient extends Client<BrowserClientOptions> {
           if (enableLogs) {
             _INTERNAL_flushLogsBuffer(this);
           }
-          if (_experiments?.enableMetrics) {
+
+          if (enableMetrics) {
             _INTERNAL_flushMetricsBuffer(this);
           }
         }
diff --git a/packages/core/src/client.ts b/packages/core/src/client.ts
index e0294ef26c59..c3ff126732f8 100644
--- a/packages/core/src/client.ts
+++ b/packages/core/src/client.ts
@@ -232,8 +232,12 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
       setupWeightBasedFlushing(this, 'afterCaptureLog', 'flushLogs', estimateLogSizeInBytes, _INTERNAL_flushLogsBuffer);
     }
 
+    // todo(v11): Remove the experimental flag
+    // eslint-disable-next-line deprecation/deprecation
+    const enableMetrics = this._options.enableMetrics ?? this._options._experiments?.enableMetrics ?? true;
+
     // Setup metric flushing with weight and timeout tracking
-    if (this._options._experiments?.enableMetrics) {
+    if (enableMetrics) {
       setupWeightBasedFlushing(
         this,
         'afterCaptureMetric',
diff --git a/packages/core/src/metrics/internal.ts b/packages/core/src/metrics/internal.ts
index ff097180c6ec..5371ecba8dfd 100644
--- a/packages/core/src/metrics/internal.ts
+++ b/packages/core/src/metrics/internal.ts
@@ -116,35 +116,16 @@ export interface InternalCaptureMetricOptions {
 }
 
 /**
- * Captures a metric event and sends it to Sentry.
- *
- * @param metric - The metric event to capture.
- * @param options - Options for capturing the metric.
- *
- * @experimental This method will experience breaking changes. This is not yet part of
- * the stable Sentry SDK API and can be changed or removed without warning.
+ * Enriches metric with all contextual attributes (user, SDK metadata, replay, etc.)
  */
-export function _INTERNAL_captureMetric(beforeMetric: Metric, options?: InternalCaptureMetricOptions): void {
-  const currentScope = options?.scope ?? getCurrentScope();
-  const captureSerializedMetric = options?.captureSerializedMetric ?? _INTERNAL_captureSerializedMetric;
-  const client = currentScope?.getClient() ?? getClient();
-  if (!client) {
-    DEBUG_BUILD && debug.warn('No client available to capture metric.');
-    return;
-  }
-
-  const { release, environment, _experiments } = client.getOptions();
-  if (!_experiments?.enableMetrics) {
-    DEBUG_BUILD && debug.warn('metrics option not enabled, metric will not be captured.');
-    return;
-  }
-
-  const [, traceContext] = _getTraceInfoFromScope(client, currentScope);
+function _enrichMetricAttributes(beforeMetric: Metric, client: Client, currentScope: Scope): Metric {
+  const { release, environment } = client.getOptions();
 
   const processedMetricAttributes = {
     ...beforeMetric.attributes,
   };
 
+  // Add user attributes
   const {
     user: { id, email, username },
   } = getMergedScopeData(currentScope);
@@ -152,13 +133,16 @@ export function _INTERNAL_captureMetric(beforeMetric: Metric, options?: Internal
   setMetricAttribute(processedMetricAttributes, 'user.email', email, false);
   setMetricAttribute(processedMetricAttributes, 'user.name', username, false);
 
+  // Add Sentry metadata
   setMetricAttribute(processedMetricAttributes, 'sentry.release', release);
   setMetricAttribute(processedMetricAttributes, 'sentry.environment', environment);
 
+  // Add SDK metadata
   const { name, version } = client.getSdkMetadata()?.sdk ?? {};
   setMetricAttribute(processedMetricAttributes, 'sentry.sdk.name', name);
   setMetricAttribute(processedMetricAttributes, 'sentry.sdk.version', version);
 
+  // Add replay metadata
   const replay = client.getIntegrationByName<
     Integration & {
       getReplayId: (onlyIfSampled?: boolean) => string;
@@ -167,54 +151,97 @@ export function _INTERNAL_captureMetric(beforeMetric: Metric, options?: Internal
   >('Replay');
 
   const replayId = replay?.getReplayId(true);
-
   setMetricAttribute(processedMetricAttributes, 'sentry.replay_id', replayId);
 
   if (replayId && replay?.getRecordingMode() === 'buffer') {
-    // We send this so we can identify cases where the replayId is attached but the replay itself might not have been sent to Sentry
     setMetricAttribute(processedMetricAttributes, 'sentry._internal.replay_is_buffering', true);
   }
 
-  const metric: Metric = {
+  return {
     ...beforeMetric,
     attributes: processedMetricAttributes,
   };
+}
 
-  // Run beforeSendMetric callback
-  const processedMetric = _experiments?.beforeSendMetric ? _experiments.beforeSendMetric(metric) : metric;
-
-  if (!processedMetric) {
-    DEBUG_BUILD && debug.log('`beforeSendMetric` returned `null`, will not send metric.');
-    return;
-  }
-
+/**
+ * Creates a serialized metric ready to be sent to Sentry.
+ */
+function _buildSerializedMetric(metric: Metric, client: Client, currentScope: Scope): SerializedMetric {
+  // Serialize attributes
   const serializedAttributes: Record<string, SerializedMetricAttributeValue> = {};
-  for (const key in processedMetric.attributes) {
-    if (processedMetric.attributes[key] !== undefined) {
-      serializedAttributes[key] = metricAttributeToSerializedMetricAttribute(processedMetric.attributes[key]);
+  for (const key in metric.attributes) {
+    if (metric.attributes[key] !== undefined) {
+      serializedAttributes[key] = metricAttributeToSerializedMetricAttribute(metric.attributes[key]);
     }
   }
 
+  // Get trace context
+  const [, traceContext] = _getTraceInfoFromScope(client, currentScope);
   const span = _getSpanForScope(currentScope);
   const traceId = span ? span.spanContext().traceId : traceContext?.trace_id;
   const spanId = span ? span.spanContext().spanId : undefined;
 
-  const serializedMetric: SerializedMetric = {
+  return {
     timestamp: timestampInSeconds(),
     trace_id: traceId ?? '',
     span_id: spanId,
-    name: processedMetric.name,
-    type: processedMetric.type,
-    unit: processedMetric.unit,
-    value: processedMetric.value,
+    name: metric.name,
+    type: metric.type,
+    unit: metric.unit,
+    value: metric.value,
     attributes: serializedAttributes,
   };
+}
+
+/**
+ * Captures a metric event and sends it to Sentry.
+ *
+ * @param metric - The metric event to capture.
+ * @param options - Options for capturing the metric.
+ *
+ * @experimental This method will experience breaking changes. This is not yet part of
+ * the stable Sentry SDK API and can be changed or removed without warning.
+ */
+export function _INTERNAL_captureMetric(beforeMetric: Metric, options?: InternalCaptureMetricOptions): void {
+  const currentScope = options?.scope ?? getCurrentScope();
+  const captureSerializedMetric = options?.captureSerializedMetric ?? _INTERNAL_captureSerializedMetric;
+  const client = currentScope?.getClient() ?? getClient();
+  if (!client) {
+    DEBUG_BUILD && debug.warn('No client available to capture metric.');
+    return;
+  }
+
+  const { _experiments, enableMetrics, beforeSendMetric } = client.getOptions();
+
+  // todo(v11): Remove the experimental flag
+  // eslint-disable-next-line deprecation/deprecation
+  const metricsEnabled = enableMetrics ?? _experiments?.enableMetrics ?? true;
+
+  if (!metricsEnabled) {
+    DEBUG_BUILD && debug.warn('metrics option not enabled, metric will not be captured.');
+    return;
+  }
+
+  // Enrich metric with contextual attributes
+  const enrichedMetric = _enrichMetricAttributes(beforeMetric, client, currentScope);
+
+  // todo(v11): Remove the experimental `beforeSendMetric`
+  // eslint-disable-next-line deprecation/deprecation
+  const beforeSendCallback = beforeSendMetric || _experiments?.beforeSendMetric;
+  const processedMetric = beforeSendCallback ? beforeSendCallback(enrichedMetric) : enrichedMetric;
+
+  if (!processedMetric) {
+    DEBUG_BUILD && debug.log('`beforeSendMetric` returned `null`, will not send metric.');
+    return;
+  }
+
+  const serializedMetric = _buildSerializedMetric(processedMetric, client, currentScope);
 
   DEBUG_BUILD && debug.log('[Metric]', serializedMetric);
 
   captureSerializedMetric(client, serializedMetric);
 
-  client.emit('afterCaptureMetric', metric);
+  client.emit('afterCaptureMetric', enrichedMetric);
 }
 
 /**
diff --git a/packages/core/src/types-hoist/options.ts b/packages/core/src/types-hoist/options.ts
index 2d4c0e6b43a4..ccdc3b180e15 100644
--- a/packages/core/src/types-hoist/options.ts
+++ b/packages/core/src/types-hoist/options.ts
@@ -287,6 +287,7 @@ export interface ClientOptions<TO extends BaseTransportOptions = BaseTransportOp
      *
      * @default false
      * @experimental
+     * @deprecated Use the top level`enableMetrics` option instead.
      */
     enableMetrics?: boolean;
 
@@ -302,6 +303,7 @@ export interface ClientOptions<TO extends BaseTransportOptions = BaseTransportOp
      *
      * @param metric The metric generated by the SDK.
      * @returns A new metric that will be sent | null.
+     * @deprecated Use the top level`beforeSendMetric` option instead.
      */
     beforeSendMetric?: (metric: Metric) => Metric | null;
   };
@@ -401,6 +403,27 @@ export interface ClientOptions<TO extends BaseTransportOptions = BaseTransportOp
    */
   beforeSendLog?: (log: Log) => Log | null;
 
+  /**
+   * If metrics support should be enabled.
+   *
+   * @default true
+   */
+  enableMetrics?: boolean;
+
+  /**
+   * An event-processing callback for metrics, guaranteed to be invoked after all other metric
+   * processors. This allows a metric to be modified or dropped before it's sent.
+   *
+   * Note that you must return a valid metric from this callback. If you do not wish to modify the metric, simply return
+   * it at the end. Returning `null` will cause the metric to be dropped.
+   *
+   * @default undefined
+   *
+   * @param metric The metric generated by the SDK.
+   * @returns A new metric that will be sent.
+   */
+  beforeSendMetric?: (metric: Metric) => Metric;
+
   /**
    * Function to compute tracing sample rate dynamically and filter unwanted traces.
    *
diff --git a/packages/core/test/lib/client.test.ts b/packages/core/test/lib/client.test.ts
index d50d6da911b8..db25793ccf7b 100644
--- a/packages/core/test/lib/client.test.ts
+++ b/packages/core/test/lib/client.test.ts
@@ -2753,7 +2753,6 @@ describe('Client', () => {
     it('flushes metrics when weight exceeds 800KB', () => {
       const options = getDefaultTestClientOptions({
         dsn: PUBLIC_DSN,
-        _experiments: { enableMetrics: true },
       });
       const client = new TestClient(options);
       const scope = new Scope();
@@ -2774,7 +2773,6 @@ describe('Client', () => {
     it('accumulates metric weight without flushing when under threshold', () => {
       const options = getDefaultTestClientOptions({
         dsn: PUBLIC_DSN,
-        _experiments: { enableMetrics: true },
       });
       const client = new TestClient(options);
       const scope = new Scope();
@@ -2791,7 +2789,6 @@ describe('Client', () => {
     it('flushes metrics on flush event', () => {
       const options = getDefaultTestClientOptions({
         dsn: PUBLIC_DSN,
-        _experiments: { enableMetrics: true },
       });
       const client = new TestClient(options);
       const scope = new Scope();
diff --git a/packages/core/test/lib/metrics/internal.test.ts b/packages/core/test/lib/metrics/internal.test.ts
index c0279c9a270b..d9d123b63e99 100644
--- a/packages/core/test/lib/metrics/internal.test.ts
+++ b/packages/core/test/lib/metrics/internal.test.ts
@@ -82,7 +82,7 @@ describe('metricAttributeToSerializedMetricAttribute', () => {
 
 describe('_INTERNAL_captureMetric', () => {
   it('captures and sends metrics', () => {
-    const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN, _experiments: { enableMetrics: true } });
+    const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
     const client = new TestClient(options);
     const scope = new Scope();
     scope.setClient(client);
@@ -103,7 +103,7 @@ describe('_INTERNAL_captureMetric', () => {
 
   it('does not capture metrics when enableMetrics is not enabled', () => {
     const logWarnSpy = vi.spyOn(loggerModule.debug, 'warn').mockImplementation(() => undefined);
-    const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
+    const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN, enableMetrics: false });
     const client = new TestClient(options);
     const scope = new Scope();
     scope.setClient(client);
@@ -117,7 +117,7 @@ describe('_INTERNAL_captureMetric', () => {
   });
 
   it('includes trace context when available', () => {
-    const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN, _experiments: { enableMetrics: true } });
+    const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
     const client = new TestClient(options);
     const scope = new Scope();
     scope.setClient(client);
@@ -138,7 +138,6 @@ describe('_INTERNAL_captureMetric', () => {
   it('includes release and environment in metric attributes when available', () => {
     const options = getDefaultTestClientOptions({
       dsn: PUBLIC_DSN,
-      _experiments: { enableMetrics: true },
       release: '1.0.0',
       environment: 'test',
     });
@@ -164,7 +163,6 @@ describe('_INTERNAL_captureMetric', () => {
   it('includes SDK metadata in metric attributes when available', () => {
     const options = getDefaultTestClientOptions({
       dsn: PUBLIC_DSN,
-      _experiments: { enableMetrics: true },
     });
     const client = new TestClient(options);
     const scope = new Scope();
@@ -195,7 +193,6 @@ describe('_INTERNAL_captureMetric', () => {
   it('does not include SDK metadata in metric attributes when not available', () => {
     const options = getDefaultTestClientOptions({
       dsn: PUBLIC_DSN,
-      _experiments: { enableMetrics: true },
     });
     const client = new TestClient(options);
     const scope = new Scope();
@@ -215,7 +212,7 @@ describe('_INTERNAL_captureMetric', () => {
   });
 
   it('includes custom attributes in metric', () => {
-    const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN, _experiments: { enableMetrics: true } });
+    const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
     const client = new TestClient(options);
     const scope = new Scope();
     scope.setClient(client);
@@ -244,7 +241,7 @@ describe('_INTERNAL_captureMetric', () => {
   });
 
   it('flushes metrics buffer when it reaches max size', () => {
-    const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN, _experiments: { enableMetrics: true } });
+    const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
     const client = new TestClient(options);
     const scope = new Scope();
     scope.setClient(client);
@@ -263,7 +260,7 @@ describe('_INTERNAL_captureMetric', () => {
   });
 
   it('does not flush metrics buffer when it is empty', () => {
-    const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN, _experiments: { enableMetrics: true } });
+    const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
     const client = new TestClient(options);
 
     const mockSendEnvelope = vi.spyOn(client as any, 'sendEnvelope').mockImplementation(() => {});
@@ -280,7 +277,7 @@ describe('_INTERNAL_captureMetric', () => {
 
     const options = getDefaultTestClientOptions({
       dsn: PUBLIC_DSN,
-      _experiments: { enableMetrics: true, beforeSendMetric },
+      beforeSendMetric,
     });
     const client = new TestClient(options);
     const scope = new Scope();
@@ -328,7 +325,7 @@ describe('_INTERNAL_captureMetric', () => {
 
     const options = getDefaultTestClientOptions({
       dsn: PUBLIC_DSN,
-      _experiments: { enableMetrics: true, beforeSendMetric },
+      beforeSendMetric,
     });
     const client = new TestClient(options);
     const scope = new Scope();
@@ -352,7 +349,7 @@ describe('_INTERNAL_captureMetric', () => {
 
   it('emits afterCaptureMetric event', () => {
     const afterCaptureMetricSpy = vi.spyOn(TestClient.prototype, 'emit');
-    const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN, _experiments: { enableMetrics: true } });
+    const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
     const client = new TestClient(options);
     const scope = new Scope();
     scope.setClient(client);
@@ -372,7 +369,7 @@ describe('_INTERNAL_captureMetric', () => {
 
   describe('replay integration with onlyIfSampled', () => {
     it('includes replay ID for sampled sessions', () => {
-      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN, _experiments: { enableMetrics: true } });
+      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
       const client = new TestClient(options);
       const scope = new Scope();
       scope.setClient(client);
@@ -401,7 +398,7 @@ describe('_INTERNAL_captureMetric', () => {
     });
 
     it('excludes replay ID for unsampled sessions when onlyIfSampled=true', () => {
-      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN, _experiments: { enableMetrics: true } });
+      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
       const client = new TestClient(options);
       const scope = new Scope();
       scope.setClient(client);
@@ -424,7 +421,7 @@ describe('_INTERNAL_captureMetric', () => {
     });
 
     it('includes replay ID for buffer mode sessions', () => {
-      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN, _experiments: { enableMetrics: true } });
+      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
       const client = new TestClient(options);
       const scope = new Scope();
       scope.setClient(client);
@@ -457,7 +454,7 @@ describe('_INTERNAL_captureMetric', () => {
     });
 
     it('handles missing replay integration gracefully', () => {
-      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN, _experiments: { enableMetrics: true } });
+      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
       const client = new TestClient(options);
       const scope = new Scope();
       scope.setClient(client);
@@ -474,7 +471,7 @@ describe('_INTERNAL_captureMetric', () => {
     it('combines replay ID with other metric attributes', () => {
       const options = getDefaultTestClientOptions({
         dsn: PUBLIC_DSN,
-        _experiments: { enableMetrics: true },
+
         release: '1.0.0',
         environment: 'test',
       });
@@ -526,7 +523,7 @@ describe('_INTERNAL_captureMetric', () => {
     });
 
     it('does not set replay ID attribute when getReplayId returns null or undefined', () => {
-      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN, _experiments: { enableMetrics: true } });
+      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
       const client = new TestClient(options);
       const scope = new Scope();
       scope.setClient(client);
@@ -552,7 +549,7 @@ describe('_INTERNAL_captureMetric', () => {
     });
 
     it('sets replay_is_buffering attribute when replay is in buffer mode', () => {
-      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN, _experiments: { enableMetrics: true } });
+      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
       const client = new TestClient(options);
       const scope = new Scope();
       scope.setClient(client);
@@ -584,7 +581,7 @@ describe('_INTERNAL_captureMetric', () => {
     });
 
     it('does not set replay_is_buffering attribute when replay is in session mode', () => {
-      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN, _experiments: { enableMetrics: true } });
+      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
       const client = new TestClient(options);
       const scope = new Scope();
       scope.setClient(client);
@@ -613,7 +610,7 @@ describe('_INTERNAL_captureMetric', () => {
     });
 
     it('does not set replay_is_buffering attribute when replay is undefined mode', () => {
-      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN, _experiments: { enableMetrics: true } });
+      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
       const client = new TestClient(options);
       const scope = new Scope();
       scope.setClient(client);
@@ -642,7 +639,7 @@ describe('_INTERNAL_captureMetric', () => {
     });
 
     it('does not set replay_is_buffering attribute when no replay ID is available', () => {
-      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN, _experiments: { enableMetrics: true } });
+      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
       const client = new TestClient(options);
       const scope = new Scope();
       scope.setClient(client);
@@ -668,7 +665,7 @@ describe('_INTERNAL_captureMetric', () => {
     });
 
     it('does not set replay_is_buffering attribute when replay integration is missing', () => {
-      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN, _experiments: { enableMetrics: true } });
+      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
       const client = new TestClient(options);
       const scope = new Scope();
       scope.setClient(client);
@@ -687,7 +684,7 @@ describe('_INTERNAL_captureMetric', () => {
     it('combines replay_is_buffering with other replay attributes', () => {
       const options = getDefaultTestClientOptions({
         dsn: PUBLIC_DSN,
-        _experiments: { enableMetrics: true },
+
         release: '1.0.0',
         environment: 'test',
       });
@@ -747,7 +744,6 @@ describe('_INTERNAL_captureMetric', () => {
     it('includes user data in metric attributes', () => {
       const options = getDefaultTestClientOptions({
         dsn: PUBLIC_DSN,
-        _experiments: { enableMetrics: true },
       });
       const client = new TestClient(options);
       const scope = new Scope();
@@ -780,7 +776,6 @@ describe('_INTERNAL_captureMetric', () => {
     it('includes partial user data when only some fields are available', () => {
       const options = getDefaultTestClientOptions({
         dsn: PUBLIC_DSN,
-        _experiments: { enableMetrics: true },
       });
       const client = new TestClient(options);
       const scope = new Scope();
@@ -804,7 +799,6 @@ describe('_INTERNAL_captureMetric', () => {
     it('includes user email and username without id', () => {
       const options = getDefaultTestClientOptions({
         dsn: PUBLIC_DSN,
-        _experiments: { enableMetrics: true },
       });
       const client = new TestClient(options);
       const scope = new Scope();
@@ -833,7 +827,6 @@ describe('_INTERNAL_captureMetric', () => {
     it('does not include user data when user object is empty', () => {
       const options = getDefaultTestClientOptions({
         dsn: PUBLIC_DSN,
-        _experiments: { enableMetrics: true },
       });
       const client = new TestClient(options);
       const scope = new Scope();
@@ -849,7 +842,7 @@ describe('_INTERNAL_captureMetric', () => {
     it('combines user data with other metric attributes', () => {
       const options = getDefaultTestClientOptions({
         dsn: PUBLIC_DSN,
-        _experiments: { enableMetrics: true },
+
         release: '1.0.0',
         environment: 'test',
       });
@@ -903,7 +896,6 @@ describe('_INTERNAL_captureMetric', () => {
     it('handles user data with non-string values', () => {
       const options = getDefaultTestClientOptions({
         dsn: PUBLIC_DSN,
-        _experiments: { enableMetrics: true },
       });
       const client = new TestClient(options);
       const scope = new Scope();
@@ -932,7 +924,6 @@ describe('_INTERNAL_captureMetric', () => {
     it('preserves existing user attributes in metric and does not override them', () => {
       const options = getDefaultTestClientOptions({
         dsn: PUBLIC_DSN,
-        _experiments: { enableMetrics: true },
       });
       const client = new TestClient(options);
       const scope = new Scope();
@@ -975,7 +966,6 @@ describe('_INTERNAL_captureMetric', () => {
     it('only adds scope user data for attributes that do not already exist', () => {
       const options = getDefaultTestClientOptions({
         dsn: PUBLIC_DSN,
-        _experiments: { enableMetrics: true },
       });
       const client = new TestClient(options);
       const scope = new Scope();
@@ -1024,7 +1014,7 @@ describe('_INTERNAL_captureMetric', () => {
   it('overrides user-provided system attributes with SDK values', () => {
     const options = getDefaultTestClientOptions({
       dsn: PUBLIC_DSN,
-      _experiments: { enableMetrics: true },
+
       release: 'sdk-release-1.0.0',
       environment: 'sdk-environment',
     });
diff --git a/packages/core/test/lib/metrics/public-api.test.ts b/packages/core/test/lib/metrics/public-api.test.ts
index 42fe7c41ae4a..df8ff49c5553 100644
--- a/packages/core/test/lib/metrics/public-api.test.ts
+++ b/packages/core/test/lib/metrics/public-api.test.ts
@@ -9,7 +9,7 @@ const PUBLIC_DSN = 'https://username@domain/123';
 describe('Metrics Public API', () => {
   describe('count', () => {
     it('captures a counter metric with default value of 1', () => {
-      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN, _experiments: { enableMetrics: true } });
+      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
       const client = new TestClient(options);
       const scope = new Scope();
       scope.setClient(client);
@@ -28,7 +28,7 @@ describe('Metrics Public API', () => {
     });
 
     it('captures a counter metric with custom value', () => {
-      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN, _experiments: { enableMetrics: true } });
+      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
       const client = new TestClient(options);
       const scope = new Scope();
       scope.setClient(client);
@@ -47,7 +47,7 @@ describe('Metrics Public API', () => {
     });
 
     it('captures a counter metric with attributes', () => {
-      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN, _experiments: { enableMetrics: true } });
+      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
       const client = new TestClient(options);
       const scope = new Scope();
       scope.setClient(client);
@@ -87,7 +87,7 @@ describe('Metrics Public API', () => {
     });
 
     it('captures a counter metric with unit', () => {
-      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN, _experiments: { enableMetrics: true } });
+      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
       const client = new TestClient(options);
       const scope = new Scope();
       scope.setClient(client);
@@ -110,7 +110,7 @@ describe('Metrics Public API', () => {
     });
 
     it('does not capture counter when enableMetrics is not enabled', () => {
-      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
+      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN, enableMetrics: false });
       const client = new TestClient(options);
       const scope = new Scope();
       scope.setClient(client);
@@ -123,7 +123,7 @@ describe('Metrics Public API', () => {
 
   describe('gauge', () => {
     it('captures a gauge metric', () => {
-      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN, _experiments: { enableMetrics: true } });
+      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
       const client = new TestClient(options);
       const scope = new Scope();
       scope.setClient(client);
@@ -142,7 +142,7 @@ describe('Metrics Public API', () => {
     });
 
     it('captures a gauge metric with unit', () => {
-      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN, _experiments: { enableMetrics: true } });
+      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
       const client = new TestClient(options);
       const scope = new Scope();
       scope.setClient(client);
@@ -165,7 +165,7 @@ describe('Metrics Public API', () => {
     });
 
     it('captures a gauge metric with attributes', () => {
-      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN, _experiments: { enableMetrics: true } });
+      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
       const client = new TestClient(options);
       const scope = new Scope();
       scope.setClient(client);
@@ -200,7 +200,7 @@ describe('Metrics Public API', () => {
     });
 
     it('does not capture gauge when enableMetrics is not enabled', () => {
-      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
+      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN, enableMetrics: false });
       const client = new TestClient(options);
       const scope = new Scope();
       scope.setClient(client);
@@ -213,7 +213,7 @@ describe('Metrics Public API', () => {
 
   describe('distribution', () => {
     it('captures a distribution metric', () => {
-      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN, _experiments: { enableMetrics: true } });
+      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
       const client = new TestClient(options);
       const scope = new Scope();
       scope.setClient(client);
@@ -232,7 +232,7 @@ describe('Metrics Public API', () => {
     });
 
     it('captures a distribution metric with unit', () => {
-      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN, _experiments: { enableMetrics: true } });
+      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
       const client = new TestClient(options);
       const scope = new Scope();
       scope.setClient(client);
@@ -255,7 +255,7 @@ describe('Metrics Public API', () => {
     });
 
     it('captures a distribution metric with attributes', () => {
-      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN, _experiments: { enableMetrics: true } });
+      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
       const client = new TestClient(options);
       const scope = new Scope();
       scope.setClient(client);
@@ -290,7 +290,7 @@ describe('Metrics Public API', () => {
     });
 
     it('does not capture distribution when enableMetrics is not enabled', () => {
-      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
+      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN, enableMetrics: false });
       const client = new TestClient(options);
       const scope = new Scope();
       scope.setClient(client);
@@ -303,7 +303,7 @@ describe('Metrics Public API', () => {
 
   describe('mixed metric types', () => {
     it('captures multiple different metric types', () => {
-      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN, _experiments: { enableMetrics: true } });
+      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
       const client = new TestClient(options);
       const scope = new Scope();
       scope.setClient(client);

From 296e8609189950529f3e952b616e3b64b9a7eb75 Mon Sep 17 00:00:00 2001
From: Michi Hoffmann <cleptric@users.noreply.github.com>
Date: Fri, 7 Nov 2025 07:46:00 +0100
Subject: [PATCH 031/186] chore: X handle update (#18117)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5f76eb4f7a11..3fdd9ddfc452 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ convenient interface and improved consistency between various JavaScript environ
 - [![Forum](https://img.shields.io/badge/forum-sentry-green.svg)](https://forum.sentry.io/c/sdks)
 - [![Discord](https://img.shields.io/discord/621778831602221064)](https://discord.gg/Ww9hbqr)
 - [![Stack Overflow](https://img.shields.io/badge/stack%20overflow-sentry-green.svg)](http://stackoverflow.com/questions/tagged/sentry)
-- [![Twitter Follow](https://img.shields.io/twitter/follow/getsentry?label=getsentry&style=social)](https://twitter.com/intent/follow?screen_name=getsentry)
+- [![X Follow](https://img.shields.io/twitter/follow/sentry?label=sentry&style=social)](https://x.com/intent/follow?screen_name=sentry)
 
 ## Contents
 

From 27af12e80644954cc001d7df62aa7633d28538ac Mon Sep 17 00:00:00 2001
From: Charly Gomez <charly.gomez@sentry.io>
Date: Fri, 7 Nov 2025 10:14:31 +0100
Subject: [PATCH 032/186] fix(nextjs): Stop accessing sync props in template
 (#18113)

We need to stop accessing params within our wrapper templates as this
can break statically rendered pages and cause cache busts in dynamic
pages.

Opened https://github.com/getsentry/sentry-javascript/issues/18115 to
investigate other ways of handling the functionality we're removing
here.

closes https://github.com/getsentry/sentry-javascript/issues/18097
closes https://github.com/getsentry/sentry-javascript/issues/17431

Note: There's some unused code in the utils that I did not delete as we
might be able to reuse this in
https://github.com/getsentry/sentry-javascript/issues/18115
---
 .../tests/server-components.test.ts           |  1 -
 .../wrapGenerationFunctionWithSentry.ts       | 26 -------------------
 .../common/wrapServerComponentWithSentry.ts   | 20 --------------
 3 files changed, 47 deletions(-)

diff --git a/dev-packages/e2e-tests/test-applications/nextjs-app-dir/tests/server-components.test.ts b/dev-packages/e2e-tests/test-applications/nextjs-app-dir/tests/server-components.test.ts
index 52f6ae13875a..25d84cdc28e1 100644
--- a/dev-packages/e2e-tests/test-applications/nextjs-app-dir/tests/server-components.test.ts
+++ b/dev-packages/e2e-tests/test-applications/nextjs-app-dir/tests/server-components.test.ts
@@ -39,7 +39,6 @@ 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
diff --git a/packages/nextjs/src/common/wrapGenerationFunctionWithSentry.ts b/packages/nextjs/src/common/wrapGenerationFunctionWithSentry.ts
index c22910df43bf..85969ef1064d 100644
--- a/packages/nextjs/src/common/wrapGenerationFunctionWithSentry.ts
+++ b/packages/nextjs/src/common/wrapGenerationFunctionWithSentry.ts
@@ -3,7 +3,6 @@ import {
   captureException,
   getActiveSpan,
   getCapturedScopesOnSpan,
-  getClient,
   getRootSpan,
   handleCallbackErrors,
   propagationContextFromHeaders,
@@ -13,7 +12,6 @@ import {
   setCapturedScopesOnSpan,
   SPAN_STATUS_ERROR,
   SPAN_STATUS_OK,
-  spanToJSON,
   startSpanManual,
   winterCGHeadersToDict,
   withIsolationScope,
@@ -23,8 +21,6 @@ import type { GenerationFunctionContext } from '../common/types';
 import { isNotFoundNavigationError, isRedirectNavigationError } from './nextNavigationErrorUtils';
 import { TRANSACTION_ATTR_SENTRY_TRACE_BACKFILL } from './span-attributes-with-logic-attached';
 import { commonObjectToIsolationScope, commonObjectToPropagationContext } from './utils/tracingUtils';
-import { getSanitizedRequestUrl } from './utils/urls';
-import { maybeExtractSynchronousParamsAndSearchParams } from './utils/wrapperUtils';
 /**
  * Wraps a generation function (e.g. generateMetadata) with Sentry error and performance instrumentation.
  */
@@ -46,30 +42,16 @@ export function wrapGenerationFunctionWithSentry<F extends (...args: any[]) => a
       }
 
       const isolationScope = commonObjectToIsolationScope(headers);
-      let pathname = undefined as string | undefined;
 
       const activeSpan = getActiveSpan();
       if (activeSpan) {
         const rootSpan = getRootSpan(activeSpan);
         const { scope } = getCapturedScopesOnSpan(rootSpan);
         setCapturedScopesOnSpan(rootSpan, scope ?? new Scope(), isolationScope);
-
-        const spanData = spanToJSON(rootSpan);
-
-        if (spanData.data && 'http.target' in spanData.data) {
-          pathname = spanData.data['http.target'] as string;
-        }
       }
 
       const headersDict = headers ? winterCGHeadersToDict(headers) : undefined;
 
-      let data: Record<string, unknown> | undefined = undefined;
-      if (getClient()?.getOptions().sendDefaultPii) {
-        const props: unknown = args[0];
-        const { params, searchParams } = maybeExtractSynchronousParamsAndSearchParams(props);
-        data = { params, searchParams };
-      }
-
       return withIsolationScope(isolationScope, () => {
         return withScope(scope => {
           scope.setTransactionName(`${componentType}.${generationFunctionIdentifier} (${componentRoute})`);
@@ -77,12 +59,6 @@ export function wrapGenerationFunctionWithSentry<F extends (...args: any[]) => a
           isolationScope.setSDKProcessingMetadata({
             normalizedRequest: {
               headers: headersDict,
-              url: getSanitizedRequestUrl(
-                componentRoute,
-                data?.params as Record<string, string> | undefined,
-                headersDict,
-                pathname,
-              ),
             } satisfies RequestEventData,
           });
 
@@ -106,8 +82,6 @@ export function wrapGenerationFunctionWithSentry<F extends (...args: any[]) => a
 
           scope.setPropagationContext(propagationContext);
 
-          scope.setExtra('route_data', data);
-
           return startSpanManual(
             {
               op: 'function.nextjs',
diff --git a/packages/nextjs/src/common/wrapServerComponentWithSentry.ts b/packages/nextjs/src/common/wrapServerComponentWithSentry.ts
index 1f522dbf212f..63871413f006 100644
--- a/packages/nextjs/src/common/wrapServerComponentWithSentry.ts
+++ b/packages/nextjs/src/common/wrapServerComponentWithSentry.ts
@@ -3,7 +3,6 @@ import {
   captureException,
   getActiveSpan,
   getCapturedScopesOnSpan,
-  getClient,
   getRootSpan,
   handleCallbackErrors,
   propagationContextFromHeaders,
@@ -13,7 +12,6 @@ import {
   setCapturedScopesOnSpan,
   SPAN_STATUS_ERROR,
   SPAN_STATUS_OK,
-  spanToJSON,
   startSpanManual,
   vercelWaitUntil,
   winterCGHeadersToDict,
@@ -25,8 +23,6 @@ import type { ServerComponentContext } from '../common/types';
 import { flushSafelyWithTimeout } from '../common/utils/responseEnd';
 import { TRANSACTION_ATTR_SENTRY_TRACE_BACKFILL } from './span-attributes-with-logic-attached';
 import { commonObjectToIsolationScope, commonObjectToPropagationContext } from './utils/tracingUtils';
-import { getSanitizedRequestUrl } from './utils/urls';
-import { maybeExtractSynchronousParamsAndSearchParams } from './utils/wrapperUtils';
 
 /**
  * Wraps an `app` directory server component with Sentry error instrumentation.
@@ -45,34 +41,18 @@ export function wrapServerComponentWithSentry<F extends (...args: any[]) => any>
       const requestTraceId = getActiveSpan()?.spanContext().traceId;
       const isolationScope = commonObjectToIsolationScope(context.headers);
 
-      let pathname = undefined as string | undefined;
       const activeSpan = getActiveSpan();
       if (activeSpan) {
         const rootSpan = getRootSpan(activeSpan);
         const { scope } = getCapturedScopesOnSpan(rootSpan);
         setCapturedScopesOnSpan(rootSpan, scope ?? new Scope(), isolationScope);
-
-        const spanData = spanToJSON(rootSpan);
-
-        if (spanData.data && 'http.target' in spanData.data) {
-          pathname = spanData.data['http.target']?.toString();
-        }
       }
 
       const headersDict = context.headers ? winterCGHeadersToDict(context.headers) : undefined;
 
-      let params: Record<string, string> | undefined = undefined;
-
-      if (getClient()?.getOptions().sendDefaultPii) {
-        const props: unknown = args[0];
-        const { params: paramsFromProps } = maybeExtractSynchronousParamsAndSearchParams(props);
-        params = paramsFromProps;
-      }
-
       isolationScope.setSDKProcessingMetadata({
         normalizedRequest: {
           headers: headersDict,
-          url: getSanitizedRequestUrl(componentRoute, params, headersDict, pathname),
         } satisfies RequestEventData,
       });
 

From d4a2b2bc93f5d2be3d1b960f89b61e2e08e58ca4 Mon Sep 17 00:00:00 2001
From: Abdelrahman Awad <me@awad.dev>
Date: Fri, 7 Nov 2025 12:18:09 +0200
Subject: [PATCH 033/186] test(next): fix flakey tests (#18100)

I can't reproduce the flakiness locally, I logged a few things on CI
runs and it seems while the fetch spans does get created, it doesn't get
created on the middletrasnaction.

This is similar to what the note is saying in dev-mode, for it to be
less flakey I'm asserting if it either has the span on the right
transaction or if it got created in a separate transaction. Ideally we
want it to be created within the middleware transaction but it seems
like there is a timing issue preventing it from being picked up there.

At any case this seems to reduce or eliminate the chances of failed
runs, previously it would fail consistently but with this it didn't fail
in 5 runs so far.
---
 .../nextjs-16/tests/middleware.test.ts        | 93 ++++++++++++-------
 1 file changed, 57 insertions(+), 36 deletions(-)

diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16/tests/middleware.test.ts b/dev-packages/e2e-tests/test-applications/nextjs-16/tests/middleware.test.ts
index aa4611fb7afc..0bb957bbc466 100644
--- a/dev-packages/e2e-tests/test-applications/nextjs-16/tests/middleware.test.ts
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16/tests/middleware.test.ts
@@ -62,9 +62,15 @@ test('Faulty middlewares', async ({ request }) => {
 test('Should trace outgoing fetch requests inside middleware and create breadcrumbs for it', async ({ request }) => {
   test.skip(isDevMode, 'The fetch requests ends up in a separate tx in dev atm');
   const middlewareTransactionPromise = waitForTransaction('nextjs-16', async transactionEvent => {
+    return transactionEvent?.transaction === 'middleware GET';
+  });
+
+  // In some builds (especially webpack), fetch spans may end up in a separate transaction instead of as child spans
+  // This test validates that the fetch is traced either way
+  const fetchTransactionPromise = waitForTransaction('nextjs-16', async transactionEvent => {
     return (
-      transactionEvent?.transaction === 'middleware GET' &&
-      !!transactionEvent.spans?.find(span => span.op === 'http.client')
+      transactionEvent?.transaction === 'GET http://localhost:3030/' ||
+      transactionEvent?.contexts?.trace?.description === 'GET http://localhost:3030/'
     );
   });
 
@@ -74,40 +80,7 @@ test('Should trace outgoing fetch requests inside middleware and create breadcru
 
   const middlewareTransaction = await middlewareTransactionPromise;
 
-  expect(middlewareTransaction.spans).toEqual(
-    expect.arrayContaining([
-      {
-        data: {
-          'http.request.method': 'GET',
-          'http.request.method_original': 'GET',
-          'http.response.status_code': 200,
-          'network.peer.address': '::1',
-          'network.peer.port': 3030,
-          'otel.kind': 'CLIENT',
-          'sentry.op': 'http.client',
-          'sentry.origin': 'auto.http.otel.node_fetch',
-          'server.address': 'localhost',
-          'server.port': 3030,
-          url: 'http://localhost:3030/',
-          'url.full': 'http://localhost:3030/',
-          'url.path': '/',
-          'url.query': '',
-          'url.scheme': 'http',
-          'user_agent.original': 'node',
-        },
-        description: 'GET http://localhost:3030/',
-        op: 'http.client',
-        origin: 'auto.http.otel.node_fetch',
-        parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
-        span_id: expect.stringMatching(/[a-f0-9]{16}/),
-        start_timestamp: expect.any(Number),
-        status: 'ok',
-        timestamp: expect.any(Number),
-        trace_id: expect.stringMatching(/[a-f0-9]{32}/),
-      },
-    ]),
-  );
-
+  // Breadcrumbs should always be created for the fetch request
   expect(middlewareTransaction.breadcrumbs).toEqual(
     expect.arrayContaining([
       {
@@ -118,4 +91,52 @@ test('Should trace outgoing fetch requests inside middleware and create breadcru
       },
     ]),
   );
+
+  // Check if http.client span exists as a child of the middleware transaction
+  const hasHttpClientSpan = !!middlewareTransaction.spans?.find(span => span.op === 'http.client');
+
+  if (hasHttpClientSpan) {
+    // Check if fetch is traced as a child span of the middleware transaction
+    expect(middlewareTransaction.spans).toEqual(
+      expect.arrayContaining([
+        {
+          data: {
+            'http.request.method': 'GET',
+            'http.request.method_original': 'GET',
+            'http.response.status_code': 200,
+            'network.peer.address': '::1',
+            'network.peer.port': 3030,
+            'otel.kind': 'CLIENT',
+            'sentry.op': 'http.client',
+            'sentry.origin': 'auto.http.otel.node_fetch',
+            'server.address': 'localhost',
+            'server.port': 3030,
+            url: 'http://localhost:3030/',
+            'url.full': 'http://localhost:3030/',
+            'url.path': '/',
+            'url.query': '',
+            'url.scheme': 'http',
+            'user_agent.original': 'node',
+          },
+          description: 'GET http://localhost:3030/',
+          op: 'http.client',
+          origin: 'auto.http.otel.node_fetch',
+          parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
+          span_id: expect.stringMatching(/[a-f0-9]{16}/),
+          start_timestamp: expect.any(Number),
+          status: 'ok',
+          timestamp: expect.any(Number),
+          trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+        },
+      ]),
+    );
+  } else {
+    // Alternatively, fetch is traced as a separate transaction, similar to Dev builds
+    const fetchTransaction = await fetchTransactionPromise;
+
+    expect(fetchTransaction.contexts?.trace?.op).toBe('http.client');
+    expect(fetchTransaction.contexts?.trace?.status).toBe('ok');
+    expect(fetchTransaction.contexts?.trace?.data?.['http.request.method']).toBe('GET');
+    expect(fetchTransaction.contexts?.trace?.data?.['url.full']).toBe('http://localhost:3030/');
+  }
 });

From d26e1a93a1d72bf15dec5dbc9c5b73aea0cd452a Mon Sep 17 00:00:00 2001
From: Andrei <168741329+andreiborza@users.noreply.github.com>
Date: Mon, 10 Nov 2025 10:05:16 +0100
Subject: [PATCH 034/186] feat(aws): Add `SENTRY_LAYER_EXTENSION` to configure
 using the lambda layer extension via env variables (#18101)

Our recommended approach for the aws sdk is to use our Lambda layer.
When the Lambda layer is used, it would previously automatically set up
the layer extension. This can be disabled by setting `useLayerExtension:
false` during init, but when using the layer with our auto-wrapping as
per recommendation, it wasn't possible to opt out of using the
extension.

This PR adds `SENTRY_LAYER_EXTENSION` that can be used to opt out of the
extension.

---------

Co-authored-by: Lukas Stracke <lukas.stracke@sentry.io>
---
 packages/aws-serverless/package.json      |  1 +
 packages/aws-serverless/src/init.ts       | 40 +++++++---
 packages/aws-serverless/test/init.test.ts | 96 +++++++++++++++++++++++
 3 files changed, 124 insertions(+), 13 deletions(-)

diff --git a/packages/aws-serverless/package.json b/packages/aws-serverless/package.json
index b4763f675a35..ae86d94f73e1 100644
--- a/packages/aws-serverless/package.json
+++ b/packages/aws-serverless/package.json
@@ -71,6 +71,7 @@
     "@opentelemetry/semantic-conventions": "^1.37.0",
     "@sentry/core": "10.23.0",
     "@sentry/node": "10.23.0",
+    "@sentry/node-core": "10.23.0",
     "@types/aws-lambda": "^8.10.62"
   },
   "devDependencies": {
diff --git a/packages/aws-serverless/src/init.ts b/packages/aws-serverless/src/init.ts
index e19cc41baf46..25180a41f6e6 100644
--- a/packages/aws-serverless/src/init.ts
+++ b/packages/aws-serverless/src/init.ts
@@ -2,6 +2,7 @@ import type { Integration, Options } from '@sentry/core';
 import { applySdkMetadata, debug, getSDKSource } from '@sentry/core';
 import type { NodeClient, NodeOptions } from '@sentry/node';
 import { getDefaultIntegrationsWithoutPerformance, initWithoutDefaultIntegrations } from '@sentry/node';
+import { envToBool } from '@sentry/node-core';
 import { DEBUG_BUILD } from './debug-build';
 import { awsIntegration } from './integration/aws';
 import { awsLambdaIntegration } from './integration/awslambda';
@@ -54,7 +55,10 @@ export function getDefaultIntegrations(_options: Options): Integration[] {
 
 export interface AwsServerlessOptions extends NodeOptions {
   /**
-   * If Sentry events should be proxied through the Lambda extension when using the Lambda layer. Defaults to `true` when using the Lambda layer.
+   * If Sentry events should be proxied through the Lambda extension when using the Lambda layer.
+   * Defaults to `true` when using the Lambda layer.
+   *
+   * Can also be configured via the `SENTRY_LAYER_EXTENSION` environment variable.
    */
   useLayerExtension?: boolean;
 }
@@ -68,31 +72,41 @@ export function init(options: AwsServerlessOptions = {}): NodeClient | undefined
   const sdkSource = getSDKSource();
   const proxyWouldInterfere = shouldDisableLayerExtensionForProxy();
 
+  // Determine useLayerExtension value with the following priority:
+  // 1. Explicit option value (if provided)
+  // 2. Environment variable SENTRY_LAYER_EXTENSION (if set)
+  // 3. Default logic based on sdkSource, tunnel, and proxy settings
+  const useLayerExtensionFromEnv = envToBool(process.env.SENTRY_LAYER_EXTENSION, { strict: true });
+  const defaultUseLayerExtension = sdkSource === 'aws-lambda-layer' && !options.tunnel && !proxyWouldInterfere;
+  const useLayerExtension = options.useLayerExtension ?? useLayerExtensionFromEnv ?? defaultUseLayerExtension;
+
   const opts = {
     defaultIntegrations: getDefaultIntegrations(options),
-    useLayerExtension: sdkSource === 'aws-lambda-layer' && !options.tunnel && !proxyWouldInterfere,
+    useLayerExtension,
     ...options,
   };
 
   if (opts.useLayerExtension) {
-    if (sdkSource === 'aws-lambda-layer') {
-      if (!opts.tunnel) {
-        DEBUG_BUILD && debug.log('Proxying Sentry events through the Sentry Lambda extension');
-        opts.tunnel = 'http://localhost:9000/envelope';
-      } else {
+    if (sdkSource !== 'aws-lambda-layer') {
+      DEBUG_BUILD && debug.warn('The Sentry Lambda extension is only supported when using the AWS Lambda layer.');
+    } else if (opts.tunnel || proxyWouldInterfere) {
+      if (opts.tunnel) {
         DEBUG_BUILD &&
           debug.warn(
             `Using a custom tunnel with the Sentry Lambda extension is not supported. Events will be tunnelled to ${opts.tunnel} and not through the extension.`,
           );
       }
+
+      if (proxyWouldInterfere) {
+        DEBUG_BUILD &&
+          debug.warn(
+            'Sentry Lambda extension is disabled due to proxy environment variables (http_proxy/https_proxy). Consider adding localhost to no_proxy to re-enable.',
+          );
+      }
     } else {
-      DEBUG_BUILD && debug.warn('The Sentry Lambda extension is only supported when using the AWS Lambda layer.');
+      DEBUG_BUILD && debug.log('Proxying Sentry events through the Sentry Lambda extension');
+      opts.tunnel = 'http://localhost:9000/envelope';
     }
-  } else if (sdkSource === 'aws-lambda-layer' && proxyWouldInterfere) {
-    DEBUG_BUILD &&
-      debug.warn(
-        'Sentry Lambda extension disabled due to proxy environment variables (http_proxy/https_proxy). Consider adding localhost to no_proxy to re-enable.',
-      );
   }
 
   applySdkMetadata(opts, 'aws-serverless', ['aws-serverless'], sdkSource);
diff --git a/packages/aws-serverless/test/init.test.ts b/packages/aws-serverless/test/init.test.ts
index e6a675ecc43f..500338dc7144 100644
--- a/packages/aws-serverless/test/init.test.ts
+++ b/packages/aws-serverless/test/init.test.ts
@@ -19,9 +19,13 @@ const mockInitWithoutDefaultIntegrations = vi.mocked(initWithoutDefaultIntegrati
 
 describe('init', () => {
   beforeEach(() => {
+    // Clear all mocks between tests
+    vi.clearAllMocks();
+
     // Clean up environment variables between tests
     delete process.env.http_proxy;
     delete process.env.no_proxy;
+    delete process.env.SENTRY_LAYER_EXTENSION;
   });
 
   describe('Lambda extension setup', () => {
@@ -386,4 +390,96 @@ describe('init', () => {
       );
     });
   });
+
+  describe('SENTRY_LAYER_EXTENSION environment variable', () => {
+    test('should enable useLayerExtension when SENTRY_LAYER_EXTENSION=true', () => {
+      process.env.SENTRY_LAYER_EXTENSION = 'true';
+      mockGetSDKSource.mockReturnValue('aws-lambda-layer');
+      const options: AwsServerlessOptions = {};
+
+      init(options);
+
+      expect(mockInitWithoutDefaultIntegrations).toHaveBeenCalledWith(
+        expect.objectContaining({
+          useLayerExtension: true,
+          tunnel: 'http://localhost:9000/envelope',
+        }),
+      );
+    });
+
+    test('should disable useLayerExtension when SENTRY_LAYER_EXTENSION=false', () => {
+      process.env.SENTRY_LAYER_EXTENSION = 'false';
+      mockGetSDKSource.mockReturnValue('aws-lambda-layer');
+      const options: AwsServerlessOptions = {};
+
+      init(options);
+
+      expect(mockInitWithoutDefaultIntegrations).toHaveBeenCalledWith(
+        expect.objectContaining({
+          useLayerExtension: false,
+        }),
+      );
+      expect(mockInitWithoutDefaultIntegrations).toHaveBeenCalledWith(
+        expect.not.objectContaining({
+          tunnel: expect.any(String),
+        }),
+      );
+    });
+
+    test('should fall back to default behavior when SENTRY_LAYER_EXTENSION is not set', () => {
+      mockGetSDKSource.mockReturnValue('aws-lambda-layer');
+      const options: AwsServerlessOptions = {};
+
+      init(options);
+
+      expect(mockInitWithoutDefaultIntegrations).toHaveBeenCalledWith(
+        expect.objectContaining({
+          useLayerExtension: true,
+          tunnel: 'http://localhost:9000/envelope',
+        }),
+      );
+    });
+
+    test('should prioritize explicit option over environment variable', () => {
+      process.env.SENTRY_LAYER_EXTENSION = 'true';
+      mockGetSDKSource.mockReturnValue('aws-lambda-layer');
+      const options: AwsServerlessOptions = {
+        useLayerExtension: false,
+      };
+
+      init(options);
+
+      expect(mockInitWithoutDefaultIntegrations).toHaveBeenCalledWith(
+        expect.objectContaining({
+          useLayerExtension: false,
+        }),
+      );
+      expect(mockInitWithoutDefaultIntegrations).toHaveBeenCalledWith(
+        expect.not.objectContaining({
+          tunnel: expect.any(String),
+        }),
+      );
+    });
+
+    test('should not set tunnel even tho useLayerExtension is set via env var when proxy is explicitly set', () => {
+      process.env.http_proxy = 'http://proxy.example.com:8080';
+      process.env.SENTRY_LAYER_EXTENSION = 'true';
+      mockGetSDKSource.mockReturnValue('aws-lambda-layer');
+      const options: AwsServerlessOptions = {};
+
+      init(options);
+
+      // useLayerExtension is respected but tunnel is not set due to proxy interference
+      expect(mockInitWithoutDefaultIntegrations).toHaveBeenCalledWith(
+        expect.objectContaining({
+          useLayerExtension: true,
+        }),
+      );
+      expect(mockInitWithoutDefaultIntegrations).toHaveBeenCalledWith(
+        expect.not.objectContaining({
+          tunnel: expect.any(String),
+        }),
+      );
+    });
+  });
 });

From 10211f432addf326d36fc168be59924e4ccaca43 Mon Sep 17 00:00:00 2001
From: Charly Gomez <charly.gomez@sentry.io>
Date: Mon, 10 Nov 2025 10:40:19 +0100
Subject: [PATCH 035/186] fix(nextjs): Delete css map files (#18131)

closes https://github.com/getsentry/sentry-javascript/issues/18125

We want to delete `*.map.css` files when `deleteSourcemapsAfterUpload`
is enabled.
---
 packages/nextjs/src/config/getBuildPluginOptions.ts       | 2 +-
 packages/nextjs/test/config/getBuildPluginOptions.test.ts | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/nextjs/src/config/getBuildPluginOptions.ts b/packages/nextjs/src/config/getBuildPluginOptions.ts
index 6de802917015..e36e88802fa5 100644
--- a/packages/nextjs/src/config/getBuildPluginOptions.ts
+++ b/packages/nextjs/src/config/getBuildPluginOptions.ts
@@ -40,7 +40,7 @@ const FILE_PATTERNS = {
 } as const;
 
 // Source map file extensions to delete
-const SOURCEMAP_EXTENSIONS = ['*.js.map', '*.mjs.map', '*.cjs.map'] as const;
+const SOURCEMAP_EXTENSIONS = ['*.js.map', '*.mjs.map', '*.cjs.map', '*.css.map'] as const;
 
 type BuildTool = keyof typeof LOGGER_PREFIXES;
 
diff --git a/packages/nextjs/test/config/getBuildPluginOptions.test.ts b/packages/nextjs/test/config/getBuildPluginOptions.test.ts
index 0281624584d0..609183d198bb 100644
--- a/packages/nextjs/test/config/getBuildPluginOptions.test.ts
+++ b/packages/nextjs/test/config/getBuildPluginOptions.test.ts
@@ -308,6 +308,7 @@ describe('getBuildPluginOptions', () => {
         '/path/to/.next/static/**/*.js.map',
         '/path/to/.next/static/**/*.mjs.map',
         '/path/to/.next/static/**/*.cjs.map',
+        '/path/to/.next/static/**/*.css.map',
       ]);
     });
 
@@ -331,6 +332,7 @@ describe('getBuildPluginOptions', () => {
         '/path/to/.next/static/**/*.js.map',
         '/path/to/.next/static/**/*.mjs.map',
         '/path/to/.next/static/**/*.cjs.map',
+        '/path/to/.next/static/**/*.css.map',
       ]);
     });
 
@@ -355,6 +357,7 @@ describe('getBuildPluginOptions', () => {
         '/path/to/.next/static/**/*.js.map',
         '/path/to/.next/static/**/*.mjs.map',
         '/path/to/.next/static/**/*.cjs.map',
+        '/path/to/.next/static/**/*.css.map',
       ]);
     });
 
@@ -788,6 +791,7 @@ describe('getBuildPluginOptions', () => {
         `${complexPath}/static/**/*.js.map`,
         `${complexPath}/static/**/*.mjs.map`,
         `${complexPath}/static/**/*.cjs.map`,
+        `${complexPath}/static/**/*.css.map`,
       ]);
     });
   });

From 0054094bbc1f1634a06f45618009f9f6302f8fc4 Mon Sep 17 00:00:00 2001
From: Charly Gomez <charly.gomez@sentry.io>
Date: Mon, 10 Nov 2025 11:11:55 +0100
Subject: [PATCH 036/186] meta(changelog): Update changelog for 10.24.0

---
 CHANGELOG.md | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c98188d73b5c..0f98b440d47d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,34 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 10.24.0
+
+### Important Changes
+
+- **feat(metrics): Add top level option `enableMetrics` and `beforeSendMetric` ([#18088](https://github.com/getsentry/sentry-javascript/pull/18088))**
+
+  This PR moves `enableMetrics` and `beforeSendMetric` out of the `_experiments` options.
+  The metrics feature will now be **enabled by default** (none of our integrations will auto-emit metrics as of now), but you can disable sending metrics via `enableMetrics: false`.
+  Metric options within `_experiments` got deprecated but will still work as of now, they will be removed with the next major version of our SDKs.
+
+### Other Changes
+
+- feat(aws): Add `SENTRY_LAYER_EXTENSION` to configure using the lambda layer extension via env variables ([#18101](https://github.com/getsentry/sentry-javascript/pull/18101))
+- feat(core): Include all exception object keys instead of truncating ([#18044](https://github.com/getsentry/sentry-javascript/pull/18044))
+- feat(metrics)!: Update types ([#17907](https://github.com/getsentry/sentry-javascript/pull/17907))
+- feat(replay): ignore `background-image` when `blockAllMedia` is enabled ([#18019](https://github.com/getsentry/sentry-javascript/pull/18019))
+- fix(nextjs): Delete css map files ([#18131](https://github.com/getsentry/sentry-javascript/pull/18131))
+- fix(nextjs): Stop accessing sync props in template ([#18113](https://github.com/getsentry/sentry-javascript/pull/18113))
+
+<details>
+  <summary> <strong>Internal Changes</strong> </summary>
+
+- chore: X handle update ([#18117](https://github.com/getsentry/sentry-javascript/pull/18117))
+- chore(eslint): Add eslint-plugin-regexp rule (dev-packages) ([#18063](https://github.com/getsentry/sentry-javascript/pull/18063))
+- test(next): fix flakey tests ([#18100](https://github.com/getsentry/sentry-javascript/pull/18100))
+- test(node-core): Proof that withMonitor doesn't create a new trace ([#18057](https://github.com/getsentry/sentry-javascript/pull/18057))
+</details>
+
 ## 10.23.0
 
 - feat(core): Send `user-agent` header with envelope requests in server SDKs ([#17929](https://github.com/getsentry/sentry-javascript/pull/17929))

From 907546f066691d5f63443b627cbf61d0e6fde0f6 Mon Sep 17 00:00:00 2001
From: getsentry-bot <bot@sentry.io>
Date: Mon, 10 Nov 2025 12:29:34 +0000
Subject: [PATCH 037/186] release: 10.24.0

---
 .../browser-integration-tests/package.json         |  4 ++--
 .../bundle-analyzer-scenarios/package.json         |  2 +-
 dev-packages/clear-cache-gh-action/package.json    |  2 +-
 .../cloudflare-integration-tests/package.json      |  6 +++---
 dev-packages/e2e-tests/package.json                |  2 +-
 .../external-contributor-gh-action/package.json    |  2 +-
 .../node-core-integration-tests/package.json       |  6 +++---
 dev-packages/node-integration-tests/package.json   | 10 +++++-----
 dev-packages/node-overhead-gh-action/package.json  |  4 ++--
 dev-packages/rollup-utils/package.json             |  2 +-
 dev-packages/size-limit-gh-action/package.json     |  2 +-
 dev-packages/test-utils/package.json               |  4 ++--
 lerna.json                                         |  2 +-
 packages/angular/package.json                      |  6 +++---
 packages/astro/package.json                        |  8 ++++----
 packages/aws-serverless/package.json               |  8 ++++----
 packages/browser-utils/package.json                |  4 ++--
 packages/browser/package.json                      | 14 +++++++-------
 packages/bun/package.json                          |  6 +++---
 packages/cloudflare/package.json                   |  4 ++--
 packages/core/package.json                         |  2 +-
 packages/deno/package.json                         |  4 ++--
 packages/ember/package.json                        |  6 +++---
 packages/eslint-config-sdk/package.json            |  6 +++---
 packages/eslint-plugin-sdk/package.json            |  2 +-
 packages/feedback/package.json                     |  4 ++--
 packages/gatsby/package.json                       |  6 +++---
 packages/google-cloud-serverless/package.json      |  6 +++---
 packages/integration-shims/package.json            |  4 ++--
 packages/nestjs/package.json                       |  6 +++---
 packages/nextjs/package.json                       | 14 +++++++-------
 packages/node-core/package.json                    |  6 +++---
 packages/node-native/package.json                  |  6 +++---
 packages/node/package.json                         |  8 ++++----
 packages/nuxt/package.json                         | 12 ++++++------
 packages/opentelemetry/package.json                |  4 ++--
 packages/profiling-node/package.json               |  6 +++---
 packages/react-router/package.json                 | 10 +++++-----
 packages/react/package.json                        |  6 +++---
 packages/remix/package.json                        |  8 ++++----
 packages/replay-canvas/package.json                |  6 +++---
 packages/replay-internal/package.json              |  8 ++++----
 packages/replay-worker/package.json                |  2 +-
 packages/solid/package.json                        |  6 +++---
 packages/solidstart/package.json                   |  8 ++++----
 packages/svelte/package.json                       |  6 +++---
 packages/sveltekit/package.json                    | 10 +++++-----
 packages/tanstackstart-react/package.json          | 10 +++++-----
 packages/tanstackstart/package.json                |  2 +-
 packages/types/package.json                        |  4 ++--
 packages/typescript/package.json                   |  2 +-
 packages/vercel-edge/package.json                  |  6 +++---
 packages/vue/package.json                          |  6 +++---
 packages/wasm/package.json                         |  6 +++---
 54 files changed, 153 insertions(+), 153 deletions(-)

diff --git a/dev-packages/browser-integration-tests/package.json b/dev-packages/browser-integration-tests/package.json
index 8e005588537a..b0022f25f976 100644
--- a/dev-packages/browser-integration-tests/package.json
+++ b/dev-packages/browser-integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/browser-integration-tests",
-  "version": "10.23.0",
+  "version": "10.24.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": "10.23.0",
+    "@sentry/browser": "10.24.0",
     "@supabase/supabase-js": "2.49.3",
     "axios": "^1.12.2",
     "babel-loader": "^8.2.2",
diff --git a/dev-packages/bundle-analyzer-scenarios/package.json b/dev-packages/bundle-analyzer-scenarios/package.json
index f986cf4208f4..a37e4a0ab15b 100644
--- a/dev-packages/bundle-analyzer-scenarios/package.json
+++ b/dev-packages/bundle-analyzer-scenarios/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/bundle-analyzer-scenarios",
-  "version": "10.23.0",
+  "version": "10.24.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",
diff --git a/dev-packages/clear-cache-gh-action/package.json b/dev-packages/clear-cache-gh-action/package.json
index 28666e974eca..12ca9159870e 100644
--- a/dev-packages/clear-cache-gh-action/package.json
+++ b/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.23.0",
+  "version": "10.24.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
diff --git a/dev-packages/cloudflare-integration-tests/package.json b/dev-packages/cloudflare-integration-tests/package.json
index 97bf49dfce5e..4a28d818dc25 100644
--- a/dev-packages/cloudflare-integration-tests/package.json
+++ b/dev-packages/cloudflare-integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/cloudflare-integration-tests",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
@@ -13,11 +13,11 @@
     "test:watch": "yarn test --watch"
   },
   "dependencies": {
-    "@sentry/cloudflare": "10.23.0"
+    "@sentry/cloudflare": "10.24.0"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20250922.0",
-    "@sentry-internal/test-utils": "10.23.0",
+    "@sentry-internal/test-utils": "10.24.0",
     "eslint-plugin-regexp": "^1.15.0",
     "vitest": "^3.2.4",
     "wrangler": "4.22.0"
diff --git a/dev-packages/e2e-tests/package.json b/dev-packages/e2e-tests/package.json
index 169508d15e55..df7589435057 100644
--- a/dev-packages/e2e-tests/package.json
+++ b/dev-packages/e2e-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/e2e-tests",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "license": "MIT",
   "private": true,
   "scripts": {
diff --git a/dev-packages/external-contributor-gh-action/package.json b/dev-packages/external-contributor-gh-action/package.json
index 3640bb7c29d2..3123e2d98067 100644
--- a/dev-packages/external-contributor-gh-action/package.json
+++ b/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": "10.23.0",
+  "version": "10.24.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
diff --git a/dev-packages/node-core-integration-tests/package.json b/dev-packages/node-core-integration-tests/package.json
index 3b27b2ffd3d7..1ed632bf8591 100644
--- a/dev-packages/node-core-integration-tests/package.json
+++ b/dev-packages/node-core-integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/node-core-integration-tests",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
@@ -34,8 +34,8 @@
     "@opentelemetry/resources": "^2.1.0",
     "@opentelemetry/sdk-trace-base": "^2.1.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry/core": "10.23.0",
-    "@sentry/node-core": "10.23.0",
+    "@sentry/core": "10.24.0",
+    "@sentry/node-core": "10.24.0",
     "body-parser": "^1.20.3",
     "cors": "^2.8.5",
     "cron": "^3.1.6",
diff --git a/dev-packages/node-integration-tests/package.json b/dev-packages/node-integration-tests/package.json
index 62c3a63793c2..325a99860c4e 100644
--- a/dev-packages/node-integration-tests/package.json
+++ b/dev-packages/node-integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/node-integration-tests",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
@@ -35,9 +35,9 @@
     "@nestjs/core": "^11",
     "@nestjs/platform-express": "^11",
     "@prisma/client": "6.15.0",
-    "@sentry/aws-serverless": "10.23.0",
-    "@sentry/core": "10.23.0",
-    "@sentry/node": "10.23.0",
+    "@sentry/aws-serverless": "10.24.0",
+    "@sentry/core": "10.24.0",
+    "@sentry/node": "10.24.0",
     "@types/mongodb": "^3.6.20",
     "@types/mysql": "^2.15.21",
     "@types/pg": "^8.6.5",
@@ -82,7 +82,7 @@
     "yargs": "^16.2.0"
   },
   "devDependencies": {
-    "@sentry-internal/test-utils": "10.23.0",
+    "@sentry-internal/test-utils": "10.24.0",
     "@types/amqplib": "^0.10.5",
     "@types/node-cron": "^3.0.11",
     "@types/node-schedule": "^2.1.7",
diff --git a/dev-packages/node-overhead-gh-action/package.json b/dev-packages/node-overhead-gh-action/package.json
index 6b01633f742d..107248da588a 100644
--- a/dev-packages/node-overhead-gh-action/package.json
+++ b/dev-packages/node-overhead-gh-action/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/node-overhead-gh-action",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
@@ -23,7 +23,7 @@
     "fix": "eslint . --format stylish --fix"
   },
   "dependencies": {
-    "@sentry/node": "10.23.0",
+    "@sentry/node": "10.24.0",
     "express": "^4.21.1",
     "mysql2": "^3.14.4"
   },
diff --git a/dev-packages/rollup-utils/package.json b/dev-packages/rollup-utils/package.json
index bfe5f6fe498e..3b13e73075f3 100644
--- a/dev-packages/rollup-utils/package.json
+++ b/dev-packages/rollup-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/rollup-utils",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "description": "Rollup utilities used at Sentry for the Sentry JavaScript SDK",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/rollup-utils",
diff --git a/dev-packages/size-limit-gh-action/package.json b/dev-packages/size-limit-gh-action/package.json
index b1a290f4d93b..9eaabe58ef65 100644
--- a/dev-packages/size-limit-gh-action/package.json
+++ b/dev-packages/size-limit-gh-action/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@sentry-internal/size-limit-gh-action",
   "description": "An internal Github Action to compare the current size of a PR against the one on develop.",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
diff --git a/dev-packages/test-utils/package.json b/dev-packages/test-utils/package.json
index fa30f4a3c0eb..577e383cf831 100644
--- a/dev-packages/test-utils/package.json
+++ b/dev-packages/test-utils/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "10.23.0",
+  "version": "10.24.0",
   "name": "@sentry-internal/test-utils",
   "author": "Sentry",
   "license": "MIT",
@@ -48,7 +48,7 @@
   },
   "devDependencies": {
     "@playwright/test": "~1.53.2",
-    "@sentry/core": "10.23.0",
+    "@sentry/core": "10.24.0",
     "eslint-plugin-regexp": "^1.15.0"
   },
   "volta": {
diff --git a/lerna.json b/lerna.json
index addd8722cf5c..c7be2107343d 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "npmClient": "yarn"
 }
diff --git a/packages/angular/package.json b/packages/angular/package.json
index af3e2b0c1f3a..ab4949e09314 100644
--- a/packages/angular/package.json
+++ b/packages/angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/angular",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "description": "Official Sentry SDK for Angular",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/angular",
@@ -21,8 +21,8 @@
     "rxjs": "^6.5.5 || ^7.x"
   },
   "dependencies": {
-    "@sentry/browser": "10.23.0",
-    "@sentry/core": "10.23.0",
+    "@sentry/browser": "10.24.0",
+    "@sentry/core": "10.24.0",
     "tslib": "^2.4.1"
   },
   "devDependencies": {
diff --git a/packages/astro/package.json b/packages/astro/package.json
index 546b889f2ce6..1704077b26e7 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/astro",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "description": "Official Sentry SDK for Astro",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/astro",
@@ -56,9 +56,9 @@
     "astro": ">=3.x || >=4.0.0-beta || >=5.x"
   },
   "dependencies": {
-    "@sentry/browser": "10.23.0",
-    "@sentry/core": "10.23.0",
-    "@sentry/node": "10.23.0",
+    "@sentry/browser": "10.24.0",
+    "@sentry/core": "10.24.0",
+    "@sentry/node": "10.24.0",
     "@sentry/vite-plugin": "^4.1.0"
   },
   "devDependencies": {
diff --git a/packages/aws-serverless/package.json b/packages/aws-serverless/package.json
index ae86d94f73e1..0c6cadfad79d 100644
--- a/packages/aws-serverless/package.json
+++ b/packages/aws-serverless/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/aws-serverless",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "description": "Official Sentry SDK for AWS Lambda and AWS Serverless Environments",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/aws-serverless",
@@ -69,9 +69,9 @@
     "@opentelemetry/instrumentation": "^0.204.0",
     "@opentelemetry/instrumentation-aws-sdk": "0.59.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry/core": "10.23.0",
-    "@sentry/node": "10.23.0",
-    "@sentry/node-core": "10.23.0",
+    "@sentry/core": "10.24.0",
+    "@sentry/node": "10.24.0",
+    "@sentry/node-core": "10.24.0",
     "@types/aws-lambda": "^8.10.62"
   },
   "devDependencies": {
diff --git a/packages/browser-utils/package.json b/packages/browser-utils/package.json
index ceb69e2d06cc..238e53ea445a 100644
--- a/packages/browser-utils/package.json
+++ b/packages/browser-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/browser-utils",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "description": "Browser Utilities for all Sentry JavaScript SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/browser-utils",
@@ -39,7 +39,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.23.0"
+    "@sentry/core": "10.24.0"
   },
   "scripts": {
     "build": "run-p build:transpile build:types",
diff --git a/packages/browser/package.json b/packages/browser/package.json
index addb646dec4b..5c07b30eaab8 100644
--- a/packages/browser/package.json
+++ b/packages/browser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/browser",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "description": "Official Sentry SDK for browsers",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/browser",
@@ -39,14 +39,14 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry-internal/browser-utils": "10.23.0",
-    "@sentry-internal/feedback": "10.23.0",
-    "@sentry-internal/replay": "10.23.0",
-    "@sentry-internal/replay-canvas": "10.23.0",
-    "@sentry/core": "10.23.0"
+    "@sentry-internal/browser-utils": "10.24.0",
+    "@sentry-internal/feedback": "10.24.0",
+    "@sentry-internal/replay": "10.24.0",
+    "@sentry-internal/replay-canvas": "10.24.0",
+    "@sentry/core": "10.24.0"
   },
   "devDependencies": {
-    "@sentry-internal/integration-shims": "10.23.0",
+    "@sentry-internal/integration-shims": "10.24.0",
     "fake-indexeddb": "^6.2.4"
   },
   "scripts": {
diff --git a/packages/bun/package.json b/packages/bun/package.json
index 6bf6c10af3df..2b05b4a08e37 100644
--- a/packages/bun/package.json
+++ b/packages/bun/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/bun",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "description": "Official Sentry SDK for bun",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/bun",
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.23.0",
-    "@sentry/node": "10.23.0"
+    "@sentry/core": "10.24.0",
+    "@sentry/node": "10.24.0"
   },
   "devDependencies": {
     "bun-types": "^1.2.9"
diff --git a/packages/cloudflare/package.json b/packages/cloudflare/package.json
index 062cf1735b05..8266a381f745 100644
--- a/packages/cloudflare/package.json
+++ b/packages/cloudflare/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/cloudflare",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "description": "Official Sentry SDK for Cloudflare Workers and Pages",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/cloudflare",
@@ -50,7 +50,7 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@sentry/core": "10.23.0"
+    "@sentry/core": "10.24.0"
   },
   "peerDependencies": {
     "@cloudflare/workers-types": "^4.x"
diff --git a/packages/core/package.json b/packages/core/package.json
index 27b4db779860..6d3a51c67e0a 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/core",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "description": "Base implementation for all Sentry JavaScript SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/core",
diff --git a/packages/deno/package.json b/packages/deno/package.json
index 9ff481e8b0ee..4f74c15f2e54 100644
--- a/packages/deno/package.json
+++ b/packages/deno/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/deno",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "description": "Official Sentry SDK for Deno",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/deno",
@@ -25,7 +25,7 @@
   ],
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@sentry/core": "10.23.0"
+    "@sentry/core": "10.24.0"
   },
   "scripts": {
     "deno-types": "node ./scripts/download-deno-types.mjs",
diff --git a/packages/ember/package.json b/packages/ember/package.json
index 84eb175cff50..ba18b243932d 100644
--- a/packages/ember/package.json
+++ b/packages/ember/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/ember",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "description": "Official Sentry SDK for Ember.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/ember",
@@ -32,8 +32,8 @@
   "dependencies": {
     "@babel/core": "^7.27.7",
     "@embroider/macros": "^1.16.0",
-    "@sentry/browser": "10.23.0",
-    "@sentry/core": "10.23.0",
+    "@sentry/browser": "10.24.0",
+    "@sentry/core": "10.24.0",
     "ember-auto-import": "^2.7.2",
     "ember-cli-babel": "^8.2.0",
     "ember-cli-htmlbars": "^6.1.1",
diff --git a/packages/eslint-config-sdk/package.json b/packages/eslint-config-sdk/package.json
index 92f988ab07f4..3db5551de08c 100644
--- a/packages/eslint-config-sdk/package.json
+++ b/packages/eslint-config-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/eslint-config-sdk",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "description": "Official Sentry SDK eslint config",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-config-sdk",
@@ -22,8 +22,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry-internal/eslint-plugin-sdk": "10.23.0",
-    "@sentry-internal/typescript": "10.23.0",
+    "@sentry-internal/eslint-plugin-sdk": "10.24.0",
+    "@sentry-internal/typescript": "10.24.0",
     "@typescript-eslint/eslint-plugin": "^5.48.0",
     "@typescript-eslint/parser": "^5.48.0",
     "eslint-config-prettier": "^6.11.0",
diff --git a/packages/eslint-plugin-sdk/package.json b/packages/eslint-plugin-sdk/package.json
index 921e5d9a8326..adbe616940a7 100644
--- a/packages/eslint-plugin-sdk/package.json
+++ b/packages/eslint-plugin-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/eslint-plugin-sdk",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "description": "Official Sentry SDK eslint plugin",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-plugin-sdk",
diff --git a/packages/feedback/package.json b/packages/feedback/package.json
index 781d9c4e38e4..461b62f428c1 100644
--- a/packages/feedback/package.json
+++ b/packages/feedback/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/feedback",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "description": "Sentry SDK integration for user feedback",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/feedback",
@@ -39,7 +39,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.23.0"
+    "@sentry/core": "10.24.0"
   },
   "devDependencies": {
     "preact": "^10.19.4"
diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json
index 5fbfa9838fc6..dda329628910 100644
--- a/packages/gatsby/package.json
+++ b/packages/gatsby/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/gatsby",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "description": "Official Sentry SDK for Gatsby.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/gatsby",
@@ -45,8 +45,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.23.0",
-    "@sentry/react": "10.23.0",
+    "@sentry/core": "10.24.0",
+    "@sentry/react": "10.24.0",
     "@sentry/webpack-plugin": "^4.1.1"
   },
   "peerDependencies": {
diff --git a/packages/google-cloud-serverless/package.json b/packages/google-cloud-serverless/package.json
index b7f9641ae71a..2849632ece86 100644
--- a/packages/google-cloud-serverless/package.json
+++ b/packages/google-cloud-serverless/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/google-cloud-serverless",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "description": "Official Sentry SDK for Google Cloud Functions",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/google-cloud-serverless",
@@ -48,8 +48,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.23.0",
-    "@sentry/node": "10.23.0",
+    "@sentry/core": "10.24.0",
+    "@sentry/node": "10.24.0",
     "@types/express": "^4.17.14"
   },
   "devDependencies": {
diff --git a/packages/integration-shims/package.json b/packages/integration-shims/package.json
index ed752f00adda..ce36550f9f42 100644
--- a/packages/integration-shims/package.json
+++ b/packages/integration-shims/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/integration-shims",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "description": "Shims for integrations in Sentry SDK.",
   "main": "build/cjs/index.js",
   "module": "build/esm/index.js",
@@ -56,7 +56,7 @@
     "url": "https://github.com/getsentry/sentry-javascript/issues"
   },
   "dependencies": {
-    "@sentry/core": "10.23.0"
+    "@sentry/core": "10.24.0"
   },
   "engines": {
     "node": ">=18"
diff --git a/packages/nestjs/package.json b/packages/nestjs/package.json
index 63e85d4e745d..fcff6412b7e2 100644
--- a/packages/nestjs/package.json
+++ b/packages/nestjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/nestjs",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "description": "Official Sentry SDK for NestJS",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/nestjs",
@@ -49,8 +49,8 @@
     "@opentelemetry/instrumentation": "^0.204.0",
     "@opentelemetry/instrumentation-nestjs-core": "0.50.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry/core": "10.23.0",
-    "@sentry/node": "10.23.0"
+    "@sentry/core": "10.24.0",
+    "@sentry/node": "10.24.0"
   },
   "devDependencies": {
     "@nestjs/common": "^10.0.0",
diff --git a/packages/nextjs/package.json b/packages/nextjs/package.json
index fe42e9c605e4..026724dd1b69 100644
--- a/packages/nextjs/package.json
+++ b/packages/nextjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/nextjs",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "description": "Official Sentry SDK for Next.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/nextjs",
@@ -79,13 +79,13 @@
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
     "@rollup/plugin-commonjs": "28.0.1",
-    "@sentry-internal/browser-utils": "10.23.0",
+    "@sentry-internal/browser-utils": "10.24.0",
     "@sentry/bundler-plugin-core": "^4.3.0",
-    "@sentry/core": "10.23.0",
-    "@sentry/node": "10.23.0",
-    "@sentry/opentelemetry": "10.23.0",
-    "@sentry/react": "10.23.0",
-    "@sentry/vercel-edge": "10.23.0",
+    "@sentry/core": "10.24.0",
+    "@sentry/node": "10.24.0",
+    "@sentry/opentelemetry": "10.24.0",
+    "@sentry/react": "10.24.0",
+    "@sentry/vercel-edge": "10.24.0",
     "@sentry/webpack-plugin": "^4.3.0",
     "resolve": "1.22.8",
     "rollup": "^4.35.0",
diff --git a/packages/node-core/package.json b/packages/node-core/package.json
index 55d0b7e2a29b..0c5123756840 100644
--- a/packages/node-core/package.json
+++ b/packages/node-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/node-core",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "description": "Sentry Node-Core SDK",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/node-core",
@@ -67,8 +67,8 @@
   },
   "dependencies": {
     "@apm-js-collab/tracing-hooks": "^0.3.1",
-    "@sentry/core": "10.23.0",
-    "@sentry/opentelemetry": "10.23.0",
+    "@sentry/core": "10.24.0",
+    "@sentry/opentelemetry": "10.24.0",
     "import-in-the-middle": "^1.14.2"
   },
   "devDependencies": {
diff --git a/packages/node-native/package.json b/packages/node-native/package.json
index 29c6e426452d..a280be7c6ef8 100644
--- a/packages/node-native/package.json
+++ b/packages/node-native/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/node-native",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "description": "Native Tools for the Official Sentry Node.js SDK",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/node-native",
@@ -64,8 +64,8 @@
   },
   "dependencies": {
     "@sentry-internal/node-native-stacktrace": "^0.2.2",
-    "@sentry/core": "10.23.0",
-    "@sentry/node": "10.23.0"
+    "@sentry/core": "10.24.0",
+    "@sentry/node": "10.24.0"
   },
   "devDependencies": {
     "@types/node": "^18.19.1"
diff --git a/packages/node/package.json b/packages/node/package.json
index a7d5f24ef432..15859ef1bfc2 100644
--- a/packages/node/package.json
+++ b/packages/node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/node",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "description": "Sentry Node SDK using OpenTelemetry for performance instrumentation",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/node",
@@ -95,9 +95,9 @@
     "@opentelemetry/sdk-trace-base": "^2.1.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
     "@prisma/instrumentation": "6.15.0",
-    "@sentry/core": "10.23.0",
-    "@sentry/node-core": "10.23.0",
-    "@sentry/opentelemetry": "10.23.0",
+    "@sentry/core": "10.24.0",
+    "@sentry/node-core": "10.24.0",
+    "@sentry/opentelemetry": "10.24.0",
     "import-in-the-middle": "^1.14.2",
     "minimatch": "^9.0.0"
   },
diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json
index 08457351d476..b5be7a8d0c34 100644
--- a/packages/nuxt/package.json
+++ b/packages/nuxt/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/nuxt",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "description": "Official Sentry SDK for Nuxt",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/nuxt",
@@ -49,13 +49,13 @@
   },
   "dependencies": {
     "@nuxt/kit": "^3.13.2",
-    "@sentry/browser": "10.23.0",
-    "@sentry/cloudflare": "10.23.0",
-    "@sentry/core": "10.23.0",
-    "@sentry/node": "10.23.0",
+    "@sentry/browser": "10.24.0",
+    "@sentry/cloudflare": "10.24.0",
+    "@sentry/core": "10.24.0",
+    "@sentry/node": "10.24.0",
     "@sentry/rollup-plugin": "^4.3.0",
     "@sentry/vite-plugin": "^4.3.0",
-    "@sentry/vue": "10.23.0"
+    "@sentry/vue": "10.24.0"
   },
   "devDependencies": {
     "@nuxt/module-builder": "^0.8.4",
diff --git a/packages/opentelemetry/package.json b/packages/opentelemetry/package.json
index cf4de93c1edc..65ac00dce9d9 100644
--- a/packages/opentelemetry/package.json
+++ b/packages/opentelemetry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/opentelemetry",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "description": "Official Sentry utilities for OpenTelemetry",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/opentelemetry",
@@ -39,7 +39,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.23.0"
+    "@sentry/core": "10.24.0"
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.9.0",
diff --git a/packages/profiling-node/package.json b/packages/profiling-node/package.json
index 437dd54205c9..509cfd46e0f2 100644
--- a/packages/profiling-node/package.json
+++ b/packages/profiling-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/profiling-node",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "description": "Official Sentry SDK for Node.js Profiling",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/profiling-node",
@@ -63,8 +63,8 @@
   },
   "dependencies": {
     "@sentry-internal/node-cpu-profiler": "^2.2.0",
-    "@sentry/core": "10.23.0",
-    "@sentry/node": "10.23.0"
+    "@sentry/core": "10.24.0",
+    "@sentry/node": "10.24.0"
   },
   "devDependencies": {
     "@types/node": "^18.19.1"
diff --git a/packages/react-router/package.json b/packages/react-router/package.json
index 336644436064..104ccd246563 100644
--- a/packages/react-router/package.json
+++ b/packages/react-router/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/react-router",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "description": "Official Sentry SDK for React Router (Framework)",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/react-router",
@@ -49,11 +49,11 @@
     "@opentelemetry/core": "^2.1.0",
     "@opentelemetry/instrumentation": "^0.204.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry/browser": "10.23.0",
+    "@sentry/browser": "10.24.0",
     "@sentry/cli": "^2.56.0",
-    "@sentry/core": "10.23.0",
-    "@sentry/node": "10.23.0",
-    "@sentry/react": "10.23.0",
+    "@sentry/core": "10.24.0",
+    "@sentry/node": "10.24.0",
+    "@sentry/react": "10.24.0",
     "@sentry/vite-plugin": "^4.1.0",
     "glob": "11.0.1"
   },
diff --git a/packages/react/package.json b/packages/react/package.json
index 5ce6ac2a293b..0dc428bc9a41 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/react",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "description": "Official Sentry SDK for React.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/react",
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "10.23.0",
-    "@sentry/core": "10.23.0",
+    "@sentry/browser": "10.24.0",
+    "@sentry/core": "10.24.0",
     "hoist-non-react-statics": "^3.3.2"
   },
   "peerDependencies": {
diff --git a/packages/remix/package.json b/packages/remix/package.json
index e68492dbcec9..3eb6fe8ccbda 100644
--- a/packages/remix/package.json
+++ b/packages/remix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/remix",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "description": "Official Sentry SDK for Remix",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/remix",
@@ -69,9 +69,9 @@
     "@opentelemetry/semantic-conventions": "^1.37.0",
     "@remix-run/router": "1.x",
     "@sentry/cli": "^2.56.0",
-    "@sentry/core": "10.23.0",
-    "@sentry/node": "10.23.0",
-    "@sentry/react": "10.23.0",
+    "@sentry/core": "10.24.0",
+    "@sentry/node": "10.24.0",
+    "@sentry/react": "10.24.0",
     "glob": "^10.3.4",
     "yargs": "^17.6.0"
   },
diff --git a/packages/replay-canvas/package.json b/packages/replay-canvas/package.json
index 02e80ec8f265..a958bd1bdb86 100644
--- a/packages/replay-canvas/package.json
+++ b/packages/replay-canvas/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/replay-canvas",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "description": "Replay canvas integration",
   "main": "build/npm/cjs/index.js",
   "module": "build/npm/esm/index.js",
@@ -69,8 +69,8 @@
     "@sentry-internal/rrweb": "2.40.0"
   },
   "dependencies": {
-    "@sentry-internal/replay": "10.23.0",
-    "@sentry/core": "10.23.0"
+    "@sentry-internal/replay": "10.24.0",
+    "@sentry/core": "10.24.0"
   },
   "engines": {
     "node": ">=18"
diff --git a/packages/replay-internal/package.json b/packages/replay-internal/package.json
index 4dfa1171ea8d..6bb9937c635b 100644
--- a/packages/replay-internal/package.json
+++ b/packages/replay-internal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/replay",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "description": "User replays for Sentry",
   "main": "build/npm/cjs/index.js",
   "module": "build/npm/esm/index.js",
@@ -81,7 +81,7 @@
   "homepage": "https://docs.sentry.io/platforms/javascript/session-replay/",
   "devDependencies": {
     "@babel/core": "^7.27.7",
-    "@sentry-internal/replay-worker": "10.23.0",
+    "@sentry-internal/replay-worker": "10.24.0",
     "@sentry-internal/rrweb": "2.40.0",
     "@sentry-internal/rrweb-snapshot": "2.40.0",
     "fflate": "0.8.2",
@@ -90,8 +90,8 @@
     "node-fetch": "^2.6.7"
   },
   "dependencies": {
-    "@sentry-internal/browser-utils": "10.23.0",
-    "@sentry/core": "10.23.0"
+    "@sentry-internal/browser-utils": "10.24.0",
+    "@sentry/core": "10.24.0"
   },
   "engines": {
     "node": ">=18"
diff --git a/packages/replay-worker/package.json b/packages/replay-worker/package.json
index d9a63ee257e2..baf959acd70c 100644
--- a/packages/replay-worker/package.json
+++ b/packages/replay-worker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/replay-worker",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "description": "Worker for @sentry-internal/replay",
   "main": "build/esm/index.js",
   "module": "build/esm/index.js",
diff --git a/packages/solid/package.json b/packages/solid/package.json
index 7985d4426d06..a87d1c1317f1 100644
--- a/packages/solid/package.json
+++ b/packages/solid/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/solid",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "description": "Official Sentry SDK for Solid",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/solid",
@@ -54,8 +54,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "10.23.0",
-    "@sentry/core": "10.23.0"
+    "@sentry/browser": "10.24.0",
+    "@sentry/core": "10.24.0"
   },
   "peerDependencies": {
     "@solidjs/router": "^0.13.4",
diff --git a/packages/solidstart/package.json b/packages/solidstart/package.json
index a5cc37631eb3..13f2fa48908b 100644
--- a/packages/solidstart/package.json
+++ b/packages/solidstart/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/solidstart",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "description": "Official Sentry SDK for Solid Start",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/solidstart",
@@ -66,9 +66,9 @@
     }
   },
   "dependencies": {
-    "@sentry/core": "10.23.0",
-    "@sentry/node": "10.23.0",
-    "@sentry/solid": "10.23.0",
+    "@sentry/core": "10.24.0",
+    "@sentry/node": "10.24.0",
+    "@sentry/solid": "10.24.0",
     "@sentry/vite-plugin": "^4.1.0"
   },
   "devDependencies": {
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index c8edb0f9e39d..e504e0106d93 100644
--- a/packages/svelte/package.json
+++ b/packages/svelte/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/svelte",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "description": "Official Sentry SDK for Svelte",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/svelte",
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "10.23.0",
-    "@sentry/core": "10.23.0",
+    "@sentry/browser": "10.24.0",
+    "@sentry/core": "10.24.0",
     "magic-string": "^0.30.0"
   },
   "peerDependencies": {
diff --git a/packages/sveltekit/package.json b/packages/sveltekit/package.json
index 954960636edf..dc6726d8b52e 100644
--- a/packages/sveltekit/package.json
+++ b/packages/sveltekit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/sveltekit",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "description": "Official Sentry SDK for SvelteKit",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/sveltekit",
@@ -48,10 +48,10 @@
   },
   "dependencies": {
     "@babel/parser": "7.26.9",
-    "@sentry/cloudflare": "10.23.0",
-    "@sentry/core": "10.23.0",
-    "@sentry/node": "10.23.0",
-    "@sentry/svelte": "10.23.0",
+    "@sentry/cloudflare": "10.24.0",
+    "@sentry/core": "10.24.0",
+    "@sentry/node": "10.24.0",
+    "@sentry/svelte": "10.24.0",
     "@sentry/vite-plugin": "^4.1.0",
     "magic-string": "0.30.7",
     "recast": "0.23.11",
diff --git a/packages/tanstackstart-react/package.json b/packages/tanstackstart-react/package.json
index cb091835d747..c74f15a623ab 100644
--- a/packages/tanstackstart-react/package.json
+++ b/packages/tanstackstart-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/tanstackstart-react",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "description": "Official Sentry SDK for TanStack Start React",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/tanstackstart-react",
@@ -52,10 +52,10 @@
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry-internal/browser-utils": "10.23.0",
-    "@sentry/core": "10.23.0",
-    "@sentry/node": "10.23.0",
-    "@sentry/react": "10.23.0"
+    "@sentry-internal/browser-utils": "10.24.0",
+    "@sentry/core": "10.24.0",
+    "@sentry/node": "10.24.0",
+    "@sentry/react": "10.24.0"
   },
   "scripts": {
     "build": "run-p build:transpile build:types",
diff --git a/packages/tanstackstart/package.json b/packages/tanstackstart/package.json
index 5fd902bb2784..542bd1eeaa51 100644
--- a/packages/tanstackstart/package.json
+++ b/packages/tanstackstart/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/tanstackstart",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "description": "Utilities for the Sentry TanStack Start SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/tanstackstart",
diff --git a/packages/types/package.json b/packages/types/package.json
index 9fa59c5c8587..80219ea97aad 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/types",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "description": "Types for all Sentry JavaScript SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/types",
@@ -57,7 +57,7 @@
     "yalc:publish": "yalc publish --push --sig"
   },
   "dependencies": {
-    "@sentry/core": "10.23.0"
+    "@sentry/core": "10.24.0"
   },
   "volta": {
     "extends": "../../package.json"
diff --git a/packages/typescript/package.json b/packages/typescript/package.json
index 2fe4c5a359cf..f010874370b6 100644
--- a/packages/typescript/package.json
+++ b/packages/typescript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/typescript",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "description": "Typescript configuration used at Sentry",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/typescript",
diff --git a/packages/vercel-edge/package.json b/packages/vercel-edge/package.json
index 9e6174f0bd6a..7b071ac706d5 100644
--- a/packages/vercel-edge/package.json
+++ b/packages/vercel-edge/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/vercel-edge",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "description": "Official Sentry SDK for the Vercel Edge Runtime",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/vercel-edge",
@@ -41,14 +41,14 @@
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/resources": "^2.1.0",
-    "@sentry/core": "10.23.0"
+    "@sentry/core": "10.24.0"
   },
   "devDependencies": {
     "@edge-runtime/types": "3.0.1",
     "@opentelemetry/core": "^2.1.0",
     "@opentelemetry/sdk-trace-base": "^2.1.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry/opentelemetry": "10.23.0"
+    "@sentry/opentelemetry": "10.24.0"
   },
   "scripts": {
     "build": "run-p build:transpile build:types",
diff --git a/packages/vue/package.json b/packages/vue/package.json
index e078c527719b..5b891d1ac311 100644
--- a/packages/vue/package.json
+++ b/packages/vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/vue",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "description": "Official Sentry SDK for Vue.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/vue",
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "10.23.0",
-    "@sentry/core": "10.23.0"
+    "@sentry/browser": "10.24.0",
+    "@sentry/core": "10.24.0"
   },
   "peerDependencies": {
     "pinia": "2.x || 3.x",
diff --git a/packages/wasm/package.json b/packages/wasm/package.json
index ed487df8ebe1..d2faade1bba4 100644
--- a/packages/wasm/package.json
+++ b/packages/wasm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/wasm",
-  "version": "10.23.0",
+  "version": "10.24.0",
   "description": "Support for WASM.",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/wasm",
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "10.23.0",
-    "@sentry/core": "10.23.0"
+    "@sentry/browser": "10.24.0",
+    "@sentry/core": "10.24.0"
   },
   "scripts": {
     "build": "run-p build:transpile build:bundle build:types",

From 7019263f1d87d884048e1fdbfbd157801bb3c146 Mon Sep 17 00:00:00 2001
From: Sigrid Huemer <32902192+s1gr1d@users.noreply.github.com>
Date: Mon, 10 Nov 2025 14:31:02 +0100
Subject: [PATCH 038/186] feat(node): Add `maxCacheKeyLength` to Redis
 integration (remove truncation) (#18045)

This removes the automatic truncation of the span description. Now, all
cache keys are set in the description.

part of https://github.com/getsentry/sentry-javascript/issues/17389
---
 .../node/src/integrations/tracing/redis.ts    | 29 ++++++-
 .../test/integrations/tracing/redis.test.ts   | 81 ++++++++++++++++++-
 2 files changed, 105 insertions(+), 5 deletions(-)

diff --git a/packages/node/src/integrations/tracing/redis.ts b/packages/node/src/integrations/tracing/redis.ts
index 8376c99c1998..f8be12352ae0 100644
--- a/packages/node/src/integrations/tracing/redis.ts
+++ b/packages/node/src/integrations/tracing/redis.ts
@@ -24,14 +24,34 @@ import {
 } from '../../utils/redisCache';
 
 interface RedisOptions {
+  /**
+   * Define cache prefixes for cache keys that should be captured as a cache span.
+   *
+   * Setting this to, for example, `['user:']` will capture cache keys that start with `user:`.
+   */
   cachePrefixes?: string[];
+  /**
+   * Maximum length of the cache key added to the span description. If the key exceeds this length, it will be truncated.
+   *
+   * Passing `0` will use the full cache key without truncation.
+   *
+   * By default, the full cache key is used.
+   */
+  maxCacheKeyLength?: number;
 }
 
 const INTEGRATION_NAME = 'Redis';
 
-let _redisOptions: RedisOptions = {};
+/* Only exported for testing purposes */
+export let _redisOptions: RedisOptions = {};
 
-const cacheResponseHook: RedisResponseCustomAttributeFunction = (span: Span, redisCommand, cmdArgs, response) => {
+/* Only exported for testing purposes */
+export const cacheResponseHook: RedisResponseCustomAttributeFunction = (
+  span: Span,
+  redisCommand,
+  cmdArgs,
+  response,
+) => {
   span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, 'auto.db.otel.redis');
 
   const safeKey = getCacheKeySafely(redisCommand, cmdArgs);
@@ -70,9 +90,12 @@ const cacheResponseHook: RedisResponseCustomAttributeFunction = (span: Span, red
     [SEMANTIC_ATTRIBUTE_CACHE_KEY]: safeKey,
   });
 
+  // todo: change to string[] once EAP supports it
   const spanDescription = safeKey.join(', ');
 
-  span.updateName(truncate(spanDescription, 1024));
+  span.updateName(
+    _redisOptions.maxCacheKeyLength ? truncate(spanDescription, _redisOptions.maxCacheKeyLength) : spanDescription,
+  );
 };
 
 const instrumentIORedis = generateInstrumentOnce(`${INTEGRATION_NAME}.IORedis`, () => {
diff --git a/packages/node/test/integrations/tracing/redis.test.ts b/packages/node/test/integrations/tracing/redis.test.ts
index 38a5b80eb759..ae5b879c0b8e 100644
--- a/packages/node/test/integrations/tracing/redis.test.ts
+++ b/packages/node/test/integrations/tracing/redis.test.ts
@@ -1,4 +1,5 @@
-import { describe, expect, it } from 'vitest';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { _redisOptions, cacheResponseHook } from '../../../src/integrations/tracing/redis';
 import {
   calculateCacheItemSize,
   GET_COMMANDS,
@@ -8,6 +9,82 @@ import {
 } from '../../../src/utils/redisCache';
 
 describe('Redis', () => {
+  describe('cacheResponseHook', () => {
+    let mockSpan: any;
+    let originalRedisOptions: any;
+
+    beforeEach(() => {
+      mockSpan = {
+        setAttribute: vi.fn(),
+        setAttributes: vi.fn(),
+        updateName: vi.fn(),
+        spanContext: () => ({ spanId: 'test-span-id', traceId: 'test-trace-id' }),
+      };
+
+      originalRedisOptions = { ..._redisOptions };
+    });
+
+    afterEach(() => {
+      vi.restoreAllMocks();
+      // Reset redis options by clearing all properties first, then restoring original ones
+      // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
+      Object.keys(_redisOptions).forEach(key => delete (_redisOptions as any)[key]);
+      Object.assign(_redisOptions, originalRedisOptions);
+    });
+
+    describe('early returns', () => {
+      it.each([
+        { desc: 'no args', cmd: 'get', args: [], response: 'test' },
+        { desc: 'unsupported command', cmd: 'exists', args: ['key'], response: 'test' },
+        { desc: 'no cache prefixes', cmd: 'get', args: ['key'], response: 'test', options: {} },
+        { desc: 'non-matching prefix', cmd: 'get', args: ['key'], response: 'test', options: { cachePrefixes: ['c'] } },
+      ])('should always set sentry.origin but return early when $desc', ({ cmd, args, response, options = {} }) => {
+        Object.assign(_redisOptions, options);
+
+        cacheResponseHook(mockSpan, cmd, args, response);
+
+        expect(mockSpan.setAttribute).toHaveBeenCalledWith('sentry.origin', 'auto.db.otel.redis');
+        expect(mockSpan.setAttributes).not.toHaveBeenCalled();
+        expect(mockSpan.updateName).not.toHaveBeenCalled();
+      });
+    });
+
+    describe('span name truncation', () => {
+      beforeEach(() => {
+        Object.assign(_redisOptions, { cachePrefixes: ['cache:'] });
+      });
+
+      it('should not truncate span name when maxCacheKeyLength is not set', () => {
+        cacheResponseHook(
+          mockSpan,
+          'mget',
+          ['cache:very-long-key-name', 'cache:very-long-key-name-2', 'cache:very-long-key-name-3'],
+          'value',
+        );
+
+        expect(mockSpan.updateName).toHaveBeenCalledWith(
+          'cache:very-long-key-name, cache:very-long-key-name-2, cache:very-long-key-name-3',
+        );
+      });
+
+      it('should truncate span name when maxCacheKeyLength is set', () => {
+        Object.assign(_redisOptions, { maxCacheKeyLength: 10 });
+
+        cacheResponseHook(mockSpan, 'get', ['cache:very-long-key-name'], 'value');
+
+        expect(mockSpan.updateName).toHaveBeenCalledWith('cache:very...');
+      });
+
+      it('should truncate multiple keys joined with commas', () => {
+        Object.assign(_redisOptions, { maxCacheKeyLength: 20 });
+
+        cacheResponseHook(mockSpan, 'mget', ['cache:key1', 'cache:key2', 'cache:key3'], ['val1', 'val2', 'val3']);
+
+        expect(mockSpan.updateName).toHaveBeenCalledWith('cache:key1, cache:ke...');
+      });
+    });
+  });
+
   describe('getCacheKeySafely (single arg)', () => {
     it('should return an empty string if there are no command arguments', () => {
       const result = getCacheKeySafely('get', []);
@@ -26,7 +103,7 @@ describe('Redis', () => {
       expect(result).toStrictEqual(['key1']);
     });
 
-    it('should return only the key for multiple arguments', () => {
+    it('should return only the first key for commands that only accept a singe key (get)', () => {
       const cmdArgs = ['key1', 'the-value'];
       const result = getCacheKeySafely('get', cmdArgs);
       expect(result).toStrictEqual(['key1']);

From 8b332543b849368338f1058480fe15005c6eb884 Mon Sep 17 00:00:00 2001
From: Tim Fish <tim@timfish.uk>
Date: Mon, 10 Nov 2025 14:07:13 +0000
Subject: [PATCH 039/186] feat(browser): Include Spotlight in development
 bundles (#18078)

This PR:
- Splits the browser build output into separate development and
production builds
- References these two builds in the package.json exports
- Adds a Rollup plugin to production builds which can strip out code
wrapped with development-only magic comments
- Adds the spotlight integration to the default integrations in
development mode only
- Also adds this plugin for browser bundles so spotlight doesn't get
included in CDN bundles
---
 .size-limit.js                                |  22 +-
 .../utils/generatePlugin.ts                   |  12 +-
 dev-packages/bundler-tests/.eslintrc.js       |   6 +
 .../bundler-tests/fixtures/basic/index.html   |   6 +
 .../bundler-tests/fixtures/basic/index.js     |   5 +
 dev-packages/bundler-tests/package.json       |  26 ++
 .../bundler-tests/tests/bundling.test.ts      | 144 ++++++++++
 dev-packages/bundler-tests/vitest.config.mjs  |   9 +
 dev-packages/bundler-tests/webpack.config.js  |  10 +
 dev-packages/rollup-utils/bundleHelpers.mjs   |   7 +-
 dev-packages/rollup-utils/npmHelpers.mjs      |  44 ++-
 .../rollup-utils/plugins/npmPlugins.mjs       |  18 ++
 dev-packages/rollup-utils/utils.mjs           |  11 +-
 package.json                                  |   3 +-
 packages/browser/package.json                 |  23 +-
 packages/browser/rollup.npm.config.mjs        |   1 +
 packages/browser/src/client.ts                |  12 +
 packages/browser/src/sdk.ts                   |  17 +-
 scripts/ci-unit-tests.ts                      |   1 +
 yarn.lock                                     | 258 +++++++++---------
 20 files changed, 469 insertions(+), 166 deletions(-)
 create mode 100644 dev-packages/bundler-tests/.eslintrc.js
 create mode 100644 dev-packages/bundler-tests/fixtures/basic/index.html
 create mode 100644 dev-packages/bundler-tests/fixtures/basic/index.js
 create mode 100644 dev-packages/bundler-tests/package.json
 create mode 100644 dev-packages/bundler-tests/tests/bundling.test.ts
 create mode 100644 dev-packages/bundler-tests/vitest.config.mjs
 create mode 100644 dev-packages/bundler-tests/webpack.config.js

diff --git a/.size-limit.js b/.size-limit.js
index b4819fc83126..2d07afde52ab 100644
--- a/.size-limit.js
+++ b/.size-limit.js
@@ -5,14 +5,14 @@ module.exports = [
   // Browser SDK (ESM)
   {
     name: '@sentry/browser',
-    path: 'packages/browser/build/npm/esm/index.js',
+    path: 'packages/browser/build/npm/esm/prod/index.js',
     import: createImport('init'),
     gzip: true,
     limit: '25 KB',
   },
   {
     name: '@sentry/browser - with treeshaking flags',
-    path: 'packages/browser/build/npm/esm/index.js',
+    path: 'packages/browser/build/npm/esm/prod/index.js',
     import: createImport('init'),
     gzip: true,
     limit: '24.1 KB',
@@ -35,28 +35,28 @@ module.exports = [
   },
   {
     name: '@sentry/browser (incl. Tracing)',
-    path: 'packages/browser/build/npm/esm/index.js',
+    path: 'packages/browser/build/npm/esm/prod/index.js',
     import: createImport('init', 'browserTracingIntegration'),
     gzip: true,
     limit: '41.3 KB',
   },
   {
     name: '@sentry/browser (incl. Tracing, Profiling)',
-    path: 'packages/browser/build/npm/esm/index.js',
+    path: 'packages/browser/build/npm/esm/prod/index.js',
     import: createImport('init', 'browserTracingIntegration', 'browserProfilingIntegration'),
     gzip: true,
     limit: '48 KB',
   },
   {
     name: '@sentry/browser (incl. Tracing, Replay)',
-    path: 'packages/browser/build/npm/esm/index.js',
+    path: 'packages/browser/build/npm/esm/prod/index.js',
     import: createImport('init', 'browserTracingIntegration', 'replayIntegration'),
     gzip: true,
     limit: '80 KB',
   },
   {
     name: '@sentry/browser (incl. Tracing, Replay) - with treeshaking flags',
-    path: 'packages/browser/build/npm/esm/index.js',
+    path: 'packages/browser/build/npm/esm/prod/index.js',
     import: createImport('init', 'browserTracingIntegration', 'replayIntegration'),
     gzip: true,
     limit: '75 KB',
@@ -79,35 +79,35 @@ module.exports = [
   },
   {
     name: '@sentry/browser (incl. Tracing, Replay with Canvas)',
-    path: 'packages/browser/build/npm/esm/index.js',
+    path: 'packages/browser/build/npm/esm/prod/index.js',
     import: createImport('init', 'browserTracingIntegration', 'replayIntegration', 'replayCanvasIntegration'),
     gzip: true,
     limit: '85 KB',
   },
   {
     name: '@sentry/browser (incl. Tracing, Replay, Feedback)',
-    path: 'packages/browser/build/npm/esm/index.js',
+    path: 'packages/browser/build/npm/esm/prod/index.js',
     import: createImport('init', 'browserTracingIntegration', 'replayIntegration', 'feedbackIntegration'),
     gzip: true,
     limit: '97 KB',
   },
   {
     name: '@sentry/browser (incl. Feedback)',
-    path: 'packages/browser/build/npm/esm/index.js',
+    path: 'packages/browser/build/npm/esm/prod/index.js',
     import: createImport('init', 'feedbackIntegration'),
     gzip: true,
     limit: '42 KB',
   },
   {
     name: '@sentry/browser (incl. sendFeedback)',
-    path: 'packages/browser/build/npm/esm/index.js',
+    path: 'packages/browser/build/npm/esm/prod/index.js',
     import: createImport('init', 'sendFeedback'),
     gzip: true,
     limit: '30 KB',
   },
   {
     name: '@sentry/browser (incl. FeedbackAsync)',
-    path: 'packages/browser/build/npm/esm/index.js',
+    path: 'packages/browser/build/npm/esm/prod/index.js',
     import: createImport('init', 'feedbackAsyncIntegration'),
     gzip: true,
     limit: '35 KB',
diff --git a/dev-packages/browser-integration-tests/utils/generatePlugin.ts b/dev-packages/browser-integration-tests/utils/generatePlugin.ts
index 0a90b5e2be23..6e3ef99aa7ea 100644
--- a/dev-packages/browser-integration-tests/utils/generatePlugin.ts
+++ b/dev-packages/browser-integration-tests/utils/generatePlugin.ts
@@ -46,8 +46,8 @@ const IMPORTED_INTEGRATION_CDN_BUNDLE_PATHS: Record<string, string> = {
 
 const BUNDLE_PATHS: Record<string, Record<string, string>> = {
   browser: {
-    cjs: 'build/npm/cjs/index.js',
-    esm: 'build/npm/esm/index.js',
+    cjs: 'build/npm/cjs/prod/index.js',
+    esm: 'build/npm/esm/prod/index.js',
     bundle: 'build/bundles/bundle.js',
     bundle_min: 'build/bundles/bundle.min.js',
     bundle_replay: 'build/bundles/bundle.replay.js',
@@ -67,8 +67,8 @@ const BUNDLE_PATHS: Record<string, Record<string, string>> = {
     loader_tracing_replay: 'build/bundles/bundle.tracing.replay.debug.min.js',
   },
   integrations: {
-    cjs: 'build/npm/cjs/index.js',
-    esm: 'build/npm/esm/index.js',
+    cjs: 'build/npm/cjs/prod/index.js',
+    esm: 'build/npm/esm/prod/index.js',
     bundle: 'build/bundles/[INTEGRATION_NAME].js',
     bundle_min: 'build/bundles/[INTEGRATION_NAME].min.js',
   },
@@ -77,8 +77,8 @@ const BUNDLE_PATHS: Record<string, Record<string, string>> = {
     bundle_min: 'build/bundles/[INTEGRATION_NAME].min.js',
   },
   wasm: {
-    cjs: 'build/npm/cjs/index.js',
-    esm: 'build/npm/esm/index.js',
+    cjs: 'build/npm/cjs/prod/index.js',
+    esm: 'build/npm/esm/prod/index.js',
     bundle: 'build/bundles/wasm.js',
     bundle_min: 'build/bundles/wasm.min.js',
   },
diff --git a/dev-packages/bundler-tests/.eslintrc.js b/dev-packages/bundler-tests/.eslintrc.js
new file mode 100644
index 000000000000..a65cf78e0b57
--- /dev/null
+++ b/dev-packages/bundler-tests/.eslintrc.js
@@ -0,0 +1,6 @@
+module.exports = {
+  extends: ['../../.eslintrc.js'],
+  parserOptions: {
+    sourceType: 'module',
+  },
+};
diff --git a/dev-packages/bundler-tests/fixtures/basic/index.html b/dev-packages/bundler-tests/fixtures/basic/index.html
new file mode 100644
index 000000000000..40e5dbc0642e
--- /dev/null
+++ b/dev-packages/bundler-tests/fixtures/basic/index.html
@@ -0,0 +1,6 @@
+<!doctype html>
+<html lang="en">
+  <body>
+    <script type="module" src="/index.js"></script>
+  </body>
+</html>
diff --git a/dev-packages/bundler-tests/fixtures/basic/index.js b/dev-packages/bundler-tests/fixtures/basic/index.js
new file mode 100644
index 000000000000..f3d47c97f7a2
--- /dev/null
+++ b/dev-packages/bundler-tests/fixtures/basic/index.js
@@ -0,0 +1,5 @@
+import { init } from '@sentry/browser';
+
+init({
+  dsn: 'https://00000000000000000000000000000000@o000000.ingest.sentry.io/0000000',
+});
diff --git a/dev-packages/bundler-tests/package.json b/dev-packages/bundler-tests/package.json
new file mode 100644
index 000000000000..7cc3dffe89eb
--- /dev/null
+++ b/dev-packages/bundler-tests/package.json
@@ -0,0 +1,26 @@
+{
+  "name": "@sentry-internal/bundler-tests",
+  "version": "10.23.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",
+  "author": "Sentry",
+  "license": "MIT",
+  "private": true,
+  "main": "./index.mjs",
+  "scripts": {
+    "test": "vitest run"
+  },
+  "dependencies": {
+    "@sentry/browser": "10.23.0",
+    "webpack": "^5.0.0",
+    "rollup": "^4.0.0",
+    "vite": "^5.0.0",
+    "@rollup/plugin-node-resolve": "^15.2.3",
+    "vitest": "^3.2.4"
+  },
+  "volta": {
+    "extends": "../../package.json"
+  },
+  "type": "module"
+}
diff --git a/dev-packages/bundler-tests/tests/bundling.test.ts b/dev-packages/bundler-tests/tests/bundling.test.ts
new file mode 100644
index 000000000000..1c3f42fc40f4
--- /dev/null
+++ b/dev-packages/bundler-tests/tests/bundling.test.ts
@@ -0,0 +1,144 @@
+import { describe, expect, beforeAll, test } from 'vitest';
+import * as path from 'node:path';
+import * as fs from 'node:fs';
+import { fileURLToPath } from 'node:url';
+
+import webpack from 'webpack';
+import { rollup } from 'rollup';
+import { build as viteBuild } from 'vite';
+import nodeResolve from '@rollup/plugin-node-resolve';
+
+// Helper functions
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+function distDir(name: string): string {
+  const dir = path.join(__dirname, '..', 'dist', name);
+  if (!fs.existsSync(dir)) {
+    fs.mkdirSync(dir, { recursive: true });
+  }
+  return dir;
+}
+
+function rimraf(dir: string): void {
+  if (fs.existsSync(dir)) {
+    fs.rmSync(dir, { recursive: true, force: true });
+  }
+}
+
+function readAllJs(outDir: string): string {
+  let contents = '';
+  const stack = [outDir];
+  while (stack.length) {
+    const current = stack.pop()!;
+    for (const entry of fs.readdirSync(current)) {
+      const full = path.join(current, entry);
+      const stat = fs.statSync(full);
+      if (stat.isDirectory()) {
+        stack.push(full);
+      } else if (entry.endsWith('.js') || entry.endsWith('.mjs')) {
+        contents += fs.readFileSync(full, 'utf8');
+      }
+    }
+  }
+  return contents;
+}
+
+function fixtureEntry(name: string): string {
+  return path.resolve(__dirname, '..', 'fixtures', name, 'index.js');
+}
+
+function rootDir(): string {
+  return path.join(__dirname, '../../..');
+}
+
+const SPOTLIGHT_URL = 'localhost:8969';
+
+type BundleMode = 'development' | 'production';
+
+function bundleWithWebpack(mode: BundleMode): Promise<string> {
+  return new Promise((resolve, reject) => {
+    const outDir = distDir(`webpack-${mode}`);
+    rimraf(outDir);
+    const compiler = webpack({
+      mode,
+      entry: fixtureEntry('basic'),
+      output: { path: outDir, filename: 'bundle.js' },
+    });
+    compiler?.run((err: Error | null | undefined, stats: webpack.Stats | undefined) => {
+      try {
+        if (err) throw err;
+        if (stats?.hasErrors()) {
+          throw new Error(stats.toString('errors-only'));
+        }
+        resolve(readAllJs(outDir));
+      } catch (e) {
+        reject(e);
+      } finally {
+        compiler.close(() => {});
+      }
+    });
+  });
+}
+
+async function bundleWithRollup(mode: BundleMode): Promise<string> {
+  const outDir = distDir(`rollup-${mode}`);
+  rimraf(outDir);
+
+  const bundle = await rollup({
+    input: fixtureEntry('basic'),
+    plugins: [
+      nodeResolve({
+        // There should really be a default where these get specified automatically
+        exportConditions: [mode === 'production' ? 'production' : 'development'],
+      }),
+    ],
+  });
+  await bundle.write({ dir: outDir, format: 'esm' });
+  await bundle.close();
+  return readAllJs(outDir);
+}
+
+async function bundleWithVite(mode: BundleMode): Promise<string> {
+  const outDir = distDir(`vite-${mode}`);
+  rimraf(outDir);
+
+  // In Vitest, NODE_ENV is always 'test', so we need to override it here
+  const prev = process.env.NODE_ENV;
+  process.env.NODE_ENV = mode;
+
+  await viteBuild({
+    mode,
+    root: path.dirname(fixtureEntry('basic')),
+    build: { outDir, minify: mode === 'production' },
+  });
+
+  process.env.NODE_ENV = prev;
+
+  return readAllJs(outDir);
+}
+
+describe('spotlight', () => {
+  beforeAll(() => {
+    const distRoot = path.join(rootDir(), 'dist');
+    rimraf(distRoot);
+  });
+
+  const cases: [string, (mode: BundleMode) => Promise<string>][] = [
+    ['webpack', bundleWithWebpack],
+    ['rollup', bundleWithRollup],
+    ['vite', bundleWithVite],
+  ];
+
+  for (const [name, bundler] of cases) {
+    test(`${name} development bundle contains spotlight`, async () => {
+      const code = await bundler('development');
+      expect(code).includes(SPOTLIGHT_URL);
+    });
+
+    test(`${name} production bundle does not contain spotlight`, async () => {
+      const code = await bundler('production');
+      expect(code).not.includes(SPOTLIGHT_URL);
+    });
+  }
+});
diff --git a/dev-packages/bundler-tests/vitest.config.mjs b/dev-packages/bundler-tests/vitest.config.mjs
new file mode 100644
index 000000000000..8baf9e1fbf68
--- /dev/null
+++ b/dev-packages/bundler-tests/vitest.config.mjs
@@ -0,0 +1,9 @@
+import { defineConfig } from 'vitest/config';
+
+export default defineConfig({
+  test: {
+    include: ['tests/**/*.test.*s'],
+    timeout: 10000,
+    hookTimeout: 10000,
+  },
+});
diff --git a/dev-packages/bundler-tests/webpack.config.js b/dev-packages/bundler-tests/webpack.config.js
new file mode 100644
index 000000000000..2c3c73b459a4
--- /dev/null
+++ b/dev-packages/bundler-tests/webpack.config.js
@@ -0,0 +1,10 @@
+const path = require('path');
+
+module.exports = (env, argv) => ({
+  mode: argv.mode || 'development',
+  entry: path.resolve(__dirname, 'fixtures/basic/index.js'),
+  output: {
+    path: path.resolve(__dirname, 'dist/webpack-' + (argv.mode || 'development')),
+    filename: 'bundle.js',
+  },
+});
diff --git a/dev-packages/rollup-utils/bundleHelpers.mjs b/dev-packages/rollup-utils/bundleHelpers.mjs
index b353eebaa214..8dd2ebd21999 100644
--- a/dev-packages/rollup-utils/bundleHelpers.mjs
+++ b/dev-packages/rollup-utils/bundleHelpers.mjs
@@ -11,7 +11,6 @@ import {
   makeCleanupPlugin,
   makeCommonJSPlugin,
   makeIsDebugBuildPlugin,
-  makeJsonPlugin,
   makeLicensePlugin,
   makeNodeResolvePlugin,
   makeRrwebBuildPlugin,
@@ -20,6 +19,7 @@ import {
   makeTerserPlugin,
 } from './plugins/index.mjs';
 import { mergePlugins } from './utils.mjs';
+import { makeProductionReplacePlugin } from './plugins/npmPlugins.mjs';
 
 const BUNDLE_VARIANTS = ['.js', '.min.js', '.debug.min.js'];
 
@@ -35,14 +35,13 @@ export function makeBaseBundleConfig(options) {
     excludeIframe: false,
     excludeShadowDom: false,
   });
+  const productionReplacePlugin = makeProductionReplacePlugin();
 
   // The `commonjs` plugin is the `esModuleInterop` of the bundling world. When used with `transformMixedEsModules`, it
   // will include all dependencies, imported or required, in the final bundle. (Without it, CJS modules aren't included
   // at all, and without `transformMixedEsModules`, they're only included if they're imported, not if they're required.)
   const commonJSPlugin = makeCommonJSPlugin({ transformMixedEsModules: true });
 
-  const jsonPlugin = makeJsonPlugin();
-
   // used by `@sentry/browser`
   const standAloneBundleConfig = {
     output: {
@@ -119,7 +118,7 @@ export function makeBaseBundleConfig(options) {
       strict: false,
       esModule: false,
     },
-    plugins: [sucrasePlugin, nodeResolvePlugin, cleanupPlugin],
+    plugins: [productionReplacePlugin, sucrasePlugin, nodeResolvePlugin, cleanupPlugin],
     treeshake: 'smallest',
   };
 
diff --git a/dev-packages/rollup-utils/npmHelpers.mjs b/dev-packages/rollup-utils/npmHelpers.mjs
index cff113d622d6..d5f7428b992d 100644
--- a/dev-packages/rollup-utils/npmHelpers.mjs
+++ b/dev-packages/rollup-utils/npmHelpers.mjs
@@ -16,6 +16,7 @@ import {
   makeCleanupPlugin,
   makeDebugBuildStatementReplacePlugin,
   makeNodeResolvePlugin,
+  makeProductionReplacePlugin,
   makeRrwebBuildPlugin,
   makeSucrasePlugin,
 } from './plugins/index.mjs';
@@ -114,22 +115,47 @@ export function makeBaseNPMConfig(options = {}) {
 }
 
 export function makeNPMConfigVariants(baseConfig, options = {}) {
-  const { emitEsm = true, emitCjs = true } = options;
+  const { emitEsm = true, emitCjs = true, splitDevProd = false } = options;
 
   const variantSpecificConfigs = [];
 
   if (emitCjs) {
-    variantSpecificConfigs.push({ output: { format: 'cjs', dir: path.join(baseConfig.output.dir, 'cjs') } });
+    if (splitDevProd) {
+      variantSpecificConfigs.push({ output: { format: 'cjs', dir: path.join(baseConfig.output.dir, 'cjs/dev') } });
+      variantSpecificConfigs.push({
+        output: { format: 'cjs', dir: path.join(baseConfig.output.dir, 'cjs/prod') },
+        plugins: [makeProductionReplacePlugin()],
+      });
+    } else {
+      variantSpecificConfigs.push({ output: { format: 'cjs', dir: path.join(baseConfig.output.dir, 'cjs') } });
+    }
   }
 
   if (emitEsm) {
-    variantSpecificConfigs.push({
-      output: {
-        format: 'esm',
-        dir: path.join(baseConfig.output.dir, 'esm'),
-        plugins: [makePackageNodeEsm()],
-      },
-    });
+    if (splitDevProd) {
+      variantSpecificConfigs.push({
+        output: {
+          format: 'esm',
+          dir: path.join(baseConfig.output.dir, 'esm/dev'),
+          plugins: [makePackageNodeEsm()],
+        },
+      });
+      variantSpecificConfigs.push({
+        output: {
+          format: 'esm',
+          dir: path.join(baseConfig.output.dir, 'esm/prod'),
+          plugins: [makeProductionReplacePlugin(), makePackageNodeEsm()],
+        },
+      });
+    } else {
+      variantSpecificConfigs.push({
+        output: {
+          format: 'esm',
+          dir: path.join(baseConfig.output.dir, 'esm'),
+          plugins: [makePackageNodeEsm()],
+        },
+      });
+    }
   }
 
   return variantSpecificConfigs.map(variant => deepMerge(baseConfig, variant));
diff --git a/dev-packages/rollup-utils/plugins/npmPlugins.mjs b/dev-packages/rollup-utils/plugins/npmPlugins.mjs
index 8c7e0ff10a80..7f08873f1c80 100644
--- a/dev-packages/rollup-utils/plugins/npmPlugins.mjs
+++ b/dev-packages/rollup-utils/plugins/npmPlugins.mjs
@@ -125,6 +125,24 @@ export function makeDebugBuildStatementReplacePlugin() {
   });
 }
 
+export function makeProductionReplacePlugin() {
+  const pattern = /\/\* rollup-include-development-only \*\/[\s\S]*?\/\* rollup-include-development-only-end \*\/\s*/g;
+
+  function stripDevBlocks(code) {
+    if (!code) return null;
+    if (!code.includes('rollup-include-development-only')) return null;
+    const replaced = code.replace(pattern, '');
+    return { code: replaced, map: null };
+  }
+
+  return {
+    name: 'remove-dev-mode-blocks',
+    renderChunk(code) {
+      return stripDevBlocks(code);
+    },
+  };
+}
+
 /**
  * Creates a plugin to replace build flags of rrweb with either a constant (if passed true/false) or with a safe statement that:
  * a) evaluates to `true`
diff --git a/dev-packages/rollup-utils/utils.mjs b/dev-packages/rollup-utils/utils.mjs
index 94b8c4483c23..b687ff9993c4 100644
--- a/dev-packages/rollup-utils/utils.mjs
+++ b/dev-packages/rollup-utils/utils.mjs
@@ -21,7 +21,16 @@ export function mergePlugins(pluginsA, pluginsB) {
     // here.
     // Additionally, the excludeReplay plugin must run before TS/Sucrase so that we can eliminate the replay code
     // before anything is type-checked (TS-only) and transpiled.
-    const order = ['excludeReplay', 'typescript', 'sucrase', '...', 'terser', 'license', 'output-base64-worker-script'];
+    const order = [
+      'remove-dev-mode-blocks',
+      'excludeReplay',
+      'typescript',
+      'sucrase',
+      '...',
+      'terser',
+      'license',
+      'output-base64-worker-script',
+    ];
     const sortKeyA = order.includes(a.name) ? a.name : '...';
     const sortKeyB = order.includes(b.name) ? b.name : '...';
 
diff --git a/package.json b/package.json
index 1fd6eb062564..298e17031240 100644
--- a/package.json
+++ b/package.json
@@ -100,7 +100,8 @@
     "dev-packages/clear-cache-gh-action",
     "dev-packages/external-contributor-gh-action",
     "dev-packages/rollup-utils",
-    "dev-packages/node-overhead-gh-action"
+    "dev-packages/node-overhead-gh-action",
+    "dev-packages/bundler-tests"
   ],
   "devDependencies": {
     "@rollup/plugin-commonjs": "^25.0.7",
diff --git a/packages/browser/package.json b/packages/browser/package.json
index 5c07b30eaab8..9ac303dbbd95 100644
--- a/packages/browser/package.json
+++ b/packages/browser/package.json
@@ -12,19 +12,24 @@
   "files": [
     "/build/npm"
   ],
-  "main": "build/npm/cjs/index.js",
-  "module": "build/npm/esm/index.js",
+  "main": "build/npm/cjs/prod/index.js",
+  "module": "build/npm/esm/prod/index.js",
   "types": "build/npm/types/index.d.ts",
   "exports": {
     "./package.json": "./package.json",
     ".": {
-      "import": {
-        "types": "./build/npm/types/index.d.ts",
-        "default": "./build/npm/esm/index.js"
+      "types": "./build/npm/types/index.d.ts",
+      "development": {
+        "import": "./build/npm/esm/dev/index.js",
+        "require": "./build/npm/cjs/dev/index.js"
       },
-      "require": {
-        "types": "./build/npm/types/index.d.ts",
-        "default": "./build/npm/cjs/index.js"
+      "production": {
+        "import": "./build/npm/esm/prod/index.js",
+        "require": "./build/npm/cjs/prod/index.js"
+      },
+      "default": {
+        "import": "./build/npm/esm/prod/index.js",
+        "require": "./build/npm/cjs/prod/index.js"
       }
     }
   },
@@ -67,7 +72,7 @@
     "clean": "rimraf build coverage .rpt2_cache sentry-browser-*.tgz",
     "fix": "eslint . --format stylish --fix",
     "lint": "eslint . --format stylish",
-    "lint:es-compatibility": "es-check es2020 ./build/{bundles,npm/cjs}/*.js && es-check es2020 ./build/npm/esm/*.js --module",
+    "lint:es-compatibility": "es-check es2020 ./build/{bundles,npm/cjs/prod}/*.js && es-check es2020 ./build/npm/esm/prod/*.js --module",
     "size:check": "cat build/bundles/bundle.min.js | gzip -9 | wc -c | awk '{$1=$1/1024; print \"ES2017: \",$1,\"kB\";}'",
     "test": "vitest run",
     "test:watch": "vitest --watch",
diff --git a/packages/browser/rollup.npm.config.mjs b/packages/browser/rollup.npm.config.mjs
index 00251eea81fd..40e3cbff5906 100644
--- a/packages/browser/rollup.npm.config.mjs
+++ b/packages/browser/rollup.npm.config.mjs
@@ -16,4 +16,5 @@ export default makeNPMConfigVariants(
       },
     },
   }),
+  { splitDevProd: true },
 );
diff --git a/packages/browser/src/client.ts b/packages/browser/src/client.ts
index dddaa440b198..ea55174f340c 100644
--- a/packages/browser/src/client.ts
+++ b/packages/browser/src/client.ts
@@ -63,6 +63,18 @@ type BrowserSpecificOptions = BrowserClientReplayOptions &
      * @default false
      */
     propagateTraceparent?: boolean;
+
+    /**
+     * If you use Spotlight by Sentry during development, use
+     * this option to forward captured Sentry events to Spotlight.
+     *
+     * Either set it to true, or provide a specific Spotlight Sidecar URL.
+     *
+     * More details: https://spotlightjs.com/
+     *
+     * IMPORTANT: Only set this option to `true` while developing, not in production!
+     */
+    spotlight?: boolean | string;
   };
 /**
  * Configuration options for the Sentry Browser SDK.
diff --git a/packages/browser/src/sdk.ts b/packages/browser/src/sdk.ts
index 7b5d67c636ae..800c1b701352 100644
--- a/packages/browser/src/sdk.ts
+++ b/packages/browser/src/sdk.ts
@@ -15,6 +15,7 @@ import { browserSessionIntegration } from './integrations/browsersession';
 import { globalHandlersIntegration } from './integrations/globalhandlers';
 import { httpContextIntegration } from './integrations/httpcontext';
 import { linkedErrorsIntegration } from './integrations/linkederrors';
+import { spotlightBrowserIntegration } from './integrations/spotlight';
 import { defaultStackParser } from './stack-parsers';
 import { makeFetchTransport } from './transports/fetch';
 import { checkAndWarnIfIsEmbeddedBrowserExtension } from './utils/detectBrowserExtension';
@@ -90,14 +91,26 @@ export function init(options: BrowserOptions = {}): Client | undefined {
   const shouldDisableBecauseIsBrowserExtenstion =
     !options.skipBrowserExtensionCheck && checkAndWarnIfIsEmbeddedBrowserExtension();
 
+  let defaultIntegrations =
+    options.defaultIntegrations == null ? getDefaultIntegrations(options) : options.defaultIntegrations;
+
+  /* rollup-include-development-only */
+  if (options.spotlight) {
+    if (!defaultIntegrations) {
+      defaultIntegrations = [];
+    }
+    const args = typeof options.spotlight === 'string' ? { sidecarUrl: options.spotlight } : undefined;
+    defaultIntegrations.push(spotlightBrowserIntegration(args));
+  }
+  /* rollup-include-development-only-end */
+
   const clientOptions: BrowserClientOptions = {
     ...options,
     enabled: shouldDisableBecauseIsBrowserExtenstion ? false : options.enabled,
     stackParser: stackParserFromStackParserOptions(options.stackParser || defaultStackParser),
     integrations: getIntegrationsToSetup({
       integrations: options.integrations,
-      defaultIntegrations:
-        options.defaultIntegrations == null ? getDefaultIntegrations(options) : options.defaultIntegrations,
+      defaultIntegrations,
     }),
     transport: options.transport || makeFetchTransport,
   };
diff --git a/scripts/ci-unit-tests.ts b/scripts/ci-unit-tests.ts
index 2802bde62fa6..2b6468c3e4ce 100644
--- a/scripts/ci-unit-tests.ts
+++ b/scripts/ci-unit-tests.ts
@@ -23,6 +23,7 @@ const BROWSER_TEST_PACKAGES = [
   '@sentry-internal/replay-canvas',
   '@sentry-internal/replay-worker',
   '@sentry-internal/feedback',
+  '@sentry-internal/bundler-tests',
   '@sentry/wasm',
 ];
 
diff --git a/yarn.lock b/yarn.lock
index a49764ebb218..99e434f5efff 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6824,105 +6824,115 @@
     estree-walker "^2.0.2"
     picomatch "^4.0.2"
 
-"@rollup/rollup-android-arm-eabi@4.44.1":
-  version "4.44.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.44.1.tgz#f768e3b2b0e6b55c595d7a053652c06413713983"
-  integrity sha512-JAcBr1+fgqx20m7Fwe1DxPUl/hPkee6jA6Pl7n1v2EFiktAHenTaXl5aIFjUIEsfn9w3HE4gK1lEgNGMzBDs1w==
-
-"@rollup/rollup-android-arm64@4.44.1":
-  version "4.44.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.44.1.tgz#40379fd5501cfdfd7d8f86dfa1d3ce8d3a609493"
-  integrity sha512-RurZetXqTu4p+G0ChbnkwBuAtwAbIwJkycw1n6GvlGlBuS4u5qlr5opix8cBAYFJgaY05TWtM+LaoFggUmbZEQ==
-
-"@rollup/rollup-darwin-arm64@4.44.1":
-  version "4.44.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.44.1.tgz#972c227bc89fe8a38a3f0c493e1966900e4e1ff7"
-  integrity sha512-fM/xPesi7g2M7chk37LOnmnSTHLG/v2ggWqKj3CCA1rMA4mm5KVBT1fNoswbo1JhPuNNZrVwpTvlCVggv8A2zg==
-
-"@rollup/rollup-darwin-x64@4.44.1":
-  version "4.44.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.44.1.tgz#96c919dcb87a5aa7dec5f7f77d90de881e578fdd"
-  integrity sha512-gDnWk57urJrkrHQ2WVx9TSVTH7lSlU7E3AFqiko+bgjlh78aJ88/3nycMax52VIVjIm3ObXnDL2H00e/xzoipw==
-
-"@rollup/rollup-freebsd-arm64@4.44.1":
-  version "4.44.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.44.1.tgz#d199d8eaef830179c0c95b7a6e5455e893d1102c"
-  integrity sha512-wnFQmJ/zPThM5zEGcnDcCJeYJgtSLjh1d//WuHzhf6zT3Md1BvvhJnWoy+HECKu2bMxaIcfWiu3bJgx6z4g2XA==
-
-"@rollup/rollup-freebsd-x64@4.44.1":
-  version "4.44.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.44.1.tgz#cab01f9e06ca756c1fabe87d64825ae016af4713"
-  integrity sha512-uBmIxoJ4493YATvU2c0upGz87f99e3wop7TJgOA/bXMFd2SvKCI7xkxY/5k50bv7J6dw1SXT4MQBQSLn8Bb/Uw==
-
-"@rollup/rollup-linux-arm-gnueabihf@4.44.1":
-  version "4.44.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.44.1.tgz#f6f1c42036dba0e58dc2315305429beff0d02c78"
-  integrity sha512-n0edDmSHlXFhrlmTK7XBuwKlG5MbS7yleS1cQ9nn4kIeW+dJH+ExqNgQ0RrFRew8Y+0V/x6C5IjsHrJmiHtkxQ==
-
-"@rollup/rollup-linux-arm-musleabihf@4.44.1":
-  version "4.44.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.44.1.tgz#1157e98e740facf858993fb51431dce3a4a96239"
-  integrity sha512-8WVUPy3FtAsKSpyk21kV52HCxB+me6YkbkFHATzC2Yd3yuqHwy2lbFL4alJOLXKljoRw08Zk8/xEj89cLQ/4Nw==
-
-"@rollup/rollup-linux-arm64-gnu@4.44.1":
-  version "4.44.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.44.1.tgz#b39db73f8a4c22e7db31a4f3fd45170105f33265"
-  integrity sha512-yuktAOaeOgorWDeFJggjuCkMGeITfqvPgkIXhDqsfKX8J3jGyxdDZgBV/2kj/2DyPaLiX6bPdjJDTu9RB8lUPQ==
-
-"@rollup/rollup-linux-arm64-musl@4.44.1":
-  version "4.44.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.44.1.tgz#4043398049fe4449c1485312d1ae9ad8af4056dd"
-  integrity sha512-W+GBM4ifET1Plw8pdVaecwUgxmiH23CfAUj32u8knq0JPFyK4weRy6H7ooxYFD19YxBulL0Ktsflg5XS7+7u9g==
-
-"@rollup/rollup-linux-loongarch64-gnu@4.44.1":
-  version "4.44.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.44.1.tgz#855a80e7e86490da15a85dcce247dbc25265bc08"
-  integrity sha512-1zqnUEMWp9WrGVuVak6jWTl4fEtrVKfZY7CvcBmUUpxAJ7WcSowPSAWIKa/0o5mBL/Ij50SIf9tuirGx63Ovew==
-
-"@rollup/rollup-linux-powerpc64le-gnu@4.44.1":
-  version "4.44.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.44.1.tgz#8cf843cb7ab1d42e1dda680937cf0a2db6d59047"
-  integrity sha512-Rl3JKaRu0LHIx7ExBAAnf0JcOQetQffaw34T8vLlg9b1IhzcBgaIdnvEbbsZq9uZp3uAH+JkHd20Nwn0h9zPjA==
-
-"@rollup/rollup-linux-riscv64-gnu@4.44.1":
-  version "4.44.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.44.1.tgz#287c085472976c8711f16700326f736a527f2f38"
-  integrity sha512-j5akelU3snyL6K3N/iX7otLBIl347fGwmd95U5gS/7z6T4ftK288jKq3A5lcFKcx7wwzb5rgNvAg3ZbV4BqUSw==
-
-"@rollup/rollup-linux-riscv64-musl@4.44.1":
-  version "4.44.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.44.1.tgz#095ad5e53a54ba475979f1b3226b92440c95c892"
-  integrity sha512-ppn5llVGgrZw7yxbIm8TTvtj1EoPgYUAbfw0uDjIOzzoqlZlZrLJ/KuiE7uf5EpTpCTrNt1EdtzF0naMm0wGYg==
-
-"@rollup/rollup-linux-s390x-gnu@4.44.1":
-  version "4.44.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.44.1.tgz#a3dec8281d8f2aef1703e48ebc65d29fe847933c"
-  integrity sha512-Hu6hEdix0oxtUma99jSP7xbvjkUM/ycke/AQQ4EC5g7jNRLLIwjcNwaUy95ZKBJJwg1ZowsclNnjYqzN4zwkAw==
-
-"@rollup/rollup-linux-x64-gnu@4.44.1":
-  version "4.44.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.44.1.tgz#4b211e6fd57edd6a134740f4f8e8ea61972ff2c5"
-  integrity sha512-EtnsrmZGomz9WxK1bR5079zee3+7a+AdFlghyd6VbAjgRJDbTANJ9dcPIPAi76uG05micpEL+gPGmAKYTschQw==
-
-"@rollup/rollup-linux-x64-musl@4.44.1":
-  version "4.44.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.44.1.tgz#3ecbf8e21b4157e57bb15dc6837b6db851f9a336"
-  integrity sha512-iAS4p+J1az6Usn0f8xhgL4PaU878KEtutP4hqw52I4IO6AGoyOkHCxcc4bqufv1tQLdDWFx8lR9YlwxKuv3/3g==
-
-"@rollup/rollup-win32-arm64-msvc@4.44.1":
-  version "4.44.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.44.1.tgz#d4aae38465b2ad200557b53c8c817266a3ddbfd0"
-  integrity sha512-NtSJVKcXwcqozOl+FwI41OH3OApDyLk3kqTJgx8+gp6On9ZEt5mYhIsKNPGuaZr3p9T6NWPKGU/03Vw4CNU9qg==
-
-"@rollup/rollup-win32-ia32-msvc@4.44.1":
-  version "4.44.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.44.1.tgz#0258e8ca052abd48b23fd6113360fa0cd1ec3e23"
-  integrity sha512-JYA3qvCOLXSsnTR3oiyGws1Dm0YTuxAAeaYGVlGpUsHqloPcFjPg+X0Fj2qODGLNwQOAcCiQmHub/V007kiH5A==
-
-"@rollup/rollup-win32-x64-msvc@4.44.1":
-  version "4.44.1"
-  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.44.1.tgz#1c982f6a5044ffc2a35cd754a0951bdcb44d5ba0"
-  integrity sha512-J8o22LuF0kTe7m+8PvW9wk3/bRq5+mRo5Dqo6+vXb7otCm3TPhYOJqOaQtGU9YMWQSL3krMnoOxMr0+9E6F3Ug==
+"@rollup/rollup-android-arm-eabi@4.52.5":
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.52.5.tgz#0f44a2f8668ed87b040b6fe659358ac9239da4db"
+  integrity sha512-8c1vW4ocv3UOMp9K+gToY5zL2XiiVw3k7f1ksf4yO1FlDFQ1C2u72iACFnSOceJFsWskc2WZNqeRhFRPzv+wtQ==
+
+"@rollup/rollup-android-arm64@4.52.5":
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.52.5.tgz#25b9a01deef6518a948431564c987bcb205274f5"
+  integrity sha512-mQGfsIEFcu21mvqkEKKu2dYmtuSZOBMmAl5CFlPGLY94Vlcm+zWApK7F/eocsNzp8tKmbeBP8yXyAbx0XHsFNA==
+
+"@rollup/rollup-darwin-arm64@4.52.5":
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.52.5.tgz#8a102869c88f3780c7d5e6776afd3f19084ecd7f"
+  integrity sha512-takF3CR71mCAGA+v794QUZ0b6ZSrgJkArC+gUiG6LB6TQty9T0Mqh3m2ImRBOxS2IeYBo4lKWIieSvnEk2OQWA==
+
+"@rollup/rollup-darwin-x64@4.52.5":
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.52.5.tgz#8e526417cd6f54daf1d0c04cf361160216581956"
+  integrity sha512-W901Pla8Ya95WpxDn//VF9K9u2JbocwV/v75TE0YIHNTbhqUTv9w4VuQ9MaWlNOkkEfFwkdNhXgcLqPSmHy0fA==
+
+"@rollup/rollup-freebsd-arm64@4.52.5":
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.52.5.tgz#0e7027054493f3409b1f219a3eac5efd128ef899"
+  integrity sha512-QofO7i7JycsYOWxe0GFqhLmF6l1TqBswJMvICnRUjqCx8b47MTo46W8AoeQwiokAx3zVryVnxtBMcGcnX12LvA==
+
+"@rollup/rollup-freebsd-x64@4.52.5":
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.52.5.tgz#72b204a920139e9ec3d331bd9cfd9a0c248ccb10"
+  integrity sha512-jr21b/99ew8ujZubPo9skbrItHEIE50WdV86cdSoRkKtmWa+DDr6fu2c/xyRT0F/WazZpam6kk7IHBerSL7LDQ==
+
+"@rollup/rollup-linux-arm-gnueabihf@4.52.5":
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.52.5.tgz#ab1b522ebe5b7e06c99504cc38f6cd8b808ba41c"
+  integrity sha512-PsNAbcyv9CcecAUagQefwX8fQn9LQ4nZkpDboBOttmyffnInRy8R8dSg6hxxl2Re5QhHBf6FYIDhIj5v982ATQ==
+
+"@rollup/rollup-linux-arm-musleabihf@4.52.5":
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.52.5.tgz#f8cc30b638f1ee7e3d18eac24af47ea29d9beb00"
+  integrity sha512-Fw4tysRutyQc/wwkmcyoqFtJhh0u31K+Q6jYjeicsGJJ7bbEq8LwPWV/w0cnzOqR2m694/Af6hpFayLJZkG2VQ==
+
+"@rollup/rollup-linux-arm64-gnu@4.52.5":
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.52.5.tgz#7af37a9e85f25db59dc8214172907b7e146c12cc"
+  integrity sha512-a+3wVnAYdQClOTlyapKmyI6BLPAFYs0JM8HRpgYZQO02rMR09ZcV9LbQB+NL6sljzG38869YqThrRnfPMCDtZg==
+
+"@rollup/rollup-linux-arm64-musl@4.52.5":
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.52.5.tgz#a623eb0d3617c03b7a73716eb85c6e37b776f7e0"
+  integrity sha512-AvttBOMwO9Pcuuf7m9PkC1PUIKsfaAJ4AYhy944qeTJgQOqJYJ9oVl2nYgY7Rk0mkbsuOpCAYSs6wLYB2Xiw0Q==
+
+"@rollup/rollup-linux-loong64-gnu@4.52.5":
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.52.5.tgz#76ea038b549c5c6c5f0d062942627c4066642ee2"
+  integrity sha512-DkDk8pmXQV2wVrF6oq5tONK6UHLz/XcEVow4JTTerdeV1uqPeHxwcg7aFsfnSm9L+OO8WJsWotKM2JJPMWrQtA==
+
+"@rollup/rollup-linux-ppc64-gnu@4.52.5":
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.52.5.tgz#d9a4c3f0a3492bc78f6fdfe8131ac61c7359ccd5"
+  integrity sha512-W/b9ZN/U9+hPQVvlGwjzi+Wy4xdoH2I8EjaCkMvzpI7wJUs8sWJ03Rq96jRnHkSrcHTpQe8h5Tg3ZzUPGauvAw==
+
+"@rollup/rollup-linux-riscv64-gnu@4.52.5":
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.52.5.tgz#87ab033eebd1a9a1dd7b60509f6333ec1f82d994"
+  integrity sha512-sjQLr9BW7R/ZiXnQiWPkErNfLMkkWIoCz7YMn27HldKsADEKa5WYdobaa1hmN6slu9oWQbB6/jFpJ+P2IkVrmw==
+
+"@rollup/rollup-linux-riscv64-musl@4.52.5":
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.52.5.tgz#bda3eb67e1c993c1ba12bc9c2f694e7703958d9f"
+  integrity sha512-hq3jU/kGyjXWTvAh2awn8oHroCbrPm8JqM7RUpKjalIRWWXE01CQOf/tUNWNHjmbMHg/hmNCwc/Pz3k1T/j/Lg==
+
+"@rollup/rollup-linux-s390x-gnu@4.52.5":
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.52.5.tgz#f7bc10fbe096ab44694233dc42a2291ed5453d4b"
+  integrity sha512-gn8kHOrku8D4NGHMK1Y7NA7INQTRdVOntt1OCYypZPRt6skGbddska44K8iocdpxHTMMNui5oH4elPH4QOLrFQ==
+
+"@rollup/rollup-linux-x64-gnu@4.52.5":
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.52.5.tgz#a151cb1234cc9b2cf5e8cfc02aa91436b8f9e278"
+  integrity sha512-hXGLYpdhiNElzN770+H2nlx+jRog8TyynpTVzdlc6bndktjKWyZyiCsuDAlpd+j+W+WNqfcyAWz9HxxIGfZm1Q==
+
+"@rollup/rollup-linux-x64-musl@4.52.5":
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.52.5.tgz#7859e196501cc3b3062d45d2776cfb4d2f3a9350"
+  integrity sha512-arCGIcuNKjBoKAXD+y7XomR9gY6Mw7HnFBv5Rw7wQRvwYLR7gBAgV7Mb2QTyjXfTveBNFAtPt46/36vV9STLNg==
+
+"@rollup/rollup-openharmony-arm64@4.52.5":
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.52.5.tgz#85d0df7233734df31e547c1e647d2a5300b3bf30"
+  integrity sha512-QoFqB6+/9Rly/RiPjaomPLmR/13cgkIGfA40LHly9zcH1S0bN2HVFYk3a1eAyHQyjs3ZJYlXvIGtcCs5tko9Cw==
+
+"@rollup/rollup-win32-arm64-msvc@4.52.5":
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.52.5.tgz#e62357d00458db17277b88adbf690bb855cac937"
+  integrity sha512-w0cDWVR6MlTstla1cIfOGyl8+qb93FlAVutcor14Gf5Md5ap5ySfQ7R9S/NjNaMLSFdUnKGEasmVnu3lCMqB7w==
+
+"@rollup/rollup-win32-ia32-msvc@4.52.5":
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.52.5.tgz#fc7cd40f44834a703c1f1c3fe8bcc27ce476cd50"
+  integrity sha512-Aufdpzp7DpOTULJCuvzqcItSGDH73pF3ko/f+ckJhxQyHtp67rHw3HMNxoIdDMUITJESNE6a8uh4Lo4SLouOUg==
+
+"@rollup/rollup-win32-x64-gnu@4.52.5":
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.52.5.tgz#1a22acfc93c64a64a48c42672e857ee51774d0d3"
+  integrity sha512-UGBUGPFp1vkj6p8wCRraqNhqwX/4kNQPS57BCFc8wYh0g94iVIW33wJtQAx3G7vrjjNtRaxiMUylM0ktp/TRSQ==
+
+"@rollup/rollup-win32-x64-msvc@4.52.5":
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.52.5.tgz#1657f56326bbe0ac80eedc9f9c18fc1ddd24e107"
+  integrity sha512-TAcgQh2sSkykPRWLrdyy2AiceMckNf5loITqXxFI5VuQjS5tSuw3WlwdN8qv8vzjLAUTvYaH/mVjSFpbkFbpTg==
 
 "@schematics/angular@14.2.13":
   version "14.2.13"
@@ -27073,33 +27083,35 @@ rollup@^3.27.1, rollup@^3.28.1:
   optionalDependencies:
     fsevents "~2.3.2"
 
-rollup@^4.20.0, rollup@^4.34.9, rollup@^4.35.0, rollup@^4.44.0:
-  version "4.44.1"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.44.1.tgz#641723932894e7acbe6052aea34b8e72ef8b7c8f"
-  integrity sha512-x8H8aPvD+xbl0Do8oez5f5o8eMS3trfCghc4HhLAnCkj7Vl0d1JWGs0UF/D886zLW2rOj2QymV/JcSSsw+XDNg==
+rollup@^4.0.0, rollup@^4.20.0, rollup@^4.34.9, rollup@^4.35.0, rollup@^4.44.0:
+  version "4.52.5"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.52.5.tgz#96982cdcaedcdd51b12359981f240f94304ec235"
+  integrity sha512-3GuObel8h7Kqdjt0gxkEzaifHTqLVW56Y/bjN7PSQtkKr0w3V/QYSdt6QWYtd7A1xUtYQigtdUfgj1RvWVtorw==
   dependencies:
     "@types/estree" "1.0.8"
   optionalDependencies:
-    "@rollup/rollup-android-arm-eabi" "4.44.1"
-    "@rollup/rollup-android-arm64" "4.44.1"
-    "@rollup/rollup-darwin-arm64" "4.44.1"
-    "@rollup/rollup-darwin-x64" "4.44.1"
-    "@rollup/rollup-freebsd-arm64" "4.44.1"
-    "@rollup/rollup-freebsd-x64" "4.44.1"
-    "@rollup/rollup-linux-arm-gnueabihf" "4.44.1"
-    "@rollup/rollup-linux-arm-musleabihf" "4.44.1"
-    "@rollup/rollup-linux-arm64-gnu" "4.44.1"
-    "@rollup/rollup-linux-arm64-musl" "4.44.1"
-    "@rollup/rollup-linux-loongarch64-gnu" "4.44.1"
-    "@rollup/rollup-linux-powerpc64le-gnu" "4.44.1"
-    "@rollup/rollup-linux-riscv64-gnu" "4.44.1"
-    "@rollup/rollup-linux-riscv64-musl" "4.44.1"
-    "@rollup/rollup-linux-s390x-gnu" "4.44.1"
-    "@rollup/rollup-linux-x64-gnu" "4.44.1"
-    "@rollup/rollup-linux-x64-musl" "4.44.1"
-    "@rollup/rollup-win32-arm64-msvc" "4.44.1"
-    "@rollup/rollup-win32-ia32-msvc" "4.44.1"
-    "@rollup/rollup-win32-x64-msvc" "4.44.1"
+    "@rollup/rollup-android-arm-eabi" "4.52.5"
+    "@rollup/rollup-android-arm64" "4.52.5"
+    "@rollup/rollup-darwin-arm64" "4.52.5"
+    "@rollup/rollup-darwin-x64" "4.52.5"
+    "@rollup/rollup-freebsd-arm64" "4.52.5"
+    "@rollup/rollup-freebsd-x64" "4.52.5"
+    "@rollup/rollup-linux-arm-gnueabihf" "4.52.5"
+    "@rollup/rollup-linux-arm-musleabihf" "4.52.5"
+    "@rollup/rollup-linux-arm64-gnu" "4.52.5"
+    "@rollup/rollup-linux-arm64-musl" "4.52.5"
+    "@rollup/rollup-linux-loong64-gnu" "4.52.5"
+    "@rollup/rollup-linux-ppc64-gnu" "4.52.5"
+    "@rollup/rollup-linux-riscv64-gnu" "4.52.5"
+    "@rollup/rollup-linux-riscv64-musl" "4.52.5"
+    "@rollup/rollup-linux-s390x-gnu" "4.52.5"
+    "@rollup/rollup-linux-x64-gnu" "4.52.5"
+    "@rollup/rollup-linux-x64-musl" "4.52.5"
+    "@rollup/rollup-openharmony-arm64" "4.52.5"
+    "@rollup/rollup-win32-arm64-msvc" "4.52.5"
+    "@rollup/rollup-win32-ia32-msvc" "4.52.5"
+    "@rollup/rollup-win32-x64-gnu" "4.52.5"
+    "@rollup/rollup-win32-x64-msvc" "4.52.5"
     fsevents "~2.3.2"
 
 router@^2.2.0:

From 6de4cbad4fd526efd1f017059cf6db9ffc047f9c Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Mon, 10 Nov 2025 15:32:19 +0100
Subject: [PATCH 040/186] fix(core): Only consider exception mechanism when
 updating session status from event with exceptions (#18137)

This PR fixes an oversight in our session update logic when we update
the SDK's session status while processing an error event. Previously,
we'd always set `status: 'crashed'` as soon as the top-level
`event.level` field was set to `'fatal'` (added in
https://github.com/getsentry/sentry-javascript/pull/15072). However,
this disregarded the case where the level was initially `'fatal'` but
later on the SDK or users decided to set the
`event.exceptions.values[i].mechanism.handled` field to `true`.

Simplest reproduction:

```
Sentry.captureException(new Error('test'), { captureContext: { level: 'fatal' } });
```

This PR changes the update logic to only look at the event mechanisms if
the event contained exceptions. I _think_ this is still compatible with
#15072 because the PR suggests we only care about `event.level ===
'fatal'` if no exceptions are on the event. But I'd appreciate a second
pair of eyes on this (cc @timfish).
---
 packages/core/src/client.ts           |   6 +-
 packages/core/test/lib/client.test.ts | 103 ++++++++++++++++++++++++++
 2 files changed, 107 insertions(+), 2 deletions(-)

diff --git a/packages/core/src/client.ts b/packages/core/src/client.ts
index c3ff126732f8..53e0328965a4 100644
--- a/packages/core/src/client.ts
+++ b/packages/core/src/client.ts
@@ -1037,16 +1037,18 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
 
   /** Updates existing session based on the provided event */
   protected _updateSessionFromEvent(session: Session, event: Event): void {
+    // initially, set `crashed` based on the event level and update from exceptions if there are any later on
     let crashed = event.level === 'fatal';
     let errored = false;
     const exceptions = event.exception?.values;
 
     if (exceptions) {
       errored = true;
+      // reset crashed to false if there are exceptions, to ensure `mechanism.handled` is respected.
+      crashed = false;
 
       for (const ex of exceptions) {
-        const mechanism = ex.mechanism;
-        if (mechanism?.handled === false) {
+        if (ex.mechanism?.handled === false) {
           crashed = true;
           break;
         }
diff --git a/packages/core/test/lib/client.test.ts b/packages/core/test/lib/client.test.ts
index db25793ccf7b..acb4197cf4cf 100644
--- a/packages/core/test/lib/client.test.ts
+++ b/packages/core/test/lib/client.test.ts
@@ -1,4 +1,5 @@
 import { afterEach, beforeEach, describe, expect, it, test, vi } from 'vitest';
+import type { SeverityLevel } from '../../src';
 import {
   addBreadcrumb,
   dsnToString,
@@ -2308,6 +2309,108 @@ describe('Client', () => {
     });
   });
 
+  describe('_updateSessionFromEvent()', () => {
+    describe('event has no exceptions', () => {
+      it('sets status to crashed if level is fatal', () => {
+        const client = new TestClient(getDefaultTestClientOptions());
+        const session = makeSession();
+        getCurrentScope().setSession(session);
+
+        client.captureEvent({ message: 'test', level: 'fatal' });
+
+        const updatedSession = client.session;
+
+        expect(updatedSession).toMatchObject({
+          duration: expect.any(Number),
+          errors: 1,
+          init: false,
+          sid: expect.any(String),
+          started: expect.any(Number),
+          status: 'crashed',
+          timestamp: expect.any(Number),
+        });
+      });
+
+      it.each(['error', 'warning', 'log', 'info', 'debug'] as const)(
+        'sets status to ok if level is %s',
+        (level: SeverityLevel) => {
+          const client = new TestClient(getDefaultTestClientOptions());
+          const session = makeSession();
+          getCurrentScope().setSession(session);
+
+          client.captureEvent({ message: 'test', level });
+
+          const updatedSession = client.session;
+
+          expect(updatedSession?.status).toEqual('ok');
+        },
+      );
+    });
+
+    describe('event has exceptions', () => {
+      it.each(['fatal', 'error', 'warning', 'log', 'info', 'debug'] as const)(
+        'sets status ok for handled exceptions and ignores event level %s',
+        (level: SeverityLevel) => {
+          const client = new TestClient(getDefaultTestClientOptions());
+          const session = makeSession();
+          getCurrentScope().setSession(session);
+
+          client.captureException(new Error('test'), { captureContext: { level } });
+
+          const updatedSession = client.session;
+
+          expect(updatedSession?.status).toEqual('ok');
+        },
+      );
+
+      it.each(['fatal', 'error', 'warning', 'log', 'info', 'debug'] as const)(
+        'sets status crashed for unhandled exceptions and ignores event level %s',
+        (level: SeverityLevel) => {
+          const client = new TestClient(getDefaultTestClientOptions());
+          const session = makeSession();
+          getCurrentScope().setSession(session);
+
+          client.captureException(new Error('test'), { captureContext: { level }, mechanism: { handled: false } });
+
+          const updatedSession = client.session;
+
+          expect(updatedSession?.status).toEqual('crashed');
+        },
+      );
+
+      it('sets status crashed if at least one exception is unhandled', () => {
+        const client = new TestClient(getDefaultTestClientOptions());
+        const session = makeSession();
+        getCurrentScope().setSession(session);
+
+        const event: Event = {
+          exception: {
+            values: [
+              {
+                mechanism: { type: 'generic', handled: true },
+              },
+              {
+                mechanism: { type: 'generic', handled: false },
+              },
+              {
+                mechanism: { type: 'generic', handled: true },
+              },
+            ],
+          },
+        };
+
+        client.captureEvent(event);
+
+        const updatedSession = client.session;
+
+        expect(updatedSession).toMatchObject({
+          status: 'crashed',
+          errors: 1, // an event with multiple exceptions still counts as one error in the session
+        });
+      });
+    });
+  });
+
   describe('recordDroppedEvent()/_clearOutcomes()', () => {
     test('records and returns outcomes', () => {
       const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });

From 02625ef5becdb053c89e86afe481961be8af18f9 Mon Sep 17 00:00:00 2001
From: Sigrid Huemer <32902192+s1gr1d@users.noreply.github.com>
Date: Mon, 10 Nov 2025 15:38:23 +0100
Subject: [PATCH 041/186] ref(browser): Remove truncation when not needed
 (#18051)

Removes the remaining places where we truncate, although not needed.

part of https://github.com/getsentry/sentry-javascript/issues/17389
---
 packages/browser-utils/src/metrics/lcp.ts           | 3 +--
 packages/browser/src/integrations/globalhandlers.ts | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/browser-utils/src/metrics/lcp.ts b/packages/browser-utils/src/metrics/lcp.ts
index 5f84f1782041..a6410ac08580 100644
--- a/packages/browser-utils/src/metrics/lcp.ts
+++ b/packages/browser-utils/src/metrics/lcp.ts
@@ -77,8 +77,7 @@ export function _sendStandaloneLcpSpan(
     entry.element && (attributes['lcp.element'] = htmlTreeAsString(entry.element));
     entry.id && (attributes['lcp.id'] = entry.id);
 
-    // Trim URL to the first 200 characters.
-    entry.url && (attributes['lcp.url'] = entry.url.trim().slice(0, 200));
+    entry.url && (attributes['lcp.url'] = entry.url);
 
     // loadTime is the time of LCP that's related to receiving the LCP element response..
     entry.loadTime != null && (attributes['lcp.loadTime'] = entry.loadTime);
diff --git a/packages/browser/src/integrations/globalhandlers.ts b/packages/browser/src/integrations/globalhandlers.ts
index aa7b2fa9e412..6bada802b98e 100644
--- a/packages/browser/src/integrations/globalhandlers.ts
+++ b/packages/browser/src/integrations/globalhandlers.ts
@@ -217,5 +217,5 @@ function getFilenameFromUrl(url: string | undefined): string | undefined {
     return `<data:${mimeType}${isBase64 ? ',base64' : ''}>`;
   }
 
-  return url.slice(0, 1024);
+  return url; // it's fine to not truncate it as it's not put in a regex (https://codeql.github.com/codeql-query-help/javascript/js-polynomial-redos)
 }

From c236db3f5ac8c9baeb7f7f55b5611a22ffb53039 Mon Sep 17 00:00:00 2001
From: Tim Fish <tim@timfish.uk>
Date: Tue, 11 Nov 2025 10:07:14 +0100
Subject: [PATCH 042/186] chore(build): Fix incorrect versions after merge
 (#18154)

Whenever we add a new module to the monorepo, the version does not keep
up with new releases before it is merged...
---
 dev-packages/bundler-tests/package.json           |  4 ++--
 dev-packages/bundler-tests/tests/bundling.test.ts |  4 ++--
 dev-packages/bundler-tests/webpack.config.js      | 10 ----------
 3 files changed, 4 insertions(+), 14 deletions(-)
 delete mode 100644 dev-packages/bundler-tests/webpack.config.js

diff --git a/dev-packages/bundler-tests/package.json b/dev-packages/bundler-tests/package.json
index 7cc3dffe89eb..1e61939cac5f 100644
--- a/dev-packages/bundler-tests/package.json
+++ b/dev-packages/bundler-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/bundler-tests",
-  "version": "10.23.0",
+  "version": "10.24.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",
@@ -12,7 +12,7 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@sentry/browser": "10.23.0",
+    "@sentry/browser": "10.24.0",
     "webpack": "^5.0.0",
     "rollup": "^4.0.0",
     "vite": "^5.0.0",
diff --git a/dev-packages/bundler-tests/tests/bundling.test.ts b/dev-packages/bundler-tests/tests/bundling.test.ts
index 1c3f42fc40f4..2cc8113ca83b 100644
--- a/dev-packages/bundler-tests/tests/bundling.test.ts
+++ b/dev-packages/bundler-tests/tests/bundling.test.ts
@@ -133,12 +133,12 @@ describe('spotlight', () => {
   for (const [name, bundler] of cases) {
     test(`${name} development bundle contains spotlight`, async () => {
       const code = await bundler('development');
-      expect(code).includes(SPOTLIGHT_URL);
+      expect(code).toContain(SPOTLIGHT_URL);
     });
 
     test(`${name} production bundle does not contain spotlight`, async () => {
       const code = await bundler('production');
-      expect(code).not.includes(SPOTLIGHT_URL);
+      expect(code).not.toContain(SPOTLIGHT_URL);
     });
   }
 });
diff --git a/dev-packages/bundler-tests/webpack.config.js b/dev-packages/bundler-tests/webpack.config.js
deleted file mode 100644
index 2c3c73b459a4..000000000000
--- a/dev-packages/bundler-tests/webpack.config.js
+++ /dev/null
@@ -1,10 +0,0 @@
-const path = require('path');
-
-module.exports = (env, argv) => ({
-  mode: argv.mode || 'development',
-  entry: path.resolve(__dirname, 'fixtures/basic/index.js'),
-  output: {
-    path: path.resolve(__dirname, 'dist/webpack-' + (argv.mode || 'development')),
-    filename: 'bundle.js',
-  },
-});

From c2a53e75fb51cbcebe5b59c5f5af5b01df0783e0 Mon Sep 17 00:00:00 2001
From: Nicolas Hrubec <nico.hrubec@sentry.io>
Date: Tue, 11 Nov 2025 10:09:03 +0100
Subject: [PATCH 043/186] feat(core): Truncate request string inputs in OpenAI
 integration (#18136)

The main OpenAI APIs are the
[completions](https://platform.openai.com/docs/api-reference/completions/create)
and
[responses](https://platform.openai.com/docs/api-reference/responses/create)
API. Currently we truncate messages sent to the API only if the user
input is an array of strings. This works for the completions, but not
for the responses API (where the input is a plain string).

Updated the truncation logic to also truncate if the input is a plain
string (+ test to verify everything works now as expected).
---
 ...enario-message-truncation-completions.mjs} |  2 +-
 .../scenario-message-truncation-responses.mjs | 93 +++++++++++++++++++
 .../suites/tracing/openai/test.ts             | 38 +++++++-
 .../core/src/utils/ai/messageTruncation.ts    | 10 ++
 packages/core/src/utils/ai/utils.ts           |  4 +-
 5 files changed, 143 insertions(+), 4 deletions(-)
 rename dev-packages/node-integration-tests/suites/tracing/openai/{scenario-message-truncation.mjs => scenario-message-truncation-completions.mjs} (97%)
 create mode 100644 dev-packages/node-integration-tests/suites/tracing/openai/scenario-message-truncation-responses.mjs

diff --git a/dev-packages/node-integration-tests/suites/tracing/openai/scenario-message-truncation.mjs b/dev-packages/node-integration-tests/suites/tracing/openai/scenario-message-truncation-completions.mjs
similarity index 97%
rename from dev-packages/node-integration-tests/suites/tracing/openai/scenario-message-truncation.mjs
rename to dev-packages/node-integration-tests/suites/tracing/openai/scenario-message-truncation-completions.mjs
index 5623d3763657..96684ed9ec4f 100644
--- a/dev-packages/node-integration-tests/suites/tracing/openai/scenario-message-truncation.mjs
+++ b/dev-packages/node-integration-tests/suites/tracing/openai/scenario-message-truncation-completions.mjs
@@ -12,7 +12,7 @@ class MockOpenAI {
           await new Promise(resolve => setTimeout(resolve, 10));
 
           return {
-            id: 'chatcmpl-truncation-test',
+            id: 'chatcmpl-completions-truncation-test',
             object: 'chat.completion',
             created: 1677652288,
             model: params.model,
diff --git a/dev-packages/node-integration-tests/suites/tracing/openai/scenario-message-truncation-responses.mjs b/dev-packages/node-integration-tests/suites/tracing/openai/scenario-message-truncation-responses.mjs
new file mode 100644
index 000000000000..aebd3341eb33
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/openai/scenario-message-truncation-responses.mjs
@@ -0,0 +1,93 @@
+import { instrumentOpenAiClient } from '@sentry/core';
+import * as Sentry from '@sentry/node';
+
+class MockOpenAI {
+  constructor(config) {
+    this.apiKey = config.apiKey;
+
+    this.responses = {
+      create: async params => {
+        // Simulate processing time
+        await new Promise(resolve => setTimeout(resolve, 10));
+
+        return {
+          id: 'chatcmpl-responses-truncation-test',
+          object: 'response',
+          created_at: 1677652288,
+          status: 'completed',
+          error: null,
+          incomplete_details: null,
+          instructions: null,
+          max_output_tokens: null,
+          model: params.model,
+          output: [
+            {
+              type: 'message',
+              id: 'message-123',
+              status: 'completed',
+              role: 'assistant',
+              content: [
+                {
+                  type: 'output_text',
+                  text: 'Response to truncated messages',
+                  annotations: [],
+                },
+              ],
+            },
+          ],
+          parallel_tool_calls: true,
+          previous_response_id: null,
+          reasoning: {
+            effort: null,
+            summary: null,
+          },
+          store: true,
+          temperature: params.temperature,
+          text: {
+            format: {
+              type: 'text',
+            },
+          },
+          tool_choice: 'auto',
+          tools: [],
+          top_p: 1.0,
+          truncation: 'disabled',
+          usage: {
+            input_tokens: 10,
+            input_tokens_details: {
+              cached_tokens: 0,
+            },
+            output_tokens: 15,
+            output_tokens_details: {
+              reasoning_tokens: 0,
+            },
+            total_tokens: 25,
+          },
+          user: null,
+          metadata: {},
+        };
+      },
+    };
+  }
+}
+
+async function run() {
+  await Sentry.startSpan({ op: 'function', name: 'main' }, async () => {
+    const mockClient = new MockOpenAI({
+      apiKey: 'mock-api-key',
+    });
+
+    const client = instrumentOpenAiClient(mockClient);
+
+    // Create 1 large message that gets truncated to fit within the 20KB limit
+    const largeContent = 'A'.repeat(25000) + 'B'.repeat(25000); // ~50KB gets truncated to include only As
+
+    await client.responses.create({
+      model: 'gpt-3.5-turbo',
+      input: largeContent,
+      temperature: 0.7,
+    });
+  });
+}
+
+run();
diff --git a/dev-packages/node-integration-tests/suites/tracing/openai/test.ts b/dev-packages/node-integration-tests/suites/tracing/openai/test.ts
index 218e3c7ee61f..5cbb27df73bf 100644
--- a/dev-packages/node-integration-tests/suites/tracing/openai/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/openai/test.ts
@@ -400,7 +400,7 @@ describe('OpenAI integration', () => {
 
   createEsmAndCjsTests(
     __dirname,
-    'scenario-message-truncation.mjs',
+    'scenario-message-truncation-completions.mjs',
     'instrument-with-pii.mjs',
     (createRunner, test) => {
       test('truncates messages when they exceed byte limit - keeps only last message and crops it', async () => {
@@ -433,4 +433,40 @@ describe('OpenAI integration', () => {
       });
     },
   );
+
+  createEsmAndCjsTests(
+    __dirname,
+    'scenario-message-truncation-responses.mjs',
+    'instrument-with-pii.mjs',
+    (createRunner, test) => {
+      test('truncates string inputs when they exceed byte limit', async () => {
+        await createRunner()
+          .ignore('event')
+          .expect({
+            transaction: {
+              transaction: 'main',
+              spans: expect.arrayContaining([
+                expect.objectContaining({
+                  data: expect.objectContaining({
+                    'gen_ai.operation.name': 'responses',
+                    'sentry.op': 'gen_ai.responses',
+                    'sentry.origin': 'auto.ai.openai',
+                    'gen_ai.system': 'openai',
+                    'gen_ai.request.model': 'gpt-3.5-turbo',
+                    // Messages should be present and should include truncated string input (contains only As)
+                    'gen_ai.request.messages': expect.stringMatching(/^A+$/),
+                  }),
+                  description: 'responses gpt-3.5-turbo',
+                  op: 'gen_ai.responses',
+                  origin: 'auto.ai.openai',
+                  status: 'ok',
+                }),
+              ]),
+            },
+          })
+          .start()
+          .completed();
+      });
+    },
+  );
 });
diff --git a/packages/core/src/utils/ai/messageTruncation.ts b/packages/core/src/utils/ai/messageTruncation.ts
index 64d186f927b8..945761f6220c 100644
--- a/packages/core/src/utils/ai/messageTruncation.ts
+++ b/packages/core/src/utils/ai/messageTruncation.ts
@@ -294,3 +294,13 @@ export function truncateMessagesByBytes(messages: unknown[], maxBytes: number):
 export function truncateGenAiMessages(messages: unknown[]): unknown[] {
   return truncateMessagesByBytes(messages, DEFAULT_GEN_AI_MESSAGES_BYTE_LIMIT);
 }
+
+/**
+ * Truncate GenAI string input using the default byte limit.
+ *
+ * @param input - The string to truncate
+ * @returns Truncated string
+ */
+export function truncateGenAiStringInput(input: string): string {
+  return truncateTextByBytes(input, DEFAULT_GEN_AI_MESSAGES_BYTE_LIMIT);
+}
diff --git a/packages/core/src/utils/ai/utils.ts b/packages/core/src/utils/ai/utils.ts
index 00e147a16e5f..4a7a14eea554 100644
--- a/packages/core/src/utils/ai/utils.ts
+++ b/packages/core/src/utils/ai/utils.ts
@@ -7,7 +7,7 @@ import {
   GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE,
   GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE,
 } from './gen-ai-attributes';
-import { truncateGenAiMessages } from './messageTruncation';
+import { truncateGenAiMessages, truncateGenAiStringInput } from './messageTruncation';
 /**
  * Maps AI method paths to Sentry operation name
  */
@@ -95,7 +95,7 @@ export function setTokenUsageAttributes(
 export function getTruncatedJsonString<T>(value: T | T[]): string {
   if (typeof value === 'string') {
     // Some values are already JSON strings, so we don't need to duplicate the JSON parsing
-    return value;
+    return truncateGenAiStringInput(value);
   }
   if (Array.isArray(value)) {
     // truncateGenAiMessages returns an array of strings, so we need to stringify it

From b3e65e01fb42fc67862a97d963ccd730bbf635d8 Mon Sep 17 00:00:00 2001
From: Charly Gomez <charly.gomez@sentry.io>
Date: Tue, 11 Nov 2025 13:48:25 +0100
Subject: [PATCH 044/186] feat(cloudflare): Add metrics exports (#18147)

closes https://github.com/getsentry/sentry-javascript/issues/18150
---
 packages/cloudflare/src/index.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/cloudflare/src/index.ts b/packages/cloudflare/src/index.ts
index a6aa7ffc8d9a..36de54816030 100644
--- a/packages/cloudflare/src/index.ts
+++ b/packages/cloudflare/src/index.ts
@@ -16,6 +16,7 @@ export type {
   Stacktrace,
   Thread,
   User,
+  Metric,
 } from '@sentry/core';
 
 export type { CloudflareOptions } from './client';
@@ -100,6 +101,7 @@ export {
   featureFlagsIntegration,
   growthbookIntegration,
   logger,
+  metrics,
 } from '@sentry/core';
 
 export { withSentry } from './handler';

From b03617a6e9b4c105a940ac9a93a1af326e41b39c Mon Sep 17 00:00:00 2001
From: Charly Gomez <charly.gomez@sentry.io>
Date: Tue, 11 Nov 2025 13:48:41 +0100
Subject: [PATCH 045/186] feat(vercel-edge): Add metrics export (#18148)

closes https://github.com/getsentry/sentry-javascript/issues/18151

ref https://github.com/getsentry/sentry-javascript/pull/18147
---
 packages/vercel-edge/src/index.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/vercel-edge/src/index.ts b/packages/vercel-edge/src/index.ts
index 7a73234f535e..4f5017bb8f6c 100644
--- a/packages/vercel-edge/src/index.ts
+++ b/packages/vercel-edge/src/index.ts
@@ -16,6 +16,7 @@ export type {
   Stacktrace,
   Thread,
   User,
+  Metric,
 } from '@sentry/core';
 
 export type { VercelEdgeOptions } from './types';
@@ -98,6 +99,7 @@ export {
   createLangChainCallbackHandler,
   featureFlagsIntegration,
   logger,
+  metrics,
 } from '@sentry/core';
 
 export { VercelEdgeClient } from './client';

From 76fef9805bf4c1b93e5fedfe1de3e62587548598 Mon Sep 17 00:00:00 2001
From: Charly Gomez <charly.gomez@sentry.io>
Date: Tue, 11 Nov 2025 13:48:57 +0100
Subject: [PATCH 046/186] feat(metrics): Add missing metric node exports
 (#18149)

Adds remaining node-based exports for metrics

closes https://github.com/getsentry/sentry-javascript/issues/18152
---
 .../node-exports-test-app/scripts/consistentExports.ts    | 8 --------
 packages/astro/src/index.server.ts                        | 1 +
 packages/aws-serverless/src/index.ts                      | 1 +
 packages/bun/src/index.ts                                 | 2 ++
 packages/google-cloud-serverless/src/index.ts             | 1 +
 packages/sveltekit/src/server/index.ts                    | 1 +
 6 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts b/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts
index ee4b7ac35421..17c6f714c499 100644
--- a/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts
+++ b/dev-packages/e2e-tests/test-applications/node-exports-test-app/scripts/consistentExports.ts
@@ -41,8 +41,6 @@ const DEPENDENTS: Dependent[] = [
     ignoreExports: [
       // Not needed for Astro
       'setupFastifyErrorHandler',
-      // Todo(metrics): Add metrics exports for beta
-      'metrics',
     ],
   },
   {
@@ -56,8 +54,6 @@ const DEPENDENTS: Dependent[] = [
       'childProcessIntegration',
       'systemErrorIntegration',
       'pinoIntegration',
-      // Todo(metrics): Add metrics exports for beta
-      'metrics',
     ],
   },
   {
@@ -79,8 +75,6 @@ const DEPENDENTS: Dependent[] = [
     ignoreExports: [
       // Not needed for Serverless
       'setupFastifyErrorHandler',
-      // Todo(metrics): Add metrics exports for beta
-      'metrics',
     ],
   },
   {
@@ -90,8 +84,6 @@ const DEPENDENTS: Dependent[] = [
     ignoreExports: [
       // Not needed for Serverless
       'setupFastifyErrorHandler',
-      // Todo(metrics): Add metrics exports for beta
-      'metrics',
     ],
   },
   {
diff --git a/packages/astro/src/index.server.ts b/packages/astro/src/index.server.ts
index 69ca79e04a17..1774f597af43 100644
--- a/packages/astro/src/index.server.ts
+++ b/packages/astro/src/index.server.ts
@@ -162,6 +162,7 @@ export {
   statsigIntegration,
   unleashIntegration,
   growthbookIntegration,
+  metrics,
 } from '@sentry/node';
 
 export { init } from './server/sdk';
diff --git a/packages/aws-serverless/src/index.ts b/packages/aws-serverless/src/index.ts
index da0393d9b0e9..586babab40ee 100644
--- a/packages/aws-serverless/src/index.ts
+++ b/packages/aws-serverless/src/index.ts
@@ -148,6 +148,7 @@ export {
   statsigIntegration,
   unleashIntegration,
   growthbookIntegration,
+  metrics,
 } from '@sentry/node';
 
 export {
diff --git a/packages/bun/src/index.ts b/packages/bun/src/index.ts
index 33af15790191..813e087dc2d2 100644
--- a/packages/bun/src/index.ts
+++ b/packages/bun/src/index.ts
@@ -16,6 +16,7 @@ export type {
   Thread,
   User,
   FeatureFlagsIntegration,
+  Metric,
 } from '@sentry/core';
 
 export {
@@ -164,6 +165,7 @@ export {
   OpenFeatureIntegrationHook,
   statsigIntegration,
   unleashIntegration,
+  metrics,
 } from '@sentry/node';
 
 export {
diff --git a/packages/google-cloud-serverless/src/index.ts b/packages/google-cloud-serverless/src/index.ts
index 02e55c45a7ba..3aa7da1cbab9 100644
--- a/packages/google-cloud-serverless/src/index.ts
+++ b/packages/google-cloud-serverless/src/index.ts
@@ -148,6 +148,7 @@ export {
   OpenFeatureIntegrationHook,
   statsigIntegration,
   unleashIntegration,
+  metrics,
 } from '@sentry/node';
 
 export {
diff --git a/packages/sveltekit/src/server/index.ts b/packages/sveltekit/src/server/index.ts
index 0613d6397f96..88177f11354a 100644
--- a/packages/sveltekit/src/server/index.ts
+++ b/packages/sveltekit/src/server/index.ts
@@ -128,6 +128,7 @@ export {
   createConsolaReporter,
   createSentryWinstonTransport,
   vercelAIIntegration,
+  metrics,
 } from '@sentry/node';
 
 // We can still leave this for the carrier init and type exports

From a730d96b04fadbc130e3865a26bc0249324aaebf Mon Sep 17 00:00:00 2001
From: Charly Gomez <charly.gomez@sentry.io>
Date: Tue, 11 Nov 2025 14:24:13 +0100
Subject: [PATCH 047/186] meta(changelog): Update changelog for 10.25.0

---
 CHANGELOG.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f98b440d47d..d5cf4d9b810f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,23 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 10.25.0
+
+- feat(browser): Include Spotlight in development bundles ([#18078](https://github.com/getsentry/sentry-javascript/pull/18078))
+- feat(cloudflare): Add metrics exports ([#18147](https://github.com/getsentry/sentry-javascript/pull/18147))
+- feat(core): Truncate request string inputs in OpenAI integration ([#18136](https://github.com/getsentry/sentry-javascript/pull/18136))
+- feat(metrics): Add missing metric node exports ([#18149](https://github.com/getsentry/sentry-javascript/pull/18149))
+- feat(node): Add `maxCacheKeyLength` to Redis integration (remove truncation) ([#18045](https://github.com/getsentry/sentry-javascript/pull/18045))
+- feat(vercel-edge): Add metrics export ([#18148](https://github.com/getsentry/sentry-javascript/pull/18148))
+- fix(core): Only consider exception mechanism when updating session status from event with exceptions ([#18137](https://github.com/getsentry/sentry-javascript/pull/18137))
+- ref(browser): Remove truncation when not needed ([#18051](https://github.com/getsentry/sentry-javascript/pull/18051))
+
+<details>
+  <summary> <strong>Internal Changes</strong> </summary>
+
+- chore(build): Fix incorrect versions after merge ([#18154](https://github.com/getsentry/sentry-javascript/pull/18154))
+</details>
+
 ## 10.24.0
 
 ### Important Changes

From b6a7773544bc220f5499262c6f4e4705fe38ffb6 Mon Sep 17 00:00:00 2001
From: Nicolas Hrubec <nico.hrubec@sentry.io>
Date: Tue, 11 Nov 2025 14:41:24 +0100
Subject: [PATCH 048/186] feat(core): Support truncation for LangChain
 integration request messages (#18157)

This PR adds [truncation support for LangChain integration request
messages](https://github.com/getsentry/sentry-javascript/issues/18018).
All messages already get normalized to arrays of messages, so here we
need no case distinction for strings.

Adds tests to verify behavior for 1. simple string inputs and 2.
conversations in the form of arrays of strings.

Closes #18018
---
 .../langchain/scenario-message-truncation.mjs | 72 +++++++++++++++++++
 .../suites/tracing/langchain/test.ts          | 51 +++++++++++++
 packages/core/src/utils/langchain/utils.ts    |  4 +-
 3 files changed, 126 insertions(+), 1 deletion(-)
 create mode 100644 dev-packages/node-integration-tests/suites/tracing/langchain/scenario-message-truncation.mjs

diff --git a/dev-packages/node-integration-tests/suites/tracing/langchain/scenario-message-truncation.mjs b/dev-packages/node-integration-tests/suites/tracing/langchain/scenario-message-truncation.mjs
new file mode 100644
index 000000000000..6dafe8572cec
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/langchain/scenario-message-truncation.mjs
@@ -0,0 +1,72 @@
+import { ChatAnthropic } from '@langchain/anthropic';
+import * as Sentry from '@sentry/node';
+import express from 'express';
+
+function startMockAnthropicServer() {
+  const app = express();
+  app.use(express.json());
+
+  app.post('/v1/messages', (req, res) => {
+    const model = req.body.model;
+
+    res.json({
+      id: 'msg_truncation_test',
+      type: 'message',
+      role: 'assistant',
+      content: [
+        {
+          type: 'text',
+          text: 'Response to truncated messages',
+        },
+      ],
+      model: model,
+      stop_reason: 'end_turn',
+      stop_sequence: null,
+      usage: {
+        input_tokens: 10,
+        output_tokens: 15,
+      },
+    });
+  });
+
+  return new Promise(resolve => {
+    const server = app.listen(0, () => {
+      resolve(server);
+    });
+  });
+}
+
+async function run() {
+  const server = await startMockAnthropicServer();
+  const baseUrl = `http://localhost:${server.address().port}`;
+
+  await Sentry.startSpan({ op: 'function', name: 'main' }, async () => {
+    const model = new ChatAnthropic({
+      model: 'claude-3-5-sonnet-20241022',
+      apiKey: 'mock-api-key',
+      clientOptions: {
+        baseURL: baseUrl,
+      },
+    });
+
+    const largeContent1 = 'A'.repeat(15000); // ~15KB
+    const largeContent2 = 'B'.repeat(15000); // ~15KB
+    const largeContent3 = 'C'.repeat(25000); // ~25KB (will be truncated)
+
+    // Create one very large string that gets truncated to only include Cs
+    await model.invoke(largeContent3 + largeContent2);
+
+    // Create an array of messages that gets truncated to only include the last message (result should again contain only Cs)
+    await model.invoke([
+      { role: 'system', content: largeContent1 },
+      { role: 'user', content: largeContent2 },
+      { role: 'user', content: largeContent3 },
+    ]);
+  });
+
+  await Sentry.flush(2000);
+
+  server.close();
+}
+
+run();
diff --git a/dev-packages/node-integration-tests/suites/tracing/langchain/test.ts b/dev-packages/node-integration-tests/suites/tracing/langchain/test.ts
index 4de2f96b5dc5..ff0e95b8f8ad 100644
--- a/dev-packages/node-integration-tests/suites/tracing/langchain/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/langchain/test.ts
@@ -194,4 +194,55 @@ describe('LangChain integration', () => {
       await createRunner().ignore('event').expect({ transaction: EXPECTED_TRANSACTION_TOOL_CALLS }).start().completed();
     });
   });
+
+  const EXPECTED_TRANSACTION_MESSAGE_TRUNCATION = {
+    transaction: 'main',
+    spans: expect.arrayContaining([
+      expect.objectContaining({
+        data: expect.objectContaining({
+          'gen_ai.operation.name': 'chat',
+          'sentry.op': 'gen_ai.chat',
+          'sentry.origin': 'auto.ai.langchain',
+          'gen_ai.system': 'anthropic',
+          'gen_ai.request.model': 'claude-3-5-sonnet-20241022',
+          // Messages should be present and should include truncated string input (contains only Cs)
+          'gen_ai.request.messages': expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
+        }),
+        description: 'chat claude-3-5-sonnet-20241022',
+        op: 'gen_ai.chat',
+        origin: 'auto.ai.langchain',
+        status: 'ok',
+      }),
+      expect.objectContaining({
+        data: expect.objectContaining({
+          'gen_ai.operation.name': 'chat',
+          'sentry.op': 'gen_ai.chat',
+          'sentry.origin': 'auto.ai.langchain',
+          'gen_ai.system': 'anthropic',
+          'gen_ai.request.model': 'claude-3-5-sonnet-20241022',
+          // Messages should be present (truncation happened) and should be a JSON array of a single index (contains only Cs)
+          'gen_ai.request.messages': expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
+        }),
+        description: 'chat claude-3-5-sonnet-20241022',
+        op: 'gen_ai.chat',
+        origin: 'auto.ai.langchain',
+        status: 'ok',
+      }),
+    ]),
+  };
+
+  createEsmAndCjsTests(
+    __dirname,
+    'scenario-message-truncation.mjs',
+    'instrument-with-pii.mjs',
+    (createRunner, test) => {
+      test('truncates messages when they exceed byte limit', async () => {
+        await createRunner()
+          .ignore('event')
+          .expect({ transaction: EXPECTED_TRANSACTION_MESSAGE_TRUNCATION })
+          .start()
+          .completed();
+      });
+    },
+  );
 });
diff --git a/packages/core/src/utils/langchain/utils.ts b/packages/core/src/utils/langchain/utils.ts
index 8464e71aecb0..caacf5059bdc 100644
--- a/packages/core/src/utils/langchain/utils.ts
+++ b/packages/core/src/utils/langchain/utils.ts
@@ -23,6 +23,7 @@ import {
   GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE,
   GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE,
 } from '../ai/gen-ai-attributes';
+import { truncateGenAiMessages } from '../ai/messageTruncation';
 import { LANGCHAIN_ORIGIN, ROLE_MAP } from './constants';
 import type { LangChainLLMResult, LangChainMessage, LangChainSerialized } from './types';
 
@@ -281,7 +282,8 @@ export function extractChatModelRequestAttributes(
 
   if (recordInputs && Array.isArray(langChainMessages) && langChainMessages.length > 0) {
     const normalized = normalizeLangChainMessages(langChainMessages.flat());
-    setIfDefined(attrs, GEN_AI_REQUEST_MESSAGES_ATTRIBUTE, asString(normalized));
+    const truncated = truncateGenAiMessages(normalized);
+    setIfDefined(attrs, GEN_AI_REQUEST_MESSAGES_ATTRIBUTE, asString(truncated));
   }
 
   return attrs;

From 3be2092005a0c019b162c3db2ada702ddc1504a2 Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Tue, 11 Nov 2025 14:51:18 +0100
Subject: [PATCH 049/186] test(browser-integration): Fix incorrect tag value
 assertions (#18162)

Fixes faulty test assertions where we asserted for certain properties to
_not_ be in an object but used `toMatchObject` to do so.
---
 .../public-api/setTag/with_non_primitives/test.ts    | 12 ++++++++++--
 .../suites/public-api/setTag/with_primitives/test.ts |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/dev-packages/browser-integration-tests/suites/public-api/setTag/with_non_primitives/test.ts b/dev-packages/browser-integration-tests/suites/public-api/setTag/with_non_primitives/test.ts
index 181711650074..648187404c0e 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/setTag/with_non_primitives/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/setTag/with_non_primitives/test.ts
@@ -3,11 +3,19 @@ import type { Event } from '@sentry/core';
 import { sentryTest } from '../../../../utils/fixtures';
 import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
 
-sentryTest('should not accept non-primitive tags', async ({ getLocalTestUrl, page }) => {
+sentryTest('[bug] accepts non-primitive tags', async ({ getLocalTestUrl, page }) => {
+  // this is a bug that went unnoticed due to type definitions and a bad assertion
+  // TODO: We should not accept non-primitive tags. Fix this as a follow-up.
   const url = await getLocalTestUrl({ testDir: __dirname });
 
   const eventData = await getFirstSentryEnvelopeRequest<Event>(page, url);
 
   expect(eventData.message).toBe('non_primitives');
-  expect(eventData.tags).toMatchObject({});
+
+  // TODO: This should be an empty object but instead, it is:
+  expect(eventData.tags).toEqual({
+    tag_1: {},
+    tag_2: [],
+    tag_3: ['a', {}],
+  });
 });
diff --git a/dev-packages/browser-integration-tests/suites/public-api/setTag/with_primitives/test.ts b/dev-packages/browser-integration-tests/suites/public-api/setTag/with_primitives/test.ts
index 47116b6554bb..2b4922e4a86e 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/setTag/with_primitives/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/setTag/with_primitives/test.ts
@@ -9,7 +9,7 @@ sentryTest('should set primitive tags', async ({ getLocalTestUrl, page }) => {
   const eventData = await getFirstSentryEnvelopeRequest<Event>(page, url);
 
   expect(eventData.message).toBe('primitive_tags');
-  expect(eventData.tags).toMatchObject({
+  expect(eventData.tags).toEqual({
     tag_1: 'foo',
     tag_2: 3.141592653589793,
     tag_3: false,

From a36b67212ab04f9e194b814c21735ddce553bd43 Mon Sep 17 00:00:00 2001
From: Sigrid Huemer <32902192+s1gr1d@users.noreply.github.com>
Date: Tue, 11 Nov 2025 16:15:56 +0100
Subject: [PATCH 050/186] test(profiling): Add test utils to validate Profile
 Chunk envelope (#18170)

This PR adds two utility functions for testing the profile envelope:
`validateProfilePayloadMetadata` and `validateProfile`. As More tests
are going to be added, I don't want to copy-paste the same tests over
and over.


Part of https://github.com/getsentry/sentry-javascript/issues/17279
---
 .../suites/profiling/legacyMode/test.ts       |  88 ++-------
 .../suites/profiling/test-utils.ts            | 151 +++++++++++++++
 .../test.ts                                   | 172 ++++--------------
 .../test.ts                                   | 121 ++----------
 4 files changed, 214 insertions(+), 318 deletions(-)
 create mode 100644 dev-packages/browser-integration-tests/suites/profiling/test-utils.ts

diff --git a/dev-packages/browser-integration-tests/suites/profiling/legacyMode/test.ts b/dev-packages/browser-integration-tests/suites/profiling/legacyMode/test.ts
index d473236cdfda..4d8caa3a2be3 100644
--- a/dev-packages/browser-integration-tests/suites/profiling/legacyMode/test.ts
+++ b/dev-packages/browser-integration-tests/suites/profiling/legacyMode/test.ts
@@ -6,6 +6,7 @@ import {
   shouldSkipTracingTest,
   waitForTransactionRequestOnUrl,
 } from '../../../utils/helpers';
+import { validateProfile } from '../test-utils';
 
 sentryTest(
   'does not send profile envelope when document-policy is not set',
@@ -41,79 +42,16 @@ sentryTest('sends profile envelope in legacy mode', async ({ page, getLocalTestU
   const profile = profileEvent.profile;
   expect(profileEvent.profile).toBeDefined();
 
-  expect(profile.samples).toBeDefined();
-  expect(profile.stacks).toBeDefined();
-  expect(profile.frames).toBeDefined();
-  expect(profile.thread_metadata).toBeDefined();
-
-  // Samples
-  expect(profile.samples.length).toBeGreaterThanOrEqual(2);
-  for (const sample of profile.samples) {
-    expect(typeof sample.elapsed_since_start_ns).toBe('string');
-    expect(sample.elapsed_since_start_ns).toMatch(/^\d+$/); // Numeric string
-    expect(parseInt(sample.elapsed_since_start_ns, 10)).toBeGreaterThanOrEqual(0);
-
-    expect(typeof sample.stack_id).toBe('number');
-    expect(sample.stack_id).toBeGreaterThanOrEqual(0);
-    expect(sample.thread_id).toBe('0'); // Should be main thread
-  }
-
-  // Stacks
-  expect(profile.stacks.length).toBeGreaterThan(0);
-  for (const stack of profile.stacks) {
-    expect(Array.isArray(stack)).toBe(true);
-    for (const frameIndex of stack) {
-      expect(typeof frameIndex).toBe('number');
-      expect(frameIndex).toBeGreaterThanOrEqual(0);
-      expect(frameIndex).toBeLessThan(profile.frames.length);
-    }
-  }
-
-  // Frames
-  expect(profile.frames.length).toBeGreaterThan(0);
-  for (const frame of profile.frames) {
-    expect(frame).toHaveProperty('function');
-    expect(typeof frame.function).toBe('string');
-
-    if (frame.function !== 'fetch' && frame.function !== 'setTimeout') {
-      expect(frame).toHaveProperty('abs_path');
-      expect(frame).toHaveProperty('lineno');
-      expect(frame).toHaveProperty('colno');
-      expect(typeof frame.abs_path).toBe('string');
-      expect(typeof frame.lineno).toBe('number');
-      expect(typeof frame.colno).toBe('number');
-    }
-  }
-
-  const functionNames = profile.frames.map(frame => frame.function).filter(name => name !== '');
-
-  if ((process.env.PW_BUNDLE || '').endsWith('min')) {
-    // Function names are minified in minified bundles
-    expect(functionNames.length).toBeGreaterThan(0);
-    expect((functionNames as string[]).every(name => name?.length > 0)).toBe(true); // Just make sure they're not empty strings
-  } else {
-    expect(functionNames).toEqual(
-      expect.arrayContaining([
-        '_startRootSpan',
-        'withScope',
-        'createChildOrRootSpan',
-        'startSpanManual',
-        'startProfileForSpan',
-        'startJSSelfProfile',
-      ]),
-    );
-  }
-
-  expect(profile.thread_metadata).toHaveProperty('0');
-  expect(profile.thread_metadata['0']).toHaveProperty('name');
-  expect(profile.thread_metadata['0'].name).toBe('main');
-
-  // Test that profile duration makes sense (should be > 20ms based on test setup)
-  const startTime = parseInt(profile.samples[0].elapsed_since_start_ns, 10);
-  const endTime = parseInt(profile.samples[profile.samples.length - 1].elapsed_since_start_ns, 10);
-  const durationNs = endTime - startTime;
-  const durationMs = durationNs / 1_000_000; // Convert ns to ms
-
-  // Should be at least 20ms based on our setTimeout(21) in the test
-  expect(durationMs).toBeGreaterThan(20);
+  validateProfile(profile, {
+    expectedFunctionNames: [
+      '_startRootSpan',
+      'withScope',
+      'createChildOrRootSpan',
+      'startSpanManual',
+      'startProfileForSpan',
+      'startJSSelfProfile',
+    ],
+    minSampleDurationMs: 20,
+    isChunkFormat: false,
+  });
 });
diff --git a/dev-packages/browser-integration-tests/suites/profiling/test-utils.ts b/dev-packages/browser-integration-tests/suites/profiling/test-utils.ts
new file mode 100644
index 000000000000..e150be2d56bc
--- /dev/null
+++ b/dev-packages/browser-integration-tests/suites/profiling/test-utils.ts
@@ -0,0 +1,151 @@
+import { expect } from '@playwright/test';
+import type { ContinuousThreadCpuProfile, ProfileChunk, ThreadCpuProfile } from '@sentry/core';
+
+interface ValidateProfileOptions {
+  expectedFunctionNames?: string[];
+  minSampleDurationMs?: number;
+  isChunkFormat?: boolean;
+}
+
+/**
+ * Validates the metadata of a profile chunk envelope.
+ * https://develop.sentry.dev/sdk/telemetry/profiles/sample-format-v2/
+ */
+export function validateProfilePayloadMetadata(profileChunk: ProfileChunk): void {
+  expect(profileChunk.version).toBe('2');
+  expect(profileChunk.platform).toBe('javascript');
+
+  expect(typeof profileChunk.profiler_id).toBe('string');
+  expect(profileChunk.profiler_id).toMatch(/^[a-f\d]{32}$/);
+
+  expect(typeof profileChunk.chunk_id).toBe('string');
+  expect(profileChunk.chunk_id).toMatch(/^[a-f\d]{32}$/);
+
+  expect(profileChunk.client_sdk).toBeDefined();
+  expect(typeof profileChunk.client_sdk.name).toBe('string');
+  expect(typeof profileChunk.client_sdk.version).toBe('string');
+
+  expect(typeof profileChunk.release).toBe('string');
+
+  expect(profileChunk.debug_meta).toBeDefined();
+  expect(Array.isArray(profileChunk?.debug_meta?.images)).toBe(true);
+}
+
+/**
+ * Validates the basic structure and content of a Sentry profile.
+ */
+export function validateProfile(
+  profile: ThreadCpuProfile | ContinuousThreadCpuProfile,
+  options: ValidateProfileOptions = {},
+): void {
+  const { expectedFunctionNames, minSampleDurationMs, isChunkFormat = false } = options;
+
+  // Basic profile structure
+  expect(profile.samples).toBeDefined();
+  expect(profile.stacks).toBeDefined();
+  expect(profile.frames).toBeDefined();
+  expect(profile.thread_metadata).toBeDefined();
+
+  // SAMPLES
+  expect(profile.samples.length).toBeGreaterThanOrEqual(2);
+  let previousTimestamp: number = Number.NEGATIVE_INFINITY;
+
+  for (const sample of profile.samples) {
+    expect(typeof sample.stack_id).toBe('number');
+    expect(sample.stack_id).toBeGreaterThanOrEqual(0);
+    expect(sample.stack_id).toBeLessThan(profile.stacks.length);
+
+    expect(sample.thread_id).toBe('0'); // Should be main thread
+
+    // Timestamp validation - differs between chunk format (v2) and legacy format
+    if (isChunkFormat) {
+      const chunkProfileSample = sample as ContinuousThreadCpuProfile['samples'][number];
+
+      // Chunk format uses numeric timestamps (UNIX timestamp in seconds with microseconds precision)
+      expect(typeof chunkProfileSample.timestamp).toBe('number');
+      const ts = chunkProfileSample.timestamp;
+      expect(Number.isFinite(ts)).toBe(true);
+      expect(ts).toBeGreaterThan(0);
+      // Monotonic non-decreasing timestamps
+      expect(ts).toBeGreaterThanOrEqual(previousTimestamp);
+      previousTimestamp = ts;
+    } else {
+      // Legacy format uses elapsed_since_start_ns as a string
+      const legacyProfileSample = sample as ThreadCpuProfile['samples'][number];
+
+      expect(typeof legacyProfileSample.elapsed_since_start_ns).toBe('string');
+      expect(legacyProfileSample.elapsed_since_start_ns).toMatch(/^\d+$/); // Numeric string
+      expect(parseInt(legacyProfileSample.elapsed_since_start_ns, 10)).toBeGreaterThanOrEqual(0);
+    }
+  }
+
+  // STACKS
+  expect(profile.stacks.length).toBeGreaterThan(0);
+  for (const stack of profile.stacks) {
+    expect(Array.isArray(stack)).toBe(true);
+    for (const frameIndex of stack) {
+      expect(typeof frameIndex).toBe('number');
+      expect(frameIndex).toBeGreaterThanOrEqual(0);
+      expect(frameIndex).toBeLessThan(profile.frames.length);
+    }
+  }
+
+  // Frames
+  expect(profile.frames.length).toBeGreaterThan(0);
+  for (const frame of profile.frames) {
+    expect(frame).toHaveProperty('function');
+    expect(typeof frame.function).toBe('string');
+
+    // Some browser functions (fetch, setTimeout) may not have file locations
+    if (frame.function !== 'fetch' && frame.function !== 'setTimeout') {
+      expect(frame).toHaveProperty('abs_path');
+      expect(frame).toHaveProperty('lineno');
+      expect(frame).toHaveProperty('colno');
+      expect(typeof frame.abs_path).toBe('string');
+      expect(typeof frame.lineno).toBe('number');
+      expect(typeof frame.colno).toBe('number');
+    }
+  }
+
+  // Function names validation (only when not minified and expected names provided)
+  if (expectedFunctionNames && expectedFunctionNames.length > 0) {
+    const functionNames = profile.frames.map(frame => frame.function).filter(name => name !== '');
+
+    if ((process.env.PW_BUNDLE || '').endsWith('min')) {
+      // In minified bundles, just check that we have some non-empty function names
+      expect(functionNames.length).toBeGreaterThan(0);
+      expect((functionNames as string[]).every(name => name?.length > 0)).toBe(true);
+    } else {
+      // In non-minified bundles, check for expected function names
+      expect(functionNames).toEqual(expect.arrayContaining(expectedFunctionNames));
+    }
+  }
+
+  // THREAD METADATA
+  expect(profile.thread_metadata).toHaveProperty('0');
+  expect(profile.thread_metadata['0']).toHaveProperty('name');
+  expect(profile.thread_metadata['0'].name).toBe('main');
+
+  // DURATION
+  if (minSampleDurationMs !== undefined) {
+    let durationMs: number;
+
+    if (isChunkFormat) {
+      // Chunk format: timestamps are in seconds
+      const chunkProfile = profile as ContinuousThreadCpuProfile;
+
+      const startTimeSec = chunkProfile.samples[0].timestamp;
+      const endTimeSec = chunkProfile.samples[chunkProfile.samples.length - 1].timestamp;
+      durationMs = (endTimeSec - startTimeSec) * 1000; // Convert to ms
+    } else {
+      // Legacy format: elapsed_since_start_ns is in nanoseconds
+      const legacyProfile = profile as ThreadCpuProfile;
+
+      const startTimeNs = parseInt(legacyProfile.samples[0].elapsed_since_start_ns, 10);
+      const endTimeNs = parseInt(legacyProfile.samples[legacyProfile.samples.length - 1].elapsed_since_start_ns, 10);
+      durationMs = (endTimeNs - startTimeNs) / 1_000_000; // Convert ns to ms
+    }
+
+    expect(durationMs).toBeGreaterThan(minSampleDurationMs);
+  }
+}
diff --git a/dev-packages/browser-integration-tests/suites/profiling/traceLifecycleMode_multiple-chunks/test.ts b/dev-packages/browser-integration-tests/suites/profiling/traceLifecycleMode_multiple-chunks/test.ts
index 421cdfc1e645..5afc23a3a75f 100644
--- a/dev-packages/browser-integration-tests/suites/profiling/traceLifecycleMode_multiple-chunks/test.ts
+++ b/dev-packages/browser-integration-tests/suites/profiling/traceLifecycleMode_multiple-chunks/test.ts
@@ -7,6 +7,7 @@ import {
   properFullEnvelopeRequestParser,
   shouldSkipTracingTest,
 } from '../../../utils/helpers';
+import { validateProfile, validateProfilePayloadMetadata } from '../test-utils';
 
 sentryTest(
   'does not send profile envelope when document-policy is not set',
@@ -51,109 +52,24 @@ sentryTest(
     const envelopeItemPayload1 = profileChunkEnvelopeItem[1];
 
     expect(envelopeItemHeader).toHaveProperty('type', 'profile_chunk');
-
     expect(envelopeItemPayload1.profile).toBeDefined();
-    expect(envelopeItemPayload1.version).toBe('2');
-    expect(envelopeItemPayload1.platform).toBe('javascript');
-
-    // Required profile metadata (Sample Format V2)
-    expect(typeof envelopeItemPayload1.profiler_id).toBe('string');
-    expect(envelopeItemPayload1.profiler_id).toMatch(/^[a-f\d]{32}$/);
-    expect(typeof envelopeItemPayload1.chunk_id).toBe('string');
-    expect(envelopeItemPayload1.chunk_id).toMatch(/^[a-f\d]{32}$/);
-    expect(envelopeItemPayload1.client_sdk).toBeDefined();
-    expect(typeof envelopeItemPayload1.client_sdk.name).toBe('string');
-    expect(typeof envelopeItemPayload1.client_sdk.version).toBe('string');
-    expect(typeof envelopeItemPayload1.release).toBe('string');
-    expect(envelopeItemPayload1.debug_meta).toBeDefined();
-    expect(Array.isArray(envelopeItemPayload1?.debug_meta?.images)).toBe(true);
-
-    const profile1 = envelopeItemPayload1.profile;
-
-    expect(profile1.samples).toBeDefined();
-    expect(profile1.stacks).toBeDefined();
-    expect(profile1.frames).toBeDefined();
-    expect(profile1.thread_metadata).toBeDefined();
-
-    // Samples
-    expect(profile1.samples.length).toBeGreaterThanOrEqual(2);
-    let previousTimestamp = Number.NEGATIVE_INFINITY;
-    for (const sample of profile1.samples) {
-      expect(typeof sample.stack_id).toBe('number');
-      expect(sample.stack_id).toBeGreaterThanOrEqual(0);
-      expect(sample.stack_id).toBeLessThan(profile1.stacks.length);
-
-      // In trace lifecycle mode, samples carry a numeric timestamp (ms since epoch or similar clock)
-      expect(typeof (sample as any).timestamp).toBe('number');
-      const ts = (sample as any).timestamp as number;
-      expect(Number.isFinite(ts)).toBe(true);
-      expect(ts).toBeGreaterThan(0);
-      // Monotonic non-decreasing timestamps
-      expect(ts).toBeGreaterThanOrEqual(previousTimestamp);
-      previousTimestamp = ts;
-
-      expect(sample.thread_id).toBe('0'); // Should be main thread
-    }
-
-    // Stacks
-    expect(profile1.stacks.length).toBeGreaterThan(0);
-    for (const stack of profile1.stacks) {
-      expect(Array.isArray(stack)).toBe(true);
-      for (const frameIndex of stack) {
-        expect(typeof frameIndex).toBe('number');
-        expect(frameIndex).toBeGreaterThanOrEqual(0);
-        expect(frameIndex).toBeLessThan(profile1.frames.length);
-      }
-    }
-
-    // Frames
-    expect(profile1.frames.length).toBeGreaterThan(0);
-    for (const frame of profile1.frames) {
-      expect(frame).toHaveProperty('function');
-      expect(typeof frame.function).toBe('string');
-
-      if (frame.function !== 'fetch' && frame.function !== 'setTimeout') {
-        expect(frame).toHaveProperty('abs_path');
-        expect(frame).toHaveProperty('lineno');
-        expect(frame).toHaveProperty('colno');
-        expect(typeof frame.abs_path).toBe('string');
-        expect(typeof frame.lineno).toBe('number');
-        expect(typeof frame.colno).toBe('number');
-      }
-    }
 
-    const functionNames = profile1.frames.map(frame => frame.function).filter(name => name !== '');
-
-    if ((process.env.PW_BUNDLE || '').endsWith('min')) {
-      // In bundled mode, function names are minified
-      expect(functionNames.length).toBeGreaterThan(0);
-      expect((functionNames as string[]).every(name => name?.length > 0)).toBe(true); // Just make sure they're not empty strings
-    } else {
-      expect(functionNames).toEqual(
-        expect.arrayContaining([
-          '_startRootSpan',
-          'withScope',
-          'createChildOrRootSpan',
-          'startSpanManual',
-          'startJSSelfProfile',
-
-          // first function is captured (other one is in other chunk)
-          'fibonacci',
-        ]),
-      );
-    }
-
-    expect(profile1.thread_metadata).toHaveProperty('0');
-    expect(profile1.thread_metadata['0']).toHaveProperty('name');
-    expect(profile1.thread_metadata['0'].name).toBe('main');
-
-    // Test that profile duration makes sense (should be > 20ms based on test setup)
-    const startTimeSec = (profile1.samples[0] as any).timestamp as number;
-    const endTimeSec = (profile1.samples[profile1.samples.length - 1] as any).timestamp as number;
-    const durationSec = endTimeSec - startTimeSec;
-
-    // Should be at least 20ms based on our setTimeout(21) in the test
-    expect(durationSec).toBeGreaterThan(0.2);
+    validateProfilePayloadMetadata(envelopeItemPayload1);
+
+    validateProfile(envelopeItemPayload1.profile, {
+      expectedFunctionNames: [
+        '_startRootSpan',
+        'withScope',
+        'createChildOrRootSpan',
+        'startSpanManual',
+        'startJSSelfProfile',
+        // first function is captured (other one is in other chunk)
+        'fibonacci',
+      ],
+      // Should be at least 20ms based on our setTimeout(21) in the test
+      minSampleDurationMs: 20,
+      isChunkFormat: true,
+    });
 
     // === PROFILE CHUNK 2 ===
 
@@ -161,46 +77,22 @@ sentryTest(
     const envelopeItemHeader2 = profileChunkEnvelopeItem2[0];
     const envelopeItemPayload2 = profileChunkEnvelopeItem2[1];
 
-    // Basic sanity on the second chunk: has correct envelope type and structure
     expect(envelopeItemHeader2).toHaveProperty('type', 'profile_chunk');
     expect(envelopeItemPayload2.profile).toBeDefined();
-    expect(envelopeItemPayload2.version).toBe('2');
-    expect(envelopeItemPayload2.platform).toBe('javascript');
-
-    // Required profile metadata (Sample Format V2)
-    // https://develop.sentry.dev/sdk/telemetry/profiles/sample-format-v2/
-    expect(typeof envelopeItemPayload2.profiler_id).toBe('string');
-    expect(envelopeItemPayload2.profiler_id).toMatch(/^[a-f\d]{32}$/);
-    expect(typeof envelopeItemPayload2.chunk_id).toBe('string');
-    expect(envelopeItemPayload2.chunk_id).toMatch(/^[a-f\d]{32}$/);
-    expect(envelopeItemPayload2.client_sdk).toBeDefined();
-    expect(typeof envelopeItemPayload2.client_sdk.name).toBe('string');
-    expect(typeof envelopeItemPayload2.client_sdk.version).toBe('string');
-    expect(typeof envelopeItemPayload2.release).toBe('string');
-    expect(envelopeItemPayload2.debug_meta).toBeDefined();
-    expect(Array.isArray(envelopeItemPayload2?.debug_meta?.images)).toBe(true);
-
-    const profile2 = envelopeItemPayload2.profile;
-
-    const functionNames2 = profile2.frames.map(frame => frame.function).filter(name => name !== '');
-
-    if ((process.env.PW_BUNDLE || '').endsWith('min')) {
-      // In bundled mode, function names are minified
-      expect(functionNames2.length).toBeGreaterThan(0);
-      expect((functionNames2 as string[]).every(name => name?.length > 0)).toBe(true); // Just make sure they're not empty strings
-    } else {
-      expect(functionNames2).toEqual(
-        expect.arrayContaining([
-          '_startRootSpan',
-          'withScope',
-          'createChildOrRootSpan',
-          'startSpanManual',
-          'startJSSelfProfile',
-
-          // second function is captured (other one is in other chunk)
-          'largeSum',
-        ]),
-      );
-    }
+
+    validateProfilePayloadMetadata(envelopeItemPayload2);
+
+    validateProfile(envelopeItemPayload2.profile, {
+      expectedFunctionNames: [
+        '_startRootSpan',
+        'withScope',
+        'createChildOrRootSpan',
+        'startSpanManual',
+        'startJSSelfProfile',
+        // second function is captured (other one is in other chunk)
+        'largeSum',
+      ],
+      isChunkFormat: true,
+    });
   },
 );
diff --git a/dev-packages/browser-integration-tests/suites/profiling/traceLifecycleMode_overlapping-spans/test.ts b/dev-packages/browser-integration-tests/suites/profiling/traceLifecycleMode_overlapping-spans/test.ts
index 161f74d64e83..fa66a225b49b 100644
--- a/dev-packages/browser-integration-tests/suites/profiling/traceLifecycleMode_overlapping-spans/test.ts
+++ b/dev-packages/browser-integration-tests/suites/profiling/traceLifecycleMode_overlapping-spans/test.ts
@@ -8,6 +8,7 @@ import {
   shouldSkipTracingTest,
   waitForTransactionRequestOnUrl,
 } from '../../../utils/helpers';
+import { validateProfile, validateProfilePayloadMetadata } from '../test-utils';
 
 sentryTest(
   'does not send profile envelope when document-policy is not set',
@@ -52,111 +53,25 @@ sentryTest(
     const envelopeItemPayload = profileChunkEnvelopeItem[1];
 
     expect(envelopeItemHeader).toHaveProperty('type', 'profile_chunk');
-
     expect(envelopeItemPayload.profile).toBeDefined();
-    expect(envelopeItemPayload.version).toBe('2');
-    expect(envelopeItemPayload.platform).toBe('javascript');
-
-    // Required profile metadata (Sample Format V2)
-    // https://develop.sentry.dev/sdk/telemetry/profiles/sample-format-v2/
-    expect(typeof envelopeItemPayload.profiler_id).toBe('string');
-    expect(envelopeItemPayload.profiler_id).toMatch(/^[a-f\d]{32}$/);
-    expect(typeof envelopeItemPayload.chunk_id).toBe('string');
-    expect(envelopeItemPayload.chunk_id).toMatch(/^[a-f\d]{32}$/);
-    expect(envelopeItemPayload.client_sdk).toBeDefined();
-    expect(typeof envelopeItemPayload.client_sdk.name).toBe('string');
-    expect(typeof envelopeItemPayload.client_sdk.version).toBe('string');
-    expect(typeof envelopeItemPayload.release).toBe('string');
-    expect(envelopeItemPayload.debug_meta).toBeDefined();
-    expect(Array.isArray(envelopeItemPayload?.debug_meta?.images)).toBe(true);
-
-    const profile = envelopeItemPayload.profile;
-
-    expect(profile.samples).toBeDefined();
-    expect(profile.stacks).toBeDefined();
-    expect(profile.frames).toBeDefined();
-    expect(profile.thread_metadata).toBeDefined();
-
-    // Samples
-    expect(profile.samples.length).toBeGreaterThanOrEqual(2);
-    let previousTimestamp = Number.NEGATIVE_INFINITY;
-    for (const sample of profile.samples) {
-      expect(typeof sample.stack_id).toBe('number');
-      expect(sample.stack_id).toBeGreaterThanOrEqual(0);
-      expect(sample.stack_id).toBeLessThan(profile.stacks.length);
-
-      // In trace lifecycle mode, samples carry a numeric timestamp (ms since epoch or similar clock)
-      expect(typeof sample.timestamp).toBe('number');
-      const ts = sample.timestamp;
-      expect(Number.isFinite(ts)).toBe(true);
-      expect(ts).toBeGreaterThan(0);
-      // Monotonic non-decreasing timestamps
-      expect(ts).toBeGreaterThanOrEqual(previousTimestamp);
-      previousTimestamp = ts;
-
-      expect(sample.thread_id).toBe('0'); // Should be main thread
-    }
-
-    // Stacks
-    expect(profile.stacks.length).toBeGreaterThan(0);
-    for (const stack of profile.stacks) {
-      expect(Array.isArray(stack)).toBe(true);
-      for (const frameIndex of stack) {
-        expect(typeof frameIndex).toBe('number');
-        expect(frameIndex).toBeGreaterThanOrEqual(0);
-        expect(frameIndex).toBeLessThan(profile.frames.length);
-      }
-    }
-
-    // Frames
-    expect(profile.frames.length).toBeGreaterThan(0);
-    for (const frame of profile.frames) {
-      expect(frame).toHaveProperty('function');
-      expect(typeof frame.function).toBe('string');
-
-      if (frame.function !== 'fetch' && frame.function !== 'setTimeout') {
-        expect(frame).toHaveProperty('abs_path');
-        expect(frame).toHaveProperty('lineno');
-        expect(frame).toHaveProperty('colno');
-        expect(typeof frame.abs_path).toBe('string');
-        expect(typeof frame.lineno).toBe('number');
-        expect(typeof frame.colno).toBe('number');
-      }
-    }
-
-    const functionNames = profile.frames.map(frame => frame.function).filter(name => name !== '');
-
-    if ((process.env.PW_BUNDLE || '').endsWith('min')) {
-      // In bundled mode, function names are minified
-      expect(functionNames.length).toBeGreaterThan(0);
-      expect((functionNames as string[]).every(name => name?.length > 0)).toBe(true); // Just make sure they're not empty strings
-    } else {
-      expect(functionNames).toEqual(
-        expect.arrayContaining([
-          '_startRootSpan',
-          'withScope',
-          'createChildOrRootSpan',
-          'startSpanManual',
-          'startJSSelfProfile',
-
-          // both functions are captured
-          'fibonacci',
-          'largeSum',
-        ]),
-      );
-    }
-
-    expect(profile.thread_metadata).toHaveProperty('0');
-    expect(profile.thread_metadata['0']).toHaveProperty('name');
-    expect(profile.thread_metadata['0'].name).toBe('main');
-
-    // Test that profile duration makes sense (should be > 20ms based on test setup)
-    const startTimeSec = (profile.samples[0] as any).timestamp as number;
-    const endTimeSec = (profile.samples[profile.samples.length - 1] as any).timestamp as number;
-    const durationSec = endTimeSec - startTimeSec;
 
-    // Should be at least 20ms based on our setTimeout(21) in the test
-    expect(durationSec).toBeGreaterThan(0.2);
+    validateProfilePayloadMetadata(envelopeItemPayload);
+
+    validateProfile(envelopeItemPayload.profile, {
+      expectedFunctionNames: [
+        '_startRootSpan',
+        'withScope',
+        'createChildOrRootSpan',
+        'startSpanManual',
+        'startJSSelfProfile',
+        // both functions are captured
+        'fibonacci',
+        'largeSum',
+      ],
+      // Test that profile duration makes sense (should be > 20ms based on test setup
+      minSampleDurationMs: 20,
+      isChunkFormat: true,
+    });
   },
 );
 

From dd75ae74c3da6c02e3afba570d6b901b545b0785 Mon Sep 17 00:00:00 2001
From: Andrei <168741329+andreiborza@users.noreply.github.com>
Date: Tue, 11 Nov 2025 16:19:04 +0100
Subject: [PATCH 051/186] chore(test): Use correct `testTimeout` field in
 bundler-tests vitest config

---
 dev-packages/bundler-tests/vitest.config.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-packages/bundler-tests/vitest.config.mjs b/dev-packages/bundler-tests/vitest.config.mjs
index 8baf9e1fbf68..1198ee1d5f42 100644
--- a/dev-packages/bundler-tests/vitest.config.mjs
+++ b/dev-packages/bundler-tests/vitest.config.mjs
@@ -3,7 +3,7 @@ import { defineConfig } from 'vitest/config';
 export default defineConfig({
   test: {
     include: ['tests/**/*.test.*s'],
-    timeout: 10000,
+    testTimeout: 10000,
     hookTimeout: 10000,
   },
 });

From b08235b23f45bd72830fb5c6061532d5fca92d99 Mon Sep 17 00:00:00 2001
From: Andrei <168741329+andreiborza@users.noreply.github.com>
Date: Tue, 11 Nov 2025 17:42:20 +0100
Subject: [PATCH 052/186] chore(e2e): Pin `@embroider/addon-shim` to 1.10.0 for
 the e2e ember-embroider (#18173)

See: https://github.com/embroider-build/embroider/issues/2609
---
 .../e2e-tests/test-applications/ember-embroider/package.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dev-packages/e2e-tests/test-applications/ember-embroider/package.json b/dev-packages/e2e-tests/test-applications/ember-embroider/package.json
index b7a102917e80..78a2e202d1eb 100644
--- a/dev-packages/e2e-tests/test-applications/ember-embroider/package.json
+++ b/dev-packages/e2e-tests/test-applications/ember-embroider/package.json
@@ -68,5 +68,10 @@
   },
   "volta": {
     "extends": "../../package.json"
+  },
+  "pnpm": {
+    "overrides": {
+      "@embroider/addon-shim": "1.10.0"
+    }
   }
 }

From d9cf9a408420db1944247e1b90f753a48ebed976 Mon Sep 17 00:00:00 2001
From: getsentry-bot <bot@sentry.io>
Date: Tue, 11 Nov 2025 16:45:56 +0000
Subject: [PATCH 053/186] release: 10.25.0

---
 .../browser-integration-tests/package.json         |  4 ++--
 .../bundle-analyzer-scenarios/package.json         |  2 +-
 dev-packages/bundler-tests/package.json            | 10 +++++-----
 dev-packages/clear-cache-gh-action/package.json    |  2 +-
 .../cloudflare-integration-tests/package.json      |  6 +++---
 dev-packages/e2e-tests/package.json                |  2 +-
 .../external-contributor-gh-action/package.json    |  2 +-
 .../node-core-integration-tests/package.json       |  6 +++---
 dev-packages/node-integration-tests/package.json   | 10 +++++-----
 dev-packages/node-overhead-gh-action/package.json  |  4 ++--
 dev-packages/rollup-utils/package.json             |  2 +-
 dev-packages/size-limit-gh-action/package.json     |  2 +-
 dev-packages/test-utils/package.json               |  4 ++--
 lerna.json                                         |  2 +-
 packages/angular/package.json                      |  6 +++---
 packages/astro/package.json                        |  8 ++++----
 packages/aws-serverless/package.json               |  8 ++++----
 packages/browser-utils/package.json                |  4 ++--
 packages/browser/package.json                      | 14 +++++++-------
 packages/bun/package.json                          |  6 +++---
 packages/cloudflare/package.json                   |  4 ++--
 packages/core/package.json                         |  2 +-
 packages/deno/package.json                         |  4 ++--
 packages/ember/package.json                        |  6 +++---
 packages/eslint-config-sdk/package.json            |  6 +++---
 packages/eslint-plugin-sdk/package.json            |  2 +-
 packages/feedback/package.json                     |  4 ++--
 packages/gatsby/package.json                       |  6 +++---
 packages/google-cloud-serverless/package.json      |  6 +++---
 packages/integration-shims/package.json            |  4 ++--
 packages/nestjs/package.json                       |  6 +++---
 packages/nextjs/package.json                       | 14 +++++++-------
 packages/node-core/package.json                    |  6 +++---
 packages/node-native/package.json                  |  6 +++---
 packages/node/package.json                         |  8 ++++----
 packages/nuxt/package.json                         | 12 ++++++------
 packages/opentelemetry/package.json                |  4 ++--
 packages/profiling-node/package.json               |  6 +++---
 packages/react-router/package.json                 | 10 +++++-----
 packages/react/package.json                        |  6 +++---
 packages/remix/package.json                        |  8 ++++----
 packages/replay-canvas/package.json                |  6 +++---
 packages/replay-internal/package.json              |  8 ++++----
 packages/replay-worker/package.json                |  2 +-
 packages/solid/package.json                        |  6 +++---
 packages/solidstart/package.json                   |  8 ++++----
 packages/svelte/package.json                       |  6 +++---
 packages/sveltekit/package.json                    | 10 +++++-----
 packages/tanstackstart-react/package.json          | 10 +++++-----
 packages/tanstackstart/package.json                |  2 +-
 packages/types/package.json                        |  4 ++--
 packages/typescript/package.json                   |  2 +-
 packages/vercel-edge/package.json                  |  6 +++---
 packages/vue/package.json                          |  6 +++---
 packages/wasm/package.json                         |  6 +++---
 55 files changed, 158 insertions(+), 158 deletions(-)

diff --git a/dev-packages/browser-integration-tests/package.json b/dev-packages/browser-integration-tests/package.json
index b0022f25f976..b6a7e01e7bfb 100644
--- a/dev-packages/browser-integration-tests/package.json
+++ b/dev-packages/browser-integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/browser-integration-tests",
-  "version": "10.24.0",
+  "version": "10.25.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": "10.24.0",
+    "@sentry/browser": "10.25.0",
     "@supabase/supabase-js": "2.49.3",
     "axios": "^1.12.2",
     "babel-loader": "^8.2.2",
diff --git a/dev-packages/bundle-analyzer-scenarios/package.json b/dev-packages/bundle-analyzer-scenarios/package.json
index a37e4a0ab15b..5de03ee2a113 100644
--- a/dev-packages/bundle-analyzer-scenarios/package.json
+++ b/dev-packages/bundle-analyzer-scenarios/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/bundle-analyzer-scenarios",
-  "version": "10.24.0",
+  "version": "10.25.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",
diff --git a/dev-packages/bundler-tests/package.json b/dev-packages/bundler-tests/package.json
index 1e61939cac5f..a7850b3c1cc6 100644
--- a/dev-packages/bundler-tests/package.json
+++ b/dev-packages/bundler-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/bundler-tests",
-  "version": "10.24.0",
+  "version": "10.25.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",
@@ -12,12 +12,12 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@sentry/browser": "10.24.0",
-    "webpack": "^5.0.0",
+    "@rollup/plugin-node-resolve": "^15.2.3",
+    "@sentry/browser": "10.25.0",
     "rollup": "^4.0.0",
     "vite": "^5.0.0",
-    "@rollup/plugin-node-resolve": "^15.2.3",
-    "vitest": "^3.2.4"
+    "vitest": "^3.2.4",
+    "webpack": "^5.0.0"
   },
   "volta": {
     "extends": "../../package.json"
diff --git a/dev-packages/clear-cache-gh-action/package.json b/dev-packages/clear-cache-gh-action/package.json
index 12ca9159870e..c64bdf36eb9a 100644
--- a/dev-packages/clear-cache-gh-action/package.json
+++ b/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.24.0",
+  "version": "10.25.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
diff --git a/dev-packages/cloudflare-integration-tests/package.json b/dev-packages/cloudflare-integration-tests/package.json
index 4a28d818dc25..aac6e9c96945 100644
--- a/dev-packages/cloudflare-integration-tests/package.json
+++ b/dev-packages/cloudflare-integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/cloudflare-integration-tests",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
@@ -13,11 +13,11 @@
     "test:watch": "yarn test --watch"
   },
   "dependencies": {
-    "@sentry/cloudflare": "10.24.0"
+    "@sentry/cloudflare": "10.25.0"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20250922.0",
-    "@sentry-internal/test-utils": "10.24.0",
+    "@sentry-internal/test-utils": "10.25.0",
     "eslint-plugin-regexp": "^1.15.0",
     "vitest": "^3.2.4",
     "wrangler": "4.22.0"
diff --git a/dev-packages/e2e-tests/package.json b/dev-packages/e2e-tests/package.json
index df7589435057..556891ca2d55 100644
--- a/dev-packages/e2e-tests/package.json
+++ b/dev-packages/e2e-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/e2e-tests",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "license": "MIT",
   "private": true,
   "scripts": {
diff --git a/dev-packages/external-contributor-gh-action/package.json b/dev-packages/external-contributor-gh-action/package.json
index 3123e2d98067..4b536a69fc1d 100644
--- a/dev-packages/external-contributor-gh-action/package.json
+++ b/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": "10.24.0",
+  "version": "10.25.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
diff --git a/dev-packages/node-core-integration-tests/package.json b/dev-packages/node-core-integration-tests/package.json
index 1ed632bf8591..bf4bf9f3578a 100644
--- a/dev-packages/node-core-integration-tests/package.json
+++ b/dev-packages/node-core-integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/node-core-integration-tests",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
@@ -34,8 +34,8 @@
     "@opentelemetry/resources": "^2.1.0",
     "@opentelemetry/sdk-trace-base": "^2.1.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry/core": "10.24.0",
-    "@sentry/node-core": "10.24.0",
+    "@sentry/core": "10.25.0",
+    "@sentry/node-core": "10.25.0",
     "body-parser": "^1.20.3",
     "cors": "^2.8.5",
     "cron": "^3.1.6",
diff --git a/dev-packages/node-integration-tests/package.json b/dev-packages/node-integration-tests/package.json
index 325a99860c4e..79d933a3c525 100644
--- a/dev-packages/node-integration-tests/package.json
+++ b/dev-packages/node-integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/node-integration-tests",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
@@ -35,9 +35,9 @@
     "@nestjs/core": "^11",
     "@nestjs/platform-express": "^11",
     "@prisma/client": "6.15.0",
-    "@sentry/aws-serverless": "10.24.0",
-    "@sentry/core": "10.24.0",
-    "@sentry/node": "10.24.0",
+    "@sentry/aws-serverless": "10.25.0",
+    "@sentry/core": "10.25.0",
+    "@sentry/node": "10.25.0",
     "@types/mongodb": "^3.6.20",
     "@types/mysql": "^2.15.21",
     "@types/pg": "^8.6.5",
@@ -82,7 +82,7 @@
     "yargs": "^16.2.0"
   },
   "devDependencies": {
-    "@sentry-internal/test-utils": "10.24.0",
+    "@sentry-internal/test-utils": "10.25.0",
     "@types/amqplib": "^0.10.5",
     "@types/node-cron": "^3.0.11",
     "@types/node-schedule": "^2.1.7",
diff --git a/dev-packages/node-overhead-gh-action/package.json b/dev-packages/node-overhead-gh-action/package.json
index 107248da588a..02dca29a291f 100644
--- a/dev-packages/node-overhead-gh-action/package.json
+++ b/dev-packages/node-overhead-gh-action/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/node-overhead-gh-action",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
@@ -23,7 +23,7 @@
     "fix": "eslint . --format stylish --fix"
   },
   "dependencies": {
-    "@sentry/node": "10.24.0",
+    "@sentry/node": "10.25.0",
     "express": "^4.21.1",
     "mysql2": "^3.14.4"
   },
diff --git a/dev-packages/rollup-utils/package.json b/dev-packages/rollup-utils/package.json
index 3b13e73075f3..60237502ec71 100644
--- a/dev-packages/rollup-utils/package.json
+++ b/dev-packages/rollup-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/rollup-utils",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "description": "Rollup utilities used at Sentry for the Sentry JavaScript SDK",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/rollup-utils",
diff --git a/dev-packages/size-limit-gh-action/package.json b/dev-packages/size-limit-gh-action/package.json
index 9eaabe58ef65..e29d747dcbaa 100644
--- a/dev-packages/size-limit-gh-action/package.json
+++ b/dev-packages/size-limit-gh-action/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@sentry-internal/size-limit-gh-action",
   "description": "An internal Github Action to compare the current size of a PR against the one on develop.",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
diff --git a/dev-packages/test-utils/package.json b/dev-packages/test-utils/package.json
index 577e383cf831..c8c0c09b353d 100644
--- a/dev-packages/test-utils/package.json
+++ b/dev-packages/test-utils/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "10.24.0",
+  "version": "10.25.0",
   "name": "@sentry-internal/test-utils",
   "author": "Sentry",
   "license": "MIT",
@@ -48,7 +48,7 @@
   },
   "devDependencies": {
     "@playwright/test": "~1.53.2",
-    "@sentry/core": "10.24.0",
+    "@sentry/core": "10.25.0",
     "eslint-plugin-regexp": "^1.15.0"
   },
   "volta": {
diff --git a/lerna.json b/lerna.json
index c7be2107343d..3b70b74ac476 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "npmClient": "yarn"
 }
diff --git a/packages/angular/package.json b/packages/angular/package.json
index ab4949e09314..6102320de760 100644
--- a/packages/angular/package.json
+++ b/packages/angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/angular",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "description": "Official Sentry SDK for Angular",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/angular",
@@ -21,8 +21,8 @@
     "rxjs": "^6.5.5 || ^7.x"
   },
   "dependencies": {
-    "@sentry/browser": "10.24.0",
-    "@sentry/core": "10.24.0",
+    "@sentry/browser": "10.25.0",
+    "@sentry/core": "10.25.0",
     "tslib": "^2.4.1"
   },
   "devDependencies": {
diff --git a/packages/astro/package.json b/packages/astro/package.json
index 1704077b26e7..c8ff489ca77b 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/astro",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "description": "Official Sentry SDK for Astro",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/astro",
@@ -56,9 +56,9 @@
     "astro": ">=3.x || >=4.0.0-beta || >=5.x"
   },
   "dependencies": {
-    "@sentry/browser": "10.24.0",
-    "@sentry/core": "10.24.0",
-    "@sentry/node": "10.24.0",
+    "@sentry/browser": "10.25.0",
+    "@sentry/core": "10.25.0",
+    "@sentry/node": "10.25.0",
     "@sentry/vite-plugin": "^4.1.0"
   },
   "devDependencies": {
diff --git a/packages/aws-serverless/package.json b/packages/aws-serverless/package.json
index 0c6cadfad79d..7ee6a0a50d97 100644
--- a/packages/aws-serverless/package.json
+++ b/packages/aws-serverless/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/aws-serverless",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "description": "Official Sentry SDK for AWS Lambda and AWS Serverless Environments",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/aws-serverless",
@@ -69,9 +69,9 @@
     "@opentelemetry/instrumentation": "^0.204.0",
     "@opentelemetry/instrumentation-aws-sdk": "0.59.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry/core": "10.24.0",
-    "@sentry/node": "10.24.0",
-    "@sentry/node-core": "10.24.0",
+    "@sentry/core": "10.25.0",
+    "@sentry/node": "10.25.0",
+    "@sentry/node-core": "10.25.0",
     "@types/aws-lambda": "^8.10.62"
   },
   "devDependencies": {
diff --git a/packages/browser-utils/package.json b/packages/browser-utils/package.json
index 238e53ea445a..338175ef5ad5 100644
--- a/packages/browser-utils/package.json
+++ b/packages/browser-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/browser-utils",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "description": "Browser Utilities for all Sentry JavaScript SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/browser-utils",
@@ -39,7 +39,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.24.0"
+    "@sentry/core": "10.25.0"
   },
   "scripts": {
     "build": "run-p build:transpile build:types",
diff --git a/packages/browser/package.json b/packages/browser/package.json
index 9ac303dbbd95..555062e2744f 100644
--- a/packages/browser/package.json
+++ b/packages/browser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/browser",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "description": "Official Sentry SDK for browsers",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/browser",
@@ -44,14 +44,14 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry-internal/browser-utils": "10.24.0",
-    "@sentry-internal/feedback": "10.24.0",
-    "@sentry-internal/replay": "10.24.0",
-    "@sentry-internal/replay-canvas": "10.24.0",
-    "@sentry/core": "10.24.0"
+    "@sentry-internal/browser-utils": "10.25.0",
+    "@sentry-internal/feedback": "10.25.0",
+    "@sentry-internal/replay": "10.25.0",
+    "@sentry-internal/replay-canvas": "10.25.0",
+    "@sentry/core": "10.25.0"
   },
   "devDependencies": {
-    "@sentry-internal/integration-shims": "10.24.0",
+    "@sentry-internal/integration-shims": "10.25.0",
     "fake-indexeddb": "^6.2.4"
   },
   "scripts": {
diff --git a/packages/bun/package.json b/packages/bun/package.json
index 2b05b4a08e37..288e327bf6eb 100644
--- a/packages/bun/package.json
+++ b/packages/bun/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/bun",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "description": "Official Sentry SDK for bun",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/bun",
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.24.0",
-    "@sentry/node": "10.24.0"
+    "@sentry/core": "10.25.0",
+    "@sentry/node": "10.25.0"
   },
   "devDependencies": {
     "bun-types": "^1.2.9"
diff --git a/packages/cloudflare/package.json b/packages/cloudflare/package.json
index 8266a381f745..a620dc84b3d9 100644
--- a/packages/cloudflare/package.json
+++ b/packages/cloudflare/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/cloudflare",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "description": "Official Sentry SDK for Cloudflare Workers and Pages",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/cloudflare",
@@ -50,7 +50,7 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@sentry/core": "10.24.0"
+    "@sentry/core": "10.25.0"
   },
   "peerDependencies": {
     "@cloudflare/workers-types": "^4.x"
diff --git a/packages/core/package.json b/packages/core/package.json
index 6d3a51c67e0a..e45152996f0f 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/core",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "description": "Base implementation for all Sentry JavaScript SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/core",
diff --git a/packages/deno/package.json b/packages/deno/package.json
index 4f74c15f2e54..814d76142cc3 100644
--- a/packages/deno/package.json
+++ b/packages/deno/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/deno",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "description": "Official Sentry SDK for Deno",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/deno",
@@ -25,7 +25,7 @@
   ],
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@sentry/core": "10.24.0"
+    "@sentry/core": "10.25.0"
   },
   "scripts": {
     "deno-types": "node ./scripts/download-deno-types.mjs",
diff --git a/packages/ember/package.json b/packages/ember/package.json
index ba18b243932d..333eda5345d5 100644
--- a/packages/ember/package.json
+++ b/packages/ember/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/ember",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "description": "Official Sentry SDK for Ember.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/ember",
@@ -32,8 +32,8 @@
   "dependencies": {
     "@babel/core": "^7.27.7",
     "@embroider/macros": "^1.16.0",
-    "@sentry/browser": "10.24.0",
-    "@sentry/core": "10.24.0",
+    "@sentry/browser": "10.25.0",
+    "@sentry/core": "10.25.0",
     "ember-auto-import": "^2.7.2",
     "ember-cli-babel": "^8.2.0",
     "ember-cli-htmlbars": "^6.1.1",
diff --git a/packages/eslint-config-sdk/package.json b/packages/eslint-config-sdk/package.json
index 3db5551de08c..63c6f926f934 100644
--- a/packages/eslint-config-sdk/package.json
+++ b/packages/eslint-config-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/eslint-config-sdk",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "description": "Official Sentry SDK eslint config",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-config-sdk",
@@ -22,8 +22,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry-internal/eslint-plugin-sdk": "10.24.0",
-    "@sentry-internal/typescript": "10.24.0",
+    "@sentry-internal/eslint-plugin-sdk": "10.25.0",
+    "@sentry-internal/typescript": "10.25.0",
     "@typescript-eslint/eslint-plugin": "^5.48.0",
     "@typescript-eslint/parser": "^5.48.0",
     "eslint-config-prettier": "^6.11.0",
diff --git a/packages/eslint-plugin-sdk/package.json b/packages/eslint-plugin-sdk/package.json
index adbe616940a7..f8d9f4c615ee 100644
--- a/packages/eslint-plugin-sdk/package.json
+++ b/packages/eslint-plugin-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/eslint-plugin-sdk",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "description": "Official Sentry SDK eslint plugin",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-plugin-sdk",
diff --git a/packages/feedback/package.json b/packages/feedback/package.json
index 461b62f428c1..aa65e00d8ab5 100644
--- a/packages/feedback/package.json
+++ b/packages/feedback/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/feedback",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "description": "Sentry SDK integration for user feedback",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/feedback",
@@ -39,7 +39,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.24.0"
+    "@sentry/core": "10.25.0"
   },
   "devDependencies": {
     "preact": "^10.19.4"
diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json
index dda329628910..1da49b3a4dca 100644
--- a/packages/gatsby/package.json
+++ b/packages/gatsby/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/gatsby",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "description": "Official Sentry SDK for Gatsby.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/gatsby",
@@ -45,8 +45,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.24.0",
-    "@sentry/react": "10.24.0",
+    "@sentry/core": "10.25.0",
+    "@sentry/react": "10.25.0",
     "@sentry/webpack-plugin": "^4.1.1"
   },
   "peerDependencies": {
diff --git a/packages/google-cloud-serverless/package.json b/packages/google-cloud-serverless/package.json
index 2849632ece86..c742b5a3a154 100644
--- a/packages/google-cloud-serverless/package.json
+++ b/packages/google-cloud-serverless/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/google-cloud-serverless",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "description": "Official Sentry SDK for Google Cloud Functions",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/google-cloud-serverless",
@@ -48,8 +48,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.24.0",
-    "@sentry/node": "10.24.0",
+    "@sentry/core": "10.25.0",
+    "@sentry/node": "10.25.0",
     "@types/express": "^4.17.14"
   },
   "devDependencies": {
diff --git a/packages/integration-shims/package.json b/packages/integration-shims/package.json
index ce36550f9f42..a2535fc2b9b4 100644
--- a/packages/integration-shims/package.json
+++ b/packages/integration-shims/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/integration-shims",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "description": "Shims for integrations in Sentry SDK.",
   "main": "build/cjs/index.js",
   "module": "build/esm/index.js",
@@ -56,7 +56,7 @@
     "url": "https://github.com/getsentry/sentry-javascript/issues"
   },
   "dependencies": {
-    "@sentry/core": "10.24.0"
+    "@sentry/core": "10.25.0"
   },
   "engines": {
     "node": ">=18"
diff --git a/packages/nestjs/package.json b/packages/nestjs/package.json
index fcff6412b7e2..80fdb673cc6d 100644
--- a/packages/nestjs/package.json
+++ b/packages/nestjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/nestjs",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "description": "Official Sentry SDK for NestJS",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/nestjs",
@@ -49,8 +49,8 @@
     "@opentelemetry/instrumentation": "^0.204.0",
     "@opentelemetry/instrumentation-nestjs-core": "0.50.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry/core": "10.24.0",
-    "@sentry/node": "10.24.0"
+    "@sentry/core": "10.25.0",
+    "@sentry/node": "10.25.0"
   },
   "devDependencies": {
     "@nestjs/common": "^10.0.0",
diff --git a/packages/nextjs/package.json b/packages/nextjs/package.json
index 026724dd1b69..47adab59a32d 100644
--- a/packages/nextjs/package.json
+++ b/packages/nextjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/nextjs",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "description": "Official Sentry SDK for Next.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/nextjs",
@@ -79,13 +79,13 @@
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
     "@rollup/plugin-commonjs": "28.0.1",
-    "@sentry-internal/browser-utils": "10.24.0",
+    "@sentry-internal/browser-utils": "10.25.0",
     "@sentry/bundler-plugin-core": "^4.3.0",
-    "@sentry/core": "10.24.0",
-    "@sentry/node": "10.24.0",
-    "@sentry/opentelemetry": "10.24.0",
-    "@sentry/react": "10.24.0",
-    "@sentry/vercel-edge": "10.24.0",
+    "@sentry/core": "10.25.0",
+    "@sentry/node": "10.25.0",
+    "@sentry/opentelemetry": "10.25.0",
+    "@sentry/react": "10.25.0",
+    "@sentry/vercel-edge": "10.25.0",
     "@sentry/webpack-plugin": "^4.3.0",
     "resolve": "1.22.8",
     "rollup": "^4.35.0",
diff --git a/packages/node-core/package.json b/packages/node-core/package.json
index 0c5123756840..43af0a610e61 100644
--- a/packages/node-core/package.json
+++ b/packages/node-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/node-core",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "description": "Sentry Node-Core SDK",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/node-core",
@@ -67,8 +67,8 @@
   },
   "dependencies": {
     "@apm-js-collab/tracing-hooks": "^0.3.1",
-    "@sentry/core": "10.24.0",
-    "@sentry/opentelemetry": "10.24.0",
+    "@sentry/core": "10.25.0",
+    "@sentry/opentelemetry": "10.25.0",
     "import-in-the-middle": "^1.14.2"
   },
   "devDependencies": {
diff --git a/packages/node-native/package.json b/packages/node-native/package.json
index a280be7c6ef8..23ce0068019c 100644
--- a/packages/node-native/package.json
+++ b/packages/node-native/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/node-native",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "description": "Native Tools for the Official Sentry Node.js SDK",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/node-native",
@@ -64,8 +64,8 @@
   },
   "dependencies": {
     "@sentry-internal/node-native-stacktrace": "^0.2.2",
-    "@sentry/core": "10.24.0",
-    "@sentry/node": "10.24.0"
+    "@sentry/core": "10.25.0",
+    "@sentry/node": "10.25.0"
   },
   "devDependencies": {
     "@types/node": "^18.19.1"
diff --git a/packages/node/package.json b/packages/node/package.json
index 15859ef1bfc2..830fb510f9f9 100644
--- a/packages/node/package.json
+++ b/packages/node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/node",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "description": "Sentry Node SDK using OpenTelemetry for performance instrumentation",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/node",
@@ -95,9 +95,9 @@
     "@opentelemetry/sdk-trace-base": "^2.1.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
     "@prisma/instrumentation": "6.15.0",
-    "@sentry/core": "10.24.0",
-    "@sentry/node-core": "10.24.0",
-    "@sentry/opentelemetry": "10.24.0",
+    "@sentry/core": "10.25.0",
+    "@sentry/node-core": "10.25.0",
+    "@sentry/opentelemetry": "10.25.0",
     "import-in-the-middle": "^1.14.2",
     "minimatch": "^9.0.0"
   },
diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json
index b5be7a8d0c34..3a9679553475 100644
--- a/packages/nuxt/package.json
+++ b/packages/nuxt/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/nuxt",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "description": "Official Sentry SDK for Nuxt",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/nuxt",
@@ -49,13 +49,13 @@
   },
   "dependencies": {
     "@nuxt/kit": "^3.13.2",
-    "@sentry/browser": "10.24.0",
-    "@sentry/cloudflare": "10.24.0",
-    "@sentry/core": "10.24.0",
-    "@sentry/node": "10.24.0",
+    "@sentry/browser": "10.25.0",
+    "@sentry/cloudflare": "10.25.0",
+    "@sentry/core": "10.25.0",
+    "@sentry/node": "10.25.0",
     "@sentry/rollup-plugin": "^4.3.0",
     "@sentry/vite-plugin": "^4.3.0",
-    "@sentry/vue": "10.24.0"
+    "@sentry/vue": "10.25.0"
   },
   "devDependencies": {
     "@nuxt/module-builder": "^0.8.4",
diff --git a/packages/opentelemetry/package.json b/packages/opentelemetry/package.json
index 65ac00dce9d9..94457ff83b65 100644
--- a/packages/opentelemetry/package.json
+++ b/packages/opentelemetry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/opentelemetry",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "description": "Official Sentry utilities for OpenTelemetry",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/opentelemetry",
@@ -39,7 +39,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.24.0"
+    "@sentry/core": "10.25.0"
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.9.0",
diff --git a/packages/profiling-node/package.json b/packages/profiling-node/package.json
index 509cfd46e0f2..7040f0a53c21 100644
--- a/packages/profiling-node/package.json
+++ b/packages/profiling-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/profiling-node",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "description": "Official Sentry SDK for Node.js Profiling",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/profiling-node",
@@ -63,8 +63,8 @@
   },
   "dependencies": {
     "@sentry-internal/node-cpu-profiler": "^2.2.0",
-    "@sentry/core": "10.24.0",
-    "@sentry/node": "10.24.0"
+    "@sentry/core": "10.25.0",
+    "@sentry/node": "10.25.0"
   },
   "devDependencies": {
     "@types/node": "^18.19.1"
diff --git a/packages/react-router/package.json b/packages/react-router/package.json
index 104ccd246563..52dd1a71fee7 100644
--- a/packages/react-router/package.json
+++ b/packages/react-router/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/react-router",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "description": "Official Sentry SDK for React Router (Framework)",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/react-router",
@@ -49,11 +49,11 @@
     "@opentelemetry/core": "^2.1.0",
     "@opentelemetry/instrumentation": "^0.204.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry/browser": "10.24.0",
+    "@sentry/browser": "10.25.0",
     "@sentry/cli": "^2.56.0",
-    "@sentry/core": "10.24.0",
-    "@sentry/node": "10.24.0",
-    "@sentry/react": "10.24.0",
+    "@sentry/core": "10.25.0",
+    "@sentry/node": "10.25.0",
+    "@sentry/react": "10.25.0",
     "@sentry/vite-plugin": "^4.1.0",
     "glob": "11.0.1"
   },
diff --git a/packages/react/package.json b/packages/react/package.json
index 0dc428bc9a41..c7e7163a9a5e 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/react",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "description": "Official Sentry SDK for React.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/react",
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "10.24.0",
-    "@sentry/core": "10.24.0",
+    "@sentry/browser": "10.25.0",
+    "@sentry/core": "10.25.0",
     "hoist-non-react-statics": "^3.3.2"
   },
   "peerDependencies": {
diff --git a/packages/remix/package.json b/packages/remix/package.json
index 3eb6fe8ccbda..9a255af786ce 100644
--- a/packages/remix/package.json
+++ b/packages/remix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/remix",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "description": "Official Sentry SDK for Remix",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/remix",
@@ -69,9 +69,9 @@
     "@opentelemetry/semantic-conventions": "^1.37.0",
     "@remix-run/router": "1.x",
     "@sentry/cli": "^2.56.0",
-    "@sentry/core": "10.24.0",
-    "@sentry/node": "10.24.0",
-    "@sentry/react": "10.24.0",
+    "@sentry/core": "10.25.0",
+    "@sentry/node": "10.25.0",
+    "@sentry/react": "10.25.0",
     "glob": "^10.3.4",
     "yargs": "^17.6.0"
   },
diff --git a/packages/replay-canvas/package.json b/packages/replay-canvas/package.json
index a958bd1bdb86..491d919e55dc 100644
--- a/packages/replay-canvas/package.json
+++ b/packages/replay-canvas/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/replay-canvas",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "description": "Replay canvas integration",
   "main": "build/npm/cjs/index.js",
   "module": "build/npm/esm/index.js",
@@ -69,8 +69,8 @@
     "@sentry-internal/rrweb": "2.40.0"
   },
   "dependencies": {
-    "@sentry-internal/replay": "10.24.0",
-    "@sentry/core": "10.24.0"
+    "@sentry-internal/replay": "10.25.0",
+    "@sentry/core": "10.25.0"
   },
   "engines": {
     "node": ">=18"
diff --git a/packages/replay-internal/package.json b/packages/replay-internal/package.json
index 6bb9937c635b..d2e1efbd84b7 100644
--- a/packages/replay-internal/package.json
+++ b/packages/replay-internal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/replay",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "description": "User replays for Sentry",
   "main": "build/npm/cjs/index.js",
   "module": "build/npm/esm/index.js",
@@ -81,7 +81,7 @@
   "homepage": "https://docs.sentry.io/platforms/javascript/session-replay/",
   "devDependencies": {
     "@babel/core": "^7.27.7",
-    "@sentry-internal/replay-worker": "10.24.0",
+    "@sentry-internal/replay-worker": "10.25.0",
     "@sentry-internal/rrweb": "2.40.0",
     "@sentry-internal/rrweb-snapshot": "2.40.0",
     "fflate": "0.8.2",
@@ -90,8 +90,8 @@
     "node-fetch": "^2.6.7"
   },
   "dependencies": {
-    "@sentry-internal/browser-utils": "10.24.0",
-    "@sentry/core": "10.24.0"
+    "@sentry-internal/browser-utils": "10.25.0",
+    "@sentry/core": "10.25.0"
   },
   "engines": {
     "node": ">=18"
diff --git a/packages/replay-worker/package.json b/packages/replay-worker/package.json
index baf959acd70c..a0d25235c7d7 100644
--- a/packages/replay-worker/package.json
+++ b/packages/replay-worker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/replay-worker",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "description": "Worker for @sentry-internal/replay",
   "main": "build/esm/index.js",
   "module": "build/esm/index.js",
diff --git a/packages/solid/package.json b/packages/solid/package.json
index a87d1c1317f1..bdb3dbe50a15 100644
--- a/packages/solid/package.json
+++ b/packages/solid/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/solid",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "description": "Official Sentry SDK for Solid",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/solid",
@@ -54,8 +54,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "10.24.0",
-    "@sentry/core": "10.24.0"
+    "@sentry/browser": "10.25.0",
+    "@sentry/core": "10.25.0"
   },
   "peerDependencies": {
     "@solidjs/router": "^0.13.4",
diff --git a/packages/solidstart/package.json b/packages/solidstart/package.json
index 13f2fa48908b..bb4acc3404f4 100644
--- a/packages/solidstart/package.json
+++ b/packages/solidstart/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/solidstart",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "description": "Official Sentry SDK for Solid Start",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/solidstart",
@@ -66,9 +66,9 @@
     }
   },
   "dependencies": {
-    "@sentry/core": "10.24.0",
-    "@sentry/node": "10.24.0",
-    "@sentry/solid": "10.24.0",
+    "@sentry/core": "10.25.0",
+    "@sentry/node": "10.25.0",
+    "@sentry/solid": "10.25.0",
     "@sentry/vite-plugin": "^4.1.0"
   },
   "devDependencies": {
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index e504e0106d93..dc8c662012c3 100644
--- a/packages/svelte/package.json
+++ b/packages/svelte/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/svelte",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "description": "Official Sentry SDK for Svelte",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/svelte",
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "10.24.0",
-    "@sentry/core": "10.24.0",
+    "@sentry/browser": "10.25.0",
+    "@sentry/core": "10.25.0",
     "magic-string": "^0.30.0"
   },
   "peerDependencies": {
diff --git a/packages/sveltekit/package.json b/packages/sveltekit/package.json
index dc6726d8b52e..01f88fcd60b9 100644
--- a/packages/sveltekit/package.json
+++ b/packages/sveltekit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/sveltekit",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "description": "Official Sentry SDK for SvelteKit",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/sveltekit",
@@ -48,10 +48,10 @@
   },
   "dependencies": {
     "@babel/parser": "7.26.9",
-    "@sentry/cloudflare": "10.24.0",
-    "@sentry/core": "10.24.0",
-    "@sentry/node": "10.24.0",
-    "@sentry/svelte": "10.24.0",
+    "@sentry/cloudflare": "10.25.0",
+    "@sentry/core": "10.25.0",
+    "@sentry/node": "10.25.0",
+    "@sentry/svelte": "10.25.0",
     "@sentry/vite-plugin": "^4.1.0",
     "magic-string": "0.30.7",
     "recast": "0.23.11",
diff --git a/packages/tanstackstart-react/package.json b/packages/tanstackstart-react/package.json
index c74f15a623ab..49c0bf12d971 100644
--- a/packages/tanstackstart-react/package.json
+++ b/packages/tanstackstart-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/tanstackstart-react",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "description": "Official Sentry SDK for TanStack Start React",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/tanstackstart-react",
@@ -52,10 +52,10 @@
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry-internal/browser-utils": "10.24.0",
-    "@sentry/core": "10.24.0",
-    "@sentry/node": "10.24.0",
-    "@sentry/react": "10.24.0"
+    "@sentry-internal/browser-utils": "10.25.0",
+    "@sentry/core": "10.25.0",
+    "@sentry/node": "10.25.0",
+    "@sentry/react": "10.25.0"
   },
   "scripts": {
     "build": "run-p build:transpile build:types",
diff --git a/packages/tanstackstart/package.json b/packages/tanstackstart/package.json
index 542bd1eeaa51..56e0c7992fea 100644
--- a/packages/tanstackstart/package.json
+++ b/packages/tanstackstart/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/tanstackstart",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "description": "Utilities for the Sentry TanStack Start SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/tanstackstart",
diff --git a/packages/types/package.json b/packages/types/package.json
index 80219ea97aad..1c53b6c05275 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/types",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "description": "Types for all Sentry JavaScript SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/types",
@@ -57,7 +57,7 @@
     "yalc:publish": "yalc publish --push --sig"
   },
   "dependencies": {
-    "@sentry/core": "10.24.0"
+    "@sentry/core": "10.25.0"
   },
   "volta": {
     "extends": "../../package.json"
diff --git a/packages/typescript/package.json b/packages/typescript/package.json
index f010874370b6..c1c99704c346 100644
--- a/packages/typescript/package.json
+++ b/packages/typescript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/typescript",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "description": "Typescript configuration used at Sentry",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/typescript",
diff --git a/packages/vercel-edge/package.json b/packages/vercel-edge/package.json
index 7b071ac706d5..c7c6db556ccb 100644
--- a/packages/vercel-edge/package.json
+++ b/packages/vercel-edge/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/vercel-edge",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "description": "Official Sentry SDK for the Vercel Edge Runtime",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/vercel-edge",
@@ -41,14 +41,14 @@
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/resources": "^2.1.0",
-    "@sentry/core": "10.24.0"
+    "@sentry/core": "10.25.0"
   },
   "devDependencies": {
     "@edge-runtime/types": "3.0.1",
     "@opentelemetry/core": "^2.1.0",
     "@opentelemetry/sdk-trace-base": "^2.1.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry/opentelemetry": "10.24.0"
+    "@sentry/opentelemetry": "10.25.0"
   },
   "scripts": {
     "build": "run-p build:transpile build:types",
diff --git a/packages/vue/package.json b/packages/vue/package.json
index 5b891d1ac311..31bef1a870c8 100644
--- a/packages/vue/package.json
+++ b/packages/vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/vue",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "description": "Official Sentry SDK for Vue.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/vue",
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "10.24.0",
-    "@sentry/core": "10.24.0"
+    "@sentry/browser": "10.25.0",
+    "@sentry/core": "10.25.0"
   },
   "peerDependencies": {
     "pinia": "2.x || 3.x",
diff --git a/packages/wasm/package.json b/packages/wasm/package.json
index d2faade1bba4..f7a97139c120 100644
--- a/packages/wasm/package.json
+++ b/packages/wasm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/wasm",
-  "version": "10.24.0",
+  "version": "10.25.0",
   "description": "Support for WASM.",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/wasm",
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "10.24.0",
-    "@sentry/core": "10.24.0"
+    "@sentry/browser": "10.25.0",
+    "@sentry/core": "10.25.0"
   },
   "scripts": {
     "build": "run-p build:transpile build:bundle build:types",

From 9d99c99c067a074ee39a972003ef2a0cdfb09de4 Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Wed, 12 Nov 2025 09:43:34 +0100
Subject: [PATCH 054/186] fix(core): Decrease number of Sentry stack frames for
 messages from `captureConsoleIntegration` (#18096)

This patch creates a synthetic exception already within the captureConsole
handler, so that we minimize the number of Sentry stack frames in the
stack trace. It also adjusts the `Client::captureMessage` method to
favor an already provided `syntheticException` over the one it would
create by itself.
---
 packages/core/src/exports.ts                  |  4 +-
 .../core/src/integrations/captureconsole.ts   | 17 +++-
 packages/core/src/scope.ts                    |  2 +-
 .../lib/integrations/captureconsole.test.ts   | 81 ++++++++++++-------
 4 files changed, 68 insertions(+), 36 deletions(-)

diff --git a/packages/core/src/exports.ts b/packages/core/src/exports.ts
index a5dc716d8124..e3f658c88f2a 100644
--- a/packages/core/src/exports.ts
+++ b/packages/core/src/exports.ts
@@ -40,8 +40,8 @@ export function captureMessage(message: string, captureContext?: CaptureContext
   // This is necessary to provide explicit scopes upgrade, without changing the original
   // arity of the `captureMessage(message, level)` method.
   const level = typeof captureContext === 'string' ? captureContext : undefined;
-  const context = typeof captureContext !== 'string' ? { captureContext } : undefined;
-  return getCurrentScope().captureMessage(message, level, context);
+  const hint = typeof captureContext !== 'string' ? { captureContext } : undefined;
+  return getCurrentScope().captureMessage(message, level, hint);
 }
 
 /**
diff --git a/packages/core/src/integrations/captureconsole.ts b/packages/core/src/integrations/captureconsole.ts
index d5d34bd554aa..4c28e2c74a54 100644
--- a/packages/core/src/integrations/captureconsole.ts
+++ b/packages/core/src/integrations/captureconsole.ts
@@ -1,5 +1,5 @@
 import { getClient, withScope } from '../currentScopes';
-import { captureException, captureMessage } from '../exports';
+import { captureException } from '../exports';
 import { addConsoleInstrumentationHandler } from '../instrument/console';
 import { defineIntegration } from '../integration';
 import type { CaptureContext } from '../scope';
@@ -52,6 +52,17 @@ const _captureConsoleIntegration = ((options: CaptureConsoleOptions = {}) => {
 export const captureConsoleIntegration = defineIntegration(_captureConsoleIntegration);
 
 function consoleHandler(args: unknown[], level: string, handled: boolean): void {
+  const severityLevel = severityLevelFromString(level);
+
+  /*
+    We create this error here already to attach a stack trace to captured messages,
+    if users set `attachStackTrace` to `true` in Sentry.init.
+    We do this here already because we want to minimize the number of Sentry SDK stack frames
+    within the error. Technically, Client.captureMessage will also do it but this happens several
+    stack frames deeper.
+  */
+  const syntheticException = new Error();
+
   const captureContext: CaptureContext = {
     level: severityLevelFromString(level),
     extra: {
@@ -75,7 +86,7 @@ function consoleHandler(args: unknown[], level: string, handled: boolean): void
       if (!args[0]) {
         const message = `Assertion failed: ${safeJoin(args.slice(1), ' ') || 'console.assert'}`;
         scope.setExtra('arguments', args.slice(1));
-        captureMessage(message, captureContext);
+        scope.captureMessage(message, severityLevel, { captureContext, syntheticException });
       }
       return;
     }
@@ -87,6 +98,6 @@ function consoleHandler(args: unknown[], level: string, handled: boolean): void
     }
 
     const message = safeJoin(args, ' ');
-    captureMessage(message, captureContext);
+    scope.captureMessage(message, severityLevel, { captureContext, syntheticException });
   });
 }
diff --git a/packages/core/src/scope.ts b/packages/core/src/scope.ts
index 8b1e21acfb4a..3287d8efbbbd 100644
--- a/packages/core/src/scope.ts
+++ b/packages/core/src/scope.ts
@@ -607,7 +607,7 @@ export class Scope {
       return eventId;
     }
 
-    const syntheticException = new Error(message);
+    const syntheticException = hint?.syntheticException ?? new Error(message);
 
     this._client.captureMessage(
       message,
diff --git a/packages/core/test/lib/integrations/captureconsole.test.ts b/packages/core/test/lib/integrations/captureconsole.test.ts
index 2ca059be4f86..a7e14f6536c3 100644
--- a/packages/core/test/lib/integrations/captureconsole.test.ts
+++ b/packages/core/test/lib/integrations/captureconsole.test.ts
@@ -29,13 +29,14 @@ describe('CaptureConsole setup', () => {
 
   let mockClient: Client;
 
+  const captureException = vi.fn();
+
   const mockScope = {
     setExtra: vi.fn(),
     addEventProcessor: vi.fn(),
+    captureMessage: vi.fn(),
   };
 
-  const captureMessage = vi.fn();
-  const captureException = vi.fn();
   const withScope = vi.fn(callback => {
     return callback(mockScope);
   });
@@ -43,7 +44,6 @@ describe('CaptureConsole setup', () => {
   beforeEach(() => {
     mockClient = {} as Client;
 
-    vi.spyOn(SentryCore, 'captureMessage').mockImplementation(captureMessage);
     vi.spyOn(SentryCore, 'captureException').mockImplementation(captureException);
     vi.spyOn(CurrentScopes, 'getClient').mockImplementation(() => mockClient);
     vi.spyOn(CurrentScopes, 'withScope').mockImplementation(withScope);
@@ -72,7 +72,7 @@ describe('CaptureConsole setup', () => {
       GLOBAL_OBJ.console.log('msg 2');
       GLOBAL_OBJ.console.warn('msg 3');
 
-      expect(captureMessage).toHaveBeenCalledTimes(2);
+      expect(mockScope.captureMessage).toHaveBeenCalledTimes(2);
     });
 
     it('should fall back to default console levels if none are provided', () => {
@@ -86,7 +86,7 @@ describe('CaptureConsole setup', () => {
 
       GLOBAL_OBJ.console.assert(false);
 
-      expect(captureMessage).toHaveBeenCalledTimes(7);
+      expect(mockScope.captureMessage).toHaveBeenCalledTimes(7);
     });
 
     it('should not wrap any functions with an empty levels option', () => {
@@ -97,7 +97,7 @@ describe('CaptureConsole setup', () => {
         GLOBAL_OBJ.console[key]('msg');
       });
 
-      expect(captureMessage).toHaveBeenCalledTimes(0);
+      expect(mockScope.captureMessage).toHaveBeenCalledTimes(0);
     });
   });
 
@@ -121,8 +121,14 @@ describe('CaptureConsole setup', () => {
 
     GLOBAL_OBJ.console.log();
 
-    expect(captureMessage).toHaveBeenCalledTimes(1);
-    expect(captureMessage).toHaveBeenCalledWith('', { extra: { arguments: [] }, level: 'log' });
+    expect(mockScope.captureMessage).toHaveBeenCalledTimes(1);
+    expect(mockScope.captureMessage).toHaveBeenCalledWith('', 'log', {
+      captureContext: {
+        level: 'log',
+        extra: { arguments: [] },
+      },
+      syntheticException: expect.any(Error),
+    });
   });
 
   it('should add an event processor that sets the `debug` field of events', () => {
@@ -148,10 +154,13 @@ describe('CaptureConsole setup', () => {
     GLOBAL_OBJ.console.assert(1 + 1 === 3);
 
     expect(mockScope.setExtra).toHaveBeenLastCalledWith('arguments', []);
-    expect(captureMessage).toHaveBeenCalledTimes(1);
-    expect(captureMessage).toHaveBeenCalledWith('Assertion failed: console.assert', {
-      extra: { arguments: [false] },
-      level: 'log',
+    expect(mockScope.captureMessage).toHaveBeenCalledTimes(1);
+    expect(mockScope.captureMessage).toHaveBeenCalledWith('Assertion failed: console.assert', 'log', {
+      captureContext: {
+        level: 'log',
+        extra: { arguments: [false] },
+      },
+      syntheticException: expect.any(Error),
     });
   });
 
@@ -162,10 +171,13 @@ describe('CaptureConsole setup', () => {
     GLOBAL_OBJ.console.assert(1 + 1 === 3, 'expression is false');
 
     expect(mockScope.setExtra).toHaveBeenLastCalledWith('arguments', ['expression is false']);
-    expect(captureMessage).toHaveBeenCalledTimes(1);
-    expect(captureMessage).toHaveBeenCalledWith('Assertion failed: expression is false', {
-      extra: { arguments: [false, 'expression is false'] },
-      level: 'log',
+    expect(mockScope.captureMessage).toHaveBeenCalledTimes(1);
+    expect(mockScope.captureMessage).toHaveBeenCalledWith('Assertion failed: expression is false', 'log', {
+      captureContext: {
+        level: 'log',
+        extra: { arguments: [false, 'expression is false'] },
+      },
+      syntheticException: expect.any(Error),
     });
   });
 
@@ -175,7 +187,7 @@ describe('CaptureConsole setup', () => {
 
     GLOBAL_OBJ.console.assert(1 + 1 === 2);
 
-    expect(captureMessage).toHaveBeenCalledTimes(0);
+    expect(mockScope.captureMessage).toHaveBeenCalledTimes(0);
   });
 
   it('should capture exception when console logs an error object with level set to "error"', () => {
@@ -226,10 +238,13 @@ describe('CaptureConsole setup', () => {
 
     GLOBAL_OBJ.console.error('some message');
 
-    expect(captureMessage).toHaveBeenCalledTimes(1);
-    expect(captureMessage).toHaveBeenCalledWith('some message', {
-      extra: { arguments: ['some message'] },
-      level: 'error',
+    expect(mockScope.captureMessage).toHaveBeenCalledTimes(1);
+    expect(mockScope.captureMessage).toHaveBeenCalledWith('some message', 'error', {
+      captureContext: {
+        level: 'error',
+        extra: { arguments: ['some message'] },
+      },
+      syntheticException: expect.any(Error),
     });
   });
 
@@ -239,10 +254,13 @@ describe('CaptureConsole setup', () => {
 
     GLOBAL_OBJ.console.error('some non-error message');
 
-    expect(captureMessage).toHaveBeenCalledTimes(1);
-    expect(captureMessage).toHaveBeenCalledWith('some non-error message', {
-      extra: { arguments: ['some non-error message'] },
-      level: 'error',
+    expect(mockScope.captureMessage).toHaveBeenCalledTimes(1);
+    expect(mockScope.captureMessage).toHaveBeenCalledWith('some non-error message', 'error', {
+      captureContext: {
+        level: 'error',
+        extra: { arguments: ['some non-error message'] },
+      },
+      syntheticException: expect.any(Error),
     });
     expect(captureException).not.toHaveBeenCalled();
   });
@@ -253,10 +271,13 @@ describe('CaptureConsole setup', () => {
 
     GLOBAL_OBJ.console.info('some message');
 
-    expect(captureMessage).toHaveBeenCalledTimes(1);
-    expect(captureMessage).toHaveBeenCalledWith('some message', {
-      extra: { arguments: ['some message'] },
-      level: 'info',
+    expect(mockScope.captureMessage).toHaveBeenCalledTimes(1);
+    expect(mockScope.captureMessage).toHaveBeenCalledWith('some message', 'info', {
+      captureContext: {
+        level: 'info',
+        extra: { arguments: ['some message'] },
+      },
+      syntheticException: expect.any(Error),
     });
   });
 
@@ -293,7 +314,7 @@ describe('CaptureConsole setup', () => {
 
     // Should not capture messages
     GLOBAL_OBJ.console.log('some message');
-    expect(captureMessage).not.toHaveBeenCalledWith();
+    expect(mockScope.captureMessage).not.toHaveBeenCalledWith();
   });
 
   it("should not crash when the original console methods don't exist at time of invocation", () => {

From 0f4c190b4024b3376af7e003bda227d2eefcba0e Mon Sep 17 00:00:00 2001
From: Sigrid Huemer <32902192+s1gr1d@users.noreply.github.com>
Date: Wed, 12 Nov 2025 09:54:02 +0100
Subject: [PATCH 055/186] ref(e2e-ember): Remove `@embroider/addon-shim`
 override (#18180)

We needed the override because version 10.0.1 didn't have a valid
package.json (https://github.com/embroider-build/embroider/issues/2609).

They released version 10.0.2 now.
---
 .../e2e-tests/test-applications/ember-embroider/package.json | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/dev-packages/e2e-tests/test-applications/ember-embroider/package.json b/dev-packages/e2e-tests/test-applications/ember-embroider/package.json
index 78a2e202d1eb..b7a102917e80 100644
--- a/dev-packages/e2e-tests/test-applications/ember-embroider/package.json
+++ b/dev-packages/e2e-tests/test-applications/ember-embroider/package.json
@@ -68,10 +68,5 @@
   },
   "volta": {
     "extends": "../../package.json"
-  },
-  "pnpm": {
-    "overrides": {
-      "@embroider/addon-shim": "1.10.0"
-    }
   }
 }

From 679a02c8f5201e3a2595ac2e6b5385e0a591301d Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Wed, 12 Nov 2025 13:09:01 +0100
Subject: [PATCH 056/186] ref(core): Optimize `Scope.setTag` bundle size and
 adjust test (#18182)

Two changes:
1. Reduce bundle size slightly by optimizing `setTag` (+ adding some
more tests around setTag(s))
2. Adjust the integration test message since we no longer classify the
SUT behaviour as a bug
---
 .../setTag/with_non_primitives/test.ts        | 13 +++--
 packages/core/src/scope.ts                    |  4 +-
 packages/core/test/lib/scope.test.ts          | 47 +++++++++++++++----
 3 files changed, 49 insertions(+), 15 deletions(-)

diff --git a/dev-packages/browser-integration-tests/suites/public-api/setTag/with_non_primitives/test.ts b/dev-packages/browser-integration-tests/suites/public-api/setTag/with_non_primitives/test.ts
index 648187404c0e..465c2f684de0 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/setTag/with_non_primitives/test.ts
+++ b/dev-packages/browser-integration-tests/suites/public-api/setTag/with_non_primitives/test.ts
@@ -3,16 +3,21 @@ import type { Event } from '@sentry/core';
 import { sentryTest } from '../../../../utils/fixtures';
 import { getFirstSentryEnvelopeRequest } from '../../../../utils/helpers';
 
-sentryTest('[bug] accepts non-primitive tags', async ({ getLocalTestUrl, page }) => {
-  // this is a bug that went unnoticed due to type definitions and a bad assertion
-  // TODO: We should not accept non-primitive tags. Fix this as a follow-up.
+sentryTest('accepts and sends non-primitive tags', async ({ getLocalTestUrl, page }) => {
+  // Technically, accepting and sending non-primitive tags is a specification violation.
+  // This slipped through because a previous version of this test should have ensured that
+  // we don't accept non-primitive tags. However, the test was flawed.
+  // Turns out, Relay and our product handle invalid tag values gracefully.
+  // Our type definitions for setTag(s) also only allow primitive values.
+  // Therefore (to save some bundle size), we'll continue accepting and sending non-primitive
+  // tag values for now (but not adjust types).
+  // This test documents this decision, so that we know why we're accepting non-primitive tags.
   const url = await getLocalTestUrl({ testDir: __dirname });
 
   const eventData = await getFirstSentryEnvelopeRequest<Event>(page, url);
 
   expect(eventData.message).toBe('non_primitives');
 
-  // TODO: This should be an empty object but instead, it is:
   expect(eventData.tags).toEqual({
     tag_1: {},
     tag_2: [],
diff --git a/packages/core/src/scope.ts b/packages/core/src/scope.ts
index 3287d8efbbbd..b23b01664431 100644
--- a/packages/core/src/scope.ts
+++ b/packages/core/src/scope.ts
@@ -291,9 +291,7 @@ export class Scope {
    * Set a single tag that will be sent as tags data with the event.
    */
   public setTag(key: string, value: Primitive): this {
-    this._tags = { ...this._tags, [key]: value };
-    this._notifyScopeListeners();
-    return this;
+    return this.setTags({ [key]: value });
   }
 
   /**
diff --git a/packages/core/test/lib/scope.test.ts b/packages/core/test/lib/scope.test.ts
index 280ba4c651ff..221ac14a6fa2 100644
--- a/packages/core/test/lib/scope.test.ts
+++ b/packages/core/test/lib/scope.test.ts
@@ -140,16 +140,47 @@ describe('Scope', () => {
       expect(scope['_extra']).toEqual({ a: undefined });
     });
 
-    test('setTag', () => {
-      const scope = new Scope();
-      scope.setTag('a', 'b');
-      expect(scope['_tags']).toEqual({ a: 'b' });
+    describe('setTag', () => {
+      it('sets a tag', () => {
+        const scope = new Scope();
+        scope.setTag('a', 'b');
+        expect(scope['_tags']).toEqual({ a: 'b' });
+      });
+
+      it('sets a tag with undefined', () => {
+        const scope = new Scope();
+        scope.setTag('a', 'b');
+        scope.setTag('a', undefined);
+        expect(scope['_tags']).toEqual({ a: undefined });
+      });
+
+      it('notifies scope listeners once per call', () => {
+        const scope = new Scope();
+        const listener = vi.fn();
+
+        scope.addScopeListener(listener);
+        scope.setTag('a', 'b');
+        scope.setTag('a', 'c');
+
+        expect(listener).toHaveBeenCalledTimes(2);
+      });
     });
 
-    test('setTags', () => {
-      const scope = new Scope();
-      scope.setTags({ a: 'b' });
-      expect(scope['_tags']).toEqual({ a: 'b' });
+    describe('setTags', () => {
+      it('sets tags', () => {
+        const scope = new Scope();
+        scope.setTags({ a: 'b', c: 1 });
+        expect(scope['_tags']).toEqual({ a: 'b', c: 1 });
+      });
+
+      it('notifies scope listeners once per call', () => {
+        const scope = new Scope();
+        const listener = vi.fn();
+        scope.addScopeListener(listener);
+        scope.setTags({ a: 'b', c: 'd' });
+        scope.setTags({ a: 'e', f: 'g' });
+        expect(listener).toHaveBeenCalledTimes(2);
+      });
     });
 
     test('setUser', () => {

From 5c184f4a85113d3b566ac5aa8799112ad03d194a Mon Sep 17 00:00:00 2001
From: Abdelrahman Awad <me@awad.dev>
Date: Wed, 12 Nov 2025 14:26:57 +0200
Subject: [PATCH 057/186] fix(nextjs): Avoid wrapping middleware files when in
 standalone mode (#18172)

This PR attempts to fix #18001 by not wrapping the middleware files if
Next.js 16 is the current version and is in standalone output mode which
is the problematic scenario.

Investigation:

- Next.js renames `proxy` to `middleware` under the hood.
- By wrapping the middleware a `proxy.js` entry is produced in
`middleware.js.nft.json` which wouldn't be there otherwise, meaning if
we don't wrap it then that entry doesn't get produced. So it seems like
`@vercel/nft` is somehow adding the `proxy` file as a dependency of
itself which fails to copy to the output directory because it was
already copied and renamed to `proxy.js` or at least that is what I'm
guessing is happening.
---
 packages/nextjs/src/config/webpack.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/nextjs/src/config/webpack.ts b/packages/nextjs/src/config/webpack.ts
index 4484b1194bd2..df32c31f392e 100644
--- a/packages/nextjs/src/config/webpack.ts
+++ b/packages/nextjs/src/config/webpack.ts
@@ -276,7 +276,8 @@ export function constructWebpackConfigFunction({
       });
 
       // Wrap middleware
-      if (userSentryOptions.autoInstrumentMiddleware ?? true) {
+      const canWrapStandaloneMiddleware = userNextConfig.output !== 'standalone' || !major || major < 16;
+      if ((userSentryOptions.autoInstrumentMiddleware ?? true) && canWrapStandaloneMiddleware) {
         newConfig.module.rules.unshift({
           test: isMiddlewareResource,
           use: [

From 0cb306ef81dd74a6fe10ecddf43efe353417812a Mon Sep 17 00:00:00 2001
From: Onur Temizkan <onur@narval.co.uk>
Date: Wed, 12 Nov 2025 12:38:24 +0000
Subject: [PATCH 058/186] fix(browser): Add `ok` status to succesful
 `idleSpan`s (#18139)

This came up while working on improvements for React Router wildcard
routes. Looks like the successful browser `idleSpans` are reported with
`unknown` status at the moment.
---
 .../tests/client-transactions.test.ts         |  2 +
 .../nextjs-app-dir/tests/transactions.test.ts |  1 +
 .../tests/transactions.test.ts                |  1 +
 .../tests/transactions.test.ts                |  4 +
 .../tests/transactions.test.ts                |  2 +
 .../tests/transactions.test.ts                |  2 +
 .../tests/transactions.test.ts                | 89 +++++++++++++++++++
 packages/core/src/tracing/idleSpan.ts         |  8 +-
 8 files changed, 108 insertions(+), 1 deletion(-)

diff --git a/dev-packages/e2e-tests/test-applications/create-next-app/tests/client-transactions.test.ts b/dev-packages/e2e-tests/test-applications/create-next-app/tests/client-transactions.test.ts
index cbb2cae29265..a539216efee7 100644
--- a/dev-packages/e2e-tests/test-applications/create-next-app/tests/client-transactions.test.ts
+++ b/dev-packages/e2e-tests/test-applications/create-next-app/tests/client-transactions.test.ts
@@ -24,6 +24,7 @@ test('Sends a pageload transaction to Sentry', async ({ page }) => {
           trace_id: expect.stringMatching(/[a-f0-9]{32}/),
           op: 'pageload',
           origin: 'auto.pageload.nextjs.pages_router_instrumentation',
+          status: 'ok',
           data: expect.objectContaining({
             'sentry.idle_span_finish_reason': 'idleTimeout',
             'sentry.op': 'pageload',
@@ -69,6 +70,7 @@ test('captures a navigation transaction to Sentry', async ({ page }) => {
           trace_id: expect.stringMatching(/[a-f0-9]{32}/),
           op: 'navigation',
           origin: 'auto.navigation.nextjs.pages_router_instrumentation',
+          status: 'ok',
           data: expect.objectContaining({
             'sentry.idle_span_finish_reason': 'idleTimeout',
             'sentry.op': 'navigation',
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-app-dir/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/nextjs-app-dir/tests/transactions.test.ts
index 9819507f5cb9..c938817e2642 100644
--- a/dev-packages/e2e-tests/test-applications/nextjs-app-dir/tests/transactions.test.ts
+++ b/dev-packages/e2e-tests/test-applications/nextjs-app-dir/tests/transactions.test.ts
@@ -33,6 +33,7 @@ test('Sends a pageload transaction', async ({ page }) => {
           trace_id: expect.stringMatching(/[a-f0-9]{32}/),
           op: 'pageload',
           origin: 'auto.pageload.nextjs.app_router_instrumentation',
+          status: 'ok',
           data: expect.objectContaining({
             'sentry.op': 'pageload',
             'sentry.origin': 'auto.pageload.nextjs.app_router_instrumentation',
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-pages-dir/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/nextjs-pages-dir/tests/transactions.test.ts
index 3569789ed995..5b648065e45a 100644
--- a/dev-packages/e2e-tests/test-applications/nextjs-pages-dir/tests/transactions.test.ts
+++ b/dev-packages/e2e-tests/test-applications/nextjs-pages-dir/tests/transactions.test.ts
@@ -33,6 +33,7 @@ test('Sends a pageload transaction', async ({ page }) => {
           trace_id: expect.stringMatching(/[a-f0-9]{32}/),
           op: 'pageload',
           origin: 'auto.pageload.nextjs.pages_router_instrumentation',
+          status: 'ok',
           data: expect.objectContaining({
             'sentry.op': 'pageload',
             'sentry.origin': 'auto.pageload.nextjs.pages_router_instrumentation',
diff --git a/dev-packages/e2e-tests/test-applications/react-create-browser-router/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/react-create-browser-router/tests/transactions.test.ts
index ee0c507076fa..4af30d8e139d 100644
--- a/dev-packages/e2e-tests/test-applications/react-create-browser-router/tests/transactions.test.ts
+++ b/dev-packages/e2e-tests/test-applications/react-create-browser-router/tests/transactions.test.ts
@@ -36,6 +36,7 @@ test('Captures a pageload transaction', async ({ page }) => {
       span_id: expect.stringMatching(/[a-f0-9]{16}/),
       trace_id: expect.stringMatching(/[a-f0-9]{32}/),
       origin: 'auto.pageload.react.reactrouter_v6',
+      status: 'ok',
     }),
   );
 });
@@ -72,6 +73,7 @@ test('Captures a navigation transaction', async ({ page }) => {
     span_id: expect.stringMatching(/[a-f0-9]{16}/),
     trace_id: expect.stringMatching(/[a-f0-9]{32}/),
     origin: 'auto.navigation.react.reactrouter_v6',
+    status: 'ok',
   });
 
   expect(transactionEvent).toEqual(
@@ -107,6 +109,7 @@ test('Captures a lazy pageload transaction', async ({ page }) => {
     span_id: expect.stringMatching(/[a-f0-9]{16}/),
     trace_id: expect.stringMatching(/[a-f0-9]{32}/),
     origin: 'auto.pageload.react.reactrouter_v6',
+    status: 'ok',
   });
 
   expect(transactionEvent).toEqual(
@@ -169,6 +172,7 @@ test('Captures a lazy navigation transaction', async ({ page }) => {
     span_id: expect.stringMatching(/[a-f0-9]{16}/),
     trace_id: expect.stringMatching(/[a-f0-9]{32}/),
     origin: 'auto.navigation.react.reactrouter_v6',
+    status: 'ok',
   });
 
   expect(transactionEvent).toEqual(
diff --git a/dev-packages/e2e-tests/test-applications/react-create-hash-router/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/react-create-hash-router/tests/transactions.test.ts
index 36e6d0c18ee2..15cab5e8569e 100644
--- a/dev-packages/e2e-tests/test-applications/react-create-hash-router/tests/transactions.test.ts
+++ b/dev-packages/e2e-tests/test-applications/react-create-hash-router/tests/transactions.test.ts
@@ -31,6 +31,7 @@ test('Captures a pageload transaction', async ({ page }) => {
     span_id: expect.stringMatching(/[a-f0-9]{16}/),
     trace_id: expect.stringMatching(/[a-f0-9]{32}/),
     origin: 'auto.pageload.react.reactrouter_v6',
+    status: 'ok',
   });
 
   expect(transactionEvent).toEqual(
@@ -136,6 +137,7 @@ test('Captures a navigation transaction', async ({ page }) => {
     span_id: expect.stringMatching(/[a-f0-9]{16}/),
     trace_id: expect.stringMatching(/[a-f0-9]{32}/),
     origin: 'auto.navigation.react.reactrouter_v6',
+    status: 'ok',
   });
 
   expect(transactionEvent).toEqual(
diff --git a/dev-packages/e2e-tests/test-applications/react-create-memory-router/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/react-create-memory-router/tests/transactions.test.ts
index 61a583a7bf55..5c60b704bb7a 100644
--- a/dev-packages/e2e-tests/test-applications/react-create-memory-router/tests/transactions.test.ts
+++ b/dev-packages/e2e-tests/test-applications/react-create-memory-router/tests/transactions.test.ts
@@ -33,6 +33,7 @@ test('Captures a pageload transaction', async ({ page }) => {
       span_id: expect.stringMatching(/[a-f0-9]{16}/),
       trace_id: expect.stringMatching(/[a-f0-9]{32}/),
       origin: 'auto.pageload.react.reactrouter_v6',
+      status: 'ok',
     }),
   );
 });
@@ -69,6 +70,7 @@ test('Captures a navigation transaction', async ({ page }) => {
     span_id: expect.stringMatching(/[a-f0-9]{16}/),
     trace_id: expect.stringMatching(/[a-f0-9]{32}/),
     origin: 'auto.navigation.react.reactrouter_v6',
+    status: 'ok',
   });
 
   expect(transactionEvent).toEqual(
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/tests/transactions.test.ts
index 3901b0938ca5..a57199c52633 100644
--- a/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/tests/transactions.test.ts
+++ b/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/tests/transactions.test.ts
@@ -21,6 +21,7 @@ test('Creates a pageload transaction with parameterized route', async ({ page })
   expect(event.transaction).toBe('/lazy/inner/:id/:anotherId/:someAnotherId');
   expect(event.type).toBe('transaction');
   expect(event.contexts?.trace?.op).toBe('pageload');
+  expect(event.contexts?.trace?.status).toBe('ok');
 });
 
 test('Does not create a navigation transaction on initial load to deep lazy route', async ({ page }) => {
@@ -82,6 +83,7 @@ test('Creates a navigation transaction inside a lazy route', async ({ page }) =>
   expect(event.transaction).toBe('/lazy/inner/:id/:anotherId/:someAnotherId');
   expect(event.type).toBe('transaction');
   expect(event.contexts?.trace?.op).toBe('navigation');
+  expect(event.contexts?.trace?.status).toBe('ok');
 });
 
 test('Creates navigation transactions between two different lazy routes', async ({ page }) => {
@@ -498,3 +500,90 @@ test('Updates navigation transaction name correctly when span is cancelled early
     expect(['externalFinish', 'cancelled']).toContain(idleSpanFinishReason);
   }
 });
+
+test('Creates separate transactions for rapid consecutive navigations', async ({ page }) => {
+  await page.goto('/');
+
+  // First navigation: / -> /lazy/inner/:id/:anotherId/:someAnotherId
+  const firstTransactionPromise = waitForTransaction('react-router-7-lazy-routes', async transactionEvent => {
+    return (
+      !!transactionEvent?.transaction &&
+      transactionEvent.contexts?.trace?.op === 'navigation' &&
+      transactionEvent.transaction === '/lazy/inner/:id/:anotherId/:someAnotherId'
+    );
+  });
+
+  const navigationToInner = page.locator('id=navigation');
+  await expect(navigationToInner).toBeVisible();
+  await navigationToInner.click();
+
+  const firstEvent = await firstTransactionPromise;
+
+  // Verify first transaction
+  expect(firstEvent.transaction).toBe('/lazy/inner/:id/:anotherId/:someAnotherId');
+  expect(firstEvent.contexts?.trace?.op).toBe('navigation');
+  expect(firstEvent.contexts?.trace?.status).toBe('ok');
+  const firstTraceId = firstEvent.contexts?.trace?.trace_id;
+  const firstSpanId = firstEvent.contexts?.trace?.span_id;
+
+  // Second navigation: /lazy/inner -> /another-lazy/sub/:id/:subId
+  const secondTransactionPromise = waitForTransaction('react-router-7-lazy-routes', async transactionEvent => {
+    return (
+      !!transactionEvent?.transaction &&
+      transactionEvent.contexts?.trace?.op === 'navigation' &&
+      transactionEvent.transaction === '/another-lazy/sub/:id/:subId'
+    );
+  });
+
+  const navigationToAnother = page.locator('id=navigate-to-another-from-inner');
+  await expect(navigationToAnother).toBeVisible();
+  await navigationToAnother.click();
+
+  const secondEvent = await secondTransactionPromise;
+
+  // Verify second transaction
+  expect(secondEvent.transaction).toBe('/another-lazy/sub/:id/:subId');
+  expect(secondEvent.contexts?.trace?.op).toBe('navigation');
+  expect(secondEvent.contexts?.trace?.status).toBe('ok');
+  const secondTraceId = secondEvent.contexts?.trace?.trace_id;
+  const secondSpanId = secondEvent.contexts?.trace?.span_id;
+
+  // Third navigation: /another-lazy -> /lazy/inner/:id/:anotherId/:someAnotherId (back to same route as first)
+  const thirdTransactionPromise = waitForTransaction('react-router-7-lazy-routes', async transactionEvent => {
+    return (
+      !!transactionEvent?.transaction &&
+      transactionEvent.contexts?.trace?.op === 'navigation' &&
+      transactionEvent.transaction === '/lazy/inner/:id/:anotherId/:someAnotherId' &&
+      // Ensure we're not matching the first transaction again
+      transactionEvent.contexts?.trace?.trace_id !== firstTraceId
+    );
+  });
+
+  const navigationBackToInner = page.locator('id=navigate-to-inner-from-deep');
+  await expect(navigationBackToInner).toBeVisible();
+  await navigationBackToInner.click();
+
+  const thirdEvent = await thirdTransactionPromise;
+
+  // Verify third transaction
+  expect(thirdEvent.transaction).toBe('/lazy/inner/:id/:anotherId/:someAnotherId');
+  expect(thirdEvent.contexts?.trace?.op).toBe('navigation');
+  expect(thirdEvent.contexts?.trace?.status).toBe('ok');
+  const thirdTraceId = thirdEvent.contexts?.trace?.trace_id;
+  const thirdSpanId = thirdEvent.contexts?.trace?.span_id;
+
+  // Verify each navigation created a separate transaction with unique trace and span IDs
+  expect(firstTraceId).toBeDefined();
+  expect(secondTraceId).toBeDefined();
+  expect(thirdTraceId).toBeDefined();
+
+  // All trace IDs should be unique
+  expect(firstTraceId).not.toBe(secondTraceId);
+  expect(secondTraceId).not.toBe(thirdTraceId);
+  expect(firstTraceId).not.toBe(thirdTraceId);
+
+  // All span IDs should be unique
+  expect(firstSpanId).not.toBe(secondSpanId);
+  expect(secondSpanId).not.toBe(thirdSpanId);
+  expect(firstSpanId).not.toBe(thirdSpanId);
+});
diff --git a/packages/core/src/tracing/idleSpan.ts b/packages/core/src/tracing/idleSpan.ts
index b35e31322ecd..53848a9c9191 100644
--- a/packages/core/src/tracing/idleSpan.ts
+++ b/packages/core/src/tracing/idleSpan.ts
@@ -19,7 +19,7 @@ import { timestampInSeconds } from '../utils/time';
 import { freezeDscOnSpan, getDynamicSamplingContextFromSpan } from './dynamicSamplingContext';
 import { SentryNonRecordingSpan } from './sentryNonRecordingSpan';
 import { SentrySpan } from './sentrySpan';
-import { SPAN_STATUS_ERROR } from './spanstatus';
+import { SPAN_STATUS_ERROR, SPAN_STATUS_OK } from './spanstatus';
 import { startInactiveSpan } from './trace';
 
 export const TRACING_DEFAULTS = {
@@ -302,6 +302,12 @@ export function startIdleSpan(startSpanOptions: StartSpanOptions, options: Parti
       span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_IDLE_SPAN_FINISH_REASON, _finishReason);
     }
 
+    // Set span status to 'ok' if it hasn't been explicitly set to an error status
+    const currentStatus = spanJSON.status;
+    if (!currentStatus || currentStatus === 'unknown') {
+      span.setStatus({ code: SPAN_STATUS_OK });
+    }
+
     debug.log(`[Tracing] Idle span "${spanJSON.op}" finished`);
 
     const childSpans = getSpanDescendants(span).filter(child => child !== span);

From 2406e9058377436956028779268e510e02a25bc6 Mon Sep 17 00:00:00 2001
From: Rola Abuhasna <rola.abuhasna@sentry.io>
Date: Wed, 12 Nov 2025 14:06:17 +0100
Subject: [PATCH 059/186] feat(node-core): Add mechanism to prevent wrapping ai
 providers multiple times(#17972)

When using higher-level integrations that wrap underlying libraries,
both the wrapper integration and the underlying library integration can
instrument the same API calls, resulting in duplicate spans. This is
particularly problematic for:

- LangChain wrapping AI providers (OpenAI, Anthropic, Google GenAI)
- Any future providers that wrap other providers

We expose 3 internal methods

```js
_INTERNAL_skipAiProviderWrapping(providers: string[])
_INTERNAL_shouldSkipAiProviderWrapping(provider: string)
_INTERNAL_clearAiProviderSkips()
```

To bail out of instrumenting providers when they are on the skip list. These are internal methods not meant for public consumers and may be changed or removed in the future.
---------

Co-authored-by: Andrei Borza <andrei.borza@sentry.io>
---
 .../tracing/langchain/instrument-with-pii.mjs |  2 -
 .../suites/tracing/langchain/instrument.mjs   |  2 -
 .../scenario-openai-before-langchain.mjs      | 95 +++++++++++++++++++
 .../suites/tracing/langchain/test.ts          | 60 ++++++++++++
 packages/core/src/index.ts                    |  7 +-
 packages/core/src/integration.ts              |  2 +-
 packages/core/src/utils/ai/providerSkip.ts    | 64 +++++++++++++
 packages/core/test/lib/integration.test.ts    |  6 +-
 .../test/lib/utils/ai/providerSkip.test.ts    | 71 ++++++++++++++
 packages/node-core/src/sdk/client.ts          | 18 +++-
 .../tracing/anthropic-ai/instrumentation.ts   | 13 ++-
 .../tracing/google-genai/instrumentation.ts   | 16 +++-
 .../node/src/integrations/tracing/index.ts    | 10 +-
 .../integrations/tracing/langchain/index.ts   |  4 +
 .../tracing/langchain/instrumentation.ts      | 20 +++-
 .../tracing/openai/instrumentation.ts         | 13 ++-
 16 files changed, 381 insertions(+), 22 deletions(-)
 create mode 100644 dev-packages/node-integration-tests/suites/tracing/langchain/scenario-openai-before-langchain.mjs
 create mode 100644 packages/core/src/utils/ai/providerSkip.ts
 create mode 100644 packages/core/test/lib/utils/ai/providerSkip.test.ts

diff --git a/dev-packages/node-integration-tests/suites/tracing/langchain/instrument-with-pii.mjs b/dev-packages/node-integration-tests/suites/tracing/langchain/instrument-with-pii.mjs
index 85b2a963d977..cb68a6f7683e 100644
--- a/dev-packages/node-integration-tests/suites/tracing/langchain/instrument-with-pii.mjs
+++ b/dev-packages/node-integration-tests/suites/tracing/langchain/instrument-with-pii.mjs
@@ -7,8 +7,6 @@ Sentry.init({
   tracesSampleRate: 1.0,
   sendDefaultPii: true,
   transport: loggingTransport,
-  // Filter out Anthropic integration to avoid duplicate spans with LangChain
-  integrations: integrations => integrations.filter(integration => integration.name !== 'Anthropic_AI'),
   beforeSendTransaction: event => {
     // Filter out mock express server transactions
     if (event.transaction.includes('/v1/messages')) {
diff --git a/dev-packages/node-integration-tests/suites/tracing/langchain/instrument.mjs b/dev-packages/node-integration-tests/suites/tracing/langchain/instrument.mjs
index 524d19f4b995..b4ce44f3e91a 100644
--- a/dev-packages/node-integration-tests/suites/tracing/langchain/instrument.mjs
+++ b/dev-packages/node-integration-tests/suites/tracing/langchain/instrument.mjs
@@ -7,8 +7,6 @@ Sentry.init({
   tracesSampleRate: 1.0,
   sendDefaultPii: false,
   transport: loggingTransport,
-  // Filter out Anthropic integration to avoid duplicate spans with LangChain
-  integrations: integrations => integrations.filter(integration => integration.name !== 'Anthropic_AI'),
   beforeSendTransaction: event => {
     // Filter out mock express server transactions
     if (event.transaction.includes('/v1/messages')) {
diff --git a/dev-packages/node-integration-tests/suites/tracing/langchain/scenario-openai-before-langchain.mjs b/dev-packages/node-integration-tests/suites/tracing/langchain/scenario-openai-before-langchain.mjs
new file mode 100644
index 000000000000..f194acb1672b
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/langchain/scenario-openai-before-langchain.mjs
@@ -0,0 +1,95 @@
+import * as Sentry from '@sentry/node';
+import express from 'express';
+
+function startMockAnthropicServer() {
+  const app = express();
+  app.use(express.json());
+
+  app.post('/v1/messages', (req, res) => {
+    res.json({
+      id: 'msg_test123',
+      type: 'message',
+      role: 'assistant',
+      content: [
+        {
+          type: 'text',
+          text: 'Mock response from Anthropic!',
+        },
+      ],
+      model: req.body.model,
+      stop_reason: 'end_turn',
+      stop_sequence: null,
+      usage: {
+        input_tokens: 10,
+        output_tokens: 15,
+      },
+    });
+  });
+
+  return new Promise(resolve => {
+    const server = app.listen(0, () => {
+      resolve(server);
+    });
+  });
+}
+
+async function run() {
+  const server = await startMockAnthropicServer();
+  const baseURL = `http://localhost:${server.address().port}`;
+
+  await Sentry.startSpan({ op: 'function', name: 'main' }, async () => {
+    // EDGE CASE: Import and instantiate Anthropic client BEFORE LangChain is imported
+    // This simulates the timing issue where a user creates an Anthropic client in one file
+    // before importing LangChain in another file
+    const { default: Anthropic } = await import('@anthropic-ai/sdk');
+    const anthropicClient = new Anthropic({
+      apiKey: 'mock-api-key',
+      baseURL,
+    });
+
+    // Use the Anthropic client directly - this will be instrumented by the Anthropic integration
+    await anthropicClient.messages.create({
+      model: 'claude-3-5-sonnet-20241022',
+      messages: [{ role: 'user', content: 'Direct Anthropic call' }],
+      temperature: 0.7,
+      max_tokens: 100,
+    });
+
+    // NOW import LangChain - at this point it will mark Anthropic to be skipped
+    // But the client created above is already instrumented
+    const { ChatAnthropic } = await import('@langchain/anthropic');
+
+    // Create a LangChain model - this uses Anthropic under the hood
+    const langchainModel = new ChatAnthropic({
+      model: 'claude-3-5-sonnet-20241022',
+      temperature: 0.7,
+      maxTokens: 100,
+      apiKey: 'mock-api-key',
+      clientOptions: {
+        baseURL,
+      },
+    });
+
+    // Use LangChain - this will be instrumented by LangChain integration
+    await langchainModel.invoke('LangChain Anthropic call');
+
+    // Create ANOTHER Anthropic client after LangChain was imported
+    // This one should NOT be instrumented (skip mechanism works correctly)
+    const anthropicClient2 = new Anthropic({
+      apiKey: 'mock-api-key',
+      baseURL,
+    });
+
+    await anthropicClient2.messages.create({
+      model: 'claude-3-5-sonnet-20241022',
+      messages: [{ role: 'user', content: 'Second direct Anthropic call' }],
+      temperature: 0.7,
+      max_tokens: 100,
+    });
+  });
+
+  await Sentry.flush(2000);
+  server.close();
+}
+
+run();
diff --git a/dev-packages/node-integration-tests/suites/tracing/langchain/test.ts b/dev-packages/node-integration-tests/suites/tracing/langchain/test.ts
index ff0e95b8f8ad..e75e0ec7f5da 100644
--- a/dev-packages/node-integration-tests/suites/tracing/langchain/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/langchain/test.ts
@@ -245,4 +245,64 @@ describe('LangChain integration', () => {
       });
     },
   );
+
+  createEsmAndCjsTests(
+    __dirname,
+    'scenario-openai-before-langchain.mjs',
+    'instrument.mjs',
+    (createRunner, test) => {
+      test('demonstrates timing issue with duplicate spans (ESM only)', async () => {
+        await createRunner()
+          .ignore('event')
+          .expect({
+            transaction: event => {
+              // This test highlights the limitation: if a user creates an Anthropic client
+              // before importing LangChain, that client will still be instrumented and
+              // could cause duplicate spans when used alongside LangChain.
+
+              const spans = event.spans || [];
+
+              // First call: Direct Anthropic call made BEFORE LangChain import
+              // This should have Anthropic instrumentation (origin: 'auto.ai.anthropic')
+              const firstAnthropicSpan = spans.find(
+                span =>
+                  span.description === 'messages claude-3-5-sonnet-20241022' && span.origin === 'auto.ai.anthropic',
+              );
+
+              // Second call: LangChain call
+              // This should have LangChain instrumentation (origin: 'auto.ai.langchain')
+              const langchainSpan = spans.find(
+                span => span.description === 'chat claude-3-5-sonnet-20241022' && span.origin === 'auto.ai.langchain',
+              );
+
+              // Third call: Direct Anthropic call made AFTER LangChain import
+              // This should NOT have Anthropic instrumentation (skip works correctly)
+              // Count how many Anthropic spans we have - should be exactly 1
+              const anthropicSpans = spans.filter(
+                span =>
+                  span.description === 'messages claude-3-5-sonnet-20241022' && span.origin === 'auto.ai.anthropic',
+              );
+
+              // Verify the edge case limitation:
+              // - First Anthropic client (created before LangChain) IS instrumented
+              expect(firstAnthropicSpan).toBeDefined();
+              expect(firstAnthropicSpan?.origin).toBe('auto.ai.anthropic');
+
+              // - LangChain call IS instrumented by LangChain
+              expect(langchainSpan).toBeDefined();
+              expect(langchainSpan?.origin).toBe('auto.ai.langchain');
+
+              // - Second Anthropic client (created after LangChain) is NOT instrumented
+              // This demonstrates that the skip mechanism works for NEW clients
+              // We should only have ONE Anthropic span (the first one), not two
+              expect(anthropicSpans).toHaveLength(1);
+            },
+          })
+          .start()
+          .completed();
+      });
+    },
+    // This test fails on CJS because we use dynamic imports to simulate importing LangChain after the Anthropic client is created
+    { failsOnCjs: true },
+  );
 });
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index f3b29009b9ce..c11d69179bd3 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -55,7 +55,12 @@ export { initAndBind, setCurrentClient } from './sdk';
 export { createTransport } from './transports/base';
 export { makeOfflineTransport } from './transports/offline';
 export { makeMultiplexedTransport } from './transports/multiplexed';
-export { getIntegrationsToSetup, addIntegration, defineIntegration } from './integration';
+export { getIntegrationsToSetup, addIntegration, defineIntegration, installedIntegrations } from './integration';
+export {
+  _INTERNAL_skipAiProviderWrapping,
+  _INTERNAL_shouldSkipAiProviderWrapping,
+  _INTERNAL_clearAiProviderSkips,
+} from './utils/ai/providerSkip';
 export { applyScopeDataToEvent, mergeScopeData } from './utils/applyScopeDataToEvent';
 export { prepareEvent } from './utils/prepareEvent';
 export { createCheckInEnvelope } from './checkin';
diff --git a/packages/core/src/integration.ts b/packages/core/src/integration.ts
index 5cba3ff3dfb8..892228476824 100644
--- a/packages/core/src/integration.ts
+++ b/packages/core/src/integration.ts
@@ -107,7 +107,7 @@ export function setupIntegration(client: Client, integration: Integration, integ
   integrationIndex[integration.name] = integration;
 
   // `setupOnce` is only called the first time
-  if (installedIntegrations.indexOf(integration.name) === -1 && typeof integration.setupOnce === 'function') {
+  if (!installedIntegrations.includes(integration.name) && typeof integration.setupOnce === 'function') {
     integration.setupOnce();
     installedIntegrations.push(integration.name);
   }
diff --git a/packages/core/src/utils/ai/providerSkip.ts b/packages/core/src/utils/ai/providerSkip.ts
new file mode 100644
index 000000000000..0b7ca2a5c3bc
--- /dev/null
+++ b/packages/core/src/utils/ai/providerSkip.ts
@@ -0,0 +1,64 @@
+import { DEBUG_BUILD } from '../../debug-build';
+import { debug } from '../debug-logger';
+
+/**
+ * Registry tracking which AI provider modules should skip instrumentation wrapping.
+ *
+ * This prevents duplicate spans when a higher-level integration (like LangChain)
+ * already instruments AI providers at a higher abstraction level.
+ */
+const SKIPPED_AI_PROVIDERS = new Set<string>();
+
+/**
+ * Mark AI provider modules to skip instrumentation wrapping.
+ *
+ * This prevents duplicate spans when a higher-level integration (like LangChain)
+ * already instruments AI providers at a higher abstraction level.
+ *
+ * @internal
+ * @param modules - Array of npm module names to skip (e.g., '@anthropic-ai/sdk', 'openai')
+ *
+ * @example
+ * ```typescript
+ * // In LangChain integration
+ * _INTERNAL_skipAiProviderWrapping(['@anthropic-ai/sdk', 'openai', '@google/generative-ai']);
+ * ```
+ */
+export function _INTERNAL_skipAiProviderWrapping(modules: string[]): void {
+  modules.forEach(module => {
+    SKIPPED_AI_PROVIDERS.add(module);
+    DEBUG_BUILD && debug.log(`AI provider "${module}" wrapping will be skipped`);
+  });
+}
+
+/**
+ * Check if an AI provider module should skip instrumentation wrapping.
+ *
+ * @internal
+ * @param module - The npm module name (e.g., '@anthropic-ai/sdk', 'openai')
+ * @returns true if wrapping should be skipped
+ *
+ * @example
+ * ```typescript
+ * // In AI provider instrumentation
+ * if (_INTERNAL_shouldSkipAiProviderWrapping('@anthropic-ai/sdk')) {
+ *   return Reflect.construct(Original, args); // Don't instrument
+ * }
+ * ```
+ */
+export function _INTERNAL_shouldSkipAiProviderWrapping(module: string): boolean {
+  return SKIPPED_AI_PROVIDERS.has(module);
+}
+
+/**
+ * Clear all AI provider skip registrations.
+ *
+ * This is automatically called at the start of Sentry.init() to ensure a clean state
+ * between different client initializations.
+ *
+ * @internal
+ */
+export function _INTERNAL_clearAiProviderSkips(): void {
+  SKIPPED_AI_PROVIDERS.clear();
+  DEBUG_BUILD && debug.log('Cleared AI provider skip registrations');
+}
diff --git a/packages/core/test/lib/integration.test.ts b/packages/core/test/lib/integration.test.ts
index 5b7554f261b1..75e13374daa7 100644
--- a/packages/core/test/lib/integration.test.ts
+++ b/packages/core/test/lib/integration.test.ts
@@ -3,7 +3,7 @@ import { getCurrentScope } from '../../src/currentScopes';
 import { addIntegration, getIntegrationsToSetup, installedIntegrations, setupIntegration } from '../../src/integration';
 import { setCurrentClient } from '../../src/sdk';
 import type { Integration } from '../../src/types-hoist/integration';
-import type { Options } from '../../src/types-hoist/options';
+import type { CoreOptions } from '../../src/types-hoist/options';
 import { debug } from '../../src/utils/debug-logger';
 import { getDefaultTestClientOptions, TestClient } from '../mocks/client';
 
@@ -32,8 +32,8 @@ class MockIntegration implements Integration {
 
 type TestCase = [
   string, // test name
-  Options['defaultIntegrations'], // default integrations
-  Options['integrations'], // user-provided integrations
+  CoreOptions['defaultIntegrations'], // default integrations
+  CoreOptions['integrations'], // user-provided integrations
   Array<string | string[]>, // expected results
 ];
 
diff --git a/packages/core/test/lib/utils/ai/providerSkip.test.ts b/packages/core/test/lib/utils/ai/providerSkip.test.ts
new file mode 100644
index 000000000000..99ec76c970d6
--- /dev/null
+++ b/packages/core/test/lib/utils/ai/providerSkip.test.ts
@@ -0,0 +1,71 @@
+import { beforeEach, describe, expect, it } from 'vitest';
+import {
+  _INTERNAL_clearAiProviderSkips,
+  _INTERNAL_shouldSkipAiProviderWrapping,
+  _INTERNAL_skipAiProviderWrapping,
+  ANTHROPIC_AI_INTEGRATION_NAME,
+  GOOGLE_GENAI_INTEGRATION_NAME,
+  OPENAI_INTEGRATION_NAME,
+} from '../../../../src/index';
+
+describe('AI Provider Skip', () => {
+  beforeEach(() => {
+    _INTERNAL_clearAiProviderSkips();
+  });
+
+  describe('_INTERNAL_skipAiProviderWrapping', () => {
+    it('marks a single provider to be skipped', () => {
+      _INTERNAL_skipAiProviderWrapping([OPENAI_INTEGRATION_NAME]);
+      expect(_INTERNAL_shouldSkipAiProviderWrapping(OPENAI_INTEGRATION_NAME)).toBe(true);
+      expect(_INTERNAL_shouldSkipAiProviderWrapping(ANTHROPIC_AI_INTEGRATION_NAME)).toBe(false);
+    });
+
+    it('marks multiple providers to be skipped', () => {
+      _INTERNAL_skipAiProviderWrapping([OPENAI_INTEGRATION_NAME, ANTHROPIC_AI_INTEGRATION_NAME]);
+      expect(_INTERNAL_shouldSkipAiProviderWrapping(OPENAI_INTEGRATION_NAME)).toBe(true);
+      expect(_INTERNAL_shouldSkipAiProviderWrapping(ANTHROPIC_AI_INTEGRATION_NAME)).toBe(true);
+      expect(_INTERNAL_shouldSkipAiProviderWrapping(GOOGLE_GENAI_INTEGRATION_NAME)).toBe(false);
+    });
+
+    it('is idempotent - can mark same provider multiple times', () => {
+      _INTERNAL_skipAiProviderWrapping([OPENAI_INTEGRATION_NAME]);
+      _INTERNAL_skipAiProviderWrapping([OPENAI_INTEGRATION_NAME]);
+      _INTERNAL_skipAiProviderWrapping([OPENAI_INTEGRATION_NAME]);
+      expect(_INTERNAL_shouldSkipAiProviderWrapping(OPENAI_INTEGRATION_NAME)).toBe(true);
+    });
+  });
+
+  describe('_INTERNAL_shouldSkipAiProviderWrapping', () => {
+    it('returns false for unmarked providers', () => {
+      expect(_INTERNAL_shouldSkipAiProviderWrapping(OPENAI_INTEGRATION_NAME)).toBe(false);
+      expect(_INTERNAL_shouldSkipAiProviderWrapping(ANTHROPIC_AI_INTEGRATION_NAME)).toBe(false);
+      expect(_INTERNAL_shouldSkipAiProviderWrapping(GOOGLE_GENAI_INTEGRATION_NAME)).toBe(false);
+    });
+
+    it('returns true after marking provider to be skipped', () => {
+      _INTERNAL_skipAiProviderWrapping([ANTHROPIC_AI_INTEGRATION_NAME]);
+      expect(_INTERNAL_shouldSkipAiProviderWrapping(ANTHROPIC_AI_INTEGRATION_NAME)).toBe(true);
+    });
+  });
+
+  describe('_INTERNAL_clearAiProviderSkips', () => {
+    it('clears all skip registrations', () => {
+      _INTERNAL_skipAiProviderWrapping([OPENAI_INTEGRATION_NAME, ANTHROPIC_AI_INTEGRATION_NAME]);
+      expect(_INTERNAL_shouldSkipAiProviderWrapping(OPENAI_INTEGRATION_NAME)).toBe(true);
+      expect(_INTERNAL_shouldSkipAiProviderWrapping(ANTHROPIC_AI_INTEGRATION_NAME)).toBe(true);
+
+      _INTERNAL_clearAiProviderSkips();
+
+      expect(_INTERNAL_shouldSkipAiProviderWrapping(OPENAI_INTEGRATION_NAME)).toBe(false);
+      expect(_INTERNAL_shouldSkipAiProviderWrapping(ANTHROPIC_AI_INTEGRATION_NAME)).toBe(false);
+    });
+
+    it('can be called multiple times safely', () => {
+      _INTERNAL_skipAiProviderWrapping([OPENAI_INTEGRATION_NAME]);
+      _INTERNAL_clearAiProviderSkips();
+      _INTERNAL_clearAiProviderSkips();
+      _INTERNAL_clearAiProviderSkips();
+      expect(_INTERNAL_shouldSkipAiProviderWrapping(OPENAI_INTEGRATION_NAME)).toBe(false);
+    });
+  });
+});
diff --git a/packages/node-core/src/sdk/client.ts b/packages/node-core/src/sdk/client.ts
index e631508c7392..efc144989421 100644
--- a/packages/node-core/src/sdk/client.ts
+++ b/packages/node-core/src/sdk/client.ts
@@ -4,7 +4,14 @@ import { trace } from '@opentelemetry/api';
 import { registerInstrumentations } from '@opentelemetry/instrumentation';
 import type { BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
 import type { DynamicSamplingContext, Scope, ServerRuntimeClientOptions, TraceContext } from '@sentry/core';
-import { _INTERNAL_flushLogsBuffer, applySdkMetadata, debug, SDK_VERSION, ServerRuntimeClient } from '@sentry/core';
+import {
+  _INTERNAL_clearAiProviderSkips,
+  _INTERNAL_flushLogsBuffer,
+  applySdkMetadata,
+  debug,
+  SDK_VERSION,
+  ServerRuntimeClient,
+} from '@sentry/core';
 import { getTraceContextForScope } from '@sentry/opentelemetry';
 import { isMainThread, threadId } from 'worker_threads';
 import { DEBUG_BUILD } from '../debug-build';
@@ -145,6 +152,15 @@ export class NodeClient extends ServerRuntimeClient<NodeClientOptions> {
     }
   }
 
+  /** @inheritDoc */
+  protected _setupIntegrations(): void {
+    // Clear AI provider skip registrations before setting up integrations
+    // This ensures a clean state between different client initializations
+    // (e.g., when LangChain skips OpenAI in one client, but a subsequent client uses OpenAI standalone)
+    _INTERNAL_clearAiProviderSkips();
+    super._setupIntegrations();
+  }
+
   /** Custom implementation for OTEL, so we can handle scope-span linking. */
   protected _getTraceInfoFromScope(
     scope: Scope | undefined,
diff --git a/packages/node/src/integrations/tracing/anthropic-ai/instrumentation.ts b/packages/node/src/integrations/tracing/anthropic-ai/instrumentation.ts
index d55689415aee..09cfd7e33713 100644
--- a/packages/node/src/integrations/tracing/anthropic-ai/instrumentation.ts
+++ b/packages/node/src/integrations/tracing/anthropic-ai/instrumentation.ts
@@ -5,7 +5,13 @@ import {
   InstrumentationNodeModuleDefinition,
 } from '@opentelemetry/instrumentation';
 import type { AnthropicAiClient, AnthropicAiOptions } from '@sentry/core';
-import { getClient, instrumentAnthropicAiClient, SDK_VERSION } from '@sentry/core';
+import {
+  _INTERNAL_shouldSkipAiProviderWrapping,
+  ANTHROPIC_AI_INTEGRATION_NAME,
+  getClient,
+  instrumentAnthropicAiClient,
+  SDK_VERSION,
+} from '@sentry/core';
 
 const supportedVersions = ['>=0.19.2 <1.0.0'];
 
@@ -48,6 +54,11 @@ export class SentryAnthropicAiInstrumentation extends InstrumentationBase<Anthro
     const config = this.getConfig();
 
     const WrappedAnthropic = function (this: unknown, ...args: unknown[]) {
+      // Check if wrapping should be skipped (e.g., when LangChain is handling instrumentation)
+      if (_INTERNAL_shouldSkipAiProviderWrapping(ANTHROPIC_AI_INTEGRATION_NAME)) {
+        return Reflect.construct(Original, args) as AnthropicAiClient;
+      }
+
       const instance = Reflect.construct(Original, args);
       const client = getClient();
       const defaultPii = Boolean(client?.getOptions().sendDefaultPii);
diff --git a/packages/node/src/integrations/tracing/google-genai/instrumentation.ts b/packages/node/src/integrations/tracing/google-genai/instrumentation.ts
index e604e0c99cd3..194e5bf2df70 100644
--- a/packages/node/src/integrations/tracing/google-genai/instrumentation.ts
+++ b/packages/node/src/integrations/tracing/google-genai/instrumentation.ts
@@ -6,7 +6,14 @@ import {
   InstrumentationNodeModuleFile,
 } from '@opentelemetry/instrumentation';
 import type { GoogleGenAIClient, GoogleGenAIOptions } from '@sentry/core';
-import { getClient, instrumentGoogleGenAIClient, replaceExports, SDK_VERSION } from '@sentry/core';
+import {
+  _INTERNAL_shouldSkipAiProviderWrapping,
+  getClient,
+  GOOGLE_GENAI_INTEGRATION_NAME,
+  instrumentGoogleGenAIClient,
+  replaceExports,
+  SDK_VERSION,
+} from '@sentry/core';
 
 const supportedVersions = ['>=0.10.0 <2'];
 
@@ -65,14 +72,17 @@ export class SentryGoogleGenAiInstrumentation extends InstrumentationBase<Google
     }
 
     const WrappedGoogleGenAI = function (this: unknown, ...args: unknown[]): GoogleGenAIClient {
+      // Check if wrapping should be skipped (e.g., when LangChain is handling instrumentation)
+      if (_INTERNAL_shouldSkipAiProviderWrapping(GOOGLE_GENAI_INTEGRATION_NAME)) {
+        return Reflect.construct(Original, args) as GoogleGenAIClient;
+      }
+
       const instance = Reflect.construct(Original, args);
       const client = getClient();
       const defaultPii = Boolean(client?.getOptions().sendDefaultPii);
 
       const typedConfig = config;
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
       const recordInputs = typedConfig?.recordInputs ?? defaultPii;
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
       const recordOutputs = typedConfig?.recordOutputs ?? defaultPii;
 
       return instrumentGoogleGenAIClient(instance, {
diff --git a/packages/node/src/integrations/tracing/index.ts b/packages/node/src/integrations/tracing/index.ts
index 2782d7907349..b586941d6530 100644
--- a/packages/node/src/integrations/tracing/index.ts
+++ b/packages/node/src/integrations/tracing/index.ts
@@ -51,13 +51,15 @@ export function getAutoPerformanceIntegrations(): Integration[] {
     kafkaIntegration(),
     amqplibIntegration(),
     lruMemoizerIntegration(),
+    // AI providers
+    // LangChain must come first to disable AI provider integrations before they instrument
+    langChainIntegration(),
     vercelAIIntegration(),
     openAIIntegration(),
-    postgresJsIntegration(),
-    firebaseIntegration(),
     anthropicAIIntegration(),
     googleGenAIIntegration(),
-    langChainIntegration(),
+    postgresJsIntegration(),
+    firebaseIntegration(),
   ];
 }
 
@@ -89,12 +91,12 @@ export function getOpenTelemetryInstrumentationToPreload(): (((options?: any) =>
     instrumentTedious,
     instrumentGenericPool,
     instrumentAmqplib,
+    instrumentLangChain,
     instrumentVercelAi,
     instrumentOpenAi,
     instrumentPostgresJs,
     instrumentFirebase,
     instrumentAnthropicAi,
     instrumentGoogleGenAI,
-    instrumentLangChain,
   ];
 }
diff --git a/packages/node/src/integrations/tracing/langchain/index.ts b/packages/node/src/integrations/tracing/langchain/index.ts
index e575691b930f..cbc7bae8c63d 100644
--- a/packages/node/src/integrations/tracing/langchain/index.ts
+++ b/packages/node/src/integrations/tracing/langchain/index.ts
@@ -25,6 +25,10 @@ const _langChainIntegration = ((options: LangChainOptions = {}) => {
  * When configured, this integration automatically instruments LangChain runnable instances
  * to capture telemetry data by injecting Sentry callback handlers into all LangChain calls.
  *
+ * **Important:** This integration automatically skips wrapping the OpenAI, Anthropic, and Google GenAI
+ * providers to prevent duplicate spans when using LangChain with these AI providers.
+ * LangChain handles the instrumentation for all underlying AI providers.
+ *
  * @example
  * ```javascript
  * import * as Sentry from '@sentry/node';
diff --git a/packages/node/src/integrations/tracing/langchain/instrumentation.ts b/packages/node/src/integrations/tracing/langchain/instrumentation.ts
index f171a2dfb022..09c6002a4629 100644
--- a/packages/node/src/integrations/tracing/langchain/instrumentation.ts
+++ b/packages/node/src/integrations/tracing/langchain/instrumentation.ts
@@ -6,7 +6,15 @@ import {
   InstrumentationNodeModuleFile,
 } from '@opentelemetry/instrumentation';
 import type { LangChainOptions } from '@sentry/core';
-import { createLangChainCallbackHandler, getClient, SDK_VERSION } from '@sentry/core';
+import {
+  _INTERNAL_skipAiProviderWrapping,
+  ANTHROPIC_AI_INTEGRATION_NAME,
+  createLangChainCallbackHandler,
+  getClient,
+  GOOGLE_GENAI_INTEGRATION_NAME,
+  OPENAI_INTEGRATION_NAME,
+  SDK_VERSION,
+} from '@sentry/core';
 
 const supportedVersions = ['>=0.1.0 <1.0.0'];
 
@@ -143,14 +151,20 @@ export class SentryLangChainInstrumentation extends InstrumentationBase<LangChai
    * This is called when a LangChain provider package is loaded
    */
   private _patch(exports: PatchedLangChainExports): PatchedLangChainExports | void {
+    // Skip AI provider wrapping now that LangChain is actually being used
+    // This prevents duplicate spans from Anthropic/OpenAI/GoogleGenAI standalone integrations
+    _INTERNAL_skipAiProviderWrapping([
+      OPENAI_INTEGRATION_NAME,
+      ANTHROPIC_AI_INTEGRATION_NAME,
+      GOOGLE_GENAI_INTEGRATION_NAME,
+    ]);
+
     const client = getClient();
     const defaultPii = Boolean(client?.getOptions().sendDefaultPii);
 
     const config = this.getConfig();
 
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
     const recordInputs = config?.recordInputs ?? defaultPii;
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
     const recordOutputs = config?.recordOutputs ?? defaultPii;
 
     // Create a shared handler instance
diff --git a/packages/node/src/integrations/tracing/openai/instrumentation.ts b/packages/node/src/integrations/tracing/openai/instrumentation.ts
index 23df5bb66c35..d71c548395b0 100644
--- a/packages/node/src/integrations/tracing/openai/instrumentation.ts
+++ b/packages/node/src/integrations/tracing/openai/instrumentation.ts
@@ -5,7 +5,13 @@ import {
   InstrumentationNodeModuleDefinition,
 } from '@opentelemetry/instrumentation';
 import type { Integration, OpenAiClient, OpenAiOptions } from '@sentry/core';
-import { getClient, instrumentOpenAiClient, OPENAI_INTEGRATION_NAME, SDK_VERSION } from '@sentry/core';
+import {
+  _INTERNAL_shouldSkipAiProviderWrapping,
+  getClient,
+  instrumentOpenAiClient,
+  OPENAI_INTEGRATION_NAME,
+  SDK_VERSION,
+} from '@sentry/core';
 
 const supportedVersions = ['>=4.0.0 <6'];
 
@@ -56,6 +62,11 @@ export class SentryOpenAiInstrumentation extends InstrumentationBase<Instrumenta
     const Original = exports.OpenAI;
 
     const WrappedOpenAI = function (this: unknown, ...args: unknown[]) {
+      // Check if wrapping should be skipped (e.g., when LangChain is handling instrumentation)
+      if (_INTERNAL_shouldSkipAiProviderWrapping(OPENAI_INTEGRATION_NAME)) {
+        return Reflect.construct(Original, args) as OpenAiClient;
+      }
+
       const instance = Reflect.construct(Original, args);
       const client = getClient();
       const integration = client?.getIntegrationByName<OpenAiIntegration>(OPENAI_INTEGRATION_NAME);

From 4f71c948e12d3f6a55f8d74c84766cce053a280c Mon Sep 17 00:00:00 2001
From: Nicolas Hrubec <nico.hrubec@sentry.io>
Date: Wed, 12 Nov 2025 14:55:03 +0100
Subject: [PATCH 060/186] ref(core): Move ai integrations from utils to tracing
 (#18185)

As discussed moving the AI integrations from core/utils to core/tracing.
---
 packages/core/src/index.ts                    | 30 +++++++++----------
 .../ai/gen-ai-attributes.ts                   |  0
 .../ai/messageTruncation.ts                   |  0
 .../core/src/{utils => tracing}/ai/utils.ts   |  0
 .../anthropic-ai/constants.ts                 |  0
 .../{utils => tracing}/anthropic-ai/index.ts  |  2 +-
 .../anthropic-ai/streaming.ts                 |  0
 .../{utils => tracing}/anthropic-ai/types.ts  |  0
 .../{utils => tracing}/anthropic-ai/utils.ts  |  0
 .../google-genai/constants.ts                 |  0
 .../{utils => tracing}/google-genai/index.ts  |  2 +-
 .../google-genai/streaming.ts                 |  0
 .../{utils => tracing}/google-genai/types.ts  |  0
 .../{utils => tracing}/google-genai/utils.ts  |  0
 .../{utils => tracing}/langchain/constants.ts |  0
 .../src/{utils => tracing}/langchain/index.ts |  0
 .../src/{utils => tracing}/langchain/types.ts |  0
 .../src/{utils => tracing}/langchain/utils.ts |  0
 .../{utils => tracing}/openai/constants.ts    |  0
 .../src/{utils => tracing}/openai/index.ts    |  0
 .../{utils => tracing}/openai/streaming.ts    |  0
 .../src/{utils => tracing}/openai/types.ts    |  0
 .../src/{utils => tracing}/openai/utils.ts    |  0
 .../{utils => tracing}/vercel-ai/constants.ts |  0
 .../src/{utils => tracing}/vercel-ai/index.ts |  2 +-
 .../src/{utils => tracing}/vercel-ai/types.ts |  0
 .../src/{utils => tracing}/vercel-ai/utils.ts |  0
 .../vercel-ai/vercel-ai-attributes.ts         |  0
 .../core/test/lib/utils/openai-utils.test.ts  |  2 +-
 .../openai-integration-functions.test.ts      |  2 +-
 30 files changed, 20 insertions(+), 20 deletions(-)
 rename packages/core/src/{utils => tracing}/ai/gen-ai-attributes.ts (100%)
 rename packages/core/src/{utils => tracing}/ai/messageTruncation.ts (100%)
 rename packages/core/src/{utils => tracing}/ai/utils.ts (100%)
 rename packages/core/src/{utils => tracing}/anthropic-ai/constants.ts (100%)
 rename packages/core/src/{utils => tracing}/anthropic-ai/index.ts (99%)
 rename packages/core/src/{utils => tracing}/anthropic-ai/streaming.ts (100%)
 rename packages/core/src/{utils => tracing}/anthropic-ai/types.ts (100%)
 rename packages/core/src/{utils => tracing}/anthropic-ai/utils.ts (100%)
 rename packages/core/src/{utils => tracing}/google-genai/constants.ts (100%)
 rename packages/core/src/{utils => tracing}/google-genai/index.ts (99%)
 rename packages/core/src/{utils => tracing}/google-genai/streaming.ts (100%)
 rename packages/core/src/{utils => tracing}/google-genai/types.ts (100%)
 rename packages/core/src/{utils => tracing}/google-genai/utils.ts (100%)
 rename packages/core/src/{utils => tracing}/langchain/constants.ts (100%)
 rename packages/core/src/{utils => tracing}/langchain/index.ts (100%)
 rename packages/core/src/{utils => tracing}/langchain/types.ts (100%)
 rename packages/core/src/{utils => tracing}/langchain/utils.ts (100%)
 rename packages/core/src/{utils => tracing}/openai/constants.ts (100%)
 rename packages/core/src/{utils => tracing}/openai/index.ts (100%)
 rename packages/core/src/{utils => tracing}/openai/streaming.ts (100%)
 rename packages/core/src/{utils => tracing}/openai/types.ts (100%)
 rename packages/core/src/{utils => tracing}/openai/utils.ts (100%)
 rename packages/core/src/{utils => tracing}/vercel-ai/constants.ts (100%)
 rename packages/core/src/{utils => tracing}/vercel-ai/index.ts (99%)
 rename packages/core/src/{utils => tracing}/vercel-ai/types.ts (100%)
 rename packages/core/src/{utils => tracing}/vercel-ai/utils.ts (100%)
 rename packages/core/src/{utils => tracing}/vercel-ai/vercel-ai-attributes.ts (100%)
 rename packages/core/test/{utils => tracing}/openai-integration-functions.test.ts (98%)

diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index c11d69179bd3..504368cfb873 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -140,31 +140,31 @@ export {
 export * as metrics from './metrics/public-api';
 export type { MetricOptions } from './metrics/public-api';
 export { createConsolaReporter } from './integrations/consola';
-export { addVercelAiProcessors } from './utils/vercel-ai';
-export { _INTERNAL_getSpanForToolCallId, _INTERNAL_cleanupToolCallSpan } from './utils/vercel-ai/utils';
-export { instrumentOpenAiClient } from './utils/openai';
-export { OPENAI_INTEGRATION_NAME } from './utils/openai/constants';
-export { instrumentAnthropicAiClient } from './utils/anthropic-ai';
-export { ANTHROPIC_AI_INTEGRATION_NAME } from './utils/anthropic-ai/constants';
-export { instrumentGoogleGenAIClient } from './utils/google-genai';
-export { GOOGLE_GENAI_INTEGRATION_NAME } from './utils/google-genai/constants';
-export type { GoogleGenAIResponse } from './utils/google-genai/types';
-export { createLangChainCallbackHandler } from './utils/langchain';
-export { LANGCHAIN_INTEGRATION_NAME } from './utils/langchain/constants';
-export type { LangChainOptions, LangChainIntegration } from './utils/langchain/types';
-export type { OpenAiClient, OpenAiOptions, InstrumentedMethod } from './utils/openai/types';
+export { addVercelAiProcessors } from './tracing/vercel-ai';
+export { _INTERNAL_getSpanForToolCallId, _INTERNAL_cleanupToolCallSpan } from './tracing/vercel-ai/utils';
+export { instrumentOpenAiClient } from './tracing/openai';
+export { OPENAI_INTEGRATION_NAME } from './tracing/openai/constants';
+export { instrumentAnthropicAiClient } from './tracing/anthropic-ai';
+export { ANTHROPIC_AI_INTEGRATION_NAME } from './tracing/anthropic-ai/constants';
+export { instrumentGoogleGenAIClient } from './tracing/google-genai';
+export { GOOGLE_GENAI_INTEGRATION_NAME } from './tracing/google-genai/constants';
+export type { GoogleGenAIResponse } from './tracing/google-genai/types';
+export { createLangChainCallbackHandler } from './tracing/langchain';
+export { LANGCHAIN_INTEGRATION_NAME } from './tracing/langchain/constants';
+export type { LangChainOptions, LangChainIntegration } from './tracing/langchain/types';
+export type { OpenAiClient, OpenAiOptions, InstrumentedMethod } from './tracing/openai/types';
 export type {
   AnthropicAiClient,
   AnthropicAiOptions,
   AnthropicAiInstrumentedMethod,
   AnthropicAiResponse,
-} from './utils/anthropic-ai/types';
+} from './tracing/anthropic-ai/types';
 export type {
   GoogleGenAIClient,
   GoogleGenAIChat,
   GoogleGenAIOptions,
   GoogleGenAIIstrumentedMethod,
-} from './utils/google-genai/types';
+} from './tracing/google-genai/types';
 export type { FeatureFlag } from './utils/featureFlags';
 
 export {
diff --git a/packages/core/src/utils/ai/gen-ai-attributes.ts b/packages/core/src/tracing/ai/gen-ai-attributes.ts
similarity index 100%
rename from packages/core/src/utils/ai/gen-ai-attributes.ts
rename to packages/core/src/tracing/ai/gen-ai-attributes.ts
diff --git a/packages/core/src/utils/ai/messageTruncation.ts b/packages/core/src/tracing/ai/messageTruncation.ts
similarity index 100%
rename from packages/core/src/utils/ai/messageTruncation.ts
rename to packages/core/src/tracing/ai/messageTruncation.ts
diff --git a/packages/core/src/utils/ai/utils.ts b/packages/core/src/tracing/ai/utils.ts
similarity index 100%
rename from packages/core/src/utils/ai/utils.ts
rename to packages/core/src/tracing/ai/utils.ts
diff --git a/packages/core/src/utils/anthropic-ai/constants.ts b/packages/core/src/tracing/anthropic-ai/constants.ts
similarity index 100%
rename from packages/core/src/utils/anthropic-ai/constants.ts
rename to packages/core/src/tracing/anthropic-ai/constants.ts
diff --git a/packages/core/src/utils/anthropic-ai/index.ts b/packages/core/src/tracing/anthropic-ai/index.ts
similarity index 99%
rename from packages/core/src/utils/anthropic-ai/index.ts
rename to packages/core/src/tracing/anthropic-ai/index.ts
index 669d8a61b068..aa48a1e4c21d 100644
--- a/packages/core/src/utils/anthropic-ai/index.ts
+++ b/packages/core/src/tracing/anthropic-ai/index.ts
@@ -4,6 +4,7 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '../../semanticAttributes';
 import { SPAN_STATUS_ERROR } from '../../tracing';
 import { startSpan, startSpanManual } from '../../tracing/trace';
 import type { Span, SpanAttributeValue } from '../../types-hoist/span';
+import { handleCallbackErrors } from '../../utils/handleCallbackErrors';
 import {
   ANTHROPIC_AI_RESPONSE_TIMESTAMP_ATTRIBUTE,
   GEN_AI_OPERATION_NAME_ATTRIBUTE,
@@ -30,7 +31,6 @@ import {
   getTruncatedJsonString,
   setTokenUsageAttributes,
 } from '../ai/utils';
-import { handleCallbackErrors } from '../handleCallbackErrors';
 import { instrumentAsyncIterableStream, instrumentMessageStream } from './streaming';
 import type {
   AnthropicAiInstrumentedMethod,
diff --git a/packages/core/src/utils/anthropic-ai/streaming.ts b/packages/core/src/tracing/anthropic-ai/streaming.ts
similarity index 100%
rename from packages/core/src/utils/anthropic-ai/streaming.ts
rename to packages/core/src/tracing/anthropic-ai/streaming.ts
diff --git a/packages/core/src/utils/anthropic-ai/types.ts b/packages/core/src/tracing/anthropic-ai/types.ts
similarity index 100%
rename from packages/core/src/utils/anthropic-ai/types.ts
rename to packages/core/src/tracing/anthropic-ai/types.ts
diff --git a/packages/core/src/utils/anthropic-ai/utils.ts b/packages/core/src/tracing/anthropic-ai/utils.ts
similarity index 100%
rename from packages/core/src/utils/anthropic-ai/utils.ts
rename to packages/core/src/tracing/anthropic-ai/utils.ts
diff --git a/packages/core/src/utils/google-genai/constants.ts b/packages/core/src/tracing/google-genai/constants.ts
similarity index 100%
rename from packages/core/src/utils/google-genai/constants.ts
rename to packages/core/src/tracing/google-genai/constants.ts
diff --git a/packages/core/src/utils/google-genai/index.ts b/packages/core/src/tracing/google-genai/index.ts
similarity index 99%
rename from packages/core/src/utils/google-genai/index.ts
rename to packages/core/src/tracing/google-genai/index.ts
index 9639b1255d29..6ee3e9df8b5b 100644
--- a/packages/core/src/utils/google-genai/index.ts
+++ b/packages/core/src/tracing/google-genai/index.ts
@@ -4,6 +4,7 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '../../semanticAttributes';
 import { SPAN_STATUS_ERROR } from '../../tracing';
 import { startSpan, startSpanManual } from '../../tracing/trace';
 import type { Span, SpanAttributeValue } from '../../types-hoist/span';
+import { handleCallbackErrors } from '../../utils/handleCallbackErrors';
 import {
   GEN_AI_OPERATION_NAME_ATTRIBUTE,
   GEN_AI_REQUEST_AVAILABLE_TOOLS_ATTRIBUTE,
@@ -23,7 +24,6 @@ import {
   GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE,
 } from '../ai/gen-ai-attributes';
 import { buildMethodPath, getFinalOperationName, getSpanOperation, getTruncatedJsonString } from '../ai/utils';
-import { handleCallbackErrors } from '../handleCallbackErrors';
 import { CHAT_PATH, CHATS_CREATE_METHOD, GOOGLE_GENAI_SYSTEM_NAME } from './constants';
 import { instrumentStream } from './streaming';
 import type {
diff --git a/packages/core/src/utils/google-genai/streaming.ts b/packages/core/src/tracing/google-genai/streaming.ts
similarity index 100%
rename from packages/core/src/utils/google-genai/streaming.ts
rename to packages/core/src/tracing/google-genai/streaming.ts
diff --git a/packages/core/src/utils/google-genai/types.ts b/packages/core/src/tracing/google-genai/types.ts
similarity index 100%
rename from packages/core/src/utils/google-genai/types.ts
rename to packages/core/src/tracing/google-genai/types.ts
diff --git a/packages/core/src/utils/google-genai/utils.ts b/packages/core/src/tracing/google-genai/utils.ts
similarity index 100%
rename from packages/core/src/utils/google-genai/utils.ts
rename to packages/core/src/tracing/google-genai/utils.ts
diff --git a/packages/core/src/utils/langchain/constants.ts b/packages/core/src/tracing/langchain/constants.ts
similarity index 100%
rename from packages/core/src/utils/langchain/constants.ts
rename to packages/core/src/tracing/langchain/constants.ts
diff --git a/packages/core/src/utils/langchain/index.ts b/packages/core/src/tracing/langchain/index.ts
similarity index 100%
rename from packages/core/src/utils/langchain/index.ts
rename to packages/core/src/tracing/langchain/index.ts
diff --git a/packages/core/src/utils/langchain/types.ts b/packages/core/src/tracing/langchain/types.ts
similarity index 100%
rename from packages/core/src/utils/langchain/types.ts
rename to packages/core/src/tracing/langchain/types.ts
diff --git a/packages/core/src/utils/langchain/utils.ts b/packages/core/src/tracing/langchain/utils.ts
similarity index 100%
rename from packages/core/src/utils/langchain/utils.ts
rename to packages/core/src/tracing/langchain/utils.ts
diff --git a/packages/core/src/utils/openai/constants.ts b/packages/core/src/tracing/openai/constants.ts
similarity index 100%
rename from packages/core/src/utils/openai/constants.ts
rename to packages/core/src/tracing/openai/constants.ts
diff --git a/packages/core/src/utils/openai/index.ts b/packages/core/src/tracing/openai/index.ts
similarity index 100%
rename from packages/core/src/utils/openai/index.ts
rename to packages/core/src/tracing/openai/index.ts
diff --git a/packages/core/src/utils/openai/streaming.ts b/packages/core/src/tracing/openai/streaming.ts
similarity index 100%
rename from packages/core/src/utils/openai/streaming.ts
rename to packages/core/src/tracing/openai/streaming.ts
diff --git a/packages/core/src/utils/openai/types.ts b/packages/core/src/tracing/openai/types.ts
similarity index 100%
rename from packages/core/src/utils/openai/types.ts
rename to packages/core/src/tracing/openai/types.ts
diff --git a/packages/core/src/utils/openai/utils.ts b/packages/core/src/tracing/openai/utils.ts
similarity index 100%
rename from packages/core/src/utils/openai/utils.ts
rename to packages/core/src/tracing/openai/utils.ts
diff --git a/packages/core/src/utils/vercel-ai/constants.ts b/packages/core/src/tracing/vercel-ai/constants.ts
similarity index 100%
rename from packages/core/src/utils/vercel-ai/constants.ts
rename to packages/core/src/tracing/vercel-ai/constants.ts
diff --git a/packages/core/src/utils/vercel-ai/index.ts b/packages/core/src/tracing/vercel-ai/index.ts
similarity index 99%
rename from packages/core/src/utils/vercel-ai/index.ts
rename to packages/core/src/tracing/vercel-ai/index.ts
index 747a3c105449..8e802edc789f 100644
--- a/packages/core/src/utils/vercel-ai/index.ts
+++ b/packages/core/src/tracing/vercel-ai/index.ts
@@ -2,12 +2,12 @@ import type { Client } from '../../client';
 import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '../../semanticAttributes';
 import type { Event } from '../../types-hoist/event';
 import type { Span, SpanAttributes, SpanAttributeValue, SpanJSON, SpanOrigin } from '../../types-hoist/span';
+import { spanToJSON } from '../../utils/spanUtils';
 import {
   GEN_AI_USAGE_INPUT_TOKENS_CACHE_WRITE_ATTRIBUTE,
   GEN_AI_USAGE_INPUT_TOKENS_CACHED_ATTRIBUTE,
 } from '../ai/gen-ai-attributes';
 import { getTruncatedJsonString } from '../ai/utils';
-import { spanToJSON } from '../spanUtils';
 import { toolCallSpanMap } from './constants';
 import type { TokenSummary } from './types';
 import { accumulateTokensForParent, applyAccumulatedTokens } from './utils';
diff --git a/packages/core/src/utils/vercel-ai/types.ts b/packages/core/src/tracing/vercel-ai/types.ts
similarity index 100%
rename from packages/core/src/utils/vercel-ai/types.ts
rename to packages/core/src/tracing/vercel-ai/types.ts
diff --git a/packages/core/src/utils/vercel-ai/utils.ts b/packages/core/src/tracing/vercel-ai/utils.ts
similarity index 100%
rename from packages/core/src/utils/vercel-ai/utils.ts
rename to packages/core/src/tracing/vercel-ai/utils.ts
diff --git a/packages/core/src/utils/vercel-ai/vercel-ai-attributes.ts b/packages/core/src/tracing/vercel-ai/vercel-ai-attributes.ts
similarity index 100%
rename from packages/core/src/utils/vercel-ai/vercel-ai-attributes.ts
rename to packages/core/src/tracing/vercel-ai/vercel-ai-attributes.ts
diff --git a/packages/core/test/lib/utils/openai-utils.test.ts b/packages/core/test/lib/utils/openai-utils.test.ts
index 0076a617e219..c68a35e5becc 100644
--- a/packages/core/test/lib/utils/openai-utils.test.ts
+++ b/packages/core/test/lib/utils/openai-utils.test.ts
@@ -8,7 +8,7 @@ import {
   isResponsesApiResponse,
   isResponsesApiStreamEvent,
   shouldInstrument,
-} from '../../../src/utils/openai/utils';
+} from '../../../src/tracing/openai/utils';
 
 describe('openai-utils', () => {
   describe('getOperationName', () => {
diff --git a/packages/core/test/utils/openai-integration-functions.test.ts b/packages/core/test/tracing/openai-integration-functions.test.ts
similarity index 98%
rename from packages/core/test/utils/openai-integration-functions.test.ts
rename to packages/core/test/tracing/openai-integration-functions.test.ts
index d032fb1e69ed..240ba14d429b 100644
--- a/packages/core/test/utils/openai-integration-functions.test.ts
+++ b/packages/core/test/tracing/openai-integration-functions.test.ts
@@ -1,6 +1,6 @@
 import { beforeEach, describe, expect, it } from 'vitest';
 import type { OpenAiClient } from '../../src';
-import { instrumentOpenAiClient } from '../../src/utils/openai';
+import { instrumentOpenAiClient } from '../../src/tracing/openai';
 
 interface FullOpenAIClient {
   chat: {

From 2deb0001e9e3134596530f76280d8a6ea2dca985 Mon Sep 17 00:00:00 2001
From: Sigrid <32902192+s1gr1d@users.noreply.github.com>
Date: Wed, 12 Nov 2025 16:45:56 +0100
Subject: [PATCH 061/186] ref(browserprofiling): Move and rename profiler class
 to UIProfiler (#18187)

This PR renames and moves the profiler class as the class will be used
for the `trace` and `manual` lifecycle in the future (prevents large git
diffs).

Part of https://github.com/getsentry/sentry-javascript/issues/17279
---
 .../traceLifecycleProfiler.ts => UIProfiler.ts}           | 8 ++++----
 packages/browser/src/profiling/integration.ts             | 4 ++--
 ...{traceLifecycleProfiler.test.ts => UIProfiler.test.ts} | 0
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename packages/browser/src/profiling/{lifecycleMode/traceLifecycleProfiler.ts => UIProfiler.ts} (98%)
 rename packages/browser/test/profiling/{traceLifecycleProfiler.test.ts => UIProfiler.test.ts} (100%)

diff --git a/packages/browser/src/profiling/lifecycleMode/traceLifecycleProfiler.ts b/packages/browser/src/profiling/UIProfiler.ts
similarity index 98%
rename from packages/browser/src/profiling/lifecycleMode/traceLifecycleProfiler.ts
rename to packages/browser/src/profiling/UIProfiler.ts
index 3ce773fe01ff..fb7cd022ac7f 100644
--- a/packages/browser/src/profiling/lifecycleMode/traceLifecycleProfiler.ts
+++ b/packages/browser/src/profiling/UIProfiler.ts
@@ -9,9 +9,9 @@ import {
   getSdkMetadataForEnvelopeHeader,
   uuid4,
 } from '@sentry/core';
-import { DEBUG_BUILD } from '../../debug-build';
-import type { JSSelfProfiler } from '../jsSelfProfiling';
-import { createProfileChunkPayload, startJSSelfProfile, validateProfileChunk } from '../utils';
+import { DEBUG_BUILD } from './../debug-build';
+import type { JSSelfProfiler } from './jsSelfProfiling';
+import { createProfileChunkPayload, startJSSelfProfile, validateProfileChunk } from './utils';
 
 const CHUNK_INTERVAL_MS = 60_000; // 1 minute
 // Maximum length for trace lifecycle profiling per root span (e.g. if spanEnd never fires)
@@ -27,7 +27,7 @@ const MAX_ROOT_SPAN_PROFILE_MS = 300_000; // 5 minutes
  * - there are no more sampled root spans, or
  * - the 60s chunk timer elapses while profiling is running.
  */
-export class BrowserTraceLifecycleProfiler {
+export class UIProfiler {
   private _client: Client | undefined;
   private _profiler: JSSelfProfiler | undefined;
   private _chunkTimer: ReturnType<typeof setTimeout> | undefined;
diff --git a/packages/browser/src/profiling/integration.ts b/packages/browser/src/profiling/integration.ts
index 415282698d45..7cd1886e636d 100644
--- a/packages/browser/src/profiling/integration.ts
+++ b/packages/browser/src/profiling/integration.ts
@@ -3,8 +3,8 @@ import { debug, defineIntegration, getActiveSpan, getRootSpan, hasSpansEnabled }
 import type { BrowserOptions } from '../client';
 import { DEBUG_BUILD } from '../debug-build';
 import { WINDOW } from '../helpers';
-import { BrowserTraceLifecycleProfiler } from './lifecycleMode/traceLifecycleProfiler';
 import { startProfileForSpan } from './startProfileForSpan';
+import { UIProfiler } from './UIProfiler';
 import type { ProfiledEvent } from './utils';
 import {
   addProfilesToEnvelope,
@@ -65,7 +65,7 @@ const _browserProfilingIntegration = (() => {
             return;
           }
 
-          const traceLifecycleProfiler = new BrowserTraceLifecycleProfiler();
+          const traceLifecycleProfiler = new UIProfiler();
           traceLifecycleProfiler.initialize(client, sessionSampled);
 
           // If there is an active, sampled root span already, notify the profiler
diff --git a/packages/browser/test/profiling/traceLifecycleProfiler.test.ts b/packages/browser/test/profiling/UIProfiler.test.ts
similarity index 100%
rename from packages/browser/test/profiling/traceLifecycleProfiler.test.ts
rename to packages/browser/test/profiling/UIProfiler.test.ts

From 090a3e35a94014aad4dfd06a6ff3c361f0420009 Mon Sep 17 00:00:00 2001
From: Tim Fish <tim@timfish.uk>
Date: Wed, 12 Nov 2025 19:33:44 +0100
Subject: [PATCH 062/186] fix(node): `tracingChannel` export missing in older
 node versions (#18191)

I guess this got through CI because we test latest 18 rather than
18.0.0.

This breaks [some supported Electron
versions](https://github.com/getsentry/sentry-electron/actions/runs/19306230917/job/55215745023)
which are using >18.0.0 but <18.19.0.

This wont have impacted almost anyone else because Otel requires
18.19.0!

```
[App] [    Main] App threw an error during load
[App] [    Main] file:///home/runner/work/sentry-electron/sentry-electron/test/e2e/dist/error-after-ready/node_modules/@sentry/node-core/build/esm/integrations/pino.js:1
[App] [    Main] import { tracingChannel } from 'node:diagnostics_channel';
[App] [    Main]          ^^^^^^^^^^^^^^
[App] [    Main] SyntaxError: The requested module 'node:diagnostics_channel' does not provide an export named 'tracingChannel'
[App] [    Main]     at ModuleJob._instantiate (node:internal/modules/esm/module_job:124:21)
[App] [    Main]     at async ModuleJob.run (node:internal/modules/esm/module_job:190:5)
[App] [    Main] A JavaScript error occurred in the main process
```
---
 packages/node-core/src/integrations/pino.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/node-core/src/integrations/pino.ts b/packages/node-core/src/integrations/pino.ts
index 21eeff64769e..dda9693f90f2 100644
--- a/packages/node-core/src/integrations/pino.ts
+++ b/packages/node-core/src/integrations/pino.ts
@@ -1,4 +1,4 @@
-import { tracingChannel } from 'node:diagnostics_channel';
+import * as diagnosticsChannel from 'node:diagnostics_channel';
 import type { Integration, IntegrationFn, LogSeverityLevel } from '@sentry/core';
 import {
   _INTERNAL_captureLog,
@@ -122,8 +122,8 @@ const _pinoIntegration = defineIntegration((userOptions: DeepPartial<PinoOptions
         },
       });
 
-      const injectedChannel = tracingChannel('orchestrion:pino:pino-log');
-      const integratedChannel = tracingChannel('pino_asJson');
+      const injectedChannel = diagnosticsChannel.tracingChannel('orchestrion:pino:pino-log');
+      const integratedChannel = diagnosticsChannel.tracingChannel('pino_asJson');
 
       function onPinoStart(self: Pino, args: PinoHookArgs, result: PinoResult): void {
         if (!shouldTrackLogger(self)) {

From 7efb1d2f52814e0d08de12956dbd5b36d2b59119 Mon Sep 17 00:00:00 2001
From: Charly Gomez <charly.gomez@sentry.io>
Date: Thu, 13 Nov 2025 11:35:12 +0100
Subject: [PATCH 063/186] feat(replay): Bump limit for minReplayDuration
 (#18190)

With this PR users can set their min replay duration to max 50s,
previously this was capped at 15s.

We cannot bump this value further as this would lead to dropping
buffered replays (we keep max. 60s in-memory at this point)

closes https://github.com/getsentry/sentry-javascript/issues/18109

---------

Co-authored-by: Andrei <168741329+andreiborza@users.noreply.github.com>
---
 .../replay/minReplayDurationLimit/init.js     | 18 +++++++++++++++
 .../minReplayDurationLimit/template.html      | 12 ++++++++++
 .../replay/minReplayDurationLimit/test.ts     | 23 +++++++++++++++++++
 packages/replay-internal/src/constants.ts     |  8 +++++--
 packages/replay-internal/src/types/replay.ts  |  5 +++-
 5 files changed, 63 insertions(+), 3 deletions(-)
 create mode 100644 dev-packages/browser-integration-tests/suites/replay/minReplayDurationLimit/init.js
 create mode 100644 dev-packages/browser-integration-tests/suites/replay/minReplayDurationLimit/template.html
 create mode 100644 dev-packages/browser-integration-tests/suites/replay/minReplayDurationLimit/test.ts

diff --git a/dev-packages/browser-integration-tests/suites/replay/minReplayDurationLimit/init.js b/dev-packages/browser-integration-tests/suites/replay/minReplayDurationLimit/init.js
new file mode 100644
index 000000000000..58873b85f9ec
--- /dev/null
+++ b/dev-packages/browser-integration-tests/suites/replay/minReplayDurationLimit/init.js
@@ -0,0 +1,18 @@
+import * as Sentry from '@sentry/browser';
+
+window.Sentry = Sentry;
+window.Replay = Sentry.replayIntegration({
+  flushMinDelay: 200,
+  flushMaxDelay: 200,
+  // Try to set to 60s - should be capped at 50s
+  minReplayDuration: 60000,
+});
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  sampleRate: 0,
+  replaysSessionSampleRate: 1.0,
+  replaysOnErrorSampleRate: 0.0,
+
+  integrations: [window.Replay],
+});
diff --git a/dev-packages/browser-integration-tests/suites/replay/minReplayDurationLimit/template.html b/dev-packages/browser-integration-tests/suites/replay/minReplayDurationLimit/template.html
new file mode 100644
index 000000000000..06c44ed4bc9c
--- /dev/null
+++ b/dev-packages/browser-integration-tests/suites/replay/minReplayDurationLimit/template.html
@@ -0,0 +1,12 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <title>Replay - minReplayDuration Limit</title>
+  </head>
+  <body>
+    <div id="content">
+      <p>Testing that minReplayDuration is capped at 50s max</p>
+    </div>
+  </body>
+</html>
diff --git a/dev-packages/browser-integration-tests/suites/replay/minReplayDurationLimit/test.ts b/dev-packages/browser-integration-tests/suites/replay/minReplayDurationLimit/test.ts
new file mode 100644
index 000000000000..125af55a6985
--- /dev/null
+++ b/dev-packages/browser-integration-tests/suites/replay/minReplayDurationLimit/test.ts
@@ -0,0 +1,23 @@
+import { expect } from '@playwright/test';
+import { sentryTest } from '../../../utils/fixtures';
+import { shouldSkipReplayTest } from '../../../utils/replayHelpers';
+
+sentryTest('caps minReplayDuration to maximum of 50 seconds', async ({ getLocalTestUrl, page }) => {
+  if (shouldSkipReplayTest()) {
+    sentryTest.skip();
+  }
+
+  const url = await getLocalTestUrl({ testDir: __dirname });
+
+  await page.goto(url);
+
+  const actualMinReplayDuration = await page.evaluate(() => {
+    // @ts-expect-error - Replay is not typed on window
+    const replayIntegration = window.Replay;
+    const replay = replayIntegration._replay;
+    return replay.getOptions().minReplayDuration;
+  });
+
+  // Even though we configured it to 60s (60000ms), it should be capped to 50s
+  expect(actualMinReplayDuration).toBe(50_000);
+});
diff --git a/packages/replay-internal/src/constants.ts b/packages/replay-internal/src/constants.ts
index da253a68ec8f..ac24f64cddfe 100644
--- a/packages/replay-internal/src/constants.ts
+++ b/packages/replay-internal/src/constants.ts
@@ -45,8 +45,12 @@ export const REPLAY_MAX_EVENT_BUFFER_SIZE = 20_000_000; // ~20MB
 
 /** Replays must be min. 5s long before we send them. */
 export const MIN_REPLAY_DURATION = 4_999;
-/* The max. allowed value that the minReplayDuration can be set to. */
-export const MIN_REPLAY_DURATION_LIMIT = 15_000;
+
+/*
+The max. allowed value that the minReplayDuration can be set to.
+This needs to be below 60s, so we don't unintentionally drop buffered replays that are longer than 60s.
+*/
+export const MIN_REPLAY_DURATION_LIMIT = 50_000;
 
 /** The max. length of a replay. */
 export const MAX_REPLAY_DURATION = 3_600_000; // 60 minutes in ms;
diff --git a/packages/replay-internal/src/types/replay.ts b/packages/replay-internal/src/types/replay.ts
index a2c84d6c4bbe..75a2d35e64f2 100644
--- a/packages/replay-internal/src/types/replay.ts
+++ b/packages/replay-internal/src/types/replay.ts
@@ -180,7 +180,10 @@ export interface ReplayPluginOptions extends ReplayNetworkOptions {
   /**
    * The min. duration (in ms) a replay has to have before it is sent to Sentry.
    * Whenever attempting to flush a session that is shorter than this, it will not actually send it to Sentry.
-   * Note that this is capped at max. 15s.
+   * Note that this is capped at max. 50s, so we don't unintentionally drop buffered replays that are longer than 60s
+   *
+   * Warning: Setting this to a higher value can result in unintended drops of onError-sampled replays.
+   *
    */
   minReplayDuration: number;
 

From c8ca2864ca945f459f4c6bea68249e416997a982 Mon Sep 17 00:00:00 2001
From: Burak Yigit Kaya <byk@sentry.io>
Date: Thu, 13 Nov 2025 15:41:48 +0000
Subject: [PATCH 064/186] fix(node): Fix Spotlight configuration precedence to
 match specification (#18195)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Problem

The Spotlight configuration logic had a precedence bug where when
`spotlight: true` was set in config AND the `SENTRY_SPOTLIGHT`
environment variable contained a URL string, the SDK would incorrectly
use `true` instead of the URL from the environment variable.

According to the [Spotlight
specification](https://raw.githubusercontent.com/getsentry/sentry-docs/b38e3b307f900665a348f855559ac1d1c58914cc/develop-docs/sdk/expected-features/spotlight.mdx),
when `spotlight: true` is set and the env var contains a URL, the URL
from the env var should be used to allow developers to override the
Spotlight URL via environment variables.

**Previous behavior:**
```typescript
// Config: spotlight: true
// Env: SENTRY_SPOTLIGHT=http://custom:3000/stream
// Result: spotlight = true ❌ (incorrect)
```

**Expected behavior per spec:**
```typescript
// Config: spotlight: true
// Env: SENTRY_SPOTLIGHT=http://custom:3000/stream
// Result: spotlight = "http://custom:3000/stream" ✅ (correct)
```

## Solution

Fixed the precedence logic in `getClientOptions()` to properly implement
the specification:

1. `spotlight: false` → Always disabled (overrides env var)
2. `spotlight: string` → Uses the config URL (ignores env var)
3. `spotlight: true` + env var URL → **Uses the env var URL** (the bug
fix)
4. `spotlight: true` + env var truthy → Uses default URL
5. No config + env var → Parses and uses env var

The implementation reuses the existing `envToBool()` utility to avoid
code duplication.

## Changes

- Fixed Spotlight precedence logic in
`packages/node-core/src/sdk/index.ts`
- Added 12 comprehensive test cases covering all precedence scenarios in
`packages/node-core/test/sdk/init.test.ts`
- Updated CHANGELOG.md

## Test Coverage

The new tests cover:
- ✅ Env var only: truthy values, falsy values, URL strings
- ✅ Config only: `true`, `false`, URL string
- ✅ Precedence: config `false` overrides env var (URL, truthy, falsy)
- ✅ Precedence: config URL overrides env var
- ✅ Precedence: config `true` + env var URL uses env var URL (the fix)
- ✅ Precedence: config `true` + env var truthy uses default URL

## Related

- Original Spotlight implementation: #13325
- Spotlight specification: https://spotlightjs.com/

---------

Co-authored-by: Cursor Agent <cursoragent@cursor.com>
---
 .size-limit.js                           |   2 +-
 CHANGELOG.md                             |   2 +-
 packages/node-core/src/sdk/index.ts      |  20 ++++-
 packages/node-core/test/sdk/init.test.ts | 108 +++++++++++++++++++++++
 4 files changed, 128 insertions(+), 4 deletions(-)

diff --git a/.size-limit.js b/.size-limit.js
index 2d07afde52ab..4e929875dad5 100644
--- a/.size-limit.js
+++ b/.size-limit.js
@@ -240,7 +240,7 @@ module.exports = [
     import: createImport('init'),
     ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
     gzip: true,
-    limit: '158 KB',
+    limit: '160 KB',
   },
   {
     name: '@sentry/node - without tracing',
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d5cf4d9b810f..09030a4dc82a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## Unreleased
 
-- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
+- fix(node): Fix Spotlight configuration precedence to match specification (#18195)
 
 ## 10.25.0
 
diff --git a/packages/node-core/src/sdk/index.ts b/packages/node-core/src/sdk/index.ts
index d53f5d4faefb..0814ab401535 100644
--- a/packages/node-core/src/sdk/index.ts
+++ b/packages/node-core/src/sdk/index.ts
@@ -182,8 +182,24 @@ function getClientOptions(
   getDefaultIntegrationsImpl: (options: Options) => Integration[],
 ): NodeClientOptions {
   const release = getRelease(options.release);
-  const spotlight =
-    options.spotlight ?? envToBool(process.env.SENTRY_SPOTLIGHT, { strict: true }) ?? process.env.SENTRY_SPOTLIGHT;
+
+  // Parse spotlight configuration with proper precedence per spec
+  let spotlight: boolean | string | undefined;
+  if (options.spotlight === false) {
+    spotlight = false;
+  } else if (typeof options.spotlight === 'string') {
+    spotlight = options.spotlight;
+  } else {
+    // options.spotlight is true or undefined
+    const envBool = envToBool(process.env.SENTRY_SPOTLIGHT, { strict: true });
+    const envUrl = envBool === null && process.env.SENTRY_SPOTLIGHT ? process.env.SENTRY_SPOTLIGHT : undefined;
+
+    spotlight =
+      options.spotlight === true
+        ? (envUrl ?? true) // true: use env URL if present, otherwise true
+        : (envBool ?? envUrl); // undefined: use env var (bool or URL)
+  }
+
   const tracesSampleRate = getTracesSampleRate(options.tracesSampleRate);
 
   const mergedOptions = {
diff --git a/packages/node-core/test/sdk/init.test.ts b/packages/node-core/test/sdk/init.test.ts
index 4262bffb7cda..1332b89abcd6 100644
--- a/packages/node-core/test/sdk/init.test.ts
+++ b/packages/node-core/test/sdk/init.test.ts
@@ -216,6 +216,114 @@ describe('init()', () => {
         }),
       );
     });
+
+    describe('spotlight configuration', () => {
+      afterEach(() => {
+        delete process.env.SENTRY_SPOTLIGHT;
+      });
+
+      it('enables spotlight with default URL from `SENTRY_SPOTLIGHT` env variable (truthy value)', () => {
+        process.env.SENTRY_SPOTLIGHT = 'true';
+
+        const client = init({ dsn: PUBLIC_DSN });
+
+        expect(client?.getOptions().spotlight).toBe(true);
+        expect(client?.getOptions().integrations.some(integration => integration.name === 'Spotlight')).toBe(true);
+      });
+
+      it('disables spotlight from `SENTRY_SPOTLIGHT` env variable (falsy value)', () => {
+        process.env.SENTRY_SPOTLIGHT = 'false';
+
+        const client = init({ dsn: PUBLIC_DSN });
+
+        expect(client?.getOptions().spotlight).toBe(false);
+        expect(client?.getOptions().integrations.some(integration => integration.name === 'Spotlight')).toBe(false);
+      });
+
+      it('enables spotlight with custom URL from `SENTRY_SPOTLIGHT` env variable', () => {
+        process.env.SENTRY_SPOTLIGHT = 'http://localhost:3000/stream';
+
+        const client = init({ dsn: PUBLIC_DSN });
+
+        expect(client?.getOptions().spotlight).toBe('http://localhost:3000/stream');
+        expect(client?.getOptions().integrations.some(integration => integration.name === 'Spotlight')).toBe(true);
+      });
+
+      it('enables spotlight with default URL from config `true`', () => {
+        const client = init({ dsn: PUBLIC_DSN, spotlight: true });
+
+        expect(client?.getOptions().spotlight).toBe(true);
+        expect(client?.getOptions().integrations.some(integration => integration.name === 'Spotlight')).toBe(true);
+      });
+
+      it('disables spotlight from config `false`', () => {
+        const client = init({ dsn: PUBLIC_DSN, spotlight: false });
+
+        expect(client?.getOptions().spotlight).toBe(false);
+        expect(client?.getOptions().integrations.some(integration => integration.name === 'Spotlight')).toBe(false);
+      });
+
+      it('enables spotlight with custom URL from config', () => {
+        const client = init({ dsn: PUBLIC_DSN, spotlight: 'http://custom:8888/stream' });
+
+        expect(client?.getOptions().spotlight).toBe('http://custom:8888/stream');
+        expect(client?.getOptions().integrations.some(integration => integration.name === 'Spotlight')).toBe(true);
+      });
+
+      it('config `false` overrides `SENTRY_SPOTLIGHT` env variable URL', () => {
+        process.env.SENTRY_SPOTLIGHT = 'http://localhost:3000/stream';
+
+        const client = init({ dsn: PUBLIC_DSN, spotlight: false });
+
+        expect(client?.getOptions().spotlight).toBe(false);
+        expect(client?.getOptions().integrations.some(integration => integration.name === 'Spotlight')).toBe(false);
+      });
+
+      it('config `false` overrides `SENTRY_SPOTLIGHT` env variable truthy value', () => {
+        process.env.SENTRY_SPOTLIGHT = 'true';
+
+        const client = init({ dsn: PUBLIC_DSN, spotlight: false });
+
+        expect(client?.getOptions().spotlight).toBe(false);
+        expect(client?.getOptions().integrations.some(integration => integration.name === 'Spotlight')).toBe(false);
+      });
+
+      it('config `false` with `SENTRY_SPOTLIGHT` env variable falsy value keeps spotlight disabled', () => {
+        process.env.SENTRY_SPOTLIGHT = 'false';
+
+        const client = init({ dsn: PUBLIC_DSN, spotlight: false });
+
+        expect(client?.getOptions().spotlight).toBe(false);
+        expect(client?.getOptions().integrations.some(integration => integration.name === 'Spotlight')).toBe(false);
+      });
+
+      it('config URL overrides `SENTRY_SPOTLIGHT` env variable URL', () => {
+        process.env.SENTRY_SPOTLIGHT = 'http://env:3000/stream';
+
+        const client = init({ dsn: PUBLIC_DSN, spotlight: 'http://config:8888/stream' });
+
+        expect(client?.getOptions().spotlight).toBe('http://config:8888/stream');
+        expect(client?.getOptions().integrations.some(integration => integration.name === 'Spotlight')).toBe(true);
+      });
+
+      it('config `true` with env var URL uses env var URL', () => {
+        process.env.SENTRY_SPOTLIGHT = 'http://localhost:3000/stream';
+
+        const client = init({ dsn: PUBLIC_DSN, spotlight: true });
+
+        expect(client?.getOptions().spotlight).toBe('http://localhost:3000/stream');
+        expect(client?.getOptions().integrations.some(integration => integration.name === 'Spotlight')).toBe(true);
+      });
+
+      it('config `true` with env var truthy value uses default URL', () => {
+        process.env.SENTRY_SPOTLIGHT = 'true';
+
+        const client = init({ dsn: PUBLIC_DSN, spotlight: true });
+
+        expect(client?.getOptions().spotlight).toBe(true);
+        expect(client?.getOptions().integrations.some(integration => integration.name === 'Spotlight')).toBe(true);
+      });
+    });
   });
 });
 

From b947281837b832c8744c86c3890ebe4c8073c7fb Mon Sep 17 00:00:00 2001
From: Nicolas Hrubec <nico.hrubec@sentry.io>
Date: Fri, 14 Nov 2025 11:21:50 +0100
Subject: [PATCH 065/186] fix(core): Flatten gen_ai.request.available_tools in
 google-genai (#18194)

While investigating [this
ticket](https://linear.app/getsentry/issue/JS-657/available-tools-json-should-be-a-stringified-json-array-of-objects-not)
I noticed that available tools are sent as a nested instead of a flat
array in google genai, which seems like a bug to me.

The format I would expect and how we do it in other integrations is:
[{tool-definition}, {tool-definition}]

What we actually send atm is:
[[{tool-definition}], [{tool-definition}]]

This PR fixes this to instead send a flat list of tool definitions.
---
 .../suites/tracing/google-genai/test.ts                    | 7 +++++--
 packages/core/src/tracing/google-genai/index.ts            | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dev-packages/node-integration-tests/suites/tracing/google-genai/test.ts b/dev-packages/node-integration-tests/suites/tracing/google-genai/test.ts
index 7507ca255ae0..8b2b04137fff 100644
--- a/dev-packages/node-integration-tests/suites/tracing/google-genai/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/google-genai/test.ts
@@ -204,6 +204,9 @@ describe('Google GenAI integration', () => {
     });
   });
 
+  const EXPECTED_AVAILABLE_TOOLS_JSON =
+    '[{"name":"controlLight","parametersJsonSchema":{"type":"object","properties":{"brightness":{"type":"number"},"colorTemperature":{"type":"string"}},"required":["brightness","colorTemperature"]}}]';
+
   const EXPECTED_TRANSACTION_TOOLS = {
     transaction: 'main',
     spans: expect.arrayContaining([
@@ -215,7 +218,7 @@ describe('Google GenAI integration', () => {
           'sentry.origin': 'auto.ai.google_genai',
           'gen_ai.system': 'google_genai',
           'gen_ai.request.model': 'gemini-2.0-flash-001',
-          'gen_ai.request.available_tools': expect.any(String), // Should include tools
+          'gen_ai.request.available_tools': EXPECTED_AVAILABLE_TOOLS_JSON,
           'gen_ai.request.messages': expect.any(String), // Should include contents
           'gen_ai.response.text': expect.any(String), // Should include response text
           'gen_ai.response.tool_calls': expect.any(String), // Should include tool calls
@@ -236,7 +239,7 @@ describe('Google GenAI integration', () => {
           'sentry.origin': 'auto.ai.google_genai',
           'gen_ai.system': 'google_genai',
           'gen_ai.request.model': 'gemini-2.0-flash-001',
-          'gen_ai.request.available_tools': expect.any(String), // Should include tools
+          'gen_ai.request.available_tools': EXPECTED_AVAILABLE_TOOLS_JSON,
           'gen_ai.request.messages': expect.any(String), // Should include contents
           'gen_ai.response.streaming': true,
           'gen_ai.response.text': expect.any(String), // Should include response text
diff --git a/packages/core/src/tracing/google-genai/index.ts b/packages/core/src/tracing/google-genai/index.ts
index 6ee3e9df8b5b..cc0226c5cb37 100644
--- a/packages/core/src/tracing/google-genai/index.ts
+++ b/packages/core/src/tracing/google-genai/index.ts
@@ -115,7 +115,7 @@ function extractRequestAttributes(
 
       // Extract available tools from config
       if ('tools' in config && Array.isArray(config.tools)) {
-        const functionDeclarations = config.tools.map(
+        const functionDeclarations = config.tools.flatMap(
           (tool: { functionDeclarations: unknown[] }) => tool.functionDeclarations,
         );
         attributes[GEN_AI_REQUEST_AVAILABLE_TOOLS_ATTRIBUTE] = JSON.stringify(functionDeclarations);

From ea3183f701920d1a651e946032c16f80b69ee502 Mon Sep 17 00:00:00 2001
From: Nicolas Hrubec <nico.hrubec@sentry.io>
Date: Fri, 14 Nov 2025 12:22:00 +0100
Subject: [PATCH 066/186] fix(core): Stringify available tools sent from
 vercelai (#18197)

[Linear
Ticket](https://linear.app/getsentry/issue/JS-657/available-tools-json-should-be-a-stringified-json-array-of-objects-not)

The available tools sent from our SDKs should generally be in the format
of a stringified array of objects (where an object stores information
about a particular tool). This is true for all AI SDKs except Vercel,
where we send an array of strings. This PR fixes this by parsing the
available tool array and converting the whole array into a proper string
representation.
---
 .../suites/tracing/vercelai/test.ts             |  5 ++++-
 .../suites/tracing/vercelai/v5/test.ts          |  5 ++++-
 packages/core/src/tracing/vercel-ai/index.ts    |  9 ++++++++-
 packages/core/src/tracing/vercel-ai/utils.ts    | 17 +++++++++++++++++
 4 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/dev-packages/node-integration-tests/suites/tracing/vercelai/test.ts b/dev-packages/node-integration-tests/suites/tracing/vercelai/test.ts
index aac243eff11c..04ff4a0ac52c 100644
--- a/dev-packages/node-integration-tests/suites/tracing/vercelai/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/vercelai/test.ts
@@ -197,6 +197,9 @@ describe('Vercel AI integration', () => {
     ]),
   };
 
+  const EXPECTED_AVAILABLE_TOOLS_JSON =
+    '[{"type":"function","name":"getWeather","parameters":{"type":"object","properties":{"location":{"type":"string"}},"required":["location"],"additionalProperties":false,"$schema":"http://json-schema.org/draft-07/schema#"}}]';
+
   const EXPECTED_TRANSACTION_DEFAULT_PII_TRUE = {
     transaction: 'main',
     spans: expect.arrayContaining([
@@ -358,7 +361,7 @@ describe('Vercel AI integration', () => {
           'vercel.ai.prompt.format': expect.any(String),
           'gen_ai.request.messages': expect.any(String),
           'vercel.ai.prompt.toolChoice': expect.any(String),
-          'gen_ai.request.available_tools': expect.any(Array),
+          'gen_ai.request.available_tools': EXPECTED_AVAILABLE_TOOLS_JSON,
           'vercel.ai.response.finishReason': 'tool-calls',
           'vercel.ai.response.id': expect.any(String),
           'vercel.ai.response.model': 'mock-model-id',
diff --git a/dev-packages/node-integration-tests/suites/tracing/vercelai/v5/test.ts b/dev-packages/node-integration-tests/suites/tracing/vercelai/v5/test.ts
index b5a2b8107326..56860af76925 100644
--- a/dev-packages/node-integration-tests/suites/tracing/vercelai/v5/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/vercelai/v5/test.ts
@@ -193,6 +193,9 @@ describe('Vercel AI integration (V5)', () => {
     ]),
   };
 
+  const EXPECTED_AVAILABLE_TOOLS_JSON =
+    '[{"type":"function","name":"getWeather","inputSchema":{"$schema":"http://json-schema.org/draft-07/schema#","type":"object","properties":{"location":{"type":"string"}},"required":["location"],"additionalProperties":false}}]';
+
   const EXPECTED_TRANSACTION_DEFAULT_PII_TRUE = {
     transaction: 'main',
     spans: expect.arrayContaining([
@@ -348,7 +351,7 @@ describe('Vercel AI integration (V5)', () => {
           'vercel.ai.pipeline.name': 'generateText.doGenerate',
           'gen_ai.request.messages': expect.any(String),
           'vercel.ai.prompt.toolChoice': expect.any(String),
-          'gen_ai.request.available_tools': expect.any(Array),
+          'gen_ai.request.available_tools': EXPECTED_AVAILABLE_TOOLS_JSON,
           'vercel.ai.response.finishReason': 'tool-calls',
           'vercel.ai.response.id': expect.any(String),
           'vercel.ai.response.model': 'mock-model-id',
diff --git a/packages/core/src/tracing/vercel-ai/index.ts b/packages/core/src/tracing/vercel-ai/index.ts
index 8e802edc789f..f07244088ff9 100644
--- a/packages/core/src/tracing/vercel-ai/index.ts
+++ b/packages/core/src/tracing/vercel-ai/index.ts
@@ -10,7 +10,7 @@ import {
 import { getTruncatedJsonString } from '../ai/utils';
 import { toolCallSpanMap } from './constants';
 import type { TokenSummary } from './types';
-import { accumulateTokensForParent, applyAccumulatedTokens } from './utils';
+import { accumulateTokensForParent, applyAccumulatedTokens, convertAvailableToolsToJsonString } from './utils';
 import type { ProviderMetadata } from './vercel-ai-attributes';
 import {
   AI_MODEL_ID_ATTRIBUTE,
@@ -123,6 +123,13 @@ function processEndedVercelAiSpan(span: SpanJSON): void {
       attributes[GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE] + attributes[GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE];
   }
 
+  // Convert the available tools array to a JSON string
+  if (attributes[AI_PROMPT_TOOLS_ATTRIBUTE] && Array.isArray(attributes[AI_PROMPT_TOOLS_ATTRIBUTE])) {
+    attributes[AI_PROMPT_TOOLS_ATTRIBUTE] = convertAvailableToolsToJsonString(
+      attributes[AI_PROMPT_TOOLS_ATTRIBUTE] as unknown[],
+    );
+  }
+
   // Rename AI SDK attributes to standardized gen_ai attributes
   renameAttributeKey(attributes, AI_PROMPT_MESSAGES_ATTRIBUTE, 'gen_ai.request.messages');
   renameAttributeKey(attributes, AI_RESPONSE_TEXT_ATTRIBUTE, 'gen_ai.response.text');
diff --git a/packages/core/src/tracing/vercel-ai/utils.ts b/packages/core/src/tracing/vercel-ai/utils.ts
index e9df1a4a7f96..9a0b57eb16f7 100644
--- a/packages/core/src/tracing/vercel-ai/utils.ts
+++ b/packages/core/src/tracing/vercel-ai/utils.ts
@@ -70,3 +70,20 @@ export function _INTERNAL_getSpanForToolCallId(toolCallId: string): Span | undef
 export function _INTERNAL_cleanupToolCallSpan(toolCallId: string): void {
   toolCallSpanMap.delete(toolCallId);
 }
+
+/**
+ * Convert an array of tool strings to a JSON string
+ */
+export function convertAvailableToolsToJsonString(tools: unknown[]): string {
+  const toolObjects = tools.map(tool => {
+    if (typeof tool === 'string') {
+      try {
+        return JSON.parse(tool);
+      } catch {
+        return tool;
+      }
+    }
+    return tool;
+  });
+  return JSON.stringify(toolObjects);
+}

From fcf35f6db6c826a124ccd7b81f13378bd7b9c706 Mon Sep 17 00:00:00 2001
From: Abdelrahman Awad <me@awad.dev>
Date: Fri, 14 Nov 2025 22:42:25 +0200
Subject: [PATCH 067/186] fix(core/vue): Detect and skip normalizing Vue
 `VNode` objects with high `normalizeDepth` (#18206)

Fixes #18203

### Problem

When using `normalizeDepth: 10` with `captureConsoleIntegration`
enabled, Vue VNodes in console arguments would trigger recursive warning
spam. Accessing VNode properties during normalization would trigger
Vue's reactive getters, which emit console warnings. These warnings
would then be captured and normalized again, creating a recursive loop
that could generate hundreds of warnings.

Note that this only happens in `dev` mode

### Solution

Changed `isVueViewModel()` to detect Vue 3 VNodes (`__v_isVNode: true`)
in addition to Vue 2/3 ViewModels. VNodes are now identified early in
the normalization process and stringified as `[VueVNode]` before their
properties are accessed, preventing the recursive warning loop.

Some of the properties on the `VNode` can also be reactive, so it can
incorrectly add those to a watchEffect or a render function reactive
dependencies when accessed by the normalizer.

### Changes

- **`packages/core/src/utils/is.ts`**: Added `__v_isVNode` check to
`isVueViewModel()`.
- **`packages/core/src/utils/normalize.ts`**: Distinguish VNodes from
ViewModels in output (`[VueVNode]` vs `[VueViewModel]`).
- **Tests**: Added comprehensive unit tests for Vue object detection and
integration test that verifies no property access occurs during VNode
normalization.

---

I couldn't reproduce this exactly in a test with a real vue component,
but verified it fixes the reproduction example.

The before and after of the captured logs:

Before:

<img width="1106" height="1137" alt="CleanShot 2025-11-14 at 15 46 30"
src="https://github.com/user-attachments/assets/435dbb04-ba3c-430b-8c39-d886f92072e8"
/>


After:

<img width="908" height="768" alt="CleanShot 2025-11-14 at 15 45 15"
src="https://github.com/user-attachments/assets/e7d8cca2-a0e1-48bb-9f95-3a39d2164d21"
/>


As a Vue developer I don't think the loss of information here would help
debug anything.
---
 packages/core/src/types-hoist/vue.ts          | 18 +++++++
 packages/core/src/utils/is.ts                 | 18 +++----
 packages/core/src/utils/normalize.ts          |  4 +-
 packages/core/src/utils/stacktrace.ts         | 13 +++++
 packages/core/src/utils/string.ts             |  3 +-
 packages/core/test/lib/utils/is.test.ts       | 37 ++++++++++++--
 .../test/integration/VueIntegration.test.ts   | 51 +++++++++++++++++++
 7 files changed, 129 insertions(+), 15 deletions(-)
 create mode 100644 packages/core/src/types-hoist/vue.ts

diff --git a/packages/core/src/types-hoist/vue.ts b/packages/core/src/types-hoist/vue.ts
new file mode 100644
index 000000000000..f83be3c5fd28
--- /dev/null
+++ b/packages/core/src/types-hoist/vue.ts
@@ -0,0 +1,18 @@
+/**
+ * Vue 2/3 VM type.
+ */
+export interface VueViewModel {
+  // Vue3
+  __isVue?: boolean;
+  // Vue2
+  _isVue?: boolean;
+}
+
+/**
+ * Vue 3 VNode type.
+ */
+export interface VNode {
+  // Vue3
+  // https://github.com/vuejs/core/blob/main/packages/runtime-core/src/vnode.ts#L168
+  __v_isVNode?: boolean;
+}
diff --git a/packages/core/src/utils/is.ts b/packages/core/src/utils/is.ts
index 9ec498983d4a..9abfab910099 100644
--- a/packages/core/src/utils/is.ts
+++ b/packages/core/src/utils/is.ts
@@ -3,6 +3,7 @@
 import type { Primitive } from '../types-hoist/misc';
 import type { ParameterizedString } from '../types-hoist/parameterize';
 import type { PolymorphicEvent } from '../types-hoist/polymorphics';
+import type { VNode, VueViewModel } from '../types-hoist/vue';
 
 // eslint-disable-next-line @typescript-eslint/unbound-method
 const objectToString = Object.prototype.toString;
@@ -187,21 +188,20 @@ export function isInstanceOf(wat: any, base: any): boolean {
   }
 }
 
-interface VueViewModel {
-  // Vue3
-  __isVue?: boolean;
-  // Vue2
-  _isVue?: boolean;
-}
 /**
- * Checks whether given value's type is a Vue ViewModel.
+ * Checks whether given value's type is a Vue ViewModel or a VNode.
  *
  * @param wat A value to be checked.
  * @returns A boolean representing the result.
  */
-export function isVueViewModel(wat: unknown): boolean {
+export function isVueViewModel(wat: unknown): wat is VueViewModel | VNode {
   // Not using Object.prototype.toString because in Vue 3 it would read the instance's Symbol(Symbol.toStringTag) property.
-  return !!(typeof wat === 'object' && wat !== null && ((wat as VueViewModel).__isVue || (wat as VueViewModel)._isVue));
+  // We also need to check for __v_isVNode because Vue 3 component render instances have an internal __v_isVNode property.
+  return !!(
+    typeof wat === 'object' &&
+    wat !== null &&
+    ((wat as VueViewModel).__isVue || (wat as VueViewModel)._isVue || (wat as { __v_isVNode?: boolean }).__v_isVNode)
+  );
 }
 
 /**
diff --git a/packages/core/src/utils/normalize.ts b/packages/core/src/utils/normalize.ts
index ba78d0cdb043..d70033d65672 100644
--- a/packages/core/src/utils/normalize.ts
+++ b/packages/core/src/utils/normalize.ts
@@ -1,7 +1,7 @@
 import type { Primitive } from '../types-hoist/misc';
 import { isSyntheticEvent, isVueViewModel } from './is';
 import { convertToPlainObject } from './object';
-import { getFunctionName } from './stacktrace';
+import { getFunctionName, getVueInternalName } from './stacktrace';
 
 type Prototype = { constructor?: (...args: unknown[]) => unknown };
 // This is a hack to placate TS, relying on the fact that technically, arrays are objects with integer keys. Normally we
@@ -217,7 +217,7 @@ function stringifyValue(
     }
 
     if (isVueViewModel(value)) {
-      return '[VueViewModel]';
+      return getVueInternalName(value);
     }
 
     // React's SyntheticEvent thingy
diff --git a/packages/core/src/utils/stacktrace.ts b/packages/core/src/utils/stacktrace.ts
index c7aab77bf3be..6b50caf48b30 100644
--- a/packages/core/src/utils/stacktrace.ts
+++ b/packages/core/src/utils/stacktrace.ts
@@ -1,6 +1,7 @@
 import type { Event } from '../types-hoist/event';
 import type { StackFrame } from '../types-hoist/stackframe';
 import type { StackLineParser, StackParser } from '../types-hoist/stacktrace';
+import type { VNode, VueViewModel } from '../types-hoist/vue';
 
 const STACKTRACE_FRAME_LIMIT = 50;
 export const UNKNOWN_FUNCTION = '?';
@@ -164,3 +165,15 @@ export function getFramesFromEvent(event: Event): StackFrame[] | undefined {
   }
   return undefined;
 }
+
+/**
+ * Get the internal name of an internal Vue value, to represent it in a stacktrace.
+ *
+ * @param value The value to get the internal name of.
+ */
+export function getVueInternalName(value: VueViewModel | VNode): string {
+  // Check if it's a VNode (has __v_isVNode) or a component instance (has _isVue/__isVue)
+  const isVNode = '__v_isVNode' in value && value.__v_isVNode;
+
+  return isVNode ? '[VueVNode]' : '[VueViewModel]';
+}
diff --git a/packages/core/src/utils/string.ts b/packages/core/src/utils/string.ts
index 34a1abd4eb46..b74f9559f9cf 100644
--- a/packages/core/src/utils/string.ts
+++ b/packages/core/src/utils/string.ts
@@ -1,4 +1,5 @@
 import { isRegExp, isString, isVueViewModel } from './is';
+import { getVueInternalName } from './stacktrace';
 
 export { escapeStringForRegex } from '../vendor/escapeStringForRegex';
 
@@ -81,7 +82,7 @@ export function safeJoin(input: unknown[], delimiter?: string): string {
       // Vue to issue another warning which repeats indefinitely.
       // see: https://github.com/getsentry/sentry-javascript/pull/8981
       if (isVueViewModel(value)) {
-        output.push('[VueViewModel]');
+        output.push(getVueInternalName(value));
       } else {
         output.push(String(value));
       }
diff --git a/packages/core/test/lib/utils/is.test.ts b/packages/core/test/lib/utils/is.test.ts
index 745cf275be06..092ffae2e3c3 100644
--- a/packages/core/test/lib/utils/is.test.ts
+++ b/packages/core/test/lib/utils/is.test.ts
@@ -121,11 +121,42 @@ describe('isInstanceOf()', () => {
 });
 
 describe('isVueViewModel()', () => {
-  test('should work as advertised', () => {
-    expect(isVueViewModel({ _isVue: true })).toEqual(true);
-    expect(isVueViewModel({ __isVue: true })).toEqual(true);
+  test('detects Vue 2 component instances with _isVue', () => {
+    const vue2Component = { _isVue: true, $el: {}, $data: {} };
+    expect(isVueViewModel(vue2Component)).toEqual(true);
+  });
+
+  test('detects Vue 3 component instances with __isVue', () => {
+    const vue3Component = { __isVue: true, $el: {}, $data: {} };
+    expect(isVueViewModel(vue3Component)).toEqual(true);
+  });
+
+  test('detects Vue 3 VNodes with __v_isVNode', () => {
+    const vueVNode = {
+      __v_isVNode: true,
+      __v_skip: true,
+      type: {},
+      props: {},
+      children: null,
+    };
+    expect(isVueViewModel(vueVNode)).toEqual(true);
+  });
 
+  test('does not detect plain objects', () => {
     expect(isVueViewModel({ foo: true })).toEqual(false);
+    expect(isVueViewModel({ __v_skip: true })).toEqual(false); // __v_skip alone is not enough
+    expect(isVueViewModel({})).toEqual(false);
+  });
+
+  test('handles null and undefined', () => {
+    expect(isVueViewModel(null)).toEqual(false);
+    expect(isVueViewModel(undefined)).toEqual(false);
+  });
+
+  test('handles non-objects', () => {
+    expect(isVueViewModel('string')).toEqual(false);
+    expect(isVueViewModel(123)).toEqual(false);
+    expect(isVueViewModel(true)).toEqual(false);
   });
 });
 
diff --git a/packages/vue/test/integration/VueIntegration.test.ts b/packages/vue/test/integration/VueIntegration.test.ts
index 81eb22254917..62ff990d1f43 100644
--- a/packages/vue/test/integration/VueIntegration.test.ts
+++ b/packages/vue/test/integration/VueIntegration.test.ts
@@ -93,4 +93,55 @@ describe('Sentry.VueIntegration', () => {
     ]);
     expect(loggerWarnings).toEqual([]);
   });
+
+  it('does not trigger warning spam when normalizing Vue VNodes with high normalizeDepth', () => {
+    // This test reproduces the issue from https://github.com/getsentry/sentry-javascript/issues/18203
+    // where VNodes in console arguments would trigger recursive warning spam with captureConsoleIntegration
+
+    Sentry.init({
+      dsn: PUBLIC_DSN,
+      defaultIntegrations: false,
+      normalizeDepth: 10, // High depth that would cause the issue
+      integrations: [Sentry.captureConsoleIntegration({ levels: ['warn'] })],
+    });
+
+    const initialWarningCount = warnings.length;
+
+    // Create a mock VNode that simulates the problematic behavior from the original issue
+    // In the real scenario, accessing VNode properties during normalization would trigger Vue warnings
+    // which would then be captured and normalized again, creating a recursive loop
+    let propertyAccessCount = 0;
+    const mockVNode = {
+      __v_isVNode: true,
+      __v_skip: true,
+      type: {},
+      get ctx() {
+        // Simulate Vue's behavior where accessing ctx triggers a warning
+        propertyAccessCount++;
+        // eslint-disable-next-line no-console
+        console.warn('[Vue warn]: compilerOptions warning triggered by property access');
+        return { uid: 1 };
+      },
+      get props() {
+        propertyAccessCount++;
+        return {};
+      },
+    };
+
+    // Pass the mock VNode to console.warn, simulating what Vue does
+    // Without the fix, Sentry would try to normalize mockVNode, access its ctx property,
+    // which triggers another warning, which gets captured and normalized, creating infinite recursion
+    // eslint-disable-next-line no-console
+    console.warn('[Vue warn]: Original warning', mockVNode);
+
+    // With the fix, Sentry detects the VNode early and stringifies it as [VueVNode]
+    // without accessing its properties, so propertyAccessCount stays at 0
+    expect(propertyAccessCount).toBe(0);
+
+    // Only 1 warning should be captured (the original one)
+    // Without the fix, the count would multiply as ctx getter warnings get recursively captured
+    const warningCountAfter = warnings.length;
+    const newWarnings = warningCountAfter - initialWarningCount;
+    expect(newWarnings).toBe(1);
+  });
 });

From 74822de7db0996aa2faaf92d2970d6fb07093892 Mon Sep 17 00:00:00 2001
From: Andrei <168741329+andreiborza@users.noreply.github.com>
Date: Fri, 14 Nov 2025 22:27:38 +0100
Subject: [PATCH 068/186] ref(react-router): Deprecate ErrorBoundary exports
 (#18208)

The ErrorBoundary exported in the SDK only works on the client and is
not intended to be used.

Use react router's error boundary instead:
https://docs.sentry.io/platforms/javascript/guides/react-router/#report-errors-from-error-boundaries.
---
 packages/react-router/src/client/index.ts | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/packages/react-router/src/client/index.ts b/packages/react-router/src/client/index.ts
index c19c3456e341..935df5fb7611 100644
--- a/packages/react-router/src/client/index.ts
+++ b/packages/react-router/src/client/index.ts
@@ -3,13 +3,16 @@ export * from '@sentry/browser';
 export { init } from './sdk';
 export { reactRouterTracingIntegration } from './tracingIntegration';
 
-export {
-  captureReactException,
-  reactErrorHandler,
-  Profiler,
-  withProfiler,
-  useProfiler,
-  ErrorBoundary,
-  withErrorBoundary,
-} from '@sentry/react';
+export { captureReactException, reactErrorHandler, Profiler, withProfiler, useProfiler } from '@sentry/react';
+
+/**
+ * @deprecated ErrorBoundary is deprecated, use react router's error boundary instead.
+ * See https://docs.sentry.io/platforms/javascript/guides/react-router/#report-errors-from-error-boundaries
+ */
+export { ErrorBoundary, withErrorBoundary } from '@sentry/react';
+
+/**
+ * @deprecated ErrorBoundaryProps and FallbackRender are deprecated, use react router's error boundary instead.
+ * See https://docs.sentry.io/platforms/javascript/guides/react-router/#report-errors-from-error-boundaries
+ */
 export type { ErrorBoundaryProps, FallbackRender } from '@sentry/react';

From e403d893679475b5cb9a45b0631700383ad53749 Mon Sep 17 00:00:00 2001
From: Andrei <168741329+andreiborza@users.noreply.github.com>
Date: Mon, 17 Nov 2025 09:35:55 +0100
Subject: [PATCH 069/186] fix(core): Ensure logs past `MAX_LOG_BUFFER_SIZE` are
 not swallowed (#18207)

Looks like we swallowed the log that triggers a flush when
`MAX_LOG_BUFFER_SIZE` is surpassed.

Test demonstrating issue:
[5697b7d](https://github.com/getsentry/sentry-javascript/pull/18207/commits/5697b7dd18110559c20eec9bbf6241c38ccc2ca0)
Fix:
[f7a4d8b](https://github.com/getsentry/sentry-javascript/pull/18207/commits/f7a4d8bf41f7116bd9ab8cf7edfd87b35345456a)

Related metrics pr: #18212
v9 backport: #18213
---
 packages/core/src/logs/internal.ts           | 6 ++++--
 packages/core/test/lib/logs/internal.test.ts | 5 ++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/core/src/logs/internal.ts b/packages/core/src/logs/internal.ts
index 601d9be29cb6..819c51c7e3f1 100644
--- a/packages/core/src/logs/internal.ts
+++ b/packages/core/src/logs/internal.ts
@@ -91,14 +91,16 @@ function setLogAttribute(
  */
 export function _INTERNAL_captureSerializedLog(client: Client, serializedLog: SerializedLog): void {
   const bufferMap = _getBufferMap();
-
   const logBuffer = _INTERNAL_getLogBuffer(client);
+
   if (logBuffer === undefined) {
     bufferMap.set(client, [serializedLog]);
   } else {
-    bufferMap.set(client, [...logBuffer, serializedLog]);
     if (logBuffer.length >= MAX_LOG_BUFFER_SIZE) {
       _INTERNAL_flushLogsBuffer(client, logBuffer);
+      bufferMap.set(client, [serializedLog]);
+    } else {
+      bufferMap.set(client, [...logBuffer, serializedLog]);
     }
   }
 }
diff --git a/packages/core/test/lib/logs/internal.test.ts b/packages/core/test/lib/logs/internal.test.ts
index dbb2966dc076..563139aba36d 100644
--- a/packages/core/test/lib/logs/internal.test.ts
+++ b/packages/core/test/lib/logs/internal.test.ts
@@ -259,7 +259,10 @@ describe('_INTERNAL_captureLog', () => {
     // Add one more to trigger flush
     _INTERNAL_captureLog({ level: 'info', message: 'trigger flush' }, scope);
 
-    expect(_INTERNAL_getLogBuffer(client)).toEqual([]);
+    // After flushing the 100 logs, the new log starts a fresh buffer with 1 item
+    const buffer = _INTERNAL_getLogBuffer(client);
+    expect(buffer).toHaveLength(1);
+    expect(buffer?.[0]?.body).toBe('trigger flush');
   });
 
   it('does not flush logs buffer when it is empty', () => {

From e3ef3f294c4d70a624df6ee642e8994d0cf7bd2c Mon Sep 17 00:00:00 2001
From: Andrei <168741329+andreiborza@users.noreply.github.com>
Date: Mon, 17 Nov 2025 09:50:11 +0100
Subject: [PATCH 070/186] fix(core): Ensure metrics past
 `MAX_METRIC_BUFFER_SIZE` are not swallowed (#18212)

Looks like we swallowed the metric that triggers a flush when
MAX_METRIC_BUFFER_SIZE is surpassed.

Test demonstrating issue:
[f0737fa](https://github.com/getsentry/sentry-javascript/pull/18212/commits/f0737fa81950e8690eb119749c943366ff898b29)
Fix:
[1a4e02a](https://github.com/getsentry/sentry-javascript/pull/18212/commits/1a4e02a6fc0ff44051171b63cf0e8c54083d436e)

Related logs pr: #18207
---
 packages/core/src/metrics/internal.ts           | 6 ++++--
 packages/core/test/lib/metrics/internal.test.ts | 5 ++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/core/src/metrics/internal.ts b/packages/core/src/metrics/internal.ts
index 5371ecba8dfd..e94da7f36cd8 100644
--- a/packages/core/src/metrics/internal.ts
+++ b/packages/core/src/metrics/internal.ts
@@ -88,14 +88,16 @@ function setMetricAttribute(
  */
 export function _INTERNAL_captureSerializedMetric(client: Client, serializedMetric: SerializedMetric): void {
   const bufferMap = _getBufferMap();
-
   const metricBuffer = _INTERNAL_getMetricBuffer(client);
+
   if (metricBuffer === undefined) {
     bufferMap.set(client, [serializedMetric]);
   } else {
-    bufferMap.set(client, [...metricBuffer, serializedMetric]);
     if (metricBuffer.length >= MAX_METRIC_BUFFER_SIZE) {
       _INTERNAL_flushMetricsBuffer(client, metricBuffer);
+      bufferMap.set(client, [serializedMetric]);
+    } else {
+      bufferMap.set(client, [...metricBuffer, serializedMetric]);
     }
   }
 }
diff --git a/packages/core/test/lib/metrics/internal.test.ts b/packages/core/test/lib/metrics/internal.test.ts
index d9d123b63e99..3e479e282a0c 100644
--- a/packages/core/test/lib/metrics/internal.test.ts
+++ b/packages/core/test/lib/metrics/internal.test.ts
@@ -256,7 +256,10 @@ describe('_INTERNAL_captureMetric', () => {
     // Add one more to trigger flush
     _INTERNAL_captureMetric({ type: 'counter', name: 'trigger.flush', value: 999 }, { scope });
 
-    expect(_INTERNAL_getMetricBuffer(client)).toEqual([]);
+    // After flushing the 1000 metrics, the new metric starts a fresh buffer with 1 item
+    const buffer = _INTERNAL_getMetricBuffer(client);
+    expect(buffer).toHaveLength(1);
+    expect(buffer?.[0]?.name).toBe('trigger.flush');
   });
 
   it('does not flush metrics buffer when it is empty', () => {

From 84ef78bbc8e5e28abb378df0b75c2e5006aef166 Mon Sep 17 00:00:00 2001
From: Andrei <168741329+andreiborza@users.noreply.github.com>
Date: Mon, 17 Nov 2025 09:52:16 +0100
Subject: [PATCH 071/186] chore(react-router): Fix casing on deprecation
 notices (#18221)

---
 packages/react-router/src/client/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/react-router/src/client/index.ts b/packages/react-router/src/client/index.ts
index 935df5fb7611..507f4172fe0b 100644
--- a/packages/react-router/src/client/index.ts
+++ b/packages/react-router/src/client/index.ts
@@ -6,13 +6,13 @@ export { reactRouterTracingIntegration } from './tracingIntegration';
 export { captureReactException, reactErrorHandler, Profiler, withProfiler, useProfiler } from '@sentry/react';
 
 /**
- * @deprecated ErrorBoundary is deprecated, use react router's error boundary instead.
+ * @deprecated ErrorBoundary is deprecated, use React Router's error boundary instead.
  * See https://docs.sentry.io/platforms/javascript/guides/react-router/#report-errors-from-error-boundaries
  */
 export { ErrorBoundary, withErrorBoundary } from '@sentry/react';
 
 /**
- * @deprecated ErrorBoundaryProps and FallbackRender are deprecated, use react router's error boundary instead.
+ * @deprecated ErrorBoundaryProps and FallbackRender are deprecated, use React Router's error boundary instead.
  * See https://docs.sentry.io/platforms/javascript/guides/react-router/#report-errors-from-error-boundaries
  */
 export type { ErrorBoundaryProps, FallbackRender } from '@sentry/react';

From ad0ce512ee369ad54e63f1ed439fa59e47c9bd9e Mon Sep 17 00:00:00 2001
From: Andrei <168741329+andreiborza@users.noreply.github.com>
Date: Mon, 17 Nov 2025 10:06:12 +0100
Subject: [PATCH 072/186] fix(core): Fix logs and metrics flush timeout
 starvation with continuous logging (#18211)

The flush timeout was being reset on every incoming log, preventing
flushes when logs arrived continuously. Now, the timer starts on the
first log and won't get reset, ensuring logs flush within the configured
interval.

Fixes #18204, getsentry/sentry-react-native#5378

v9 backport: #18214
---
 packages/core/src/client.ts           | 13 +++++++--
 packages/core/test/lib/client.test.ts | 42 ++++++++++++++++++++++-----
 2 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/packages/core/src/client.ts b/packages/core/src/client.ts
index 53e0328965a4..f363e61becd7 100644
--- a/packages/core/src/client.ts
+++ b/packages/core/src/client.ts
@@ -94,7 +94,7 @@ function _isDoNotSendEventError(error: unknown): error is DoNotSendEventError {
  * This helper function encapsulates the common pattern of:
  * 1. Tracking accumulated weight of items
  * 2. Flushing when weight exceeds threshold (800KB)
- * 3. Flushing after idle timeout if no new items arrive
+ * 3. Flushing after timeout period from the first item
  *
  * Uses closure variables to track weight and timeout state.
  */
@@ -112,11 +112,13 @@ function setupWeightBasedFlushing<
   // Track weight and timeout in closure variables
   let weight = 0;
   let flushTimeout: ReturnType<typeof setTimeout> | undefined;
+  let isTimerActive = false;
 
   // @ts-expect-error - TypeScript can't narrow generic hook types to match specific overloads, but we know this is type-safe
   client.on(flushHook, () => {
     weight = 0;
     clearTimeout(flushTimeout);
+    isTimerActive = false;
   });
 
   // @ts-expect-error - TypeScript can't narrow generic hook types to match specific overloads, but we know this is type-safe
@@ -127,10 +129,15 @@ function setupWeightBasedFlushing<
     // The weight is a rough estimate, so we flush way before the payload gets too big.
     if (weight >= 800_000) {
       flushFn(client);
-    } else {
-      clearTimeout(flushTimeout);
+    } else if (!isTimerActive) {
+      // Only start timer if one isn't already running.
+      // This prevents flushing being delayed by items that arrive close to the timeout limit
+      // and thus resetting the flushing timeout and delaying items being flushed.
+      isTimerActive = true;
       flushTimeout = setTimeout(() => {
         flushFn(client);
+        // Note: isTimerActive is reset by the flushHook handler above, not here,
+        // to avoid race conditions when new items arrive during the flush.
       }, DEFAULT_FLUSH_INTERVAL);
     }
   });
diff --git a/packages/core/test/lib/client.test.ts b/packages/core/test/lib/client.test.ts
index acb4197cf4cf..c009d0e0c2a8 100644
--- a/packages/core/test/lib/client.test.ts
+++ b/packages/core/test/lib/client.test.ts
@@ -2772,7 +2772,7 @@ describe('Client', () => {
       expect(sendEnvelopeSpy).toHaveBeenCalledTimes(1);
     });
 
-    it('resets idle timeout when new logs are captured', () => {
+    it('does not reset idle timeout when new logs are captured', () => {
       const options = getDefaultTestClientOptions({
         dsn: PUBLIC_DSN,
         enableLogs: true,
@@ -2783,26 +2783,52 @@ describe('Client', () => {
 
       const sendEnvelopeSpy = vi.spyOn(client, 'sendEnvelope');
 
-      // Add initial log
+      // Add initial log (starts the timer)
       _INTERNAL_captureLog({ message: 'test log 1', level: 'info' }, scope);
 
       // Fast forward part of the idle timeout
       vi.advanceTimersByTime(2500);
 
-      // Add another log which should reset the timeout
+      // Add another log which should NOT reset the timeout
       _INTERNAL_captureLog({ message: 'test log 2', level: 'info' }, scope);
 
-      // Fast forward the remaining time
+      // Fast forward the remaining time to reach the full timeout from the first log
       vi.advanceTimersByTime(2500);
 
-      // Should not have flushed yet since timeout was reset
-      expect(sendEnvelopeSpy).not.toHaveBeenCalled();
+      // Should have flushed both logs since timeout was not reset
+      expect(sendEnvelopeSpy).toHaveBeenCalledTimes(1);
+    });
+
+    it('starts new timer after timeout completes and flushes', () => {
+      const options = getDefaultTestClientOptions({
+        dsn: PUBLIC_DSN,
+        enableLogs: true,
+      });
+      const client = new TestClient(options);
+      const scope = new Scope();
+      scope.setClient(client);
 
-      // Fast forward the full timeout
+      const sendEnvelopeSpy = vi.spyOn(client, 'sendEnvelope');
+
+      // First batch: Add a log and let it flush
+      _INTERNAL_captureLog({ message: 'test log 1', level: 'info' }, scope);
+
+      // Fast forward to trigger the first flush
       vi.advanceTimersByTime(5000);
 
-      // Now should have flushed both logs
       expect(sendEnvelopeSpy).toHaveBeenCalledTimes(1);
+
+      // Second batch: Add another log after the first flush completed
+      _INTERNAL_captureLog({ message: 'test log 2', level: 'info' }, scope);
+
+      // Should not have flushed yet
+      expect(sendEnvelopeSpy).toHaveBeenCalledTimes(1);
+
+      // Fast forward to trigger the second flush
+      vi.advanceTimersByTime(5000);
+
+      // Should have flushed the second log
+      expect(sendEnvelopeSpy).toHaveBeenCalledTimes(2);
     });
 
     it('flushes logs on flush event', () => {

From 8efeeeb7d64c1ab1a95774bc6845c5d501650772 Mon Sep 17 00:00:00 2001
From: Charly Gomez <charly.gomez@sentry.io>
Date: Mon, 17 Nov 2025 10:57:42 +0100
Subject: [PATCH 073/186] fix(core): Emit processed metric (#18222)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We were emitting the non-processed metric in the hook before – I changed
this behaviour + added a test to verify.
---
 .../metrics/afterCaptureMetric/init.js        | 25 ++++++++
 .../metrics/afterCaptureMetric/subject.js     | 14 +++++
 .../metrics/afterCaptureMetric/test.ts        | 59 +++++++++++++++++++
 packages/core/src/metrics/internal.ts         |  2 +-
 4 files changed, 99 insertions(+), 1 deletion(-)
 create mode 100644 dev-packages/browser-integration-tests/suites/public-api/metrics/afterCaptureMetric/init.js
 create mode 100644 dev-packages/browser-integration-tests/suites/public-api/metrics/afterCaptureMetric/subject.js
 create mode 100644 dev-packages/browser-integration-tests/suites/public-api/metrics/afterCaptureMetric/test.ts

diff --git a/dev-packages/browser-integration-tests/suites/public-api/metrics/afterCaptureMetric/init.js b/dev-packages/browser-integration-tests/suites/public-api/metrics/afterCaptureMetric/init.js
new file mode 100644
index 000000000000..5590fbb90547
--- /dev/null
+++ b/dev-packages/browser-integration-tests/suites/public-api/metrics/afterCaptureMetric/init.js
@@ -0,0 +1,25 @@
+import * as Sentry from '@sentry/browser';
+
+window.Sentry = Sentry;
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  release: '1.0.0',
+  environment: 'test',
+  integrations: integrations => {
+    return integrations.filter(integration => integration.name !== 'BrowserSession');
+  },
+  beforeSendMetric: metric => {
+    if (metric.name === 'test.counter') {
+      return {
+        ...metric,
+        attributes: {
+          ...metric.attributes,
+          modified: 'by-beforeSendMetric',
+          original: undefined,
+        },
+      };
+    }
+    return metric;
+  },
+});
diff --git a/dev-packages/browser-integration-tests/suites/public-api/metrics/afterCaptureMetric/subject.js b/dev-packages/browser-integration-tests/suites/public-api/metrics/afterCaptureMetric/subject.js
new file mode 100644
index 000000000000..e7b9940c7f6f
--- /dev/null
+++ b/dev-packages/browser-integration-tests/suites/public-api/metrics/afterCaptureMetric/subject.js
@@ -0,0 +1,14 @@
+// Store captured metrics from the afterCaptureMetric event
+window.capturedMetrics = [];
+
+const client = Sentry.getClient();
+
+client.on('afterCaptureMetric', metric => {
+  window.capturedMetrics.push(metric);
+});
+
+// Capture metrics - these should be processed by beforeSendMetric
+Sentry.metrics.count('test.counter', 1, { attributes: { endpoint: '/api/test', original: 'value' } });
+Sentry.metrics.gauge('test.gauge', 42, { unit: 'millisecond', attributes: { server: 'test-1' } });
+
+Sentry.flush();
diff --git a/dev-packages/browser-integration-tests/suites/public-api/metrics/afterCaptureMetric/test.ts b/dev-packages/browser-integration-tests/suites/public-api/metrics/afterCaptureMetric/test.ts
new file mode 100644
index 000000000000..a89bdea81902
--- /dev/null
+++ b/dev-packages/browser-integration-tests/suites/public-api/metrics/afterCaptureMetric/test.ts
@@ -0,0 +1,59 @@
+import { expect } from '@playwright/test';
+import { sentryTest } from '../../../../utils/fixtures';
+
+sentryTest(
+  'should emit afterCaptureMetric event with processed metric from beforeSendMetric',
+  async ({ getLocalTestUrl, page }) => {
+    const bundle = process.env.PW_BUNDLE || '';
+    if (bundle.startsWith('bundle') || bundle.startsWith('loader')) {
+      sentryTest.skip();
+    }
+
+    const url = await getLocalTestUrl({ testDir: __dirname });
+    await page.goto(url);
+
+    await page.waitForFunction(() => {
+      return (window as any).capturedMetrics.length >= 2;
+    });
+
+    const capturedMetrics = await page.evaluate(() => {
+      return (window as any).capturedMetrics;
+    });
+
+    expect(capturedMetrics).toHaveLength(2);
+
+    // Verify the counter metric was modified by beforeSendMetric
+    expect(capturedMetrics[0]).toMatchObject({
+      name: 'test.counter',
+      type: 'counter',
+      value: 1,
+      attributes: {
+        endpoint: '/api/test',
+        modified: 'by-beforeSendMetric',
+        'sentry.release': '1.0.0',
+        'sentry.environment': 'test',
+        'sentry.sdk.name': 'sentry.javascript.browser',
+      },
+    });
+
+    // Verify the 'original' attribute was removed by beforeSendMetric
+    expect(capturedMetrics[0].attributes.original).toBeUndefined();
+
+    // Verify the gauge metric was not modified (no beforeSendMetric processing)
+    expect(capturedMetrics[1]).toMatchObject({
+      name: 'test.gauge',
+      type: 'gauge',
+      unit: 'millisecond',
+      value: 42,
+      attributes: {
+        server: 'test-1',
+        'sentry.release': '1.0.0',
+        'sentry.environment': 'test',
+        'sentry.sdk.name': 'sentry.javascript.browser',
+      },
+    });
+
+    expect(capturedMetrics[0].attributes['sentry.sdk.version']).toBeDefined();
+    expect(capturedMetrics[1].attributes['sentry.sdk.version']).toBeDefined();
+  },
+);
diff --git a/packages/core/src/metrics/internal.ts b/packages/core/src/metrics/internal.ts
index e94da7f36cd8..b38d61b5195c 100644
--- a/packages/core/src/metrics/internal.ts
+++ b/packages/core/src/metrics/internal.ts
@@ -243,7 +243,7 @@ export function _INTERNAL_captureMetric(beforeMetric: Metric, options?: Internal
 
   captureSerializedMetric(client, serializedMetric);
 
-  client.emit('afterCaptureMetric', enrichedMetric);
+  client.emit('afterCaptureMetric', processedMetric);
 }
 
 /**

From f9e714fa24ebcbf73c276ab13b8e4a345d48cf33 Mon Sep 17 00:00:00 2001
From: Rola Abuhasna <rola.abuhasna@sentry.io>
Date: Mon, 17 Nov 2025 12:23:21 +0100
Subject: [PATCH 074/186] feat(core): Instrument LangGraph Agent (#18114)

This PR adds official support for instrumenting LangGraph StateGraph
operations in Node with Sentry tracing, following OpenTelemetry semantic
conventions for Generative AI.

### Currently supported:
Node.js - Both agent creation and invocation are instrumented in this PR
ESM and CJS - Both module systems are supported

The langGraphIntegration() accepts the following options:
```
// The integration respects your sendDefaultPii client option
interface LangGraphOptions {
  recordInputs?: boolean;   // Whether to record input messages
  recordOutputs?: boolean;  // Whether to record response text and tool calls
}
```
e.g
```
Sentry.init({
  dsn: '__DSN__',
  sendDefaultPii: false, // Even with PII disabled globally
  integrations: [
    Sentry.langGraphIntegration({
      recordInputs: true,    // Force recording input messages
      recordOutputs: true,   // Force recording response text
    }),
  ],
});
```

### Operations traced:

- gen_ai.create_agent - Spans created when StateGraph.compile() is
called
- gen_ai.invoke_agent - Spans created when CompiledGraph.invoke() is
called
---
 .../node-integration-tests/package.json       |   1 +
 .../tracing/langgraph/instrument-with-pii.mjs |  10 +
 .../suites/tracing/langgraph/instrument.mjs   |  10 +
 .../tracing/langgraph/scenario-tools.mjs      | 164 ++++++++++++++
 .../suites/tracing/langgraph/scenario.mjs     |  52 +++++
 .../suites/tracing/langgraph/test.ts          | 208 ++++++++++++++++++
 packages/astro/src/index.server.ts            |   1 +
 packages/aws-serverless/src/index.ts          |   1 +
 packages/bun/src/index.ts                     |   1 +
 packages/core/src/index.ts                    |   3 +
 .../core/src/tracing/ai/gen-ai-attributes.ts  |  15 ++
 .../core/src/tracing/langgraph/constants.ts   |   2 +
 packages/core/src/tracing/langgraph/index.ts  | 157 +++++++++++++
 packages/core/src/tracing/langgraph/types.ts  |  85 +++++++
 packages/core/src/tracing/langgraph/utils.ts  | 187 ++++++++++++++++
 packages/google-cloud-serverless/src/index.ts |   1 +
 packages/node/src/index.ts                    |   1 +
 .../node/src/integrations/tracing/index.ts    |   3 +
 .../integrations/tracing/langgraph/index.ts   |  88 ++++++++
 .../tracing/langgraph/instrumentation.ts      |  90 ++++++++
 yarn.lock                                     |  27 +++
 21 files changed, 1107 insertions(+)
 create mode 100644 dev-packages/node-integration-tests/suites/tracing/langgraph/instrument-with-pii.mjs
 create mode 100644 dev-packages/node-integration-tests/suites/tracing/langgraph/instrument.mjs
 create mode 100644 dev-packages/node-integration-tests/suites/tracing/langgraph/scenario-tools.mjs
 create mode 100644 dev-packages/node-integration-tests/suites/tracing/langgraph/scenario.mjs
 create mode 100644 dev-packages/node-integration-tests/suites/tracing/langgraph/test.ts
 create mode 100644 packages/core/src/tracing/langgraph/constants.ts
 create mode 100644 packages/core/src/tracing/langgraph/index.ts
 create mode 100644 packages/core/src/tracing/langgraph/types.ts
 create mode 100644 packages/core/src/tracing/langgraph/utils.ts
 create mode 100644 packages/node/src/integrations/tracing/langgraph/index.ts
 create mode 100644 packages/node/src/integrations/tracing/langgraph/instrumentation.ts

diff --git a/dev-packages/node-integration-tests/package.json b/dev-packages/node-integration-tests/package.json
index 79d933a3c525..0bc5b8b83b1c 100644
--- a/dev-packages/node-integration-tests/package.json
+++ b/dev-packages/node-integration-tests/package.json
@@ -31,6 +31,7 @@
     "@hono/node-server": "^1.19.4",
     "@langchain/anthropic": "^0.3.10",
     "@langchain/core": "^0.3.28",
+    "@langchain/langgraph": "^0.2.32",
     "@nestjs/common": "^11",
     "@nestjs/core": "^11",
     "@nestjs/platform-express": "^11",
diff --git a/dev-packages/node-integration-tests/suites/tracing/langgraph/instrument-with-pii.mjs b/dev-packages/node-integration-tests/suites/tracing/langgraph/instrument-with-pii.mjs
new file mode 100644
index 000000000000..be512ed2f773
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/langgraph/instrument-with-pii.mjs
@@ -0,0 +1,10 @@
+import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  release: '1.0',
+  tracesSampleRate: 1.0,
+  sendDefaultPii: true,
+  transport: loggingTransport,
+});
diff --git a/dev-packages/node-integration-tests/suites/tracing/langgraph/instrument.mjs b/dev-packages/node-integration-tests/suites/tracing/langgraph/instrument.mjs
new file mode 100644
index 000000000000..06cc1a32e93e
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/langgraph/instrument.mjs
@@ -0,0 +1,10 @@
+import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  release: '1.0',
+  tracesSampleRate: 1.0,
+  sendDefaultPii: false,
+  transport: loggingTransport,
+});
diff --git a/dev-packages/node-integration-tests/suites/tracing/langgraph/scenario-tools.mjs b/dev-packages/node-integration-tests/suites/tracing/langgraph/scenario-tools.mjs
new file mode 100644
index 000000000000..21110c337755
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/langgraph/scenario-tools.mjs
@@ -0,0 +1,164 @@
+import { tool } from '@langchain/core/tools';
+import { END, MessagesAnnotation, START, StateGraph } from '@langchain/langgraph';
+import { ToolNode } from '@langchain/langgraph/prebuilt';
+import * as Sentry from '@sentry/node';
+import { z } from 'zod';
+
+async function run() {
+  await Sentry.startSpan({ op: 'function', name: 'langgraph-tools-test' }, async () => {
+    // Define tools
+    const getWeatherTool = tool(
+      async ({ city }) => {
+        return JSON.stringify({ city, temperature: 72, condition: 'sunny' });
+      },
+      {
+        name: 'get_weather',
+        description: 'Get the current weather for a given city',
+        schema: z.object({
+          city: z.string().describe('The city to get weather for'),
+        }),
+      },
+    );
+
+    const getTimeTool = tool(
+      async () => {
+        return new Date().toISOString();
+      },
+      {
+        name: 'get_time',
+        description: 'Get the current time',
+        schema: z.object({}),
+      },
+    );
+
+    const tools = [getWeatherTool, getTimeTool];
+    const toolNode = new ToolNode(tools);
+
+    // Define mock LLM function that returns without tool calls
+    const mockLlm = () => {
+      return {
+        messages: [
+          {
+            role: 'assistant',
+            content: 'Response without calling tools',
+            response_metadata: {
+              model_name: 'gpt-4-0613',
+              finish_reason: 'stop',
+              tokenUsage: {
+                promptTokens: 25,
+                completionTokens: 15,
+                totalTokens: 40,
+              },
+            },
+            tool_calls: [],
+          },
+        ],
+      };
+    };
+
+    // Routing function - check if there are tool calls
+    const shouldContinue = state => {
+      const messages = state.messages;
+      const lastMessage = messages[messages.length - 1];
+
+      // If the last message has tool_calls, route to tools, otherwise end
+      if (lastMessage.tool_calls && lastMessage.tool_calls.length > 0) {
+        return 'tools';
+      }
+      return END;
+    };
+
+    // Create graph with conditional edge to tools
+    const graph = new StateGraph(MessagesAnnotation)
+      .addNode('agent', mockLlm)
+      .addNode('tools', toolNode)
+      .addEdge(START, 'agent')
+      .addConditionalEdges('agent', shouldContinue, {
+        tools: 'tools',
+        [END]: END,
+      })
+      .addEdge('tools', 'agent')
+      .compile({ name: 'tool_agent' });
+
+    // Simple invocation - won't call tools since mockLlm returns empty tool_calls
+    await graph.invoke({
+      messages: [{ role: 'user', content: 'What is the weather?' }],
+    });
+
+    // Define mock LLM function that returns with tool calls
+    let callCount = 0;
+    const mockLlmWithTools = () => {
+      callCount++;
+
+      // First call - return tool calls
+      if (callCount === 1) {
+        return {
+          messages: [
+            {
+              role: 'assistant',
+              content: '',
+              response_metadata: {
+                model_name: 'gpt-4-0613',
+                finish_reason: 'tool_calls',
+                tokenUsage: {
+                  promptTokens: 30,
+                  completionTokens: 20,
+                  totalTokens: 50,
+                },
+              },
+              tool_calls: [
+                {
+                  name: 'get_weather',
+                  args: { city: 'San Francisco' },
+                  id: 'call_123',
+                  type: 'tool_call',
+                },
+              ],
+            },
+          ],
+        };
+      }
+
+      // Second call - return final response after tool execution
+      return {
+        messages: [
+          {
+            role: 'assistant',
+            content: 'Based on the weather data, it is sunny and 72 degrees in San Francisco.',
+            response_metadata: {
+              model_name: 'gpt-4-0613',
+              finish_reason: 'stop',
+              tokenUsage: {
+                promptTokens: 50,
+                completionTokens: 20,
+                totalTokens: 70,
+              },
+            },
+            tool_calls: [],
+          },
+        ],
+      };
+    };
+
+    // Create graph with tool calls enabled
+    const graphWithTools = new StateGraph(MessagesAnnotation)
+      .addNode('agent', mockLlmWithTools)
+      .addNode('tools', toolNode)
+      .addEdge(START, 'agent')
+      .addConditionalEdges('agent', shouldContinue, {
+        tools: 'tools',
+        [END]: END,
+      })
+      .addEdge('tools', 'agent')
+      .compile({ name: 'tool_calling_agent' });
+
+    // Invocation that actually calls tools
+    await graphWithTools.invoke({
+      messages: [{ role: 'user', content: 'What is the weather in San Francisco?' }],
+    });
+  });
+
+  await Sentry.flush(2000);
+}
+
+run();
diff --git a/dev-packages/node-integration-tests/suites/tracing/langgraph/scenario.mjs b/dev-packages/node-integration-tests/suites/tracing/langgraph/scenario.mjs
new file mode 100644
index 000000000000..d93c4b5491c7
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/langgraph/scenario.mjs
@@ -0,0 +1,52 @@
+import { END, MessagesAnnotation, START, StateGraph } from '@langchain/langgraph';
+import * as Sentry from '@sentry/node';
+
+async function run() {
+  await Sentry.startSpan({ op: 'function', name: 'langgraph-test' }, async () => {
+    // Define a simple mock LLM function
+    const mockLlm = () => {
+      return {
+        messages: [
+          {
+            role: 'assistant',
+            content: 'Mock LLM response',
+            response_metadata: {
+              model_name: 'mock-model',
+              finish_reason: 'stop',
+              tokenUsage: {
+                promptTokens: 20,
+                completionTokens: 10,
+                totalTokens: 30,
+              },
+            },
+          },
+        ],
+      };
+    };
+
+    // Create and compile the graph
+    const graph = new StateGraph(MessagesAnnotation)
+      .addNode('agent', mockLlm)
+      .addEdge(START, 'agent')
+      .addEdge('agent', END)
+      .compile({ name: 'weather_assistant' });
+
+    // Test: basic invocation
+    await graph.invoke({
+      messages: [{ role: 'user', content: 'What is the weather today?' }],
+    });
+
+    // Test: invocation with multiple messages
+    await graph.invoke({
+      messages: [
+        { role: 'user', content: 'Hello' },
+        { role: 'assistant', content: 'Hi there!' },
+        { role: 'user', content: 'Tell me about the weather' },
+      ],
+    });
+  });
+
+  await Sentry.flush(2000);
+}
+
+run();
diff --git a/dev-packages/node-integration-tests/suites/tracing/langgraph/test.ts b/dev-packages/node-integration-tests/suites/tracing/langgraph/test.ts
new file mode 100644
index 000000000000..6a67b5cd1e86
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/langgraph/test.ts
@@ -0,0 +1,208 @@
+import { afterAll, describe, expect } from 'vitest';
+import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../utils/runner';
+
+describe('LangGraph integration', () => {
+  afterAll(() => {
+    cleanupChildProcesses();
+  });
+
+  const EXPECTED_TRANSACTION_DEFAULT_PII_FALSE = {
+    transaction: 'langgraph-test',
+    spans: expect.arrayContaining([
+      // create_agent span
+      expect.objectContaining({
+        data: {
+          'gen_ai.operation.name': 'create_agent',
+          'sentry.op': 'gen_ai.create_agent',
+          'sentry.origin': 'auto.ai.langgraph',
+          'gen_ai.agent.name': 'weather_assistant',
+        },
+        description: 'create_agent weather_assistant',
+        op: 'gen_ai.create_agent',
+        origin: 'auto.ai.langgraph',
+        status: 'ok',
+      }),
+      // First invoke_agent span
+      expect.objectContaining({
+        data: expect.objectContaining({
+          'gen_ai.operation.name': 'invoke_agent',
+          'sentry.op': 'gen_ai.invoke_agent',
+          'sentry.origin': 'auto.ai.langgraph',
+          'gen_ai.agent.name': 'weather_assistant',
+          'gen_ai.pipeline.name': 'weather_assistant',
+        }),
+        description: 'invoke_agent weather_assistant',
+        op: 'gen_ai.invoke_agent',
+        origin: 'auto.ai.langgraph',
+        status: 'ok',
+      }),
+      // Second invoke_agent span
+      expect.objectContaining({
+        data: expect.objectContaining({
+          'gen_ai.operation.name': 'invoke_agent',
+          'sentry.op': 'gen_ai.invoke_agent',
+          'sentry.origin': 'auto.ai.langgraph',
+          'gen_ai.agent.name': 'weather_assistant',
+          'gen_ai.pipeline.name': 'weather_assistant',
+        }),
+        description: 'invoke_agent weather_assistant',
+        op: 'gen_ai.invoke_agent',
+        origin: 'auto.ai.langgraph',
+        status: 'ok',
+      }),
+    ]),
+  };
+
+  const EXPECTED_TRANSACTION_DEFAULT_PII_TRUE = {
+    transaction: 'langgraph-test',
+    spans: expect.arrayContaining([
+      // create_agent span (PII enabled doesn't affect this span)
+      expect.objectContaining({
+        data: {
+          'gen_ai.operation.name': 'create_agent',
+          'sentry.op': 'gen_ai.create_agent',
+          'sentry.origin': 'auto.ai.langgraph',
+          'gen_ai.agent.name': 'weather_assistant',
+        },
+        description: 'create_agent weather_assistant',
+        op: 'gen_ai.create_agent',
+        origin: 'auto.ai.langgraph',
+        status: 'ok',
+      }),
+      // First invoke_agent span with PII
+      expect.objectContaining({
+        data: expect.objectContaining({
+          'gen_ai.operation.name': 'invoke_agent',
+          'sentry.op': 'gen_ai.invoke_agent',
+          'sentry.origin': 'auto.ai.langgraph',
+          'gen_ai.agent.name': 'weather_assistant',
+          'gen_ai.pipeline.name': 'weather_assistant',
+          'gen_ai.request.messages': expect.stringContaining('What is the weather today?'),
+        }),
+        description: 'invoke_agent weather_assistant',
+        op: 'gen_ai.invoke_agent',
+        origin: 'auto.ai.langgraph',
+        status: 'ok',
+      }),
+      // Second invoke_agent span with PII and multiple messages
+      expect.objectContaining({
+        data: expect.objectContaining({
+          'gen_ai.operation.name': 'invoke_agent',
+          'sentry.op': 'gen_ai.invoke_agent',
+          'sentry.origin': 'auto.ai.langgraph',
+          'gen_ai.agent.name': 'weather_assistant',
+          'gen_ai.pipeline.name': 'weather_assistant',
+          'gen_ai.request.messages': expect.stringContaining('Tell me about the weather'),
+        }),
+        description: 'invoke_agent weather_assistant',
+        op: 'gen_ai.invoke_agent',
+        origin: 'auto.ai.langgraph',
+        status: 'ok',
+      }),
+    ]),
+  };
+
+  const EXPECTED_TRANSACTION_WITH_TOOLS = {
+    transaction: 'langgraph-tools-test',
+    spans: expect.arrayContaining([
+      // create_agent span for first graph (no tool calls)
+      expect.objectContaining({
+        data: {
+          'gen_ai.operation.name': 'create_agent',
+          'sentry.op': 'gen_ai.create_agent',
+          'sentry.origin': 'auto.ai.langgraph',
+          'gen_ai.agent.name': 'tool_agent',
+        },
+        description: 'create_agent tool_agent',
+        op: 'gen_ai.create_agent',
+        origin: 'auto.ai.langgraph',
+        status: 'ok',
+      }),
+      // invoke_agent span with tools available but not called
+      expect.objectContaining({
+        data: expect.objectContaining({
+          'gen_ai.operation.name': 'invoke_agent',
+          'sentry.op': 'gen_ai.invoke_agent',
+          'sentry.origin': 'auto.ai.langgraph',
+          'gen_ai.agent.name': 'tool_agent',
+          'gen_ai.pipeline.name': 'tool_agent',
+          'gen_ai.request.available_tools': expect.stringContaining('get_weather'),
+          'gen_ai.request.messages': expect.stringContaining('What is the weather?'),
+          'gen_ai.response.model': 'gpt-4-0613',
+          'gen_ai.response.finish_reasons': ['stop'],
+          'gen_ai.response.text': expect.stringContaining('Response without calling tools'),
+          'gen_ai.usage.input_tokens': 25,
+          'gen_ai.usage.output_tokens': 15,
+          'gen_ai.usage.total_tokens': 40,
+        }),
+        description: 'invoke_agent tool_agent',
+        op: 'gen_ai.invoke_agent',
+        origin: 'auto.ai.langgraph',
+        status: 'ok',
+      }),
+      // create_agent span for second graph (with tool calls)
+      expect.objectContaining({
+        data: {
+          'gen_ai.operation.name': 'create_agent',
+          'sentry.op': 'gen_ai.create_agent',
+          'sentry.origin': 'auto.ai.langgraph',
+          'gen_ai.agent.name': 'tool_calling_agent',
+        },
+        description: 'create_agent tool_calling_agent',
+        op: 'gen_ai.create_agent',
+        origin: 'auto.ai.langgraph',
+        status: 'ok',
+      }),
+      // invoke_agent span with tool calls and execution
+      expect.objectContaining({
+        data: expect.objectContaining({
+          'gen_ai.operation.name': 'invoke_agent',
+          'sentry.op': 'gen_ai.invoke_agent',
+          'sentry.origin': 'auto.ai.langgraph',
+          'gen_ai.agent.name': 'tool_calling_agent',
+          'gen_ai.pipeline.name': 'tool_calling_agent',
+          'gen_ai.request.available_tools': expect.stringContaining('get_weather'),
+          'gen_ai.request.messages': expect.stringContaining('San Francisco'),
+          'gen_ai.response.model': 'gpt-4-0613',
+          'gen_ai.response.finish_reasons': ['stop'],
+          'gen_ai.response.text': expect.stringMatching(/"role":"tool"/),
+          // Verify tool_calls are captured
+          'gen_ai.response.tool_calls': expect.stringContaining('get_weather'),
+          'gen_ai.usage.input_tokens': 80,
+          'gen_ai.usage.output_tokens': 40,
+          'gen_ai.usage.total_tokens': 120,
+        }),
+        description: 'invoke_agent tool_calling_agent',
+        op: 'gen_ai.invoke_agent',
+        origin: 'auto.ai.langgraph',
+        status: 'ok',
+      }),
+    ]),
+  };
+
+  createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createRunner, test) => {
+    test('should instrument LangGraph with default PII settings', async () => {
+      await createRunner()
+        .ignore('event')
+        .expect({ transaction: EXPECTED_TRANSACTION_DEFAULT_PII_FALSE })
+        .start()
+        .completed();
+    });
+  });
+
+  createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument-with-pii.mjs', (createRunner, test) => {
+    test('should instrument LangGraph with sendDefaultPii: true', async () => {
+      await createRunner()
+        .ignore('event')
+        .expect({ transaction: EXPECTED_TRANSACTION_DEFAULT_PII_TRUE })
+        .start()
+        .completed();
+    });
+  });
+
+  createEsmAndCjsTests(__dirname, 'scenario-tools.mjs', 'instrument-with-pii.mjs', (createRunner, test) => {
+    test('should capture tools from LangGraph agent', { timeout: 30000 }, async () => {
+      await createRunner().ignore('event').expect({ transaction: EXPECTED_TRANSACTION_WITH_TOOLS }).start().completed();
+    });
+  });
+});
diff --git a/packages/astro/src/index.server.ts b/packages/astro/src/index.server.ts
index 1774f597af43..2913022c816b 100644
--- a/packages/astro/src/index.server.ts
+++ b/packages/astro/src/index.server.ts
@@ -95,6 +95,7 @@ export {
   onUnhandledRejectionIntegration,
   openAIIntegration,
   langChainIntegration,
+  langGraphIntegration,
   parameterize,
   pinoIntegration,
   postgresIntegration,
diff --git a/packages/aws-serverless/src/index.ts b/packages/aws-serverless/src/index.ts
index 586babab40ee..6b36930265ca 100644
--- a/packages/aws-serverless/src/index.ts
+++ b/packages/aws-serverless/src/index.ts
@@ -58,6 +58,7 @@ export {
   onUnhandledRejectionIntegration,
   openAIIntegration,
   langChainIntegration,
+  langGraphIntegration,
   modulesIntegration,
   contextLinesIntegration,
   nodeContextIntegration,
diff --git a/packages/bun/src/index.ts b/packages/bun/src/index.ts
index 813e087dc2d2..d3d266b4dfc1 100644
--- a/packages/bun/src/index.ts
+++ b/packages/bun/src/index.ts
@@ -79,6 +79,7 @@ export {
   onUnhandledRejectionIntegration,
   openAIIntegration,
   langChainIntegration,
+  langGraphIntegration,
   modulesIntegration,
   contextLinesIntegration,
   nodeContextIntegration,
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index 504368cfb873..ed3dbe4750d7 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -152,6 +152,9 @@ export type { GoogleGenAIResponse } from './tracing/google-genai/types';
 export { createLangChainCallbackHandler } from './tracing/langchain';
 export { LANGCHAIN_INTEGRATION_NAME } from './tracing/langchain/constants';
 export type { LangChainOptions, LangChainIntegration } from './tracing/langchain/types';
+export { instrumentStateGraphCompile } from './tracing/langgraph';
+export { LANGGRAPH_INTEGRATION_NAME } from './tracing/langgraph/constants';
+export type { LangGraphOptions, LangGraphIntegration, CompiledGraph } from './tracing/langgraph/types';
 export type { OpenAiClient, OpenAiOptions, InstrumentedMethod } from './tracing/openai/types';
 export type {
   AnthropicAiClient,
diff --git a/packages/core/src/tracing/ai/gen-ai-attributes.ts b/packages/core/src/tracing/ai/gen-ai-attributes.ts
index 84efb21c1822..b07aa63d306f 100644
--- a/packages/core/src/tracing/ai/gen-ai-attributes.ts
+++ b/packages/core/src/tracing/ai/gen-ai-attributes.ts
@@ -134,6 +134,16 @@ export const GEN_AI_RESPONSE_STREAMING_ATTRIBUTE = 'gen_ai.response.streaming';
  */
 export const GEN_AI_RESPONSE_TOOL_CALLS_ATTRIBUTE = 'gen_ai.response.tool_calls';
 
+/**
+ * The agent name
+ */
+export const GEN_AI_AGENT_NAME_ATTRIBUTE = 'gen_ai.agent.name';
+
+/**
+ * The pipeline name
+ */
+export const GEN_AI_PIPELINE_NAME_ATTRIBUTE = 'gen_ai.pipeline.name';
+
 /**
  * The number of cache creation input tokens used
  */
@@ -154,6 +164,11 @@ export const GEN_AI_USAGE_INPUT_TOKENS_CACHE_WRITE_ATTRIBUTE = 'gen_ai.usage.inp
  */
 export const GEN_AI_USAGE_INPUT_TOKENS_CACHED_ATTRIBUTE = 'gen_ai.usage.input_tokens.cached';
 
+/**
+ * The span operation name for invoking an agent
+ */
+export const GEN_AI_INVOKE_AGENT_OPERATION_ATTRIBUTE = 'gen_ai.invoke_agent';
+
 // =============================================================================
 // OPENAI-SPECIFIC ATTRIBUTES
 // =============================================================================
diff --git a/packages/core/src/tracing/langgraph/constants.ts b/packages/core/src/tracing/langgraph/constants.ts
new file mode 100644
index 000000000000..add875f7b655
--- /dev/null
+++ b/packages/core/src/tracing/langgraph/constants.ts
@@ -0,0 +1,2 @@
+export const LANGGRAPH_INTEGRATION_NAME = 'LangGraph';
+export const LANGGRAPH_ORIGIN = 'auto.ai.langgraph';
diff --git a/packages/core/src/tracing/langgraph/index.ts b/packages/core/src/tracing/langgraph/index.ts
new file mode 100644
index 000000000000..65d315bf3f63
--- /dev/null
+++ b/packages/core/src/tracing/langgraph/index.ts
@@ -0,0 +1,157 @@
+import { captureException } from '../../exports';
+import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '../../semanticAttributes';
+import { SPAN_STATUS_ERROR } from '../../tracing';
+import {
+  GEN_AI_AGENT_NAME_ATTRIBUTE,
+  GEN_AI_INVOKE_AGENT_OPERATION_ATTRIBUTE,
+  GEN_AI_OPERATION_NAME_ATTRIBUTE,
+  GEN_AI_PIPELINE_NAME_ATTRIBUTE,
+  GEN_AI_REQUEST_AVAILABLE_TOOLS_ATTRIBUTE,
+  GEN_AI_REQUEST_MESSAGES_ATTRIBUTE,
+} from '../ai/gen-ai-attributes';
+import { truncateGenAiMessages } from '../ai/messageTruncation';
+import type { LangChainMessage } from '../langchain/types';
+import { normalizeLangChainMessages } from '../langchain/utils';
+import { startSpan } from '../trace';
+import { LANGGRAPH_ORIGIN } from './constants';
+import type { CompiledGraph, LangGraphOptions } from './types';
+import { extractToolsFromCompiledGraph, setResponseAttributes } from './utils';
+
+/**
+ * Instruments StateGraph's compile method to create spans for agent creation and invocation
+ *
+ * Wraps the compile() method to:
+ * - Create a `gen_ai.create_agent` span when compile() is called
+ * - Automatically wrap the invoke() method on the returned compiled graph with a `gen_ai.invoke_agent` span
+ *
+ */
+export function instrumentStateGraphCompile(
+  originalCompile: (...args: unknown[]) => CompiledGraph,
+  options: LangGraphOptions,
+): (...args: unknown[]) => CompiledGraph {
+  return new Proxy(originalCompile, {
+    apply(target, thisArg, args: unknown[]): CompiledGraph {
+      return startSpan(
+        {
+          op: 'gen_ai.create_agent',
+          name: 'create_agent',
+          attributes: {
+            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: LANGGRAPH_ORIGIN,
+            [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'gen_ai.create_agent',
+            [GEN_AI_OPERATION_NAME_ATTRIBUTE]: 'create_agent',
+          },
+        },
+        span => {
+          try {
+            const compiledGraph = Reflect.apply(target, thisArg, args);
+            const compileOptions = args.length > 0 ? (args[0] as Record<string, unknown>) : {};
+
+            // Extract graph name
+            if (compileOptions?.name && typeof compileOptions.name === 'string') {
+              span.setAttribute(GEN_AI_AGENT_NAME_ATTRIBUTE, compileOptions.name);
+              span.updateName(`create_agent ${compileOptions.name}`);
+            }
+
+            // Instrument agent invoke method on the compiled graph
+            const originalInvoke = compiledGraph.invoke;
+            if (originalInvoke && typeof originalInvoke === 'function') {
+              compiledGraph.invoke = instrumentCompiledGraphInvoke(
+                originalInvoke.bind(compiledGraph) as (...args: unknown[]) => Promise<unknown>,
+                compiledGraph,
+                compileOptions,
+                options,
+              ) as typeof originalInvoke;
+            }
+
+            return compiledGraph;
+          } catch (error) {
+            span.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
+            captureException(error, {
+              mechanism: {
+                handled: false,
+                type: 'auto.ai.langgraph.error',
+              },
+            });
+            throw error;
+          }
+        },
+      );
+    },
+  }) as (...args: unknown[]) => CompiledGraph;
+}
+
+/**
+ * Instruments CompiledGraph's invoke method to create spans for agent invocation
+ *
+ * Creates a `gen_ai.invoke_agent` span when invoke() is called
+ */
+function instrumentCompiledGraphInvoke(
+  originalInvoke: (...args: unknown[]) => Promise<unknown>,
+  graphInstance: CompiledGraph,
+  compileOptions: Record<string, unknown>,
+  options: LangGraphOptions,
+): (...args: unknown[]) => Promise<unknown> {
+  return new Proxy(originalInvoke, {
+    apply(target, thisArg, args: unknown[]): Promise<unknown> {
+      return startSpan(
+        {
+          op: 'gen_ai.invoke_agent',
+          name: 'invoke_agent',
+          attributes: {
+            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: LANGGRAPH_ORIGIN,
+            [SEMANTIC_ATTRIBUTE_SENTRY_OP]: GEN_AI_INVOKE_AGENT_OPERATION_ATTRIBUTE,
+            [GEN_AI_OPERATION_NAME_ATTRIBUTE]: 'invoke_agent',
+          },
+        },
+        async span => {
+          try {
+            const graphName = compileOptions?.name;
+
+            if (graphName && typeof graphName === 'string') {
+              span.setAttribute(GEN_AI_PIPELINE_NAME_ATTRIBUTE, graphName);
+              span.setAttribute(GEN_AI_AGENT_NAME_ATTRIBUTE, graphName);
+              span.updateName(`invoke_agent ${graphName}`);
+            }
+
+            // Extract available tools from the graph instance
+            const tools = extractToolsFromCompiledGraph(graphInstance);
+            if (tools) {
+              span.setAttribute(GEN_AI_REQUEST_AVAILABLE_TOOLS_ATTRIBUTE, JSON.stringify(tools));
+            }
+
+            // Parse input messages
+            const recordInputs = options.recordInputs;
+            const recordOutputs = options.recordOutputs;
+            const inputMessages =
+              args.length > 0 ? ((args[0] as { messages?: LangChainMessage[] }).messages ?? []) : [];
+
+            if (inputMessages && recordInputs) {
+              const normalizedMessages = normalizeLangChainMessages(inputMessages);
+              const truncatedMessages = truncateGenAiMessages(normalizedMessages);
+              span.setAttribute(GEN_AI_REQUEST_MESSAGES_ATTRIBUTE, JSON.stringify(truncatedMessages));
+            }
+
+            // Call original invoke
+            const result = await Reflect.apply(target, thisArg, args);
+
+            // Set response attributes
+            if (recordOutputs) {
+              setResponseAttributes(span, inputMessages ?? null, result);
+            }
+
+            return result;
+          } catch (error) {
+            span.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
+            captureException(error, {
+              mechanism: {
+                handled: false,
+                type: 'auto.ai.langgraph.error',
+              },
+            });
+            throw error;
+          }
+        },
+      );
+    },
+  }) as (...args: unknown[]) => Promise<unknown>;
+}
diff --git a/packages/core/src/tracing/langgraph/types.ts b/packages/core/src/tracing/langgraph/types.ts
new file mode 100644
index 000000000000..b16f9718c69e
--- /dev/null
+++ b/packages/core/src/tracing/langgraph/types.ts
@@ -0,0 +1,85 @@
+export interface LangGraphOptions {
+  /**
+   * Enable or disable input recording.
+   */
+  recordInputs?: boolean;
+  /**
+   * Enable or disable output recording.
+   */
+  recordOutputs?: boolean;
+}
+
+/**
+ * LangGraph Tool definition from lc_kwargs
+ */
+export interface LangGraphToolDefinition {
+  name?: string;
+  description?: string;
+  schema?: unknown;
+  func?: (...args: unknown[]) => unknown;
+}
+
+/**
+ * LangGraph Tool object (DynamicTool, DynamicStructuredTool, etc.)
+ */
+export interface LangGraphTool {
+  [key: string]: unknown;
+  lc_kwargs?: LangGraphToolDefinition;
+  name?: string;
+  description?: string;
+}
+
+/**
+ * LangGraph ToolNode with tools array
+ */
+export interface ToolNode {
+  [key: string]: unknown;
+  tools?: LangGraphTool[];
+}
+
+/**
+ * LangGraph PregelNode containing a ToolNode
+ */
+export interface PregelNode {
+  [key: string]: unknown;
+  runnable?: ToolNode;
+}
+
+/**
+ * LangGraph StateGraph builder nodes
+ */
+export interface StateGraphNodes {
+  [key: string]: unknown;
+  tools?: PregelNode;
+}
+
+/**
+ * LangGraph StateGraph builder
+ */
+export interface StateGraphBuilder {
+  [key: string]: unknown;
+  nodes?: StateGraphNodes;
+}
+
+/**
+ * Basic interface for compiled graph
+ */
+export interface CompiledGraph {
+  [key: string]: unknown;
+  invoke?: (...args: unknown[]) => Promise<unknown>;
+  name?: string;
+  graph_name?: string;
+  lc_kwargs?: {
+    [key: string]: unknown;
+    name?: string;
+  };
+  builder?: StateGraphBuilder;
+}
+
+/**
+ * LangGraph Integration interface for type safety
+ */
+export interface LangGraphIntegration {
+  name: string;
+  options: LangGraphOptions;
+}
diff --git a/packages/core/src/tracing/langgraph/utils.ts b/packages/core/src/tracing/langgraph/utils.ts
new file mode 100644
index 000000000000..4b1990058924
--- /dev/null
+++ b/packages/core/src/tracing/langgraph/utils.ts
@@ -0,0 +1,187 @@
+import type { Span } from '../../types-hoist/span';
+import {
+  GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE,
+  GEN_AI_RESPONSE_MODEL_ATTRIBUTE,
+  GEN_AI_RESPONSE_TEXT_ATTRIBUTE,
+  GEN_AI_RESPONSE_TOOL_CALLS_ATTRIBUTE,
+  GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE,
+  GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE,
+  GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE,
+} from '../ai/gen-ai-attributes';
+import type { LangChainMessage } from '../langchain/types';
+import { normalizeLangChainMessages } from '../langchain/utils';
+import type { CompiledGraph, LangGraphTool } from './types';
+
+/**
+ * Extract tool calls from messages
+ */
+export function extractToolCalls(messages: Array<Record<string, unknown>> | null): unknown[] | null {
+  if (!messages || messages.length === 0) {
+    return null;
+  }
+
+  const toolCalls: unknown[] = [];
+
+  for (const message of messages) {
+    if (message && typeof message === 'object') {
+      const msgToolCalls = message.tool_calls;
+      if (msgToolCalls && Array.isArray(msgToolCalls)) {
+        toolCalls.push(...msgToolCalls);
+      }
+    }
+  }
+
+  return toolCalls.length > 0 ? toolCalls : null;
+}
+
+/**
+ * Extract token usage from a message's usage_metadata or response_metadata
+ * Returns token counts without setting span attributes
+ */
+export function extractTokenUsageFromMessage(message: LangChainMessage): {
+  inputTokens: number;
+  outputTokens: number;
+  totalTokens: number;
+} {
+  const msg = message as Record<string, unknown>;
+  let inputTokens = 0;
+  let outputTokens = 0;
+  let totalTokens = 0;
+
+  // Extract from usage_metadata (newer format)
+  if (msg.usage_metadata && typeof msg.usage_metadata === 'object') {
+    const usage = msg.usage_metadata as Record<string, unknown>;
+    if (typeof usage.input_tokens === 'number') {
+      inputTokens = usage.input_tokens;
+    }
+    if (typeof usage.output_tokens === 'number') {
+      outputTokens = usage.output_tokens;
+    }
+    if (typeof usage.total_tokens === 'number') {
+      totalTokens = usage.total_tokens;
+    }
+    return { inputTokens, outputTokens, totalTokens };
+  }
+
+  // Fallback: Extract from response_metadata.tokenUsage
+  if (msg.response_metadata && typeof msg.response_metadata === 'object') {
+    const metadata = msg.response_metadata as Record<string, unknown>;
+    if (metadata.tokenUsage && typeof metadata.tokenUsage === 'object') {
+      const tokenUsage = metadata.tokenUsage as Record<string, unknown>;
+      if (typeof tokenUsage.promptTokens === 'number') {
+        inputTokens = tokenUsage.promptTokens;
+      }
+      if (typeof tokenUsage.completionTokens === 'number') {
+        outputTokens = tokenUsage.completionTokens;
+      }
+      if (typeof tokenUsage.totalTokens === 'number') {
+        totalTokens = tokenUsage.totalTokens;
+      }
+    }
+  }
+
+  return { inputTokens, outputTokens, totalTokens };
+}
+
+/**
+ * Extract model and finish reason from a message's response_metadata
+ */
+export function extractModelMetadata(span: Span, message: LangChainMessage): void {
+  const msg = message as Record<string, unknown>;
+
+  if (msg.response_metadata && typeof msg.response_metadata === 'object') {
+    const metadata = msg.response_metadata as Record<string, unknown>;
+
+    if (metadata.model_name && typeof metadata.model_name === 'string') {
+      span.setAttribute(GEN_AI_RESPONSE_MODEL_ATTRIBUTE, metadata.model_name);
+    }
+
+    if (metadata.finish_reason && typeof metadata.finish_reason === 'string') {
+      span.setAttribute(GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE, [metadata.finish_reason]);
+    }
+  }
+}
+
+/**
+ * Extract tools from compiled graph structure
+ *
+ * Tools are stored in: compiledGraph.builder.nodes.tools.runnable.tools
+ */
+export function extractToolsFromCompiledGraph(compiledGraph: CompiledGraph): unknown[] | null {
+  if (!compiledGraph.builder?.nodes?.tools?.runnable?.tools) {
+    return null;
+  }
+
+  const tools = compiledGraph.builder?.nodes?.tools?.runnable?.tools;
+
+  if (!tools || !Array.isArray(tools) || tools.length === 0) {
+    return null;
+  }
+
+  // Extract name, description, and schema from each tool's lc_kwargs
+  return tools.map((tool: LangGraphTool) => ({
+    name: tool.lc_kwargs?.name,
+    description: tool.lc_kwargs?.description,
+    schema: tool.lc_kwargs?.schema,
+  }));
+}
+
+/**
+ * Set response attributes on the span
+ */
+export function setResponseAttributes(span: Span, inputMessages: LangChainMessage[] | null, result: unknown): void {
+  // Extract messages from result
+  const resultObj = result as { messages?: LangChainMessage[] } | undefined;
+  const outputMessages = resultObj?.messages;
+
+  if (!outputMessages || !Array.isArray(outputMessages)) {
+    return;
+  }
+
+  // Get new messages (delta between input and output)
+  const inputCount = inputMessages?.length ?? 0;
+  const newMessages = outputMessages.length > inputCount ? outputMessages.slice(inputCount) : [];
+
+  if (newMessages.length === 0) {
+    return;
+  }
+
+  // Extract and set tool calls from new messages BEFORE normalization
+  // (normalization strips tool_calls, so we need to extract them first)
+  const toolCalls = extractToolCalls(newMessages as Array<Record<string, unknown>>);
+  if (toolCalls) {
+    span.setAttribute(GEN_AI_RESPONSE_TOOL_CALLS_ATTRIBUTE, JSON.stringify(toolCalls));
+  }
+
+  // Normalize the new messages
+  const normalizedNewMessages = normalizeLangChainMessages(newMessages);
+  span.setAttribute(GEN_AI_RESPONSE_TEXT_ATTRIBUTE, JSON.stringify(normalizedNewMessages));
+
+  // Accumulate token usage across all messages
+  let totalInputTokens = 0;
+  let totalOutputTokens = 0;
+  let totalTokens = 0;
+
+  // Extract metadata from messages
+  for (const message of newMessages) {
+    // Accumulate token usage
+    const tokens = extractTokenUsageFromMessage(message);
+    totalInputTokens += tokens.inputTokens;
+    totalOutputTokens += tokens.outputTokens;
+    totalTokens += tokens.totalTokens;
+
+    // Extract model metadata (last message's metadata wins for model/finish_reason)
+    extractModelMetadata(span, message);
+  }
+
+  // Set accumulated token usage on span
+  if (totalInputTokens > 0) {
+    span.setAttribute(GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE, totalInputTokens);
+  }
+  if (totalOutputTokens > 0) {
+    span.setAttribute(GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE, totalOutputTokens);
+  }
+  if (totalTokens > 0) {
+    span.setAttribute(GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE, totalTokens);
+  }
+}
diff --git a/packages/google-cloud-serverless/src/index.ts b/packages/google-cloud-serverless/src/index.ts
index 3aa7da1cbab9..d7cd08e5b14e 100644
--- a/packages/google-cloud-serverless/src/index.ts
+++ b/packages/google-cloud-serverless/src/index.ts
@@ -58,6 +58,7 @@ export {
   onUnhandledRejectionIntegration,
   openAIIntegration,
   langChainIntegration,
+  langGraphIntegration,
   modulesIntegration,
   contextLinesIntegration,
   nodeContextIntegration,
diff --git a/packages/node/src/index.ts b/packages/node/src/index.ts
index e469fd75d2d2..a03b31619472 100644
--- a/packages/node/src/index.ts
+++ b/packages/node/src/index.ts
@@ -28,6 +28,7 @@ export { openAIIntegration } from './integrations/tracing/openai';
 export { anthropicAIIntegration } from './integrations/tracing/anthropic-ai';
 export { googleGenAIIntegration } from './integrations/tracing/google-genai';
 export { langChainIntegration } from './integrations/tracing/langchain';
+export { langGraphIntegration } from './integrations/tracing/langgraph';
 export {
   launchDarklyIntegration,
   buildLaunchDarklyFlagUsedHandler,
diff --git a/packages/node/src/integrations/tracing/index.ts b/packages/node/src/integrations/tracing/index.ts
index b586941d6530..dcd2efa5595c 100644
--- a/packages/node/src/integrations/tracing/index.ts
+++ b/packages/node/src/integrations/tracing/index.ts
@@ -14,6 +14,7 @@ import { honoIntegration, instrumentHono } from './hono';
 import { instrumentKafka, kafkaIntegration } from './kafka';
 import { instrumentKoa, koaIntegration } from './koa';
 import { instrumentLangChain, langChainIntegration } from './langchain';
+import { instrumentLangGraph, langGraphIntegration } from './langgraph';
 import { instrumentLruMemoizer, lruMemoizerIntegration } from './lrumemoizer';
 import { instrumentMongo, mongoIntegration } from './mongo';
 import { instrumentMongoose, mongooseIntegration } from './mongoose';
@@ -54,6 +55,7 @@ export function getAutoPerformanceIntegrations(): Integration[] {
     // AI providers
     // LangChain must come first to disable AI provider integrations before they instrument
     langChainIntegration(),
+    langGraphIntegration(),
     vercelAIIntegration(),
     openAIIntegration(),
     anthropicAIIntegration(),
@@ -98,5 +100,6 @@ export function getOpenTelemetryInstrumentationToPreload(): (((options?: any) =>
     instrumentFirebase,
     instrumentAnthropicAi,
     instrumentGoogleGenAI,
+    instrumentLangGraph,
   ];
 }
diff --git a/packages/node/src/integrations/tracing/langgraph/index.ts b/packages/node/src/integrations/tracing/langgraph/index.ts
new file mode 100644
index 000000000000..c302582e5908
--- /dev/null
+++ b/packages/node/src/integrations/tracing/langgraph/index.ts
@@ -0,0 +1,88 @@
+import type { IntegrationFn, LangGraphOptions } from '@sentry/core';
+import { defineIntegration, LANGGRAPH_INTEGRATION_NAME } from '@sentry/core';
+import { generateInstrumentOnce } from '@sentry/node-core';
+import { SentryLangGraphInstrumentation } from './instrumentation';
+
+export const instrumentLangGraph = generateInstrumentOnce<LangGraphOptions>(
+  LANGGRAPH_INTEGRATION_NAME,
+  options => new SentryLangGraphInstrumentation(options),
+);
+
+const _langGraphIntegration = ((options: LangGraphOptions = {}) => {
+  return {
+    name: LANGGRAPH_INTEGRATION_NAME,
+    setupOnce() {
+      instrumentLangGraph(options);
+    },
+  };
+}) satisfies IntegrationFn;
+
+/**
+ * Adds Sentry tracing instrumentation for LangGraph.
+ *
+ * This integration is enabled by default.
+ *
+ * When configured, this integration automatically instruments LangGraph StateGraph and compiled graph instances
+ * to capture telemetry data following OpenTelemetry Semantic Conventions for Generative AI.
+ *
+ * @example
+ * ```javascript
+ * import * as Sentry from '@sentry/node';
+ *
+ * Sentry.init({
+ *   integrations: [Sentry.langGraphIntegration()],
+ * });
+ * ```
+ *
+ * ## Options
+ *
+ * - `recordInputs`: Whether to record input messages (default: respects `sendDefaultPii` client option)
+ * - `recordOutputs`: Whether to record response text (default: respects `sendDefaultPii` client option)
+ *
+ * ### Default Behavior
+ *
+ * By default, the integration will:
+ * - Record inputs and outputs ONLY if `sendDefaultPii` is set to `true` in your Sentry client options
+ * - Otherwise, inputs and outputs are NOT recorded unless explicitly enabled
+ *
+ * @example
+ * ```javascript
+ * // Record inputs and outputs when sendDefaultPii is false
+ * Sentry.init({
+ *   integrations: [
+ *     Sentry.langGraphIntegration({
+ *       recordInputs: true,
+ *       recordOutputs: true
+ *     })
+ *   ],
+ * });
+ *
+ * // Never record inputs/outputs regardless of sendDefaultPii
+ * Sentry.init({
+ *   sendDefaultPii: true,
+ *   integrations: [
+ *     Sentry.langGraphIntegration({
+ *       recordInputs: false,
+ *       recordOutputs: false
+ *     })
+ *   ],
+ * });
+ * ```
+ *
+ * ## Captured Operations
+ *
+ * The integration captures the following LangGraph operations:
+ * - **Agent Creation** (`StateGraph.compile()`) - Creates a `gen_ai.create_agent` span
+ * - **Agent Invocation** (`CompiledGraph.invoke()`) - Creates a `gen_ai.invoke_agent` span
+ *
+ * ## Captured Data
+ *
+ * When `recordInputs` and `recordOutputs` are enabled, the integration captures:
+ * - Input messages from the graph state
+ * - Output messages and LLM responses
+ * - Tool calls made during agent execution
+ * - Agent and graph names
+ * - Available tools configured in the graph
+ *
+ */
+export const langGraphIntegration = defineIntegration(_langGraphIntegration);
diff --git a/packages/node/src/integrations/tracing/langgraph/instrumentation.ts b/packages/node/src/integrations/tracing/langgraph/instrumentation.ts
new file mode 100644
index 000000000000..ca1406e3e493
--- /dev/null
+++ b/packages/node/src/integrations/tracing/langgraph/instrumentation.ts
@@ -0,0 +1,90 @@
+import {
+  type InstrumentationConfig,
+  type InstrumentationModuleDefinition,
+  InstrumentationBase,
+  InstrumentationNodeModuleDefinition,
+  InstrumentationNodeModuleFile,
+} from '@opentelemetry/instrumentation';
+import type { CompiledGraph, LangGraphOptions } from '@sentry/core';
+import { getClient, instrumentStateGraphCompile, SDK_VERSION } from '@sentry/core';
+
+const supportedVersions = ['>=0.0.0 <2.0.0'];
+
+type LangGraphInstrumentationOptions = InstrumentationConfig & LangGraphOptions;
+
+/**
+ * Represents the patched shape of the LangGraph module export.
+ */
+interface PatchedModuleExports {
+  [key: string]: unknown;
+  StateGraph?: abstract new (...args: unknown[]) => unknown;
+}
+
+/**
+ * Sentry LangGraph instrumentation using OpenTelemetry.
+ */
+export class SentryLangGraphInstrumentation extends InstrumentationBase<LangGraphInstrumentationOptions> {
+  public constructor(config: LangGraphInstrumentationOptions = {}) {
+    super('@sentry/instrumentation-langgraph', SDK_VERSION, config);
+  }
+
+  /**
+   * Initializes the instrumentation by defining the modules to be patched.
+   */
+  public init(): InstrumentationModuleDefinition {
+    const module = new InstrumentationNodeModuleDefinition(
+      '@langchain/langgraph',
+      supportedVersions,
+      this._patch.bind(this),
+      exports => exports,
+      [
+        new InstrumentationNodeModuleFile(
+          /**
+           * In CJS, LangGraph packages re-export from dist/index.cjs files.
+           * Patching only the root module sometimes misses the real implementation or
+           * gets overwritten when that file is loaded. We add a file-level patch so that
+           * _patch runs again on the concrete implementation
+           */
+          '@langchain/langgraph/dist/index.cjs',
+          supportedVersions,
+          this._patch.bind(this),
+          exports => exports,
+        ),
+      ],
+    );
+    return module;
+  }
+
+  /**
+   * Core patch logic applying instrumentation to the LangGraph module.
+   */
+  private _patch(exports: PatchedModuleExports): PatchedModuleExports | void {
+    const client = getClient();
+    const defaultPii = Boolean(client?.getOptions().sendDefaultPii);
+
+    const config = this.getConfig();
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+    const recordInputs = config.recordInputs ?? defaultPii;
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+    const recordOutputs = config.recordOutputs ?? defaultPii;
+
+    const options: LangGraphOptions = {
+      recordInputs,
+      recordOutputs,
+    };
+
+    // Patch StateGraph.compile to instrument both compile() and invoke()
+    if (exports.StateGraph && typeof exports.StateGraph === 'function') {
+      const StateGraph = exports.StateGraph as {
+        prototype: Record<string, unknown>;
+      };
+
+      StateGraph.prototype.compile = instrumentStateGraphCompile(
+        StateGraph.prototype.compile as (...args: unknown[]) => CompiledGraph,
+        options,
+      );
+    }
+
+    return exports;
+  }
+}
diff --git a/yarn.lock b/yarn.lock
index 99e434f5efff..0b2a0f0f31dc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4931,6 +4931,33 @@
     zod "^3.25.32"
     zod-to-json-schema "^3.22.3"
 
+"@langchain/langgraph-checkpoint@~0.0.17":
+  version "0.0.18"
+  resolved "https://registry.npmjs.org/@langchain/langgraph-checkpoint/-/langgraph-checkpoint-0.0.18.tgz#2f7a9cdeda948ccc8d312ba9463810709d71d0b8"
+  integrity sha512-IS7zJj36VgY+4pf8ZjsVuUWef7oTwt1y9ylvwu0aLuOn1d0fg05Om9DLm3v2GZ2Df6bhLV1kfWAM0IAl9O5rQQ==
+  dependencies:
+    uuid "^10.0.0"
+
+"@langchain/langgraph-sdk@~0.0.32":
+  version "0.0.112"
+  resolved "https://registry.npmjs.org/@langchain/langgraph-sdk/-/langgraph-sdk-0.0.112.tgz#3186919b60e3381aa8aa32ea9b9c39df1f02a9fd"
+  integrity sha512-/9W5HSWCqYgwma6EoOspL4BGYxGxeJP6lIquPSF4FA0JlKopaUv58ucZC3vAgdJyCgg6sorCIV/qg7SGpEcCLw==
+  dependencies:
+    "@types/json-schema" "^7.0.15"
+    p-queue "^6.6.2"
+    p-retry "4"
+    uuid "^9.0.0"
+
+"@langchain/langgraph@^0.2.32":
+  version "0.2.74"
+  resolved "https://registry.npmjs.org/@langchain/langgraph/-/langgraph-0.2.74.tgz#37367a1e8bafda3548037a91449a69a84f285def"
+  integrity sha512-oHpEi5sTZTPaeZX1UnzfM2OAJ21QGQrwReTV6+QnX7h8nDCBzhtipAw1cK616S+X8zpcVOjgOtJuaJhXa4mN8w==
+  dependencies:
+    "@langchain/langgraph-checkpoint" "~0.0.17"
+    "@langchain/langgraph-sdk" "~0.0.32"
+    uuid "^10.0.0"
+    zod "^3.23.8"
+
 "@leichtgewicht/ip-codec@^2.0.1":
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b"

From 5a5e091365ea2a71fe8249288cf7fa8f25bcfd7e Mon Sep 17 00:00:00 2001
From: Sigrid <32902192+s1gr1d@users.noreply.github.com>
Date: Mon, 17 Nov 2025 14:12:44 +0100
Subject: [PATCH 075/186] ref(browser): Move trace lifecycle listeners to class
 function (#18231)

This PR was factored out of another PR to make reviewing easier. The
other PR: https://github.com/getsentry/sentry-javascript/pull/18189

Moved the `spanStart` and `spanEnd` listeners into an extra function
(`_setupTraceLifecycleListeners`) to be able to only call it depending
on the lifecycle (used in another PR).

Part of https://github.com/getsentry/sentry-javascript/issues/17279
---
 packages/browser/src/profiling/UIProfiler.ts | 138 +++++++++----------
 1 file changed, 68 insertions(+), 70 deletions(-)

diff --git a/packages/browser/src/profiling/UIProfiler.ts b/packages/browser/src/profiling/UIProfiler.ts
index fb7cd022ac7f..731684996d62 100644
--- a/packages/browser/src/profiling/UIProfiler.ts
+++ b/packages/browser/src/profiling/UIProfiler.ts
@@ -62,76 +62,7 @@ export class UIProfiler {
     this._client = client;
     this._sessionSampled = sessionSampled;
 
-    client.on('spanStart', span => {
-      if (!this._sessionSampled) {
-        DEBUG_BUILD && debug.log('[Profiling] Session not sampled because of negative sampling decision.');
-        return;
-      }
-      if (span !== getRootSpan(span)) {
-        return;
-      }
-      // Only count sampled root spans
-      if (!span.isRecording()) {
-        DEBUG_BUILD && debug.log('[Profiling] Discarding profile because root span was not sampled.');
-        return;
-      }
-
-      // Matching root spans with profiles
-      getGlobalScope().setContext('profile', {
-        profiler_id: this._profilerId,
-      });
-
-      const spanId = span.spanContext().spanId;
-      if (!spanId) {
-        return;
-      }
-      if (this._activeRootSpanIds.has(spanId)) {
-        return;
-      }
-
-      this._activeRootSpanIds.add(spanId);
-      const rootSpanCount = this._activeRootSpanIds.size;
-
-      const timeout = setTimeout(() => {
-        this._onRootSpanTimeout(spanId);
-      }, MAX_ROOT_SPAN_PROFILE_MS);
-      this._rootSpanTimeouts.set(spanId, timeout);
-
-      if (rootSpanCount === 1) {
-        DEBUG_BUILD &&
-          debug.log(
-            `[Profiling] Root span with ID ${spanId} started. Will continue profiling for as long as there are active root spans (currently: ${rootSpanCount}).`,
-          );
-
-        this.start();
-      }
-    });
-
-    client.on('spanEnd', span => {
-      if (!this._sessionSampled) {
-        return;
-      }
-
-      const spanId = span.spanContext().spanId;
-      if (!spanId || !this._activeRootSpanIds.has(spanId)) {
-        return;
-      }
-
-      this._activeRootSpanIds.delete(spanId);
-      const rootSpanCount = this._activeRootSpanIds.size;
-
-      DEBUG_BUILD &&
-        debug.log(
-          `[Profiling] Root span with ID ${spanId} ended. Will continue profiling for as long as there are active root spans (currently: ${rootSpanCount}).`,
-        );
-      if (rootSpanCount === 0) {
-        this._collectCurrentChunk().catch(e => {
-          DEBUG_BUILD && debug.error('[Profiling] Failed to collect current profile chunk on `spanEnd`:', e);
-        });
-
-        this.stop();
-      }
-    });
+    this._setupTraceLifecycleListeners(client);
   }
 
   /**
@@ -170,6 +101,9 @@ export class UIProfiler {
 
     DEBUG_BUILD && debug.log('[Profiling] Started profiling with profile ID:', this._profilerId);
 
+    // Expose profiler_id to match root spans with profiles
+    getGlobalScope().setContext('profile', { profiler_id: this._profilerId });
+
     this._startProfilerInstance();
 
     if (!this._profiler) {
@@ -203,6 +137,63 @@ export class UIProfiler {
     });
   }
 
+  /** Trace-mode: attach spanStart/spanEnd listeners. */
+  private _setupTraceLifecycleListeners(client: Client): void {
+    client.on('spanStart', span => {
+      if (!this._sessionSampled) {
+        DEBUG_BUILD && debug.log('[Profiling] Session not sampled because of negative sampling decision.');
+        return;
+      }
+      if (span !== getRootSpan(span)) {
+        return; // only care about root spans
+      }
+      // Only count sampled root spans
+      if (!span.isRecording()) {
+        DEBUG_BUILD && debug.log('[Profiling] Discarding profile because root span was not sampled.');
+        return;
+      }
+
+      const spanId = span.spanContext().spanId;
+      if (!spanId || this._activeRootSpanIds.has(spanId)) {
+        return;
+      }
+
+      this._registerTraceRootSpan(spanId);
+
+      const rootSpanCount = this._activeRootSpanIds.size;
+      if (rootSpanCount === 1) {
+        DEBUG_BUILD &&
+          debug.log(
+            `[Profiling] Root span ${spanId} started. Profiling active while there are active root spans (count=${rootSpanCount}).`,
+          );
+        this.start();
+      }
+    });
+
+    client.on('spanEnd', span => {
+      if (!this._sessionSampled) {
+        return;
+      }
+      const spanId = span.spanContext().spanId;
+      if (!spanId || !this._activeRootSpanIds.has(spanId)) {
+        return;
+      }
+      this._activeRootSpanIds.delete(spanId);
+      const rootSpanCount = this._activeRootSpanIds.size;
+
+      DEBUG_BUILD &&
+        debug.log(
+          `[Profiling] Root span with ID ${spanId} ended. Will continue profiling for as long as there are active root spans (currently: ${rootSpanCount}).`,
+        );
+      if (rootSpanCount === 0) {
+        this._collectCurrentChunk().catch(e => {
+          DEBUG_BUILD && debug.error('[Profiling] Failed to collect current profile chunk on last `spanEnd`:', e);
+        });
+        this.stop();
+      }
+    });
+  }
+
   /**
    * Resets profiling information from scope and resets running state
    */
@@ -219,6 +210,13 @@ export class UIProfiler {
     this._rootSpanTimeouts.clear();
   }
 
+  /** Register root span and schedule safeguard timeout (trace mode). */
+  private _registerTraceRootSpan(spanId: string): void {
+    this._activeRootSpanIds.add(spanId);
+    const timeout = setTimeout(() => this._onRootSpanTimeout(spanId), MAX_ROOT_SPAN_PROFILE_MS);
+    this._rootSpanTimeouts.set(spanId, timeout);
+  }
+
   /**
    * Start a profiler instance if needed.
    */

From fb67650bf316cfe723f4ab7003e06a28fb1b07f9 Mon Sep 17 00:00:00 2001
From: Sigrid <32902192+s1gr1d@users.noreply.github.com>
Date: Mon, 17 Nov 2025 14:47:13 +0100
Subject: [PATCH 076/186] fix(core): Check `fetch` support with data URL
 (#18225)

As Deno requires a valid URL when calling `new Request`, `example.com`
was used but this caused problems.

This PR changes it to a data URL as it does not rely on external
dependencies and is a valid URL in Deno.

Fixes: https://github.com/getsentry/sentry-javascript/issues/18218

Previous PR for that:
https://github.com/getsentry/sentry-javascript/pull/5630
---
 packages/core/src/utils/supports.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/core/src/utils/supports.ts b/packages/core/src/utils/supports.ts
index 5c7f173c3d6e..7ac3b4789765 100644
--- a/packages/core/src/utils/supports.ts
+++ b/packages/core/src/utils/supports.ts
@@ -80,7 +80,8 @@ function _isFetchSupported(): boolean {
 
   try {
     new Headers();
-    new Request('http://www.example.com');
+    // Deno requires a valid URL so '' cannot be used as an argument
+    new Request('data:,');
     new Response();
     return true;
   } catch {

From 4ad4d926012238ca4e06e8d01d59ae21f8fe7266 Mon Sep 17 00:00:00 2001
From: Robin <robin.kehl@singular-it.de>
Date: Mon, 17 Nov 2025 18:00:09 +0100
Subject: [PATCH 077/186] chore: move tip about prioritizing issues (#18071)

Moves the prioritization hint to a dropdown to avoid users accidentally removing it

---------

Co-authored-by: Lukas Stracke <lukas.stracke@sentry.io>
---
 .github/ISSUE_TEMPLATE/bug.yml     | 15 ++++++++-------
 .github/ISSUE_TEMPLATE/feature.yml | 16 ++++++++--------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
index 8acac6fd2709..c09984de5c3b 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -136,13 +136,14 @@ body:
     id: additional
     attributes:
       label: Additional Context
-      description:
-        Add any other context here. Please keep the pre-filled text, which helps us manage issue prioritization.
-      value: |-
-        <sub>Tip: React with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it.</sub>
+      description: Add any other context here.
     validations:
       required: false
-  - type: markdown
+  - type: dropdown
     attributes:
-      value: |-
-        ## Thanks 🙏
+      label: 'Priority'
+      description: Please keep the pre-filled option, which helps us manage issue prioritization.
+      default: 0
+      options:
+        - <sub>React with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1`
+          or `me too`, to help us triage it.</sub>
diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/feature.yml
index 2859c10d2dc0..3809730ade4c 100644
--- a/.github/ISSUE_TEMPLATE/feature.yml
+++ b/.github/ISSUE_TEMPLATE/feature.yml
@@ -27,14 +27,14 @@ body:
     id: additional
     attributes:
       label: Additional Context
-      description:
-        Add any other context here. Please keep the pre-filled text, which helps us manage feature prioritization.
-      value: |-
-        <sub>Tip: React with 👍 to help prioritize this improvement. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it.</sub>
+      description: Add any other context here.
     validations:
       required: false
-  - type: markdown
+  - type: dropdown
     attributes:
-      value: |-
-        ## Thanks 🙏
-        Check our [triage docs](https://open.sentry.io/triage/) for what to expect next.
+      label: 'Priority'
+      description: Please keep the pre-filled option, which helps us manage issue prioritization.
+      default: 0
+      options:
+        - <sub>React with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1`
+          or `me too`, to help us triage it.</sub>

From 1679d802742bd9ec5206f9663b37cf5c979170e8 Mon Sep 17 00:00:00 2001
From: Abdelrahman Awad <me@awad.dev>
Date: Mon, 17 Nov 2025 20:04:15 +0200
Subject: [PATCH 078/186] fix(nextjs): Drop meta trace tags if rendered page is
 ISR (#18192)

**Summary**

ISR pages will have a `sentry-trace` and `baggage` meta tags rendered on
them following the initial render or after the first invalidation
causing a cached trace id to be present until the next invalidation.

This happens in Next.js 15/16 and both on Turbopack and Webpack.


**What I tried and didn't work**

I Found no way to conditionally set/unset/change the values set by the
`clientTraceMetadata` option, I found nothing useful on unit async
storages, nor re-setting the propagation context works. The
`clientTraceMetadata` gets called way earlier at the `app-render.tsx`
level, which would call our `SentryPropagator.inject()` then. We cannot
intercept it either because it runs before the page wrapper is called.

The main issue is _timing_:

- Suppressing the tracing wouldn't work either because it is too late.
Ideally we want a way to tell Next to remove those attributes at
runtime, or render them conditionally.
- I also tried setting everything that has to do with `sentry-trace` or
baggage to dummy values as some sort of "marker" for the SDK on the
browser side to drop them, but again it is too late since
`clientTraceMetadata` is picked up too early.


**Implementation**

so I figured a workaround, I decided to do it on the client side by:

- Marking ISR page routes via the route manifest we already have.
- In `Sentry.init` call we remove the tags before the browser
integration has had a chance to grab the meta tags.

Not the cleanest way, but I verified the issue by writing tests for it
and observing page loads across multiple page visits having the same
trace id. The meta deletion forces them to have new id for every visit
which is what we want.
---
 .../nextjs-15/app/isr-test/[product]/page.tsx |  17 +
 .../nextjs-15/app/isr-test/static/page.tsx    |  15 +
 .../app/non-isr-test/[item]/page.tsx          |  11 +
 .../nextjs-15/instrumentation-client.ts       |   3 +-
 .../nextjs-15/tests/isr-routes.test.ts        |  94 +++++
 .../nextjs-16/app/isr-test/[product]/page.tsx |  17 +
 .../nextjs-16/app/isr-test/static/page.tsx    |  15 +
 .../app/non-isr-test/[item]/page.tsx          |  11 +
 .../nextjs-16/tests/isr-routes.test.ts        |  94 +++++
 packages/nextjs/src/client/index.ts           |   7 +
 .../src/client/routing/isrRoutingTracing.ts   |  61 +++
 .../src/client/routing/parameterization.ts    |   3 +-
 .../config/manifest/createRouteManifest.ts    |  42 +-
 packages/nextjs/src/config/manifest/types.ts  |   5 +
 .../test/client/isrRoutingTracing.test.ts     | 398 ++++++++++++++++++
 .../suites/base-path/base-path.test.ts        |   1 +
 .../catchall-at-root/catchall-at-root.test.ts |   1 +
 .../manifest/suites/catchall/catchall.test.ts |   1 +
 .../manifest/suites/dynamic/dynamic.test.ts   |   1 +
 .../file-extensions/file-extensions.test.ts   |   1 +
 .../app/articles/[category]/[slug]/page.tsx   |   2 +
 .../manifest/suites/isr/app/blog/page.tsx     |   2 +
 .../suites/isr/app/docs/[[...path]]/page.tsx  |   2 +
 .../isr/app/guides/[...segments]/page.tsx     |   2 +
 .../config/manifest/suites/isr/app/page.tsx   |   2 +
 .../suites/isr/app/posts/[slug]/page.tsx      |   2 +
 .../suites/isr/app/products/[id]/page.tsx     |   2 +
 .../manifest/suites/isr/app/regular/page.tsx  |   2 +
 .../isr/app/users/[id]/profile/page.tsx       |   2 +
 .../config/manifest/suites/isr/isr.test.ts    | 345 +++++++++++++++
 .../suites/route-groups/route-groups.test.ts  |   2 +
 .../manifest/suites/static/static.test.ts     |   1 +
 32 files changed, 1154 insertions(+), 10 deletions(-)
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-15/app/isr-test/[product]/page.tsx
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-15/app/isr-test/static/page.tsx
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-15/app/non-isr-test/[item]/page.tsx
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-15/tests/isr-routes.test.ts
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16/app/isr-test/[product]/page.tsx
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16/app/isr-test/static/page.tsx
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16/app/non-isr-test/[item]/page.tsx
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16/tests/isr-routes.test.ts
 create mode 100644 packages/nextjs/src/client/routing/isrRoutingTracing.ts
 create mode 100644 packages/nextjs/test/client/isrRoutingTracing.test.ts
 create mode 100644 packages/nextjs/test/config/manifest/suites/isr/app/articles/[category]/[slug]/page.tsx
 create mode 100644 packages/nextjs/test/config/manifest/suites/isr/app/blog/page.tsx
 create mode 100644 packages/nextjs/test/config/manifest/suites/isr/app/docs/[[...path]]/page.tsx
 create mode 100644 packages/nextjs/test/config/manifest/suites/isr/app/guides/[...segments]/page.tsx
 create mode 100644 packages/nextjs/test/config/manifest/suites/isr/app/page.tsx
 create mode 100644 packages/nextjs/test/config/manifest/suites/isr/app/posts/[slug]/page.tsx
 create mode 100644 packages/nextjs/test/config/manifest/suites/isr/app/products/[id]/page.tsx
 create mode 100644 packages/nextjs/test/config/manifest/suites/isr/app/regular/page.tsx
 create mode 100644 packages/nextjs/test/config/manifest/suites/isr/app/users/[id]/profile/page.tsx
 create mode 100644 packages/nextjs/test/config/manifest/suites/isr/isr.test.ts

diff --git a/dev-packages/e2e-tests/test-applications/nextjs-15/app/isr-test/[product]/page.tsx b/dev-packages/e2e-tests/test-applications/nextjs-15/app/isr-test/[product]/page.tsx
new file mode 100644
index 000000000000..cd1e085e2763
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-15/app/isr-test/[product]/page.tsx
@@ -0,0 +1,17 @@
+export const revalidate = 60; // ISR: revalidate every 60 seconds
+export const dynamicParams = true; // Allow dynamic params beyond generateStaticParams
+
+export async function generateStaticParams(): Promise<Array<{ product: string }>> {
+  return [{ product: 'laptop' }, { product: 'phone' }, { product: 'tablet' }];
+}
+
+export default async function ISRProductPage({ params }: { params: Promise<{ product: string }> }) {
+  const { product } = await params;
+
+  return (
+    <div>
+      <h1>ISR Product: {product}</h1>
+      <div id="isr-product-id">{product}</div>
+    </div>
+  );
+}
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-15/app/isr-test/static/page.tsx b/dev-packages/e2e-tests/test-applications/nextjs-15/app/isr-test/static/page.tsx
new file mode 100644
index 000000000000..f49605bd9da4
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-15/app/isr-test/static/page.tsx
@@ -0,0 +1,15 @@
+export const revalidate = 60; // ISR: revalidate every 60 seconds
+export const dynamicParams = true;
+
+export async function generateStaticParams(): Promise<never[]> {
+  return [];
+}
+
+export default function ISRStaticPage() {
+  return (
+    <div>
+      <h1>ISR Static Page</h1>
+      <div id="isr-static-marker">static-isr</div>
+    </div>
+  );
+}
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-15/app/non-isr-test/[item]/page.tsx b/dev-packages/e2e-tests/test-applications/nextjs-15/app/non-isr-test/[item]/page.tsx
new file mode 100644
index 000000000000..e0bafdb24181
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-15/app/non-isr-test/[item]/page.tsx
@@ -0,0 +1,11 @@
+// No generateStaticParams - this is NOT an ISR page
+export default async function NonISRPage({ params }: { params: Promise<{ item: string }> }) {
+  const { item } = await params;
+
+  return (
+    <div>
+      <h1>Non-ISR Dynamic Page: {item}</h1>
+      <div id="non-isr-item-id">{item}</div>
+    </div>
+  );
+}
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-15/instrumentation-client.ts b/dev-packages/e2e-tests/test-applications/nextjs-15/instrumentation-client.ts
index 4870c64e7959..0737d2043169 100644
--- a/dev-packages/e2e-tests/test-applications/nextjs-15/instrumentation-client.ts
+++ b/dev-packages/e2e-tests/test-applications/nextjs-15/instrumentation-client.ts
@@ -2,10 +2,11 @@ import * as Sentry from '@sentry/nextjs';
 
 Sentry.init({
   environment: 'qa', // dynamic sampling bias to keep transactions
-  dsn: process.env.NEXT_PUBLIC_E2E_TEST_DSN,
+  dsn: 'https://username@domain/123',
   tunnel: `http://localhost:3031/`, // proxy server
   tracesSampleRate: 1.0,
   sendDefaultPii: true,
+  debug: true,
 });
 
 export const onRouterTransitionStart = Sentry.captureRouterTransitionStart;
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-15/tests/isr-routes.test.ts b/dev-packages/e2e-tests/test-applications/nextjs-15/tests/isr-routes.test.ts
new file mode 100644
index 000000000000..215f6cbb0bfc
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-15/tests/isr-routes.test.ts
@@ -0,0 +1,94 @@
+import { expect, test } from '@playwright/test';
+import { waitForTransaction } from '@sentry-internal/test-utils';
+
+test('should remove sentry-trace and baggage meta tags on ISR dynamic route page load', async ({ page }) => {
+  // Navigate to ISR page
+  await page.goto('/isr-test/laptop');
+
+  // Wait for page to be fully loaded
+  await expect(page.locator('#isr-product-id')).toHaveText('laptop');
+
+  // Check that sentry-trace and baggage meta tags are removed for ISR pages
+  await expect(page.locator('meta[name="sentry-trace"]')).toHaveCount(0);
+  await expect(page.locator('meta[name="baggage"]')).toHaveCount(0);
+});
+
+test('should remove sentry-trace and baggage meta tags on ISR static route', async ({ page }) => {
+  // Navigate to ISR static page
+  await page.goto('/isr-test/static');
+
+  // Wait for page to be fully loaded
+  await expect(page.locator('#isr-static-marker')).toHaveText('static-isr');
+
+  // Check that sentry-trace and baggage meta tags are removed for ISR pages
+  await expect(page.locator('meta[name="sentry-trace"]')).toHaveCount(0);
+  await expect(page.locator('meta[name="baggage"]')).toHaveCount(0);
+});
+
+test('should remove meta tags for different ISR dynamic route values', async ({ page }) => {
+  // Test with 'phone' (one of the pre-generated static params)
+  await page.goto('/isr-test/phone');
+  await expect(page.locator('#isr-product-id')).toHaveText('phone');
+
+  await expect(page.locator('meta[name="sentry-trace"]')).toHaveCount(0);
+  await expect(page.locator('meta[name="baggage"]')).toHaveCount(0);
+
+  // Test with 'tablet'
+  await page.goto('/isr-test/tablet');
+  await expect(page.locator('#isr-product-id')).toHaveText('tablet');
+
+  await expect(page.locator('meta[name="sentry-trace"]')).toHaveCount(0);
+  await expect(page.locator('meta[name="baggage"]')).toHaveCount(0);
+});
+
+test('should create unique transactions for ISR pages on each visit', async ({ page }) => {
+  const traceIds: string[] = [];
+
+  // Load the same ISR page 5 times to ensure cached HTML meta tags are consistently removed
+  for (let i = 0; i < 5; i++) {
+    const transactionPromise = waitForTransaction('nextjs-15', async transactionEvent => {
+      return !!(
+        transactionEvent.transaction === '/isr-test/:product' && transactionEvent.contexts?.trace?.op === 'pageload'
+      );
+    });
+
+    if (i === 0) {
+      await page.goto('/isr-test/laptop');
+    } else {
+      await page.reload();
+    }
+
+    const transaction = await transactionPromise;
+    const traceId = transaction.contexts?.trace?.trace_id;
+
+    expect(traceId).toBeDefined();
+    expect(traceId).toMatch(/[a-f0-9]{32}/);
+    traceIds.push(traceId!);
+  }
+
+  // Verify all 5 page loads have unique trace IDs (no reuse of cached/stale meta tags)
+  const uniqueTraceIds = new Set(traceIds);
+  expect(uniqueTraceIds.size).toBe(5);
+});
+
+test('ISR route should be identified correctly in the route manifest', async ({ page }) => {
+  const transactionPromise = waitForTransaction('nextjs-15', async transactionEvent => {
+    return transactionEvent.transaction === '/isr-test/:product' && transactionEvent.contexts?.trace?.op === 'pageload';
+  });
+
+  await page.goto('/isr-test/laptop');
+  const transaction = await transactionPromise;
+
+  // Verify the transaction is properly parameterized
+  expect(transaction).toMatchObject({
+    transaction: '/isr-test/:product',
+    transaction_info: { source: 'route' },
+    contexts: {
+      trace: {
+        data: {
+          'sentry.source': 'route',
+        },
+      },
+    },
+  });
+});
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16/app/isr-test/[product]/page.tsx b/dev-packages/e2e-tests/test-applications/nextjs-16/app/isr-test/[product]/page.tsx
new file mode 100644
index 000000000000..cd1e085e2763
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16/app/isr-test/[product]/page.tsx
@@ -0,0 +1,17 @@
+export const revalidate = 60; // ISR: revalidate every 60 seconds
+export const dynamicParams = true; // Allow dynamic params beyond generateStaticParams
+
+export async function generateStaticParams(): Promise<Array<{ product: string }>> {
+  return [{ product: 'laptop' }, { product: 'phone' }, { product: 'tablet' }];
+}
+
+export default async function ISRProductPage({ params }: { params: Promise<{ product: string }> }) {
+  const { product } = await params;
+
+  return (
+    <div>
+      <h1>ISR Product: {product}</h1>
+      <div id="isr-product-id">{product}</div>
+    </div>
+  );
+}
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16/app/isr-test/static/page.tsx b/dev-packages/e2e-tests/test-applications/nextjs-16/app/isr-test/static/page.tsx
new file mode 100644
index 000000000000..f49605bd9da4
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16/app/isr-test/static/page.tsx
@@ -0,0 +1,15 @@
+export const revalidate = 60; // ISR: revalidate every 60 seconds
+export const dynamicParams = true;
+
+export async function generateStaticParams(): Promise<never[]> {
+  return [];
+}
+
+export default function ISRStaticPage() {
+  return (
+    <div>
+      <h1>ISR Static Page</h1>
+      <div id="isr-static-marker">static-isr</div>
+    </div>
+  );
+}
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16/app/non-isr-test/[item]/page.tsx b/dev-packages/e2e-tests/test-applications/nextjs-16/app/non-isr-test/[item]/page.tsx
new file mode 100644
index 000000000000..e0bafdb24181
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16/app/non-isr-test/[item]/page.tsx
@@ -0,0 +1,11 @@
+// No generateStaticParams - this is NOT an ISR page
+export default async function NonISRPage({ params }: { params: Promise<{ item: string }> }) {
+  const { item } = await params;
+
+  return (
+    <div>
+      <h1>Non-ISR Dynamic Page: {item}</h1>
+      <div id="non-isr-item-id">{item}</div>
+    </div>
+  );
+}
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16/tests/isr-routes.test.ts b/dev-packages/e2e-tests/test-applications/nextjs-16/tests/isr-routes.test.ts
new file mode 100644
index 000000000000..541cff9c064c
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16/tests/isr-routes.test.ts
@@ -0,0 +1,94 @@
+import { expect, test } from '@playwright/test';
+import { waitForTransaction } from '@sentry-internal/test-utils';
+
+test('should remove sentry-trace and baggage meta tags on ISR dynamic route page load', async ({ page }) => {
+  // Navigate to ISR page
+  await page.goto('/isr-test/laptop');
+
+  // Wait for page to be fully loaded
+  await expect(page.locator('#isr-product-id')).toHaveText('laptop');
+
+  // Check that sentry-trace and baggage meta tags are removed for ISR pages
+  await expect(page.locator('meta[name="sentry-trace"]')).toHaveCount(0);
+  await expect(page.locator('meta[name="baggage"]')).toHaveCount(0);
+});
+
+test('should remove sentry-trace and baggage meta tags on ISR static route', async ({ page }) => {
+  // Navigate to ISR static page
+  await page.goto('/isr-test/static');
+
+  // Wait for page to be fully loaded
+  await expect(page.locator('#isr-static-marker')).toHaveText('static-isr');
+
+  // Check that sentry-trace and baggage meta tags are removed for ISR pages
+  await expect(page.locator('meta[name="sentry-trace"]')).toHaveCount(0);
+  await expect(page.locator('meta[name="baggage"]')).toHaveCount(0);
+});
+
+test('should remove meta tags for different ISR dynamic route values', async ({ page }) => {
+  // Test with 'phone' (one of the pre-generated static params)
+  await page.goto('/isr-test/phone');
+  await expect(page.locator('#isr-product-id')).toHaveText('phone');
+
+  await expect(page.locator('meta[name="sentry-trace"]')).toHaveCount(0);
+  await expect(page.locator('meta[name="baggage"]')).toHaveCount(0);
+
+  // Test with 'tablet'
+  await page.goto('/isr-test/tablet');
+  await expect(page.locator('#isr-product-id')).toHaveText('tablet');
+
+  await expect(page.locator('meta[name="sentry-trace"]')).toHaveCount(0);
+  await expect(page.locator('meta[name="baggage"]')).toHaveCount(0);
+});
+
+test('should create unique transactions for ISR pages on each visit', async ({ page }) => {
+  const traceIds: string[] = [];
+
+  // Load the same ISR page 5 times to ensure cached HTML meta tags are consistently removed
+  for (let i = 0; i < 5; i++) {
+    const transactionPromise = waitForTransaction('nextjs-16', async transactionEvent => {
+      return !!(
+        transactionEvent.transaction === '/isr-test/:product' && transactionEvent.contexts?.trace?.op === 'pageload'
+      );
+    });
+
+    if (i === 0) {
+      await page.goto('/isr-test/laptop');
+    } else {
+      await page.reload();
+    }
+
+    const transaction = await transactionPromise;
+    const traceId = transaction.contexts?.trace?.trace_id;
+
+    expect(traceId).toBeDefined();
+    expect(traceId).toMatch(/[a-f0-9]{32}/);
+    traceIds.push(traceId!);
+  }
+
+  // Verify all 5 page loads have unique trace IDs (no reuse of cached/stale meta tags)
+  const uniqueTraceIds = new Set(traceIds);
+  expect(uniqueTraceIds.size).toBe(5);
+});
+
+test('ISR route should be identified correctly in the route manifest', async ({ page }) => {
+  const transactionPromise = waitForTransaction('nextjs-16', async transactionEvent => {
+    return transactionEvent.transaction === '/isr-test/:product' && transactionEvent.contexts?.trace?.op === 'pageload';
+  });
+
+  await page.goto('/isr-test/laptop');
+  const transaction = await transactionPromise;
+
+  // Verify the transaction is properly parameterized
+  expect(transaction).toMatchObject({
+    transaction: '/isr-test/:product',
+    transaction_info: { source: 'route' },
+    contexts: {
+      trace: {
+        data: {
+          'sentry.source': 'route',
+        },
+      },
+    },
+  });
+});
diff --git a/packages/nextjs/src/client/index.ts b/packages/nextjs/src/client/index.ts
index 4d09e7e2d170..a171652b7221 100644
--- a/packages/nextjs/src/client/index.ts
+++ b/packages/nextjs/src/client/index.ts
@@ -8,6 +8,7 @@ import { isRedirectNavigationError } from '../common/nextNavigationErrorUtils';
 import { browserTracingIntegration } from './browserTracingIntegration';
 import { nextjsClientStackFrameNormalizationIntegration } from './clientNormalizationIntegration';
 import { INCOMPLETE_APP_ROUTER_INSTRUMENTATION_TRANSACTION_NAME } from './routing/appRouterRoutingInstrumentation';
+import { removeIsrSsgTraceMetaTags } from './routing/isrRoutingTracing';
 import { applyTunnelRouteOption } from './tunnelRoute';
 
 export * from '@sentry/react';
@@ -41,6 +42,12 @@ export function init(options: BrowserOptions): Client | undefined {
   }
   clientIsInitialized = true;
 
+  // Remove cached trace meta tags for ISR/SSG pages before initializing
+  // This prevents the browser tracing integration from using stale trace IDs
+  if (typeof __SENTRY_TRACING__ === 'undefined' || __SENTRY_TRACING__) {
+    removeIsrSsgTraceMetaTags();
+  }
+
   const opts = {
     environment: getVercelEnv(true) || process.env.NODE_ENV,
     defaultIntegrations: getDefaultIntegrations(options),
diff --git a/packages/nextjs/src/client/routing/isrRoutingTracing.ts b/packages/nextjs/src/client/routing/isrRoutingTracing.ts
new file mode 100644
index 000000000000..567d30aa9852
--- /dev/null
+++ b/packages/nextjs/src/client/routing/isrRoutingTracing.ts
@@ -0,0 +1,61 @@
+import { WINDOW } from '@sentry/react';
+import { getManifest, maybeParameterizeRoute } from './parameterization';
+
+/**
+ * Cache for ISR/SSG route checks. Exported for testing purposes.
+ * @internal
+ */
+export const IS_ISR_SSG_ROUTE_CACHE = new Map<string, boolean>();
+
+/**
+ * Check if the current page is an ISR/SSG route by checking the route manifest.
+ * @internal Exported for testing purposes.
+ */
+export function isIsrSsgRoute(pathname: string): boolean {
+  // Early parameterization to get the cache key
+  const parameterizedPath = maybeParameterizeRoute(pathname);
+  const pathToCheck = parameterizedPath || pathname;
+
+  // Check cache using the parameterized path as the key
+  if (IS_ISR_SSG_ROUTE_CACHE.has(pathToCheck)) {
+    return IS_ISR_SSG_ROUTE_CACHE.get(pathToCheck) as boolean;
+  }
+
+  // Cache miss get the manifest
+  const manifest = getManifest();
+  if (!manifest?.isrRoutes || !Array.isArray(manifest.isrRoutes) || manifest.isrRoutes.length === 0) {
+    IS_ISR_SSG_ROUTE_CACHE.set(pathToCheck, false);
+    return false;
+  }
+
+  const isIsrSsgRoute = manifest.isrRoutes.includes(pathToCheck);
+  IS_ISR_SSG_ROUTE_CACHE.set(pathToCheck, isIsrSsgRoute);
+
+  return isIsrSsgRoute;
+}
+
+/**
+ * Remove sentry-trace and baggage meta tags from the DOM if this is an ISR/SSG page.
+ * This prevents the browser tracing integration from using stale/cached trace IDs.
+ */
+export function removeIsrSsgTraceMetaTags(): void {
+  if (!WINDOW.document || !isIsrSsgRoute(WINDOW.location.pathname)) {
+    return;
+  }
+
+  // Helper function to remove a meta tag
+  function removeMetaTag(metaName: string): void {
+    try {
+      const meta = WINDOW.document.querySelector(`meta[name="${metaName}"]`);
+      if (meta) {
+        meta.remove();
+      }
+    } catch {
+      // ignore errors when removing the meta tag
+    }
+  }
+
+  // Remove the meta tags so browserTracingIntegration won't pick them up
+  removeMetaTag('sentry-trace');
+  removeMetaTag('baggage');
+}
diff --git a/packages/nextjs/src/client/routing/parameterization.ts b/packages/nextjs/src/client/routing/parameterization.ts
index d13097435f41..1bf6c22d5fe0 100644
--- a/packages/nextjs/src/client/routing/parameterization.ts
+++ b/packages/nextjs/src/client/routing/parameterization.ts
@@ -74,7 +74,7 @@ function getCompiledRegex(regexString: string): RegExp | null {
  * Get and cache the route manifest from the global object.
  * @returns The parsed route manifest or null if not available/invalid.
  */
-function getManifest(): RouteManifest | null {
+export function getManifest(): RouteManifest | null {
   if (
     !globalWithInjectedManifest?._sentryRouteManifest ||
     typeof globalWithInjectedManifest._sentryRouteManifest !== 'string'
@@ -96,6 +96,7 @@ function getManifest(): RouteManifest | null {
   let manifest: RouteManifest = {
     staticRoutes: [],
     dynamicRoutes: [],
+    isrRoutes: [],
   };
 
   // Shallow check if the manifest is actually what we expect it to be
diff --git a/packages/nextjs/src/config/manifest/createRouteManifest.ts b/packages/nextjs/src/config/manifest/createRouteManifest.ts
index 5e2a99f66285..d37285983d31 100644
--- a/packages/nextjs/src/config/manifest/createRouteManifest.ts
+++ b/packages/nextjs/src/config/manifest/createRouteManifest.ts
@@ -115,23 +115,42 @@ function hasOptionalPrefix(paramNames: string[]): boolean {
   return firstParam === 'locale' || firstParam === 'lang' || firstParam === 'language';
 }
 
-function scanAppDirectory(
-  dir: string,
-  basePath: string = '',
-  includeRouteGroups: boolean = false,
-): { dynamicRoutes: RouteInfo[]; staticRoutes: RouteInfo[] } {
+/**
+ * Check if a page file exports generateStaticParams (ISR/SSG indicator)
+ */
+function checkForGenerateStaticParams(pageFilePath: string): boolean {
+  try {
+    const content = fs.readFileSync(pageFilePath, 'utf8');
+    // check for generateStaticParams export
+    // the regex covers `export function generateStaticParams`, `export async function generateStaticParams`, `export const generateStaticParams`
+    return /export\s+(async\s+)?function\s+generateStaticParams|export\s+const\s+generateStaticParams/.test(content);
+  } catch {
+    return false;
+  }
+}
+
+function scanAppDirectory(dir: string, basePath: string = '', includeRouteGroups: boolean = false): RouteManifest {
   const dynamicRoutes: RouteInfo[] = [];
   const staticRoutes: RouteInfo[] = [];
+  const isrRoutes: string[] = [];
 
   try {
     const entries = fs.readdirSync(dir, { withFileTypes: true });
-    const pageFile = entries.some(entry => isPageFile(entry.name));
+    const pageFile = entries.find(entry => isPageFile(entry.name));
 
     if (pageFile) {
       // Conditionally normalize the path based on includeRouteGroups option
       const routePath = includeRouteGroups ? basePath || '/' : normalizeRoutePath(basePath || '/');
       const isDynamic = routePath.includes(':');
 
+      // Check if this page has generateStaticParams (ISR/SSG indicator)
+      const pageFilePath = path.join(dir, pageFile.name);
+      const hasGenerateStaticParams = checkForGenerateStaticParams(pageFilePath);
+
+      if (hasGenerateStaticParams) {
+        isrRoutes.push(routePath);
+      }
+
       if (isDynamic) {
         const { regex, paramNames, hasOptionalPrefix } = buildRegexForDynamicRoute(routePath);
         dynamicRoutes.push({
@@ -172,6 +191,7 @@ function scanAppDirectory(
 
         dynamicRoutes.push(...subRoutes.dynamicRoutes);
         staticRoutes.push(...subRoutes.staticRoutes);
+        isrRoutes.push(...subRoutes.isrRoutes);
       }
     }
   } catch (error) {
@@ -179,7 +199,7 @@ function scanAppDirectory(
     console.warn('Error building route manifest:', error);
   }
 
-  return { dynamicRoutes, staticRoutes };
+  return { dynamicRoutes, staticRoutes, isrRoutes };
 }
 
 /**
@@ -204,6 +224,7 @@ export function createRouteManifest(options?: CreateRouteManifestOptions): Route
 
   if (!targetDir) {
     return {
+      isrRoutes: [],
       dynamicRoutes: [],
       staticRoutes: [],
     };
@@ -214,11 +235,16 @@ export function createRouteManifest(options?: CreateRouteManifestOptions): Route
     return manifestCache;
   }
 
-  const { dynamicRoutes, staticRoutes } = scanAppDirectory(targetDir, options?.basePath, options?.includeRouteGroups);
+  const { dynamicRoutes, staticRoutes, isrRoutes } = scanAppDirectory(
+    targetDir,
+    options?.basePath,
+    options?.includeRouteGroups,
+  );
 
   const manifest: RouteManifest = {
     dynamicRoutes,
     staticRoutes,
+    isrRoutes,
   };
 
   // set cache
diff --git a/packages/nextjs/src/config/manifest/types.ts b/packages/nextjs/src/config/manifest/types.ts
index 0a0946be70f7..99fc42fb27d7 100644
--- a/packages/nextjs/src/config/manifest/types.ts
+++ b/packages/nextjs/src/config/manifest/types.ts
@@ -34,4 +34,9 @@ export type RouteManifest = {
    * List of all static routes
    */
   staticRoutes: RouteInfo[];
+
+  /**
+   * List of ISR/SSG routes (routes with generateStaticParams)
+   */
+  isrRoutes: string[];
 };
diff --git a/packages/nextjs/test/client/isrRoutingTracing.test.ts b/packages/nextjs/test/client/isrRoutingTracing.test.ts
new file mode 100644
index 000000000000..be553e086449
--- /dev/null
+++ b/packages/nextjs/test/client/isrRoutingTracing.test.ts
@@ -0,0 +1,398 @@
+import { WINDOW } from '@sentry/react';
+import { JSDOM } from 'jsdom';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import {
+  IS_ISR_SSG_ROUTE_CACHE,
+  isIsrSsgRoute,
+  removeIsrSsgTraceMetaTags,
+} from '../../src/client/routing/isrRoutingTracing';
+import type { RouteManifest } from '../../src/config/manifest/types';
+
+const globalWithInjectedValues = WINDOW as typeof WINDOW & {
+  _sentryRouteManifest?: string;
+};
+
+describe('isrRoutingTracing', () => {
+  let dom: JSDOM;
+
+  beforeEach(() => {
+    // Set up a fresh DOM environment for each test
+    dom = new JSDOM('<!DOCTYPE html><html><head></head><body></body></html>', {
+      url: 'https://example.com/',
+    });
+    Object.defineProperty(global, 'document', { value: dom.window.document, writable: true });
+    Object.defineProperty(global, 'location', { value: dom.window.location, writable: true });
+
+    // Clear the injected manifest
+    delete globalWithInjectedValues._sentryRouteManifest;
+  });
+
+  afterEach(() => {
+    // Clean up
+    vi.clearAllMocks();
+  });
+
+  describe('removeIsrSsgTraceMetaTags', () => {
+    const mockManifest: RouteManifest = {
+      staticRoutes: [{ path: '/' }, { path: '/blog' }],
+      dynamicRoutes: [
+        {
+          path: '/products/:id',
+          regex: '^/products/([^/]+?)(?:/)?$',
+          paramNames: ['id'],
+          hasOptionalPrefix: false,
+        },
+        {
+          path: '/posts/:slug',
+          regex: '^/posts/([^/]+?)(?:/)?$',
+          paramNames: ['slug'],
+          hasOptionalPrefix: false,
+        },
+      ],
+      isrRoutes: ['/', '/blog', '/products/:id', '/posts/:slug'],
+    };
+
+    it('should remove meta tags when on a static ISR route', () => {
+      // Set up DOM with meta tags
+      const sentryTraceMeta = dom.window.document.createElement('meta');
+      sentryTraceMeta.setAttribute('name', 'sentry-trace');
+      sentryTraceMeta.setAttribute('content', 'trace-id-12345');
+      dom.window.document.head.appendChild(sentryTraceMeta);
+
+      const baggageMeta = dom.window.document.createElement('meta');
+      baggageMeta.setAttribute('name', 'baggage');
+      baggageMeta.setAttribute('content', 'sentry-trace-id=12345');
+      dom.window.document.head.appendChild(baggageMeta);
+
+      // Set up route manifest (as stringified JSON, which is how it's injected in production)
+      globalWithInjectedValues._sentryRouteManifest = JSON.stringify(mockManifest);
+
+      // Set location to an ISR route
+      Object.defineProperty(global, 'location', {
+        value: { ...dom.window.location, pathname: '/blog' },
+        writable: true,
+      });
+
+      // Call the function
+      removeIsrSsgTraceMetaTags();
+
+      // Verify meta tags were removed
+      expect(dom.window.document.querySelector('meta[name="sentry-trace"]')).toBeNull();
+      expect(dom.window.document.querySelector('meta[name="baggage"]')).toBeNull();
+    });
+
+    it('should remove meta tags when on a dynamic ISR route', () => {
+      // Set up DOM with meta tags
+      const sentryTraceMeta = dom.window.document.createElement('meta');
+      sentryTraceMeta.setAttribute('name', 'sentry-trace');
+      sentryTraceMeta.setAttribute('content', 'trace-id-12345');
+      dom.window.document.head.appendChild(sentryTraceMeta);
+
+      const baggageMeta = dom.window.document.createElement('meta');
+      baggageMeta.setAttribute('name', 'baggage');
+      baggageMeta.setAttribute('content', 'sentry-trace-id=12345');
+      dom.window.document.head.appendChild(baggageMeta);
+
+      // Set up route manifest
+      globalWithInjectedValues._sentryRouteManifest = JSON.stringify(mockManifest);
+
+      // Set location to a dynamic ISR route
+      Object.defineProperty(global, 'location', {
+        value: { ...dom.window.location, pathname: '/products/123' },
+        writable: true,
+      });
+
+      // Call the function
+      removeIsrSsgTraceMetaTags();
+
+      // Verify meta tags were removed
+      expect(dom.window.document.querySelector('meta[name="sentry-trace"]')).toBeNull();
+      expect(dom.window.document.querySelector('meta[name="baggage"]')).toBeNull();
+    });
+
+    it('should NOT remove meta tags when on a non-ISR route', () => {
+      // Set up DOM with meta tags
+      const sentryTraceMeta = dom.window.document.createElement('meta');
+      sentryTraceMeta.setAttribute('name', 'sentry-trace');
+      sentryTraceMeta.setAttribute('content', 'trace-id-12345');
+      dom.window.document.head.appendChild(sentryTraceMeta);
+
+      const baggageMeta = dom.window.document.createElement('meta');
+      baggageMeta.setAttribute('name', 'baggage');
+      baggageMeta.setAttribute('content', 'sentry-trace-id=12345');
+      dom.window.document.head.appendChild(baggageMeta);
+
+      // Set up route manifest
+      globalWithInjectedValues._sentryRouteManifest = JSON.stringify(mockManifest);
+
+      // Set location to a non-ISR route
+      Object.defineProperty(global, 'location', {
+        value: { ...dom.window.location, pathname: '/regular-page' },
+        writable: true,
+      });
+
+      // Call the function
+      removeIsrSsgTraceMetaTags();
+
+      // Verify meta tags were NOT removed
+      expect(dom.window.document.querySelector('meta[name="sentry-trace"]')).not.toBeNull();
+      expect(dom.window.document.querySelector('meta[name="baggage"]')).not.toBeNull();
+    });
+
+    it('should handle missing manifest gracefully', () => {
+      // Clear cache to ensure fresh state
+      IS_ISR_SSG_ROUTE_CACHE.clear();
+
+      // Set up DOM with meta tags
+      const sentryTraceMeta = dom.window.document.createElement('meta');
+      sentryTraceMeta.setAttribute('name', 'sentry-trace');
+      sentryTraceMeta.setAttribute('content', 'trace-id-12345');
+      dom.window.document.head.appendChild(sentryTraceMeta);
+
+      // No manifest set
+      // globalWithInjectedValues._sentryRouteManifest is undefined
+
+      // Set location
+      Object.defineProperty(global, 'location', {
+        value: { ...dom.window.location, pathname: '/blog' },
+        writable: true,
+      });
+
+      // Call the function (should not throw)
+      expect(() => removeIsrSsgTraceMetaTags()).not.toThrow();
+
+      // Verify meta tags were NOT removed (no manifest means no ISR detection)
+      expect(dom.window.document.querySelector('meta[name="sentry-trace"]')).not.toBeNull();
+    });
+
+    it('should handle invalid JSON manifest gracefully', () => {
+      // Clear cache to ensure fresh state
+      IS_ISR_SSG_ROUTE_CACHE.clear();
+
+      // Set up DOM with meta tags
+      const sentryTraceMeta = dom.window.document.createElement('meta');
+      sentryTraceMeta.setAttribute('name', 'sentry-trace');
+      sentryTraceMeta.setAttribute('content', 'trace-id-12345');
+      dom.window.document.head.appendChild(sentryTraceMeta);
+
+      // Set up invalid manifest
+      globalWithInjectedValues._sentryRouteManifest = 'invalid json {';
+
+      // Set location
+      Object.defineProperty(global, 'location', {
+        value: { ...dom.window.location, pathname: '/blog' },
+        writable: true,
+      });
+
+      // Call the function (should not throw)
+      expect(() => removeIsrSsgTraceMetaTags()).not.toThrow();
+
+      // Verify meta tags were NOT removed (invalid manifest means no ISR detection)
+      expect(dom.window.document.querySelector('meta[name="sentry-trace"]')).not.toBeNull();
+    });
+
+    it('should handle manifest with no ISR routes', () => {
+      // Set up DOM with meta tags
+      const sentryTraceMeta = dom.window.document.createElement('meta');
+      sentryTraceMeta.setAttribute('name', 'sentry-trace');
+      sentryTraceMeta.setAttribute('content', 'trace-id-12345');
+      dom.window.document.head.appendChild(sentryTraceMeta);
+
+      // Set up manifest with no ISR routes
+      const manifestWithNoISR: RouteManifest = {
+        staticRoutes: [{ path: '/' }],
+        dynamicRoutes: [],
+        isrRoutes: [],
+      };
+      globalWithInjectedValues._sentryRouteManifest = JSON.stringify(manifestWithNoISR);
+
+      // Set location
+      Object.defineProperty(global, 'location', {
+        value: { ...dom.window.location, pathname: '/' },
+        writable: true,
+      });
+
+      // Call the function
+      removeIsrSsgTraceMetaTags();
+
+      // Verify meta tags were NOT removed (no ISR routes in manifest)
+      expect(dom.window.document.querySelector('meta[name="sentry-trace"]')).not.toBeNull();
+    });
+
+    it('should handle missing meta tags gracefully', () => {
+      // Set up DOM without meta tags
+
+      // Set up route manifest
+      globalWithInjectedValues._sentryRouteManifest = JSON.stringify(mockManifest);
+
+      // Set location to an ISR route
+      Object.defineProperty(global, 'location', {
+        value: { ...dom.window.location, pathname: '/blog' },
+        writable: true,
+      });
+
+      // Call the function (should not throw)
+      expect(() => removeIsrSsgTraceMetaTags()).not.toThrow();
+
+      // Verify no errors and still no meta tags
+      expect(dom.window.document.querySelector('meta[name="sentry-trace"]')).toBeNull();
+      expect(dom.window.document.querySelector('meta[name="baggage"]')).toBeNull();
+    });
+
+    it('should work with parameterized dynamic routes', () => {
+      // Set up DOM with meta tags
+      const sentryTraceMeta = dom.window.document.createElement('meta');
+      sentryTraceMeta.setAttribute('name', 'sentry-trace');
+      sentryTraceMeta.setAttribute('content', 'trace-id-12345');
+      dom.window.document.head.appendChild(sentryTraceMeta);
+
+      const baggageMeta = dom.window.document.createElement('meta');
+      baggageMeta.setAttribute('name', 'baggage');
+      baggageMeta.setAttribute('content', 'sentry-trace-id=12345');
+      dom.window.document.head.appendChild(baggageMeta);
+
+      // Set up route manifest
+      globalWithInjectedValues._sentryRouteManifest = JSON.stringify(mockManifest);
+
+      // Set location to a different dynamic ISR route value
+      Object.defineProperty(global, 'location', {
+        value: { ...dom.window.location, pathname: '/posts/my-awesome-post' },
+        writable: true,
+      });
+
+      // Call the function
+      removeIsrSsgTraceMetaTags();
+
+      // Verify meta tags were removed (should match /posts/:slug)
+      expect(dom.window.document.querySelector('meta[name="sentry-trace"]')).toBeNull();
+      expect(dom.window.document.querySelector('meta[name="baggage"]')).toBeNull();
+    });
+  });
+
+  describe('isIsrSsgRoute caching', () => {
+    const mockManifest: RouteManifest = {
+      staticRoutes: [{ path: '/' }, { path: '/blog' }],
+      dynamicRoutes: [
+        {
+          path: '/products/:id',
+          regex: '^/products/([^/]+?)(?:/)?$',
+          paramNames: ['id'],
+          hasOptionalPrefix: false,
+        },
+        {
+          path: '/posts/:slug',
+          regex: '^/posts/([^/]+?)(?:/)?$',
+          paramNames: ['slug'],
+          hasOptionalPrefix: false,
+        },
+      ],
+      isrRoutes: ['/', '/blog', '/products/:id', '/posts/:slug'],
+    };
+
+    beforeEach(() => {
+      // Clear cache before each test
+      IS_ISR_SSG_ROUTE_CACHE.clear();
+      // Set up route manifest
+      globalWithInjectedValues._sentryRouteManifest = JSON.stringify(mockManifest);
+    });
+
+    it('should cache results by parameterized route, not concrete pathname', () => {
+      // First call with /products/123
+      const result1 = isIsrSsgRoute('/products/123');
+      expect(result1).toBe(true);
+      expect(IS_ISR_SSG_ROUTE_CACHE.size).toBe(1);
+      expect(IS_ISR_SSG_ROUTE_CACHE.has('/products/:id')).toBe(true);
+
+      // Second call with different concrete path /products/456
+      const result2 = isIsrSsgRoute('/products/456');
+      expect(result2).toBe(true);
+      // Cache size should still be 1 - both paths map to same parameterized route
+      expect(IS_ISR_SSG_ROUTE_CACHE.size).toBe(1);
+      expect(IS_ISR_SSG_ROUTE_CACHE.has('/products/:id')).toBe(true);
+
+      // Third call with yet another path /products/999
+      const result3 = isIsrSsgRoute('/products/999');
+      expect(result3).toBe(true);
+      // Still just 1 cache entry
+      expect(IS_ISR_SSG_ROUTE_CACHE.size).toBe(1);
+    });
+
+    it('should use cached results on subsequent calls with same route pattern', () => {
+      // Clear cache
+      IS_ISR_SSG_ROUTE_CACHE.clear();
+
+      // First call - cache miss, will populate cache
+      isIsrSsgRoute('/products/1');
+      expect(IS_ISR_SSG_ROUTE_CACHE.size).toBe(1);
+      expect(IS_ISR_SSG_ROUTE_CACHE.has('/products/:id')).toBe(true);
+
+      // Second call with different concrete path - cache hit
+      const result2 = isIsrSsgRoute('/products/2');
+      expect(result2).toBe(true);
+      // Cache size unchanged - using cached result
+      expect(IS_ISR_SSG_ROUTE_CACHE.size).toBe(1);
+
+      // Third call - still cache hit
+      const result3 = isIsrSsgRoute('/products/3');
+      expect(result3).toBe(true);
+      expect(IS_ISR_SSG_ROUTE_CACHE.size).toBe(1);
+    });
+
+    it('should cache false results for non-ISR routes', () => {
+      const result1 = isIsrSsgRoute('/not-an-isr-route');
+      expect(result1).toBe(false);
+      expect(IS_ISR_SSG_ROUTE_CACHE.has('/not-an-isr-route')).toBe(true);
+      expect(IS_ISR_SSG_ROUTE_CACHE.get('/not-an-isr-route')).toBe(false);
+
+      // Second call should use cache
+      const result2 = isIsrSsgRoute('/not-an-isr-route');
+      expect(result2).toBe(false);
+    });
+
+    it('should cache false results when manifest is invalid', () => {
+      IS_ISR_SSG_ROUTE_CACHE.clear();
+      globalWithInjectedValues._sentryRouteManifest = 'invalid json';
+
+      const result = isIsrSsgRoute('/any-route');
+      expect(result).toBe(false);
+      expect(IS_ISR_SSG_ROUTE_CACHE.has('/any-route')).toBe(true);
+      expect(IS_ISR_SSG_ROUTE_CACHE.get('/any-route')).toBe(false);
+    });
+
+    it('should cache static routes without parameterization', () => {
+      const result1 = isIsrSsgRoute('/blog');
+      expect(result1).toBe(true);
+      expect(IS_ISR_SSG_ROUTE_CACHE.has('/blog')).toBe(true);
+
+      // Second call should use cache
+      const result2 = isIsrSsgRoute('/blog');
+      expect(result2).toBe(true);
+    });
+
+    it('should maintain separate cache entries for different route patterns', () => {
+      // Check multiple different routes
+      isIsrSsgRoute('/products/1');
+      isIsrSsgRoute('/posts/hello');
+      isIsrSsgRoute('/blog');
+      isIsrSsgRoute('/');
+
+      // Should have 4 cache entries (one for each unique route pattern)
+      expect(IS_ISR_SSG_ROUTE_CACHE.size).toBe(4);
+      expect(IS_ISR_SSG_ROUTE_CACHE.has('/products/:id')).toBe(true);
+      expect(IS_ISR_SSG_ROUTE_CACHE.has('/posts/:slug')).toBe(true);
+      expect(IS_ISR_SSG_ROUTE_CACHE.has('/blog')).toBe(true);
+      expect(IS_ISR_SSG_ROUTE_CACHE.has('/')).toBe(true);
+    });
+
+    it('should efficiently handle multiple calls to same dynamic route with different params', () => {
+      // Simulate real-world scenario with many different product IDs
+      for (let i = 1; i <= 100; i++) {
+        isIsrSsgRoute(`/products/${i}`);
+      }
+
+      // Should only have 1 cache entry despite 100 calls
+      expect(IS_ISR_SSG_ROUTE_CACHE.size).toBe(1);
+      expect(IS_ISR_SSG_ROUTE_CACHE.has('/products/:id')).toBe(true);
+    });
+  });
+});
diff --git a/packages/nextjs/test/config/manifest/suites/base-path/base-path.test.ts b/packages/nextjs/test/config/manifest/suites/base-path/base-path.test.ts
index 097e3f603693..7a9a88033d85 100644
--- a/packages/nextjs/test/config/manifest/suites/base-path/base-path.test.ts
+++ b/packages/nextjs/test/config/manifest/suites/base-path/base-path.test.ts
@@ -19,6 +19,7 @@ describe('basePath', () => {
           hasOptionalPrefix: false,
         },
       ],
+      isrRoutes: [],
     });
   });
 
diff --git a/packages/nextjs/test/config/manifest/suites/catchall-at-root/catchall-at-root.test.ts b/packages/nextjs/test/config/manifest/suites/catchall-at-root/catchall-at-root.test.ts
index 8d78f24a0986..4e8e62199592 100644
--- a/packages/nextjs/test/config/manifest/suites/catchall-at-root/catchall-at-root.test.ts
+++ b/packages/nextjs/test/config/manifest/suites/catchall-at-root/catchall-at-root.test.ts
@@ -16,6 +16,7 @@ describe('catchall', () => {
           hasOptionalPrefix: false,
         },
       ],
+      isrRoutes: [],
     });
   });
 
diff --git a/packages/nextjs/test/config/manifest/suites/catchall/catchall.test.ts b/packages/nextjs/test/config/manifest/suites/catchall/catchall.test.ts
index d259a1a38223..34b9334dba05 100644
--- a/packages/nextjs/test/config/manifest/suites/catchall/catchall.test.ts
+++ b/packages/nextjs/test/config/manifest/suites/catchall/catchall.test.ts
@@ -16,6 +16,7 @@ describe('catchall', () => {
           hasOptionalPrefix: false,
         },
       ],
+      isrRoutes: [],
     });
   });
 
diff --git a/packages/nextjs/test/config/manifest/suites/dynamic/dynamic.test.ts b/packages/nextjs/test/config/manifest/suites/dynamic/dynamic.test.ts
index 2ea4b4aca5d8..fb0111d941e5 100644
--- a/packages/nextjs/test/config/manifest/suites/dynamic/dynamic.test.ts
+++ b/packages/nextjs/test/config/manifest/suites/dynamic/dynamic.test.ts
@@ -34,6 +34,7 @@ describe('dynamic', () => {
           hasOptionalPrefix: false,
         },
       ],
+      isrRoutes: [],
     });
   });
 
diff --git a/packages/nextjs/test/config/manifest/suites/file-extensions/file-extensions.test.ts b/packages/nextjs/test/config/manifest/suites/file-extensions/file-extensions.test.ts
index 2c898b1e8e96..79daf2d4d58c 100644
--- a/packages/nextjs/test/config/manifest/suites/file-extensions/file-extensions.test.ts
+++ b/packages/nextjs/test/config/manifest/suites/file-extensions/file-extensions.test.ts
@@ -16,6 +16,7 @@ describe('file-extensions', () => {
         { path: '/typescript' },
       ],
       dynamicRoutes: [],
+      isrRoutes: [],
     });
   });
 });
diff --git a/packages/nextjs/test/config/manifest/suites/isr/app/articles/[category]/[slug]/page.tsx b/packages/nextjs/test/config/manifest/suites/isr/app/articles/[category]/[slug]/page.tsx
new file mode 100644
index 000000000000..24b26184353a
--- /dev/null
+++ b/packages/nextjs/test/config/manifest/suites/isr/app/articles/[category]/[slug]/page.tsx
@@ -0,0 +1,2 @@
+// Nested dynamic ISR page
+export async function generateStaticParams(): Promise<void> {}
diff --git a/packages/nextjs/test/config/manifest/suites/isr/app/blog/page.tsx b/packages/nextjs/test/config/manifest/suites/isr/app/blog/page.tsx
new file mode 100644
index 000000000000..027e160f91d3
--- /dev/null
+++ b/packages/nextjs/test/config/manifest/suites/isr/app/blog/page.tsx
@@ -0,0 +1,2 @@
+// Static ISR page
+export async function generateStaticParams(): Promise<void> {}
diff --git a/packages/nextjs/test/config/manifest/suites/isr/app/docs/[[...path]]/page.tsx b/packages/nextjs/test/config/manifest/suites/isr/app/docs/[[...path]]/page.tsx
new file mode 100644
index 000000000000..f98be769d9c3
--- /dev/null
+++ b/packages/nextjs/test/config/manifest/suites/isr/app/docs/[[...path]]/page.tsx
@@ -0,0 +1,2 @@
+// Optional catchall ISR page
+export async function generateStaticParams(): Promise<void> {}
diff --git a/packages/nextjs/test/config/manifest/suites/isr/app/guides/[...segments]/page.tsx b/packages/nextjs/test/config/manifest/suites/isr/app/guides/[...segments]/page.tsx
new file mode 100644
index 000000000000..b22caba78d2f
--- /dev/null
+++ b/packages/nextjs/test/config/manifest/suites/isr/app/guides/[...segments]/page.tsx
@@ -0,0 +1,2 @@
+// Required catchall ISR page
+export async function generateStaticParams(): Promise<void> {}
diff --git a/packages/nextjs/test/config/manifest/suites/isr/app/page.tsx b/packages/nextjs/test/config/manifest/suites/isr/app/page.tsx
new file mode 100644
index 000000000000..b4aef2560f50
--- /dev/null
+++ b/packages/nextjs/test/config/manifest/suites/isr/app/page.tsx
@@ -0,0 +1,2 @@
+// Static ISR page at root
+export async function generateStaticParams(): Promise<void> {}
diff --git a/packages/nextjs/test/config/manifest/suites/isr/app/posts/[slug]/page.tsx b/packages/nextjs/test/config/manifest/suites/isr/app/posts/[slug]/page.tsx
new file mode 100644
index 000000000000..a68fb122c81d
--- /dev/null
+++ b/packages/nextjs/test/config/manifest/suites/isr/app/posts/[slug]/page.tsx
@@ -0,0 +1,2 @@
+// Dynamic ISR with async function
+export const generateStaticParams = async (): Promise<void> => {};
diff --git a/packages/nextjs/test/config/manifest/suites/isr/app/products/[id]/page.tsx b/packages/nextjs/test/config/manifest/suites/isr/app/products/[id]/page.tsx
new file mode 100644
index 000000000000..f18f341f1f43
--- /dev/null
+++ b/packages/nextjs/test/config/manifest/suites/isr/app/products/[id]/page.tsx
@@ -0,0 +1,2 @@
+// Dynamic ISR page with generateStaticParams
+export async function generateStaticParams(): Promise<void> {}
diff --git a/packages/nextjs/test/config/manifest/suites/isr/app/regular/page.tsx b/packages/nextjs/test/config/manifest/suites/isr/app/regular/page.tsx
new file mode 100644
index 000000000000..b46b50a71d44
--- /dev/null
+++ b/packages/nextjs/test/config/manifest/suites/isr/app/regular/page.tsx
@@ -0,0 +1,2 @@
+// Regular page without ISR (no generateStaticParams)
+export {};
diff --git a/packages/nextjs/test/config/manifest/suites/isr/app/users/[id]/profile/page.tsx b/packages/nextjs/test/config/manifest/suites/isr/app/users/[id]/profile/page.tsx
new file mode 100644
index 000000000000..3774c141885d
--- /dev/null
+++ b/packages/nextjs/test/config/manifest/suites/isr/app/users/[id]/profile/page.tsx
@@ -0,0 +1,2 @@
+// Mixed static-dynamic ISR page
+export async function generateStaticParams(): Promise<void> {}
diff --git a/packages/nextjs/test/config/manifest/suites/isr/isr.test.ts b/packages/nextjs/test/config/manifest/suites/isr/isr.test.ts
new file mode 100644
index 000000000000..56d097df0180
--- /dev/null
+++ b/packages/nextjs/test/config/manifest/suites/isr/isr.test.ts
@@ -0,0 +1,345 @@
+import path from 'path';
+import { describe, expect, test } from 'vitest';
+import { createRouteManifest } from '../../../../../src/config/manifest/createRouteManifest';
+
+describe('ISR route detection and matching', () => {
+  const manifest = createRouteManifest({ appDirPath: path.join(__dirname, 'app') });
+
+  describe('ISR detection', () => {
+    test('should detect static ISR pages with generateStaticParams', () => {
+      expect(manifest.isrRoutes).toContain('/');
+      expect(manifest.isrRoutes).toContain('/blog');
+    });
+
+    test('should detect dynamic ISR pages with generateStaticParams', () => {
+      expect(manifest.isrRoutes).toContain('/products/:id');
+      expect(manifest.isrRoutes).toContain('/posts/:slug');
+    });
+
+    test('should detect nested dynamic ISR pages', () => {
+      expect(manifest.isrRoutes).toContain('/articles/:category/:slug');
+    });
+
+    test('should detect optional catchall ISR pages', () => {
+      expect(manifest.isrRoutes).toContain('/docs/:path*?');
+    });
+
+    test('should detect required catchall ISR pages', () => {
+      expect(manifest.isrRoutes).toContain('/guides/:segments*');
+    });
+
+    test('should detect mixed static-dynamic ISR pages', () => {
+      expect(manifest.isrRoutes).toContain('/users/:id/profile');
+    });
+
+    test('should NOT detect pages without generateStaticParams as ISR', () => {
+      expect(manifest.isrRoutes).not.toContain('/regular');
+    });
+
+    test('should detect both function and const generateStaticParams', () => {
+      // /blog uses function declaration
+      // /posts/[slug] uses const declaration
+      expect(manifest.isrRoutes).toContain('/blog');
+      expect(manifest.isrRoutes).toContain('/posts/:slug');
+    });
+
+    test('should detect async generateStaticParams', () => {
+      // Multiple pages use async - this should work
+      expect(manifest.isrRoutes).toContain('/products/:id');
+      expect(manifest.isrRoutes).toContain('/posts/:slug');
+    });
+  });
+
+  describe('Route matching against pathnames', () => {
+    describe('single dynamic segment ISR routes', () => {
+      test('should match /products/:id against various product IDs', () => {
+        const route = manifest.dynamicRoutes.find(r => r.path === '/products/:id');
+        expect(route).toBeDefined();
+        const regex = new RegExp(route!.regex!);
+
+        // Should match
+        expect(regex.test('/products/1')).toBe(true);
+        expect(regex.test('/products/123')).toBe(true);
+        expect(regex.test('/products/abc-def')).toBe(true);
+        expect(regex.test('/products/product-with-dashes')).toBe(true);
+        expect(regex.test('/products/UPPERCASE')).toBe(true);
+
+        // Should NOT match
+        expect(regex.test('/products')).toBe(false);
+        expect(regex.test('/products/')).toBe(false);
+        expect(regex.test('/products/123/extra')).toBe(false);
+        expect(regex.test('/product/123')).toBe(false); // typo
+      });
+
+      test('should match /posts/:slug against various slugs', () => {
+        const route = manifest.dynamicRoutes.find(r => r.path === '/posts/:slug');
+        expect(route).toBeDefined();
+        const regex = new RegExp(route!.regex!);
+
+        // Should match
+        expect(regex.test('/posts/hello')).toBe(true);
+        expect(regex.test('/posts/world')).toBe(true);
+        expect(regex.test('/posts/my-awesome-post')).toBe(true);
+        expect(regex.test('/posts/post_with_underscores')).toBe(true);
+
+        // Should NOT match
+        expect(regex.test('/posts')).toBe(false);
+        expect(regex.test('/posts/')).toBe(false);
+        expect(regex.test('/posts/hello/world')).toBe(false);
+      });
+    });
+
+    describe('nested dynamic segments ISR routes', () => {
+      test('should match /articles/:category/:slug against various paths', () => {
+        const route = manifest.dynamicRoutes.find(r => r.path === '/articles/:category/:slug');
+        expect(route).toBeDefined();
+        const regex = new RegExp(route!.regex!);
+
+        // Should match
+        expect(regex.test('/articles/tech/nextjs-guide')).toBe(true);
+        expect(regex.test('/articles/tech/react-tips')).toBe(true);
+        expect(regex.test('/articles/programming/typescript-advanced')).toBe(true);
+        expect(regex.test('/articles/news/breaking-news-2024')).toBe(true);
+
+        // Should NOT match
+        expect(regex.test('/articles')).toBe(false);
+        expect(regex.test('/articles/tech')).toBe(false);
+        expect(regex.test('/articles/tech/nextjs-guide/extra')).toBe(false);
+
+        // Extract parameters
+        const match = '/articles/tech/nextjs-guide'.match(regex);
+        expect(match).toBeTruthy();
+        expect(match?.[1]).toBe('tech');
+        expect(match?.[2]).toBe('nextjs-guide');
+      });
+    });
+
+    describe('mixed static-dynamic ISR routes', () => {
+      test('should match /users/:id/profile against user profile paths', () => {
+        const route = manifest.dynamicRoutes.find(r => r.path === '/users/:id/profile');
+        expect(route).toBeDefined();
+        const regex = new RegExp(route!.regex!);
+
+        // Should match
+        expect(regex.test('/users/user1/profile')).toBe(true);
+        expect(regex.test('/users/user2/profile')).toBe(true);
+        expect(regex.test('/users/john-doe/profile')).toBe(true);
+        expect(regex.test('/users/123/profile')).toBe(true);
+
+        // Should NOT match
+        expect(regex.test('/users/user1')).toBe(false);
+        expect(regex.test('/users/user1/profile/edit')).toBe(false);
+        expect(regex.test('/users/profile')).toBe(false);
+        expect(regex.test('/user/user1/profile')).toBe(false); // typo
+
+        // Extract parameter
+        const match = '/users/john-doe/profile'.match(regex);
+        expect(match).toBeTruthy();
+        expect(match?.[1]).toBe('john-doe');
+      });
+    });
+
+    describe('optional catchall ISR routes', () => {
+      test('should match /docs/:path*? against various documentation paths', () => {
+        const route = manifest.dynamicRoutes.find(r => r.path === '/docs/:path*?');
+        expect(route).toBeDefined();
+        const regex = new RegExp(route!.regex!);
+
+        // Should match - with paths
+        expect(regex.test('/docs/getting-started')).toBe(true);
+        expect(regex.test('/docs/api/reference')).toBe(true);
+        expect(regex.test('/docs/guides/installation/quick-start')).toBe(true);
+        expect(regex.test('/docs/a')).toBe(true);
+        expect(regex.test('/docs/a/b/c/d/e')).toBe(true);
+
+        // Should match - without path (optional catchall)
+        expect(regex.test('/docs')).toBe(true);
+
+        // Should NOT match
+        expect(regex.test('/doc')).toBe(false); // typo
+        expect(regex.test('/')).toBe(false);
+        expect(regex.test('/documents/test')).toBe(false);
+
+        // Extract parameters
+        const matchWithPath = '/docs/api/reference'.match(regex);
+        expect(matchWithPath).toBeTruthy();
+        expect(matchWithPath?.[1]).toBe('api/reference');
+
+        const matchNoPath = '/docs'.match(regex);
+        expect(matchNoPath).toBeTruthy();
+        // Optional catchall without path
+        expect(matchNoPath?.[1]).toBeUndefined();
+      });
+    });
+
+    describe('required catchall ISR routes', () => {
+      test('should match /guides/:segments* against guide paths', () => {
+        const route = manifest.dynamicRoutes.find(r => r.path === '/guides/:segments*');
+        expect(route).toBeDefined();
+        const regex = new RegExp(route!.regex!);
+
+        // Should match - with paths (required)
+        expect(regex.test('/guides/intro')).toBe(true);
+        expect(regex.test('/guides/advanced/topics')).toBe(true);
+        expect(regex.test('/guides/getting-started/installation/setup')).toBe(true);
+
+        // Should NOT match - without path (required catchall needs at least one segment)
+        expect(regex.test('/guides')).toBe(false);
+        expect(regex.test('/guides/')).toBe(false);
+
+        // Should NOT match - wrong path
+        expect(regex.test('/guide/intro')).toBe(false); // typo
+        expect(regex.test('/')).toBe(false);
+
+        // Extract parameters
+        const match = '/guides/advanced/topics'.match(regex);
+        expect(match).toBeTruthy();
+        expect(match?.[1]).toBe('advanced/topics');
+      });
+    });
+
+    describe('real-world pathname simulations', () => {
+      test('should identify ISR pages from window.location.pathname examples', () => {
+        const testCases = [
+          { pathname: '/', isISR: true, matchedRoute: '/' },
+          { pathname: '/blog', isISR: true, matchedRoute: '/blog' },
+          { pathname: '/products/123', isISR: true, matchedRoute: '/products/:id' },
+          { pathname: '/products/gaming-laptop', isISR: true, matchedRoute: '/products/:id' },
+          { pathname: '/posts/hello-world', isISR: true, matchedRoute: '/posts/:slug' },
+          { pathname: '/articles/tech/nextjs-guide', isISR: true, matchedRoute: '/articles/:category/:slug' },
+          { pathname: '/users/john/profile', isISR: true, matchedRoute: '/users/:id/profile' },
+          { pathname: '/docs', isISR: true, matchedRoute: '/docs/:path*?' },
+          { pathname: '/docs/getting-started', isISR: true, matchedRoute: '/docs/:path*?' },
+          { pathname: '/docs/api/reference/advanced', isISR: true, matchedRoute: '/docs/:path*?' },
+          { pathname: '/guides/intro', isISR: true, matchedRoute: '/guides/:segments*' },
+          { pathname: '/guides/advanced/topics/performance', isISR: true, matchedRoute: '/guides/:segments*' },
+          { pathname: '/regular', isISR: false, matchedRoute: null },
+        ];
+
+        testCases.forEach(({ pathname, isISR, matchedRoute }) => {
+          // Check if pathname matches any ISR route
+          let foundMatch = false;
+          let foundRoute = null;
+
+          // Check static ISR routes
+          if (manifest.isrRoutes.includes(pathname)) {
+            foundMatch = true;
+            foundRoute = pathname;
+          }
+
+          // Check dynamic ISR routes
+          if (!foundMatch) {
+            for (const route of manifest.dynamicRoutes) {
+              if (manifest.isrRoutes.includes(route.path)) {
+                const regex = new RegExp(route.regex!);
+                if (regex.test(pathname)) {
+                  foundMatch = true;
+                  foundRoute = route.path;
+                  break;
+                }
+              }
+            }
+          }
+
+          expect(foundMatch).toBe(isISR);
+          if (matchedRoute) {
+            expect(foundRoute).toBe(matchedRoute);
+          }
+        });
+      });
+    });
+
+    describe('edge cases and special characters', () => {
+      test('should handle paths with special characters in dynamic segments', () => {
+        const route = manifest.dynamicRoutes.find(r => r.path === '/products/:id');
+        const regex = new RegExp(route!.regex!);
+
+        expect(regex.test('/products/product-123')).toBe(true);
+        expect(regex.test('/products/product_456')).toBe(true);
+        expect(regex.test('/products/PRODUCT-ABC')).toBe(true);
+        expect(regex.test('/products/2024-new-product')).toBe(true);
+      });
+
+      test('should handle deeply nested catchall paths', () => {
+        const route = manifest.dynamicRoutes.find(r => r.path === '/docs/:path*?');
+        const regex = new RegExp(route!.regex!);
+
+        expect(regex.test('/docs/a/b/c/d/e/f/g/h/i/j')).toBe(true);
+      });
+
+      test('should not match paths with trailing slashes if route does not have them', () => {
+        const route = manifest.dynamicRoutes.find(r => r.path === '/products/:id');
+        const regex = new RegExp(route!.regex!);
+
+        // Most Next.js routes don't match trailing slashes
+        expect(regex.test('/products/123/')).toBe(false);
+      });
+    });
+
+    describe('parameter extraction for ISR routes', () => {
+      test('should extract single parameter from ISR route', () => {
+        const route = manifest.dynamicRoutes.find(r => r.path === '/products/:id');
+        const regex = new RegExp(route!.regex!);
+
+        const match = '/products/gaming-laptop'.match(regex);
+        expect(match).toBeTruthy();
+        expect(route?.paramNames).toEqual(['id']);
+        expect(match?.[1]).toBe('gaming-laptop');
+      });
+
+      test('should extract multiple parameters from nested ISR route', () => {
+        const route = manifest.dynamicRoutes.find(r => r.path === '/articles/:category/:slug');
+        const regex = new RegExp(route!.regex!);
+
+        const match = '/articles/programming/typescript-advanced'.match(regex);
+        expect(match).toBeTruthy();
+        expect(route?.paramNames).toEqual(['category', 'slug']);
+        expect(match?.[1]).toBe('programming');
+        expect(match?.[2]).toBe('typescript-advanced');
+      });
+
+      test('should extract catchall parameter from ISR route', () => {
+        const route = manifest.dynamicRoutes.find(r => r.path === '/docs/:path*?');
+        const regex = new RegExp(route!.regex!);
+
+        const match = '/docs/api/reference/advanced'.match(regex);
+        expect(match).toBeTruthy();
+        expect(route?.paramNames).toEqual(['path']);
+        expect(match?.[1]).toBe('api/reference/advanced');
+      });
+    });
+  });
+
+  describe('complete manifest structure', () => {
+    test('should have correct structure with all route types', () => {
+      expect(manifest).toHaveProperty('staticRoutes');
+      expect(manifest).toHaveProperty('dynamicRoutes');
+      expect(manifest).toHaveProperty('isrRoutes');
+      expect(Array.isArray(manifest.staticRoutes)).toBe(true);
+      expect(Array.isArray(manifest.dynamicRoutes)).toBe(true);
+      expect(Array.isArray(manifest.isrRoutes)).toBe(true);
+    });
+
+    test('should include both ISR and non-ISR routes in main route lists', () => {
+      // ISR static routes should be in staticRoutes
+      expect(manifest.staticRoutes.some(r => r.path === '/')).toBe(true);
+      expect(manifest.staticRoutes.some(r => r.path === '/blog')).toBe(true);
+
+      // Non-ISR static routes should also be in staticRoutes
+      expect(manifest.staticRoutes.some(r => r.path === '/regular')).toBe(true);
+
+      // ISR dynamic routes should be in dynamicRoutes
+      expect(manifest.dynamicRoutes.some(r => r.path === '/products/:id')).toBe(true);
+    });
+
+    test('should only include ISR routes in isrRoutes list', () => {
+      // ISR routes should be in the list
+      expect(manifest.isrRoutes).toContain('/');
+      expect(manifest.isrRoutes).toContain('/blog');
+      expect(manifest.isrRoutes).toContain('/products/:id');
+
+      // Non-ISR routes should NOT be in the list
+      expect(manifest.isrRoutes).not.toContain('/regular');
+    });
+  });
+});
diff --git a/packages/nextjs/test/config/manifest/suites/route-groups/route-groups.test.ts b/packages/nextjs/test/config/manifest/suites/route-groups/route-groups.test.ts
index 8e1fe463190e..c2d455361c4c 100644
--- a/packages/nextjs/test/config/manifest/suites/route-groups/route-groups.test.ts
+++ b/packages/nextjs/test/config/manifest/suites/route-groups/route-groups.test.ts
@@ -26,6 +26,7 @@ describe('route-groups', () => {
             hasOptionalPrefix: false,
           },
         ],
+        isrRoutes: [],
       });
     });
 
@@ -59,6 +60,7 @@ describe('route-groups', () => {
             hasOptionalPrefix: false,
           },
         ],
+        isrRoutes: [],
       });
     });
 
diff --git a/packages/nextjs/test/config/manifest/suites/static/static.test.ts b/packages/nextjs/test/config/manifest/suites/static/static.test.ts
index a6f03f49b6fe..6701ef0875d4 100644
--- a/packages/nextjs/test/config/manifest/suites/static/static.test.ts
+++ b/packages/nextjs/test/config/manifest/suites/static/static.test.ts
@@ -8,6 +8,7 @@ describe('static', () => {
     expect(manifest).toEqual({
       staticRoutes: [{ path: '/' }, { path: '/some/nested' }, { path: '/user' }, { path: '/users' }],
       dynamicRoutes: [],
+      isrRoutes: [],
     });
   });
 });

From 60a198edcf89665fd48d9d9ed38e787ae430dbb6 Mon Sep 17 00:00:00 2001
From: Abdelrahman Awad <me@awad.dev>
Date: Mon, 17 Nov 2025 20:25:07 +0200
Subject: [PATCH 079/186] fix(nextjs): use LRU map instead of map for ISR route
 cache (#18234)

Make use of our existing `LRUMap` for the ISR route cache to avoid the
map growing too big.
---
 .../src/client/routing/isrRoutingTracing.ts   |  8 ++++---
 .../test/client/isrRoutingTracing.test.ts     | 22 +++++++++----------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/packages/nextjs/src/client/routing/isrRoutingTracing.ts b/packages/nextjs/src/client/routing/isrRoutingTracing.ts
index 567d30aa9852..de5308cbb7ef 100644
--- a/packages/nextjs/src/client/routing/isrRoutingTracing.ts
+++ b/packages/nextjs/src/client/routing/isrRoutingTracing.ts
@@ -1,3 +1,4 @@
+import { LRUMap } from '@sentry/core';
 import { WINDOW } from '@sentry/react';
 import { getManifest, maybeParameterizeRoute } from './parameterization';
 
@@ -5,7 +6,7 @@ import { getManifest, maybeParameterizeRoute } from './parameterization';
  * Cache for ISR/SSG route checks. Exported for testing purposes.
  * @internal
  */
-export const IS_ISR_SSG_ROUTE_CACHE = new Map<string, boolean>();
+export const IS_ISR_SSG_ROUTE_CACHE = new LRUMap<string, boolean>(100);
 
 /**
  * Check if the current page is an ISR/SSG route by checking the route manifest.
@@ -17,8 +18,9 @@ export function isIsrSsgRoute(pathname: string): boolean {
   const pathToCheck = parameterizedPath || pathname;
 
   // Check cache using the parameterized path as the key
-  if (IS_ISR_SSG_ROUTE_CACHE.has(pathToCheck)) {
-    return IS_ISR_SSG_ROUTE_CACHE.get(pathToCheck) as boolean;
+  const cachedResult = IS_ISR_SSG_ROUTE_CACHE.get(pathToCheck);
+  if (cachedResult !== undefined) {
+    return cachedResult;
   }
 
   // Cache miss get the manifest
diff --git a/packages/nextjs/test/client/isrRoutingTracing.test.ts b/packages/nextjs/test/client/isrRoutingTracing.test.ts
index be553e086449..cdca740727dd 100644
--- a/packages/nextjs/test/client/isrRoutingTracing.test.ts
+++ b/packages/nextjs/test/client/isrRoutingTracing.test.ts
@@ -301,14 +301,14 @@ describe('isrRoutingTracing', () => {
       const result1 = isIsrSsgRoute('/products/123');
       expect(result1).toBe(true);
       expect(IS_ISR_SSG_ROUTE_CACHE.size).toBe(1);
-      expect(IS_ISR_SSG_ROUTE_CACHE.has('/products/:id')).toBe(true);
+      expect(IS_ISR_SSG_ROUTE_CACHE.get('/products/:id')).toBeDefined();
 
       // Second call with different concrete path /products/456
       const result2 = isIsrSsgRoute('/products/456');
       expect(result2).toBe(true);
       // Cache size should still be 1 - both paths map to same parameterized route
       expect(IS_ISR_SSG_ROUTE_CACHE.size).toBe(1);
-      expect(IS_ISR_SSG_ROUTE_CACHE.has('/products/:id')).toBe(true);
+      expect(IS_ISR_SSG_ROUTE_CACHE.get('/products/:id')).toBeDefined();
 
       // Third call with yet another path /products/999
       const result3 = isIsrSsgRoute('/products/999');
@@ -324,7 +324,7 @@ describe('isrRoutingTracing', () => {
       // First call - cache miss, will populate cache
       isIsrSsgRoute('/products/1');
       expect(IS_ISR_SSG_ROUTE_CACHE.size).toBe(1);
-      expect(IS_ISR_SSG_ROUTE_CACHE.has('/products/:id')).toBe(true);
+      expect(IS_ISR_SSG_ROUTE_CACHE.get('/products/:id')).toBeDefined();
 
       // Second call with different concrete path - cache hit
       const result2 = isIsrSsgRoute('/products/2');
@@ -341,7 +341,7 @@ describe('isrRoutingTracing', () => {
     it('should cache false results for non-ISR routes', () => {
       const result1 = isIsrSsgRoute('/not-an-isr-route');
       expect(result1).toBe(false);
-      expect(IS_ISR_SSG_ROUTE_CACHE.has('/not-an-isr-route')).toBe(true);
+      expect(IS_ISR_SSG_ROUTE_CACHE.get('/not-an-isr-route')).toBeDefined();
       expect(IS_ISR_SSG_ROUTE_CACHE.get('/not-an-isr-route')).toBe(false);
 
       // Second call should use cache
@@ -355,14 +355,14 @@ describe('isrRoutingTracing', () => {
 
       const result = isIsrSsgRoute('/any-route');
       expect(result).toBe(false);
-      expect(IS_ISR_SSG_ROUTE_CACHE.has('/any-route')).toBe(true);
+      expect(IS_ISR_SSG_ROUTE_CACHE.get('/any-route')).toBeDefined();
       expect(IS_ISR_SSG_ROUTE_CACHE.get('/any-route')).toBe(false);
     });
 
     it('should cache static routes without parameterization', () => {
       const result1 = isIsrSsgRoute('/blog');
       expect(result1).toBe(true);
-      expect(IS_ISR_SSG_ROUTE_CACHE.has('/blog')).toBe(true);
+      expect(IS_ISR_SSG_ROUTE_CACHE.get('/blog')).toBeDefined();
 
       // Second call should use cache
       const result2 = isIsrSsgRoute('/blog');
@@ -378,10 +378,10 @@ describe('isrRoutingTracing', () => {
 
       // Should have 4 cache entries (one for each unique route pattern)
       expect(IS_ISR_SSG_ROUTE_CACHE.size).toBe(4);
-      expect(IS_ISR_SSG_ROUTE_CACHE.has('/products/:id')).toBe(true);
-      expect(IS_ISR_SSG_ROUTE_CACHE.has('/posts/:slug')).toBe(true);
-      expect(IS_ISR_SSG_ROUTE_CACHE.has('/blog')).toBe(true);
-      expect(IS_ISR_SSG_ROUTE_CACHE.has('/')).toBe(true);
+      expect(IS_ISR_SSG_ROUTE_CACHE.get('/products/:id')).toBeDefined();
+      expect(IS_ISR_SSG_ROUTE_CACHE.get('/posts/:slug')).toBeDefined();
+      expect(IS_ISR_SSG_ROUTE_CACHE.get('/blog')).toBeDefined();
+      expect(IS_ISR_SSG_ROUTE_CACHE.get('/')).toBeDefined();
     });
 
     it('should efficiently handle multiple calls to same dynamic route with different params', () => {
@@ -392,7 +392,7 @@ describe('isrRoutingTracing', () => {
 
       // Should only have 1 cache entry despite 100 calls
       expect(IS_ISR_SSG_ROUTE_CACHE.size).toBe(1);
-      expect(IS_ISR_SSG_ROUTE_CACHE.has('/products/:id')).toBe(true);
+      expect(IS_ISR_SSG_ROUTE_CACHE.get('/products/:id')).toBeDefined();
     });
   });
 });

From ccfda39da64ecfe2496965a61b6f48c35eb50464 Mon Sep 17 00:00:00 2001
From: Andrei <168741329+andreiborza@users.noreply.github.com>
Date: Tue, 18 Nov 2025 10:23:02 +0100
Subject: [PATCH 080/186] chore: Fix missing changelog quote we use for
 attribution placement (#18237)

Restores the office quote in our changelog. This quote acts as a
placement marker for attribution and is needed by our action.

Alternatively, we could change our action but this is a long-standing
quote and part of our culture :)
---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 09030a4dc82a..30abc26e733c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
+
 - fix(node): Fix Spotlight configuration precedence to match specification (#18195)
 
 ## 10.25.0

From 9ce440c77d80841c7c82526817bce13a4a380b63 Mon Sep 17 00:00:00 2001
From: Onur Temizkan <onur@narval.co.uk>
Date: Tue, 18 Nov 2025 09:24:59 +0000
Subject: [PATCH 081/186] fix(react): Prevent navigation span leaks for
 consecutive navigations (#18098)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes an issue where consecutive navigations to different routes fail to
create separate navigation spans, causing span leaks and missing
transaction data.

This came up in a React Router v6/v7 application where the pageload /
navigation transactions take longer and there is a high `finalTimeout`
set in config. When users navigate between different routes (e.g.,
`/users/:id` → `/projects/:projectId` → `/settings`). The SDK was
incorrectly preventing new navigation spans from being created whenever
an ongoing navigation span was active, regardless of whether the
navigation was to a different route. This resulted in only the first
navigation being tracked, with subsequent navigations being silently
ignored. Also, the spans that needed to be a part of the subsequent
navigation were recorded as a part of the previous one.

The root cause was the `if (!isAlreadyInNavigationSpan)` check that we
used to prevent cross-usage scenarios (multiple wrappers instrumenting
the same navigation), which incorrectly blocked legitimate consecutive
navigations to different routes.

So, this fix changes the logic to check both navigation span state and
the route name: `isSpanForSameRoute = isAlreadyInNavigationSpan &&
spanJson?.description === name`. This allows consecutive navigations to
different routes while preventing duplicate spans for the same route.


Also added tracking using `LAST_NAVIGATION_PER_CLIENT`. When multiple
wrappers (e.g., `wrapCreateBrowserRouter` + `wrapUseRoutes`) instrument
the same application, they may each trigger span creation for the same
navigation event. We store the navigation key
`${location.pathname}${location.search}${location.hash}` while the span
is active and clear it when that span ends.

If the same navigation key shows up again before the original span
finishes, the second wrapper updates that span’s name if it has better
parameterization instead of creating a duplicate, which keeps
cross-usage covered.
---
 .../tests/transactions.test.ts                | 109 ++++---
 .../instrumentation.tsx                       | 209 ++++++++----
 .../src/reactrouter-compat-utils/utils.ts     |  93 +++---
 .../test/reactrouter-cross-usage.test.tsx     | 308 ++++++++++++++++--
 .../reactrouter-descendant-routes.test.tsx    |   2 +
 packages/react/test/reactrouterv6.test.tsx    |   2 +
 6 files changed, 538 insertions(+), 185 deletions(-)

diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/tests/transactions.test.ts
index a57199c52633..e5b9f35042ed 100644
--- a/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/tests/transactions.test.ts
+++ b/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/tests/transactions.test.ts
@@ -87,7 +87,7 @@ test('Creates a navigation transaction inside a lazy route', async ({ page }) =>
 });
 
 test('Creates navigation transactions between two different lazy routes', async ({ page }) => {
-  // First, navigate to the "another-lazy" route
+  // Set up transaction listeners for both navigations
   const firstTransactionPromise = waitForTransaction('react-router-7-lazy-routes', async transactionEvent => {
     return (
       !!transactionEvent?.transaction &&
@@ -96,6 +96,14 @@ test('Creates navigation transactions between two different lazy routes', async
     );
   });
 
+  const secondTransactionPromise = waitForTransaction('react-router-7-lazy-routes', async transactionEvent => {
+    return (
+      !!transactionEvent?.transaction &&
+      transactionEvent.contexts?.trace?.op === 'navigation' &&
+      transactionEvent.transaction === '/lazy/inner/:id/:anotherId/:someAnotherId'
+    );
+  });
+
   await page.goto('/');
 
   // Navigate to another lazy route first
@@ -115,14 +123,6 @@ test('Creates navigation transactions between two different lazy routes', async
   expect(firstEvent.contexts?.trace?.op).toBe('navigation');
 
   // Now navigate from the first lazy route to the second lazy route
-  const secondTransactionPromise = waitForTransaction('react-router-7-lazy-routes', async transactionEvent => {
-    return (
-      !!transactionEvent?.transaction &&
-      transactionEvent.contexts?.trace?.op === 'navigation' &&
-      transactionEvent.transaction === '/lazy/inner/:id/:anotherId/:someAnotherId'
-    );
-  });
-
   // Click the navigation link from within the first lazy route to the second lazy route
   const navigationToInnerFromDeep = page.locator('id=navigate-to-inner-from-deep');
   await expect(navigationToInnerFromDeep).toBeVisible();
@@ -255,7 +255,7 @@ test('Does not send any duplicate navigation transaction names browsing between
 
   // Go to root page
   await page.goto('/');
-  page.waitForTimeout(1000);
+  await page.waitForTimeout(1000);
 
   // Navigate to inner lazy route
   const navigationToInner = page.locator('id=navigation');
@@ -339,6 +339,7 @@ test('Allows legitimate POP navigation (back/forward) after pageload completes',
   const navigationToLongRunning = page.locator('id=navigation-to-long-running');
   await expect(navigationToLongRunning).toBeVisible();
 
+  // Set up transaction listeners for both navigations
   const firstNavigationPromise = waitForTransaction('react-router-7-lazy-routes', async transactionEvent => {
     return (
       !!transactionEvent?.transaction &&
@@ -347,6 +348,14 @@ test('Allows legitimate POP navigation (back/forward) after pageload completes',
     );
   });
 
+  const backNavigationPromise = waitForTransaction('react-router-7-lazy-routes', async transactionEvent => {
+    return (
+      !!transactionEvent?.transaction &&
+      transactionEvent.contexts?.trace?.op === 'navigation' &&
+      transactionEvent.transaction === '/'
+    );
+  });
+
   await navigationToLongRunning.click();
 
   const slowLoadingContent = page.locator('id=slow-loading-content');
@@ -359,14 +368,6 @@ test('Allows legitimate POP navigation (back/forward) after pageload completes',
 
   // Now navigate back using browser back button (POP event)
   // This should create a navigation transaction since pageload is complete
-  const backNavigationPromise = waitForTransaction('react-router-7-lazy-routes', async transactionEvent => {
-    return (
-      !!transactionEvent?.transaction &&
-      transactionEvent.contexts?.trace?.op === 'navigation' &&
-      transactionEvent.transaction === '/'
-    );
-  });
-
   await page.goBack();
 
   // Verify we're back at home
@@ -504,7 +505,7 @@ test('Updates navigation transaction name correctly when span is cancelled early
 test('Creates separate transactions for rapid consecutive navigations', async ({ page }) => {
   await page.goto('/');
 
-  // First navigation: / -> /lazy/inner/:id/:anotherId/:someAnotherId
+  // Set up transaction listeners
   const firstTransactionPromise = waitForTransaction('react-router-7-lazy-routes', async transactionEvent => {
     return (
       !!transactionEvent?.transaction &&
@@ -513,20 +514,6 @@ test('Creates separate transactions for rapid consecutive navigations', async ({
     );
   });
 
-  const navigationToInner = page.locator('id=navigation');
-  await expect(navigationToInner).toBeVisible();
-  await navigationToInner.click();
-
-  const firstEvent = await firstTransactionPromise;
-
-  // Verify first transaction
-  expect(firstEvent.transaction).toBe('/lazy/inner/:id/:anotherId/:someAnotherId');
-  expect(firstEvent.contexts?.trace?.op).toBe('navigation');
-  expect(firstEvent.contexts?.trace?.status).toBe('ok');
-  const firstTraceId = firstEvent.contexts?.trace?.trace_id;
-  const firstSpanId = firstEvent.contexts?.trace?.span_id;
-
-  // Second navigation: /lazy/inner -> /another-lazy/sub/:id/:subId
   const secondTransactionPromise = waitForTransaction('react-router-7-lazy-routes', async transactionEvent => {
     return (
       !!transactionEvent?.transaction &&
@@ -535,40 +522,54 @@ test('Creates separate transactions for rapid consecutive navigations', async ({
     );
   });
 
-  const navigationToAnother = page.locator('id=navigate-to-another-from-inner');
-  await expect(navigationToAnother).toBeVisible();
-  await navigationToAnother.click();
+  // Third navigation promise - using counter to match second occurrence of same route
+  let innerRouteMatchCount = 0;
+  const thirdTransactionPromise = waitForTransaction('react-router-7-lazy-routes', async transactionEvent => {
+    if (
+      transactionEvent?.transaction &&
+      transactionEvent.contexts?.trace?.op === 'navigation' &&
+      transactionEvent.transaction === '/lazy/inner/:id/:anotherId/:someAnotherId'
+    ) {
+      innerRouteMatchCount++;
+      return innerRouteMatchCount === 2; // Match the second occurrence
+    }
+    return false;
+  });
+
+  // Perform navigations
+  // First navigation: / -> /lazy/inner/:id/:anotherId/:someAnotherId
+  await page.locator('id=navigation').click();
+
+  const firstEvent = await firstTransactionPromise;
+
+  // Second navigation: /lazy/inner -> /another-lazy/sub/:id/:subId
+  await page.locator('id=navigate-to-another-from-inner').click();
 
   const secondEvent = await secondTransactionPromise;
 
-  // Verify second transaction
+  // Third navigation: /another-lazy -> /lazy/inner/:id/:anotherId/:someAnotherId (back to same route as first)
+  await page.locator('id=navigate-to-inner-from-deep').click();
+
+  const thirdEvent = await thirdTransactionPromise;
+
+  // Verify transactions
+  expect(firstEvent.transaction).toBe('/lazy/inner/:id/:anotherId/:someAnotherId');
+  expect(firstEvent.contexts?.trace?.op).toBe('navigation');
+  const firstTraceId = firstEvent.contexts?.trace?.trace_id;
+  const firstSpanId = firstEvent.contexts?.trace?.span_id;
+
   expect(secondEvent.transaction).toBe('/another-lazy/sub/:id/:subId');
   expect(secondEvent.contexts?.trace?.op).toBe('navigation');
   expect(secondEvent.contexts?.trace?.status).toBe('ok');
+
   const secondTraceId = secondEvent.contexts?.trace?.trace_id;
   const secondSpanId = secondEvent.contexts?.trace?.span_id;
 
-  // Third navigation: /another-lazy -> /lazy/inner/:id/:anotherId/:someAnotherId (back to same route as first)
-  const thirdTransactionPromise = waitForTransaction('react-router-7-lazy-routes', async transactionEvent => {
-    return (
-      !!transactionEvent?.transaction &&
-      transactionEvent.contexts?.trace?.op === 'navigation' &&
-      transactionEvent.transaction === '/lazy/inner/:id/:anotherId/:someAnotherId' &&
-      // Ensure we're not matching the first transaction again
-      transactionEvent.contexts?.trace?.trace_id !== firstTraceId
-    );
-  });
-
-  const navigationBackToInner = page.locator('id=navigate-to-inner-from-deep');
-  await expect(navigationBackToInner).toBeVisible();
-  await navigationBackToInner.click();
-
-  const thirdEvent = await thirdTransactionPromise;
-
   // Verify third transaction
   expect(thirdEvent.transaction).toBe('/lazy/inner/:id/:anotherId/:someAnotherId');
   expect(thirdEvent.contexts?.trace?.op).toBe('navigation');
   expect(thirdEvent.contexts?.trace?.status).toBe('ok');
+
   const thirdTraceId = thirdEvent.contexts?.trace?.trace_id;
   const thirdSpanId = thirdEvent.contexts?.trace?.span_id;
 
diff --git a/packages/react/src/reactrouter-compat-utils/instrumentation.tsx b/packages/react/src/reactrouter-compat-utils/instrumentation.tsx
index a6e55f1a967c..235b207ed9a0 100644
--- a/packages/react/src/reactrouter-compat-utils/instrumentation.tsx
+++ b/packages/react/src/reactrouter-compat-utils/instrumentation.tsx
@@ -53,9 +53,11 @@ let _enableAsyncRouteHandlers: boolean = false;
 const CLIENTS_WITH_INSTRUMENT_NAVIGATION = new WeakSet<Client>();
 
 /**
- * Adds resolved routes as children to the parent route.
- * Prevents duplicate routes by checking if they already exist.
+ * Tracks last navigation per client to prevent duplicate spans in cross-usage scenarios.
+ * Entry persists until the navigation span ends, allowing cross-usage detection during delayed wrapper execution.
  */
+const LAST_NAVIGATION_PER_CLIENT = new WeakMap<Client, string>();
+
 export function addResolvedRoutesToParent(resolvedRoutes: RouteObject[], parentRoute: RouteObject): void {
   const existingChildren = parentRoute.children || [];
 
@@ -74,6 +76,26 @@ export function addResolvedRoutesToParent(resolvedRoutes: RouteObject[], parentR
   }
 }
 
+/**
+ * Determines if a navigation should be handled based on router state.
+ * Only handles:
+ * - PUSH navigations (always)
+ * - POP navigations (only after initial pageload is complete)
+ * - When router state is 'idle' (not 'loading' or 'submitting')
+ *
+ * During 'loading' or 'submitting', state.location may still have the old pathname,
+ * which would cause us to create a span for the wrong route.
+ */
+function shouldHandleNavigation(
+  state: { historyAction: string; navigation: { state: string } },
+  isInitialPageloadComplete: boolean,
+): boolean {
+  return (
+    (state.historyAction === 'PUSH' || (state.historyAction === 'POP' && isInitialPageloadComplete)) &&
+    state.navigation.state === 'idle'
+  );
+}
+
 export interface ReactRouterOptions {
   useEffect: UseEffect;
   useLocation: UseLocation;
@@ -275,27 +297,15 @@ export function createV6CompatibleWrapCreateBrowserRouter<
         // If we haven't seen a pageload span yet, keep waiting (don't mark as complete)
       }
 
-      const shouldHandleNavigation =
-        state.historyAction === 'PUSH' || (state.historyAction === 'POP' && isInitialPageloadComplete);
-
-      if (shouldHandleNavigation) {
-        const navigationHandler = (): void => {
-          handleNavigation({
-            location: state.location,
-            routes,
-            navigationType: state.historyAction,
-            version,
-            basename,
-            allRoutes: Array.from(allRoutes),
-          });
-        };
-
-        // Wait for the next render if loading an unsettled route
-        if (state.navigation.state !== 'idle') {
-          requestAnimationFrame(navigationHandler);
-        } else {
-          navigationHandler();
-        }
+      if (shouldHandleNavigation(state, isInitialPageloadComplete)) {
+        handleNavigation({
+          location: state.location,
+          routes,
+          navigationType: state.historyAction,
+          version,
+          basename,
+          allRoutes: Array.from(allRoutes),
+        });
       }
     });
 
@@ -404,29 +414,15 @@ export function createV6CompatibleWrapCreateMemoryRouter<
         // If we haven't seen a pageload span yet, keep waiting (don't mark as complete)
       }
 
-      const location = state.location;
-
-      const shouldHandleNavigation =
-        state.historyAction === 'PUSH' || (state.historyAction === 'POP' && isInitialPageloadComplete);
-
-      if (shouldHandleNavigation) {
-        const navigationHandler = (): void => {
-          handleNavigation({
-            location,
-            routes,
-            navigationType: state.historyAction,
-            version,
-            basename,
-            allRoutes: Array.from(allRoutes),
-          });
-        };
-
-        // Wait for the next render if loading an unsettled route
-        if (state.navigation.state !== 'idle') {
-          requestAnimationFrame(navigationHandler);
-        } else {
-          navigationHandler();
-        }
+      if (shouldHandleNavigation(state, isInitialPageloadComplete)) {
+        handleNavigation({
+          location: state.location,
+          routes,
+          navigationType: state.historyAction,
+          version,
+          basename,
+          allRoutes: Array.from(allRoutes),
+        });
       }
     });
 
@@ -622,6 +618,71 @@ function wrapPatchRoutesOnNavigation(
   };
 }
 
+function getNavigationKey(location: Location): string {
+  return `${location.pathname}${location.search}${location.hash}`;
+}
+
+function tryUpdateSpanName(
+  activeSpan: Span,
+  currentSpanName: string | undefined,
+  newName: string,
+  newSource: string,
+): void {
+  // Check if the new name contains React Router parameter syntax (/:param/)
+  const isReactRouterParam = /\/:[a-zA-Z0-9_]+/.test(newName);
+  const isNewNameParameterized = newName !== currentSpanName && isReactRouterParam;
+  if (isNewNameParameterized) {
+    activeSpan.updateName(newName);
+    activeSpan.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, newSource as 'route' | 'url' | 'custom');
+  }
+}
+
+function isDuplicateNavigation(client: Client, navigationKey: string): boolean {
+  const lastKey = LAST_NAVIGATION_PER_CLIENT.get(client);
+  return lastKey === navigationKey;
+}
+
+function createNavigationSpan(opts: {
+  client: Client;
+  name: string;
+  source: string;
+  version: string;
+  location: Location;
+  routes: RouteObject[];
+  basename?: string;
+  allRoutes?: RouteObject[];
+  navigationKey: string;
+}): Span | undefined {
+  const { client, name, source, version, location, routes, basename, allRoutes, navigationKey } = opts;
+
+  const navigationSpan = startBrowserTracingNavigationSpan(client, {
+    name,
+    attributes: {
+      [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: source as 'route' | 'url' | 'custom',
+      [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation',
+      [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: `auto.navigation.react.reactrouter_v${version}`,
+    },
+  });
+
+  if (navigationSpan) {
+    LAST_NAVIGATION_PER_CLIENT.set(client, navigationKey);
+    patchNavigationSpanEnd(navigationSpan, location, routes, basename, allRoutes);
+
+    const unsubscribe = client.on('spanEnd', endedSpan => {
+      if (endedSpan === navigationSpan) {
+        // Clear key only if it's still our key (handles overlapping navigations)
+        const lastKey = LAST_NAVIGATION_PER_CLIENT.get(client);
+        if (lastKey === navigationKey) {
+          LAST_NAVIGATION_PER_CLIENT.delete(client);
+        }
+        unsubscribe(); // Prevent memory leak
+      }
+    });
+  }
+
+  return navigationSpan;
+}
+
 export function handleNavigation(opts: {
   location: Location;
   routes: RouteObject[];
@@ -632,15 +693,13 @@ export function handleNavigation(opts: {
   allRoutes?: RouteObject[];
 }): void {
   const { location, routes, navigationType, version, matches, basename, allRoutes } = opts;
-  const branches = Array.isArray(matches) ? matches : _matchRoutes(routes, location, basename);
+  const branches = Array.isArray(matches) ? matches : _matchRoutes(allRoutes || routes, location, basename);
 
   const client = getClient();
   if (!client || !CLIENTS_WITH_INSTRUMENT_NAVIGATION.has(client)) {
     return;
   }
 
-  // Avoid starting a navigation span on initial load when a pageload root span is active.
-  // This commonly happens when lazy routes resolve during the first render and React Router emits a POP.
   const activeRootSpan = getActiveRootSpan();
   if (activeRootSpan && spanToJSON(activeRootSpan).op === 'pageload' && navigationType === 'POP') {
     return;
@@ -649,31 +708,39 @@ export function handleNavigation(opts: {
   if ((navigationType === 'PUSH' || navigationType === 'POP') && branches) {
     const [name, source] = resolveRouteNameAndSource(
       location,
-      routes,
+      allRoutes || routes,
       allRoutes || routes,
       branches as RouteMatch[],
       basename,
     );
 
-    const activeSpan = getActiveSpan();
-    const spanJson = activeSpan && spanToJSON(activeSpan);
-    const isAlreadyInNavigationSpan = spanJson?.op === 'navigation';
+    const currentNavigationKey = getNavigationKey(location);
+    const isNavDuplicate = isDuplicateNavigation(client, currentNavigationKey);
 
-    // Cross usage can result in multiple navigation spans being created without this check
-    if (!isAlreadyInNavigationSpan) {
-      const navigationSpan = startBrowserTracingNavigationSpan(client, {
-        name,
-        attributes: {
-          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: source,
-          [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation',
-          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: `auto.navigation.react.reactrouter_v${version}`,
-        },
-      });
+    if (isNavDuplicate) {
+      // Cross-usage duplicate - update existing span name if better
+      const activeSpan = getActiveSpan();
+      const spanJson = activeSpan && spanToJSON(activeSpan);
+      const isAlreadyInNavigationSpan = spanJson?.op === 'navigation';
 
-      // Patch navigation span to handle early cancellation (e.g., document.hidden)
-      if (navigationSpan) {
-        patchNavigationSpanEnd(navigationSpan, location, routes, basename, allRoutes);
+      if (isAlreadyInNavigationSpan && activeSpan) {
+        tryUpdateSpanName(activeSpan, spanJson?.description, name, source);
       }
+    } else {
+      // Not a cross-usage duplicate - create new span
+      // This handles: different routes, same route with different params (/user/2 → /user/3)
+      // startBrowserTracingNavigationSpan will end any active navigation span
+      createNavigationSpan({
+        client,
+        name,
+        source,
+        version,
+        location,
+        routes,
+        basename,
+        allRoutes,
+        navigationKey: currentNavigationKey,
+      });
     }
   }
 }
@@ -727,7 +794,13 @@ function updatePageloadTransaction({
     : (_matchRoutes(allRoutes || routes, location, basename) as unknown as RouteMatch[]);
 
   if (branches) {
-    const [name, source] = resolveRouteNameAndSource(location, routes, allRoutes || routes, branches, basename);
+    const [name, source] = resolveRouteNameAndSource(
+      location,
+      allRoutes || routes,
+      allRoutes || routes,
+      branches,
+      basename,
+    );
 
     getCurrentScope().setTransactionName(name || '/');
 
@@ -780,7 +853,7 @@ function patchSpanEnd(
         if (branches) {
           const [name, source] = resolveRouteNameAndSource(
             location,
-            routes,
+            currentAllRoutes.length > 0 ? currentAllRoutes : routes,
             currentAllRoutes.length > 0 ? currentAllRoutes : routes,
             branches,
             basename,
diff --git a/packages/react/src/reactrouter-compat-utils/utils.ts b/packages/react/src/reactrouter-compat-utils/utils.ts
index d6501d0e4dbf..4cec7bd98dcd 100644
--- a/packages/react/src/reactrouter-compat-utils/utils.ts
+++ b/packages/react/src/reactrouter-compat-utils/utils.ts
@@ -171,6 +171,13 @@ export function locationIsInsideDescendantRoute(location: Location, routes: Rout
   return false;
 }
 
+/**
+ * Returns a fallback transaction name from location pathname.
+ */
+function getFallbackTransactionName(location: Location, basename: string): string {
+  return _stripBasename ? stripBasenameFromPathname(location.pathname, basename) : location.pathname || '';
+}
+
 /**
  * Gets a normalized route name and transaction source from the current routes and location.
  */
@@ -184,53 +191,55 @@ export function getNormalizedName(
     return [_stripBasename ? stripBasenameFromPathname(location.pathname, basename) : location.pathname, 'url'];
   }
 
+  if (!branches) {
+    return [getFallbackTransactionName(location, basename), 'url'];
+  }
+
   let pathBuilder = '';
 
-  if (branches) {
-    for (const branch of branches) {
-      const route = branch.route;
-      if (route) {
-        // Early return if index route
-        if (route.index) {
-          return sendIndexPath(pathBuilder, branch.pathname, basename);
-        }
-        const path = route.path;
-
-        // If path is not a wildcard and has no child routes, append the path
-        if (path && !pathIsWildcardAndHasChildren(path, branch)) {
-          const newPath = path[0] === '/' || pathBuilder[pathBuilder.length - 1] === '/' ? path : `/${path}`;
-          pathBuilder = trimSlash(pathBuilder) + prefixWithSlash(newPath);
-
-          // If the path matches the current location, return the path
-          if (trimSlash(location.pathname) === trimSlash(basename + branch.pathname)) {
-            if (
-              // If the route defined on the element is something like
-              // <Route path="/stores/:storeId/products/:productId" element={<div>Product</div>} />
-              // We should check against the branch.pathname for the number of / separators
-              getNumberOfUrlSegments(pathBuilder) !== getNumberOfUrlSegments(branch.pathname) &&
-              // We should not count wildcard operators in the url segments calculation
-              !pathEndsWithWildcard(pathBuilder)
-            ) {
-              return [(_stripBasename ? '' : basename) + newPath, 'route'];
-            }
-
-            // if the last character of the pathbuilder is a wildcard and there are children, remove the wildcard
-            if (pathIsWildcardAndHasChildren(pathBuilder, branch)) {
-              pathBuilder = pathBuilder.slice(0, -1);
-            }
-
-            return [(_stripBasename ? '' : basename) + pathBuilder, 'route'];
-          }
-        }
-      }
+  for (const branch of branches) {
+    const route = branch.route;
+    if (!route) {
+      continue;
+    }
+
+    // Early return for index routes
+    if (route.index) {
+      return sendIndexPath(pathBuilder, branch.pathname, basename);
     }
-  }
 
-  const fallbackTransactionName = _stripBasename
-    ? stripBasenameFromPathname(location.pathname, basename)
-    : location.pathname || '';
+    const path = route.path;
+    if (!path || pathIsWildcardAndHasChildren(path, branch)) {
+      continue;
+    }
+
+    // Build the route path
+    const newPath = path[0] === '/' || pathBuilder[pathBuilder.length - 1] === '/' ? path : `/${path}`;
+    pathBuilder = trimSlash(pathBuilder) + prefixWithSlash(newPath);
+
+    // Check if this path matches the current location
+    if (trimSlash(location.pathname) !== trimSlash(basename + branch.pathname)) {
+      continue;
+    }
+
+    // Check if this is a parameterized route like /stores/:storeId/products/:productId
+    if (
+      getNumberOfUrlSegments(pathBuilder) !== getNumberOfUrlSegments(branch.pathname) &&
+      !pathEndsWithWildcard(pathBuilder)
+    ) {
+      return [(_stripBasename ? '' : basename) + newPath, 'route'];
+    }
+
+    // Handle wildcard routes with children - strip trailing wildcard
+    if (pathIsWildcardAndHasChildren(pathBuilder, branch)) {
+      pathBuilder = pathBuilder.slice(0, -1);
+    }
+
+    return [(_stripBasename ? '' : basename) + pathBuilder, 'route'];
+  }
 
-  return [fallbackTransactionName, 'url'];
+  // Fallback when no matching route found
+  return [getFallbackTransactionName(location, basename), 'url'];
 }
 
 /**
diff --git a/packages/react/test/reactrouter-cross-usage.test.tsx b/packages/react/test/reactrouter-cross-usage.test.tsx
index 77d8e3d95b2e..be71f4b838c5 100644
--- a/packages/react/test/reactrouter-cross-usage.test.tsx
+++ b/packages/react/test/reactrouter-cross-usage.test.tsx
@@ -9,7 +9,7 @@ import {
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
   setCurrentClient,
 } from '@sentry/core';
-import { render } from '@testing-library/react';
+import { act, render, waitFor } from '@testing-library/react';
 import * as React from 'react';
 import {
   createMemoryRouter,
@@ -26,6 +26,7 @@ import {
 } from 'react-router-6';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { BrowserClient } from '../src';
+import { allRoutes } from '../src/reactrouter-compat-utils/instrumentation';
 import {
   reactRouterV6BrowserTracingIntegration,
   withSentryReactRouterV6Routing,
@@ -101,6 +102,7 @@ describe('React Router cross usage of wrappers', () => {
   beforeEach(() => {
     vi.clearAllMocks();
     getCurrentScope().setClient(undefined);
+    allRoutes.clear();
   });
 
   describe('wrapCreateBrowserRouter and wrapUseRoutes', () => {
@@ -218,16 +220,10 @@ describe('React Router cross usage of wrappers', () => {
 
       expect(container.innerHTML).toContain('Details');
 
-      // It's called 1 time from the wrapped `MemoryRouter`
       expect(mockStartBrowserTracingNavigationSpan).toHaveBeenCalledTimes(1);
-      expect(mockStartBrowserTracingNavigationSpan).toHaveBeenLastCalledWith(expect.any(BrowserClient), {
-        name: '/second-level/:id/third-level/:id',
-        attributes: {
-          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
-          [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation',
-          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.react.reactrouter_v6',
-        },
-      });
+      // In cross-usage scenarios, the first wrapper creates the span and the second updates it
+      expect(mockNavigationSpan.updateName).toHaveBeenCalledWith('/second-level/:id/third-level/:id');
+      expect(mockNavigationSpan.setAttribute).toHaveBeenCalledWith(SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, 'route');
     });
   });
 
@@ -339,7 +335,6 @@ describe('React Router cross usage of wrappers', () => {
 
       expect(container.innerHTML).toContain('Details');
 
-      // It's called 1 time from the wrapped `MemoryRouter`
       expect(mockStartBrowserTracingNavigationSpan).toHaveBeenCalledTimes(1);
     });
   });
@@ -465,17 +460,12 @@ describe('React Router cross usage of wrappers', () => {
 
       expect(container.innerHTML).toContain('Details');
 
-      // It's called 1 time from the wrapped `createMemoryRouter`
       expect(mockStartBrowserTracingNavigationSpan).toHaveBeenCalledTimes(1);
 
-      expect(mockStartBrowserTracingNavigationSpan).toHaveBeenLastCalledWith(expect.any(BrowserClient), {
-        name: '/second-level/:id/third-level/:id',
-        attributes: {
-          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
-          [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation',
-          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.react.reactrouter_v6',
-        },
-      });
+      // Cross-usage deduplication: Span created once with initial route name
+      // With nested lazy routes, initial name may be raw path, updated to parameterized by later wrapper
+      expect(mockNavigationSpan.updateName).toHaveBeenCalledWith('/second-level/:id/third-level/:id');
+      expect(mockNavigationSpan.setAttribute).toHaveBeenCalledWith(SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, 'route');
     });
   });
 
@@ -597,14 +587,290 @@ describe('React Router cross usage of wrappers', () => {
 
       expect(container.innerHTML).toContain('Details');
       expect(mockStartBrowserTracingNavigationSpan).toHaveBeenCalledTimes(1);
+      // Cross-usage with all three wrappers: span created once, then updated
+      expect(mockNavigationSpan.updateName).toHaveBeenCalledWith('/second-level/:id/third-level/:id');
+      expect(mockNavigationSpan.setAttribute).toHaveBeenCalledWith(SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, 'route');
+    });
+  });
+
+  describe('consecutive navigations to different routes', () => {
+    it('should create separate transactions for consecutive navigations to different routes', async () => {
+      const client = createMockBrowserClient();
+      setCurrentClient(client);
+
+      client.addIntegration(
+        reactRouterV6BrowserTracingIntegration({
+          useEffect: React.useEffect,
+          useLocation,
+          useNavigationType,
+          createRoutesFromChildren,
+          matchRoutes,
+        }),
+      );
+
+      const createSentryMemoryRouter = wrapCreateMemoryRouterV6(createMemoryRouter);
+
+      const router = createSentryMemoryRouter(
+        [
+          {
+            children: [
+              { path: '/users', element: <div>Users</div> },
+              { path: '/settings', element: <div>Settings</div> },
+              { path: '/profile', element: <div>Profile</div> },
+            ],
+          },
+        ],
+        { initialEntries: ['/users'] },
+      );
+
+      render(
+        <React.StrictMode>
+          <RouterProvider router={router} />
+        </React.StrictMode>,
+      );
+
+      expect(mockStartBrowserTracingNavigationSpan).not.toHaveBeenCalled();
+
+      await act(async () => {
+        router.navigate('/settings');
+        await waitFor(() => expect(mockStartBrowserTracingNavigationSpan).toHaveBeenCalledTimes(1));
+      });
+
       expect(mockStartBrowserTracingNavigationSpan).toHaveBeenLastCalledWith(expect.any(BrowserClient), {
-        name: '/second-level/:id/third-level/:id',
+        name: '/settings',
         attributes: {
           [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
           [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation',
           [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.react.reactrouter_v6',
         },
       });
+
+      await act(async () => {
+        router.navigate('/profile');
+        await waitFor(() => expect(mockStartBrowserTracingNavigationSpan).toHaveBeenCalledTimes(2));
+      });
+
+      expect(mockStartBrowserTracingNavigationSpan).toHaveBeenCalledTimes(2);
+
+      const calls = mockStartBrowserTracingNavigationSpan.mock.calls;
+      expect(calls[0]![1].name).toBe('/settings');
+      expect(calls[1]![1].name).toBe('/profile');
+      expect(calls[0]![1].attributes[SEMANTIC_ATTRIBUTE_SENTRY_OP]).toBe('navigation');
+      expect(calls[1]![1].attributes[SEMANTIC_ATTRIBUTE_SENTRY_OP]).toBe('navigation');
+    });
+
+    it('should create separate transactions for rapid consecutive navigations', async () => {
+      const client = createMockBrowserClient();
+      setCurrentClient(client);
+
+      client.addIntegration(
+        reactRouterV6BrowserTracingIntegration({
+          useEffect: React.useEffect,
+          useLocation,
+          useNavigationType,
+          createRoutesFromChildren,
+          matchRoutes,
+        }),
+      );
+
+      const createSentryMemoryRouter = wrapCreateMemoryRouterV6(createMemoryRouter);
+
+      const router = createSentryMemoryRouter(
+        [
+          {
+            children: [
+              { path: '/a', element: <div>A</div> },
+              { path: '/b', element: <div>B</div> },
+              { path: '/c', element: <div>C</div> },
+            ],
+          },
+        ],
+        { initialEntries: ['/a'] },
+      );
+
+      render(
+        <React.StrictMode>
+          <RouterProvider router={router} />
+        </React.StrictMode>,
+      );
+
+      await act(async () => {
+        router.navigate('/b');
+        router.navigate('/c');
+        await waitFor(() => expect(mockStartBrowserTracingNavigationSpan).toHaveBeenCalledTimes(2));
+      });
+
+      expect(mockStartBrowserTracingNavigationSpan).toHaveBeenCalledTimes(2);
+
+      const calls = mockStartBrowserTracingNavigationSpan.mock.calls;
+      expect(calls[0]![1].name).toBe('/b');
+      expect(calls[1]![1].name).toBe('/c');
+    });
+
+    it('should create separate spans for same route with different params', async () => {
+      const client = createMockBrowserClient();
+      setCurrentClient(client);
+
+      client.addIntegration(
+        reactRouterV6BrowserTracingIntegration({
+          useEffect: React.useEffect,
+          useLocation,
+          useNavigationType,
+          createRoutesFromChildren,
+          matchRoutes,
+        }),
+      );
+
+      const createSentryMemoryRouter = wrapCreateMemoryRouterV6(createMemoryRouter);
+
+      const router = createSentryMemoryRouter(
+        [
+          {
+            children: [{ path: '/user/:id', element: <div>User</div> }],
+          },
+        ],
+        { initialEntries: ['/user/1'] },
+      );
+
+      render(
+        <React.StrictMode>
+          <RouterProvider router={router} />
+        </React.StrictMode>,
+      );
+
+      await act(async () => {
+        router.navigate('/user/2');
+        await waitFor(() => expect(mockStartBrowserTracingNavigationSpan).toHaveBeenCalledTimes(1));
+      });
+
+      expect(mockStartBrowserTracingNavigationSpan).toHaveBeenCalledTimes(1);
+      expect(mockStartBrowserTracingNavigationSpan).toHaveBeenCalledWith(expect.any(BrowserClient), {
+        name: '/user/:id',
+        attributes: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
+          [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation',
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.react.reactrouter_v6',
+        },
+      });
+
+      await act(async () => {
+        router.navigate('/user/3');
+        await waitFor(() => expect(mockStartBrowserTracingNavigationSpan).toHaveBeenCalledTimes(2));
+      });
+
+      // Should create 2 spans - different concrete paths are different user actions
+      expect(mockStartBrowserTracingNavigationSpan).toHaveBeenCalledTimes(2);
+      expect(mockStartBrowserTracingNavigationSpan).toHaveBeenNthCalledWith(2, expect.any(BrowserClient), {
+        name: '/user/:id',
+        attributes: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
+          [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation',
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.react.reactrouter_v6',
+        },
+      });
+    });
+
+    it('should handle mixed cross-usage and consecutive navigations correctly', async () => {
+      const client = createMockBrowserClient();
+      setCurrentClient(client);
+
+      client.addIntegration(
+        reactRouterV6BrowserTracingIntegration({
+          useEffect: React.useEffect,
+          useLocation,
+          useNavigationType,
+          createRoutesFromChildren,
+          matchRoutes,
+        }),
+      );
+
+      const createSentryMemoryRouter = wrapCreateMemoryRouterV6(createMemoryRouter);
+      const sentryUseRoutes = wrapUseRoutesV6(useRoutes);
+
+      const UsersRoute: React.FC = () => sentryUseRoutes([{ path: '/', element: <div>Users</div> }]);
+
+      const SettingsRoute: React.FC = () => sentryUseRoutes([{ path: '/', element: <div>Settings</div> }]);
+
+      const router = createSentryMemoryRouter(
+        [
+          {
+            children: [
+              { path: '/users/*', element: <UsersRoute /> },
+              { path: '/settings/*', element: <SettingsRoute /> },
+            ],
+          },
+        ],
+        { initialEntries: ['/users'] },
+      );
+
+      render(
+        <React.StrictMode>
+          <RouterProvider router={router} />
+        </React.StrictMode>,
+      );
+
+      expect(mockStartBrowserTracingNavigationSpan).not.toHaveBeenCalled();
+
+      await act(async () => {
+        router.navigate('/settings');
+        await waitFor(() => expect(mockStartBrowserTracingNavigationSpan).toHaveBeenCalledTimes(1));
+      });
+
+      expect(mockStartBrowserTracingNavigationSpan).toHaveBeenCalledTimes(1);
+      expect(mockStartBrowserTracingNavigationSpan).toHaveBeenLastCalledWith(expect.any(BrowserClient), {
+        name: '/settings/*',
+        attributes: expect.objectContaining({
+          [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation',
+        }),
+      });
+    });
+
+    it('should not create duplicate spans for cross-usage on same route', async () => {
+      const client = createMockBrowserClient();
+      setCurrentClient(client);
+
+      client.addIntegration(
+        reactRouterV6BrowserTracingIntegration({
+          useEffect: React.useEffect,
+          useLocation,
+          useNavigationType,
+          createRoutesFromChildren,
+          matchRoutes,
+        }),
+      );
+
+      const createSentryMemoryRouter = wrapCreateMemoryRouterV6(createMemoryRouter);
+      const sentryUseRoutes = wrapUseRoutesV6(useRoutes);
+
+      const NestedRoute: React.FC = () => sentryUseRoutes([{ path: '/', element: <div>Details</div> }]);
+
+      const router = createSentryMemoryRouter(
+        [
+          {
+            children: [{ path: '/details/*', element: <NestedRoute /> }],
+          },
+        ],
+        { initialEntries: ['/home'] },
+      );
+
+      render(
+        <React.StrictMode>
+          <RouterProvider router={router} />
+        </React.StrictMode>,
+      );
+
+      await act(async () => {
+        router.navigate('/details');
+        await waitFor(() => expect(mockStartBrowserTracingNavigationSpan).toHaveBeenCalled());
+      });
+
+      expect(mockStartBrowserTracingNavigationSpan).toHaveBeenCalledTimes(1);
+      expect(mockStartBrowserTracingNavigationSpan).toHaveBeenCalledWith(expect.any(BrowserClient), {
+        name: '/details/*',
+        attributes: expect.objectContaining({
+          [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation',
+        }),
+      });
     });
   });
 });
diff --git a/packages/react/test/reactrouter-descendant-routes.test.tsx b/packages/react/test/reactrouter-descendant-routes.test.tsx
index fe75bc81e858..a08893694a30 100644
--- a/packages/react/test/reactrouter-descendant-routes.test.tsx
+++ b/packages/react/test/reactrouter-descendant-routes.test.tsx
@@ -25,6 +25,7 @@ import {
 } from 'react-router-6';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { BrowserClient } from '../src';
+import { allRoutes } from '../src/reactrouter-compat-utils/instrumentation';
 import {
   reactRouterV6BrowserTracingIntegration,
   withSentryReactRouterV6Routing,
@@ -79,6 +80,7 @@ describe('React Router Descendant Routes', () => {
   beforeEach(() => {
     vi.clearAllMocks();
     getCurrentScope().setClient(undefined);
+    allRoutes.clear();
   });
 
   describe('withSentryReactRouterV6Routing', () => {
diff --git a/packages/react/test/reactrouterv6.test.tsx b/packages/react/test/reactrouterv6.test.tsx
index 61fefdff9b63..fda5043d2e6a 100644
--- a/packages/react/test/reactrouterv6.test.tsx
+++ b/packages/react/test/reactrouterv6.test.tsx
@@ -28,6 +28,7 @@ import {
 } from 'react-router-6';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { BrowserClient } from '../src';
+import { allRoutes } from '../src/reactrouter-compat-utils/instrumentation';
 import {
   reactRouterV6BrowserTracingIntegration,
   withSentryReactRouterV6Routing,
@@ -83,6 +84,7 @@ describe('reactRouterV6BrowserTracingIntegration', () => {
   beforeEach(() => {
     vi.clearAllMocks();
     getCurrentScope().setClient(undefined);
+    allRoutes.clear();
   });
 
   it('wrapCreateMemoryRouterV6 starts and updates a pageload transaction - single initialEntry', () => {

From d729cdbd568425be29b9cfa72d31eede24b15949 Mon Sep 17 00:00:00 2001
From: Abdelrahman Awad <me@awad.dev>
Date: Tue, 18 Nov 2025 11:40:53 +0200
Subject: [PATCH 082/186] feat(nextjs): Add URL to server-side transaction
 events (#18230)

URLs were missing from server-side transaction events (server
components, generation functions) in Next.js. This was previously
removed in #18113 because we tried to synchronously access `params` and
`searchParams`, which cause builds to crash.

This PR approach adds the URL at runtime using a `preprocessEvent` hook
as suggested.

**Implementation**

1. Reads `http.target` (actual request path) and `next.route`
(parameterized route) from the transaction's trace data
2. Extracts headers from the captured isolation scope's SDK processing
metadata
3. Builds the full URL using the existing `getSanitizedRequestUrl()`
utility
4. Adds it to `normalizedRequest.url` so the `requestDataIntegration`
includes it in the event

This works uniformly for both Webpack and Turbopack across all of our
supported Next.js versions (13~16), I added missing tests for this case
in the versions that did not have it.

Fixes #18115
---
 .../tests/server/server-components.test.ts    | 48 +++++++++++++++++++
 .../nextjs-15/tests/server-components.test.ts | 48 +++++++++++++++++++
 .../nextjs-16/tests/server-components.test.ts | 48 +++++++++++++++++++
 .../tests/server-components.test.ts           |  7 +--
 .../tests/app-router/route-handlers.test.ts   |  3 +-
 .../app-router/server-components.test.ts      | 48 +++++++++++++++++++
 .../common/utils/setUrlProcessingMetadata.ts  | 42 ++++++++++++++++
 packages/nextjs/src/edge/index.ts             |  3 ++
 packages/nextjs/src/server/index.ts           |  3 ++
 9 files changed, 243 insertions(+), 7 deletions(-)
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-13/tests/server/server-components.test.ts
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-15/tests/server-components.test.ts
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16/tests/server-components.test.ts
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-turbo/tests/app-router/server-components.test.ts
 create mode 100644 packages/nextjs/src/common/utils/setUrlProcessingMetadata.ts

diff --git a/dev-packages/e2e-tests/test-applications/nextjs-13/tests/server/server-components.test.ts b/dev-packages/e2e-tests/test-applications/nextjs-13/tests/server/server-components.test.ts
new file mode 100644
index 000000000000..c9e3a6ff588c
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-13/tests/server/server-components.test.ts
@@ -0,0 +1,48 @@
+import { expect, test } from '@playwright/test';
+import { waitForTransaction } from '@sentry-internal/test-utils';
+
+test('Sends a transaction for a request to app router with URL', async ({ page }) => {
+  const serverComponentTransactionPromise = waitForTransaction('nextjs-13', transactionEvent => {
+    return (
+      transactionEvent?.transaction === 'GET /parameterized/[one]/beep/[two]' &&
+      transactionEvent.contexts?.trace?.data?.['http.target']?.startsWith('/parameterized/1337/beep/42')
+    );
+  });
+
+  await page.goto('/parameterized/1337/beep/42');
+
+  const transactionEvent = await serverComponentTransactionPromise;
+
+  expect(transactionEvent.contexts?.trace).toEqual({
+    data: expect.objectContaining({
+      'sentry.op': 'http.server',
+      'sentry.origin': 'auto',
+      'sentry.sample_rate': 1,
+      'sentry.source': 'route',
+      'http.method': 'GET',
+      'http.response.status_code': 200,
+      'http.route': '/parameterized/[one]/beep/[two]',
+      'http.status_code': 200,
+      'http.target': '/parameterized/1337/beep/42',
+      'otel.kind': 'SERVER',
+      'next.route': '/parameterized/[one]/beep/[two]',
+    }),
+    op: 'http.server',
+    origin: 'auto',
+    span_id: expect.stringMatching(/[a-f0-9]{16}/),
+    status: 'ok',
+    trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+  });
+
+  expect(transactionEvent.request).toMatchObject({
+    url: expect.stringContaining('/parameterized/1337/beep/42'),
+  });
+
+  // The transaction should not contain any spans with the same name as the transaction
+  // e.g. "GET /parameterized/[one]/beep/[two]"
+  expect(
+    transactionEvent.spans?.filter(span => {
+      return span.description === transactionEvent.transaction;
+    }),
+  ).toHaveLength(0);
+});
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-15/tests/server-components.test.ts b/dev-packages/e2e-tests/test-applications/nextjs-15/tests/server-components.test.ts
new file mode 100644
index 000000000000..2f3488976d28
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-15/tests/server-components.test.ts
@@ -0,0 +1,48 @@
+import { expect, test } from '@playwright/test';
+import { waitForTransaction } from '@sentry-internal/test-utils';
+
+test('Sends a transaction for a request to app router with URL', async ({ page }) => {
+  const serverComponentTransactionPromise = waitForTransaction('nextjs-15', transactionEvent => {
+    return (
+      transactionEvent?.transaction === 'GET /parameterized/[one]/beep/[two]' &&
+      transactionEvent.contexts?.trace?.data?.['http.target']?.startsWith('/parameterized/1337/beep/42')
+    );
+  });
+
+  await page.goto('/parameterized/1337/beep/42');
+
+  const transactionEvent = await serverComponentTransactionPromise;
+
+  expect(transactionEvent.contexts?.trace).toEqual({
+    data: expect.objectContaining({
+      'sentry.op': 'http.server',
+      'sentry.origin': 'auto',
+      'sentry.sample_rate': 1,
+      'sentry.source': 'route',
+      'http.method': 'GET',
+      'http.response.status_code': 200,
+      'http.route': '/parameterized/[one]/beep/[two]',
+      'http.status_code': 200,
+      'http.target': '/parameterized/1337/beep/42',
+      'otel.kind': 'SERVER',
+      'next.route': '/parameterized/[one]/beep/[two]',
+    }),
+    op: 'http.server',
+    origin: 'auto',
+    span_id: expect.stringMatching(/[a-f0-9]{16}/),
+    status: 'ok',
+    trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+  });
+
+  expect(transactionEvent.request).toMatchObject({
+    url: expect.stringContaining('/parameterized/1337/beep/42'),
+  });
+
+  // The transaction should not contain any spans with the same name as the transaction
+  // e.g. "GET /parameterized/[one]/beep/[two]"
+  expect(
+    transactionEvent.spans?.filter(span => {
+      return span.description === transactionEvent.transaction;
+    }),
+  ).toHaveLength(0);
+});
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16/tests/server-components.test.ts b/dev-packages/e2e-tests/test-applications/nextjs-16/tests/server-components.test.ts
new file mode 100644
index 000000000000..d5b1a00b30d8
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16/tests/server-components.test.ts
@@ -0,0 +1,48 @@
+import { expect, test } from '@playwright/test';
+import { waitForTransaction } from '@sentry-internal/test-utils';
+
+test('Sends a transaction for a request to app router with URL', async ({ page }) => {
+  const serverComponentTransactionPromise = waitForTransaction('nextjs-16', transactionEvent => {
+    return (
+      transactionEvent?.transaction === 'GET /parameterized/[one]/beep/[two]' &&
+      transactionEvent.contexts?.trace?.data?.['http.target']?.startsWith('/parameterized/1337/beep/42')
+    );
+  });
+
+  await page.goto('/parameterized/1337/beep/42');
+
+  const transactionEvent = await serverComponentTransactionPromise;
+
+  expect(transactionEvent.contexts?.trace).toEqual({
+    data: expect.objectContaining({
+      'sentry.op': 'http.server',
+      'sentry.origin': 'auto',
+      'sentry.sample_rate': 1,
+      'sentry.source': 'route',
+      'http.method': 'GET',
+      'http.response.status_code': 200,
+      'http.route': '/parameterized/[one]/beep/[two]',
+      'http.status_code': 200,
+      'http.target': '/parameterized/1337/beep/42',
+      'otel.kind': 'SERVER',
+      'next.route': '/parameterized/[one]/beep/[two]',
+    }),
+    op: 'http.server',
+    origin: 'auto',
+    span_id: expect.stringMatching(/[a-f0-9]{16}/),
+    status: 'ok',
+    trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+  });
+
+  expect(transactionEvent.request).toMatchObject({
+    url: expect.stringContaining('/parameterized/1337/beep/42'),
+  });
+
+  // The transaction should not contain any spans with the same name as the transaction
+  // e.g. "GET /parameterized/[one]/beep/[two]"
+  expect(
+    transactionEvent.spans?.filter(span => {
+      return span.description === transactionEvent.transaction;
+    }),
+  ).toHaveLength(0);
+});
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-app-dir/tests/server-components.test.ts b/dev-packages/e2e-tests/test-applications/nextjs-app-dir/tests/server-components.test.ts
index 25d84cdc28e1..eedb702715de 100644
--- a/dev-packages/e2e-tests/test-applications/nextjs-app-dir/tests/server-components.test.ts
+++ b/dev-packages/e2e-tests/test-applications/nextjs-app-dir/tests/server-components.test.ts
@@ -34,11 +34,8 @@ test('Sends a transaction for a request to app router', async ({ page }) => {
     trace_id: expect.stringMatching(/[a-f0-9]{32}/),
   });
 
-  expect(transactionEvent.request).toEqual({
-    cookies: {},
-    headers: expect.objectContaining({
-      'user-agent': expect.any(String),
-    }),
+  expect(transactionEvent.request).toMatchObject({
+    url: expect.stringContaining('/server-component/parameter/1337/42'),
   });
 
   // The transaction should not contain any spans with the same name as the transaction
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-turbo/tests/app-router/route-handlers.test.ts b/dev-packages/e2e-tests/test-applications/nextjs-turbo/tests/app-router/route-handlers.test.ts
index 544ba0084167..13f4f5fa4a58 100644
--- a/dev-packages/e2e-tests/test-applications/nextjs-turbo/tests/app-router/route-handlers.test.ts
+++ b/dev-packages/e2e-tests/test-applications/nextjs-turbo/tests/app-router/route-handlers.test.ts
@@ -66,8 +66,7 @@ test('Should record exceptions and transactions for faulty route handlers', asyn
   expect(routehandlerError.exception?.values?.[0].value).toBe('Dynamic route handler error');
 
   expect(routehandlerError.request?.method).toBe('GET');
-  // todo: make sure url is attached to request object
-  // expect(routehandlerError.request?.url).toContain('/route-handlers/boop/error');
+  expect(routehandlerError.request?.url).toContain('/route-handlers/boop/error');
 
   expect(routehandlerError.transaction).toBe('/route-handlers/[param]/error');
 });
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-turbo/tests/app-router/server-components.test.ts b/dev-packages/e2e-tests/test-applications/nextjs-turbo/tests/app-router/server-components.test.ts
new file mode 100644
index 000000000000..d3a6db69fcd5
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-turbo/tests/app-router/server-components.test.ts
@@ -0,0 +1,48 @@
+import { expect, test } from '@playwright/test';
+import { waitForTransaction } from '@sentry-internal/test-utils';
+
+test('Sends a transaction for a request to app router with URL', async ({ page }) => {
+  const serverComponentTransactionPromise = waitForTransaction('nextjs-turbo', transactionEvent => {
+    return (
+      transactionEvent?.transaction === 'GET /parameterized/[one]/beep/[two]' &&
+      transactionEvent.contexts?.trace?.data?.['http.target']?.startsWith('/parameterized/1337/beep/42')
+    );
+  });
+
+  await page.goto('/parameterized/1337/beep/42');
+
+  const transactionEvent = await serverComponentTransactionPromise;
+
+  expect(transactionEvent.contexts?.trace).toEqual({
+    data: expect.objectContaining({
+      'sentry.op': 'http.server',
+      'sentry.origin': 'auto',
+      'sentry.sample_rate': 1,
+      'sentry.source': 'route',
+      'http.method': 'GET',
+      'http.response.status_code': 200,
+      'http.route': '/parameterized/[one]/beep/[two]',
+      'http.status_code': 200,
+      'http.target': '/parameterized/1337/beep/42',
+      'otel.kind': 'SERVER',
+      'next.route': '/parameterized/[one]/beep/[two]',
+    }),
+    op: 'http.server',
+    origin: 'auto',
+    span_id: expect.stringMatching(/[a-f0-9]{16}/),
+    status: 'ok',
+    trace_id: expect.stringMatching(/[a-f0-9]{32}/),
+  });
+
+  expect(transactionEvent.request).toMatchObject({
+    url: expect.stringContaining('/parameterized/1337/beep/42'),
+  });
+
+  // The transaction should not contain any spans with the same name as the transaction
+  // e.g. "GET /parameterized/[one]/beep/[two]"
+  expect(
+    transactionEvent.spans?.filter(span => {
+      return span.description === transactionEvent.transaction;
+    }),
+  ).toHaveLength(0);
+});
diff --git a/packages/nextjs/src/common/utils/setUrlProcessingMetadata.ts b/packages/nextjs/src/common/utils/setUrlProcessingMetadata.ts
new file mode 100644
index 000000000000..0c7e0c3b33f2
--- /dev/null
+++ b/packages/nextjs/src/common/utils/setUrlProcessingMetadata.ts
@@ -0,0 +1,42 @@
+import type { Event } from '@sentry/core';
+import { getClient } from '@sentry/core';
+import { getSanitizedRequestUrl } from './urls';
+
+/**
+ * Sets the URL processing metadata for the event.
+ */
+export function setUrlProcessingMetadata(event: Event): void {
+  // Skip if not a server-side transaction
+  if (event.type !== 'transaction' || event.contexts?.trace?.op !== 'http.server' || !event.contexts?.trace?.data) {
+    return;
+  }
+
+  // Only add URL if sendDefaultPii is enabled, as URLs may contain PII
+  const client = getClient();
+  if (!client?.getOptions().sendDefaultPii) {
+    return;
+  }
+
+  const traceData = event.contexts.trace.data;
+
+  // Get the route from trace data
+  const componentRoute = traceData['next.route'] || traceData['http.route'];
+  const httpTarget = traceData['http.target'] as string | undefined;
+
+  if (!componentRoute) {
+    return;
+  }
+
+  // Extract headers
+  const isolationScopeData = event.sdkProcessingMetadata?.capturedSpanIsolationScope?.getScopeData();
+  const headersDict = isolationScopeData?.sdkProcessingMetadata?.normalizedRequest?.headers;
+
+  const url = getSanitizedRequestUrl(componentRoute, undefined, headersDict, httpTarget?.toString());
+
+  // Add URL to the isolation scope's normalizedRequest so requestDataIntegration picks it up
+  if (url && isolationScopeData?.sdkProcessingMetadata) {
+    isolationScopeData.sdkProcessingMetadata.normalizedRequest =
+      isolationScopeData.sdkProcessingMetadata.normalizedRequest || {};
+    isolationScopeData.sdkProcessingMetadata.normalizedRequest.url = url;
+  }
+}
diff --git a/packages/nextjs/src/edge/index.ts b/packages/nextjs/src/edge/index.ts
index 6ee523fe72dc..5fd92707b912 100644
--- a/packages/nextjs/src/edge/index.ts
+++ b/packages/nextjs/src/edge/index.ts
@@ -22,6 +22,7 @@ import { getDefaultIntegrations, init as vercelEdgeInit } from '@sentry/vercel-e
 import { addHeadersAsAttributes } from '../common/utils/addHeadersAsAttributes';
 import { isBuild } from '../common/utils/isBuild';
 import { flushSafelyWithTimeout } from '../common/utils/responseEnd';
+import { setUrlProcessingMetadata } from '../common/utils/setUrlProcessingMetadata';
 import { distDirRewriteFramesIntegration } from './distDirRewriteFramesIntegration';
 
 export * from '@sentry/vercel-edge';
@@ -126,6 +127,8 @@ export function init(options: VercelEdgeOptions = {}): void {
         }
       }
     }
+
+    setUrlProcessingMetadata(event);
   });
 
   client?.on('spanEnd', span => {
diff --git a/packages/nextjs/src/server/index.ts b/packages/nextjs/src/server/index.ts
index aa6210c2ff6a..ce8ac7c56cea 100644
--- a/packages/nextjs/src/server/index.ts
+++ b/packages/nextjs/src/server/index.ts
@@ -39,6 +39,7 @@ import {
 } from '../common/span-attributes-with-logic-attached';
 import { addHeadersAsAttributes } from '../common/utils/addHeadersAsAttributes';
 import { isBuild } from '../common/utils/isBuild';
+import { setUrlProcessingMetadata } from '../common/utils/setUrlProcessingMetadata';
 import { distDirRewriteFramesIntegration } from './distDirRewriteFramesIntegration';
 
 export * from '@sentry/node';
@@ -391,6 +392,8 @@ export function init(options: NodeOptions): NodeClient | undefined {
         event.contexts.trace.parent_span_id = traceparentData.parentSpanId;
       }
     }
+
+    setUrlProcessingMetadata(event);
   });
 
   if (process.env.NODE_ENV === 'development') {

From 9482a0274f79cd7ae71d18584aec3068787bde79 Mon Sep 17 00:00:00 2001
From: Charly Gomez <charly.gomez@sentry.io>
Date: Tue, 18 Nov 2025 11:41:34 +0100
Subject: [PATCH 083/186] fix(nextjs): Respect PORT variable for dev error
 symbolication (#18227)

Next.js respects the PORT variable. If for some reason this is not
sufficient for users we can ship a follow up with a config option, which
I wanted to avoid in the first step.

Also did a small refactor of the fetching code.

closes https://github.com/getsentry/sentry-javascript/issues/18135
closes
https://linear.app/getsentry/issue/JS-1139/handle-the-case-where-users-define-a-different-portprotocol
---
 .../nextjs-orpc/tests/orpc-error.test.ts      |   7 +-
 .../devErrorSymbolicationEventProcessor.ts    |  98 ++++----
 ...evErrorSymbolicationEventProcessor.test.ts | 215 ++++++++++++++++++
 3 files changed, 268 insertions(+), 52 deletions(-)

diff --git a/dev-packages/e2e-tests/test-applications/nextjs-orpc/tests/orpc-error.test.ts b/dev-packages/e2e-tests/test-applications/nextjs-orpc/tests/orpc-error.test.ts
index a503533b6f00..a5f5494ee61c 100644
--- a/dev-packages/e2e-tests/test-applications/nextjs-orpc/tests/orpc-error.test.ts
+++ b/dev-packages/e2e-tests/test-applications/nextjs-orpc/tests/orpc-error.test.ts
@@ -1,9 +1,12 @@
 import { expect, test } from '@playwright/test';
 import { waitForError } from '@sentry-internal/test-utils';
 
-test('should capture orpc error', async ({ page }) => {
+test('should capture server-side orpc error', async ({ page }) => {
   const orpcErrorPromise = waitForError('nextjs-orpc', errorEvent => {
-    return errorEvent.exception?.values?.[0]?.value === 'You are hitting an error';
+    return (
+      errorEvent.exception?.values?.[0]?.value === 'You are hitting an error' &&
+      errorEvent.contexts?.['runtime']?.name === 'node'
+    );
   });
 
   await page.goto('/');
diff --git a/packages/nextjs/src/common/devErrorSymbolicationEventProcessor.ts b/packages/nextjs/src/common/devErrorSymbolicationEventProcessor.ts
index 9ae0a5ee0bb2..3b02d92d80fb 100644
--- a/packages/nextjs/src/common/devErrorSymbolicationEventProcessor.ts
+++ b/packages/nextjs/src/common/devErrorSymbolicationEventProcessor.ts
@@ -15,6 +15,44 @@ const globalWithInjectedValues = GLOBAL_OBJ as typeof GLOBAL_OBJ & {
   _sentryNextJsVersion: string | undefined;
 };
 
+/**
+ * Constructs the base URL for the Next.js dev server, including the port and base path.
+ * Returns only the base path when running in the browser (client-side) for relative URLs.
+ */
+function getDevServerBaseUrl(): string {
+  let basePath = process.env._sentryBasePath ?? globalWithInjectedValues._sentryBasePath ?? '';
+
+  // Prefix the basepath with a slash if it doesn't have one
+  if (basePath !== '' && !basePath.match(/^\//)) {
+    basePath = `/${basePath}`;
+  }
+
+  // eslint-disable-next-line no-restricted-globals
+  if (typeof window !== 'undefined') {
+    return basePath;
+  }
+
+  const devServerPort = process.env.PORT || '3000';
+  return `http://localhost:${devServerPort}${basePath}`;
+}
+
+/**
+ * Fetches a URL with a 3-second timeout using AbortController.
+ */
+async function fetchWithTimeout(url: string, options: RequestInit = {}): Promise<Response> {
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), 3000);
+
+  return suppressTracing(() =>
+    fetch(url, {
+      ...options,
+      signal: controller.signal,
+    }).finally(() => {
+      clearTimeout(timer);
+    }),
+  );
+}
+
 /**
  * Event processor that will symbolicate errors by using the webpack/nextjs dev server that is used to show stack traces
  * in the dev overlay.
@@ -123,28 +161,8 @@ async function resolveStackFrame(
       params.append(key, (frame[key as keyof typeof frame] ?? '').toString());
     });
 
-    let basePath = process.env._sentryBasePath ?? globalWithInjectedValues._sentryBasePath ?? '';
-
-    // Prefix the basepath with a slash if it doesn't have one
-    if (basePath !== '' && !basePath.match(/^\//)) {
-      basePath = `/${basePath}`;
-    }
-
-    const controller = new AbortController();
-    const timer = setTimeout(() => controller.abort(), 3000);
-    const res = await suppressTracing(() =>
-      fetch(
-        `${
-          // eslint-disable-next-line no-restricted-globals
-          typeof window === 'undefined' ? 'http://localhost:3000' : '' // TODO: handle the case where users define a different port
-        }${basePath}/__nextjs_original-stack-frame?${params.toString()}`,
-        {
-          signal: controller.signal,
-        },
-      ).finally(() => {
-        clearTimeout(timer);
-      }),
-    );
+    const baseUrl = getDevServerBaseUrl();
+    const res = await fetchWithTimeout(`${baseUrl}/__nextjs_original-stack-frame?${params.toString()}`);
 
     if (!res.ok || res.status === 204) {
       return null;
@@ -191,34 +209,14 @@ async function resolveStackFrames(
       isAppDirectory: true,
     };
 
-    let basePath = process.env._sentryBasePath ?? globalWithInjectedValues._sentryBasePath ?? '';
-
-    // Prefix the basepath with a slash if it doesn't have one
-    if (basePath !== '' && !basePath.match(/^\//)) {
-      basePath = `/${basePath}`;
-    }
-
-    const controller = new AbortController();
-    const timer = setTimeout(() => controller.abort(), 3000);
-
-    const res = await suppressTracing(() =>
-      fetch(
-        `${
-          // eslint-disable-next-line no-restricted-globals
-          typeof window === 'undefined' ? 'http://localhost:3000' : '' // TODO: handle the case where users define a different port
-        }${basePath}/__nextjs_original-stack-frames`,
-        {
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json',
-          },
-          signal: controller.signal,
-          body: JSON.stringify(postBody),
-        },
-      ).finally(() => {
-        clearTimeout(timer);
-      }),
-    );
+    const baseUrl = getDevServerBaseUrl();
+    const res = await fetchWithTimeout(`${baseUrl}/__nextjs_original-stack-frames`, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify(postBody),
+    });
 
     if (!res.ok || res.status === 204) {
       return null;
diff --git a/packages/nextjs/test/common/devErrorSymbolicationEventProcessor.test.ts b/packages/nextjs/test/common/devErrorSymbolicationEventProcessor.test.ts
index 4305aad537a8..130f8ea685df 100644
--- a/packages/nextjs/test/common/devErrorSymbolicationEventProcessor.test.ts
+++ b/packages/nextjs/test/common/devErrorSymbolicationEventProcessor.test.ts
@@ -25,6 +25,7 @@ describe('devErrorSymbolicationEventProcessor', () => {
     vi.clearAllMocks();
     delete (GLOBAL_OBJ as any)._sentryNextJsVersion;
     delete (GLOBAL_OBJ as any)._sentryBasePath;
+    delete process.env.PORT;
   });
 
   describe('Next.js version handling', () => {
@@ -258,4 +259,218 @@ describe('devErrorSymbolicationEventProcessor', () => {
       expect(result?.spans).toHaveLength(1);
     });
   });
+
+  describe('dev server URL construction', () => {
+    it('should use default port 3000 when PORT env variable is not set (Next.js < 15.2)', async () => {
+      const mockEvent: Event = {
+        exception: {
+          values: [
+            {
+              stacktrace: {
+                frames: [{ filename: 'webpack-internal:///./test.js', lineno: 1 }],
+              },
+            },
+          ],
+        },
+      };
+
+      const testError = new Error('test error');
+      testError.stack = 'Error: test error\n    at webpack-internal:///./test.js:1:1';
+
+      const mockHint: EventHint = {
+        originalException: testError,
+      };
+
+      (GLOBAL_OBJ as any)._sentryNextJsVersion = '14.1.0';
+
+      const stackTraceParser = await import('stacktrace-parser');
+      vi.mocked(stackTraceParser.parse).mockReturnValue([
+        {
+          file: 'webpack-internal:///./test.js',
+          methodName: 'testMethod',
+          lineNumber: 1,
+          column: 1,
+          arguments: [],
+        },
+      ]);
+
+      vi.mocked(fetch).mockResolvedValueOnce({
+        ok: true,
+        status: 200,
+        json: async () => ({
+          originalStackFrame: { file: './test.js', lineNumber: 1, column: 1, methodName: 'testMethod' },
+          originalCodeFrame: '> 1 | test code',
+        }),
+      } as any);
+
+      await devErrorSymbolicationEventProcessor(mockEvent, mockHint);
+
+      expect(fetch).toHaveBeenCalledWith(
+        expect.stringContaining('http://localhost:3000/__nextjs_original-stack-frame'),
+        expect.any(Object),
+      );
+    });
+
+    it('should use PORT env variable when set (Next.js < 15.2)', async () => {
+      process.env.PORT = '4000';
+
+      const mockEvent: Event = {
+        exception: {
+          values: [
+            {
+              stacktrace: {
+                frames: [{ filename: 'webpack-internal:///./test.js', lineno: 1 }],
+              },
+            },
+          ],
+        },
+      };
+
+      const testError = new Error('test error');
+      testError.stack = 'Error: test error\n    at webpack-internal:///./test.js:1:1';
+
+      const mockHint: EventHint = {
+        originalException: testError,
+      };
+
+      (GLOBAL_OBJ as any)._sentryNextJsVersion = '14.1.0';
+
+      const stackTraceParser = await import('stacktrace-parser');
+      vi.mocked(stackTraceParser.parse).mockReturnValue([
+        {
+          file: 'webpack-internal:///./test.js',
+          methodName: 'testMethod',
+          lineNumber: 1,
+          column: 1,
+          arguments: [],
+        },
+      ]);
+
+      vi.mocked(fetch).mockResolvedValueOnce({
+        ok: true,
+        status: 200,
+        json: async () => ({
+          originalStackFrame: { file: './test.js', lineNumber: 1, column: 1, methodName: 'testMethod' },
+          originalCodeFrame: '> 1 | test code',
+        }),
+      } as any);
+
+      await devErrorSymbolicationEventProcessor(mockEvent, mockHint);
+
+      expect(fetch).toHaveBeenCalledWith(
+        expect.stringContaining('http://localhost:4000/__nextjs_original-stack-frame'),
+        expect.any(Object),
+      );
+    });
+
+    it('should use default port 3000 when PORT env variable is not set (Next.js >= 15.2)', async () => {
+      const mockEvent: Event = {
+        exception: {
+          values: [
+            {
+              stacktrace: {
+                frames: [{ filename: 'file:///test.js', lineno: 1 }],
+              },
+            },
+          ],
+        },
+      };
+
+      const testError = new Error('test error');
+      testError.stack = 'Error: test error\n    at file:///test.js:1:1';
+
+      const mockHint: EventHint = {
+        originalException: testError,
+      };
+
+      (GLOBAL_OBJ as any)._sentryNextJsVersion = '15.2.0';
+
+      const stackTraceParser = await import('stacktrace-parser');
+      vi.mocked(stackTraceParser.parse).mockReturnValue([
+        {
+          file: 'file:///test.js',
+          methodName: 'testMethod',
+          lineNumber: 1,
+          column: 1,
+          arguments: [],
+        },
+      ]);
+
+      vi.mocked(fetch).mockResolvedValueOnce({
+        ok: true,
+        status: 200,
+        json: async () => [
+          {
+            value: {
+              originalStackFrame: { file: './test.js', lineNumber: 1, column: 1, methodName: 'testMethod' },
+              originalCodeFrame: '> 1 | test code',
+            },
+          },
+        ],
+      } as any);
+
+      await devErrorSymbolicationEventProcessor(mockEvent, mockHint);
+
+      expect(fetch).toHaveBeenCalledWith(
+        expect.stringContaining('http://localhost:3000/__nextjs_original-stack-frames'),
+        expect.any(Object),
+      );
+    });
+
+    it('should use PORT env variable when set (Next.js >= 15.2)', async () => {
+      process.env.PORT = '4000';
+
+      const mockEvent: Event = {
+        exception: {
+          values: [
+            {
+              stacktrace: {
+                frames: [{ filename: 'file:///test.js', lineno: 1 }],
+              },
+            },
+          ],
+        },
+      };
+
+      const testError = new Error('test error');
+      testError.stack = 'Error: test error\n    at file:///test.js:1:1';
+
+      const mockHint: EventHint = {
+        originalException: testError,
+      };
+
+      (GLOBAL_OBJ as any)._sentryNextJsVersion = '15.2.0';
+
+      const stackTraceParser = await import('stacktrace-parser');
+      vi.mocked(stackTraceParser.parse).mockReturnValue([
+        {
+          file: 'file:///test.js',
+          methodName: 'testMethod',
+          lineNumber: 1,
+          column: 1,
+          arguments: [],
+        },
+      ]);
+
+      vi.mocked(fetch).mockResolvedValueOnce({
+        ok: true,
+        status: 200,
+        json: async () => [
+          {
+            value: {
+              originalStackFrame: { file: './test.js', lineNumber: 1, column: 1, methodName: 'testMethod' },
+              originalCodeFrame: '> 1 | test code',
+            },
+          },
+        ],
+      } as any);
+
+      await devErrorSymbolicationEventProcessor(mockEvent, mockHint);
+
+      expect(fetch).toHaveBeenCalledWith(
+        expect.stringContaining('http://localhost:4000/__nextjs_original-stack-frames'),
+        expect.any(Object),
+      );
+    });
+  });
 });

From 610ae69d36ec5b7d55b20aae3e5d9d62e9744a93 Mon Sep 17 00:00:00 2001
From: Abdelrahman Awad <me@awad.dev>
Date: Tue, 18 Nov 2025 14:51:29 +0200
Subject: [PATCH 084/186] feat(browser-utils): bump web-vitals to 5.1.0
 (#18091)

Bumps the vendored-in web vitals library to include the changes between
`5.0.2` <-> `5.1.0` from upstream

#### Changes from upstream

- Remove `visibilitychange` event listeners when no longer required
[#627](https://github.com/GoogleChrome/web-vitals/pull/627)
- Register visibility-change early
[#637](https://github.com/GoogleChrome/web-vitals/pull/637)
- Only finalize LCP on user events (isTrusted=true)
[#635](https://github.com/GoogleChrome/web-vitals/pull/635)
- Fallback to default getSelector if custom function is null or
undefined [#634](https://github.com/GoogleChrome/web-vitals/pull/634)

#### Our own Changes

- Added `addPageListener` and `removePageListener` utilities because the
upstream package changed the listeners to be added on `window` instead
of `document`, so I added those utilities to avoid having to check for
window every time we try to add a listener.
---
 .size-limit.js                                |  6 +-
 .../src/metrics/web-vitals/README.md          | 10 ++-
 .../src/metrics/web-vitals/getCLS.ts          | 10 +--
 .../src/metrics/web-vitals/getINP.ts          |  9 +-
 .../src/metrics/web-vitals/getLCP.ts          | 28 +++---
 .../web-vitals/lib/getVisibilityWatcher.ts    | 88 ++++++++++++-------
 .../metrics/web-vitals/lib/globalListeners.ts | 20 +++++
 .../src/metrics/web-vitals/lib/onHidden.ts    | 11 ++-
 .../web-vitals/lib/whenIdleOrHidden.ts        |  9 +-
 .../src/metrics/web-vitals/types/base.ts      |  2 +-
 .../src/metrics/web-vitals/types/cls.ts       |  3 +-
 .../src/metrics/web-vitals/types/inp.ts       |  3 +-
 .../src/metrics/web-vitals/types/lcp.ts       |  3 +-
 13 files changed, 135 insertions(+), 67 deletions(-)
 create mode 100644 packages/browser-utils/src/metrics/web-vitals/lib/globalListeners.ts

diff --git a/.size-limit.js b/.size-limit.js
index 4e929875dad5..184aad0698f4 100644
--- a/.size-limit.js
+++ b/.size-limit.js
@@ -38,7 +38,7 @@ module.exports = [
     path: 'packages/browser/build/npm/esm/prod/index.js',
     import: createImport('init', 'browserTracingIntegration'),
     gzip: true,
-    limit: '41.3 KB',
+    limit: '41.38 KB',
   },
   {
     name: '@sentry/browser (incl. Tracing, Profiling)',
@@ -127,7 +127,7 @@ module.exports = [
     import: createImport('init', 'ErrorBoundary', 'reactRouterV6BrowserTracingIntegration'),
     ignore: ['react/jsx-runtime'],
     gzip: true,
-    limit: '43.3 KB',
+    limit: '43.33 KB',
   },
   // Vue SDK (ESM)
   {
@@ -142,7 +142,7 @@ module.exports = [
     path: 'packages/vue/build/esm/index.js',
     import: createImport('init', 'browserTracingIntegration'),
     gzip: true,
-    limit: '43.1 KB',
+    limit: '43.2 KB',
   },
   // Svelte SDK (ESM)
   {
diff --git a/packages/browser-utils/src/metrics/web-vitals/README.md b/packages/browser-utils/src/metrics/web-vitals/README.md
index a57937246cdd..1eeaf4df2420 100644
--- a/packages/browser-utils/src/metrics/web-vitals/README.md
+++ b/packages/browser-utils/src/metrics/web-vitals/README.md
@@ -2,10 +2,10 @@
 
 > A modular library for measuring the [Web Vitals](https://web.dev/vitals/) metrics on real users.
 
-This was vendored from: https://github.com/GoogleChrome/web-vitals: v5.0.2
+This was vendored from: https://github.com/GoogleChrome/web-vitals: v5.1.0
 
 The commit SHA used is:
-[463abbd425cda01ed65e0b5d18be9f559fe446cb](https://github.com/GoogleChrome/web-vitals/tree/463abbd425cda01ed65e0b5d18be9f559fe446cb)
+[e22d23b22c1440e69c5fc25a2f373b1a425cc940](https://github.com/GoogleChrome/web-vitals/tree/e22d23b22c1440e69c5fc25a2f373b1a425cc940)
 
 Current vendored web vitals are:
 
@@ -27,6 +27,12 @@ web-vitals only report once per pageload.
 
 ## CHANGELOG
 
+- Bumped from Web Vitals 5.0.2 to 5.1.0
+  - Remove `visibilitychange` event listeners when no longer required [#627](https://github.com/GoogleChrome/web-vitals/pull/627)
+  - Register visibility-change early [#637](https://github.com/GoogleChrome/web-vitals/pull/637)
+  - Only finalize LCP on user events (isTrusted=true) [#635](https://github.com/GoogleChrome/web-vitals/pull/635)
+  - Fallback to default getSelector if custom function is null or undefined [#634](https://github.com/GoogleChrome/web-vitals/pull/634)
+
 https://github.com/getsentry/sentry-javascript/pull/17076
 
 - Removed FID-related code with v10 of the SDK
diff --git a/packages/browser-utils/src/metrics/web-vitals/getCLS.ts b/packages/browser-utils/src/metrics/web-vitals/getCLS.ts
index c40f993f8ca8..2e3f98c599e4 100644
--- a/packages/browser-utils/src/metrics/web-vitals/getCLS.ts
+++ b/packages/browser-utils/src/metrics/web-vitals/getCLS.ts
@@ -16,6 +16,7 @@
 
 import { WINDOW } from '../../types';
 import { bindReporter } from './lib/bindReporter';
+import { getVisibilityWatcher } from './lib/getVisibilityWatcher';
 import { initMetric } from './lib/initMetric';
 import { initUnique } from './lib/initUnique';
 import { LayoutShiftManager } from './lib/LayoutShiftManager';
@@ -55,6 +56,7 @@ export const onCLS = (onReport: (metric: CLSMetric) => void, opts: ReportOpts =
     runOnce(() => {
       const metric = initMetric('CLS', 0);
       let report: ReturnType<typeof bindReporter>;
+      const visibilityWatcher = getVisibilityWatcher();
 
       const layoutShiftManager = initUnique(opts, LayoutShiftManager);
 
@@ -76,11 +78,9 @@ export const onCLS = (onReport: (metric: CLSMetric) => void, opts: ReportOpts =
       if (po) {
         report = bindReporter(onReport, metric, CLSThresholds, opts.reportAllChanges);
 
-        WINDOW.document?.addEventListener('visibilitychange', () => {
-          if (WINDOW.document?.visibilityState === 'hidden') {
-            handleEntries(po.takeRecords() as CLSMetric['entries']);
-            report(true);
-          }
+        visibilityWatcher.onHidden(() => {
+          handleEntries(po.takeRecords() as CLSMetric['entries']);
+          report(true);
         });
 
         // Queue a task to report (if nothing else triggers a report first).
diff --git a/packages/browser-utils/src/metrics/web-vitals/getINP.ts b/packages/browser-utils/src/metrics/web-vitals/getINP.ts
index f5efbcbc3afc..df8ac5e1c804 100644
--- a/packages/browser-utils/src/metrics/web-vitals/getINP.ts
+++ b/packages/browser-utils/src/metrics/web-vitals/getINP.ts
@@ -15,11 +15,11 @@
  */
 
 import { bindReporter } from './lib/bindReporter';
+import { getVisibilityWatcher } from './lib/getVisibilityWatcher';
 import { initMetric } from './lib/initMetric';
 import { initUnique } from './lib/initUnique';
 import { InteractionManager } from './lib/InteractionManager';
 import { observe } from './lib/observe';
-import { onHidden } from './lib/onHidden';
 import { initInteractionCountPolyfill } from './lib/polyfills/interactionCountPolyfill';
 import { whenActivated } from './lib/whenActivated';
 import { whenIdleOrHidden } from './lib/whenIdleOrHidden';
@@ -67,6 +67,8 @@ export const onINP = (onReport: (metric: INPMetric) => void, opts: INPReportOpts
     return;
   }
 
+  const visibilityWatcher = getVisibilityWatcher();
+
   whenActivated(() => {
     // TODO(philipwalton): remove once the polyfill is no longer needed.
     initInteractionCountPolyfill();
@@ -116,10 +118,7 @@ export const onINP = (onReport: (metric: INPMetric) => void, opts: INPReportOpts
       // where the first interaction is less than the `durationThreshold`.
       po.observe({ type: 'first-input', buffered: true });
 
-      // sentry: we use onHidden instead of directly listening to visibilitychange
-      // because some browsers we still support (Safari <14.4) don't fully support
-      // `visibilitychange` or have known bugs w.r.t the `visibilitychange` event.
-      onHidden(() => {
+      visibilityWatcher.onHidden(() => {
         handleEntries(po.takeRecords() as INPMetric['entries']);
         report(true);
       });
diff --git a/packages/browser-utils/src/metrics/web-vitals/getLCP.ts b/packages/browser-utils/src/metrics/web-vitals/getLCP.ts
index 6eafee698673..9de413c745c0 100644
--- a/packages/browser-utils/src/metrics/web-vitals/getLCP.ts
+++ b/packages/browser-utils/src/metrics/web-vitals/getLCP.ts
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-import { WINDOW } from '../../types';
 import { bindReporter } from './lib/bindReporter';
 import { getActivationStart } from './lib/getActivationStart';
 import { getVisibilityWatcher } from './lib/getVisibilityWatcher';
+import { addPageListener, removePageListener } from './lib/globalListeners';
 import { initMetric } from './lib/initMetric';
 import { initUnique } from './lib/initUnique';
 import { LCPEntryManager } from './lib/LCPEntryManager';
@@ -88,20 +88,28 @@ export const onLCP = (onReport: (metric: LCPMetric) => void, opts: ReportOpts =
         report(true);
       });
 
+      // Need a separate wrapper to ensure the `runOnce` function above is
+      // common for all three functions
+      const stopListeningWrapper = (event: Event) => {
+        if (event.isTrusted) {
+          // Wrap the listener in an idle callback so it's run in a separate
+          // task to reduce potential INP impact.
+          // https://github.com/GoogleChrome/web-vitals/issues/383
+          whenIdleOrHidden(stopListening);
+          removePageListener(event.type, stopListeningWrapper, {
+            capture: true,
+          });
+        }
+      };
+
       // Stop listening after input or visibilitychange.
       // Note: while scrolling is an input that stops LCP observation, it's
       // unreliable since it can be programmatically generated.
       // See: https://github.com/GoogleChrome/web-vitals/issues/75
       for (const type of ['keydown', 'click', 'visibilitychange']) {
-        // Wrap the listener in an idle callback so it's run in a separate
-        // task to reduce potential INP impact.
-        // https://github.com/GoogleChrome/web-vitals/issues/383
-        if (WINDOW.document) {
-          addEventListener(type, () => whenIdleOrHidden(stopListening), {
-            capture: true,
-            once: true,
-          });
-        }
+        addPageListener(type, stopListeningWrapper, {
+          capture: true,
+        });
       }
     }
   });
diff --git a/packages/browser-utils/src/metrics/web-vitals/lib/getVisibilityWatcher.ts b/packages/browser-utils/src/metrics/web-vitals/lib/getVisibilityWatcher.ts
index 3a6c0a2e42a9..3eaea296a655 100644
--- a/packages/browser-utils/src/metrics/web-vitals/lib/getVisibilityWatcher.ts
+++ b/packages/browser-utils/src/metrics/web-vitals/lib/getVisibilityWatcher.ts
@@ -16,8 +16,10 @@
 
 import { WINDOW } from '../../../types';
 import { getActivationStart } from './getActivationStart';
+import { addPageListener, removePageListener } from './globalListeners';
 
 let firstHiddenTime = -1;
+const onHiddenFunctions: Set<() => void> = new Set();
 
 const initHiddenTime = () => {
   // If the document is hidden when this code runs, assume it was always
@@ -29,35 +31,34 @@ const initHiddenTime = () => {
 };
 
 const onVisibilityUpdate = (event: Event) => {
-  // If the document is 'hidden' and no previous hidden timestamp has been
-  // set, update it based on the current event data.
-  if (WINDOW.document!.visibilityState === 'hidden' && firstHiddenTime > -1) {
-    // If the event is a 'visibilitychange' event, it means the page was
-    // visible prior to this change, so the event timestamp is the first
-    // hidden time.
-    // However, if the event is not a 'visibilitychange' event, then it must
-    // be a 'prerenderingchange' event, and the fact that the document is
-    // still 'hidden' from the above check means the tab was activated
-    // in a background state and so has always been hidden.
-    firstHiddenTime = event.type === 'visibilitychange' ? event.timeStamp : 0;
+  // Handle changes to hidden state
+  if (isPageHidden(event) && firstHiddenTime > -1) {
+    // Sentry-specific change: Also call onHidden callbacks for pagehide events
+    // to support older browsers (Safari <14.4) that don't properly fire visibilitychange
+    if (event.type === 'visibilitychange' || event.type === 'pagehide') {
+      for (const onHiddenFunction of onHiddenFunctions) {
+        onHiddenFunction();
+      }
+    }
 
-    // Remove all listeners now that a `firstHiddenTime` value has been set.
-    removeChangeListeners();
-  }
-};
-
-const addChangeListeners = () => {
-  addEventListener('visibilitychange', onVisibilityUpdate, true);
-  // IMPORTANT: when a page is prerendering, its `visibilityState` is
-  // 'hidden', so in order to account for cases where this module checks for
-  // visibility during prerendering, an additional check after prerendering
-  // completes is also required.
-  addEventListener('prerenderingchange', onVisibilityUpdate, true);
-};
+    // If the document is 'hidden' and no previous hidden timestamp has been
+    // set (so is infinity), update it based on the current event data.
+    if (!isFinite(firstHiddenTime)) {
+      // If the event is a 'visibilitychange' event, it means the page was
+      // visible prior to this change, so the event timestamp is the first
+      // hidden time.
+      // However, if the event is not a 'visibilitychange' event, then it must
+      // be a 'prerenderingchange' or 'pagehide' event, and the fact that the document is
+      // still 'hidden' from the above check means the tab was activated
+      // in a background state and so has always been hidden.
+      firstHiddenTime = event.type === 'visibilitychange' ? event.timeStamp : 0;
 
-const removeChangeListeners = () => {
-  removeEventListener('visibilitychange', onVisibilityUpdate, true);
-  removeEventListener('prerenderingchange', onVisibilityUpdate, true);
+      // We no longer need the `prerenderingchange` event listener now we've
+      // set an initial init time so remove that
+      // (we'll keep the visibilitychange and pagehide ones for onHiddenFunction above)
+      removePageListener('prerenderingchange', onVisibilityUpdate, true);
+    }
+  }
 };
 
 export const getVisibilityWatcher = () => {
@@ -75,14 +76,39 @@ export const getVisibilityWatcher = () => {
     // a perfect heuristic, but it's the best we can do until the
     // `visibility-state` performance entry becomes available in all browsers.
     firstHiddenTime = firstVisibilityStateHiddenTime ?? initHiddenTime();
-    // We're still going to listen to for changes so we can handle things like
-    // bfcache restores and/or prerender without having to examine individual
-    // timestamps in detail.
-    addChangeListeners();
+    // Listen for visibility changes so we can handle things like bfcache
+    // restores and/or prerender without having to examine individual
+    // timestamps in detail and also for onHidden function calls.
+    addPageListener('visibilitychange', onVisibilityUpdate, true);
+
+    // Sentry-specific change: Some browsers have buggy implementations of visibilitychange,
+    // so we use pagehide in addition, just to be safe. This is also required for older
+    // Safari versions (<14.4) that we still support.
+    addPageListener('pagehide', onVisibilityUpdate, true);
+
+    // IMPORTANT: when a page is prerendering, its `visibilityState` is
+    // 'hidden', so in order to account for cases where this module checks for
+    // visibility during prerendering, an additional check after prerendering
+    // completes is also required.
+    addPageListener('prerenderingchange', onVisibilityUpdate, true);
   }
+
   return {
     get firstHiddenTime() {
       return firstHiddenTime;
     },
+    onHidden(cb: () => void) {
+      onHiddenFunctions.add(cb);
+    },
   };
 };
+
+/**
+ * Check if the page is hidden, uses the `pagehide` event for older browsers support that we used to have in `onHidden` function.
+ * Some browsers we still support (Safari <14.4) don't fully support `visibilitychange`
+ * or have known bugs w.r.t the `visibilitychange` event.
+ * // TODO (v11): If we decide to drop support for Safari 14.4, we can use the logic from web-vitals 4.2.4
+ */
+function isPageHidden(event: Event) {
+  return event.type === 'pagehide' || WINDOW.document?.visibilityState === 'hidden';
+}
diff --git a/packages/browser-utils/src/metrics/web-vitals/lib/globalListeners.ts b/packages/browser-utils/src/metrics/web-vitals/lib/globalListeners.ts
new file mode 100644
index 000000000000..0e391cff17c2
--- /dev/null
+++ b/packages/browser-utils/src/metrics/web-vitals/lib/globalListeners.ts
@@ -0,0 +1,20 @@
+import { WINDOW } from '../../../types';
+
+/**
+ * web-vitals 5.1.0 switched listeners to be added on the window rather than the document.
+ * Instead of having to check for window/document every time we add a listener, we can use this function.
+ */
+export function addPageListener(type: string, listener: EventListener, options?: boolean | AddEventListenerOptions) {
+  if (WINDOW.document) {
+    WINDOW.addEventListener(type, listener, options);
+  }
+}
+/**
+ * web-vitals 5.1.0 switched listeners to be removed from the window rather than the document.
+ * Instead of having to check for window/document every time we remove a listener, we can use this function.
+ */
+export function removePageListener(type: string, listener: EventListener, options?: boolean | AddEventListenerOptions) {
+  if (WINDOW.document) {
+    WINDOW.removeEventListener(type, listener, options);
+  }
+}
diff --git a/packages/browser-utils/src/metrics/web-vitals/lib/onHidden.ts b/packages/browser-utils/src/metrics/web-vitals/lib/onHidden.ts
index 5a3c1b4fc810..d9dc2f6718ed 100644
--- a/packages/browser-utils/src/metrics/web-vitals/lib/onHidden.ts
+++ b/packages/browser-utils/src/metrics/web-vitals/lib/onHidden.ts
@@ -15,6 +15,7 @@
  */
 
 import { WINDOW } from '../../../types';
+import { addPageListener } from './globalListeners';
 
 export interface OnHiddenCallback {
   (event: Event): void;
@@ -37,10 +38,8 @@ export const onHidden = (cb: OnHiddenCallback) => {
     }
   };
 
-  if (WINDOW.document) {
-    addEventListener('visibilitychange', onHiddenOrPageHide, true);
-    // Some browsers have buggy implementations of visibilitychange,
-    // so we use pagehide in addition, just to be safe.
-    addEventListener('pagehide', onHiddenOrPageHide, true);
-  }
+  addPageListener('visibilitychange', onHiddenOrPageHide, true);
+  // Some browsers have buggy implementations of visibilitychange,
+  // so we use pagehide in addition, just to be safe.
+  addPageListener('pagehide', onHiddenOrPageHide, true);
 };
diff --git a/packages/browser-utils/src/metrics/web-vitals/lib/whenIdleOrHidden.ts b/packages/browser-utils/src/metrics/web-vitals/lib/whenIdleOrHidden.ts
index 32dae5f30f8b..008aac8dc4c2 100644
--- a/packages/browser-utils/src/metrics/web-vitals/lib/whenIdleOrHidden.ts
+++ b/packages/browser-utils/src/metrics/web-vitals/lib/whenIdleOrHidden.ts
@@ -15,6 +15,7 @@
  */
 
 import { WINDOW } from '../../../types.js';
+import { addPageListener, removePageListener } from './globalListeners.js';
 import { onHidden } from './onHidden.js';
 import { runOnce } from './runOnce.js';
 
@@ -32,7 +33,13 @@ export const whenIdleOrHidden = (cb: () => void) => {
   } else {
     // eslint-disable-next-line no-param-reassign
     cb = runOnce(cb);
-    rIC(cb);
+    addPageListener('visibilitychange', cb, { once: true, capture: true });
+    rIC(() => {
+      cb();
+      // Remove the above event listener since no longer required.
+      // See: https://github.com/GoogleChrome/web-vitals/issues/622
+      removePageListener('visibilitychange', cb, { capture: true });
+    });
     // sentry: we use onHidden instead of directly listening to visibilitychange
     // because some browsers we still support (Safari <14.4) don't fully support
     // `visibilitychange` or have known bugs w.r.t the `visibilitychange` event.
diff --git a/packages/browser-utils/src/metrics/web-vitals/types/base.ts b/packages/browser-utils/src/metrics/web-vitals/types/base.ts
index 02cb566011ac..cac7fdac1d11 100644
--- a/packages/browser-utils/src/metrics/web-vitals/types/base.ts
+++ b/packages/browser-utils/src/metrics/web-vitals/types/base.ts
@@ -116,7 +116,7 @@ export interface ReportOpts {
 }
 
 export interface AttributionReportOpts extends ReportOpts {
-  generateTarget?: (el: Node | null) => string;
+  generateTarget?: (el: Node | null) => string | undefined;
 }
 
 /**
diff --git a/packages/browser-utils/src/metrics/web-vitals/types/cls.ts b/packages/browser-utils/src/metrics/web-vitals/types/cls.ts
index 5acaaa27c9ab..6048c616e1f0 100644
--- a/packages/browser-utils/src/metrics/web-vitals/types/cls.ts
+++ b/packages/browser-utils/src/metrics/web-vitals/types/cls.ts
@@ -34,7 +34,8 @@ export interface CLSAttribution {
    * By default, a selector identifying the first element (in document order)
    * that shifted when the single largest layout shift that contributed to the
    * page's CLS score occurred. If the `generateTarget` configuration option
-   * was passed, then this will instead be the return value of that function.
+   * was passed, then this will instead be the return value of that function,
+   * falling back to the default if that returns null or undefined.
    */
   largestShiftTarget?: string;
   /**
diff --git a/packages/browser-utils/src/metrics/web-vitals/types/inp.ts b/packages/browser-utils/src/metrics/web-vitals/types/inp.ts
index e73743866301..d2b2063c7d04 100644
--- a/packages/browser-utils/src/metrics/web-vitals/types/inp.ts
+++ b/packages/browser-utils/src/metrics/web-vitals/types/inp.ts
@@ -60,7 +60,8 @@ export interface INPAttribution {
    * occurred. If this value is an empty string, that generally means the
    * element was removed from the DOM after the interaction. If the
    * `generateTarget` configuration option was passed, then this will instead
-   * be the return value of that function.
+   * be the return value of that function, falling back to the default if that
+   * returns null or undefined.
    */
   interactionTarget: string;
   /**
diff --git a/packages/browser-utils/src/metrics/web-vitals/types/lcp.ts b/packages/browser-utils/src/metrics/web-vitals/types/lcp.ts
index 293531b3d45c..9de6b32a5f94 100644
--- a/packages/browser-utils/src/metrics/web-vitals/types/lcp.ts
+++ b/packages/browser-utils/src/metrics/web-vitals/types/lcp.ts
@@ -34,7 +34,8 @@ export interface LCPAttribution {
    * By default, a selector identifying the element corresponding to the
    * largest contentful paint for the page. If the `generateTarget`
    * configuration option was passed, then this will instead be the return
-   * value of that function.
+   * value of that function, falling back to the default if that returns null
+   * or undefined.
    */
   target?: string;
   /**

From 935ef55b1cfa4eb78bdcabe91c3ea4caf90e9820 Mon Sep 17 00:00:00 2001
From: Nicolas Hrubec <nico.hrubec@sentry.io>
Date: Tue, 18 Nov 2025 16:26:58 +0100
Subject: [PATCH 085/186] feat(core): Support OpenAI embeddings API (#18224)

This adds instrumentation for the OpenAI Embeddings API. Specifically,
we instrument [Create
embeddings](https://platform.openai.com/docs/api-reference/embeddings/create),
which is also the only endpoint in the embeddings API atm.
Implementation generally follows the same flow we also have for the
`completions` and `responses` APIs. To detect `embedding` requests we
check whether the model name contains `embeddings`.

The embedding results are currently not tracked, as we do not truncate
outputs right now as far as I know and these can get large quite easily.
For instance, [text-embedding-3 uses dimension 1536 (small) or 3072
(large) by
default](https://platform.openai.com/docs/guides/embeddings#use-cases),
resulting in single embeddings sizes of 6KB and 12KB, respectively.

Test updates:
- Added a new scenario-embeddings.mjs file, that covers the embeddings
API tests (tried to put this in the main scenario.mjs, but the linter
starts complaining about the file being too long).
- Added a new scenario file to check that truncation works properly for
the embeddings API. Also moved all truncation scenarios to a folder.
---
 .../{scenario.mjs => scenario-chat.mjs}       |   0
 .../tracing/openai/scenario-embeddings.mjs    |  67 ++++++++
 .../suites/tracing/openai/test.ts             | 147 ++++++++++++++++--
 ...cenario-message-truncation-completions.mjs |   0
 ...scenario-message-truncation-embeddings.mjs |  66 ++++++++
 .../scenario-message-truncation-responses.mjs |   0
 .../core/src/tracing/ai/gen-ai-attributes.ts  |  11 ++
 packages/core/src/tracing/openai/constants.ts |   2 +-
 packages/core/src/tracing/openai/index.ts     |  93 ++---------
 packages/core/src/tracing/openai/types.ts     |  24 ++-
 packages/core/src/tracing/openai/utils.ts     | 116 ++++++++++++++
 11 files changed, 432 insertions(+), 94 deletions(-)
 rename dev-packages/node-integration-tests/suites/tracing/openai/{scenario.mjs => scenario-chat.mjs} (100%)
 create mode 100644 dev-packages/node-integration-tests/suites/tracing/openai/scenario-embeddings.mjs
 rename dev-packages/node-integration-tests/suites/tracing/openai/{ => truncation}/scenario-message-truncation-completions.mjs (100%)
 create mode 100644 dev-packages/node-integration-tests/suites/tracing/openai/truncation/scenario-message-truncation-embeddings.mjs
 rename dev-packages/node-integration-tests/suites/tracing/openai/{ => truncation}/scenario-message-truncation-responses.mjs (100%)

diff --git a/dev-packages/node-integration-tests/suites/tracing/openai/scenario.mjs b/dev-packages/node-integration-tests/suites/tracing/openai/scenario-chat.mjs
similarity index 100%
rename from dev-packages/node-integration-tests/suites/tracing/openai/scenario.mjs
rename to dev-packages/node-integration-tests/suites/tracing/openai/scenario-chat.mjs
diff --git a/dev-packages/node-integration-tests/suites/tracing/openai/scenario-embeddings.mjs b/dev-packages/node-integration-tests/suites/tracing/openai/scenario-embeddings.mjs
new file mode 100644
index 000000000000..9cdb24a42da9
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/openai/scenario-embeddings.mjs
@@ -0,0 +1,67 @@
+import { instrumentOpenAiClient } from '@sentry/core';
+import * as Sentry from '@sentry/node';
+
+class MockOpenAI {
+  constructor(config) {
+    this.apiKey = config.apiKey;
+
+    this.embeddings = {
+      create: async params => {
+        await new Promise(resolve => setTimeout(resolve, 10));
+
+        if (params.model === 'error-model') {
+          const error = new Error('Model not found');
+          error.status = 404;
+          error.headers = { 'x-request-id': 'mock-request-123' };
+          throw error;
+        }
+
+        return {
+          object: 'list',
+          data: [
+            {
+              object: 'embedding',
+              embedding: [0.1, 0.2, 0.3],
+              index: 0,
+            },
+          ],
+          model: params.model,
+          usage: {
+            prompt_tokens: 10,
+            total_tokens: 10,
+          },
+        };
+      },
+    };
+  }
+}
+
+async function run() {
+  await Sentry.startSpan({ op: 'function', name: 'main' }, async () => {
+    const mockClient = new MockOpenAI({
+      apiKey: 'mock-api-key',
+    });
+
+    const client = instrumentOpenAiClient(mockClient);
+
+    // First test: embeddings API
+    await client.embeddings.create({
+      input: 'Embedding test!',
+      model: 'text-embedding-3-small',
+      dimensions: 1536,
+      encoding_format: 'float',
+    });
+
+    // Second test: embeddings API error model
+    try {
+      await client.embeddings.create({
+        input: 'Error embedding test!',
+        model: 'error-model',
+      });
+    } catch {
+      // Error is expected and handled
+    }
+  });
+}
+
+run();
diff --git a/dev-packages/node-integration-tests/suites/tracing/openai/test.ts b/dev-packages/node-integration-tests/suites/tracing/openai/test.ts
index 5cbb27df73bf..116c3a6208fa 100644
--- a/dev-packages/node-integration-tests/suites/tracing/openai/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/openai/test.ts
@@ -6,7 +6,7 @@ describe('OpenAI integration', () => {
     cleanupChildProcesses();
   });
 
-  const EXPECTED_TRANSACTION_DEFAULT_PII_FALSE = {
+  const EXPECTED_TRANSACTION_DEFAULT_PII_FALSE_CHAT = {
     transaction: 'main',
     spans: expect.arrayContaining([
       // First span - basic chat completion without PII
@@ -147,7 +147,7 @@ describe('OpenAI integration', () => {
     ]),
   };
 
-  const EXPECTED_TRANSACTION_DEFAULT_PII_TRUE = {
+  const EXPECTED_TRANSACTION_DEFAULT_PII_TRUE_CHAT = {
     transaction: 'main',
     spans: expect.arrayContaining([
       // First span - basic chat completion with PII
@@ -321,27 +321,27 @@ describe('OpenAI integration', () => {
     ]),
   };
 
-  createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument.mjs', (createRunner, test) => {
+  createEsmAndCjsTests(__dirname, 'scenario-chat.mjs', 'instrument.mjs', (createRunner, test) => {
     test('creates openai related spans with sendDefaultPii: false', async () => {
       await createRunner()
         .ignore('event')
-        .expect({ transaction: EXPECTED_TRANSACTION_DEFAULT_PII_FALSE })
+        .expect({ transaction: EXPECTED_TRANSACTION_DEFAULT_PII_FALSE_CHAT })
         .start()
         .completed();
     });
   });
 
-  createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument-with-pii.mjs', (createRunner, test) => {
+  createEsmAndCjsTests(__dirname, 'scenario-chat.mjs', 'instrument-with-pii.mjs', (createRunner, test) => {
     test('creates openai related spans with sendDefaultPii: true', async () => {
       await createRunner()
         .ignore('event')
-        .expect({ transaction: EXPECTED_TRANSACTION_DEFAULT_PII_TRUE })
+        .expect({ transaction: EXPECTED_TRANSACTION_DEFAULT_PII_TRUE_CHAT })
         .start()
         .completed();
     });
   });
 
-  createEsmAndCjsTests(__dirname, 'scenario.mjs', 'instrument-with-options.mjs', (createRunner, test) => {
+  createEsmAndCjsTests(__dirname, 'scenario-chat.mjs', 'instrument-with-options.mjs', (createRunner, test) => {
     test('creates openai related spans with custom options', async () => {
       await createRunner()
         .ignore('event')
@@ -351,6 +351,109 @@ describe('OpenAI integration', () => {
     });
   });
 
+  const EXPECTED_TRANSACTION_DEFAULT_PII_FALSE_EMBEDDINGS = {
+    transaction: 'main',
+    spans: expect.arrayContaining([
+      // First span - embeddings API
+      expect.objectContaining({
+        data: {
+          'gen_ai.operation.name': 'embeddings',
+          'sentry.op': 'gen_ai.embeddings',
+          'sentry.origin': 'auto.ai.openai',
+          'gen_ai.system': 'openai',
+          'gen_ai.request.model': 'text-embedding-3-small',
+          'gen_ai.request.encoding_format': 'float',
+          'gen_ai.request.dimensions': 1536,
+          'gen_ai.response.model': 'text-embedding-3-small',
+          'gen_ai.usage.input_tokens': 10,
+          'gen_ai.usage.total_tokens': 10,
+          'openai.response.model': 'text-embedding-3-small',
+          'openai.usage.prompt_tokens': 10,
+        },
+        description: 'embeddings text-embedding-3-small',
+        op: 'gen_ai.embeddings',
+        origin: 'auto.ai.openai',
+        status: 'ok',
+      }),
+      // Second span - embeddings API error model
+      expect.objectContaining({
+        data: {
+          'gen_ai.operation.name': 'embeddings',
+          'sentry.op': 'gen_ai.embeddings',
+          'sentry.origin': 'auto.ai.openai',
+          'gen_ai.system': 'openai',
+          'gen_ai.request.model': 'error-model',
+        },
+        description: 'embeddings error-model',
+        op: 'gen_ai.embeddings',
+        origin: 'auto.ai.openai',
+        status: 'internal_error',
+      }),
+    ]),
+  };
+
+  const EXPECTED_TRANSACTION_DEFAULT_PII_TRUE_EMBEDDINGS = {
+    transaction: 'main',
+    spans: expect.arrayContaining([
+      // First span - embeddings API with PII
+      expect.objectContaining({
+        data: {
+          'gen_ai.operation.name': 'embeddings',
+          'sentry.op': 'gen_ai.embeddings',
+          'sentry.origin': 'auto.ai.openai',
+          'gen_ai.system': 'openai',
+          'gen_ai.request.model': 'text-embedding-3-small',
+          'gen_ai.request.encoding_format': 'float',
+          'gen_ai.request.dimensions': 1536,
+          'gen_ai.request.messages': 'Embedding test!',
+          'gen_ai.response.model': 'text-embedding-3-small',
+          'gen_ai.usage.input_tokens': 10,
+          'gen_ai.usage.total_tokens': 10,
+          'openai.response.model': 'text-embedding-3-small',
+          'openai.usage.prompt_tokens': 10,
+        },
+        description: 'embeddings text-embedding-3-small',
+        op: 'gen_ai.embeddings',
+        origin: 'auto.ai.openai',
+        status: 'ok',
+      }),
+      // Second span - embeddings API error model with PII
+      expect.objectContaining({
+        data: {
+          'gen_ai.operation.name': 'embeddings',
+          'sentry.op': 'gen_ai.embeddings',
+          'sentry.origin': 'auto.ai.openai',
+          'gen_ai.system': 'openai',
+          'gen_ai.request.model': 'error-model',
+          'gen_ai.request.messages': 'Error embedding test!',
+        },
+        description: 'embeddings error-model',
+        op: 'gen_ai.embeddings',
+        origin: 'auto.ai.openai',
+        status: 'internal_error',
+      }),
+    ]),
+  };
+  createEsmAndCjsTests(__dirname, 'scenario-embeddings.mjs', 'instrument.mjs', (createRunner, test) => {
+    test('creates openai related spans with sendDefaultPii: false', async () => {
+      await createRunner()
+        .ignore('event')
+        .expect({ transaction: EXPECTED_TRANSACTION_DEFAULT_PII_FALSE_EMBEDDINGS })
+        .start()
+        .completed();
+    });
+  });
+
+  createEsmAndCjsTests(__dirname, 'scenario-embeddings.mjs', 'instrument-with-pii.mjs', (createRunner, test) => {
+    test('creates openai related spans with sendDefaultPii: true', async () => {
+      await createRunner()
+        .ignore('event')
+        .expect({ transaction: EXPECTED_TRANSACTION_DEFAULT_PII_TRUE_EMBEDDINGS })
+        .start()
+        .completed();
+    });
+  });
+
   createEsmAndCjsTests(__dirname, 'scenario-root-span.mjs', 'instrument.mjs', (createRunner, test) => {
     test('it works without a wrapping span', async () => {
       await createRunner()
@@ -400,7 +503,7 @@ describe('OpenAI integration', () => {
 
   createEsmAndCjsTests(
     __dirname,
-    'scenario-message-truncation-completions.mjs',
+    'truncation/scenario-message-truncation-completions.mjs',
     'instrument-with-pii.mjs',
     (createRunner, test) => {
       test('truncates messages when they exceed byte limit - keeps only last message and crops it', async () => {
@@ -436,7 +539,7 @@ describe('OpenAI integration', () => {
 
   createEsmAndCjsTests(
     __dirname,
-    'scenario-message-truncation-responses.mjs',
+    'truncation/scenario-message-truncation-responses.mjs',
     'instrument-with-pii.mjs',
     (createRunner, test) => {
       test('truncates string inputs when they exceed byte limit', async () => {
@@ -469,4 +572,30 @@ describe('OpenAI integration', () => {
       });
     },
   );
+
+  createEsmAndCjsTests(
+    __dirname,
+    'truncation/scenario-message-truncation-embeddings.mjs',
+    'instrument-with-pii.mjs',
+    (createRunner, test) => {
+      test('truncates messages when they exceed byte limit - keeps only last message and crops it', async () => {
+        await createRunner()
+          .ignore('event')
+          .expect({
+            transaction: {
+              transaction: 'main',
+              spans: expect.arrayContaining([
+                expect.objectContaining({
+                  data: expect.objectContaining({
+                    'gen_ai.operation.name': 'embeddings',
+                  }),
+                }),
+              ]),
+            },
+          })
+          .start()
+          .completed();
+      });
+    },
+  );
 });
diff --git a/dev-packages/node-integration-tests/suites/tracing/openai/scenario-message-truncation-completions.mjs b/dev-packages/node-integration-tests/suites/tracing/openai/truncation/scenario-message-truncation-completions.mjs
similarity index 100%
rename from dev-packages/node-integration-tests/suites/tracing/openai/scenario-message-truncation-completions.mjs
rename to dev-packages/node-integration-tests/suites/tracing/openai/truncation/scenario-message-truncation-completions.mjs
diff --git a/dev-packages/node-integration-tests/suites/tracing/openai/truncation/scenario-message-truncation-embeddings.mjs b/dev-packages/node-integration-tests/suites/tracing/openai/truncation/scenario-message-truncation-embeddings.mjs
new file mode 100644
index 000000000000..b2e5cf3206fe
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/openai/truncation/scenario-message-truncation-embeddings.mjs
@@ -0,0 +1,66 @@
+import { instrumentOpenAiClient } from '@sentry/core';
+import * as Sentry from '@sentry/node';
+
+class MockOpenAI {
+  constructor(config) {
+    this.apiKey = config.apiKey;
+
+    this.embeddings = {
+      create: async params => {
+        await new Promise(resolve => setTimeout(resolve, 10));
+
+        return {
+          object: 'list',
+          data: [
+            {
+              object: 'embedding',
+              embedding: [0.1, 0.2, 0.3],
+              index: 0,
+            },
+          ],
+          model: params.model,
+          usage: {
+            prompt_tokens: 10,
+            total_tokens: 10,
+          },
+        };
+      },
+    };
+  }
+}
+
+async function run() {
+  await Sentry.startSpan({ op: 'function', name: 'main' }, async () => {
+    const mockClient = new MockOpenAI({
+      apiKey: 'mock-api-key',
+    });
+
+    const client = instrumentOpenAiClient(mockClient);
+
+    // Create 1 large input that gets truncated to fit within the 20KB limit
+    const largeContent = 'A'.repeat(25000) + 'B'.repeat(25000); // ~50KB gets truncated to include only As
+
+    await client.embeddings.create({
+      input: largeContent,
+      model: 'text-embedding-3-small',
+      dimensions: 1536,
+      encoding_format: 'float',
+    });
+
+    // Create 3 large inputs where:
+    // - First 2 inputs are very large (will be dropped)
+    // - Last input is large but will be truncated to fit within the 20KB limit
+    const largeContent1 = 'A'.repeat(15000); // ~15KB
+    const largeContent2 = 'B'.repeat(15000); // ~15KB
+    const largeContent3 = 'C'.repeat(25000); // ~25KB (will be truncated)
+
+    await client.embeddings.create({
+      input: [largeContent1, largeContent2, largeContent3],
+      model: 'text-embedding-3-small',
+      dimensions: 1536,
+      encoding_format: 'float',
+    });
+  });
+}
+
+run();
diff --git a/dev-packages/node-integration-tests/suites/tracing/openai/scenario-message-truncation-responses.mjs b/dev-packages/node-integration-tests/suites/tracing/openai/truncation/scenario-message-truncation-responses.mjs
similarity index 100%
rename from dev-packages/node-integration-tests/suites/tracing/openai/scenario-message-truncation-responses.mjs
rename to dev-packages/node-integration-tests/suites/tracing/openai/truncation/scenario-message-truncation-responses.mjs
diff --git a/packages/core/src/tracing/ai/gen-ai-attributes.ts b/packages/core/src/tracing/ai/gen-ai-attributes.ts
index b07aa63d306f..e2808d5f2642 100644
--- a/packages/core/src/tracing/ai/gen-ai-attributes.ts
+++ b/packages/core/src/tracing/ai/gen-ai-attributes.ts
@@ -65,6 +65,16 @@ export const GEN_AI_REQUEST_TOP_K_ATTRIBUTE = 'gen_ai.request.top_k';
  */
 export const GEN_AI_REQUEST_STOP_SEQUENCES_ATTRIBUTE = 'gen_ai.request.stop_sequences';
 
+/**
+ * The encoding format for the model request
+ */
+export const GEN_AI_REQUEST_ENCODING_FORMAT_ATTRIBUTE = 'gen_ai.request.encoding_format';
+
+/**
+ * The dimensions for the model request
+ */
+export const GEN_AI_REQUEST_DIMENSIONS_ATTRIBUTE = 'gen_ai.request.dimensions';
+
 /**
  * Array of reasons why the model stopped generating tokens
  */
@@ -208,6 +218,7 @@ export const OPENAI_USAGE_PROMPT_TOKENS_ATTRIBUTE = 'openai.usage.prompt_tokens'
 export const OPENAI_OPERATIONS = {
   CHAT: 'chat',
   RESPONSES: 'responses',
+  EMBEDDINGS: 'embeddings',
 } as const;
 
 // =============================================================================
diff --git a/packages/core/src/tracing/openai/constants.ts b/packages/core/src/tracing/openai/constants.ts
index c4952b123b0f..e8b5c6ddc87f 100644
--- a/packages/core/src/tracing/openai/constants.ts
+++ b/packages/core/src/tracing/openai/constants.ts
@@ -2,7 +2,7 @@ export const OPENAI_INTEGRATION_NAME = 'OpenAI';
 
 // https://platform.openai.com/docs/quickstart?api-mode=responses
 // https://platform.openai.com/docs/quickstart?api-mode=chat
-export const INSTRUMENTED_METHODS = ['responses.create', 'chat.completions.create'] as const;
+export const INSTRUMENTED_METHODS = ['responses.create', 'chat.completions.create', 'embeddings.create'] as const;
 export const RESPONSES_TOOL_CALL_EVENT_TYPES = [
   'response.output_item.added',
   'response.function_call_arguments.delta',
diff --git a/packages/core/src/tracing/openai/index.ts b/packages/core/src/tracing/openai/index.ts
index bb099199772c..bba2ee0f5afd 100644
--- a/packages/core/src/tracing/openai/index.ts
+++ b/packages/core/src/tracing/openai/index.ts
@@ -7,6 +7,8 @@ import type { Span, SpanAttributeValue } from '../../types-hoist/span';
 import {
   GEN_AI_OPERATION_NAME_ATTRIBUTE,
   GEN_AI_REQUEST_AVAILABLE_TOOLS_ATTRIBUTE,
+  GEN_AI_REQUEST_DIMENSIONS_ATTRIBUTE,
+  GEN_AI_REQUEST_ENCODING_FORMAT_ATTRIBUTE,
   GEN_AI_REQUEST_FREQUENCY_PENALTY_ATTRIBUTE,
   GEN_AI_REQUEST_MESSAGES_ATTRIBUTE,
   GEN_AI_REQUEST_MODEL_ATTRIBUTE,
@@ -14,9 +16,7 @@ import {
   GEN_AI_REQUEST_STREAM_ATTRIBUTE,
   GEN_AI_REQUEST_TEMPERATURE_ATTRIBUTE,
   GEN_AI_REQUEST_TOP_P_ATTRIBUTE,
-  GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE,
   GEN_AI_RESPONSE_TEXT_ATTRIBUTE,
-  GEN_AI_RESPONSE_TOOL_CALLS_ATTRIBUTE,
   GEN_AI_SYSTEM_ATTRIBUTE,
 } from '../ai/gen-ai-attributes';
 import { getTruncatedJsonString } from '../ai/utils';
@@ -25,22 +25,22 @@ import { instrumentStream } from './streaming';
 import type {
   ChatCompletionChunk,
   InstrumentedMethod,
-  OpenAiChatCompletionObject,
   OpenAiIntegration,
   OpenAiOptions,
   OpenAiResponse,
-  OpenAIResponseObject,
   OpenAIStream,
   ResponseStreamingEvent,
 } from './types';
 import {
+  addChatCompletionAttributes,
+  addEmbeddingsAttributes,
+  addResponsesApiAttributes,
   buildMethodPath,
   getOperationName,
   getSpanOperation,
   isChatCompletionResponse,
+  isEmbeddingsResponse,
   isResponsesApiResponse,
-  setCommonResponseAttributes,
-  setTokenUsageAttributes,
   shouldInstrument,
 } from './utils';
 
@@ -82,6 +82,8 @@ function extractRequestAttributes(args: unknown[], methodPath: string): Record<s
       attributes[GEN_AI_REQUEST_FREQUENCY_PENALTY_ATTRIBUTE] = params.frequency_penalty;
     if ('presence_penalty' in params) attributes[GEN_AI_REQUEST_PRESENCE_PENALTY_ATTRIBUTE] = params.presence_penalty;
     if ('stream' in params) attributes[GEN_AI_REQUEST_STREAM_ATTRIBUTE] = params.stream;
+    if ('encoding_format' in params) attributes[GEN_AI_REQUEST_ENCODING_FORMAT_ATTRIBUTE] = params.encoding_format;
+    if ('dimensions' in params) attributes[GEN_AI_REQUEST_DIMENSIONS_ATTRIBUTE] = params.dimensions;
   } else {
     attributes[GEN_AI_REQUEST_MODEL_ATTRIBUTE] = 'unknown';
   }
@@ -89,83 +91,6 @@ function extractRequestAttributes(args: unknown[], methodPath: string): Record<s
   return attributes;
 }
 
-/**
- * Add attributes for Chat Completion responses
- */
-function addChatCompletionAttributes(span: Span, response: OpenAiChatCompletionObject, recordOutputs?: boolean): void {
-  setCommonResponseAttributes(span, response.id, response.model, response.created);
-  if (response.usage) {
-    setTokenUsageAttributes(
-      span,
-      response.usage.prompt_tokens,
-      response.usage.completion_tokens,
-      response.usage.total_tokens,
-    );
-  }
-  if (Array.isArray(response.choices)) {
-    const finishReasons = response.choices
-      .map(choice => choice.finish_reason)
-      .filter((reason): reason is string => reason !== null);
-    if (finishReasons.length > 0) {
-      span.setAttributes({
-        [GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: JSON.stringify(finishReasons),
-      });
-    }
-
-    // Extract tool calls from all choices (only if recordOutputs is true)
-    if (recordOutputs) {
-      const toolCalls = response.choices
-        .map(choice => choice.message?.tool_calls)
-        .filter(calls => Array.isArray(calls) && calls.length > 0)
-        .flat();
-
-      if (toolCalls.length > 0) {
-        span.setAttributes({
-          [GEN_AI_RESPONSE_TOOL_CALLS_ATTRIBUTE]: JSON.stringify(toolCalls),
-        });
-      }
-    }
-  }
-}
-
-/**
- * Add attributes for Responses API responses
- */
-function addResponsesApiAttributes(span: Span, response: OpenAIResponseObject, recordOutputs?: boolean): void {
-  setCommonResponseAttributes(span, response.id, response.model, response.created_at);
-  if (response.status) {
-    span.setAttributes({
-      [GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: JSON.stringify([response.status]),
-    });
-  }
-  if (response.usage) {
-    setTokenUsageAttributes(
-      span,
-      response.usage.input_tokens,
-      response.usage.output_tokens,
-      response.usage.total_tokens,
-    );
-  }
-
-  // Extract function calls from output (only if recordOutputs is true)
-  if (recordOutputs) {
-    const responseWithOutput = response as OpenAIResponseObject & { output?: unknown[] };
-    if (Array.isArray(responseWithOutput.output) && responseWithOutput.output.length > 0) {
-      // Filter for function_call type objects in the output array
-      const functionCalls = responseWithOutput.output.filter(
-        (item): unknown =>
-          typeof item === 'object' && item !== null && (item as Record<string, unknown>).type === 'function_call',
-      );
-
-      if (functionCalls.length > 0) {
-        span.setAttributes({
-          [GEN_AI_RESPONSE_TOOL_CALLS_ATTRIBUTE]: JSON.stringify(functionCalls),
-        });
-      }
-    }
-  }
-}
-
 /**
  * Add response attributes to spans
  * This currently supports both Chat Completion and Responses API responses
@@ -186,6 +111,8 @@ function addResponseAttributes(span: Span, result: unknown, recordOutputs?: bool
     if (recordOutputs && response.output_text) {
       span.setAttributes({ [GEN_AI_RESPONSE_TEXT_ATTRIBUTE]: response.output_text });
     }
+  } else if (isEmbeddingsResponse(response)) {
+    addEmbeddingsAttributes(span, response);
   }
 }
 
diff --git a/packages/core/src/tracing/openai/types.ts b/packages/core/src/tracing/openai/types.ts
index daa478db4ba6..6dcd644bfe17 100644
--- a/packages/core/src/tracing/openai/types.ts
+++ b/packages/core/src/tracing/openai/types.ts
@@ -131,7 +131,29 @@ export interface OpenAIResponseObject {
   metadata: Record<string, unknown>;
 }
 
-export type OpenAiResponse = OpenAiChatCompletionObject | OpenAIResponseObject;
+/**
+ * @see https://platform.openai.com/docs/api-reference/embeddings/object
+ */
+export interface OpenAIEmbeddingsObject {
+  object: 'embedding';
+  embedding: number[];
+  index: number;
+}
+
+/**
+ * @see https://platform.openai.com/docs/api-reference/embeddings/create
+ */
+export interface OpenAICreateEmbeddingsObject {
+  object: 'list';
+  data: OpenAIEmbeddingsObject[];
+  model: string;
+  usage: {
+    prompt_tokens: number;
+    total_tokens: number;
+  };
+}
+
+export type OpenAiResponse = OpenAiChatCompletionObject | OpenAIResponseObject | OpenAICreateEmbeddingsObject;
 
 /**
  * Streaming event types for the Responses API
diff --git a/packages/core/src/tracing/openai/utils.ts b/packages/core/src/tracing/openai/utils.ts
index 17007693e739..4dff5b4fdbb8 100644
--- a/packages/core/src/tracing/openai/utils.ts
+++ b/packages/core/src/tracing/openai/utils.ts
@@ -1,7 +1,9 @@
 import type { Span } from '../../types-hoist/span';
 import {
+  GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE,
   GEN_AI_RESPONSE_ID_ATTRIBUTE,
   GEN_AI_RESPONSE_MODEL_ATTRIBUTE,
+  GEN_AI_RESPONSE_TOOL_CALLS_ATTRIBUTE,
   GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE,
   GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE,
   GEN_AI_USAGE_TOTAL_TOKENS_ATTRIBUTE,
@@ -17,6 +19,7 @@ import type {
   ChatCompletionChunk,
   InstrumentedMethod,
   OpenAiChatCompletionObject,
+  OpenAICreateEmbeddingsObject,
   OpenAIResponseObject,
   ResponseStreamingEvent,
 } from './types';
@@ -31,6 +34,9 @@ export function getOperationName(methodPath: string): string {
   if (methodPath.includes('responses')) {
     return OPENAI_OPERATIONS.RESPONSES;
   }
+  if (methodPath.includes('embeddings')) {
+    return OPENAI_OPERATIONS.EMBEDDINGS;
+  }
   return methodPath.split('.').pop() || 'unknown';
 }
 
@@ -80,6 +86,21 @@ export function isResponsesApiResponse(response: unknown): response is OpenAIRes
   );
 }
 
+/**
+ * Check if response is an Embeddings API object
+ */
+export function isEmbeddingsResponse(response: unknown): response is OpenAICreateEmbeddingsObject {
+  if (response === null || typeof response !== 'object' || !('object' in response)) {
+    return false;
+  }
+  const responseObject = response as Record<string, unknown>;
+  return (
+    responseObject.object === 'list' &&
+    typeof responseObject.model === 'string' &&
+    responseObject.model.toLowerCase().includes('embedding')
+  );
+}
+
 /**
  * Check if streaming event is from the Responses API
  */
@@ -105,6 +126,101 @@ export function isChatCompletionChunk(event: unknown): event is ChatCompletionCh
   );
 }
 
+/**
+ * Add attributes for Chat Completion responses
+ */
+export function addChatCompletionAttributes(
+  span: Span,
+  response: OpenAiChatCompletionObject,
+  recordOutputs?: boolean,
+): void {
+  setCommonResponseAttributes(span, response.id, response.model, response.created);
+  if (response.usage) {
+    setTokenUsageAttributes(
+      span,
+      response.usage.prompt_tokens,
+      response.usage.completion_tokens,
+      response.usage.total_tokens,
+    );
+  }
+  if (Array.isArray(response.choices)) {
+    const finishReasons = response.choices
+      .map(choice => choice.finish_reason)
+      .filter((reason): reason is string => reason !== null);
+    if (finishReasons.length > 0) {
+      span.setAttributes({
+        [GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: JSON.stringify(finishReasons),
+      });
+    }
+
+    // Extract tool calls from all choices (only if recordOutputs is true)
+    if (recordOutputs) {
+      const toolCalls = response.choices
+        .map(choice => choice.message?.tool_calls)
+        .filter(calls => Array.isArray(calls) && calls.length > 0)
+        .flat();
+
+      if (toolCalls.length > 0) {
+        span.setAttributes({
+          [GEN_AI_RESPONSE_TOOL_CALLS_ATTRIBUTE]: JSON.stringify(toolCalls),
+        });
+      }
+    }
+  }
+}
+
+/**
+ * Add attributes for Responses API responses
+ */
+export function addResponsesApiAttributes(span: Span, response: OpenAIResponseObject, recordOutputs?: boolean): void {
+  setCommonResponseAttributes(span, response.id, response.model, response.created_at);
+  if (response.status) {
+    span.setAttributes({
+      [GEN_AI_RESPONSE_FINISH_REASONS_ATTRIBUTE]: JSON.stringify([response.status]),
+    });
+  }
+  if (response.usage) {
+    setTokenUsageAttributes(
+      span,
+      response.usage.input_tokens,
+      response.usage.output_tokens,
+      response.usage.total_tokens,
+    );
+  }
+
+  // Extract function calls from output (only if recordOutputs is true)
+  if (recordOutputs) {
+    const responseWithOutput = response as OpenAIResponseObject & { output?: unknown[] };
+    if (Array.isArray(responseWithOutput.output) && responseWithOutput.output.length > 0) {
+      // Filter for function_call type objects in the output array
+      const functionCalls = responseWithOutput.output.filter(
+        (item): unknown =>
+          typeof item === 'object' && item !== null && (item as Record<string, unknown>).type === 'function_call',
+      );
+
+      if (functionCalls.length > 0) {
+        span.setAttributes({
+          [GEN_AI_RESPONSE_TOOL_CALLS_ATTRIBUTE]: JSON.stringify(functionCalls),
+        });
+      }
+    }
+  }
+}
+
+/**
+ * Add attributes for Embeddings API responses
+ */
+export function addEmbeddingsAttributes(span: Span, response: OpenAICreateEmbeddingsObject): void {
+  span.setAttributes({
+    [OPENAI_RESPONSE_MODEL_ATTRIBUTE]: response.model,
+    [GEN_AI_RESPONSE_MODEL_ATTRIBUTE]: response.model,
+  });
+
+  if (response.usage) {
+    setTokenUsageAttributes(span, response.usage.prompt_tokens, undefined, response.usage.total_tokens);
+  }
+}
+
 /**
  * Set token usage attributes
  * @param span - The span to add attributes to

From d12ba2ef6bd2512e8b4576dfc381f9dae173c5b4 Mon Sep 17 00:00:00 2001
From: Charly Gomez <charly.gomez@sentry.io>
Date: Tue, 18 Nov 2025 18:14:18 +0100
Subject: [PATCH 086/186] feat(metrics): Add default `server.address` attribute
 on server runtimes (#18242)

Attaches a `server.address` attribute to all captured metrics on a
`serverRuntimeClient`

Did this by emitting a new `processMetric` hook in core, that we listen
to in the `serverRuntimeClient`. This way we do not need to re-export
all metrics functions from server runtime packages and still only get a
minimal client bundle size bump.

Added integration tests for node + cloudflare

closes https://github.com/getsentry/sentry-javascript/issues/18240
closes
https://linear.app/getsentry/issue/JS-1178/attach-serveraddress-as-a-default-attribute-to-metrics

---------

Co-authored-by: Lukas Stracke <lukas.stracke@sentry.io>
---
 .../metrics/server-address/index.ts           | 21 ++++++
 .../public-api/metrics/server-address/test.ts | 50 ++++++++++++++
 .../metrics/server-address/wrangler.jsonc     |  6 ++
 .../metrics/server-address-option/scenario.ts | 19 ++++++
 .../metrics/server-address-option/test.ts     | 36 ++++++++++
 .../metrics/server-address/scenario.ts        | 18 +++++
 .../public-api/metrics/server-address/test.ts | 36 ++++++++++
 packages/core/src/client.ts                   | 14 ++++
 packages/core/src/metrics/internal.ts         |  2 +
 packages/core/src/server-runtime-client.ts    | 16 +++++
 .../test/lib/server-runtime-client.test.ts    | 65 +++++++++++++++++++
 11 files changed, 283 insertions(+)
 create mode 100644 dev-packages/cloudflare-integration-tests/suites/public-api/metrics/server-address/index.ts
 create mode 100644 dev-packages/cloudflare-integration-tests/suites/public-api/metrics/server-address/test.ts
 create mode 100644 dev-packages/cloudflare-integration-tests/suites/public-api/metrics/server-address/wrangler.jsonc
 create mode 100644 dev-packages/node-integration-tests/suites/public-api/metrics/server-address-option/scenario.ts
 create mode 100644 dev-packages/node-integration-tests/suites/public-api/metrics/server-address-option/test.ts
 create mode 100644 dev-packages/node-integration-tests/suites/public-api/metrics/server-address/scenario.ts
 create mode 100644 dev-packages/node-integration-tests/suites/public-api/metrics/server-address/test.ts

diff --git a/dev-packages/cloudflare-integration-tests/suites/public-api/metrics/server-address/index.ts b/dev-packages/cloudflare-integration-tests/suites/public-api/metrics/server-address/index.ts
new file mode 100644
index 000000000000..635fcfc8721e
--- /dev/null
+++ b/dev-packages/cloudflare-integration-tests/suites/public-api/metrics/server-address/index.ts
@@ -0,0 +1,21 @@
+import * as Sentry from '@sentry/cloudflare';
+
+interface Env {
+  SENTRY_DSN: string;
+}
+
+export default Sentry.withSentry(
+  (env: Env) => ({
+    dsn: env.SENTRY_DSN,
+    release: '1.0.0',
+    environment: 'test',
+    serverName: 'mi-servidor.com',
+  }),
+  {
+    async fetch(_request, _env, _ctx) {
+      Sentry.metrics.count('test.counter', 1, { attributes: { endpoint: '/api/test' } });
+      await Sentry.flush();
+      return new Response('OK');
+    },
+  },
+);
diff --git a/dev-packages/cloudflare-integration-tests/suites/public-api/metrics/server-address/test.ts b/dev-packages/cloudflare-integration-tests/suites/public-api/metrics/server-address/test.ts
new file mode 100644
index 000000000000..5ee5b0954e59
--- /dev/null
+++ b/dev-packages/cloudflare-integration-tests/suites/public-api/metrics/server-address/test.ts
@@ -0,0 +1,50 @@
+import type { SerializedMetricContainer } from '@sentry/core';
+import { expect, it } from 'vitest';
+import { createRunner } from '../../../../runner';
+
+it('should add server.address attribute to metrics when serverName is set', async ({ signal }) => {
+  const runner = createRunner(__dirname)
+    .expect(envelope => {
+      const metric = envelope[1]?.[0]?.[1] as SerializedMetricContainer;
+
+      expect(metric.items[0]).toEqual(
+        expect.objectContaining({
+          name: 'test.counter',
+          type: 'counter',
+          value: 1,
+          span_id: expect.any(String),
+          timestamp: expect.any(Number),
+          trace_id: expect.any(String),
+          attributes: {
+            endpoint: {
+              type: 'string',
+              value: '/api/test',
+            },
+            'sentry.environment': {
+              type: 'string',
+              value: 'test',
+            },
+            'sentry.release': {
+              type: 'string',
+              value: expect.any(String),
+            },
+            'sentry.sdk.name': {
+              type: 'string',
+              value: 'sentry.javascript.cloudflare',
+            },
+            'sentry.sdk.version': {
+              type: 'string',
+              value: expect.any(String),
+            },
+            'server.address': {
+              type: 'string',
+              value: 'mi-servidor.com',
+            },
+          },
+        }),
+      );
+    })
+    .start(signal);
+  await runner.makeRequest('get', '/');
+  await runner.completed();
+});
diff --git a/dev-packages/cloudflare-integration-tests/suites/public-api/metrics/server-address/wrangler.jsonc b/dev-packages/cloudflare-integration-tests/suites/public-api/metrics/server-address/wrangler.jsonc
new file mode 100644
index 000000000000..d6be01281f0c
--- /dev/null
+++ b/dev-packages/cloudflare-integration-tests/suites/public-api/metrics/server-address/wrangler.jsonc
@@ -0,0 +1,6 @@
+{
+  "name": "worker-name",
+  "compatibility_date": "2025-06-17",
+  "main": "index.ts",
+  "compatibility_flags": ["nodejs_compat"],
+}
diff --git a/dev-packages/node-integration-tests/suites/public-api/metrics/server-address-option/scenario.ts b/dev-packages/node-integration-tests/suites/public-api/metrics/server-address-option/scenario.ts
new file mode 100644
index 000000000000..1f6d60f91cac
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/public-api/metrics/server-address-option/scenario.ts
@@ -0,0 +1,19 @@
+import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  release: '1.0.0',
+  environment: 'test',
+  serverName: 'mi-servidor.com',
+  transport: loggingTransport,
+});
+
+async function run(): Promise<void> {
+  Sentry.metrics.count('test.counter', 1, { attributes: { endpoint: '/api/test' } });
+
+  await Sentry.flush();
+}
+
+// eslint-disable-next-line @typescript-eslint/no-floating-promises
+run();
diff --git a/dev-packages/node-integration-tests/suites/public-api/metrics/server-address-option/test.ts b/dev-packages/node-integration-tests/suites/public-api/metrics/server-address-option/test.ts
new file mode 100644
index 000000000000..825d94f41624
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/public-api/metrics/server-address-option/test.ts
@@ -0,0 +1,36 @@
+import { afterAll, describe, expect, test } from 'vitest';
+import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';
+
+describe('metrics server.address', () => {
+  afterAll(() => {
+    cleanupChildProcesses();
+  });
+
+  test('should add server.address attribute to metrics when serverName is set', async () => {
+    const runner = createRunner(__dirname, 'scenario.ts')
+      .expect({
+        trace_metric: {
+          items: [
+            {
+              timestamp: expect.any(Number),
+              trace_id: expect.any(String),
+              name: 'test.counter',
+              type: 'counter',
+              value: 1,
+              attributes: {
+                endpoint: { value: '/api/test', type: 'string' },
+                'server.address': { value: 'mi-servidor.com', type: 'string' },
+                'sentry.release': { value: '1.0.0', type: 'string' },
+                'sentry.environment': { value: 'test', type: 'string' },
+                'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                'sentry.sdk.version': { value: expect.any(String), type: 'string' },
+              },
+            },
+          ],
+        },
+      })
+      .start();
+
+    await runner.completed();
+  });
+});
diff --git a/dev-packages/node-integration-tests/suites/public-api/metrics/server-address/scenario.ts b/dev-packages/node-integration-tests/suites/public-api/metrics/server-address/scenario.ts
new file mode 100644
index 000000000000..a985f2a0fce3
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/public-api/metrics/server-address/scenario.ts
@@ -0,0 +1,18 @@
+import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  release: '1.0.0',
+  environment: 'test',
+  transport: loggingTransport,
+});
+
+async function run(): Promise<void> {
+  Sentry.metrics.count('test.counter', 1, { attributes: { endpoint: '/api/test' } });
+
+  await Sentry.flush();
+}
+
+// eslint-disable-next-line @typescript-eslint/no-floating-promises
+run();
diff --git a/dev-packages/node-integration-tests/suites/public-api/metrics/server-address/test.ts b/dev-packages/node-integration-tests/suites/public-api/metrics/server-address/test.ts
new file mode 100644
index 000000000000..1ee4eda2de3e
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/public-api/metrics/server-address/test.ts
@@ -0,0 +1,36 @@
+import { afterAll, describe, expect, test } from 'vitest';
+import { cleanupChildProcesses, createRunner } from '../../../../utils/runner';
+
+describe('metrics server.address', () => {
+  afterAll(() => {
+    cleanupChildProcesses();
+  });
+
+  test('should add server.address attribute to metrics when serverName is set', async () => {
+    const runner = createRunner(__dirname, 'scenario.ts')
+      .expect({
+        trace_metric: {
+          items: [
+            {
+              timestamp: expect.any(Number),
+              trace_id: expect.any(String),
+              name: 'test.counter',
+              type: 'counter',
+              value: 1,
+              attributes: {
+                endpoint: { value: '/api/test', type: 'string' },
+                'server.address': { value: expect.any(String), type: 'string' },
+                'sentry.release': { value: '1.0.0', type: 'string' },
+                'sentry.environment': { value: 'test', type: 'string' },
+                'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+                'sentry.sdk.version': { value: expect.any(String), type: 'string' },
+              },
+            },
+          ],
+        },
+      })
+      .start();
+
+    await runner.completed();
+  });
+});
diff --git a/packages/core/src/client.ts b/packages/core/src/client.ts
index f363e61becd7..1c925d930036 100644
--- a/packages/core/src/client.ts
+++ b/packages/core/src/client.ts
@@ -783,6 +783,13 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
    */
   public on(hook: 'flushMetrics', callback: () => void): () => void;
 
+  /**
+   * A hook that is called when a metric is processed before it is captured and before the `beforeSendMetric` callback is fired.
+   *
+   * @returns {() => void} A function that, when executed, removes the registered callback.
+   */
+  public on(hook: 'processMetric', callback: (metric: Metric) => void): () => void;
+
   /**
    * A hook that is called when a http server request is started.
    * This hook is called after request isolation, but before the request is processed.
@@ -992,6 +999,13 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
    */
   public emit(hook: 'flushMetrics'): void;
 
+  /**
+   *
+   * Emit a hook event for client to process a metric before it is captured.
+   * This hook is called before the `beforeSendMetric` callback is fired.
+   */
+  public emit(hook: 'processMetric', metric: Metric): void;
+
   /**
    * Emit a hook event for client when a http server request is started.
    * This hook is called after request isolation, but before the request is processed.
diff --git a/packages/core/src/metrics/internal.ts b/packages/core/src/metrics/internal.ts
index b38d61b5195c..7ac1372d1285 100644
--- a/packages/core/src/metrics/internal.ts
+++ b/packages/core/src/metrics/internal.ts
@@ -227,6 +227,8 @@ export function _INTERNAL_captureMetric(beforeMetric: Metric, options?: Internal
   // Enrich metric with contextual attributes
   const enrichedMetric = _enrichMetricAttributes(beforeMetric, client, currentScope);
 
+  client.emit('processMetric', enrichedMetric);
+
   // todo(v11): Remove the experimental `beforeSendMetric`
   // eslint-disable-next-line deprecation/deprecation
   const beforeSendCallback = beforeSendMetric || _experiments?.beforeSendMetric;
diff --git a/packages/core/src/server-runtime-client.ts b/packages/core/src/server-runtime-client.ts
index 988e642d0a27..d1ae8e9063e6 100644
--- a/packages/core/src/server-runtime-client.ts
+++ b/packages/core/src/server-runtime-client.ts
@@ -40,6 +40,8 @@ export class ServerRuntimeClient<
     addUserAgentToTransportHeaders(options);
 
     super(options);
+
+    this._setUpMetricsProcessing();
   }
 
   /**
@@ -176,6 +178,20 @@ export class ServerRuntimeClient<
 
     return super._prepareEvent(event, hint, currentScope, isolationScope);
   }
+
+  /**
+   * Process a server-side metric before it is captured.
+   */
+  private _setUpMetricsProcessing(): void {
+    this.on('processMetric', metric => {
+      if (this._options.serverName) {
+        metric.attributes = {
+          'server.address': this._options.serverName,
+          ...metric.attributes,
+        };
+      }
+    });
+  }
 }
 
 function setCurrentRequestSessionErroredOrCrashed(eventHint?: EventHint): void {
diff --git a/packages/core/test/lib/server-runtime-client.test.ts b/packages/core/test/lib/server-runtime-client.test.ts
index 3c5fe874af9f..24fb60d187ef 100644
--- a/packages/core/test/lib/server-runtime-client.test.ts
+++ b/packages/core/test/lib/server-runtime-client.test.ts
@@ -1,5 +1,6 @@
 import { describe, expect, it, test, vi } from 'vitest';
 import { applySdkMetadata, createTransport, Scope } from '../../src';
+import { _INTERNAL_captureMetric, _INTERNAL_getMetricBuffer } from '../../src/metrics/internal';
 import type { ServerRuntimeClientOptions } from '../../src/server-runtime-client';
 import { ServerRuntimeClient } from '../../src/server-runtime-client';
 import type { Event, EventHint } from '../../src/types-hoist/event';
@@ -236,4 +237,68 @@ describe('ServerRuntimeClient', () => {
       });
     });
   });
+
+  describe('metrics processing', () => {
+    it('adds server.address attribute to metrics when serverName is set', () => {
+      const options = getDefaultClientOptions({ dsn: PUBLIC_DSN, serverName: 'my-server.example.com' });
+      client = new ServerRuntimeClient(options);
+      const scope = new Scope();
+      scope.setClient(client);
+
+      _INTERNAL_captureMetric({ type: 'counter', name: 'test.metric', value: 1 }, { scope });
+
+      const metricAttributes = _INTERNAL_getMetricBuffer(client)?.[0]?.attributes;
+      expect(metricAttributes).toEqual(
+        expect.objectContaining({
+          'server.address': {
+            value: 'my-server.example.com',
+            type: 'string',
+          },
+        }),
+      );
+    });
+
+    it('does not add server.address attribute when serverName is not set', () => {
+      const options = getDefaultClientOptions({ dsn: PUBLIC_DSN });
+      client = new ServerRuntimeClient(options);
+      const scope = new Scope();
+      scope.setClient(client);
+
+      _INTERNAL_captureMetric({ type: 'counter', name: 'test.metric', value: 1 }, { scope });
+
+      const metricAttributes = _INTERNAL_getMetricBuffer(client)?.[0]?.attributes;
+      expect(metricAttributes).not.toEqual(
+        expect.objectContaining({
+          'server.address': expect.anything(),
+        }),
+      );
+    });
+
+    it('does not overwrite existing server.address attribute', () => {
+      const options = getDefaultClientOptions({ dsn: PUBLIC_DSN, serverName: 'my-server.example.com' });
+      client = new ServerRuntimeClient(options);
+      const scope = new Scope();
+      scope.setClient(client);
+
+      _INTERNAL_captureMetric(
+        {
+          type: 'counter',
+          name: 'test.metric',
+          value: 1,
+          attributes: { 'server.address': 'existing-server.example.com' },
+        },
+        { scope },
+      );
+
+      const metricAttributes = _INTERNAL_getMetricBuffer(client)?.[0]?.attributes;
+      expect(metricAttributes).toEqual(
+        expect.objectContaining({
+          'server.address': {
+            value: 'existing-server.example.com',
+            type: 'string',
+          },
+        }),
+      );
+    });
+  });
 });

From 584d4bcf72cb2c98242c97841d53ae7c330d8da4 Mon Sep 17 00:00:00 2001
From: Rola Abuhasna <rola.abuhasna@sentry.io>
Date: Wed, 19 Nov 2025 10:00:32 +0100
Subject: [PATCH 087/186] feat(cloudflare/vercel-edge): Add manual
 instrumentation for LangGraph (#18112)

This PR adds manual instrumentation support for LangGraph StateGraph
operations in Cloudflare Workers and Vercel Edge environments.

```
import * as Sentry from '@sentry/cloudflare'; // or '@sentry/vercel-edge'
import { StateGraph, START, END, MessagesAnnotation } from '@langchain/langgraph';

// Create and instrument the graph
const graph = new StateGraph(MessagesAnnotation)
  .addNode('agent', agentFn)
  .addEdge(START, 'agent')
  .addEdge('agent', END);

Sentry.instrumentLangGraph(graph, {
  recordInputs: true,
  recordOutputs: true,
});

const compiled = graph.compile({ name: 'weather_assistant' });

await compiled.invoke({
  messages: [{ role: 'user', content: 'What is the weather in SF?' }],
});
```

- [x] This PR depends on #18114
---
 .../cloudflare-integration-tests/package.json |  3 +-
 .../suites/tracing/langgraph/index.ts         | 66 +++++++++++++++++++
 .../suites/tracing/langgraph/test.ts          | 59 +++++++++++++++++
 .../suites/tracing/langgraph/wrangler.jsonc   |  6 ++
 packages/cloudflare/src/index.ts              |  1 +
 packages/core/src/index.ts                    |  2 +-
 packages/core/src/tracing/langgraph/index.ts  | 35 ++++++++++
 packages/vercel-edge/src/index.ts             |  1 +
 yarn.lock                                     | 25 +++++++
 9 files changed, 196 insertions(+), 2 deletions(-)
 create mode 100644 dev-packages/cloudflare-integration-tests/suites/tracing/langgraph/index.ts
 create mode 100644 dev-packages/cloudflare-integration-tests/suites/tracing/langgraph/test.ts
 create mode 100644 dev-packages/cloudflare-integration-tests/suites/tracing/langgraph/wrangler.jsonc

diff --git a/dev-packages/cloudflare-integration-tests/package.json b/dev-packages/cloudflare-integration-tests/package.json
index aac6e9c96945..c791a224a2cc 100644
--- a/dev-packages/cloudflare-integration-tests/package.json
+++ b/dev-packages/cloudflare-integration-tests/package.json
@@ -13,7 +13,8 @@
     "test:watch": "yarn test --watch"
   },
   "dependencies": {
-    "@sentry/cloudflare": "10.25.0"
+    "@sentry/cloudflare": "10.25.0",
+    "@langchain/langgraph": "^1.0.1"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20250922.0",
diff --git a/dev-packages/cloudflare-integration-tests/suites/tracing/langgraph/index.ts b/dev-packages/cloudflare-integration-tests/suites/tracing/langgraph/index.ts
new file mode 100644
index 000000000000..6837a14be111
--- /dev/null
+++ b/dev-packages/cloudflare-integration-tests/suites/tracing/langgraph/index.ts
@@ -0,0 +1,66 @@
+import { END, MessagesAnnotation, START, StateGraph } from '@langchain/langgraph';
+import * as Sentry from '@sentry/cloudflare';
+
+interface Env {
+  SENTRY_DSN: string;
+}
+
+export default Sentry.withSentry(
+  (env: Env) => ({
+    dsn: env.SENTRY_DSN,
+    tracesSampleRate: 1.0,
+    sendDefaultPii: true,
+  }),
+  {
+    async fetch(_request, _env, _ctx) {
+      // Define simple mock LLM function
+      const mockLlm = (): {
+        messages: {
+          role: string;
+          content: string;
+          response_metadata: {
+            model_name: string;
+            finish_reason: string;
+            tokenUsage: { promptTokens: number; completionTokens: number; totalTokens: number };
+          };
+          tool_calls: never[];
+        }[];
+      } => {
+        return {
+          messages: [
+            {
+              role: 'assistant',
+              content: 'Mock response from LangGraph agent',
+              response_metadata: {
+                model_name: 'mock-model',
+                finish_reason: 'stop',
+                tokenUsage: {
+                  promptTokens: 20,
+                  completionTokens: 10,
+                  totalTokens: 30,
+                },
+              },
+              tool_calls: [],
+            },
+          ],
+        };
+      };
+
+      // Create and instrument the graph
+      const graph = new StateGraph(MessagesAnnotation)
+        .addNode('agent', mockLlm)
+        .addEdge(START, 'agent')
+        .addEdge('agent', END);
+
+      Sentry.instrumentLangGraph(graph, { recordInputs: true, recordOutputs: true });
+
+      const compiled = graph.compile({ name: 'weather_assistant' });
+
+      await compiled.invoke({
+        messages: [{ role: 'user', content: 'What is the weather in SF?' }],
+      });
+
+      return new Response(JSON.stringify({ success: true }));
+    },
+  },
+);
diff --git a/dev-packages/cloudflare-integration-tests/suites/tracing/langgraph/test.ts b/dev-packages/cloudflare-integration-tests/suites/tracing/langgraph/test.ts
new file mode 100644
index 000000000000..33023b30fa55
--- /dev/null
+++ b/dev-packages/cloudflare-integration-tests/suites/tracing/langgraph/test.ts
@@ -0,0 +1,59 @@
+import { expect, it } from 'vitest';
+import { createRunner } from '../../../runner';
+
+// These tests are not exhaustive because the instrumentation is
+// already tested in the node integration tests and we merely
+// want to test that the instrumentation does not break in our
+// cloudflare SDK.
+
+it('traces langgraph compile and invoke operations', async ({ signal }) => {
+  const runner = createRunner(__dirname)
+    .ignore('event')
+    .expect(envelope => {
+      const transactionEvent = envelope[1]?.[0]?.[1] as any;
+
+      expect(transactionEvent.transaction).toBe('GET /');
+
+      // Check create_agent span
+      const createAgentSpan = transactionEvent.spans.find((span: any) => span.op === 'gen_ai.create_agent');
+      expect(createAgentSpan).toMatchObject({
+        data: {
+          'gen_ai.operation.name': 'create_agent',
+          'sentry.op': 'gen_ai.create_agent',
+          'sentry.origin': 'auto.ai.langgraph',
+          'gen_ai.agent.name': 'weather_assistant',
+        },
+        description: 'create_agent weather_assistant',
+        op: 'gen_ai.create_agent',
+        origin: 'auto.ai.langgraph',
+      });
+
+      // Check invoke_agent span
+      const invokeAgentSpan = transactionEvent.spans.find((span: any) => span.op === 'gen_ai.invoke_agent');
+      expect(invokeAgentSpan).toMatchObject({
+        data: expect.objectContaining({
+          'gen_ai.operation.name': 'invoke_agent',
+          'sentry.op': 'gen_ai.invoke_agent',
+          'sentry.origin': 'auto.ai.langgraph',
+          'gen_ai.agent.name': 'weather_assistant',
+          'gen_ai.pipeline.name': 'weather_assistant',
+          'gen_ai.request.messages': '[{"role":"user","content":"What is the weather in SF?"}]',
+          'gen_ai.response.model': 'mock-model',
+          'gen_ai.usage.input_tokens': 20,
+          'gen_ai.usage.output_tokens': 10,
+          'gen_ai.usage.total_tokens': 30,
+        }),
+        description: 'invoke_agent weather_assistant',
+        op: 'gen_ai.invoke_agent',
+        origin: 'auto.ai.langgraph',
+      });
+
+      // Verify tools are captured
+      if (invokeAgentSpan.data['gen_ai.request.available_tools']) {
+        expect(invokeAgentSpan.data['gen_ai.request.available_tools']).toMatch(/get_weather/);
+      }
+    })
+    .start(signal);
+  await runner.makeRequest('get', '/');
+  await runner.completed();
+});
diff --git a/dev-packages/cloudflare-integration-tests/suites/tracing/langgraph/wrangler.jsonc b/dev-packages/cloudflare-integration-tests/suites/tracing/langgraph/wrangler.jsonc
new file mode 100644
index 000000000000..d6be01281f0c
--- /dev/null
+++ b/dev-packages/cloudflare-integration-tests/suites/tracing/langgraph/wrangler.jsonc
@@ -0,0 +1,6 @@
+{
+  "name": "worker-name",
+  "compatibility_date": "2025-06-17",
+  "main": "index.ts",
+  "compatibility_flags": ["nodejs_compat"],
+}
diff --git a/packages/cloudflare/src/index.ts b/packages/cloudflare/src/index.ts
index 36de54816030..827c45327689 100644
--- a/packages/cloudflare/src/index.ts
+++ b/packages/cloudflare/src/index.ts
@@ -102,6 +102,7 @@ export {
   growthbookIntegration,
   logger,
   metrics,
+  instrumentLangGraph,
 } from '@sentry/core';
 
 export { withSentry } from './handler';
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index ed3dbe4750d7..014a411d0265 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -152,7 +152,7 @@ export type { GoogleGenAIResponse } from './tracing/google-genai/types';
 export { createLangChainCallbackHandler } from './tracing/langchain';
 export { LANGCHAIN_INTEGRATION_NAME } from './tracing/langchain/constants';
 export type { LangChainOptions, LangChainIntegration } from './tracing/langchain/types';
-export { instrumentStateGraphCompile } from './tracing/langgraph';
+export { instrumentStateGraphCompile, instrumentLangGraph } from './tracing/langgraph';
 export { LANGGRAPH_INTEGRATION_NAME } from './tracing/langgraph/constants';
 export type { LangGraphOptions, LangGraphIntegration, CompiledGraph } from './tracing/langgraph/types';
 export type { OpenAiClient, OpenAiOptions, InstrumentedMethod } from './tracing/openai/types';
diff --git a/packages/core/src/tracing/langgraph/index.ts b/packages/core/src/tracing/langgraph/index.ts
index 65d315bf3f63..5601cddf458b 100644
--- a/packages/core/src/tracing/langgraph/index.ts
+++ b/packages/core/src/tracing/langgraph/index.ts
@@ -155,3 +155,38 @@ function instrumentCompiledGraphInvoke(
     },
   }) as (...args: unknown[]) => Promise<unknown>;
 }
+
+/**
+ * Directly instruments a StateGraph instance to add tracing spans
+ *
+ * This function can be used to manually instrument LangGraph StateGraph instances
+ * in environments where automatic instrumentation is not available or desired.
+ *
+ * @param stateGraph - The StateGraph instance to instrument
+ * @param options - Optional configuration for recording inputs/outputs
+ *
+ * @example
+ * ```typescript
+ * import { instrumentLangGraph } from '@sentry/cloudflare';
+ * import { StateGraph } from '@langchain/langgraph';
+ *
+ * const graph = new StateGraph(MessagesAnnotation)
+ *   .addNode('agent', mockLlm)
+ *   .addEdge(START, 'agent')
+ *   .addEdge('agent', END);
+ *
+ * instrumentLangGraph(graph, { recordInputs: true, recordOutputs: true });
+ * const compiled = graph.compile({ name: 'my_agent' });
+ * ```
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function instrumentLangGraph<T extends { compile: (...args: any[]) => any }>(
+  stateGraph: T,
+  options?: LangGraphOptions,
+): T {
+  const _options: LangGraphOptions = options || {};
+
+  stateGraph.compile = instrumentStateGraphCompile(stateGraph.compile.bind(stateGraph), _options);
+
+  return stateGraph;
+}
diff --git a/packages/vercel-edge/src/index.ts b/packages/vercel-edge/src/index.ts
index 4f5017bb8f6c..8ece38279732 100644
--- a/packages/vercel-edge/src/index.ts
+++ b/packages/vercel-edge/src/index.ts
@@ -71,6 +71,7 @@ export {
   // eslint-disable-next-line deprecation/deprecation
   inboundFiltersIntegration,
   instrumentOpenAiClient,
+  instrumentLangGraph,
   instrumentGoogleGenAIClient,
   instrumentAnthropicAiClient,
   eventFiltersIntegration,
diff --git a/yarn.lock b/yarn.lock
index 0b2a0f0f31dc..082e1a032283 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4931,6 +4931,13 @@
     zod "^3.25.32"
     zod-to-json-schema "^3.22.3"
 
+"@langchain/langgraph-checkpoint@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/@langchain/langgraph-checkpoint/-/langgraph-checkpoint-1.0.0.tgz#ece2ede439d0d0b0b532c4be7817fd5029afe4f8"
+  integrity sha512-xrclBGvNCXDmi0Nz28t3vjpxSH6UYx6w5XAXSiiB1WEdc2xD2iY/a913I3x3a31XpInUW/GGfXXfePfaghV54A==
+  dependencies:
+    uuid "^10.0.0"
+
 "@langchain/langgraph-checkpoint@~0.0.17":
   version "0.0.18"
   resolved "https://registry.npmjs.org/@langchain/langgraph-checkpoint/-/langgraph-checkpoint-0.0.18.tgz#2f7a9cdeda948ccc8d312ba9463810709d71d0b8"
@@ -4948,6 +4955,15 @@
     p-retry "4"
     uuid "^9.0.0"
 
+"@langchain/langgraph-sdk@~1.0.0":
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/@langchain/langgraph-sdk/-/langgraph-sdk-1.0.0.tgz#16faca6cc426432dee9316428d0aecd94e5b7989"
+  integrity sha512-g25ti2W7Dl5wUPlNK+0uIGbeNFqf98imhHlbdVVKTTkDYLhi/pI1KTgsSSkzkeLuBIfvt2b0q6anQwCs7XBlbw==
+  dependencies:
+    p-queue "^6.6.2"
+    p-retry "4"
+    uuid "^9.0.0"
+
 "@langchain/langgraph@^0.2.32":
   version "0.2.74"
   resolved "https://registry.npmjs.org/@langchain/langgraph/-/langgraph-0.2.74.tgz#37367a1e8bafda3548037a91449a69a84f285def"
@@ -4958,6 +4974,15 @@
     uuid "^10.0.0"
     zod "^3.23.8"
 
+"@langchain/langgraph@^1.0.1":
+  version "1.0.2"
+  resolved "https://registry.npmjs.org/@langchain/langgraph/-/langgraph-1.0.2.tgz#62de931edac0dd850daf708bd6f8f3835cf25a5e"
+  integrity sha512-syxzzWTnmpCL+RhUEvalUeOXFoZy/KkzHa2Da2gKf18zsf9Dkbh3rfnRDrTyUGS1XSTejq07s4rg1qntdEDs2A==
+  dependencies:
+    "@langchain/langgraph-checkpoint" "^1.0.0"
+    "@langchain/langgraph-sdk" "~1.0.0"
+    uuid "^10.0.0"
+
 "@leichtgewicht/ip-codec@^2.0.1":
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b"

From b3bf56dacea2d39da69a3239dc6cc2fb3dc1addd Mon Sep 17 00:00:00 2001
From: Rola Abuhasna <rola.abuhasna@sentry.io>
Date: Wed, 19 Nov 2025 10:04:51 +0100
Subject: [PATCH 088/186] feat(node): Add OpenAI SDK v6 support and integration
 tests (#18244)

Upgrades OpenAI instrumentation to support OpenAI SDK v6.0.0 and adds
node integration tests to verify compatibility.

### Changes

**Instrumentation:**
- Bumped OpenAI SDK support to v6.0.0 (<v7)
- OpenAI v6 introduces no breaking changes that affect our
instrumentation
- All existing instrumentation logic remains compatible with the new SDK
version

ref: https://github.com/openai/openai-node/releases/tag/v6.0.0

**Testing:**
- Created v6 test suite in
`dev-packages/node-integration-tests/suites/tracing/openai/v6/`
- Tests verify OpenAI SDK v6.0.0 instrumentation across:
  - Chat completions API with and without PII tracking
  - Responses API with streaming support
  - Custom integration options (recordInputs, recordOutputs)
  - Error handling in chat completions and streaming contexts
  - Root span creation without wrapping spans
  - Embeddings API
---
 .../openai/v6/instrument-with-options.mjs     |  16 +
 .../tracing/openai/v6/instrument-with-pii.mjs |  11 +
 .../suites/tracing/openai/v6/instrument.mjs   |  11 +
 .../tracing/openai/v6/scenario-chat.mjs       | 318 ++++++++++
 .../tracing/openai/v6/scenario-embeddings.mjs |  67 +++
 .../tracing/openai/v6/scenario-root-span.mjs  |  63 ++
 .../suites/tracing/openai/v6/test.ts          | 565 ++++++++++++++++++
 .../tracing/openai/instrumentation.ts         |   2 +-
 8 files changed, 1052 insertions(+), 1 deletion(-)
 create mode 100644 dev-packages/node-integration-tests/suites/tracing/openai/v6/instrument-with-options.mjs
 create mode 100644 dev-packages/node-integration-tests/suites/tracing/openai/v6/instrument-with-pii.mjs
 create mode 100644 dev-packages/node-integration-tests/suites/tracing/openai/v6/instrument.mjs
 create mode 100644 dev-packages/node-integration-tests/suites/tracing/openai/v6/scenario-chat.mjs
 create mode 100644 dev-packages/node-integration-tests/suites/tracing/openai/v6/scenario-embeddings.mjs
 create mode 100644 dev-packages/node-integration-tests/suites/tracing/openai/v6/scenario-root-span.mjs
 create mode 100644 dev-packages/node-integration-tests/suites/tracing/openai/v6/test.ts

diff --git a/dev-packages/node-integration-tests/suites/tracing/openai/v6/instrument-with-options.mjs b/dev-packages/node-integration-tests/suites/tracing/openai/v6/instrument-with-options.mjs
new file mode 100644
index 000000000000..35f97fd84093
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/openai/v6/instrument-with-options.mjs
@@ -0,0 +1,16 @@
+import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  release: '1.0',
+  tracesSampleRate: 1.0,
+  sendDefaultPii: false,
+  transport: loggingTransport,
+  integrations: [
+    Sentry.openAIIntegration({
+      recordInputs: true,
+      recordOutputs: true,
+    }),
+  ],
+});
diff --git a/dev-packages/node-integration-tests/suites/tracing/openai/v6/instrument-with-pii.mjs b/dev-packages/node-integration-tests/suites/tracing/openai/v6/instrument-with-pii.mjs
new file mode 100644
index 000000000000..a53a13af7738
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/openai/v6/instrument-with-pii.mjs
@@ -0,0 +1,11 @@
+import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  release: '1.0',
+  tracesSampleRate: 1.0,
+  sendDefaultPii: true,
+  transport: loggingTransport,
+  integrations: [Sentry.openAIIntegration()],
+});
diff --git a/dev-packages/node-integration-tests/suites/tracing/openai/v6/instrument.mjs b/dev-packages/node-integration-tests/suites/tracing/openai/v6/instrument.mjs
new file mode 100644
index 000000000000..f3fbac9d1274
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/openai/v6/instrument.mjs
@@ -0,0 +1,11 @@
+import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  release: '1.0',
+  tracesSampleRate: 1.0,
+  sendDefaultPii: false,
+  transport: loggingTransport,
+  integrations: [Sentry.openAIIntegration()],
+});
diff --git a/dev-packages/node-integration-tests/suites/tracing/openai/v6/scenario-chat.mjs b/dev-packages/node-integration-tests/suites/tracing/openai/v6/scenario-chat.mjs
new file mode 100644
index 000000000000..fde651c3c1ff
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/openai/v6/scenario-chat.mjs
@@ -0,0 +1,318 @@
+import { instrumentOpenAiClient } from '@sentry/core';
+import * as Sentry from '@sentry/node';
+
+class MockOpenAI {
+  constructor(config) {
+    this.apiKey = config.apiKey;
+
+    this.chat = {
+      completions: {
+        create: async params => {
+          // Simulate processing time
+          await new Promise(resolve => setTimeout(resolve, 10));
+
+          if (params.model === 'error-model') {
+            const error = new Error('Model not found');
+            error.status = 404;
+            error.headers = { 'x-request-id': 'mock-request-123' };
+            throw error;
+          }
+
+          // If stream is requested, return an async generator
+          if (params.stream) {
+            return this._createChatCompletionStream(params);
+          }
+
+          return {
+            id: 'chatcmpl-mock123',
+            object: 'chat.completion',
+            created: 1677652288,
+            model: params.model,
+            system_fingerprint: 'fp_44709d6fcb',
+            choices: [
+              {
+                index: 0,
+                message: {
+                  role: 'assistant',
+                  content: 'Hello from OpenAI mock!',
+                },
+                finish_reason: 'stop',
+              },
+            ],
+            usage: {
+              prompt_tokens: 10,
+              completion_tokens: 15,
+              total_tokens: 25,
+            },
+          };
+        },
+      },
+    };
+
+    this.responses = {
+      create: async params => {
+        await new Promise(resolve => setTimeout(resolve, 10));
+
+        // If stream is requested, return an async generator
+        if (params.stream) {
+          return this._createResponsesApiStream(params);
+        }
+
+        return {
+          id: 'resp_mock456',
+          object: 'response',
+          created_at: 1677652290,
+          model: params.model,
+          input_text: params.input,
+          output_text: `Response to: ${params.input}`,
+          status: 'completed',
+          usage: {
+            input_tokens: 5,
+            output_tokens: 8,
+            total_tokens: 13,
+          },
+        };
+      },
+    };
+  }
+
+  // Create a mock streaming response for chat completions
+  async *_createChatCompletionStream(params) {
+    // First chunk with basic info
+    yield {
+      id: 'chatcmpl-stream-123',
+      object: 'chat.completion.chunk',
+      created: 1677652300,
+      model: params.model,
+      system_fingerprint: 'fp_stream_123',
+      choices: [
+        {
+          index: 0,
+          delta: {
+            role: 'assistant',
+            content: 'Hello',
+          },
+          finish_reason: null,
+        },
+      ],
+    };
+
+    // Second chunk with more content
+    yield {
+      id: 'chatcmpl-stream-123',
+      object: 'chat.completion.chunk',
+      created: 1677652300,
+      model: params.model,
+      system_fingerprint: 'fp_stream_123',
+      choices: [
+        {
+          index: 0,
+          delta: {
+            content: ' from OpenAI streaming!',
+          },
+          finish_reason: 'stop',
+        },
+      ],
+      usage: {
+        prompt_tokens: 12,
+        completion_tokens: 18,
+        total_tokens: 30,
+        completion_tokens_details: {
+          accepted_prediction_tokens: 0,
+          audio_tokens: 0,
+          reasoning_tokens: 0,
+          rejected_prediction_tokens: 0,
+        },
+        prompt_tokens_details: {
+          audio_tokens: 0,
+          cached_tokens: 0,
+        },
+      },
+    };
+  }
+
+  // Create a mock streaming response for responses API
+  async *_createResponsesApiStream(params) {
+    // Response created event
+    yield {
+      type: 'response.created',
+      response: {
+        id: 'resp_stream_456',
+        object: 'response',
+        created_at: 1677652310,
+        model: params.model,
+        status: 'in_progress',
+        error: null,
+        incomplete_details: null,
+        instructions: params.instructions,
+        max_output_tokens: 1000,
+        parallel_tool_calls: false,
+        previous_response_id: null,
+        reasoning: {
+          effort: null,
+          summary: null,
+        },
+        store: false,
+        temperature: 0.7,
+        text: {
+          format: {
+            type: 'text',
+          },
+        },
+        tool_choice: 'auto',
+        top_p: 1.0,
+        truncation: 'disabled',
+        user: null,
+        metadata: {},
+        output: [],
+        output_text: '',
+        usage: {
+          input_tokens: 0,
+          output_tokens: 0,
+          total_tokens: 0,
+        },
+      },
+      sequence_number: 1,
+    };
+
+    // Response in progress with output text delta
+    yield {
+      type: 'response.output_text.delta',
+      delta: 'Streaming response to: ',
+      sequence_number: 2,
+    };
+
+    yield {
+      type: 'response.output_text.delta',
+      delta: params.input,
+      sequence_number: 3,
+    };
+
+    // Response completed event
+    yield {
+      type: 'response.completed',
+      response: {
+        id: 'resp_stream_456',
+        object: 'response',
+        created_at: 1677652310,
+        model: params.model,
+        status: 'completed',
+        error: null,
+        incomplete_details: null,
+        instructions: params.instructions,
+        max_output_tokens: 1000,
+        parallel_tool_calls: false,
+        previous_response_id: null,
+        reasoning: {
+          effort: null,
+          summary: null,
+        },
+        store: false,
+        temperature: 0.7,
+        text: {
+          format: {
+            type: 'text',
+          },
+        },
+        tool_choice: 'auto',
+        top_p: 1.0,
+        truncation: 'disabled',
+        user: null,
+        metadata: {},
+        output: [],
+        output_text: params.input,
+        usage: {
+          input_tokens: 6,
+          output_tokens: 10,
+          total_tokens: 16,
+        },
+      },
+      sequence_number: 4,
+    };
+  }
+}
+
+async function run() {
+  await Sentry.startSpan({ op: 'function', name: 'main' }, async () => {
+    const mockClient = new MockOpenAI({
+      apiKey: 'mock-api-key',
+    });
+
+    const client = instrumentOpenAiClient(mockClient);
+
+    // First test: basic chat completion
+    await client.chat.completions.create({
+      model: 'gpt-3.5-turbo',
+      messages: [
+        { role: 'system', content: 'You are a helpful assistant.' },
+        { role: 'user', content: 'What is the capital of France?' },
+      ],
+      temperature: 0.7,
+      max_tokens: 100,
+    });
+
+    // Second test: responses API
+    await client.responses.create({
+      model: 'gpt-3.5-turbo',
+      input: 'Translate this to French: Hello',
+      instructions: 'You are a translator',
+    });
+
+    // Third test: error handling in chat completions
+    try {
+      await client.chat.completions.create({
+        model: 'error-model',
+        messages: [{ role: 'user', content: 'This will fail' }],
+      });
+    } catch {
+      // Error is expected and handled
+    }
+
+    // Fourth test: chat completions streaming
+    const stream1 = await client.chat.completions.create({
+      model: 'gpt-4',
+      messages: [
+        { role: 'system', content: 'You are a helpful assistant.' },
+        { role: 'user', content: 'Tell me about streaming' },
+      ],
+      stream: true,
+      temperature: 0.8,
+    });
+
+    // Consume the stream to trigger span instrumentation
+    for await (const chunk of stream1) {
+      // Stream chunks are processed automatically by instrumentation
+      void chunk; // Prevent unused variable warning
+    }
+
+    // Fifth test: responses API streaming
+    const stream2 = await client.responses.create({
+      model: 'gpt-4',
+      input: 'Test streaming responses API',
+      instructions: 'You are a streaming assistant',
+      stream: true,
+    });
+
+    for await (const chunk of stream2) {
+      void chunk;
+    }
+
+    // Sixth test: error handling in streaming context
+    try {
+      const errorStream = await client.chat.completions.create({
+        model: 'error-model',
+        messages: [{ role: 'user', content: 'This will fail' }],
+        stream: true,
+      });
+
+      // Try to consume the stream (this should not execute)
+      for await (const chunk of errorStream) {
+        void chunk;
+      }
+    } catch {
+      // Error is expected and handled
+    }
+  });
+}
+
+run();
diff --git a/dev-packages/node-integration-tests/suites/tracing/openai/v6/scenario-embeddings.mjs b/dev-packages/node-integration-tests/suites/tracing/openai/v6/scenario-embeddings.mjs
new file mode 100644
index 000000000000..9cdb24a42da9
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/openai/v6/scenario-embeddings.mjs
@@ -0,0 +1,67 @@
+import { instrumentOpenAiClient } from '@sentry/core';
+import * as Sentry from '@sentry/node';
+
+class MockOpenAI {
+  constructor(config) {
+    this.apiKey = config.apiKey;
+
+    this.embeddings = {
+      create: async params => {
+        await new Promise(resolve => setTimeout(resolve, 10));
+
+        if (params.model === 'error-model') {
+          const error = new Error('Model not found');
+          error.status = 404;
+          error.headers = { 'x-request-id': 'mock-request-123' };
+          throw error;
+        }
+
+        return {
+          object: 'list',
+          data: [
+            {
+              object: 'embedding',
+              embedding: [0.1, 0.2, 0.3],
+              index: 0,
+            },
+          ],
+          model: params.model,
+          usage: {
+            prompt_tokens: 10,
+            total_tokens: 10,
+          },
+        };
+      },
+    };
+  }
+}
+
+async function run() {
+  await Sentry.startSpan({ op: 'function', name: 'main' }, async () => {
+    const mockClient = new MockOpenAI({
+      apiKey: 'mock-api-key',
+    });
+
+    const client = instrumentOpenAiClient(mockClient);
+
+    // First test: embeddings API
+    await client.embeddings.create({
+      input: 'Embedding test!',
+      model: 'text-embedding-3-small',
+      dimensions: 1536,
+      encoding_format: 'float',
+    });
+
+    // Second test: embeddings API error model
+    try {
+      await client.embeddings.create({
+        input: 'Error embedding test!',
+        model: 'error-model',
+      });
+    } catch {
+      // Error is expected and handled
+    }
+  });
+}
+
+run();
diff --git a/dev-packages/node-integration-tests/suites/tracing/openai/v6/scenario-root-span.mjs b/dev-packages/node-integration-tests/suites/tracing/openai/v6/scenario-root-span.mjs
new file mode 100644
index 000000000000..2aaca0700312
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/openai/v6/scenario-root-span.mjs
@@ -0,0 +1,63 @@
+import express from 'express';
+import OpenAI from 'openai';
+
+function startMockOpenAiServer() {
+  const app = express();
+  app.use(express.json());
+
+  app.post('/openai/chat/completions', (req, res) => {
+    res.send({
+      id: 'chatcmpl-mock123',
+      object: 'chat.completion',
+      created: 1677652288,
+      model: req.body.model,
+      system_fingerprint: 'fp_44709d6fcb',
+      choices: [
+        {
+          index: 0,
+          message: {
+            role: 'assistant',
+            content: 'Hello from OpenAI mock!',
+          },
+          finish_reason: 'stop',
+        },
+      ],
+      usage: {
+        prompt_tokens: 10,
+        completion_tokens: 15,
+        total_tokens: 25,
+      },
+    });
+  });
+  return new Promise(resolve => {
+    const server = app.listen(0, () => {
+      resolve(server);
+    });
+  });
+}
+
+async function run() {
+  const server = await startMockOpenAiServer();
+
+  const client = new OpenAI({
+    baseURL: `http://localhost:${server.address().port}/openai`,
+    apiKey: 'mock-api-key',
+  });
+
+  const response = await client.chat.completions.create({
+    model: 'gpt-3.5-turbo',
+    messages: [
+      { role: 'system', content: 'You are a helpful assistant.' },
+      { role: 'user', content: 'What is the capital of France?' },
+    ],
+    temperature: 0.7,
+    max_tokens: 100,
+  });
+
+  // eslint-disable-next-line no-console
+  console.log(JSON.stringify(response));
+
+  server.close();
+}
+
+run();
diff --git a/dev-packages/node-integration-tests/suites/tracing/openai/v6/test.ts b/dev-packages/node-integration-tests/suites/tracing/openai/v6/test.ts
new file mode 100644
index 000000000000..053f3066a1b0
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/openai/v6/test.ts
@@ -0,0 +1,565 @@
+import { afterAll, describe, expect } from 'vitest';
+import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../../utils/runner';
+
+describe('OpenAI integration (V6)', () => {
+  afterAll(() => {
+    cleanupChildProcesses();
+  });
+
+  const EXPECTED_TRANSACTION_DEFAULT_PII_FALSE_CHAT = {
+    transaction: 'main',
+    spans: expect.arrayContaining([
+      // First span - basic chat completion without PII
+      expect.objectContaining({
+        data: {
+          'gen_ai.operation.name': 'chat',
+          'sentry.op': 'gen_ai.chat',
+          'sentry.origin': 'auto.ai.openai',
+          'gen_ai.system': 'openai',
+          'gen_ai.request.model': 'gpt-3.5-turbo',
+          'gen_ai.request.temperature': 0.7,
+          'gen_ai.response.model': 'gpt-3.5-turbo',
+          'gen_ai.response.id': 'chatcmpl-mock123',
+          'gen_ai.response.finish_reasons': '["stop"]',
+          'gen_ai.usage.input_tokens': 10,
+          'gen_ai.usage.output_tokens': 15,
+          'gen_ai.usage.total_tokens': 25,
+          'openai.response.id': 'chatcmpl-mock123',
+          'openai.response.model': 'gpt-3.5-turbo',
+          'openai.response.timestamp': '2023-03-01T06:31:28.000Z',
+          'openai.usage.completion_tokens': 15,
+          'openai.usage.prompt_tokens': 10,
+        },
+        description: 'chat gpt-3.5-turbo',
+        op: 'gen_ai.chat',
+        origin: 'auto.ai.openai',
+        status: 'ok',
+      }),
+      // Second span - responses API
+      expect.objectContaining({
+        data: {
+          'gen_ai.operation.name': 'responses',
+          'sentry.op': 'gen_ai.responses',
+          'sentry.origin': 'auto.ai.openai',
+          'gen_ai.system': 'openai',
+          'gen_ai.request.model': 'gpt-3.5-turbo',
+          'gen_ai.response.model': 'gpt-3.5-turbo',
+          'gen_ai.response.id': 'resp_mock456',
+          'gen_ai.response.finish_reasons': '["completed"]',
+          'gen_ai.usage.input_tokens': 5,
+          'gen_ai.usage.output_tokens': 8,
+          'gen_ai.usage.total_tokens': 13,
+          'openai.response.id': 'resp_mock456',
+          'openai.response.model': 'gpt-3.5-turbo',
+          'openai.response.timestamp': '2023-03-01T06:31:30.000Z',
+          'openai.usage.completion_tokens': 8,
+          'openai.usage.prompt_tokens': 5,
+        },
+        description: 'responses gpt-3.5-turbo',
+        op: 'gen_ai.responses',
+        origin: 'auto.ai.openai',
+        status: 'ok',
+      }),
+      // Third span - error handling
+      expect.objectContaining({
+        data: {
+          'gen_ai.operation.name': 'chat',
+          'sentry.op': 'gen_ai.chat',
+          'sentry.origin': 'auto.ai.openai',
+          'gen_ai.system': 'openai',
+          'gen_ai.request.model': 'error-model',
+        },
+        description: 'chat error-model',
+        op: 'gen_ai.chat',
+        origin: 'auto.ai.openai',
+        status: 'internal_error',
+      }),
+      // Fourth span - chat completions streaming
+      expect.objectContaining({
+        data: {
+          'gen_ai.operation.name': 'chat',
+          'sentry.op': 'gen_ai.chat',
+          'sentry.origin': 'auto.ai.openai',
+          'gen_ai.system': 'openai',
+          'gen_ai.request.model': 'gpt-4',
+          'gen_ai.request.temperature': 0.8,
+          'gen_ai.request.stream': true,
+          'gen_ai.response.model': 'gpt-4',
+          'gen_ai.response.id': 'chatcmpl-stream-123',
+          'gen_ai.response.finish_reasons': '["stop"]',
+          'gen_ai.usage.input_tokens': 12,
+          'gen_ai.usage.output_tokens': 18,
+          'gen_ai.usage.total_tokens': 30,
+          'openai.response.id': 'chatcmpl-stream-123',
+          'openai.response.model': 'gpt-4',
+          'gen_ai.response.streaming': true,
+          'openai.response.timestamp': '2023-03-01T06:31:40.000Z',
+          'openai.usage.completion_tokens': 18,
+          'openai.usage.prompt_tokens': 12,
+        },
+        description: 'chat gpt-4 stream-response',
+        op: 'gen_ai.chat',
+        origin: 'auto.ai.openai',
+        status: 'ok',
+      }),
+      // Fifth span - responses API streaming
+      expect.objectContaining({
+        data: {
+          'gen_ai.operation.name': 'responses',
+          'sentry.op': 'gen_ai.responses',
+          'sentry.origin': 'auto.ai.openai',
+          'gen_ai.system': 'openai',
+          'gen_ai.request.model': 'gpt-4',
+          'gen_ai.request.stream': true,
+          'gen_ai.response.model': 'gpt-4',
+          'gen_ai.response.id': 'resp_stream_456',
+          'gen_ai.response.finish_reasons': '["in_progress","completed"]',
+          'gen_ai.usage.input_tokens': 6,
+          'gen_ai.usage.output_tokens': 10,
+          'gen_ai.usage.total_tokens': 16,
+          'openai.response.id': 'resp_stream_456',
+          'openai.response.model': 'gpt-4',
+          'gen_ai.response.streaming': true,
+          'openai.response.timestamp': '2023-03-01T06:31:50.000Z',
+          'openai.usage.completion_tokens': 10,
+          'openai.usage.prompt_tokens': 6,
+        },
+        description: 'responses gpt-4 stream-response',
+        op: 'gen_ai.responses',
+        origin: 'auto.ai.openai',
+        status: 'ok',
+      }),
+      // Sixth span - error handling in streaming context
+      expect.objectContaining({
+        data: {
+          'gen_ai.operation.name': 'chat',
+          'gen_ai.request.model': 'error-model',
+          'gen_ai.request.stream': true,
+          'gen_ai.system': 'openai',
+          'sentry.op': 'gen_ai.chat',
+          'sentry.origin': 'auto.ai.openai',
+        },
+        description: 'chat error-model stream-response',
+        op: 'gen_ai.chat',
+        origin: 'auto.ai.openai',
+        status: 'internal_error',
+      }),
+    ]),
+  };
+
+  const EXPECTED_TRANSACTION_DEFAULT_PII_TRUE_CHAT = {
+    transaction: 'main',
+    spans: expect.arrayContaining([
+      // First span - basic chat completion with PII
+      expect.objectContaining({
+        data: {
+          'gen_ai.operation.name': 'chat',
+          'sentry.op': 'gen_ai.chat',
+          'sentry.origin': 'auto.ai.openai',
+          'gen_ai.system': 'openai',
+          'gen_ai.request.model': 'gpt-3.5-turbo',
+          'gen_ai.request.temperature': 0.7,
+          'gen_ai.request.messages':
+            '[{"role":"system","content":"You are a helpful assistant."},{"role":"user","content":"What is the capital of France?"}]',
+          'gen_ai.response.model': 'gpt-3.5-turbo',
+          'gen_ai.response.id': 'chatcmpl-mock123',
+          'gen_ai.response.finish_reasons': '["stop"]',
+          'gen_ai.response.text': '["Hello from OpenAI mock!"]',
+          'gen_ai.usage.input_tokens': 10,
+          'gen_ai.usage.output_tokens': 15,
+          'gen_ai.usage.total_tokens': 25,
+          'openai.response.id': 'chatcmpl-mock123',
+          'openai.response.model': 'gpt-3.5-turbo',
+          'openai.response.timestamp': '2023-03-01T06:31:28.000Z',
+          'openai.usage.completion_tokens': 15,
+          'openai.usage.prompt_tokens': 10,
+        },
+        description: 'chat gpt-3.5-turbo',
+        op: 'gen_ai.chat',
+        origin: 'auto.ai.openai',
+        status: 'ok',
+      }),
+      // Second span - responses API with PII
+      expect.objectContaining({
+        data: {
+          'gen_ai.operation.name': 'responses',
+          'sentry.op': 'gen_ai.responses',
+          'sentry.origin': 'auto.ai.openai',
+          'gen_ai.system': 'openai',
+          'gen_ai.request.model': 'gpt-3.5-turbo',
+          'gen_ai.request.messages': 'Translate this to French: Hello',
+          'gen_ai.response.text': 'Response to: Translate this to French: Hello',
+          'gen_ai.response.finish_reasons': '["completed"]',
+          'gen_ai.response.model': 'gpt-3.5-turbo',
+          'gen_ai.response.id': 'resp_mock456',
+          'gen_ai.usage.input_tokens': 5,
+          'gen_ai.usage.output_tokens': 8,
+          'gen_ai.usage.total_tokens': 13,
+          'openai.response.id': 'resp_mock456',
+          'openai.response.model': 'gpt-3.5-turbo',
+          'openai.response.timestamp': '2023-03-01T06:31:30.000Z',
+          'openai.usage.completion_tokens': 8,
+          'openai.usage.prompt_tokens': 5,
+        },
+        description: 'responses gpt-3.5-turbo',
+        op: 'gen_ai.responses',
+        origin: 'auto.ai.openai',
+        status: 'ok',
+      }),
+      // Third span - error handling with PII
+      expect.objectContaining({
+        data: {
+          'gen_ai.operation.name': 'chat',
+          'sentry.op': 'gen_ai.chat',
+          'sentry.origin': 'auto.ai.openai',
+          'gen_ai.system': 'openai',
+          'gen_ai.request.model': 'error-model',
+          'gen_ai.request.messages': '[{"role":"user","content":"This will fail"}]',
+        },
+        description: 'chat error-model',
+        op: 'gen_ai.chat',
+        origin: 'auto.ai.openai',
+        status: 'internal_error',
+      }),
+      // Fourth span - chat completions streaming with PII
+      expect.objectContaining({
+        data: expect.objectContaining({
+          'gen_ai.operation.name': 'chat',
+          'sentry.op': 'gen_ai.chat',
+          'sentry.origin': 'auto.ai.openai',
+          'gen_ai.system': 'openai',
+          'gen_ai.request.model': 'gpt-4',
+          'gen_ai.request.temperature': 0.8,
+          'gen_ai.request.stream': true,
+          'gen_ai.request.messages':
+            '[{"role":"system","content":"You are a helpful assistant."},{"role":"user","content":"Tell me about streaming"}]',
+          'gen_ai.response.text': 'Hello from OpenAI streaming!',
+          'gen_ai.response.finish_reasons': '["stop"]',
+          'gen_ai.response.id': 'chatcmpl-stream-123',
+          'gen_ai.response.model': 'gpt-4',
+          'gen_ai.usage.input_tokens': 12,
+          'gen_ai.usage.output_tokens': 18,
+          'gen_ai.usage.total_tokens': 30,
+          'openai.response.id': 'chatcmpl-stream-123',
+          'openai.response.model': 'gpt-4',
+          'gen_ai.response.streaming': true,
+          'openai.response.timestamp': '2023-03-01T06:31:40.000Z',
+          'openai.usage.completion_tokens': 18,
+          'openai.usage.prompt_tokens': 12,
+        }),
+        description: 'chat gpt-4 stream-response',
+        op: 'gen_ai.chat',
+        origin: 'auto.ai.openai',
+        status: 'ok',
+      }),
+      // Fifth span - responses API streaming with PII
+      expect.objectContaining({
+        data: expect.objectContaining({
+          'gen_ai.operation.name': 'responses',
+          'sentry.op': 'gen_ai.responses',
+          'sentry.origin': 'auto.ai.openai',
+          'gen_ai.system': 'openai',
+          'gen_ai.request.model': 'gpt-4',
+          'gen_ai.request.stream': true,
+          'gen_ai.request.messages': 'Test streaming responses API',
+          'gen_ai.response.text': 'Streaming response to: Test streaming responses APITest streaming responses API',
+          'gen_ai.response.finish_reasons': '["in_progress","completed"]',
+          'gen_ai.response.id': 'resp_stream_456',
+          'gen_ai.response.model': 'gpt-4',
+          'gen_ai.usage.input_tokens': 6,
+          'gen_ai.usage.output_tokens': 10,
+          'gen_ai.usage.total_tokens': 16,
+          'openai.response.id': 'resp_stream_456',
+          'openai.response.model': 'gpt-4',
+          'gen_ai.response.streaming': true,
+          'openai.response.timestamp': '2023-03-01T06:31:50.000Z',
+          'openai.usage.completion_tokens': 10,
+          'openai.usage.prompt_tokens': 6,
+        }),
+        description: 'responses gpt-4 stream-response',
+        op: 'gen_ai.responses',
+        origin: 'auto.ai.openai',
+        status: 'ok',
+      }),
+      // Sixth span - error handling in streaming context with PII
+      expect.objectContaining({
+        data: {
+          'gen_ai.operation.name': 'chat',
+          'gen_ai.request.model': 'error-model',
+          'gen_ai.request.stream': true,
+          'gen_ai.request.messages': '[{"role":"user","content":"This will fail"}]',
+          'gen_ai.system': 'openai',
+          'sentry.op': 'gen_ai.chat',
+          'sentry.origin': 'auto.ai.openai',
+        },
+        description: 'chat error-model stream-response',
+        op: 'gen_ai.chat',
+        origin: 'auto.ai.openai',
+        status: 'internal_error',
+      }),
+    ]),
+  };
+
+  const EXPECTED_TRANSACTION_WITH_OPTIONS = {
+    transaction: 'main',
+    spans: expect.arrayContaining([
+      // Check that custom options are respected
+      expect.objectContaining({
+        data: expect.objectContaining({
+          'gen_ai.request.messages': expect.any(String), // Should include messages when recordInputs: true
+          'gen_ai.response.text': expect.any(String), // Should include response text when recordOutputs: true
+        }),
+      }),
+      // Check that custom options are respected for streaming
+      expect.objectContaining({
+        data: expect.objectContaining({
+          'gen_ai.request.messages': expect.any(String), // Should include messages when recordInputs: true
+          'gen_ai.response.text': expect.any(String), // Should include response text when recordOutputs: true
+          'gen_ai.request.stream': true, // Should be marked as stream
+        }),
+      }),
+    ]),
+  };
+
+  const EXPECTED_TRANSACTION_DEFAULT_PII_FALSE_EMBEDDINGS = {
+    transaction: 'main',
+    spans: expect.arrayContaining([
+      // First span - embeddings API
+      expect.objectContaining({
+        data: {
+          'gen_ai.operation.name': 'embeddings',
+          'sentry.op': 'gen_ai.embeddings',
+          'sentry.origin': 'auto.ai.openai',
+          'gen_ai.system': 'openai',
+          'gen_ai.request.model': 'text-embedding-3-small',
+          'gen_ai.request.encoding_format': 'float',
+          'gen_ai.request.dimensions': 1536,
+          'gen_ai.response.model': 'text-embedding-3-small',
+          'gen_ai.usage.input_tokens': 10,
+          'gen_ai.usage.total_tokens': 10,
+          'openai.response.model': 'text-embedding-3-small',
+          'openai.usage.prompt_tokens': 10,
+        },
+        description: 'embeddings text-embedding-3-small',
+        op: 'gen_ai.embeddings',
+        origin: 'auto.ai.openai',
+        status: 'ok',
+      }),
+      // Second span - embeddings API error model
+      expect.objectContaining({
+        data: {
+          'gen_ai.operation.name': 'embeddings',
+          'sentry.op': 'gen_ai.embeddings',
+          'sentry.origin': 'auto.ai.openai',
+          'gen_ai.system': 'openai',
+          'gen_ai.request.model': 'error-model',
+        },
+        description: 'embeddings error-model',
+        op: 'gen_ai.embeddings',
+        origin: 'auto.ai.openai',
+        status: 'internal_error',
+      }),
+    ]),
+  };
+
+  const EXPECTED_TRANSACTION_DEFAULT_PII_TRUE_EMBEDDINGS = {
+    transaction: 'main',
+    spans: expect.arrayContaining([
+      // First span - embeddings API with PII
+      expect.objectContaining({
+        data: {
+          'gen_ai.operation.name': 'embeddings',
+          'sentry.op': 'gen_ai.embeddings',
+          'sentry.origin': 'auto.ai.openai',
+          'gen_ai.system': 'openai',
+          'gen_ai.request.model': 'text-embedding-3-small',
+          'gen_ai.request.encoding_format': 'float',
+          'gen_ai.request.dimensions': 1536,
+          'gen_ai.request.messages': 'Embedding test!',
+          'gen_ai.response.model': 'text-embedding-3-small',
+          'gen_ai.usage.input_tokens': 10,
+          'gen_ai.usage.total_tokens': 10,
+          'openai.response.model': 'text-embedding-3-small',
+          'openai.usage.prompt_tokens': 10,
+        },
+        description: 'embeddings text-embedding-3-small',
+        op: 'gen_ai.embeddings',
+        origin: 'auto.ai.openai',
+        status: 'ok',
+      }),
+      // Second span - embeddings API error model with PII
+      expect.objectContaining({
+        data: {
+          'gen_ai.operation.name': 'embeddings',
+          'sentry.op': 'gen_ai.embeddings',
+          'sentry.origin': 'auto.ai.openai',
+          'gen_ai.system': 'openai',
+          'gen_ai.request.model': 'error-model',
+          'gen_ai.request.messages': 'Error embedding test!',
+        },
+        description: 'embeddings error-model',
+        op: 'gen_ai.embeddings',
+        origin: 'auto.ai.openai',
+        status: 'internal_error',
+      }),
+    ]),
+  };
+
+  createEsmAndCjsTests(
+    __dirname,
+    'scenario-chat.mjs',
+    'instrument.mjs',
+    (createRunner, test) => {
+      test('creates openai related spans with sendDefaultPii: false (v6)', async () => {
+        await createRunner()
+          .ignore('event')
+          .expect({ transaction: EXPECTED_TRANSACTION_DEFAULT_PII_FALSE_CHAT })
+          .start()
+          .completed();
+      });
+    },
+    {
+      additionalDependencies: {
+        openai: '6.0.0',
+      },
+    },
+  );
+
+  createEsmAndCjsTests(
+    __dirname,
+    'scenario-chat.mjs',
+    'instrument-with-pii.mjs',
+    (createRunner, test) => {
+      test('creates openai related spans with sendDefaultPii: true (v6)', async () => {
+        await createRunner()
+          .ignore('event')
+          .expect({ transaction: EXPECTED_TRANSACTION_DEFAULT_PII_TRUE_CHAT })
+          .start()
+          .completed();
+      });
+    },
+    {
+      additionalDependencies: {
+        openai: '6.0.0',
+      },
+    },
+  );
+
+  createEsmAndCjsTests(
+    __dirname,
+    'scenario-chat.mjs',
+    'instrument-with-options.mjs',
+    (createRunner, test) => {
+      test('creates openai related spans with custom options (v6)', async () => {
+        await createRunner()
+          .ignore('event')
+          .expect({ transaction: EXPECTED_TRANSACTION_WITH_OPTIONS })
+          .start()
+          .completed();
+      });
+    },
+    {
+      additionalDependencies: {
+        openai: '6.0.0',
+      },
+    },
+  );
+
+  createEsmAndCjsTests(
+    __dirname,
+    'scenario-embeddings.mjs',
+    'instrument.mjs',
+    (createRunner, test) => {
+      test('creates openai related spans with sendDefaultPii: false (v6)', async () => {
+        await createRunner()
+          .ignore('event')
+          .expect({ transaction: EXPECTED_TRANSACTION_DEFAULT_PII_FALSE_EMBEDDINGS })
+          .start()
+          .completed();
+      });
+    },
+    {
+      additionalDependencies: {
+        openai: '6.0.0',
+      },
+    },
+  );
+
+  createEsmAndCjsTests(
+    __dirname,
+    'scenario-embeddings.mjs',
+    'instrument-with-pii.mjs',
+    (createRunner, test) => {
+      test('creates openai related spans with sendDefaultPii: true (v6)', async () => {
+        await createRunner()
+          .ignore('event')
+          .expect({ transaction: EXPECTED_TRANSACTION_DEFAULT_PII_TRUE_EMBEDDINGS })
+          .start()
+          .completed();
+      });
+    },
+    {
+      additionalDependencies: {
+        openai: '6.0.0',
+      },
+    },
+  );
+
+  createEsmAndCjsTests(
+    __dirname,
+    'scenario-root-span.mjs',
+    'instrument.mjs',
+    (createRunner, test) => {
+      test('it works without a wrapping span (v6)', async () => {
+        await createRunner()
+          // First the span that our mock express server is emitting, unrelated to this test
+          .expect({
+            transaction: {
+              transaction: 'POST /openai/chat/completions',
+            },
+          })
+          .expect({
+            transaction: {
+              transaction: 'chat gpt-3.5-turbo',
+              contexts: {
+                trace: {
+                  span_id: expect.any(String),
+                  trace_id: expect.any(String),
+                  data: {
+                    'gen_ai.operation.name': 'chat',
+                    'sentry.op': 'gen_ai.chat',
+                    'sentry.origin': 'auto.ai.openai',
+                    'gen_ai.system': 'openai',
+                    'gen_ai.request.model': 'gpt-3.5-turbo',
+                    'gen_ai.request.temperature': 0.7,
+                    'gen_ai.response.model': 'gpt-3.5-turbo',
+                    'gen_ai.response.id': 'chatcmpl-mock123',
+                    'gen_ai.response.finish_reasons': '["stop"]',
+                    'gen_ai.usage.input_tokens': 10,
+                    'gen_ai.usage.output_tokens': 15,
+                    'gen_ai.usage.total_tokens': 25,
+                    'openai.response.id': 'chatcmpl-mock123',
+                    'openai.response.model': 'gpt-3.5-turbo',
+                    'openai.response.timestamp': '2023-03-01T06:31:28.000Z',
+                    'openai.usage.completion_tokens': 15,
+                    'openai.usage.prompt_tokens': 10,
+                  },
+                  op: 'gen_ai.chat',
+                  origin: 'auto.ai.openai',
+                  status: 'ok',
+                },
+              },
+            },
+          })
+          .start()
+          .completed();
+      });
+    },
+    {
+      additionalDependencies: {
+        openai: '6.0.0',
+        express: 'latest',
+      },
+    },
+  );
+});
diff --git a/packages/node/src/integrations/tracing/openai/instrumentation.ts b/packages/node/src/integrations/tracing/openai/instrumentation.ts
index d71c548395b0..e0682185ff0a 100644
--- a/packages/node/src/integrations/tracing/openai/instrumentation.ts
+++ b/packages/node/src/integrations/tracing/openai/instrumentation.ts
@@ -13,7 +13,7 @@ import {
   SDK_VERSION,
 } from '@sentry/core';
 
-const supportedVersions = ['>=4.0.0 <6'];
+const supportedVersions = ['>=4.0.0 <7'];
 
 export interface OpenAiIntegration extends Integration {
   options: OpenAiOptions;

From be29c5617284e014e4fe5a3c0f75454d22036d0b Mon Sep 17 00:00:00 2001
From: Andrei <168741329+andreiborza@users.noreply.github.com>
Date: Wed, 19 Nov 2025 10:36:08 +0100
Subject: [PATCH 089/186] chore(e2e): Bump zod in e2e tests (#18251)

The lower version is currently breaking our ci, the version lacks v3
exports that are used by `zod-to-json`.
---
 .../e2e-tests/test-applications/node-express-v5/package.json    | 2 +-
 .../e2e-tests/test-applications/node-express/package.json       | 2 +-
 .../e2e-tests/test-applications/tsx-express/package.json        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-packages/e2e-tests/test-applications/node-express-v5/package.json b/dev-packages/e2e-tests/test-applications/node-express-v5/package.json
index b7caf4610712..0890fec0f10d 100644
--- a/dev-packages/e2e-tests/test-applications/node-express-v5/package.json
+++ b/dev-packages/e2e-tests/test-applications/node-express-v5/package.json
@@ -19,7 +19,7 @@
     "@types/node": "^18.19.1",
     "express": "^5.1.0",
     "typescript": "~5.0.0",
-    "zod": "~3.24.3"
+    "zod": "~3.25.0"
   },
   "devDependencies": {
     "@playwright/test": "~1.53.2",
diff --git a/dev-packages/e2e-tests/test-applications/node-express/package.json b/dev-packages/e2e-tests/test-applications/node-express/package.json
index 18be5221bd3f..d5bba8591164 100644
--- a/dev-packages/e2e-tests/test-applications/node-express/package.json
+++ b/dev-packages/e2e-tests/test-applications/node-express/package.json
@@ -19,7 +19,7 @@
     "@types/node": "^18.19.1",
     "express": "^4.21.2",
     "typescript": "~5.0.0",
-    "zod": "~3.24.3"
+    "zod": "~3.25.0"
   },
   "devDependencies": {
     "@playwright/test": "~1.53.2",
diff --git a/dev-packages/e2e-tests/test-applications/tsx-express/package.json b/dev-packages/e2e-tests/test-applications/tsx-express/package.json
index 80dce608dbe5..d99a88bfa3b8 100644
--- a/dev-packages/e2e-tests/test-applications/tsx-express/package.json
+++ b/dev-packages/e2e-tests/test-applications/tsx-express/package.json
@@ -19,7 +19,7 @@
     "@types/node": "^18.19.1",
     "express": "^4.21.2",
     "typescript": "~5.0.0",
-    "zod": "~3.24.3"
+    "zod": "~3.25.0"
   },
   "devDependencies": {
     "@playwright/test": "~1.50.0",

From be12569677db0ea3455a7449f381973d6e842ff1 Mon Sep 17 00:00:00 2001
From: Abdelrahman Awad <abdelrahman.awad@sentry.io>
Date: Wed, 19 Nov 2025 11:00:22 +0200
Subject: [PATCH 090/186] meta(changelog): Update changelog for 10.26.0

---
 CHANGELOG.md | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 95 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 30abc26e733c..5eba860932aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,101 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
-- fix(node): Fix Spotlight configuration precedence to match specification (#18195)
+## 10.26.0
+
+### Important Changes
+
+- **feat(core): Instrument LangGraph Agent ([#18114](https://github.com/getsentry/sentry-javascript/pull/18114))**
+
+Adds support for instrumenting LangGraph StateGraph operations in Node. The LangGraph integration can be configured as follows:
+
+```js
+Sentry.init({
+  dsn: '__DSN__',
+  sendDefaultPii: false, // Even with PII disabled globally
+  integrations: [
+    Sentry.langGraphIntegration({
+      recordInputs: true, // Force recording input messages
+      recordOutputs: true, // Force recording response text
+    }),
+  ],
+});
+```
+
+- **feat(cloudflare/vercel-edge): Add manual instrumentation for LangGraph ([#18112](https://github.com/getsentry/sentry-javascript/pull/18112))**
+
+Instrumentation for LangGraph in Cloudflare Workers and Vercel Edge environments is supported by manually calling `instrumentLangGraph`:
+
+```js
+import * as Sentry from '@sentry/cloudflare'; // or '@sentry/vercel-edge'
+import { StateGraph, START, END, MessagesAnnotation } from '@langchain/langgraph';
+
+// Create and instrument the graph
+const graph = new StateGraph(MessagesAnnotation)
+  .addNode('agent', agentFn)
+  .addEdge(START, 'agent')
+  .addEdge('agent', END);
+
+Sentry.instrumentLangGraph(graph, {
+  recordInputs: true,
+  recordOutputs: true,
+});
+
+const compiled = graph.compile({ name: 'weather_assistant' });
+
+await compiled.invoke({
+  messages: [{ role: 'user', content: 'What is the weather in SF?' }],
+});
+```
+
+- **feat(node): Add OpenAI SDK v6 support ([#18244](https://github.com/getsentry/sentry-javascript/pull/18244))**
+
+### Other Changes
+
+- feat(core): Support OpenAI embeddings API ([#18224](https://github.com/getsentry/sentry-javascript/pull/18224))
+- feat(browser-utils): bump web-vitals to 5.1.0 ([#18091](https://github.com/getsentry/sentry-javascript/pull/18091))
+- feat(core): Support truncation for LangChain integration request messages ([#18157](https://github.com/getsentry/sentry-javascript/pull/18157))
+- feat(metrics): Add default `server.address` attribute on server runtimes ([#18242](https://github.com/getsentry/sentry-javascript/pull/18242))
+- feat(nextjs): Add URL to server-side transaction events ([#18230](https://github.com/getsentry/sentry-javascript/pull/18230))
+- feat(node-core): Add mechanism to prevent wrapping ai providers multiple times([#17972](https://github.com/getsentry/sentry-javascript/pull/17972))
+- feat(replay): Bump limit for minReplayDuration ([#18190](https://github.com/getsentry/sentry-javascript/pull/18190))
+- fix(browser): Add `ok` status to successful `idleSpan`s ([#18139](https://github.com/getsentry/sentry-javascript/pull/18139))
+- fix(core): Check `fetch` support with data URL ([#18225](https://github.com/getsentry/sentry-javascript/pull/18225))
+- fix(core): Decrease number of Sentry stack frames for messages from `captureConsoleIntegration` ([#18096](https://github.com/getsentry/sentry-javascript/pull/18096))
+- fix(core): Emit processed metric ([#18222](https://github.com/getsentry/sentry-javascript/pull/18222))
+- fix(core): Ensure logs past `MAX_LOG_BUFFER_SIZE` are not swallowed ([#18207](https://github.com/getsentry/sentry-javascript/pull/18207))
+- fix(core): Ensure metrics past `MAX_METRIC_BUFFER_SIZE` are not swallowed ([#18212](https://github.com/getsentry/sentry-javascript/pull/18212))
+- fix(core): Fix logs and metrics flush timeout starvation with continuous logging ([#18211](https://github.com/getsentry/sentry-javascript/pull/18211))
+- fix(core): Flatten gen_ai.request.available_tools in google-genai ([#18194](https://github.com/getsentry/sentry-javascript/pull/18194))
+- fix(core): Stringify available tools sent from vercelai ([#18197](https://github.com/getsentry/sentry-javascript/pull/18197))
+- fix(core/vue): Detect and skip normalizing Vue `VNode` objects with high `normalizeDepth` ([#18206](https://github.com/getsentry/sentry-javascript/pull/18206))
+- fix(nextjs): Avoid wrapping middleware files when in standalone mode ([#18172](https://github.com/getsentry/sentry-javascript/pull/18172))
+- fix(nextjs): Drop meta trace tags if rendered page is ISR ([#18192](https://github.com/getsentry/sentry-javascript/pull/18192))
+- fix(nextjs): Respect PORT variable for dev error symbolication ([#18227](https://github.com/getsentry/sentry-javascript/pull/18227))
+- fix(nextjs): use LRU map instead of map for ISR route cache ([#18234](https://github.com/getsentry/sentry-javascript/pull/18234))
+- fix(node): `tracingChannel` export missing in older node versions ([#18191](https://github.com/getsentry/sentry-javascript/pull/18191))
+- fix(node): Fix Spotlight configuration precedence to match specification ([#18195](https://github.com/getsentry/sentry-javascript/pull/18195))
+- fix(react): Prevent navigation span leaks for consecutive navigations ([#18098](https://github.com/getsentry/sentry-javascript/pull/18098))
+- ref(react-router): Deprecate ErrorBoundary exports ([#18208](https://github.com/getsentry/sentry-javascript/pull/18208))
+
+<details>
+  <summary> <strong>Internal Changes</strong> </summary>
+
+- chore: Fix missing changelog quote we use for attribution placement ([#18237](https://github.com/getsentry/sentry-javascript/pull/18237))
+- chore: move tip about prioritizing issues ([#18071](https://github.com/getsentry/sentry-javascript/pull/18071))
+- chore(e2e): Pin `@embroider/addon-shim` to 1.10.0 for the e2e ember-embroider ([#18173](https://github.com/getsentry/sentry-javascript/pull/18173))
+- chore(react-router): Fix casing on deprecation notices ([#18221](https://github.com/getsentry/sentry-javascript/pull/18221))
+- chore(test): Use correct `testTimeout` field in bundler-tests vitest config
+- chore(e2e): Bump zod in e2e tests ([#18251](https://github.com/getsentry/sentry-javascript/pull/18251))
+- test(browser-integration): Fix incorrect tag value assertions ([#18162](https://github.com/getsentry/sentry-javascript/pull/18162))
+- test(profiling): Add test utils to validate Profile Chunk envelope ([#18170](https://github.com/getsentry/sentry-javascript/pull/18170))
+- ref(e2e-ember): Remove `@embroider/addon-shim` override ([#18180](https://github.com/getsentry/sentry-javascript/pull/18180))
+- ref(browser): Move trace lifecycle listeners to class function ([#18231](https://github.com/getsentry/sentry-javascript/pull/18231))
+- ref(browserprofiling): Move and rename profiler class to UIProfiler ([#18187](https://github.com/getsentry/sentry-javascript/pull/18187))
+- ref(core): Move ai integrations from utils to tracing ([#18185](https://github.com/getsentry/sentry-javascript/pull/18185))
+- ref(core): Optimize `Scope.setTag` bundle size and adjust test ([#18182](https://github.com/getsentry/sentry-javascript/pull/18182))
+
+</details>
 
 ## 10.25.0
 

From 8ab6227f365a9a9117e6e115bf8132cba2a1e72f Mon Sep 17 00:00:00 2001
From: getsentry-bot <bot@sentry.io>
Date: Wed, 19 Nov 2025 10:31:51 +0000
Subject: [PATCH 091/186] release: 10.26.0

---
 .../browser-integration-tests/package.json         |  4 ++--
 .../bundle-analyzer-scenarios/package.json         |  2 +-
 dev-packages/bundler-tests/package.json            |  4 ++--
 dev-packages/clear-cache-gh-action/package.json    |  2 +-
 .../cloudflare-integration-tests/package.json      |  8 ++++----
 dev-packages/e2e-tests/package.json                |  2 +-
 .../external-contributor-gh-action/package.json    |  2 +-
 .../node-core-integration-tests/package.json       |  6 +++---
 dev-packages/node-integration-tests/package.json   | 10 +++++-----
 dev-packages/node-overhead-gh-action/package.json  |  4 ++--
 dev-packages/rollup-utils/package.json             |  2 +-
 dev-packages/size-limit-gh-action/package.json     |  2 +-
 dev-packages/test-utils/package.json               |  4 ++--
 lerna.json                                         |  2 +-
 packages/angular/package.json                      |  6 +++---
 packages/astro/package.json                        |  8 ++++----
 packages/aws-serverless/package.json               |  8 ++++----
 packages/browser-utils/package.json                |  4 ++--
 packages/browser/package.json                      | 14 +++++++-------
 packages/bun/package.json                          |  6 +++---
 packages/cloudflare/package.json                   |  4 ++--
 packages/core/package.json                         |  2 +-
 packages/deno/package.json                         |  4 ++--
 packages/ember/package.json                        |  6 +++---
 packages/eslint-config-sdk/package.json            |  6 +++---
 packages/eslint-plugin-sdk/package.json            |  2 +-
 packages/feedback/package.json                     |  4 ++--
 packages/gatsby/package.json                       |  6 +++---
 packages/google-cloud-serverless/package.json      |  6 +++---
 packages/integration-shims/package.json            |  4 ++--
 packages/nestjs/package.json                       |  6 +++---
 packages/nextjs/package.json                       | 14 +++++++-------
 packages/node-core/package.json                    |  6 +++---
 packages/node-native/package.json                  |  6 +++---
 packages/node/package.json                         |  8 ++++----
 packages/nuxt/package.json                         | 12 ++++++------
 packages/opentelemetry/package.json                |  4 ++--
 packages/profiling-node/package.json               |  6 +++---
 packages/react-router/package.json                 | 10 +++++-----
 packages/react/package.json                        |  6 +++---
 packages/remix/package.json                        |  8 ++++----
 packages/replay-canvas/package.json                |  6 +++---
 packages/replay-internal/package.json              |  8 ++++----
 packages/replay-worker/package.json                |  2 +-
 packages/solid/package.json                        |  6 +++---
 packages/solidstart/package.json                   |  8 ++++----
 packages/svelte/package.json                       |  6 +++---
 packages/sveltekit/package.json                    | 10 +++++-----
 packages/tanstackstart-react/package.json          | 10 +++++-----
 packages/tanstackstart/package.json                |  2 +-
 packages/types/package.json                        |  4 ++--
 packages/typescript/package.json                   |  2 +-
 packages/vercel-edge/package.json                  |  6 +++---
 packages/vue/package.json                          |  6 +++---
 packages/wasm/package.json                         |  6 +++---
 55 files changed, 156 insertions(+), 156 deletions(-)

diff --git a/dev-packages/browser-integration-tests/package.json b/dev-packages/browser-integration-tests/package.json
index b6a7e01e7bfb..6350a0826572 100644
--- a/dev-packages/browser-integration-tests/package.json
+++ b/dev-packages/browser-integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/browser-integration-tests",
-  "version": "10.25.0",
+  "version": "10.26.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": "10.25.0",
+    "@sentry/browser": "10.26.0",
     "@supabase/supabase-js": "2.49.3",
     "axios": "^1.12.2",
     "babel-loader": "^8.2.2",
diff --git a/dev-packages/bundle-analyzer-scenarios/package.json b/dev-packages/bundle-analyzer-scenarios/package.json
index 5de03ee2a113..72928caf3708 100644
--- a/dev-packages/bundle-analyzer-scenarios/package.json
+++ b/dev-packages/bundle-analyzer-scenarios/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/bundle-analyzer-scenarios",
-  "version": "10.25.0",
+  "version": "10.26.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",
diff --git a/dev-packages/bundler-tests/package.json b/dev-packages/bundler-tests/package.json
index a7850b3c1cc6..14bfa512f433 100644
--- a/dev-packages/bundler-tests/package.json
+++ b/dev-packages/bundler-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/bundler-tests",
-  "version": "10.25.0",
+  "version": "10.26.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.25.0",
+    "@sentry/browser": "10.26.0",
     "rollup": "^4.0.0",
     "vite": "^5.0.0",
     "vitest": "^3.2.4",
diff --git a/dev-packages/clear-cache-gh-action/package.json b/dev-packages/clear-cache-gh-action/package.json
index c64bdf36eb9a..22f0c16d2680 100644
--- a/dev-packages/clear-cache-gh-action/package.json
+++ b/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.25.0",
+  "version": "10.26.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
diff --git a/dev-packages/cloudflare-integration-tests/package.json b/dev-packages/cloudflare-integration-tests/package.json
index c791a224a2cc..e4af74f7edfe 100644
--- a/dev-packages/cloudflare-integration-tests/package.json
+++ b/dev-packages/cloudflare-integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/cloudflare-integration-tests",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
@@ -13,12 +13,12 @@
     "test:watch": "yarn test --watch"
   },
   "dependencies": {
-    "@sentry/cloudflare": "10.25.0",
-    "@langchain/langgraph": "^1.0.1"
+    "@langchain/langgraph": "^1.0.1",
+    "@sentry/cloudflare": "10.26.0"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20250922.0",
-    "@sentry-internal/test-utils": "10.25.0",
+    "@sentry-internal/test-utils": "10.26.0",
     "eslint-plugin-regexp": "^1.15.0",
     "vitest": "^3.2.4",
     "wrangler": "4.22.0"
diff --git a/dev-packages/e2e-tests/package.json b/dev-packages/e2e-tests/package.json
index 556891ca2d55..7712bbac10ee 100644
--- a/dev-packages/e2e-tests/package.json
+++ b/dev-packages/e2e-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/e2e-tests",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "license": "MIT",
   "private": true,
   "scripts": {
diff --git a/dev-packages/external-contributor-gh-action/package.json b/dev-packages/external-contributor-gh-action/package.json
index 4b536a69fc1d..9e99c2b66ae0 100644
--- a/dev-packages/external-contributor-gh-action/package.json
+++ b/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": "10.25.0",
+  "version": "10.26.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
diff --git a/dev-packages/node-core-integration-tests/package.json b/dev-packages/node-core-integration-tests/package.json
index bf4bf9f3578a..fe755f16cc6d 100644
--- a/dev-packages/node-core-integration-tests/package.json
+++ b/dev-packages/node-core-integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/node-core-integration-tests",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
@@ -34,8 +34,8 @@
     "@opentelemetry/resources": "^2.1.0",
     "@opentelemetry/sdk-trace-base": "^2.1.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry/core": "10.25.0",
-    "@sentry/node-core": "10.25.0",
+    "@sentry/core": "10.26.0",
+    "@sentry/node-core": "10.26.0",
     "body-parser": "^1.20.3",
     "cors": "^2.8.5",
     "cron": "^3.1.6",
diff --git a/dev-packages/node-integration-tests/package.json b/dev-packages/node-integration-tests/package.json
index 0bc5b8b83b1c..1799e7c9b306 100644
--- a/dev-packages/node-integration-tests/package.json
+++ b/dev-packages/node-integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/node-integration-tests",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
@@ -36,9 +36,9 @@
     "@nestjs/core": "^11",
     "@nestjs/platform-express": "^11",
     "@prisma/client": "6.15.0",
-    "@sentry/aws-serverless": "10.25.0",
-    "@sentry/core": "10.25.0",
-    "@sentry/node": "10.25.0",
+    "@sentry/aws-serverless": "10.26.0",
+    "@sentry/core": "10.26.0",
+    "@sentry/node": "10.26.0",
     "@types/mongodb": "^3.6.20",
     "@types/mysql": "^2.15.21",
     "@types/pg": "^8.6.5",
@@ -83,7 +83,7 @@
     "yargs": "^16.2.0"
   },
   "devDependencies": {
-    "@sentry-internal/test-utils": "10.25.0",
+    "@sentry-internal/test-utils": "10.26.0",
     "@types/amqplib": "^0.10.5",
     "@types/node-cron": "^3.0.11",
     "@types/node-schedule": "^2.1.7",
diff --git a/dev-packages/node-overhead-gh-action/package.json b/dev-packages/node-overhead-gh-action/package.json
index 02dca29a291f..498cefecf053 100644
--- a/dev-packages/node-overhead-gh-action/package.json
+++ b/dev-packages/node-overhead-gh-action/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/node-overhead-gh-action",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
@@ -23,7 +23,7 @@
     "fix": "eslint . --format stylish --fix"
   },
   "dependencies": {
-    "@sentry/node": "10.25.0",
+    "@sentry/node": "10.26.0",
     "express": "^4.21.1",
     "mysql2": "^3.14.4"
   },
diff --git a/dev-packages/rollup-utils/package.json b/dev-packages/rollup-utils/package.json
index 60237502ec71..62cec9c7f9f9 100644
--- a/dev-packages/rollup-utils/package.json
+++ b/dev-packages/rollup-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/rollup-utils",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "description": "Rollup utilities used at Sentry for the Sentry JavaScript SDK",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/rollup-utils",
diff --git a/dev-packages/size-limit-gh-action/package.json b/dev-packages/size-limit-gh-action/package.json
index e29d747dcbaa..5de80ac560c7 100644
--- a/dev-packages/size-limit-gh-action/package.json
+++ b/dev-packages/size-limit-gh-action/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@sentry-internal/size-limit-gh-action",
   "description": "An internal Github Action to compare the current size of a PR against the one on develop.",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
diff --git a/dev-packages/test-utils/package.json b/dev-packages/test-utils/package.json
index c8c0c09b353d..7d0400748c94 100644
--- a/dev-packages/test-utils/package.json
+++ b/dev-packages/test-utils/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "10.25.0",
+  "version": "10.26.0",
   "name": "@sentry-internal/test-utils",
   "author": "Sentry",
   "license": "MIT",
@@ -48,7 +48,7 @@
   },
   "devDependencies": {
     "@playwright/test": "~1.53.2",
-    "@sentry/core": "10.25.0",
+    "@sentry/core": "10.26.0",
     "eslint-plugin-regexp": "^1.15.0"
   },
   "volta": {
diff --git a/lerna.json b/lerna.json
index 3b70b74ac476..7363d9e257e2 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "npmClient": "yarn"
 }
diff --git a/packages/angular/package.json b/packages/angular/package.json
index 6102320de760..01912cb13f79 100644
--- a/packages/angular/package.json
+++ b/packages/angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/angular",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "description": "Official Sentry SDK for Angular",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/angular",
@@ -21,8 +21,8 @@
     "rxjs": "^6.5.5 || ^7.x"
   },
   "dependencies": {
-    "@sentry/browser": "10.25.0",
-    "@sentry/core": "10.25.0",
+    "@sentry/browser": "10.26.0",
+    "@sentry/core": "10.26.0",
     "tslib": "^2.4.1"
   },
   "devDependencies": {
diff --git a/packages/astro/package.json b/packages/astro/package.json
index c8ff489ca77b..32a2cf0e3833 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/astro",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "description": "Official Sentry SDK for Astro",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/astro",
@@ -56,9 +56,9 @@
     "astro": ">=3.x || >=4.0.0-beta || >=5.x"
   },
   "dependencies": {
-    "@sentry/browser": "10.25.0",
-    "@sentry/core": "10.25.0",
-    "@sentry/node": "10.25.0",
+    "@sentry/browser": "10.26.0",
+    "@sentry/core": "10.26.0",
+    "@sentry/node": "10.26.0",
     "@sentry/vite-plugin": "^4.1.0"
   },
   "devDependencies": {
diff --git a/packages/aws-serverless/package.json b/packages/aws-serverless/package.json
index 7ee6a0a50d97..cd0ad16d9e7c 100644
--- a/packages/aws-serverless/package.json
+++ b/packages/aws-serverless/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/aws-serverless",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "description": "Official Sentry SDK for AWS Lambda and AWS Serverless Environments",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/aws-serverless",
@@ -69,9 +69,9 @@
     "@opentelemetry/instrumentation": "^0.204.0",
     "@opentelemetry/instrumentation-aws-sdk": "0.59.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry/core": "10.25.0",
-    "@sentry/node": "10.25.0",
-    "@sentry/node-core": "10.25.0",
+    "@sentry/core": "10.26.0",
+    "@sentry/node": "10.26.0",
+    "@sentry/node-core": "10.26.0",
     "@types/aws-lambda": "^8.10.62"
   },
   "devDependencies": {
diff --git a/packages/browser-utils/package.json b/packages/browser-utils/package.json
index 338175ef5ad5..117fec1f473c 100644
--- a/packages/browser-utils/package.json
+++ b/packages/browser-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/browser-utils",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "description": "Browser Utilities for all Sentry JavaScript SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/browser-utils",
@@ -39,7 +39,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.25.0"
+    "@sentry/core": "10.26.0"
   },
   "scripts": {
     "build": "run-p build:transpile build:types",
diff --git a/packages/browser/package.json b/packages/browser/package.json
index 555062e2744f..c7b21beb6766 100644
--- a/packages/browser/package.json
+++ b/packages/browser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/browser",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "description": "Official Sentry SDK for browsers",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/browser",
@@ -44,14 +44,14 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry-internal/browser-utils": "10.25.0",
-    "@sentry-internal/feedback": "10.25.0",
-    "@sentry-internal/replay": "10.25.0",
-    "@sentry-internal/replay-canvas": "10.25.0",
-    "@sentry/core": "10.25.0"
+    "@sentry-internal/browser-utils": "10.26.0",
+    "@sentry-internal/feedback": "10.26.0",
+    "@sentry-internal/replay": "10.26.0",
+    "@sentry-internal/replay-canvas": "10.26.0",
+    "@sentry/core": "10.26.0"
   },
   "devDependencies": {
-    "@sentry-internal/integration-shims": "10.25.0",
+    "@sentry-internal/integration-shims": "10.26.0",
     "fake-indexeddb": "^6.2.4"
   },
   "scripts": {
diff --git a/packages/bun/package.json b/packages/bun/package.json
index 288e327bf6eb..fcd538862c17 100644
--- a/packages/bun/package.json
+++ b/packages/bun/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/bun",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "description": "Official Sentry SDK for bun",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/bun",
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.25.0",
-    "@sentry/node": "10.25.0"
+    "@sentry/core": "10.26.0",
+    "@sentry/node": "10.26.0"
   },
   "devDependencies": {
     "bun-types": "^1.2.9"
diff --git a/packages/cloudflare/package.json b/packages/cloudflare/package.json
index a620dc84b3d9..ee8cba264e5f 100644
--- a/packages/cloudflare/package.json
+++ b/packages/cloudflare/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/cloudflare",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "description": "Official Sentry SDK for Cloudflare Workers and Pages",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/cloudflare",
@@ -50,7 +50,7 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@sentry/core": "10.25.0"
+    "@sentry/core": "10.26.0"
   },
   "peerDependencies": {
     "@cloudflare/workers-types": "^4.x"
diff --git a/packages/core/package.json b/packages/core/package.json
index e45152996f0f..8ffc256e2f26 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/core",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "description": "Base implementation for all Sentry JavaScript SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/core",
diff --git a/packages/deno/package.json b/packages/deno/package.json
index 814d76142cc3..04ac8f592fd1 100644
--- a/packages/deno/package.json
+++ b/packages/deno/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/deno",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "description": "Official Sentry SDK for Deno",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/deno",
@@ -25,7 +25,7 @@
   ],
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@sentry/core": "10.25.0"
+    "@sentry/core": "10.26.0"
   },
   "scripts": {
     "deno-types": "node ./scripts/download-deno-types.mjs",
diff --git a/packages/ember/package.json b/packages/ember/package.json
index 333eda5345d5..69a111ab54a9 100644
--- a/packages/ember/package.json
+++ b/packages/ember/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/ember",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "description": "Official Sentry SDK for Ember.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/ember",
@@ -32,8 +32,8 @@
   "dependencies": {
     "@babel/core": "^7.27.7",
     "@embroider/macros": "^1.16.0",
-    "@sentry/browser": "10.25.0",
-    "@sentry/core": "10.25.0",
+    "@sentry/browser": "10.26.0",
+    "@sentry/core": "10.26.0",
     "ember-auto-import": "^2.7.2",
     "ember-cli-babel": "^8.2.0",
     "ember-cli-htmlbars": "^6.1.1",
diff --git a/packages/eslint-config-sdk/package.json b/packages/eslint-config-sdk/package.json
index 63c6f926f934..d45a301e1590 100644
--- a/packages/eslint-config-sdk/package.json
+++ b/packages/eslint-config-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/eslint-config-sdk",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "description": "Official Sentry SDK eslint config",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-config-sdk",
@@ -22,8 +22,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry-internal/eslint-plugin-sdk": "10.25.0",
-    "@sentry-internal/typescript": "10.25.0",
+    "@sentry-internal/eslint-plugin-sdk": "10.26.0",
+    "@sentry-internal/typescript": "10.26.0",
     "@typescript-eslint/eslint-plugin": "^5.48.0",
     "@typescript-eslint/parser": "^5.48.0",
     "eslint-config-prettier": "^6.11.0",
diff --git a/packages/eslint-plugin-sdk/package.json b/packages/eslint-plugin-sdk/package.json
index f8d9f4c615ee..bad2ae248475 100644
--- a/packages/eslint-plugin-sdk/package.json
+++ b/packages/eslint-plugin-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/eslint-plugin-sdk",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "description": "Official Sentry SDK eslint plugin",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-plugin-sdk",
diff --git a/packages/feedback/package.json b/packages/feedback/package.json
index aa65e00d8ab5..7c9899ffd305 100644
--- a/packages/feedback/package.json
+++ b/packages/feedback/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/feedback",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "description": "Sentry SDK integration for user feedback",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/feedback",
@@ -39,7 +39,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.25.0"
+    "@sentry/core": "10.26.0"
   },
   "devDependencies": {
     "preact": "^10.19.4"
diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json
index 1da49b3a4dca..8236ee72e0e9 100644
--- a/packages/gatsby/package.json
+++ b/packages/gatsby/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/gatsby",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "description": "Official Sentry SDK for Gatsby.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/gatsby",
@@ -45,8 +45,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.25.0",
-    "@sentry/react": "10.25.0",
+    "@sentry/core": "10.26.0",
+    "@sentry/react": "10.26.0",
     "@sentry/webpack-plugin": "^4.1.1"
   },
   "peerDependencies": {
diff --git a/packages/google-cloud-serverless/package.json b/packages/google-cloud-serverless/package.json
index c742b5a3a154..6afb10e14c42 100644
--- a/packages/google-cloud-serverless/package.json
+++ b/packages/google-cloud-serverless/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/google-cloud-serverless",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "description": "Official Sentry SDK for Google Cloud Functions",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/google-cloud-serverless",
@@ -48,8 +48,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.25.0",
-    "@sentry/node": "10.25.0",
+    "@sentry/core": "10.26.0",
+    "@sentry/node": "10.26.0",
     "@types/express": "^4.17.14"
   },
   "devDependencies": {
diff --git a/packages/integration-shims/package.json b/packages/integration-shims/package.json
index a2535fc2b9b4..8569a5b837f6 100644
--- a/packages/integration-shims/package.json
+++ b/packages/integration-shims/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/integration-shims",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "description": "Shims for integrations in Sentry SDK.",
   "main": "build/cjs/index.js",
   "module": "build/esm/index.js",
@@ -56,7 +56,7 @@
     "url": "https://github.com/getsentry/sentry-javascript/issues"
   },
   "dependencies": {
-    "@sentry/core": "10.25.0"
+    "@sentry/core": "10.26.0"
   },
   "engines": {
     "node": ">=18"
diff --git a/packages/nestjs/package.json b/packages/nestjs/package.json
index 80fdb673cc6d..53c3064ed08f 100644
--- a/packages/nestjs/package.json
+++ b/packages/nestjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/nestjs",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "description": "Official Sentry SDK for NestJS",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/nestjs",
@@ -49,8 +49,8 @@
     "@opentelemetry/instrumentation": "^0.204.0",
     "@opentelemetry/instrumentation-nestjs-core": "0.50.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry/core": "10.25.0",
-    "@sentry/node": "10.25.0"
+    "@sentry/core": "10.26.0",
+    "@sentry/node": "10.26.0"
   },
   "devDependencies": {
     "@nestjs/common": "^10.0.0",
diff --git a/packages/nextjs/package.json b/packages/nextjs/package.json
index 47adab59a32d..15b6a2bf3040 100644
--- a/packages/nextjs/package.json
+++ b/packages/nextjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/nextjs",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "description": "Official Sentry SDK for Next.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/nextjs",
@@ -79,13 +79,13 @@
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
     "@rollup/plugin-commonjs": "28.0.1",
-    "@sentry-internal/browser-utils": "10.25.0",
+    "@sentry-internal/browser-utils": "10.26.0",
     "@sentry/bundler-plugin-core": "^4.3.0",
-    "@sentry/core": "10.25.0",
-    "@sentry/node": "10.25.0",
-    "@sentry/opentelemetry": "10.25.0",
-    "@sentry/react": "10.25.0",
-    "@sentry/vercel-edge": "10.25.0",
+    "@sentry/core": "10.26.0",
+    "@sentry/node": "10.26.0",
+    "@sentry/opentelemetry": "10.26.0",
+    "@sentry/react": "10.26.0",
+    "@sentry/vercel-edge": "10.26.0",
     "@sentry/webpack-plugin": "^4.3.0",
     "resolve": "1.22.8",
     "rollup": "^4.35.0",
diff --git a/packages/node-core/package.json b/packages/node-core/package.json
index 43af0a610e61..89dbe5461165 100644
--- a/packages/node-core/package.json
+++ b/packages/node-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/node-core",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "description": "Sentry Node-Core SDK",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/node-core",
@@ -67,8 +67,8 @@
   },
   "dependencies": {
     "@apm-js-collab/tracing-hooks": "^0.3.1",
-    "@sentry/core": "10.25.0",
-    "@sentry/opentelemetry": "10.25.0",
+    "@sentry/core": "10.26.0",
+    "@sentry/opentelemetry": "10.26.0",
     "import-in-the-middle": "^1.14.2"
   },
   "devDependencies": {
diff --git a/packages/node-native/package.json b/packages/node-native/package.json
index 23ce0068019c..9a4c40818556 100644
--- a/packages/node-native/package.json
+++ b/packages/node-native/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/node-native",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "description": "Native Tools for the Official Sentry Node.js SDK",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/node-native",
@@ -64,8 +64,8 @@
   },
   "dependencies": {
     "@sentry-internal/node-native-stacktrace": "^0.2.2",
-    "@sentry/core": "10.25.0",
-    "@sentry/node": "10.25.0"
+    "@sentry/core": "10.26.0",
+    "@sentry/node": "10.26.0"
   },
   "devDependencies": {
     "@types/node": "^18.19.1"
diff --git a/packages/node/package.json b/packages/node/package.json
index 830fb510f9f9..6f0bec49c92a 100644
--- a/packages/node/package.json
+++ b/packages/node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/node",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "description": "Sentry Node SDK using OpenTelemetry for performance instrumentation",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/node",
@@ -95,9 +95,9 @@
     "@opentelemetry/sdk-trace-base": "^2.1.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
     "@prisma/instrumentation": "6.15.0",
-    "@sentry/core": "10.25.0",
-    "@sentry/node-core": "10.25.0",
-    "@sentry/opentelemetry": "10.25.0",
+    "@sentry/core": "10.26.0",
+    "@sentry/node-core": "10.26.0",
+    "@sentry/opentelemetry": "10.26.0",
     "import-in-the-middle": "^1.14.2",
     "minimatch": "^9.0.0"
   },
diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json
index 3a9679553475..e054d1b9938a 100644
--- a/packages/nuxt/package.json
+++ b/packages/nuxt/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/nuxt",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "description": "Official Sentry SDK for Nuxt",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/nuxt",
@@ -49,13 +49,13 @@
   },
   "dependencies": {
     "@nuxt/kit": "^3.13.2",
-    "@sentry/browser": "10.25.0",
-    "@sentry/cloudflare": "10.25.0",
-    "@sentry/core": "10.25.0",
-    "@sentry/node": "10.25.0",
+    "@sentry/browser": "10.26.0",
+    "@sentry/cloudflare": "10.26.0",
+    "@sentry/core": "10.26.0",
+    "@sentry/node": "10.26.0",
     "@sentry/rollup-plugin": "^4.3.0",
     "@sentry/vite-plugin": "^4.3.0",
-    "@sentry/vue": "10.25.0"
+    "@sentry/vue": "10.26.0"
   },
   "devDependencies": {
     "@nuxt/module-builder": "^0.8.4",
diff --git a/packages/opentelemetry/package.json b/packages/opentelemetry/package.json
index 94457ff83b65..95b7f54cd000 100644
--- a/packages/opentelemetry/package.json
+++ b/packages/opentelemetry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/opentelemetry",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "description": "Official Sentry utilities for OpenTelemetry",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/opentelemetry",
@@ -39,7 +39,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.25.0"
+    "@sentry/core": "10.26.0"
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.9.0",
diff --git a/packages/profiling-node/package.json b/packages/profiling-node/package.json
index 7040f0a53c21..e897b8d5611e 100644
--- a/packages/profiling-node/package.json
+++ b/packages/profiling-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/profiling-node",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "description": "Official Sentry SDK for Node.js Profiling",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/profiling-node",
@@ -63,8 +63,8 @@
   },
   "dependencies": {
     "@sentry-internal/node-cpu-profiler": "^2.2.0",
-    "@sentry/core": "10.25.0",
-    "@sentry/node": "10.25.0"
+    "@sentry/core": "10.26.0",
+    "@sentry/node": "10.26.0"
   },
   "devDependencies": {
     "@types/node": "^18.19.1"
diff --git a/packages/react-router/package.json b/packages/react-router/package.json
index 52dd1a71fee7..3d57ad54469f 100644
--- a/packages/react-router/package.json
+++ b/packages/react-router/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/react-router",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "description": "Official Sentry SDK for React Router (Framework)",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/react-router",
@@ -49,11 +49,11 @@
     "@opentelemetry/core": "^2.1.0",
     "@opentelemetry/instrumentation": "^0.204.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry/browser": "10.25.0",
+    "@sentry/browser": "10.26.0",
     "@sentry/cli": "^2.56.0",
-    "@sentry/core": "10.25.0",
-    "@sentry/node": "10.25.0",
-    "@sentry/react": "10.25.0",
+    "@sentry/core": "10.26.0",
+    "@sentry/node": "10.26.0",
+    "@sentry/react": "10.26.0",
     "@sentry/vite-plugin": "^4.1.0",
     "glob": "11.0.1"
   },
diff --git a/packages/react/package.json b/packages/react/package.json
index c7e7163a9a5e..c51a7e2d3ee8 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/react",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "description": "Official Sentry SDK for React.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/react",
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "10.25.0",
-    "@sentry/core": "10.25.0",
+    "@sentry/browser": "10.26.0",
+    "@sentry/core": "10.26.0",
     "hoist-non-react-statics": "^3.3.2"
   },
   "peerDependencies": {
diff --git a/packages/remix/package.json b/packages/remix/package.json
index 9a255af786ce..667f77d53648 100644
--- a/packages/remix/package.json
+++ b/packages/remix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/remix",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "description": "Official Sentry SDK for Remix",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/remix",
@@ -69,9 +69,9 @@
     "@opentelemetry/semantic-conventions": "^1.37.0",
     "@remix-run/router": "1.x",
     "@sentry/cli": "^2.56.0",
-    "@sentry/core": "10.25.0",
-    "@sentry/node": "10.25.0",
-    "@sentry/react": "10.25.0",
+    "@sentry/core": "10.26.0",
+    "@sentry/node": "10.26.0",
+    "@sentry/react": "10.26.0",
     "glob": "^10.3.4",
     "yargs": "^17.6.0"
   },
diff --git a/packages/replay-canvas/package.json b/packages/replay-canvas/package.json
index 491d919e55dc..63ee871ddfdf 100644
--- a/packages/replay-canvas/package.json
+++ b/packages/replay-canvas/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/replay-canvas",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "description": "Replay canvas integration",
   "main": "build/npm/cjs/index.js",
   "module": "build/npm/esm/index.js",
@@ -69,8 +69,8 @@
     "@sentry-internal/rrweb": "2.40.0"
   },
   "dependencies": {
-    "@sentry-internal/replay": "10.25.0",
-    "@sentry/core": "10.25.0"
+    "@sentry-internal/replay": "10.26.0",
+    "@sentry/core": "10.26.0"
   },
   "engines": {
     "node": ">=18"
diff --git a/packages/replay-internal/package.json b/packages/replay-internal/package.json
index d2e1efbd84b7..af121d6a74c0 100644
--- a/packages/replay-internal/package.json
+++ b/packages/replay-internal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/replay",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "description": "User replays for Sentry",
   "main": "build/npm/cjs/index.js",
   "module": "build/npm/esm/index.js",
@@ -81,7 +81,7 @@
   "homepage": "https://docs.sentry.io/platforms/javascript/session-replay/",
   "devDependencies": {
     "@babel/core": "^7.27.7",
-    "@sentry-internal/replay-worker": "10.25.0",
+    "@sentry-internal/replay-worker": "10.26.0",
     "@sentry-internal/rrweb": "2.40.0",
     "@sentry-internal/rrweb-snapshot": "2.40.0",
     "fflate": "0.8.2",
@@ -90,8 +90,8 @@
     "node-fetch": "^2.6.7"
   },
   "dependencies": {
-    "@sentry-internal/browser-utils": "10.25.0",
-    "@sentry/core": "10.25.0"
+    "@sentry-internal/browser-utils": "10.26.0",
+    "@sentry/core": "10.26.0"
   },
   "engines": {
     "node": ">=18"
diff --git a/packages/replay-worker/package.json b/packages/replay-worker/package.json
index a0d25235c7d7..e9a968061841 100644
--- a/packages/replay-worker/package.json
+++ b/packages/replay-worker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/replay-worker",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "description": "Worker for @sentry-internal/replay",
   "main": "build/esm/index.js",
   "module": "build/esm/index.js",
diff --git a/packages/solid/package.json b/packages/solid/package.json
index bdb3dbe50a15..c75a0eadb4ce 100644
--- a/packages/solid/package.json
+++ b/packages/solid/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/solid",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "description": "Official Sentry SDK for Solid",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/solid",
@@ -54,8 +54,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "10.25.0",
-    "@sentry/core": "10.25.0"
+    "@sentry/browser": "10.26.0",
+    "@sentry/core": "10.26.0"
   },
   "peerDependencies": {
     "@solidjs/router": "^0.13.4",
diff --git a/packages/solidstart/package.json b/packages/solidstart/package.json
index bb4acc3404f4..8bb0e4e0471f 100644
--- a/packages/solidstart/package.json
+++ b/packages/solidstart/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/solidstart",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "description": "Official Sentry SDK for Solid Start",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/solidstart",
@@ -66,9 +66,9 @@
     }
   },
   "dependencies": {
-    "@sentry/core": "10.25.0",
-    "@sentry/node": "10.25.0",
-    "@sentry/solid": "10.25.0",
+    "@sentry/core": "10.26.0",
+    "@sentry/node": "10.26.0",
+    "@sentry/solid": "10.26.0",
     "@sentry/vite-plugin": "^4.1.0"
   },
   "devDependencies": {
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index dc8c662012c3..6e9cbdf5b54a 100644
--- a/packages/svelte/package.json
+++ b/packages/svelte/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/svelte",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "description": "Official Sentry SDK for Svelte",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/svelte",
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "10.25.0",
-    "@sentry/core": "10.25.0",
+    "@sentry/browser": "10.26.0",
+    "@sentry/core": "10.26.0",
     "magic-string": "^0.30.0"
   },
   "peerDependencies": {
diff --git a/packages/sveltekit/package.json b/packages/sveltekit/package.json
index 01f88fcd60b9..7802db426793 100644
--- a/packages/sveltekit/package.json
+++ b/packages/sveltekit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/sveltekit",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "description": "Official Sentry SDK for SvelteKit",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/sveltekit",
@@ -48,10 +48,10 @@
   },
   "dependencies": {
     "@babel/parser": "7.26.9",
-    "@sentry/cloudflare": "10.25.0",
-    "@sentry/core": "10.25.0",
-    "@sentry/node": "10.25.0",
-    "@sentry/svelte": "10.25.0",
+    "@sentry/cloudflare": "10.26.0",
+    "@sentry/core": "10.26.0",
+    "@sentry/node": "10.26.0",
+    "@sentry/svelte": "10.26.0",
     "@sentry/vite-plugin": "^4.1.0",
     "magic-string": "0.30.7",
     "recast": "0.23.11",
diff --git a/packages/tanstackstart-react/package.json b/packages/tanstackstart-react/package.json
index 49c0bf12d971..03688bdd6aad 100644
--- a/packages/tanstackstart-react/package.json
+++ b/packages/tanstackstart-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/tanstackstart-react",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "description": "Official Sentry SDK for TanStack Start React",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/tanstackstart-react",
@@ -52,10 +52,10 @@
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry-internal/browser-utils": "10.25.0",
-    "@sentry/core": "10.25.0",
-    "@sentry/node": "10.25.0",
-    "@sentry/react": "10.25.0"
+    "@sentry-internal/browser-utils": "10.26.0",
+    "@sentry/core": "10.26.0",
+    "@sentry/node": "10.26.0",
+    "@sentry/react": "10.26.0"
   },
   "scripts": {
     "build": "run-p build:transpile build:types",
diff --git a/packages/tanstackstart/package.json b/packages/tanstackstart/package.json
index 56e0c7992fea..3918ecd9a3fa 100644
--- a/packages/tanstackstart/package.json
+++ b/packages/tanstackstart/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/tanstackstart",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "description": "Utilities for the Sentry TanStack Start SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/tanstackstart",
diff --git a/packages/types/package.json b/packages/types/package.json
index 1c53b6c05275..2287d86014da 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/types",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "description": "Types for all Sentry JavaScript SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/types",
@@ -57,7 +57,7 @@
     "yalc:publish": "yalc publish --push --sig"
   },
   "dependencies": {
-    "@sentry/core": "10.25.0"
+    "@sentry/core": "10.26.0"
   },
   "volta": {
     "extends": "../../package.json"
diff --git a/packages/typescript/package.json b/packages/typescript/package.json
index c1c99704c346..ab02fe16f828 100644
--- a/packages/typescript/package.json
+++ b/packages/typescript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/typescript",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "description": "Typescript configuration used at Sentry",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/typescript",
diff --git a/packages/vercel-edge/package.json b/packages/vercel-edge/package.json
index c7c6db556ccb..d5c9ef78b8c1 100644
--- a/packages/vercel-edge/package.json
+++ b/packages/vercel-edge/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/vercel-edge",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "description": "Official Sentry SDK for the Vercel Edge Runtime",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/vercel-edge",
@@ -41,14 +41,14 @@
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/resources": "^2.1.0",
-    "@sentry/core": "10.25.0"
+    "@sentry/core": "10.26.0"
   },
   "devDependencies": {
     "@edge-runtime/types": "3.0.1",
     "@opentelemetry/core": "^2.1.0",
     "@opentelemetry/sdk-trace-base": "^2.1.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry/opentelemetry": "10.25.0"
+    "@sentry/opentelemetry": "10.26.0"
   },
   "scripts": {
     "build": "run-p build:transpile build:types",
diff --git a/packages/vue/package.json b/packages/vue/package.json
index 31bef1a870c8..abdb956018c6 100644
--- a/packages/vue/package.json
+++ b/packages/vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/vue",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "description": "Official Sentry SDK for Vue.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/vue",
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "10.25.0",
-    "@sentry/core": "10.25.0"
+    "@sentry/browser": "10.26.0",
+    "@sentry/core": "10.26.0"
   },
   "peerDependencies": {
     "pinia": "2.x || 3.x",
diff --git a/packages/wasm/package.json b/packages/wasm/package.json
index f7a97139c120..2e7883644276 100644
--- a/packages/wasm/package.json
+++ b/packages/wasm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/wasm",
-  "version": "10.25.0",
+  "version": "10.26.0",
   "description": "Support for WASM.",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/wasm",
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "10.25.0",
-    "@sentry/core": "10.25.0"
+    "@sentry/browser": "10.26.0",
+    "@sentry/core": "10.26.0"
   },
   "scripts": {
     "build": "run-p build:transpile build:bundle build:types",

From 680607c460f9dfae8cd0c5f1d496274d4460ca1b Mon Sep 17 00:00:00 2001
From: Andrei <168741329+andreiborza@users.noreply.github.com>
Date: Wed, 19 Nov 2025 11:32:17 +0100
Subject: [PATCH 092/186] chore: Add `bump_otel_instrumentations` cursor
 command (#18253)

Bumping OpenTelemetry instrumentations is an important but tedious task,
all instrumentations have to be bumped in lockstep across the codebase.
That includes easy to miss dev-packages and third party instrumentations
like prisma's.

This command should make it easier to do that.

Example of a PR that was kicked off with this command:
https://github.com/getsentry/sentry-javascript/pull/18239
---
 .../commands/bump_otel_instrumentations.md    | 32 ++++++++++++++++++
 ...upgrade_opentelemetry_instrumentations.mdc | 33 +++++++++++++++++++
 2 files changed, 65 insertions(+)
 create mode 100644 .cursor/commands/bump_otel_instrumentations.md
 create mode 100644 .cursor/rules/upgrade_opentelemetry_instrumentations.mdc

diff --git a/.cursor/commands/bump_otel_instrumentations.md b/.cursor/commands/bump_otel_instrumentations.md
new file mode 100644
index 000000000000..ff1e6cfcbcc8
--- /dev/null
+++ b/.cursor/commands/bump_otel_instrumentations.md
@@ -0,0 +1,32 @@
+# Bump OpenTelemetry instrumentations
+
+1. Ensure you're on the `develop` branch with the latest changes:
+   - If you have unsaved changes, stash them with `git stash -u`.
+   - If you're on a different branch than `develop`, check out the develop branch using `git checkout develop`.
+   - Pull the latest updates from the remote repository by running `git pull origin develop`.
+
+2. Create a new branch `bump-otel-{yyyy-mm-dd}`, e.g. `bump-otel-2025-03-03`
+
+3. Create a new empty commit with the commit message `feat(deps): Bump OpenTelemetry instrumentations`
+
+4. Push the branch and create a draft PR, note down the PR number as {PR_NUMBER}
+
+5. Create a changelog entry in `CHANGELOG.md` under
+   `- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott` with the following format:
+   `- feat(deps): Bump OpenTelemetry instrumentations ([#{PR_NUMBER}](https://github.com/getsentry/sentry-javascript/pull/{PR_NUMBER}))`
+
+6. Find the "Upgrade OpenTelemetry instrumentations" rule in `.cursor/rules/upgrade_opentelemetry_instrumentations` and
+   follow those complete instructions step by step.
+   - Create one commit per package in `packages/**` with the commit message
+     `Bump OpenTelemetry instrumentations for {SDK}`, e.g. `Bump OpenTelemetry instrumentation for @sentry/node`
+
+   - For each OpenTelemetry dependency bump, record an entry in the changelog with the format indented under the main
+     entry created in step 5: `- Bump @opentelemetry/{instrumentation} from {previous_version} to {new_version}`, e.g.
+     `- Bump @opentelemetry/instrumentation from 0.204.0 to 0.207.0` **CRITICAL**: Avoid duplicated entries, e.g. if we
+     bump @opentelemetry/instrumentation in two packages, keep a single changelog entry.
+
+7. Regenerate the yarn lockfile and run `yarn yarn-deduplicate`
+
+8. Run `yarn fix` to fix all formatting issues
+
+9. Finally update the PR description to list all dependency bumps
diff --git a/.cursor/rules/upgrade_opentelemetry_instrumentations.mdc b/.cursor/rules/upgrade_opentelemetry_instrumentations.mdc
new file mode 100644
index 000000000000..b650ae1f5041
--- /dev/null
+++ b/.cursor/rules/upgrade_opentelemetry_instrumentations.mdc
@@ -0,0 +1,33 @@
+---
+description: Use this rule if you are looking to grade OpenTelemetry instrumentations for the Sentry JavaScript SDKs
+globs: *
+alwaysApply: false
+---
+
+# Upgrading OpenTelemetry instrumentations
+
+1. For every package in packages/\*\*:
+   - When upgrading dependencies for OpenTelemetry instrumentations we need to first upgrade `@opentelemetry/instrumentation` to the latest version.
+     **CRITICAL**: `@opentelemetry/instrumentation` MUST NOT include any breaking changes.
+     Read through the changelog of `@opentelemetry/instrumentation` to figure out if breaking changes are included and fail with the reason if it does include breaking changes.
+     You can find the changelog at `https://github.com/open-telemetry/opentelemetry-js/blob/main/experimental/CHANGELOG.md`
+
+   - After successfully upgrading `@opentelemetry/instrumentation` upgrade all `@opentelemetry/instrumentation-{instrumentation}` packages, e.g. `@opentelemetry/instrumentation-pg`
+     **CRITICAL**: `@opentelemetry/instrumentation-{instrumentation}` MUST NOT include any breaking changes.
+     Read through the changelog of `@opentelemetry/instrumentation-{instrumentation}` to figure out if breaking changes are included and fail with the reason if it does including breaking changes.
+     You can find the changelogs at `https://github.com/open-telemetry/opentelemetry-js-contrib/blob/main/packages/instrumentation-{instrumentation}/CHANGELOG.md`.
+
+   - Finally, upgrade third party instrumentations to their latest versions, these are currently:
+     - @prisma/instrumentation
+
+     **CRITICAL**: Upgrades to third party instrumentations MUST NOT include breaking changes.
+     Read through the changelog of each third party instrumentation to figure out if breaking changes are included and fail with the reason if it does include breaking changes.
+
+2. For packages and apps in dev-packages/\*\*:
+   - If an app depends on `@opentelemetry/instrumentation` >= 0.200.x upgrade it to the latest version.
+     **CRITICAL**: `@opentelemetry/instrumentation` MUST NOT include any breaking changes.
+
+   - If an app depends on `@opentelemetry/instrumentation-http` >= 0.200.x upgrade it to the latest version.
+     **CRITICAL**: `@opentelemetry/instrumentation-http` MUST NOT include any breaking changes.
+
+3. Generate a new yarn lock file.

From bee20fb0eaacab58d81c995e1509bce6d46b23a8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Nov 2025 12:11:41 +0100
Subject: [PATCH 093/186] ci(deps): bump actions/upload-artifact from 4 to 5
 (#18075)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps
[actions/upload-artifact](https://github.com/actions/upload-artifact)
from 4 to 5.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/actions/upload-artifact/releases">actions/upload-artifact's
releases</a>.</em></p>
<blockquote>
<h2>v5.0.0</h2>
<h2>What's Changed</h2>
<p><strong>BREAKING CHANGE:</strong> this update supports Node
<code>v24.x</code>. This is not a breaking change per-se but we're
treating it as such.</p>
<ul>
<li>Update README.md by <a
href="https://github.com/GhadimiR"><code>@​GhadimiR</code></a> in <a
href="https://github.com/actions/upload-artifact/pull/681">actions/upload-artifact#681</a></li>
<li>Update README.md by <a
href="https://github.com/nebuk89"><code>@​nebuk89</code></a> in <a
href="https://github.com/actions/upload-artifact/pull/712">actions/upload-artifact#712</a></li>
<li>Readme: spell out the first use of GHES by <a
href="https://github.com/danwkennedy"><code>@​danwkennedy</code></a> in
<a
href="https://github.com/actions/upload-artifact/pull/727">actions/upload-artifact#727</a></li>
<li>Update GHES guidance to include reference to Node 20 version by <a
href="https://github.com/patrikpolyak"><code>@​patrikpolyak</code></a>
in <a
href="https://github.com/actions/upload-artifact/pull/725">actions/upload-artifact#725</a></li>
<li>Bump <code>@actions/artifact</code> to <code>v4.0.0</code></li>
<li>Prepare <code>v5.0.0</code> by <a
href="https://github.com/danwkennedy"><code>@​danwkennedy</code></a> in
<a
href="https://github.com/actions/upload-artifact/pull/734">actions/upload-artifact#734</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/GhadimiR"><code>@​GhadimiR</code></a>
made their first contribution in <a
href="https://github.com/actions/upload-artifact/pull/681">actions/upload-artifact#681</a></li>
<li><a href="https://github.com/nebuk89"><code>@​nebuk89</code></a> made
their first contribution in <a
href="https://github.com/actions/upload-artifact/pull/712">actions/upload-artifact#712</a></li>
<li><a
href="https://github.com/danwkennedy"><code>@​danwkennedy</code></a>
made their first contribution in <a
href="https://github.com/actions/upload-artifact/pull/727">actions/upload-artifact#727</a></li>
<li><a
href="https://github.com/patrikpolyak"><code>@​patrikpolyak</code></a>
made their first contribution in <a
href="https://github.com/actions/upload-artifact/pull/725">actions/upload-artifact#725</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/actions/upload-artifact/compare/v4...v5.0.0">https://github.com/actions/upload-artifact/compare/v4...v5.0.0</a></p>
<h2>v4.6.2</h2>
<h2>What's Changed</h2>
<ul>
<li>Update to use artifact 2.3.2 package &amp; prepare for new
upload-artifact release by <a
href="https://github.com/salmanmkc"><code>@​salmanmkc</code></a> in <a
href="https://github.com/actions/upload-artifact/pull/685">actions/upload-artifact#685</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/salmanmkc"><code>@​salmanmkc</code></a>
made their first contribution in <a
href="https://github.com/actions/upload-artifact/pull/685">actions/upload-artifact#685</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/actions/upload-artifact/compare/v4...v4.6.2">https://github.com/actions/upload-artifact/compare/v4...v4.6.2</a></p>
<h2>v4.6.1</h2>
<h2>What's Changed</h2>
<ul>
<li>Update to use artifact 2.2.2 package by <a
href="https://github.com/yacaovsnc"><code>@​yacaovsnc</code></a> in <a
href="https://github.com/actions/upload-artifact/pull/673">actions/upload-artifact#673</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/actions/upload-artifact/compare/v4...v4.6.1">https://github.com/actions/upload-artifact/compare/v4...v4.6.1</a></p>
<h2>v4.6.0</h2>
<h2>What's Changed</h2>
<ul>
<li>Expose env vars to control concurrency and timeout by <a
href="https://github.com/yacaovsnc"><code>@​yacaovsnc</code></a> in <a
href="https://github.com/actions/upload-artifact/pull/662">actions/upload-artifact#662</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/actions/upload-artifact/compare/v4...v4.6.0">https://github.com/actions/upload-artifact/compare/v4...v4.6.0</a></p>
<h2>v4.5.0</h2>
<h2>What's Changed</h2>
<ul>
<li>fix: deprecated <code>Node.js</code> version in action by <a
href="https://github.com/hamirmahal"><code>@​hamirmahal</code></a> in <a
href="https://github.com/actions/upload-artifact/pull/578">actions/upload-artifact#578</a></li>
<li>Add new <code>artifact-digest</code> output by <a
href="https://github.com/bdehamer"><code>@​bdehamer</code></a> in <a
href="https://github.com/actions/upload-artifact/pull/656">actions/upload-artifact#656</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a
href="https://github.com/hamirmahal"><code>@​hamirmahal</code></a> made
their first contribution in <a
href="https://github.com/actions/upload-artifact/pull/578">actions/upload-artifact#578</a></li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/actions/upload-artifact/commit/330a01c490aca151604b8cf639adc76d48f6c5d4"><code>330a01c</code></a>
Merge pull request <a
href="https://github.com/actions/upload-artifact/issues/734">#734</a>
from actions/danwkennedy/prepare-5.0.0</li>
<li><a
href="https://github.com/actions/upload-artifact/commit/03f282445299bbefc96171af272a984663b63a26"><code>03f2824</code></a>
Update <code>github.dep.yml</code></li>
<li><a
href="https://github.com/actions/upload-artifact/commit/905a1ecb5915b264cbc519e4eb415b5d82916018"><code>905a1ec</code></a>
Prepare <code>v5.0.0</code></li>
<li><a
href="https://github.com/actions/upload-artifact/commit/2d9f9cdfa99fedaddba68e9b5b5c281eca26cc63"><code>2d9f9cd</code></a>
Merge pull request <a
href="https://github.com/actions/upload-artifact/issues/725">#725</a>
from patrikpolyak/patch-1</li>
<li><a
href="https://github.com/actions/upload-artifact/commit/9687587dec67f2a8bc69104e183d311c42af6d6f"><code>9687587</code></a>
Merge branch 'main' into patch-1</li>
<li><a
href="https://github.com/actions/upload-artifact/commit/2848b2cda0e5190984587ec6bb1f36730ca78d50"><code>2848b2c</code></a>
Merge pull request <a
href="https://github.com/actions/upload-artifact/issues/727">#727</a>
from danwkennedy/patch-1</li>
<li><a
href="https://github.com/actions/upload-artifact/commit/9b511775fd9ce8c5710b38eea671f856de0e70a7"><code>9b51177</code></a>
Spell out the first use of GHES</li>
<li><a
href="https://github.com/actions/upload-artifact/commit/cd231ca1eda77976a84805c4194a1954f56b0727"><code>cd231ca</code></a>
Update GHES guidance to include reference to Node 20 version</li>
<li><a
href="https://github.com/actions/upload-artifact/commit/de65e23aa2b7e23d713bb51fbfcb6d502f8667d8"><code>de65e23</code></a>
Merge pull request <a
href="https://github.com/actions/upload-artifact/issues/712">#712</a>
from actions/nebuk89-patch-1</li>
<li><a
href="https://github.com/actions/upload-artifact/commit/8747d8cd7632611ad6060b528f3e0f654c98869c"><code>8747d8c</code></a>
Update README.md</li>
<li>Additional commits viewable in <a
href="https://github.com/actions/upload-artifact/compare/v4...v5">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/upload-artifact&package-manager=github_actions&previous-version=4&new-version=5)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jan Peer Stöcklmair <jan.oster94@gmail.com>
---
 .github/workflows/build.yml               | 14 +++++++-------
 .github/workflows/flaky-test-detector.yml |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 46d6e7d4fac9..610dced85c1b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -181,7 +181,7 @@ jobs:
         run: yarn build
 
       - name: Upload build artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: build-output
           path: ${{ env.CACHED_BUILD_PATHS }}
@@ -386,7 +386,7 @@ jobs:
         run: yarn build:tarball
 
       - name: Archive artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: ${{ github.sha }}
           retention-days: 90
@@ -629,7 +629,7 @@ jobs:
           format(' --shard={0}/{1}', matrix.shard, matrix.shards) || '' }}
 
       - name: Upload Playwright Traces
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: failure()
         with:
           name:
@@ -692,7 +692,7 @@ jobs:
           yarn test:loader
 
       - name: Upload Playwright Traces
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: failure()
         with:
           name: playwright-traces-job_browser_loader_tests-${{ matrix.bundle}}
@@ -1005,7 +1005,7 @@ jobs:
         run: ${{ matrix.assert-command || 'pnpm test:assert' }}
 
       - name: Upload Playwright Traces
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: failure()
         with:
           name: playwright-traces-job_e2e_playwright_tests-${{ matrix.test-application}}
@@ -1019,7 +1019,7 @@ jobs:
           node ./scripts/normalize-e2e-test-dump-transaction-events.js
 
       - name: Upload E2E Test Event Dumps
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: failure()
         with:
           name: E2E Test Dump (${{ matrix.label || matrix.test-application }})
@@ -1131,7 +1131,7 @@ jobs:
           node ./scripts/normalize-e2e-test-dump-transaction-events.js
 
       - name: Upload E2E Test Event Dumps
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: failure()
         with:
           name: E2E Test Dump (${{ matrix.label || matrix.test-application }})
diff --git a/.github/workflows/flaky-test-detector.yml b/.github/workflows/flaky-test-detector.yml
index 5103f1f43a2d..21a851fb43d6 100644
--- a/.github/workflows/flaky-test-detector.yml
+++ b/.github/workflows/flaky-test-detector.yml
@@ -71,7 +71,7 @@ jobs:
           TEST_RUN_COUNT: 'AUTO'
 
       - name: Upload Playwright Traces
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         if: failure() && steps.test.outcome == 'failure'
         with:
           name: playwright-test-results

From 81c5d56d644d9f003ff06d08c0a3fe985cde6562 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Nov 2025 12:12:01 +0100
Subject: [PATCH 094/186] ci(deps): bump actions/setup-node from 4 to 6
 (#18077)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4
to 6.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/actions/setup-node/releases">actions/setup-node's
releases</a>.</em></p>
<blockquote>
<h2>v6.0.0</h2>
<h2>What's Changed</h2>
<p><strong>Breaking Changes</strong></p>
<ul>
<li>Limit automatic caching to npm, update workflows and documentation
by <a
href="https://github.com/priyagupta108"><code>@​priyagupta108</code></a>
in <a
href="https://github.com/actions/setup-node/pull/1374">actions/setup-node#1374</a></li>
</ul>
<p><strong>Dependency Upgrades</strong></p>
<ul>
<li>Upgrade ts-jest from 29.1.2 to 29.4.1 and document breaking changes
in v5 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a>[bot]
in <a
href="https://github.com/actions/setup-node/pull/1336">#1336</a></li>
<li>Upgrade prettier from 2.8.8 to 3.6.2 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a>[bot]
in <a
href="https://github.com/actions/setup-node/pull/1334">#1334</a></li>
<li>Upgrade actions/publish-action from 0.3.0 to 0.4.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a>[bot]
in <a
href="https://github.com/actions/setup-node/pull/1362">#1362</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/actions/setup-node/compare/v5...v6.0.0">https://github.com/actions/setup-node/compare/v5...v6.0.0</a></p>
<h2>v5.0.0</h2>
<h2>What's Changed</h2>
<h3>Breaking Changes</h3>
<ul>
<li>Enhance caching in setup-node with automatic package manager
detection by <a
href="https://github.com/priya-kinthali"><code>@​priya-kinthali</code></a>
in <a
href="https://github.com/actions/setup-node/pull/1348">actions/setup-node#1348</a></li>
</ul>
<p>This update, introduces automatic caching when a valid
<code>packageManager</code> field is present in your
<code>package.json</code>. This aims to improve workflow performance and
make dependency management more seamless.
To disable this automatic caching, set <code>package-manager-cache:
false</code></p>
<pre lang="yaml"><code>steps:
- uses: actions/checkout@v5
- uses: actions/setup-node@v5
  with:
    package-manager-cache: false
</code></pre>
<ul>
<li>Upgrade action to use node24 by <a
href="https://github.com/salmanmkc"><code>@​salmanmkc</code></a> in <a
href="https://github.com/actions/setup-node/pull/1325">actions/setup-node#1325</a></li>
</ul>
<p>Make sure your runner is on version v2.327.1 or later to ensure
compatibility with this release. <a
href="https://github.com/actions/runner/releases/tag/v2.327.1">See
Release Notes</a></p>
<h3>Dependency Upgrades</h3>
<ul>
<li>Upgrade <code>@​octokit/request-error</code> and
<code>@​actions/github</code> by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a>[bot]
in <a
href="https://github.com/actions/setup-node/pull/1227">actions/setup-node#1227</a></li>
<li>Upgrade uuid from 9.0.1 to 11.1.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a>[bot]
in <a
href="https://github.com/actions/setup-node/pull/1273">actions/setup-node#1273</a></li>
<li>Upgrade undici from 5.28.5 to 5.29.0 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a>[bot]
in <a
href="https://github.com/actions/setup-node/pull/1295">actions/setup-node#1295</a></li>
<li>Upgrade form-data to bring in fix for critical vulnerability by <a
href="https://github.com/gowridurgad"><code>@​gowridurgad</code></a> in
<a
href="https://github.com/actions/setup-node/pull/1332">actions/setup-node#1332</a></li>
<li>Upgrade actions/checkout from 4 to 5 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a>[bot]
in <a
href="https://github.com/actions/setup-node/pull/1345">actions/setup-node#1345</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a
href="https://github.com/priya-kinthali"><code>@​priya-kinthali</code></a>
made their first contribution in <a
href="https://github.com/actions/setup-node/pull/1348">actions/setup-node#1348</a></li>
<li><a href="https://github.com/salmanmkc"><code>@​salmanmkc</code></a>
made their first contribution in <a
href="https://github.com/actions/setup-node/pull/1325">actions/setup-node#1325</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/actions/setup-node/compare/v4...v5.0.0">https://github.com/actions/setup-node/compare/v4...v5.0.0</a></p>
<h2>v4.4.0</h2>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/actions/setup-node/commit/2028fbc5c25fe9cf00d9f06a71cc4710d4507903"><code>2028fbc</code></a>
Limit automatic caching to npm, update workflows and documentation (<a
href="https://github.com/actions/setup-node/issues/1374">#1374</a>)</li>
<li><a
href="https://github.com/actions/setup-node/commit/13427813f706a0f6c9b74603b31103c40ab1c35a"><code>1342781</code></a>
Bump actions/publish-action from 0.3.0 to 0.4.0 (<a
href="https://github.com/actions/setup-node/issues/1362">#1362</a>)</li>
<li><a
href="https://github.com/actions/setup-node/commit/89d709d423dc495668cd762a18dd4a070611be3f"><code>89d709d</code></a>
Bump prettier from 2.8.8 to 3.6.2 (<a
href="https://github.com/actions/setup-node/issues/1334">#1334</a>)</li>
<li><a
href="https://github.com/actions/setup-node/commit/cd2651c46231bc0d6f48d6b34433b845331235fe"><code>cd2651c</code></a>
Bump ts-jest from 29.1.2 to 29.4.1 (<a
href="https://github.com/actions/setup-node/issues/1336">#1336</a>)</li>
<li><a
href="https://github.com/actions/setup-node/commit/a0853c24544627f65ddf259abe73b1d18a591444"><code>a0853c2</code></a>
Bump actions/checkout from 4 to 5 (<a
href="https://github.com/actions/setup-node/issues/1345">#1345</a>)</li>
<li><a
href="https://github.com/actions/setup-node/commit/b7234cc9fe124f0f4932554b4e5284543083ae7b"><code>b7234cc</code></a>
Upgrade action to use node24 (<a
href="https://github.com/actions/setup-node/issues/1325">#1325</a>)</li>
<li><a
href="https://github.com/actions/setup-node/commit/d7a11313b581b306c961b506cfc8971208bb03f6"><code>d7a1131</code></a>
Enhance caching in setup-node with automatic package manager detection
(<a
href="https://github.com/actions/setup-node/issues/1348">#1348</a>)</li>
<li><a
href="https://github.com/actions/setup-node/commit/5e2628c959b9ade56971c0afcebbe5332d44b398"><code>5e2628c</code></a>
Bumps form-data (<a
href="https://github.com/actions/setup-node/issues/1332">#1332</a>)</li>
<li><a
href="https://github.com/actions/setup-node/commit/65beceff8e91358525397bdce9103d999507ab03"><code>65becef</code></a>
Bump undici from 5.28.5 to 5.29.0 (<a
href="https://github.com/actions/setup-node/issues/1295">#1295</a>)</li>
<li><a
href="https://github.com/actions/setup-node/commit/7e24a656e1c7a0d6f3eaef8d8e84ae379a5b035b"><code>7e24a65</code></a>
Bump uuid from 9.0.1 to 11.1.0 (<a
href="https://github.com/actions/setup-node/issues/1273">#1273</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/actions/setup-node/compare/v4...v6">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/setup-node&package-manager=github_actions&previous-version=4&new-version=6)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jan Peer Stöcklmair <jan.oster94@gmail.com>
---
 .github/workflows/auto-release.yml          |  2 +-
 .github/workflows/build.yml                 | 40 ++++++++++-----------
 .github/workflows/canary.yml                |  4 +--
 .github/workflows/clear-cache.yml           |  2 +-
 .github/workflows/external-contributors.yml |  2 +-
 .github/workflows/flaky-test-detector.yml   |  2 +-
 .github/workflows/release.yml               |  2 +-
 7 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/auto-release.yml b/.github/workflows/auto-release.yml
index 0507fe879c27..e1fdd98549ae 100644
--- a/.github/workflows/auto-release.yml
+++ b/.github/workflows/auto-release.yml
@@ -42,7 +42,7 @@ jobs:
           echo "version=$version" >> $GITHUB_OUTPUT
 
       - name: Set up Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version-file: 'package.json'
 
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 610dced85c1b..881b5f4b6580 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -142,7 +142,7 @@ jobs:
           ref: ${{ env.HEAD_COMMIT }}
 
       - name: Set up Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version-file: 'package.json'
 
@@ -242,7 +242,7 @@ jobs:
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version-file: 'package.json'
       - name: Restore caches
@@ -271,7 +271,7 @@ jobs:
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version-file: 'package.json'
       - name: Restore caches
@@ -300,7 +300,7 @@ jobs:
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version-file: 'package.json'
       - name: Restore caches
@@ -330,7 +330,7 @@ jobs:
           ref: ${{ env.HEAD_COMMIT }}
 
       - name: Set up Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version-file: 'package.json'
 
@@ -352,7 +352,7 @@ jobs:
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version-file: 'package.json'
       - name: Restore caches
@@ -374,7 +374,7 @@ jobs:
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version-file: 'package.json'
       - name: Restore caches
@@ -415,7 +415,7 @@ jobs:
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version-file: 'package.json'
       - name: Restore caches
@@ -456,7 +456,7 @@ jobs:
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version-file: 'package.json'
       - name: Set up Bun
@@ -481,7 +481,7 @@ jobs:
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version-file: 'package.json'
       - name: Set up Deno
@@ -518,7 +518,7 @@ jobs:
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: ${{ matrix.node }}
       - name: Restore caches
@@ -607,7 +607,7 @@ jobs:
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version-file: 'package.json'
       - name: Restore caches
@@ -671,7 +671,7 @@ jobs:
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version-file: 'package.json'
       - name: Restore caches
@@ -719,7 +719,7 @@ jobs:
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version-file: 'package.json'
       - name: Restore caches
@@ -757,7 +757,7 @@ jobs:
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: ${{ matrix.node }}
       - name: Restore caches
@@ -793,7 +793,7 @@ jobs:
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version-file: 'package.json'
       - name: Restore caches
@@ -821,7 +821,7 @@ jobs:
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: ${{ matrix.node }}
       - name: Restore caches
@@ -873,7 +873,7 @@ jobs:
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version-file: 'package.json'
       - name: Restore caches
@@ -941,7 +941,7 @@ jobs:
         with:
           version: 9.15.9
       - name: Set up Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version-file: 'dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}/package.json'
       - name: Set up Bun
@@ -1071,7 +1071,7 @@ jobs:
         with:
           version: 9.15.9
       - name: Set up Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version-file: 'dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}/package.json'
       - name: Restore caches
diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml
index 29814ffea09c..57290080c8de 100644
--- a/.github/workflows/canary.yml
+++ b/.github/workflows/canary.yml
@@ -35,7 +35,7 @@ jobs:
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version-file: 'package.json'
       - name: Check canary cache
@@ -125,7 +125,7 @@ jobs:
           version: 9.15.9
       - name: Set up Node
         if: matrix.test-application != 'angular-20'
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version-file: 'dev-packages/e2e-tests/test-applications/${{ matrix.test-application }}/package.json'
 
diff --git a/.github/workflows/clear-cache.yml b/.github/workflows/clear-cache.yml
index 97aeb53365e7..0f5f2241b34a 100644
--- a/.github/workflows/clear-cache.yml
+++ b/.github/workflows/clear-cache.yml
@@ -26,7 +26,7 @@ jobs:
       - uses: actions/checkout@v5
 
       - name: Set up Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version-file: 'package.json'
 
diff --git a/.github/workflows/external-contributors.yml b/.github/workflows/external-contributors.yml
index 1735a89a5446..c085f9958452 100644
--- a/.github/workflows/external-contributors.yml
+++ b/.github/workflows/external-contributors.yml
@@ -22,7 +22,7 @@ jobs:
     steps:
       - uses: actions/checkout@v5
       - name: Set up Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version-file: 'package.json'
 
diff --git a/.github/workflows/flaky-test-detector.yml b/.github/workflows/flaky-test-detector.yml
index 21a851fb43d6..a6ed22e04f6a 100644
--- a/.github/workflows/flaky-test-detector.yml
+++ b/.github/workflows/flaky-test-detector.yml
@@ -32,7 +32,7 @@ jobs:
       - name: Check out current branch
         uses: actions/checkout@v5
       - name: Set up Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version-file: 'package.json'
           cache: 'yarn'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 05c465036ce4..954e8d3e5e84 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -28,7 +28,7 @@ jobs:
           token: ${{ steps.token.outputs.token }}
           fetch-depth: 0
       - name: Set up Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version-file: 'package.json'
       - name: Prepare release

From d710314881a19a84ca76c78c18752ef2d08a1728 Mon Sep 17 00:00:00 2001
From: Charly Gomez <charly.gomez@sentry.io>
Date: Wed, 19 Nov 2025 14:01:22 +0100
Subject: [PATCH 095/186] test(nextjs): Remove debug logs from e2e test
 (#18250)

---
 .../test-applications/nextjs-15/instrumentation-client.ts      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dev-packages/e2e-tests/test-applications/nextjs-15/instrumentation-client.ts b/dev-packages/e2e-tests/test-applications/nextjs-15/instrumentation-client.ts
index 0737d2043169..4870c64e7959 100644
--- a/dev-packages/e2e-tests/test-applications/nextjs-15/instrumentation-client.ts
+++ b/dev-packages/e2e-tests/test-applications/nextjs-15/instrumentation-client.ts
@@ -2,11 +2,10 @@ import * as Sentry from '@sentry/nextjs';
 
 Sentry.init({
   environment: 'qa', // dynamic sampling bias to keep transactions
-  dsn: 'https://username@domain/123',
+  dsn: process.env.NEXT_PUBLIC_E2E_TEST_DSN,
   tunnel: `http://localhost:3031/`, // proxy server
   tracesSampleRate: 1.0,
   sendDefaultPii: true,
-  debug: true,
 });
 
 export const onRouterTransitionStart = Sentry.captureRouterTransitionStart;

From 1e5af715f4ebb42748ba75e47c3aaaf15f0678df Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Nov 2025 14:39:19 +0100
Subject: [PATCH 096/186] ci(deps): bump github/codeql-action from 3 to 4
 (#18076)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [github/codeql-action](https://github.com/github/codeql-action)
from 3 to 4.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/github/codeql-action/releases">github/codeql-action's
releases</a>.</em></p>
<blockquote>
<h2>v3.31.2</h2>
<h1>CodeQL Action Changelog</h1>
<p>See the <a
href="https://github.com/github/codeql-action/releases">releases
page</a> for the relevant changes to the CodeQL CLI and language
packs.</p>
<h2>3.31.2 - 30 Oct 2025</h2>
<p>No user facing changes.</p>
<p>See the full <a
href="https://github.com/github/codeql-action/blob/v3.31.2/CHANGELOG.md">CHANGELOG.md</a>
for more information.</p>
<h2>v3.31.1</h2>
<h1>CodeQL Action Changelog</h1>
<p>See the <a
href="https://github.com/github/codeql-action/releases">releases
page</a> for the relevant changes to the CodeQL CLI and language
packs.</p>
<h2>3.31.1 - 30 Oct 2025</h2>
<ul>
<li>The <code>add-snippets</code> input has been removed from the
<code>analyze</code> action. This input has been deprecated since CodeQL
Action 3.26.4 in August 2024 when this removal was announced.</li>
</ul>
<p>See the full <a
href="https://github.com/github/codeql-action/blob/v3.31.1/CHANGELOG.md">CHANGELOG.md</a>
for more information.</p>
<h2>v3.31.0</h2>
<h1>CodeQL Action Changelog</h1>
<p>See the <a
href="https://github.com/github/codeql-action/releases">releases
page</a> for the relevant changes to the CodeQL CLI and language
packs.</p>
<h2>3.31.0 - 24 Oct 2025</h2>
<ul>
<li>Bump minimum CodeQL bundle version to 2.17.6. <a
href="https://github.com/github/codeql-action/pull/3223">#3223</a></li>
<li>When SARIF files are uploaded by the <code>analyze</code> or
<code>upload-sarif</code> actions, the CodeQL Action automatically
performs post-processing steps to prepare the data for the upload.
Previously, these post-processing steps were only performed before an
upload took place. We are now changing this so that the post-processing
steps will always be performed, even when the SARIF files are not
uploaded. This does not change anything for the
<code>upload-sarif</code> action. For <code>analyze</code>, this may
affect Advanced Setup for CodeQL users who specify a value other than
<code>always</code> for the <code>upload</code> input. <a
href="https://github.com/github/codeql-action/pull/3222">#3222</a></li>
</ul>
<p>See the full <a
href="https://github.com/github/codeql-action/blob/v3.31.0/CHANGELOG.md">CHANGELOG.md</a>
for more information.</p>
<h2>v3.30.9</h2>
<h1>CodeQL Action Changelog</h1>
<p>See the <a
href="https://github.com/github/codeql-action/releases">releases
page</a> for the relevant changes to the CodeQL CLI and language
packs.</p>
<h2>3.30.9 - 17 Oct 2025</h2>
<ul>
<li>Update default CodeQL bundle version to 2.23.3. <a
href="https://github.com/github/codeql-action/pull/3205">#3205</a></li>
<li>Experimental: A new <code>setup-codeql</code> action has been added
which is similar to <code>init</code>, except it only installs the
CodeQL CLI and does not initialize a database. Do not use this in
production as it is part of an internal experiment and subject to change
at any time. <a
href="https://github.com/github/codeql-action/pull/3204">#3204</a></li>
</ul>
<p>See the full <a
href="https://github.com/github/codeql-action/blob/v3.30.9/CHANGELOG.md">CHANGELOG.md</a>
for more information.</p>
<h2>v3.30.8</h2>
<h1>CodeQL Action Changelog</h1>
<p>See the <a
href="https://github.com/github/codeql-action/releases">releases
page</a> for the relevant changes to the CodeQL CLI and language
packs.</p>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/github/codeql-action/blob/main/CHANGELOG.md">github/codeql-action's
changelog</a>.</em></p>
<blockquote>
<h2>4.31.2 - 30 Oct 2025</h2>
<p>No user facing changes.</p>
<h2>4.31.1 - 30 Oct 2025</h2>
<ul>
<li>The <code>add-snippets</code> input has been removed from the
<code>analyze</code> action. This input has been deprecated since CodeQL
Action 3.26.4 in August 2024 when this removal was announced.</li>
</ul>
<h2>4.31.0 - 24 Oct 2025</h2>
<ul>
<li>Bump minimum CodeQL bundle version to 2.17.6. <a
href="https://github.com/github/codeql-action/pull/3223">#3223</a></li>
<li>When SARIF files are uploaded by the <code>analyze</code> or
<code>upload-sarif</code> actions, the CodeQL Action automatically
performs post-processing steps to prepare the data for the upload.
Previously, these post-processing steps were only performed before an
upload took place. We are now changing this so that the post-processing
steps will always be performed, even when the SARIF files are not
uploaded. This does not change anything for the
<code>upload-sarif</code> action. For <code>analyze</code>, this may
affect Advanced Setup for CodeQL users who specify a value other than
<code>always</code> for the <code>upload</code> input. <a
href="https://github.com/github/codeql-action/pull/3222">#3222</a></li>
</ul>
<h2>4.30.9 - 17 Oct 2025</h2>
<ul>
<li>Update default CodeQL bundle version to 2.23.3. <a
href="https://github.com/github/codeql-action/pull/3205">#3205</a></li>
<li>Experimental: A new <code>setup-codeql</code> action has been added
which is similar to <code>init</code>, except it only installs the
CodeQL CLI and does not initialize a database. Do not use this in
production as it is part of an internal experiment and subject to change
at any time. <a
href="https://github.com/github/codeql-action/pull/3204">#3204</a></li>
</ul>
<h2>4.30.8 - 10 Oct 2025</h2>
<p>No user facing changes.</p>
<h2>4.30.7 - 06 Oct 2025</h2>
<ul>
<li>[v4+ only] The CodeQL Action now runs on Node.js v24. <a
href="https://github.com/github/codeql-action/pull/3169">#3169</a></li>
</ul>
<h2>3.30.6 - 02 Oct 2025</h2>
<ul>
<li>Update default CodeQL bundle version to 2.23.2. <a
href="https://github.com/github/codeql-action/pull/3168">#3168</a></li>
</ul>
<h2>3.30.5 - 26 Sep 2025</h2>
<ul>
<li>We fixed a bug that was introduced in <code>3.30.4</code> with
<code>upload-sarif</code> which resulted in files without a
<code>.sarif</code> extension not getting uploaded. <a
href="https://github.com/github/codeql-action/pull/3160">#3160</a></li>
</ul>
<h2>3.30.4 - 25 Sep 2025</h2>
<ul>
<li>We have improved the CodeQL Action's ability to validate that the
workflow it is used in does not use different versions of the CodeQL
Action for different workflow steps. Mixing different versions of the
CodeQL Action in the same workflow is unsupported and can lead to
unpredictable results. A warning will now be emitted from the
<code>codeql-action/init</code> step if different versions of the CodeQL
Action are detected in the workflow file. Additionally, an error will
now be thrown by the other CodeQL Action steps if they load a
configuration file that was generated by a different version of the
<code>codeql-action/init</code> step. <a
href="https://github.com/github/codeql-action/pull/3099">#3099</a>
and <a
href="https://github.com/github/codeql-action/pull/3100">#3100</a></li>
<li>We added support for reducing the size of dependency caches for Java
analyses, which will reduce cache usage and speed up workflows. This
will be enabled automatically at a later time. <a
href="https://github.com/github/codeql-action/pull/3107">#3107</a></li>
<li>You can now run the latest CodeQL nightly bundle by passing
<code>tools: nightly</code> to the <code>init</code> action. In general,
the nightly bundle is unstable and we only recommend running it when
directed by GitHub staff. <a
href="https://github.com/github/codeql-action/pull/3130">#3130</a></li>
<li>Update default CodeQL bundle version to 2.23.1. <a
href="https://github.com/github/codeql-action/pull/3118">#3118</a></li>
</ul>
<h2>3.30.3 - 10 Sep 2025</h2>
<p>No user facing changes.</p>
<h2>3.30.2 - 09 Sep 2025</h2>
<ul>
<li>Fixed a bug which could cause language autodetection to fail. <a
href="https://github.com/github/codeql-action/pull/3084">#3084</a></li>
<li>Experimental: The <code>quality-queries</code> input that was added
in <code>3.29.2</code> as part of an internal experiment is now
deprecated and will be removed in an upcoming version of the CodeQL
Action. It has been superseded by a new <code>analysis-kinds</code>
input, which is part of the same internal experiment. Do not use this in
production as it is subject to change at any time. <a
href="https://github.com/github/codeql-action/pull/3064">#3064</a></li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/github/codeql-action/commit/74c8748a6f2dada2c01b25ae170d7858ac90f4af"><code>74c8748</code></a>
Update analyze/action.yml</li>
<li><a
href="https://github.com/github/codeql-action/commit/34c50c1d299d8a59b64a9dc6faf04dc0d9c33152"><code>34c50c1</code></a>
Merge pull request <a
href="https://github.com/github/codeql-action/issues/3251">#3251</a>
from github/mbg/user-error/enablement</li>
<li><a
href="https://github.com/github/codeql-action/commit/4ae68afd845398aa4e0bd7fccf3a37d121b3ec88"><code>4ae68af</code></a>
Warn if the <code>add-snippets</code> input is used</li>
<li><a
href="https://github.com/github/codeql-action/commit/52a7bd7b6e714abd930eb15cde3c7c76c45d6c0f"><code>52a7bd7</code></a>
Check for 403 status</li>
<li><a
href="https://github.com/github/codeql-action/commit/194ba0ee2dcf02e70ff941763c144ea06f58c485"><code>194ba0e</code></a>
Make error message tests less brittle</li>
<li><a
href="https://github.com/github/codeql-action/commit/53acf0b8aa0a8705134bb6153d859bc2817e1740"><code>53acf0b</code></a>
Turn enablement errors into configuration errors</li>
<li><a
href="https://github.com/github/codeql-action/commit/ac9aeee2261a2f9c74439210107de7657bd5ed42"><code>ac9aeee</code></a>
Merge pull request <a
href="https://github.com/github/codeql-action/issues/3249">#3249</a>
from github/henrymercer/api-logging</li>
<li><a
href="https://github.com/github/codeql-action/commit/d49e837b8cf6e8fd2c77703cc5189cfa79547ec0"><code>d49e837</code></a>
Merge branch 'main' into henrymercer/api-logging</li>
<li><a
href="https://github.com/github/codeql-action/commit/3d988b275a8c578caa755c4aaccd900332aefe93"><code>3d988b2</code></a>
Pass minimal copy of <code>core</code></li>
<li><a
href="https://github.com/github/codeql-action/commit/8cc18acfa4e60a22b3ed992afffc562f93c17030"><code>8cc18ac</code></a>
Merge pull request <a
href="https://github.com/github/codeql-action/issues/3250">#3250</a>
from github/henrymercer/prefer-fs-delete</li>
<li>Additional commits viewable in <a
href="https://github.com/github/codeql-action/compare/v3...v4">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github/codeql-action&package-manager=github_actions&previous-version=3&new-version=4)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jan Peer Stöcklmair <jan.oster94@gmail.com>
---
 .github/workflows/codeql-analysis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 8c042c5aa44f..6d6b67201d5e 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -50,7 +50,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@v4
         with:
           config-file: ./.github/codeql/codeql-config.yml
           queries: security-extended
@@ -63,7 +63,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v3
+        uses: github/codeql-action/autobuild@v4
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
@@ -77,4 +77,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v4

From 902a06e75a034c4aca6d4228d897d0f31d4d3f9e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Nov 2025 14:43:18 +0100
Subject: [PATCH 097/186] ci(deps): Bump actions/create-github-app-token from
 2.1.1 to 2.1.4 (#17825)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps
[actions/create-github-app-token](https://github.com/actions/create-github-app-token)
from 2.1.1 to 2.1.4.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/actions/create-github-app-token/releases">actions/create-github-app-token's
releases</a>.</em></p>
<blockquote>
<h2>v2.1.4</h2>
<h2><a
href="https://github.com/actions/create-github-app-token/compare/v2.1.3...v2.1.4">2.1.4</a>
(2025-09-13)</h2>
<h3>Bug Fixes</h3>
<ul>
<li><strong>deps:</strong> bump <code>@​octokit/auth-app</code> from
7.2.1 to 8.0.1 (<a
href="https://github.com/actions/create-github-app-token/issues/257">#257</a>)
(<a
href="https://github.com/actions/create-github-app-token/commit/bef1eaf1c0ac2b148ee2a0a74c65fbe6db0631f1">bef1eaf</a>)</li>
</ul>
<h2>v2.1.3</h2>
<h2><a
href="https://github.com/actions/create-github-app-token/compare/v2.1.2...v2.1.3">2.1.3</a>
(2025-09-13)</h2>
<h3>Bug Fixes</h3>
<ul>
<li><strong>deps:</strong> bump undici from 7.8.0 to 7.10.0 in the
production-dependencies group (<a
href="https://github.com/actions/create-github-app-token/issues/254">#254</a>)
(<a
href="https://github.com/actions/create-github-app-token/commit/f3d5ec20739b0cf6f0d52e5a051b65484c378ec9">f3d5ec2</a>)</li>
</ul>
<h2>v2.1.2</h2>
<h2><a
href="https://github.com/actions/create-github-app-token/compare/v2.1.1...v2.1.2">2.1.2</a>
(2025-09-12)</h2>
<h3>Bug Fixes</h3>
<ul>
<li><strong>deps:</strong> bump <code>@​octokit/request</code> from
9.2.3 to 10.0.2 (<a
href="https://github.com/actions/create-github-app-token/issues/256">#256</a>)
(<a
href="https://github.com/actions/create-github-app-token/commit/5d7307be63501c0070c634b0ae8fec74e8208130">5d7307b</a>)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/actions/create-github-app-token/commit/67018539274d69449ef7c02e8e71183d1719ab42"><code>6701853</code></a>
build(release): 2.1.4 [skip ci]</li>
<li><a
href="https://github.com/actions/create-github-app-token/commit/bef1eaf1c0ac2b148ee2a0a74c65fbe6db0631f1"><code>bef1eaf</code></a>
fix(deps): bump <code>@​octokit/auth-app</code> from 7.2.1 to 8.0.1 (<a
href="https://github.com/actions/create-github-app-token/issues/257">#257</a>)</li>
<li><a
href="https://github.com/actions/create-github-app-token/commit/1526738aa46502312d4f6ba7779d432c61dc4e36"><code>1526738</code></a>
build(release): 2.1.3 [skip ci]</li>
<li><a
href="https://github.com/actions/create-github-app-token/commit/f3d5ec20739b0cf6f0d52e5a051b65484c378ec9"><code>f3d5ec2</code></a>
fix(deps): bump undici from 7.8.0 to 7.10.0 in the
production-dependencies gr...</li>
<li><a
href="https://github.com/actions/create-github-app-token/commit/def152b8a737443d7af6c5722c6389146fe90c90"><code>def152b</code></a>
build(release): 2.1.2 [skip ci]</li>
<li><a
href="https://github.com/actions/create-github-app-token/commit/5d7307be63501c0070c634b0ae8fec74e8208130"><code>5d7307b</code></a>
fix(deps): bump <code>@​octokit/request</code> from 9.2.3 to 10.0.2 (<a
href="https://github.com/actions/create-github-app-token/issues/256">#256</a>)</li>
<li><a
href="https://github.com/actions/create-github-app-token/commit/525760a53ff3ae31661275c3461bff7181a54c90"><code>525760a</code></a>
build(deps): bump stefanzweifel/git-auto-commit-action from 5.2.0 to
6.0.1 (#...</li>
<li><a
href="https://github.com/actions/create-github-app-token/commit/8ab05a8a84060745bdc8f0b4f6d8f403c29e06b8"><code>8ab05a8</code></a>
Add beta branch support for releases (<a
href="https://github.com/actions/create-github-app-token/issues/282">#282</a>)</li>
<li><a
href="https://github.com/actions/create-github-app-token/commit/d00315e88cbf932b0754df7a395f556a41b682e4"><code>d00315e</code></a>
build(deps): bump actions/checkout from 4 to 5 (<a
href="https://github.com/actions/create-github-app-token/issues/279">#279</a>)</li>
<li><a
href="https://github.com/actions/create-github-app-token/commit/fcc6c288e5046f2c3614766b9abb3c41fc5b56c6"><code>fcc6c28</code></a>
build(deps-dev): bump dotenv from 16.5.0 to 17.2.1 (<a
href="https://github.com/actions/create-github-app-token/issues/269">#269</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/actions/create-github-app-token/compare/a8d616148505b5069dccd32f177bb87d7f39123b...67018539274d69449ef7c02e8e71183d1719ab42">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/create-github-app-token&package-manager=github_actions&previous-version=2.1.1&new-version=2.1.4)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

You can trigger a rebase of this PR by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

<!-- CURSOR_SUMMARY -->
---

> [!NOTE]
> Update actions/create-github-app-token from 2.1.1 to 2.1.4 in
auto-release and release workflows.
>
> - **CI Workflows**:
> - Bump `actions/create-github-app-token` to `v2.1.4` in
`.github/workflows/auto-release.yml` and
`.github/workflows/release.yml`.
>
> <sup>Written by [Cursor
Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit
e8434a819664875d674d4bc8759b315ce79d32a8. This will update automatically
on new commits. Configure
[here](https://cursor.com/dashboard?tab=bugbot).</sup>
<!-- /CURSOR_SUMMARY -->

> **Note**
> Automatic rebases have been disabled on this pull request as it has
been open for over 30 days.

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jan Peer Stöcklmair <jan.oster94@gmail.com>
---
 .github/workflows/auto-release.yml | 2 +-
 .github/workflows/release.yml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/auto-release.yml b/.github/workflows/auto-release.yml
index e1fdd98549ae..cfaf6db8abef 100644
--- a/.github/workflows/auto-release.yml
+++ b/.github/workflows/auto-release.yml
@@ -15,7 +15,7 @@ jobs:
     steps:
       - name: Get auth token
         id: token
-        uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
+        uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
         with:
           app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
           private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 954e8d3e5e84..a2cb3fcd9600 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -19,7 +19,7 @@ jobs:
     steps:
       - name: Get auth token
         id: token
-        uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v2.1.1
+        uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
         with:
           app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
           private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}

From 013f0bec0f686bcaeb5d2be45313efea8044123a Mon Sep 17 00:00:00 2001
From: Francesco Gringl-Novy <francesco.novy@sentry.io>
Date: Wed, 19 Nov 2025 15:07:11 +0100
Subject: [PATCH 098/186] chore(dev-deps): Update some dev dependencies
 (#17816)

Just bumping some transitive dev deps to fix security warnings.
---
 .github/dependency-review-config.yml  |   2 +
 packages/react/package.json           |   2 -
 packages/replay-internal/package.json |   3 +-
 yarn.lock                             | 734 +++++++++++++-------------
 4 files changed, 377 insertions(+), 364 deletions(-)

diff --git a/.github/dependency-review-config.yml b/.github/dependency-review-config.yml
index 1a8f76e430d1..8608d2381ace 100644
--- a/.github/dependency-review-config.yml
+++ b/.github/dependency-review-config.yml
@@ -9,3 +9,5 @@ allow-ghsas:
   - GHSA-v784-fjjh-f8r4
   # Next.js Cache poisoning - We require a vulnerable version for E2E testing
   - GHSA-gp8f-8m3g-qvj9
+  # devalue vulnerability - this is just used by nuxt & astro as transitive dependency
+  - GHSA-vj54-72f3-p5jv
diff --git a/packages/react/package.json b/packages/react/package.json
index c51a7e2d3ee8..afd5f5f25bdd 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -52,7 +52,6 @@
     "@types/history-4": "npm:@types/history@4.7.8",
     "@types/history-5": "npm:@types/history@4.7.8",
     "@types/hoist-non-react-statics": "^3.3.5",
-    "@types/node-fetch": "^2.6.11",
     "@types/react": "17.0.3",
     "@types/react-router-4": "npm:@types/react-router@4.0.25",
     "@types/react-router-5": "npm:@types/react-router@5.1.20",
@@ -60,7 +59,6 @@
     "eslint-plugin-react-hooks": "^4.0.8",
     "history-4": "npm:history@4.6.0",
     "history-5": "npm:history@4.9.0",
-    "node-fetch": "^2.6.7",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-router-3": "npm:react-router@3.2.0",
diff --git a/packages/replay-internal/package.json b/packages/replay-internal/package.json
index af121d6a74c0..f1678cea2a15 100644
--- a/packages/replay-internal/package.json
+++ b/packages/replay-internal/package.json
@@ -86,8 +86,7 @@
     "@sentry-internal/rrweb-snapshot": "2.40.0",
     "fflate": "0.8.2",
     "jest-matcher-utils": "^29.0.0",
-    "jsdom-worker": "^0.3.0",
-    "node-fetch": "^2.6.7"
+    "jsdom-worker": "^0.3.0"
   },
   "dependencies": {
     "@sentry-internal/browser-utils": "10.26.0",
diff --git a/yarn.lock b/yarn.lock
index 082e1a032283..c93b8a45e748 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3012,6 +3012,11 @@
   dependencies:
     tslib "^2.4.0"
 
+"@esbuild/aix-ppc64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz#d1bc06aedb6936b3b6d313bf809a5a40387d2b7f"
+  integrity sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==
+
 "@esbuild/aix-ppc64@0.20.0":
   version "0.20.0"
   resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.20.0.tgz#509621cca4e67caf0d18561a0c56f8b70237472f"
@@ -3032,6 +3037,11 @@
   resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.23.1.tgz#51299374de171dbd80bb7d838e1cfce9af36f353"
   integrity sha512-6VhYk1diRqrhBAqpJEdjASR/+WVRtfjpqKuNw11cLiaWpAT/Uu+nokB+UJnevzy/P9C/ty6AOe0dwueMrGh/iQ==
 
+"@esbuild/aix-ppc64@0.25.10":
+  version "0.25.10"
+  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.25.10.tgz#ee6b7163a13528e099ecf562b972f2bcebe0aa97"
+  integrity sha512-0NFWnA+7l41irNuaSVlLfgNT12caWJVLzp5eAVhZ0z1qpxbockccEt3s+149rE64VUI3Ml2zt8Nv5JVc4QXTsw==
+
 "@esbuild/aix-ppc64@0.25.4":
   version "0.25.4"
   resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.25.4.tgz#830d6476cbbca0c005136af07303646b419f1162"
@@ -3042,20 +3052,15 @@
   resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.25.5.tgz#4e0f91776c2b340e75558f60552195f6fad09f18"
   integrity sha512-9o3TMmpmftaCMepOdA5k/yDw8SfInyzWWTjYTFCX3kPSDJMROQTb8jg+h9Cnwnmm1vOzvxN7gIfB5V2ewpjtGA==
 
-"@esbuild/aix-ppc64@0.25.6":
-  version "0.25.6"
-  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.25.6.tgz#164b19122e2ed54f85469df9dea98ddb01d5e79e"
-  integrity sha512-ShbM/3XxwuxjFiuVBHA+d3j5dyac0aEVVq1oluIDf71hUw0aRF59dV/efUsIwFnR6m8JNM2FjZOzmaZ8yG61kw==
-
 "@esbuild/android-arm64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz#984b4f9c8d0377443cc2dfcef266d02244593622"
   integrity sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==
 
-"@esbuild/android-arm64@0.19.4":
-  version "0.19.4"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.19.4.tgz#74752a09301b8c6b9a415fbda9fb71406a62a7b7"
-  integrity sha512-mRsi2vJsk4Bx/AFsNBqOH2fqedxn5L/moT58xgg51DjX1la64Z3Npicut2VbhvDFO26qjWtPMsVxCd80YTFVeg==
+"@esbuild/android-arm64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz#7ad65a36cfdb7e0d429c353e00f680d737c2aed4"
+  integrity sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==
 
 "@esbuild/android-arm64@0.20.0":
   version "0.20.0"
@@ -3077,6 +3082,11 @@
   resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.23.1.tgz#58565291a1fe548638adb9c584237449e5e14018"
   integrity sha512-xw50ipykXcLstLeWH7WRdQuysJqejuAGPd30vd1i5zSyKK3WE+ijzHmLKxdiCMtH1pHz78rOg0BKSYOSB/2Khw==
 
+"@esbuild/android-arm64@0.25.10":
+  version "0.25.10"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.25.10.tgz#115fc76631e82dd06811bfaf2db0d4979c16e2cb"
+  integrity sha512-LSQa7eDahypv/VO6WKohZGPSJDq5OVOo3UoFR1E4t4Gj1W7zEQMUhI+lo81H+DtB+kP+tDgBp+M4oNCwp6kffg==
+
 "@esbuild/android-arm64@0.25.4":
   version "0.25.4"
   resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.25.4.tgz#d11d4fc299224e729e2190cacadbcc00e7a9fd67"
@@ -3087,11 +3097,6 @@
   resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.25.5.tgz#bc766407f1718923f6b8079c8c61bf86ac3a6a4f"
   integrity sha512-VGzGhj4lJO+TVGV1v8ntCZWJktV7SGCs3Pn1GRWI1SBFtRALoomm8k5E9Pmwg3HOAal2VDc2F9+PM/rEY6oIDg==
 
-"@esbuild/android-arm64@0.25.6":
-  version "0.25.6"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.25.6.tgz#8f539e7def848f764f6432598e51cc3820fde3a5"
-  integrity sha512-hd5zdUarsK6strW+3Wxi5qWws+rJhCCbMiC9QZyzoxfk5uHRIE8T287giQxzVpEvCwuJ9Qjg6bEjcRJcgfLqoA==
-
 "@esbuild/android-arm@0.15.18":
   version "0.15.18"
   resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.15.18.tgz#266d40b8fdcf87962df8af05b76219bc786b4f80"
@@ -3102,10 +3107,10 @@
   resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.18.20.tgz#fedb265bc3a589c84cc11f810804f234947c3682"
   integrity sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==
 
-"@esbuild/android-arm@0.19.4":
-  version "0.19.4"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.19.4.tgz#c27363e1e280e577d9b5c8fa7c7a3be2a8d79bf5"
-  integrity sha512-uBIbiYMeSsy2U0XQoOGVVcpIktjLMEKa7ryz2RLr7L/vTnANNEsPVAh4xOv7ondGz6ac1zVb0F8Jx20rQikffQ==
+"@esbuild/android-arm@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.19.12.tgz#b0c26536f37776162ca8bde25e42040c203f2824"
+  integrity sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==
 
 "@esbuild/android-arm@0.20.0":
   version "0.20.0"
@@ -3127,6 +3132,11 @@
   resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.23.1.tgz#5eb8c652d4c82a2421e3395b808e6d9c42c862ee"
   integrity sha512-uz6/tEy2IFm9RYOyvKl88zdzZfwEfKZmnX9Cj1BHjeSGNuGLuMD1kR8y5bteYmwqKm1tj8m4cb/aKEorr6fHWQ==
 
+"@esbuild/android-arm@0.25.10":
+  version "0.25.10"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.25.10.tgz#8d5811912da77f615398611e5bbc1333fe321aa9"
+  integrity sha512-dQAxF1dW1C3zpeCDc5KqIYuZ1tgAdRXNoZP7vkBIRtKZPYe2xVr/d3SkirklCHudW1B45tGiUlz2pUWDfbDD4w==
+
 "@esbuild/android-arm@0.25.4":
   version "0.25.4"
   resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.25.4.tgz#5660bd25080553dd2a28438f2a401a29959bd9b1"
@@ -3137,20 +3147,15 @@
   resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.25.5.tgz#4290d6d3407bae3883ad2cded1081a234473ce26"
   integrity sha512-AdJKSPeEHgi7/ZhuIPtcQKr5RQdo6OO2IL87JkianiMYMPbCtot9fxPbrMiBADOWWm3T2si9stAiVsGbTQFkbA==
 
-"@esbuild/android-arm@0.25.6":
-  version "0.25.6"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.25.6.tgz#4ceb0f40113e9861169be83e2a670c260dd234ff"
-  integrity sha512-S8ToEOVfg++AU/bHwdksHNnyLyVM+eMVAOf6yRKFitnwnbwwPNqKr3srzFRe7nzV69RQKb5DgchIX5pt3L53xg==
-
 "@esbuild/android-x64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.18.20.tgz#35cf419c4cfc8babe8893d296cd990e9e9f756f2"
   integrity sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==
 
-"@esbuild/android-x64@0.19.4":
-  version "0.19.4"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.19.4.tgz#6c9ee03d1488973d928618100048b75b147e0426"
-  integrity sha512-4iPufZ1TMOD3oBlGFqHXBpa3KFT46aLl6Vy7gwed0ZSYgHaZ/mihbYb4t7Z9etjkC9Al3ZYIoOaHrU60gcMy7g==
+"@esbuild/android-x64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.19.12.tgz#cb13e2211282012194d89bf3bfe7721273473b3d"
+  integrity sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==
 
 "@esbuild/android-x64@0.20.0":
   version "0.20.0"
@@ -3172,6 +3177,11 @@
   resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.23.1.tgz#ae19d665d2f06f0f48a6ac9a224b3f672e65d517"
   integrity sha512-nlN9B69St9BwUoB+jkyU090bru8L0NA3yFvAd7k8dNsVH8bi9a8cUAUSEcEEgTp2z3dbEDGJGfP6VUnkQnlReg==
 
+"@esbuild/android-x64@0.25.10":
+  version "0.25.10"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.25.10.tgz#e3e96516b2d50d74105bb92594c473e30ddc16b1"
+  integrity sha512-MiC9CWdPrfhibcXwr39p9ha1x0lZJ9KaVfvzA0Wxwz9ETX4v5CHfF09bx935nHlhi+MxhA63dKRRQLiVgSUtEg==
+
 "@esbuild/android-x64@0.25.4":
   version "0.25.4"
   resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.25.4.tgz#18ddde705bf984e8cd9efec54e199ac18bc7bee1"
@@ -3182,20 +3192,15 @@
   resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.25.5.tgz#40c11d9cbca4f2406548c8a9895d321bc3b35eff"
   integrity sha512-D2GyJT1kjvO//drbRT3Hib9XPwQeWd9vZoBJn+bu/lVsOZ13cqNdDeqIF/xQ5/VmWvMduP6AmXvylO/PIc2isw==
 
-"@esbuild/android-x64@0.25.6":
-  version "0.25.6"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.25.6.tgz#ad4f280057622c25fe985c08999443a195dc63a8"
-  integrity sha512-0Z7KpHSr3VBIO9A/1wcT3NTy7EB4oNC4upJ5ye3R7taCc2GUdeynSLArnon5G8scPwaU866d3H4BCrE5xLW25A==
-
 "@esbuild/darwin-arm64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz#08172cbeccf95fbc383399a7f39cfbddaeb0d7c1"
   integrity sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==
 
-"@esbuild/darwin-arm64@0.19.4":
-  version "0.19.4"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.19.4.tgz#64e2ee945e5932cd49812caa80e8896e937e2f8b"
-  integrity sha512-Lviw8EzxsVQKpbS+rSt6/6zjn9ashUZ7Tbuvc2YENgRl0yZTktGlachZ9KMJUsVjZEGFVu336kl5lBgDN6PmpA==
+"@esbuild/darwin-arm64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz#cbee41e988020d4b516e9d9e44dd29200996275e"
+  integrity sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==
 
 "@esbuild/darwin-arm64@0.20.0":
   version "0.20.0"
@@ -3217,6 +3222,11 @@
   resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.23.1.tgz#05b17f91a87e557b468a9c75e9d85ab10c121b16"
   integrity sha512-YsS2e3Wtgnw7Wq53XXBLcV6JhRsEq8hkfg91ESVadIrzr9wO6jJDMZnCQbHm1Guc5t/CdDiFSSfWP58FNuvT3Q==
 
+"@esbuild/darwin-arm64@0.25.10":
+  version "0.25.10"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.25.10.tgz#6af6bb1d05887dac515de1b162b59dc71212ed76"
+  integrity sha512-JC74bdXcQEpW9KkV326WpZZjLguSZ3DfS8wrrvPMHgQOIEIG/sPXEN/V8IssoJhbefLRcRqw6RQH2NnpdprtMA==
+
 "@esbuild/darwin-arm64@0.25.4":
   version "0.25.4"
   resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.25.4.tgz#b0b7fb55db8fc6f5de5a0207ae986eb9c4766e67"
@@ -3227,20 +3237,15 @@
   resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.25.5.tgz#49d8bf8b1df95f759ac81eb1d0736018006d7e34"
   integrity sha512-GtaBgammVvdF7aPIgH2jxMDdivezgFu6iKpmT+48+F8Hhg5J/sfnDieg0aeG/jfSvkYQU2/pceFPDKlqZzwnfQ==
 
-"@esbuild/darwin-arm64@0.25.6":
-  version "0.25.6"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.25.6.tgz#d1f04027396b3d6afc96bacd0d13167dfd9f01f7"
-  integrity sha512-FFCssz3XBavjxcFxKsGy2DYK5VSvJqa6y5HXljKzhRZ87LvEi13brPrf/wdyl/BbpbMKJNOr1Sd0jtW4Ge1pAA==
-
 "@esbuild/darwin-x64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz#d70d5790d8bf475556b67d0f8b7c5bdff053d85d"
   integrity sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==
 
-"@esbuild/darwin-x64@0.19.4":
-  version "0.19.4"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.19.4.tgz#d8e26e1b965df284692e4d1263ba69a49b39ac7a"
-  integrity sha512-YHbSFlLgDwglFn0lAO3Zsdrife9jcQXQhgRp77YiTDja23FrC2uwnhXMNkAucthsf+Psr7sTwYEryxz6FPAVqw==
+"@esbuild/darwin-x64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz#e37d9633246d52aecf491ee916ece709f9d5f4cd"
+  integrity sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==
 
 "@esbuild/darwin-x64@0.20.0":
   version "0.20.0"
@@ -3262,6 +3267,11 @@
   resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.23.1.tgz#c58353b982f4e04f0d022284b8ba2733f5ff0931"
   integrity sha512-aClqdgTDVPSEGgoCS8QDG37Gu8yc9lTHNAQlsztQ6ENetKEO//b8y31MMu2ZaPbn4kVsIABzVLXYLhCGekGDqw==
 
+"@esbuild/darwin-x64@0.25.10":
+  version "0.25.10"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.25.10.tgz#99ae82347fbd336fc2d28ffd4f05694e6e5b723d"
+  integrity sha512-tguWg1olF6DGqzws97pKZ8G2L7Ig1vjDmGTwcTuYHbuU6TTjJe5FXbgs5C1BBzHbJ2bo1m3WkQDbWO2PvamRcg==
+
 "@esbuild/darwin-x64@0.25.4":
   version "0.25.4"
   resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.25.4.tgz#e6813fdeba0bba356cb350a4b80543fbe66bf26f"
@@ -3272,20 +3282,15 @@
   resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.25.5.tgz#e27a5d92a14886ef1d492fd50fc61a2d4d87e418"
   integrity sha512-1iT4FVL0dJ76/q1wd7XDsXrSW+oLoquptvh4CLR4kITDtqi2e/xwXwdCVH8hVHU43wgJdsq7Gxuzcs6Iq/7bxQ==
 
-"@esbuild/darwin-x64@0.25.6":
-  version "0.25.6"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.25.6.tgz#2b4a6cedb799f635758d7832d75b23772c8ef68f"
-  integrity sha512-GfXs5kry/TkGM2vKqK2oyiLFygJRqKVhawu3+DOCk7OxLy/6jYkWXhlHwOoTb0WqGnWGAS7sooxbZowy+pK9Yg==
-
 "@esbuild/freebsd-arm64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz#98755cd12707f93f210e2494d6a4b51b96977f54"
   integrity sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==
 
-"@esbuild/freebsd-arm64@0.19.4":
-  version "0.19.4"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.4.tgz#29751a41b242e0a456d89713b228f1da4f45582f"
-  integrity sha512-vz59ijyrTG22Hshaj620e5yhs2dU1WJy723ofc+KUgxVCM6zxQESmWdMuVmUzxtGqtj5heHyB44PjV/HKsEmuQ==
+"@esbuild/freebsd-arm64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz#1ee4d8b682ed363b08af74d1ea2b2b4dbba76487"
+  integrity sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==
 
 "@esbuild/freebsd-arm64@0.20.0":
   version "0.20.0"
@@ -3307,6 +3312,11 @@
   resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.23.1.tgz#f9220dc65f80f03635e1ef96cfad5da1f446f3bc"
   integrity sha512-h1k6yS8/pN/NHlMl5+v4XPfikhJulk4G+tKGFIOwURBSFzE8bixw1ebjluLOjfwtLqY0kewfjLSrO6tN2MgIhA==
 
+"@esbuild/freebsd-arm64@0.25.10":
+  version "0.25.10"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.10.tgz#0c6d5558a6322b0bdb17f7025c19bd7d2359437d"
+  integrity sha512-3ZioSQSg1HT2N05YxeJWYR+Libe3bREVSdWhEEgExWaDtyFbbXWb49QgPvFH8u03vUPX10JhJPcz7s9t9+boWg==
+
 "@esbuild/freebsd-arm64@0.25.4":
   version "0.25.4"
   resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.4.tgz#dc11a73d3ccdc308567b908b43c6698e850759be"
@@ -3317,20 +3327,15 @@
   resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.5.tgz#97cede59d638840ca104e605cdb9f1b118ba0b1c"
   integrity sha512-nk4tGP3JThz4La38Uy/gzyXtpkPW8zSAmoUhK9xKKXdBCzKODMc2adkB2+8om9BDYugz+uGV7sLmpTYzvmz6Sw==
 
-"@esbuild/freebsd-arm64@0.25.6":
-  version "0.25.6"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.6.tgz#a26266cc97dd78dc3c3f3d6788b1b83697b1055d"
-  integrity sha512-aoLF2c3OvDn2XDTRvn8hN6DRzVVpDlj2B/F66clWd/FHLiHaG3aVZjxQX2DYphA5y/evbdGvC6Us13tvyt4pWg==
-
 "@esbuild/freebsd-x64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz#c1eb2bff03915f87c29cece4c1a7fa1f423b066e"
   integrity sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==
 
-"@esbuild/freebsd-x64@0.19.4":
-  version "0.19.4"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.19.4.tgz#873edc0f73e83a82432460ea59bf568c1e90b268"
-  integrity sha512-3sRbQ6W5kAiVQRBWREGJNd1YE7OgzS0AmOGjDmX/qZZecq8NFlQsQH0IfXjjmD0XtUYqr64e0EKNFjMUlPL3Cw==
+"@esbuild/freebsd-x64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz#37a693553d42ff77cd7126764b535fb6cc28a11c"
+  integrity sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==
 
 "@esbuild/freebsd-x64@0.20.0":
   version "0.20.0"
@@ -3352,6 +3357,11 @@
   resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.23.1.tgz#69bd8511fa013b59f0226d1609ac43f7ce489730"
   integrity sha512-lK1eJeyk1ZX8UklqFd/3A60UuZ/6UVfGT2LuGo3Wp4/z7eRTRYY+0xOu2kpClP+vMTi9wKOfXi2vjUpO1Ro76g==
 
+"@esbuild/freebsd-x64@0.25.10":
+  version "0.25.10"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.25.10.tgz#8c35873fab8c0857a75300a3dcce4324ca0b9844"
+  integrity sha512-LLgJfHJk014Aa4anGDbh8bmI5Lk+QidDmGzuC2D+vP7mv/GeSN+H39zOf7pN5N8p059FcOfs2bVlrRr4SK9WxA==
+
 "@esbuild/freebsd-x64@0.25.4":
   version "0.25.4"
   resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.25.4.tgz#91da08db8bd1bff5f31924c57a81dab26e93a143"
@@ -3362,20 +3372,15 @@
   resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.25.5.tgz#71c77812042a1a8190c3d581e140d15b876b9c6f"
   integrity sha512-PrikaNjiXdR2laW6OIjlbeuCPrPaAl0IwPIaRv+SMV8CiM8i2LqVUHFC1+8eORgWyY7yhQY+2U2fA55mBzReaw==
 
-"@esbuild/freebsd-x64@0.25.6":
-  version "0.25.6"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.25.6.tgz#9feb8e826735c568ebfd94859b22a3fbb6a9bdd2"
-  integrity sha512-2SkqTjTSo2dYi/jzFbU9Plt1vk0+nNg8YC8rOXXea+iA3hfNJWebKYPs3xnOUf9+ZWhKAaxnQNUf2X9LOpeiMQ==
-
 "@esbuild/linux-arm64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz#bad4238bd8f4fc25b5a021280c770ab5fc3a02a0"
   integrity sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==
 
-"@esbuild/linux-arm64@0.19.4":
-  version "0.19.4"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.19.4.tgz#659f2fa988d448dbf5010b5cc583be757cc1b914"
-  integrity sha512-ZWmWORaPbsPwmyu7eIEATFlaqm0QGt+joRE9sKcnVUG3oBbr/KYdNE2TnkzdQwX6EDRdg/x8Q4EZQTXoClUqqA==
+"@esbuild/linux-arm64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz#be9b145985ec6c57470e0e051d887b09dddb2d4b"
+  integrity sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==
 
 "@esbuild/linux-arm64@0.20.0":
   version "0.20.0"
@@ -3397,6 +3402,11 @@
   resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.23.1.tgz#8050af6d51ddb388c75653ef9871f5ccd8f12383"
   integrity sha512-/93bf2yxencYDnItMYV/v116zff6UyTjo4EtEQjUBeGiVpMmffDNUyD9UN2zV+V3LRV3/on4xdZ26NKzn6754g==
 
+"@esbuild/linux-arm64@0.25.10":
+  version "0.25.10"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.25.10.tgz#3edc2f87b889a15b4cedaf65f498c2bed7b16b90"
+  integrity sha512-5luJWN6YKBsawd5f9i4+c+geYiVEw20FVW5x0v1kEMWNq8UctFjDiMATBxLvmmHA4bf7F6hTRaJgtghFr9iziQ==
+
 "@esbuild/linux-arm64@0.25.4":
   version "0.25.4"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.25.4.tgz#efc15e45c945a082708f9a9f73bfa8d4db49728a"
@@ -3407,20 +3417,15 @@
   resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.25.5.tgz#f7b7c8f97eff8ffd2e47f6c67eb5c9765f2181b8"
   integrity sha512-Z9kfb1v6ZlGbWj8EJk9T6czVEjjq2ntSYLY2cw6pAZl4oKtfgQuS4HOq41M/BcoLPzrUbNd+R4BXFyH//nHxVg==
 
-"@esbuild/linux-arm64@0.25.6":
-  version "0.25.6"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.25.6.tgz#c07cbed8e249f4c28e7f32781d36fc4695293d28"
-  integrity sha512-b967hU0gqKd9Drsh/UuAm21Khpoh6mPBSgz8mKRq4P5mVK8bpA+hQzmm/ZwGVULSNBzKdZPQBRT3+WuVavcWsQ==
-
 "@esbuild/linux-arm@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz#3e617c61f33508a27150ee417543c8ab5acc73b0"
   integrity sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==
 
-"@esbuild/linux-arm@0.19.4":
-  version "0.19.4"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.19.4.tgz#d5b13a7ec1f1c655ce05c8d319b3950797baee55"
-  integrity sha512-z/4ArqOo9EImzTi4b6Vq+pthLnepFzJ92BnofU1jgNlcVb+UqynVFdoXMCFreTK7FdhqAzH0vmdwW5373Hm9pg==
+"@esbuild/linux-arm@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz#207ecd982a8db95f7b5279207d0ff2331acf5eef"
+  integrity sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==
 
 "@esbuild/linux-arm@0.20.0":
   version "0.20.0"
@@ -3442,6 +3447,11 @@
   resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.23.1.tgz#ecaabd1c23b701070484990db9a82f382f99e771"
   integrity sha512-CXXkzgn+dXAPs3WBwE+Kvnrf4WECwBdfjfeYHpMeVxWE0EceB6vhWGShs6wi0IYEqMSIzdOF1XjQ/Mkm5d7ZdQ==
 
+"@esbuild/linux-arm@0.25.10":
+  version "0.25.10"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.25.10.tgz#86501cfdfb3d110176d80c41b27ed4611471cde7"
+  integrity sha512-oR31GtBTFYCqEBALI9r6WxoU/ZofZl962pouZRTEYECvNF/dtXKku8YXcJkhgK/beU+zedXfIzHijSRapJY3vg==
+
 "@esbuild/linux-arm@0.25.4":
   version "0.25.4"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.25.4.tgz#9b93c3e54ac49a2ede6f906e705d5d906f6db9e8"
@@ -3452,20 +3462,15 @@
   resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.25.5.tgz#2a0be71b6cd8201fa559aea45598dffabc05d911"
   integrity sha512-cPzojwW2okgh7ZlRpcBEtsX7WBuqbLrNXqLU89GxWbNt6uIg78ET82qifUy3W6OVww6ZWobWub5oqZOVtwolfw==
 
-"@esbuild/linux-arm@0.25.6":
-  version "0.25.6"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.25.6.tgz#d6e2cd8ef3196468065d41f13fa2a61aaa72644a"
-  integrity sha512-SZHQlzvqv4Du5PrKE2faN0qlbsaW/3QQfUUc6yO2EjFcA83xnwm91UbEEVx4ApZ9Z5oG8Bxz4qPE+HFwtVcfyw==
-
 "@esbuild/linux-ia32@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz#699391cccba9aee6019b7f9892eb99219f1570a7"
   integrity sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==
 
-"@esbuild/linux-ia32@0.19.4":
-  version "0.19.4"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.19.4.tgz#878cd8bf24c9847c77acdb5dd1b2ef6e4fa27a82"
-  integrity sha512-EGc4vYM7i1GRUIMqRZNCTzJh25MHePYsnQfKDexD8uPTCm9mK56NIL04LUfX2aaJ+C9vyEp2fJ7jbqFEYgO9lQ==
+"@esbuild/linux-ia32@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz#d0d86b5ca1562523dc284a6723293a52d5860601"
+  integrity sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==
 
 "@esbuild/linux-ia32@0.20.0":
   version "0.20.0"
@@ -3487,6 +3492,11 @@
   resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.23.1.tgz#3ed2273214178109741c09bd0687098a0243b333"
   integrity sha512-VTN4EuOHwXEkXzX5nTvVY4s7E/Krz7COC8xkftbbKRYAl96vPiUssGkeMELQMOnLOJ8k3BY1+ZY52tttZnHcXQ==
 
+"@esbuild/linux-ia32@0.25.10":
+  version "0.25.10"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.25.10.tgz#e6589877876142537c6864680cd5d26a622b9d97"
+  integrity sha512-NrSCx2Kim3EnnWgS4Txn0QGt0Xipoumb6z6sUtl5bOEZIVKhzfyp/Lyw4C1DIYvzeW/5mWYPBFJU3a/8Yr75DQ==
+
 "@esbuild/linux-ia32@0.25.4":
   version "0.25.4"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.25.4.tgz#be8ef2c3e1d99fca2d25c416b297d00360623596"
@@ -3497,11 +3507,6 @@
   resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.25.5.tgz#763414463cd9ea6fa1f96555d2762f9f84c61783"
   integrity sha512-sQ7l00M8bSv36GLV95BVAdhJ2QsIbCuCjh/uYrWiMQSUuV+LpXwIqhgJDcvMTj+VsQmqAHL2yYaasENvJ7CDKA==
 
-"@esbuild/linux-ia32@0.25.6":
-  version "0.25.6"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.25.6.tgz#3e682bd47c4eddcc4b8f1393dfc8222482f17997"
-  integrity sha512-aHWdQ2AAltRkLPOsKdi3xv0mZ8fUGPdlKEjIEhxCPm5yKEThcUjHpWB1idN74lfXGnZ5SULQSgtr5Qos5B0bPw==
-
 "@esbuild/linux-loong64@0.15.18":
   version "0.15.18"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.15.18.tgz#128b76ecb9be48b60cf5cfc1c63a4f00691a3239"
@@ -3517,10 +3522,10 @@
   resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz#e6fccb7aac178dd2ffb9860465ac89d7f23b977d"
   integrity sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==
 
-"@esbuild/linux-loong64@0.19.4":
-  version "0.19.4"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.19.4.tgz#df890499f6e566b7de3aa2361be6df2b8d5fa015"
-  integrity sha512-WVhIKO26kmm8lPmNrUikxSpXcgd6HDog0cx12BUfA2PkmURHSgx9G6vA19lrlQOMw+UjMZ+l3PpbtzffCxFDRg==
+"@esbuild/linux-loong64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz#9a37f87fec4b8408e682b528391fa22afd952299"
+  integrity sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==
 
 "@esbuild/linux-loong64@0.20.0":
   version "0.20.0"
@@ -3542,6 +3547,11 @@
   resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.23.1.tgz#a0fdf440b5485c81b0fbb316b08933d217f5d3ac"
   integrity sha512-Vx09LzEoBa5zDnieH8LSMRToj7ir/Jeq0Gu6qJ/1GcBq9GkfoEAoXvLiW1U9J1qE/Y/Oyaq33w5p2ZWrNNHNEw==
 
+"@esbuild/linux-loong64@0.25.10":
+  version "0.25.10"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.25.10.tgz#11119e18781f136d8083ea10eb6be73db7532de8"
+  integrity sha512-xoSphrd4AZda8+rUDDfD9J6FUMjrkTz8itpTITM4/xgerAZZcFW7Dv+sun7333IfKxGG8gAq+3NbfEMJfiY+Eg==
+
 "@esbuild/linux-loong64@0.25.4":
   version "0.25.4"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.25.4.tgz#b0840a2707c3fc02eec288d3f9defa3827cd7a87"
@@ -3552,20 +3562,15 @@
   resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.25.5.tgz#428cf2213ff786a502a52c96cf29d1fcf1eb8506"
   integrity sha512-0ur7ae16hDUC4OL5iEnDb0tZHDxYmuQyhKhsPBV8f99f6Z9KQM02g33f93rNH5A30agMS46u2HP6qTdEt6Q1kg==
 
-"@esbuild/linux-loong64@0.25.6":
-  version "0.25.6"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.25.6.tgz#473f5ea2e52399c08ad4cd6b12e6dbcddd630f05"
-  integrity sha512-VgKCsHdXRSQ7E1+QXGdRPlQ/e08bN6WMQb27/TMfV+vPjjTImuT9PmLXupRlC90S1JeNNW5lzkAEO/McKeJ2yg==
-
 "@esbuild/linux-mips64el@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz#eeff3a937de9c2310de30622a957ad1bd9183231"
   integrity sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==
 
-"@esbuild/linux-mips64el@0.19.4":
-  version "0.19.4"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.19.4.tgz#76eae4e88d2ce9f4f1b457e93892e802851b6807"
-  integrity sha512-keYY+Hlj5w86hNp5JJPuZNbvW4jql7c1eXdBUHIJGTeN/+0QFutU3GrS+c27L+NTmzi73yhtojHk+lr2+502Mw==
+"@esbuild/linux-mips64el@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz#4ddebd4e6eeba20b509d8e74c8e30d8ace0b89ec"
+  integrity sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==
 
 "@esbuild/linux-mips64el@0.20.0":
   version "0.20.0"
@@ -3587,6 +3592,11 @@
   resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.23.1.tgz#e11a2806346db8375b18f5e104c5a9d4e81807f6"
   integrity sha512-nrFzzMQ7W4WRLNUOU5dlWAqa6yVeI0P78WKGUo7lg2HShq/yx+UYkeNSE0SSfSure0SqgnsxPvmAUu/vu0E+3Q==
 
+"@esbuild/linux-mips64el@0.25.10":
+  version "0.25.10"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.25.10.tgz#3052f5436b0c0c67a25658d5fc87f045e7def9e6"
+  integrity sha512-ab6eiuCwoMmYDyTnyptoKkVS3k8fy/1Uvq7Dj5czXI6DF2GqD2ToInBI0SHOp5/X1BdZ26RKc5+qjQNGRBelRA==
+
 "@esbuild/linux-mips64el@0.25.4":
   version "0.25.4"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.25.4.tgz#2a198e5a458c9f0e75881a4e63d26ba0cf9df39f"
@@ -3597,20 +3607,15 @@
   resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.25.5.tgz#5cbcc7fd841b4cd53358afd33527cd394e325d96"
   integrity sha512-kB/66P1OsHO5zLz0i6X0RxlQ+3cu0mkxS3TKFvkb5lin6uwZ/ttOkP3Z8lfR9mJOBk14ZwZ9182SIIWFGNmqmg==
 
-"@esbuild/linux-mips64el@0.25.6":
-  version "0.25.6"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.25.6.tgz#9960631c9fd61605b0939c19043acf4ef2b51718"
-  integrity sha512-WViNlpivRKT9/py3kCmkHnn44GkGXVdXfdc4drNmRl15zVQ2+D2uFwdlGh6IuK5AAnGTo2qPB1Djppj+t78rzw==
-
 "@esbuild/linux-ppc64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz#2f7156bde20b01527993e6881435ad79ba9599fb"
   integrity sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==
 
-"@esbuild/linux-ppc64@0.19.4":
-  version "0.19.4"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.19.4.tgz#c49032f4abbcfa3f747b543a106931fe3dce41ff"
-  integrity sha512-tQ92n0WMXyEsCH4m32S21fND8VxNiVazUbU4IUGVXQpWiaAxOBvtOtbEt3cXIV3GEBydYsY8pyeRMJx9kn3rvw==
+"@esbuild/linux-ppc64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz#adb67dadb73656849f63cd522f5ecb351dd8dee8"
+  integrity sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==
 
 "@esbuild/linux-ppc64@0.20.0":
   version "0.20.0"
@@ -3632,6 +3637,11 @@
   resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.23.1.tgz#06a2744c5eaf562b1a90937855b4d6cf7c75ec96"
   integrity sha512-dKN8fgVqd0vUIjxuJI6P/9SSSe/mB9rvA98CSH2sJnlZ/OCZWO1DJvxj8jvKTfYUdGfcq2dDxoKaC6bHuTlgcw==
 
+"@esbuild/linux-ppc64@0.25.10":
+  version "0.25.10"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.25.10.tgz#2f098920ee5be2ce799f35e367b28709925a8744"
+  integrity sha512-NLinzzOgZQsGpsTkEbdJTCanwA5/wozN9dSgEl12haXJBzMTpssebuXR42bthOF3z7zXFWH1AmvWunUCkBE4EA==
+
 "@esbuild/linux-ppc64@0.25.4":
   version "0.25.4"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.25.4.tgz#64f4ae0b923d7dd72fb860b9b22edb42007cf8f5"
@@ -3642,20 +3652,15 @@
   resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.25.5.tgz#0d954ab39ce4f5e50f00c4f8c4fd38f976c13ad9"
   integrity sha512-UZCmJ7r9X2fe2D6jBmkLBMQetXPXIsZjQJCjgwpVDz+YMcS6oFR27alkgGv3Oqkv07bxdvw7fyB71/olceJhkQ==
 
-"@esbuild/linux-ppc64@0.25.6":
-  version "0.25.6"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.25.6.tgz#477cbf8bb04aa034b94f362c32c86b5c31db8d3e"
-  integrity sha512-wyYKZ9NTdmAMb5730I38lBqVu6cKl4ZfYXIs31Baf8aoOtB4xSGi3THmDYt4BTFHk7/EcVixkOV2uZfwU3Q2Jw==
-
 "@esbuild/linux-riscv64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz#6628389f210123d8b4743045af8caa7d4ddfc7a6"
   integrity sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==
 
-"@esbuild/linux-riscv64@0.19.4":
-  version "0.19.4"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.19.4.tgz#0f815a090772138503ee0465a747e16865bf94b1"
-  integrity sha512-tRRBey6fG9tqGH6V75xH3lFPpj9E8BH+N+zjSUCnFOX93kEzqS0WdyJHkta/mmJHn7MBaa++9P4ARiU4ykjhig==
+"@esbuild/linux-riscv64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz#11bc0698bf0a2abf8727f1c7ace2112612c15adf"
+  integrity sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==
 
 "@esbuild/linux-riscv64@0.20.0":
   version "0.20.0"
@@ -3677,6 +3682,11 @@
   resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.23.1.tgz#65b46a2892fc0d1af4ba342af3fe0fa4a8fe08e7"
   integrity sha512-5AV4Pzp80fhHL83JM6LoA6pTQVWgB1HovMBsLQ9OZWLDqVY8MVobBXNSmAJi//Csh6tcY7e7Lny2Hg1tElMjIA==
 
+"@esbuild/linux-riscv64@0.25.10":
+  version "0.25.10"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.25.10.tgz#fa51d7fd0a22a62b51b4b94b405a3198cf7405dd"
+  integrity sha512-FE557XdZDrtX8NMIeA8LBJX3dC2M8VGXwfrQWU7LB5SLOajfJIxmSdyL/gU1m64Zs9CBKvm4UAuBp5aJ8OgnrA==
+
 "@esbuild/linux-riscv64@0.25.4":
   version "0.25.4"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.25.4.tgz#fb2844b11fdddd39e29d291c7cf80f99b0d5158d"
@@ -3687,20 +3697,15 @@
   resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.25.5.tgz#0e7dd30730505abd8088321e8497e94b547bfb1e"
   integrity sha512-kTxwu4mLyeOlsVIFPfQo+fQJAV9mh24xL+y+Bm6ej067sYANjyEw1dNHmvoqxJUCMnkBdKpvOn0Ahql6+4VyeA==
 
-"@esbuild/linux-riscv64@0.25.6":
-  version "0.25.6"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.25.6.tgz#bcdb46c8fb8e93aa779e9a0a62cd4ac00dcac626"
-  integrity sha512-KZh7bAGGcrinEj4qzilJ4hqTY3Dg2U82c8bv+e1xqNqZCrCyc+TL9AUEn5WGKDzm3CfC5RODE/qc96OcbIe33w==
-
 "@esbuild/linux-s390x@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz#255e81fb289b101026131858ab99fba63dcf0071"
   integrity sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==
 
-"@esbuild/linux-s390x@0.19.4":
-  version "0.19.4"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.19.4.tgz#8d2cca20cd4e7c311fde8701d9f1042664f8b92b"
-  integrity sha512-152aLpQqKZYhThiJ+uAM4PcuLCAOxDsCekIbnGzPKVBRUDlgaaAfaUl5NYkB1hgY6WN4sPkejxKlANgVcGl9Qg==
+"@esbuild/linux-s390x@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz#e86fb8ffba7c5c92ba91fc3b27ed5a70196c3cc8"
+  integrity sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==
 
 "@esbuild/linux-s390x@0.20.0":
   version "0.20.0"
@@ -3722,6 +3727,11 @@
   resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.23.1.tgz#e71ea18c70c3f604e241d16e4e5ab193a9785d6f"
   integrity sha512-9ygs73tuFCe6f6m/Tb+9LtYxWR4c9yg7zjt2cYkjDbDpV/xVn+68cQxMXCjUpYwEkze2RcU/rMnfIXNRFmSoDw==
 
+"@esbuild/linux-s390x@0.25.10":
+  version "0.25.10"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.25.10.tgz#a27642e36fc282748fdb38954bd3ef4f85791e8a"
+  integrity sha512-3BBSbgzuB9ajLoVZk0mGu+EHlBwkusRmeNYdqmznmMc9zGASFjSsxgkNsqmXugpPk00gJ0JNKh/97nxmjctdew==
+
 "@esbuild/linux-s390x@0.25.4":
   version "0.25.4"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.25.4.tgz#1466876e0aa3560c7673e63fdebc8278707bc750"
@@ -3732,20 +3742,15 @@
   resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.25.5.tgz#5669af81327a398a336d7e40e320b5bbd6e6e72d"
   integrity sha512-K2dSKTKfmdh78uJ3NcWFiqyRrimfdinS5ErLSn3vluHNeHVnBAFWC8a4X5N+7FgVE1EjXS1QDZbpqZBjfrqMTQ==
 
-"@esbuild/linux-s390x@0.25.6":
-  version "0.25.6"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.25.6.tgz#f412cf5fdf0aea849ff51c73fd817c6c0234d46d"
-  integrity sha512-9N1LsTwAuE9oj6lHMyyAM+ucxGiVnEqUdp4v7IaMmrwb06ZTEVCIs3oPPplVsnjPfyjmxwHxHMF8b6vzUVAUGw==
-
 "@esbuild/linux-x64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz#c7690b3417af318a9b6f96df3031a8865176d338"
   integrity sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==
 
-"@esbuild/linux-x64@0.19.4":
-  version "0.19.4"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.19.4.tgz#f618bec2655de49bff91c588777e37b5e3169d4a"
-  integrity sha512-Mi4aNA3rz1BNFtB7aGadMD0MavmzuuXNTaYL6/uiYIs08U7YMPETpgNn5oue3ICr+inKwItOwSsJDYkrE9ekVg==
+"@esbuild/linux-x64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz#5f37cfdc705aea687dfe5dfbec086a05acfe9c78"
+  integrity sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==
 
 "@esbuild/linux-x64@0.20.0":
   version "0.20.0"
@@ -3767,6 +3772,11 @@
   resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.23.1.tgz#d47f97391e80690d4dfe811a2e7d6927ad9eed24"
   integrity sha512-EV6+ovTsEXCPAp58g2dD68LxoP/wK5pRvgy0J/HxPGB009omFPv3Yet0HiaqvrIrgPTBuC6wCH1LTOY91EO5hQ==
 
+"@esbuild/linux-x64@0.25.10":
+  version "0.25.10"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.25.10.tgz#9d9b09c0033d17529570ced6d813f98315dfe4e9"
+  integrity sha512-QSX81KhFoZGwenVyPoberggdW1nrQZSvfVDAIUXr3WqLRZGZqWk/P4T8p2SP+de2Sr5HPcvjhcJzEiulKgnxtA==
+
 "@esbuild/linux-x64@0.25.4":
   version "0.25.4"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.25.4.tgz#c10fde899455db7cba5f11b3bccfa0e41bf4d0cd"
@@ -3777,10 +3787,10 @@
   resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.25.5.tgz#b2357dd153aa49038967ddc1ffd90c68a9d2a0d4"
   integrity sha512-uhj8N2obKTE6pSZ+aMUbqq+1nXxNjZIIjCjGLfsWvVpy7gKCOL6rsY1MhRh9zLtUtAI7vpgLMK6DxjO8Qm9lJw==
 
-"@esbuild/linux-x64@0.25.6":
-  version "0.25.6"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.25.6.tgz#d8233c09b5ebc0c855712dc5eeb835a3a3341108"
-  integrity sha512-A6bJB41b4lKFWRKNrWoP2LHsjVzNiaurf7wyj/XtFNTsnPuxwEBWHLty+ZE0dWBKuSK1fvKgrKaNjBS7qbFKig==
+"@esbuild/netbsd-arm64@0.25.10":
+  version "0.25.10"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.10.tgz#25c09a659c97e8af19e3f2afd1c9190435802151"
+  integrity sha512-AKQM3gfYfSW8XRk8DdMCzaLUFB15dTrZfnX8WXQoOUpUBQ+NaAFCP1kPS/ykbbGYz7rxn0WS48/81l9hFl3u4A==
 
 "@esbuild/netbsd-arm64@0.25.4":
   version "0.25.4"
@@ -3792,20 +3802,15 @@
   resolved "https://registry.yarnpkg.com/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.5.tgz#53b4dfb8fe1cee93777c9e366893bd3daa6ba63d"
   integrity sha512-pwHtMP9viAy1oHPvgxtOv+OkduK5ugofNTVDilIzBLpoWAM16r7b/mxBvfpuQDpRQFMfuVr5aLcn4yveGvBZvw==
 
-"@esbuild/netbsd-arm64@0.25.6":
-  version "0.25.6"
-  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.6.tgz#f51ae8dd1474172e73cf9cbaf8a38d1c72dd8f1a"
-  integrity sha512-IjA+DcwoVpjEvyxZddDqBY+uJ2Snc6duLpjmkXm/v4xuS3H+3FkLZlDm9ZsAbF9rsfP3zeA0/ArNDORZgrxR/Q==
-
 "@esbuild/netbsd-x64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz#30e8cd8a3dded63975e2df2438ca109601ebe0d1"
   integrity sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==
 
-"@esbuild/netbsd-x64@0.19.4":
-  version "0.19.4"
-  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.19.4.tgz#7889744ca4d60f1538d62382b95e90a49687cef2"
-  integrity sha512-9+Wxx1i5N/CYo505CTT7T+ix4lVzEdz0uCoYGxM5JDVlP2YdDC1Bdz+Khv6IbqmisT0Si928eAxbmGkcbiuM/A==
+"@esbuild/netbsd-x64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz#29da566a75324e0d0dd7e47519ba2f7ef168657b"
+  integrity sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==
 
 "@esbuild/netbsd-x64@0.20.0":
   version "0.20.0"
@@ -3827,6 +3832,11 @@
   resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.23.1.tgz#44e743c9778d57a8ace4b72f3c6b839a3b74a653"
   integrity sha512-aevEkCNu7KlPRpYLjwmdcuNz6bDFiE7Z8XC4CPqExjTvrHugh28QzUXVOZtiYghciKUacNktqxdpymplil1beA==
 
+"@esbuild/netbsd-x64@0.25.10":
+  version "0.25.10"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.25.10.tgz#7fa5f6ffc19be3a0f6f5fd32c90df3dc2506937a"
+  integrity sha512-7RTytDPGU6fek/hWuN9qQpeGPBZFfB4zZgcz2VK2Z5VpdUxEI8JKYsg3JfO0n/Z1E/6l05n0unDCNc4HnhQGig==
+
 "@esbuild/netbsd-x64@0.25.4":
   version "0.25.4"
   resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.25.4.tgz#ec401fb0b1ed0ac01d978564c5fc8634ed1dc2ed"
@@ -3837,16 +3847,16 @@
   resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.25.5.tgz#a0206f6314ce7dc8713b7732703d0f58de1d1e79"
   integrity sha512-WOb5fKrvVTRMfWFNCroYWWklbnXH0Q5rZppjq0vQIdlsQKuw6mdSihwSo4RV/YdQ5UCKKvBy7/0ZZYLBZKIbwQ==
 
-"@esbuild/netbsd-x64@0.25.6":
-  version "0.25.6"
-  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.25.6.tgz#a267538602c0e50a858cf41dcfe5d8036f8da8e7"
-  integrity sha512-dUXuZr5WenIDlMHdMkvDc1FAu4xdWixTCRgP7RQLBOkkGgwuuzaGSYcOpW4jFxzpzL1ejb8yF620UxAqnBrR9g==
-
 "@esbuild/openbsd-arm64@0.23.1":
   version "0.23.1"
   resolved "https://registry.yarnpkg.com/@esbuild/openbsd-arm64/-/openbsd-arm64-0.23.1.tgz#05c5a1faf67b9881834758c69f3e51b7dee015d7"
   integrity sha512-3x37szhLexNA4bXhLrCC/LImN/YtWis6WXr1VESlfVtVeoFJBRINPJ3f0a/6LV8zpikqoUg4hyXw0sFBt5Cr+Q==
 
+"@esbuild/openbsd-arm64@0.25.10":
+  version "0.25.10"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.10.tgz#8faa6aa1afca0c6d024398321d6cb1c18e72a1c3"
+  integrity sha512-5Se0VM9Wtq797YFn+dLimf2Zx6McttsH2olUBsDml+lm0GOCRVebRWUvDtkY4BWYv/3NgzS8b/UM3jQNh5hYyw==
+
 "@esbuild/openbsd-arm64@0.25.4":
   version "0.25.4"
   resolved "https://registry.yarnpkg.com/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.4.tgz#f272c2f41cfea1d91b93d487a51b5c5ca7a8c8c4"
@@ -3857,20 +3867,15 @@
   resolved "https://registry.yarnpkg.com/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.5.tgz#2a796c87c44e8de78001d808c77d948a21ec22fd"
   integrity sha512-7A208+uQKgTxHd0G0uqZO8UjK2R0DDb4fDmERtARjSHWxqMTye4Erz4zZafx7Di9Cv+lNHYuncAkiGFySoD+Mw==
 
-"@esbuild/openbsd-arm64@0.25.6":
-  version "0.25.6"
-  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.6.tgz#a51be60c425b85c216479b8c344ad0511635f2d2"
-  integrity sha512-l8ZCvXP0tbTJ3iaqdNf3pjaOSd5ex/e6/omLIQCVBLmHTlfXW3zAxQ4fnDmPLOB1x9xrcSi/xtCWFwCZRIaEwg==
-
 "@esbuild/openbsd-x64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz#7812af31b205055874c8082ea9cf9ab0da6217ae"
   integrity sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==
 
-"@esbuild/openbsd-x64@0.19.4":
-  version "0.19.4"
-  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.19.4.tgz#c3e436eb9271a423d2e8436fcb120e3fd90e2b01"
-  integrity sha512-MFsHleM5/rWRW9EivFssop+OulYVUoVcqkyOkjiynKBCGBj9Lihl7kh9IzrreDyXa4sNkquei5/DTP4uCk25xw==
+"@esbuild/openbsd-x64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz#306c0acbdb5a99c95be98bdd1d47c916e7dc3ff0"
+  integrity sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==
 
 "@esbuild/openbsd-x64@0.20.0":
   version "0.20.0"
@@ -3892,6 +3897,11 @@
   resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.23.1.tgz#2e58ae511bacf67d19f9f2dcd9e8c5a93f00c273"
   integrity sha512-aY2gMmKmPhxfU+0EdnN+XNtGbjfQgwZj43k8G3fyrDM/UdZww6xrWxmDkuz2eCZchqVeABjV5BpildOrUbBTqA==
 
+"@esbuild/openbsd-x64@0.25.10":
+  version "0.25.10"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.25.10.tgz#a42979b016f29559a8453d32440d3c8cd420af5e"
+  integrity sha512-XkA4frq1TLj4bEMB+2HnI0+4RnjbuGZfet2gs/LNs5Hc7D89ZQBHQ0gL2ND6Lzu1+QVkjp3x1gIcPKzRNP8bXw==
+
 "@esbuild/openbsd-x64@0.25.4":
   version "0.25.4"
   resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.25.4.tgz#2e25950bc10fa9db1e5c868e3d50c44f7c150fd7"
@@ -3902,25 +3912,20 @@
   resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.25.5.tgz#28d0cd8909b7fa3953af998f2b2ed34f576728f0"
   integrity sha512-G4hE405ErTWraiZ8UiSoesH8DaCsMm0Cay4fsFWOOUcz8b8rC6uCvnagr+gnioEjWn0wC+o1/TAHt+It+MpIMg==
 
-"@esbuild/openbsd-x64@0.25.6":
-  version "0.25.6"
-  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.25.6.tgz#7e4a743c73f75562e29223ba69d0be6c9c9008da"
-  integrity sha512-hKrmDa0aOFOr71KQ/19JC7az1P0GWtCN1t2ahYAf4O007DHZt/dW8ym5+CUdJhQ/qkZmI1HAF8KkJbEFtCL7gw==
-
-"@esbuild/openharmony-arm64@0.25.6":
-  version "0.25.6"
-  resolved "https://registry.yarnpkg.com/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.6.tgz#2087a5028f387879154ebf44bdedfafa17682e5b"
-  integrity sha512-+SqBcAWoB1fYKmpWoQP4pGtx+pUUC//RNYhFdbcSA16617cchuryuhOCRpPsjCblKukAckWsV+aQ3UKT/RMPcA==
+"@esbuild/openharmony-arm64@0.25.10":
+  version "0.25.10"
+  resolved "https://registry.yarnpkg.com/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.10.tgz#fd87bfeadd7eeb3aa384bbba907459ffa3197cb1"
+  integrity sha512-AVTSBhTX8Y/Fz6OmIVBip9tJzZEUcY8WLh7I59+upa5/GPhh2/aM6bvOMQySspnCCHvFi79kMtdJS1w0DXAeag==
 
 "@esbuild/sunos-x64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz#d5c275c3b4e73c9b0ecd38d1ca62c020f887ab9d"
   integrity sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==
 
-"@esbuild/sunos-x64@0.19.4":
-  version "0.19.4"
-  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.19.4.tgz#f63f5841ba8c8c1a1c840d073afc99b53e8ce740"
-  integrity sha512-6Xq8SpK46yLvrGxjp6HftkDwPP49puU4OF0hEL4dTxqCbfx09LyrbUj/D7tmIRMj5D5FCUPksBbxyQhp8tmHzw==
+"@esbuild/sunos-x64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz#0933eaab9af8b9b2c930236f62aae3fc593faf30"
+  integrity sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==
 
 "@esbuild/sunos-x64@0.20.0":
   version "0.20.0"
@@ -3942,6 +3947,11 @@
   resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.23.1.tgz#adb022b959d18d3389ac70769cef5a03d3abd403"
   integrity sha512-RBRT2gqEl0IKQABT4XTj78tpk9v7ehp+mazn2HbUeZl1YMdaGAQqhapjGTCe7uw7y0frDi4gS0uHzhvpFuI1sA==
 
+"@esbuild/sunos-x64@0.25.10":
+  version "0.25.10"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.25.10.tgz#3a18f590e36cb78ae7397976b760b2b8c74407f4"
+  integrity sha512-fswk3XT0Uf2pGJmOpDB7yknqhVkJQkAQOcW/ccVOtfx05LkbWOaRAtn5SaqXypeKQra1QaEa841PgrSL9ubSPQ==
+
 "@esbuild/sunos-x64@0.25.4":
   version "0.25.4"
   resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.25.4.tgz#cd596fa65a67b3b7adc5ecd52d9f5733832e1abd"
@@ -3952,20 +3962,15 @@
   resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.25.5.tgz#a28164f5b997e8247d407e36c90d3fd5ddbe0dc5"
   integrity sha512-l+azKShMy7FxzY0Rj4RCt5VD/q8mG/e+mDivgspo+yL8zW7qEwctQ6YqKX34DTEleFAvCIUviCFX1SDZRSyMQA==
 
-"@esbuild/sunos-x64@0.25.6":
-  version "0.25.6"
-  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.25.6.tgz#56531f861723ea0dc6283a2bb8837304223cb736"
-  integrity sha512-dyCGxv1/Br7MiSC42qinGL8KkG4kX0pEsdb0+TKhmJZgCUDBGmyo1/ArCjNGiOLiIAgdbWgmWgib4HoCi5t7kA==
-
 "@esbuild/win32-arm64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz#73bc7f5a9f8a77805f357fab97f290d0e4820ac9"
   integrity sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==
 
-"@esbuild/win32-arm64@0.19.4":
-  version "0.19.4"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.19.4.tgz#80be69cec92da4da7781cf7a8351b95cc5a236b0"
-  integrity sha512-PkIl7Jq4mP6ke7QKwyg4fD4Xvn8PXisagV/+HntWoDEdmerB2LTukRZg728Yd1Fj+LuEX75t/hKXE2Ppk8Hh1w==
+"@esbuild/win32-arm64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz#773bdbaa1971b36db2f6560088639ccd1e6773ae"
+  integrity sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==
 
 "@esbuild/win32-arm64@0.20.0":
   version "0.20.0"
@@ -3987,6 +3992,11 @@
   resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.23.1.tgz#84906f50c212b72ec360f48461d43202f4c8b9a2"
   integrity sha512-4O+gPR5rEBe2FpKOVyiJ7wNDPA8nGzDuJ6gN4okSA1gEOYZ67N8JPk58tkWtdtPeLz7lBnY6I5L3jdsr3S+A6A==
 
+"@esbuild/win32-arm64@0.25.10":
+  version "0.25.10"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.25.10.tgz#e71741a251e3fd971408827a529d2325551f530c"
+  integrity sha512-ah+9b59KDTSfpaCg6VdJoOQvKjI33nTaQr4UluQwW7aEwZQsbMCfTmfEO4VyewOxx4RaDT/xCy9ra2GPWmO7Kw==
+
 "@esbuild/win32-arm64@0.25.4":
   version "0.25.4"
   resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.25.4.tgz#b4dbcb57b21eeaf8331e424c3999b89d8951dc88"
@@ -3997,20 +4007,15 @@
   resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.25.5.tgz#6eadbead38e8bd12f633a5190e45eff80e24007e"
   integrity sha512-O2S7SNZzdcFG7eFKgvwUEZ2VG9D/sn/eIiz8XRZ1Q/DO5a3s76Xv0mdBzVM5j5R639lXQmPmSo0iRpHqUUrsxw==
 
-"@esbuild/win32-arm64@0.25.6":
-  version "0.25.6"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.25.6.tgz#f4989f033deac6fae323acff58764fa8bc01436e"
-  integrity sha512-42QOgcZeZOvXfsCBJF5Afw73t4veOId//XD3i+/9gSkhSV6Gk3VPlWncctI+JcOyERv85FUo7RxuxGy+z8A43Q==
-
 "@esbuild/win32-ia32@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz#ec93cbf0ef1085cc12e71e0d661d20569ff42102"
   integrity sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==
 
-"@esbuild/win32-ia32@0.19.4":
-  version "0.19.4"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.19.4.tgz#15dc0ed83d2794872b05d8edc4a358fecf97eb54"
-  integrity sha512-ga676Hnvw7/ycdKB53qPusvsKdwrWzEyJ+AtItHGoARszIqvjffTwaaW3b2L6l90i7MO9i+dlAW415INuRhSGg==
+"@esbuild/win32-ia32@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz#000516cad06354cc84a73f0943a4aa690ef6fd67"
+  integrity sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==
 
 "@esbuild/win32-ia32@0.20.0":
   version "0.20.0"
@@ -4032,6 +4037,11 @@
   resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.23.1.tgz#5e3eacc515820ff729e90d0cb463183128e82fac"
   integrity sha512-BcaL0Vn6QwCwre3Y717nVHZbAa4UBEigzFm6VdsVdT/MbZ38xoj1X9HPkZhbmaBGUD1W8vxAfffbDe8bA6AKnQ==
 
+"@esbuild/win32-ia32@0.25.10":
+  version "0.25.10"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.25.10.tgz#c6f010b5d3b943d8901a0c87ea55f93b8b54bf94"
+  integrity sha512-QHPDbKkrGO8/cz9LKVnJU22HOi4pxZnZhhA2HYHez5Pz4JeffhDjf85E57Oyco163GnzNCVkZK0b/n4Y0UHcSw==
+
 "@esbuild/win32-ia32@0.25.4":
   version "0.25.4"
   resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.25.4.tgz#410842e5d66d4ece1757634e297a87635eb82f7a"
@@ -4042,20 +4052,15 @@
   resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.25.5.tgz#bab6288005482f9ed2adb9ded7e88eba9a62cc0d"
   integrity sha512-onOJ02pqs9h1iMJ1PQphR+VZv8qBMQ77Klcsqv9CNW2w6yLqoURLcgERAIurY6QE63bbLuqgP9ATqajFLK5AMQ==
 
-"@esbuild/win32-ia32@0.25.6":
-  version "0.25.6"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.25.6.tgz#b260e9df71e3939eb33925076d39f63cec7d1525"
-  integrity sha512-4AWhgXmDuYN7rJI6ORB+uU9DHLq/erBbuMoAuB4VWJTu5KtCgcKYPynF0YI1VkBNuEfjNlLrFr9KZPJzrtLkrQ==
-
 "@esbuild/win32-x64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz#786c5f41f043b07afb1af37683d7c33668858f6d"
   integrity sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==
 
-"@esbuild/win32-x64@0.19.4":
-  version "0.19.4"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.19.4.tgz#d46a6e220a717f31f39ae80f49477cc3220be0f0"
-  integrity sha512-HP0GDNla1T3ZL8Ko/SHAS2GgtjOg+VmWnnYLhuTksr++EnduYB0f3Y2LzHsUwb2iQ13JGoY6G3R8h6Du/WG6uA==
+"@esbuild/win32-x64@0.19.12":
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz#c57c8afbb4054a3ab8317591a0b7320360b444ae"
+  integrity sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==
 
 "@esbuild/win32-x64@0.20.0":
   version "0.20.0"
@@ -4077,6 +4082,11 @@
   resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.23.1.tgz#81fd50d11e2c32b2d6241470e3185b70c7b30699"
   integrity sha512-BHpFFeslkWrXWyUPnbKm+xYYVYruCinGcftSBaa8zoF9hZO4BcSCFUvHVTtzpIY6YzUnYtuEhZ+C9iEXjxnasg==
 
+"@esbuild/win32-x64@0.25.10":
+  version "0.25.10"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.25.10.tgz#e4b3e255a1b4aea84f6e1d2ae0b73f826c3785bd"
+  integrity sha512-9KpxSVFCu0iK1owoez6aC/s/EdUQLDN3adTxGCqxMVhrPDj6bt5dbrHDXUuq+Bs2vATFBBrQS5vdQ/Ed2P+nbw==
+
 "@esbuild/win32-x64@0.25.4":
   version "0.25.4"
   resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.25.4.tgz#0b17ec8a70b2385827d52314c1253160a0b9bacc"
@@ -4087,11 +4097,6 @@
   resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.25.5.tgz#7fc114af5f6563f19f73324b5d5ff36ece0803d1"
   integrity sha512-TXv6YnJ8ZMVdX+SXWVBo/0p8LTcrUYngpWjvm91TMjjBQii7Oz11Lw5lbDV5Y0TzuhSJHwiH4hEtC1I42mMS0g==
 
-"@esbuild/win32-x64@0.25.6":
-  version "0.25.6"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.25.6.tgz#4276edd5c105bc28b11c6a1f76fb9d29d1bd25c1"
-  integrity sha512-NgJPHHbEpLQgDH2MjQu90pzW/5vvXIZ7KOnPyNBm92A6WgZ/7b6fJyUBjoumLqeOQQGqY2QjQxRo97ah4Sj0cA==
-
 "@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
   version "4.9.0"
   resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz#7308df158e064f0dd8b8fdb58aa14fa2a7f913b3"
@@ -8863,14 +8868,6 @@
   resolved "https://registry.yarnpkg.com/@types/node-cron/-/node-cron-3.0.11.tgz#70b7131f65038ae63cfe841354c8aba363632344"
   integrity sha512-0ikrnug3/IyneSHqCBeslAhlK2aBfYek1fGo4bP4QnZPmiqSGRK+Oy7ZMisLWkesffJvQ1cqAcBnJC+8+nxIAg==
 
-"@types/node-fetch@^2.6.11":
-  version "2.6.11"
-  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.11.tgz#9b39b78665dae0e82a08f02f4967d62c66f95d24"
-  integrity sha512-24xFj9R5+rfQJLRyM56qh+wnVSYhyXC2tkoBndtY0U+vubqNsYXGjufB2nn8Q6gt0LrARwL6UBtMCSVCwl4B1g==
-  dependencies:
-    "@types/node" "*"
-    form-data "^4.0.0"
-
 "@types/node-forge@^1.3.0":
   version "1.3.11"
   resolved "https://registry.yarnpkg.com/@types/node-forge/-/node-forge-1.3.11.tgz#0972ea538ddb0f4d9c2fa0ec5db5724773a604da"
@@ -10507,12 +10504,12 @@ ansi-html@^0.0.7:
 ansi-regex@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
-  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
+  integrity sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==
 
 ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.1.tgz#123d6479e92ad45ad897d4054e3c7ca7db4944e1"
+  integrity sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==
 
 ansi-regex@^4.1.0:
   version "4.1.1"
@@ -10525,9 +10522,9 @@ ansi-regex@^5.0.0, ansi-regex@^5.0.1:
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
 ansi-regex@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a"
-  integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.2.2.tgz#60216eea464d864597ce2832000738a0589650c1"
+  integrity sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==
 
 ansi-styles@^2.2.1:
   version "2.2.1"
@@ -11204,7 +11201,7 @@ autoprefixer@^10.4.13, autoprefixer@^10.4.19, autoprefixer@^10.4.20, autoprefixe
     picocolors "^1.0.1"
     postcss-value-parser "^4.2.0"
 
-available-typed-arrays@^1.0.2, available-typed-arrays@^1.0.7:
+available-typed-arrays@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz#a5cc375d6a03c2efc87a553f3e0b1522def14846"
   integrity sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==
@@ -12534,7 +12531,7 @@ calculate-cache-key-for-tree@^2.0.0:
   dependencies:
     json-stable-stringify "^1.0.1"
 
-call-bind-apply-helpers@^1.0.1, call-bind-apply-helpers@^1.0.2:
+call-bind-apply-helpers@^1.0.0, call-bind-apply-helpers@^1.0.1, call-bind-apply-helpers@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz#4b5428c222be985d79c3d82657479dbe0b59b2d6"
   integrity sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==
@@ -12542,18 +12539,17 @@ call-bind-apply-helpers@^1.0.1, call-bind-apply-helpers@^1.0.2:
     es-errors "^1.3.0"
     function-bind "^1.1.2"
 
-call-bind@^1.0.0, call-bind@^1.0.2, call-bind@^1.0.5, call-bind@^1.0.6, call-bind@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9"
-  integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==
+call-bind@^1.0.0, call-bind@^1.0.2, call-bind@^1.0.5, call-bind@^1.0.6, call-bind@^1.0.7, call-bind@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.8.tgz#0736a9660f537e3388826f440d5ec45f744eaa4c"
+  integrity sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==
   dependencies:
+    call-bind-apply-helpers "^1.0.0"
     es-define-property "^1.0.0"
-    es-errors "^1.3.0"
-    function-bind "^1.1.2"
     get-intrinsic "^1.2.4"
-    set-function-length "^1.2.1"
+    set-function-length "^1.2.2"
 
-call-bound@^1.0.2:
+call-bound@^1.0.2, call-bound@^1.0.3, call-bound@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/call-bound/-/call-bound-1.0.4.tgz#238de935d2a2a692928c538c7ccfa91067fd062a"
   integrity sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==
@@ -13698,9 +13694,9 @@ cross-argv@^2.0.0:
   integrity sha512-YIaY9TR5Nxeb8SMdtrU8asWVM4jqJDNDYlKV21LxtYcfNJhp1kEsgSa6qXwXgzN0WQWGODps0+TlGp2xQSHwOg==
 
 cross-spawn@^6.0.0:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
-  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
+  version "6.0.6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.6.tgz#30d0efa0712ddb7eb5a76e1e8721bffafa6b5d57"
+  integrity sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==
   dependencies:
     nice-try "^1.0.4"
     path-key "^2.0.1"
@@ -14436,14 +14432,14 @@ deterministic-object-hash@^1.3.1:
   integrity sha512-kQDIieBUreEgY+akq0N7o4FzZCr27dPG1xr3wq267vPwDlSXQ3UMcBXHqTGUBaM/5WDS1jwTYjxRhUzHeuiAvw==
 
 devalue@^4.3.2:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/devalue/-/devalue-4.3.2.tgz#cc44e4cf3872ac5a78229fbce3b77e57032727b5"
-  integrity sha512-KqFl6pOgOW+Y6wJgu80rHpo2/3H07vr8ntR9rkkFIRETewbf5GaYYcakYfiKz89K+sLsuPkQIZaXDMjUObZwWg==
+  version "4.3.3"
+  resolved "https://registry.yarnpkg.com/devalue/-/devalue-4.3.3.tgz#e35df3bdc49136837e77986f629b9fa6fef50726"
+  integrity sha512-UH8EL6H2ifcY8TbD2QsxwCC/pr5xSwPvv85LrLXVihmHVC3T3YqTCIwnR5ak0yO1KYqlxrPVOA/JVZJYPy2ATg==
 
 devalue@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/devalue/-/devalue-5.0.0.tgz#1ca0099a7d715b4d6cac3924e770ccbbc584ad98"
-  integrity sha512-gO+/OMXF7488D+u3ue+G7Y4AA3ZmUnB3eHJXmBTgNHvr4ZNzl36A0ZtG+XCRNYCkYx/bFmw4qtkoFLa+wSrwAA==
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/devalue/-/devalue-5.3.2.tgz#1d9a00f0d126a2f768589f236da8b67d6988d285"
+  integrity sha512-UDsjUbpQn9kvm68slnrs+mfxwFkIflOhkanmyabZ8zOYk8SMEIbJ3TK+88g70hSIeytu4y18f0z/hYHMTrXIWw==
 
 devlop@^1.0.0:
   version "1.1.0"
@@ -15959,32 +15955,33 @@ esbuild@^0.18.10:
     "@esbuild/win32-x64" "0.18.20"
 
 esbuild@^0.19.2:
-  version "0.19.4"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.19.4.tgz#cdf5c4c684956d550bc3c6d0c01dac7fef6c75b1"
-  integrity sha512-x7jL0tbRRpv4QUyuDMjONtWFciygUxWaUM1kMX2zWxI0X2YWOt7MSA0g4UdeSiHM8fcYVzpQhKYOycZwxTdZkA==
+  version "0.19.12"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.19.12.tgz#dc82ee5dc79e82f5a5c3b4323a2a641827db3e04"
+  integrity sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==
   optionalDependencies:
-    "@esbuild/android-arm" "0.19.4"
-    "@esbuild/android-arm64" "0.19.4"
-    "@esbuild/android-x64" "0.19.4"
-    "@esbuild/darwin-arm64" "0.19.4"
-    "@esbuild/darwin-x64" "0.19.4"
-    "@esbuild/freebsd-arm64" "0.19.4"
-    "@esbuild/freebsd-x64" "0.19.4"
-    "@esbuild/linux-arm" "0.19.4"
-    "@esbuild/linux-arm64" "0.19.4"
-    "@esbuild/linux-ia32" "0.19.4"
-    "@esbuild/linux-loong64" "0.19.4"
-    "@esbuild/linux-mips64el" "0.19.4"
-    "@esbuild/linux-ppc64" "0.19.4"
-    "@esbuild/linux-riscv64" "0.19.4"
-    "@esbuild/linux-s390x" "0.19.4"
-    "@esbuild/linux-x64" "0.19.4"
-    "@esbuild/netbsd-x64" "0.19.4"
-    "@esbuild/openbsd-x64" "0.19.4"
-    "@esbuild/sunos-x64" "0.19.4"
-    "@esbuild/win32-arm64" "0.19.4"
-    "@esbuild/win32-ia32" "0.19.4"
-    "@esbuild/win32-x64" "0.19.4"
+    "@esbuild/aix-ppc64" "0.19.12"
+    "@esbuild/android-arm" "0.19.12"
+    "@esbuild/android-arm64" "0.19.12"
+    "@esbuild/android-x64" "0.19.12"
+    "@esbuild/darwin-arm64" "0.19.12"
+    "@esbuild/darwin-x64" "0.19.12"
+    "@esbuild/freebsd-arm64" "0.19.12"
+    "@esbuild/freebsd-x64" "0.19.12"
+    "@esbuild/linux-arm" "0.19.12"
+    "@esbuild/linux-arm64" "0.19.12"
+    "@esbuild/linux-ia32" "0.19.12"
+    "@esbuild/linux-loong64" "0.19.12"
+    "@esbuild/linux-mips64el" "0.19.12"
+    "@esbuild/linux-ppc64" "0.19.12"
+    "@esbuild/linux-riscv64" "0.19.12"
+    "@esbuild/linux-s390x" "0.19.12"
+    "@esbuild/linux-x64" "0.19.12"
+    "@esbuild/netbsd-x64" "0.19.12"
+    "@esbuild/openbsd-x64" "0.19.12"
+    "@esbuild/sunos-x64" "0.19.12"
+    "@esbuild/win32-arm64" "0.19.12"
+    "@esbuild/win32-ia32" "0.19.12"
+    "@esbuild/win32-x64" "0.19.12"
 
 esbuild@^0.20.2:
   version "0.20.2"
@@ -16075,36 +16072,36 @@ esbuild@^0.23.0, esbuild@^0.23.1:
     "@esbuild/win32-x64" "0.23.1"
 
 esbuild@^0.25.0, esbuild@^0.25.5:
-  version "0.25.6"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.25.6.tgz#9b82a3db2fa131aec069ab040fd57ed0a880cdcd"
-  integrity sha512-GVuzuUwtdsghE3ocJ9Bs8PNoF13HNQ5TXbEi2AhvVb8xU1Iwt9Fos9FEamfoee+u/TOsn7GUWc04lz46n2bbTg==
+  version "0.25.10"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.25.10.tgz#37f5aa5cd14500f141be121c01b096ca83ac34a9"
+  integrity sha512-9RiGKvCwaqxO2owP61uQ4BgNborAQskMR6QusfWzQqv7AZOg5oGehdY2pRJMTKuwxd1IDBP4rSbI5lHzU7SMsQ==
   optionalDependencies:
-    "@esbuild/aix-ppc64" "0.25.6"
-    "@esbuild/android-arm" "0.25.6"
-    "@esbuild/android-arm64" "0.25.6"
-    "@esbuild/android-x64" "0.25.6"
-    "@esbuild/darwin-arm64" "0.25.6"
-    "@esbuild/darwin-x64" "0.25.6"
-    "@esbuild/freebsd-arm64" "0.25.6"
-    "@esbuild/freebsd-x64" "0.25.6"
-    "@esbuild/linux-arm" "0.25.6"
-    "@esbuild/linux-arm64" "0.25.6"
-    "@esbuild/linux-ia32" "0.25.6"
-    "@esbuild/linux-loong64" "0.25.6"
-    "@esbuild/linux-mips64el" "0.25.6"
-    "@esbuild/linux-ppc64" "0.25.6"
-    "@esbuild/linux-riscv64" "0.25.6"
-    "@esbuild/linux-s390x" "0.25.6"
-    "@esbuild/linux-x64" "0.25.6"
-    "@esbuild/netbsd-arm64" "0.25.6"
-    "@esbuild/netbsd-x64" "0.25.6"
-    "@esbuild/openbsd-arm64" "0.25.6"
-    "@esbuild/openbsd-x64" "0.25.6"
-    "@esbuild/openharmony-arm64" "0.25.6"
-    "@esbuild/sunos-x64" "0.25.6"
-    "@esbuild/win32-arm64" "0.25.6"
-    "@esbuild/win32-ia32" "0.25.6"
-    "@esbuild/win32-x64" "0.25.6"
+    "@esbuild/aix-ppc64" "0.25.10"
+    "@esbuild/android-arm" "0.25.10"
+    "@esbuild/android-arm64" "0.25.10"
+    "@esbuild/android-x64" "0.25.10"
+    "@esbuild/darwin-arm64" "0.25.10"
+    "@esbuild/darwin-x64" "0.25.10"
+    "@esbuild/freebsd-arm64" "0.25.10"
+    "@esbuild/freebsd-x64" "0.25.10"
+    "@esbuild/linux-arm" "0.25.10"
+    "@esbuild/linux-arm64" "0.25.10"
+    "@esbuild/linux-ia32" "0.25.10"
+    "@esbuild/linux-loong64" "0.25.10"
+    "@esbuild/linux-mips64el" "0.25.10"
+    "@esbuild/linux-ppc64" "0.25.10"
+    "@esbuild/linux-riscv64" "0.25.10"
+    "@esbuild/linux-s390x" "0.25.10"
+    "@esbuild/linux-x64" "0.25.10"
+    "@esbuild/netbsd-arm64" "0.25.10"
+    "@esbuild/netbsd-x64" "0.25.10"
+    "@esbuild/openbsd-arm64" "0.25.10"
+    "@esbuild/openbsd-x64" "0.25.10"
+    "@esbuild/openharmony-arm64" "0.25.10"
+    "@esbuild/sunos-x64" "0.25.10"
+    "@esbuild/win32-arm64" "0.25.10"
+    "@esbuild/win32-ia32" "0.25.10"
+    "@esbuild/win32-x64" "0.25.10"
 
 escalade@^3.1.1, escalade@^3.2.0:
   version "3.2.0"
@@ -17323,23 +17320,18 @@ follow-redirects@^1.0.0, follow-redirects@^1.15.6, follow-redirects@^1.15.9:
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.9.tgz#a604fa10e443bf98ca94228d9eebcc2e8a2c8ee1"
   integrity sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==
 
-for-each@^0.3.3:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"
-  integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==
+for-each@^0.3.3, for-each@^0.3.5:
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.5.tgz#d650688027826920feeb0af747ee7b9421a41d47"
+  integrity sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==
   dependencies:
-    is-callable "^1.1.3"
+    is-callable "^1.2.7"
 
 for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
   integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
 
-foreach@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
-  integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k=
-
 foreground-child@^3.1.0:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.3.1.tgz#32e8e9ed1b68a3497befb9ac2b6adf92a638576f"
@@ -18911,9 +18903,9 @@ http-proxy-agent@^7.0.0:
     debug "^4.3.4"
 
 http-proxy-middleware@^2.0.3:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz#915f236d92ae98ef48278a95dedf17e991936ec6"
-  integrity sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==
+  version "2.0.9"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.9.tgz#e9e63d68afaa4eee3d147f39149ab84c0c2815ef"
+  integrity sha512-c1IyJYLYppU574+YI7R4QyX2ystMtVXZwIdzazUIPIJsHuWNd+mho2j+bKoHftndicGj9yh+xjd+l0yj7VeT1Q==
   dependencies:
     "@types/http-proxy" "^1.17.8"
     http-proxy "^1.18.1"
@@ -19460,7 +19452,7 @@ is-builtin-module@^3.1.0, is-builtin-module@^3.2.1:
   dependencies:
     builtin-modules "^3.3.0"
 
-is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7:
+is-callable@^1.1.4, is-callable@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
   integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
@@ -19809,16 +19801,12 @@ is-type@0.0.1:
   dependencies:
     core-util-is "~1.0.0"
 
-is-typed-array@^1.1.3:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.5.tgz#f32e6e096455e329eb7b423862456aa213f0eb4e"
-  integrity sha512-S+GRDgJlR3PyEbsX/Fobd9cqpZBuvUS+8asRqYDMLCb2qMzt1oz5m5oxQCxOgUDxiWsOVNi4yaF+/uvdlHlYug==
+is-typed-array@^1.1.14, is-typed-array@^1.1.3:
+  version "1.1.15"
+  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.15.tgz#4bfb4a45b61cee83a5a46fba778e4e8d59c0ce0b"
+  integrity sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==
   dependencies:
-    available-typed-arrays "^1.0.2"
-    call-bind "^1.0.2"
-    es-abstract "^1.18.0-next.2"
-    foreach "^2.0.5"
-    has-symbols "^1.0.1"
+    which-typed-array "^1.1.16"
 
 is-typedarray@^1.0.0:
   version "1.0.0"
@@ -20282,18 +20270,18 @@ json-stringify-safe@^5.0.1:
 json5@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
-  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
+  integrity sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw==
 
 json5@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
-  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"
+  integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==
   dependencies:
     minimist "^1.2.0"
 
 json5@^2.1.2, json5@^2.2.1, json5@^2.2.2, json5@^2.2.3:
   version "2.2.3"
-  resolved "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
 
 jsonc-parser@3.1.0:
@@ -24606,7 +24594,7 @@ path-to-regexp@6.3.0, path-to-regexp@^6.2.0, path-to-regexp@^6.2.1:
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-6.3.0.tgz#2b6a26a337737a8e1416f9272ed0766b1c0389f4"
   integrity sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==
 
-path-to-regexp@8.2.0, path-to-regexp@^8.0.0, path-to-regexp@^8.1.0:
+path-to-regexp@8.2.0:
   version "8.2.0"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-8.2.0.tgz#73990cc29e57a3ff2a0d914095156df5db79e8b4"
   integrity sha512-TdrF7fW9Rphjq4RjrW0Kp2AW0Ahwu9sRGTkS6bvDi0SCwZlEZYmcfDbEsTz8RVk0EHIS/Vd1bv3JhG+1xZuAyQ==
@@ -24618,6 +24606,11 @@ path-to-regexp@^1.5.3, path-to-regexp@^1.7.0:
   dependencies:
     isarray "0.0.1"
 
+path-to-regexp@^8.0.0, path-to-regexp@^8.1.0:
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-8.3.0.tgz#aa818a6981f99321003a08987d3cec9c3474cd1f"
+  integrity sha512-7jdwVIRtsP8MYpdXSwOS0YdD0Du+qOoF/AEPIt88PcCFrZCzx41oxku1jD88hZBwbNUIEfpqvuhjFaMAqMTWnA==
+
 path-type@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
@@ -27252,7 +27245,7 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
+safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.1, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -27593,7 +27586,7 @@ set-cookie-parser@^2.4.8, set-cookie-parser@^2.6.0:
   resolved "https://registry.yarnpkg.com/set-cookie-parser/-/set-cookie-parser-2.6.0.tgz#131921e50f62ff1a66a461d7d62d7b21d5d15a51"
   integrity sha512-RVnVQxTXuerk653XfuliOxBP81Sf0+qfQE73LIYKcyMYHG94AuH0kgrQpRDuTZnSmjpysHmzxJXKNfa6PjFhyQ==
 
-set-function-length@^1.2.1:
+set-function-length@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449"
   integrity sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==
@@ -27641,12 +27634,13 @@ setprototypeof@1.2.0:
   integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
 
 sha.js@^2.4.11:
-  version "2.4.11"
-  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
-  integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
+  version "2.4.12"
+  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.12.tgz#eb8b568bf383dfd1867a32c3f2b74eb52bdbf23f"
+  integrity sha512-8LzC5+bvI45BjpfXU8V5fdU2mfeKiQe1D1gIMn7XUlF3OTUrpdJpPPH4EMAnF0DsHHdSZqCdSss5qCmJKuiO3w==
   dependencies:
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
+    inherits "^2.0.4"
+    safe-buffer "^5.2.1"
+    to-buffer "^1.2.0"
 
 shallow-clone@^3.0.0:
   version "3.0.1"
@@ -29043,9 +29037,9 @@ tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0:
   integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
 
 tar-fs@^2.0.0:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.3.tgz#fb3b8843a26b6f13a08e606f7922875eb1fbbf92"
-  integrity sha512-090nwYJDmlhwFwEW3QQl+vaNnxsO2yVsd45eTKRBzSzu+hlb1w2K9inVq5b0ngXuLVqQ4ApvsUHHnu/zQNkWAg==
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.4.tgz#800824dbf4ef06ded9afea4acafe71c67c76b930"
+  integrity sha512-mDAjwmZdh7LTT6pNleZ05Yt65HC3E+NiQzl672vQG38jIrehtJk/J3mNwIg+vShQPcLF/LV7CMnDW6vjj6sfYQ==
   dependencies:
     chownr "^1.1.1"
     mkdirp-classic "^0.5.2"
@@ -29053,9 +29047,9 @@ tar-fs@^2.0.0:
     tar-stream "^2.1.4"
 
 tar-fs@^3.0.4:
-  version "3.0.10"
-  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-3.0.10.tgz#60f8ccd60fe30164bdd3d6606619650236ed38f7"
-  integrity sha512-C1SwlQGNLe/jPNqapK8epDsXME7CAJR5RL3GcE6KWx1d9OUByzoHVcbu1VPI8tevg9H8Alae0AApHHFGzrD5zA==
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-3.1.1.tgz#4f164e59fb60f103d472360731e8c6bb4a7fe9ef"
+  integrity sha512-LZA0oaPOc2fVo82Txf3gw+AkEd38szODlptMYejQUhndHMLQ9M059uXR+AfS7DNo0NpINvSqDsvyaCrBVkptWg==
   dependencies:
     pump "^3.0.0"
     tar-stream "^3.1.5"
@@ -29426,7 +29420,7 @@ tmp-promise@^3.0.2:
 tmp@0.0.28:
   version "0.0.28"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.28.tgz#172735b7f614ea7af39664fa84cf0de4e515d120"
-  integrity sha1-Fyc1t/YU6nrzlmT6hM8N5OUV0SA=
+  integrity sha512-c2mmfiBmND6SOVxzogm1oda0OJ1HZVIk/5n26N59dDTh80MUeavpiCls4PGAdkX1PFkKokLpcf7prSjCeXLsJg==
   dependencies:
     os-tmpdir "~1.0.1"
 
@@ -29445,15 +29439,24 @@ tmp@^0.1.0:
     rimraf "^2.6.3"
 
 tmp@^0.2.0, tmp@^0.2.1, tmp@~0.2.1:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.3.tgz#eb783cc22bc1e8bebd0671476d46ea4eb32a79ae"
-  integrity sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.5.tgz#b06bcd23f0f3c8357b426891726d16015abfd8f8"
+  integrity sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow==
 
 tmpl@1.0.x:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
   integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==
 
+to-buffer@^1.2.0:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.2.2.tgz#ffe59ef7522ada0a2d1cb5dfe03bb8abc3cdc133"
+  integrity sha512-db0E3UJjcFhpDhAF4tLo03oli3pwl3dbnzXOUIlRKrp+ldk/VUxzpWYZENsw2SZiuBjHAk7DfB0VU7NKdpb6sw==
+  dependencies:
+    isarray "^2.0.5"
+    safe-buffer "^5.2.1"
+    typed-array-buffer "^1.0.3"
+
 to-object-path@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
@@ -29827,6 +29830,15 @@ type-level-regexp@~0.1.17:
   resolved "https://registry.yarnpkg.com/type-level-regexp/-/type-level-regexp-0.1.17.tgz#ec1bf7dd65b85201f9863031d6f023bdefc2410f"
   integrity sha512-wTk4DH3cxwk196uGLK/E9pE45aLfeKJacKmcEgEOA/q5dnPGNxXt0cfYdFxb57L+sEpf1oJH4Dnx/pnRcku9jg==
 
+typed-array-buffer@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz#a72395450a4869ec033fd549371b47af3a2ee536"
+  integrity sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==
+  dependencies:
+    call-bound "^1.0.3"
+    es-errors "^1.3.0"
+    is-typed-array "^1.1.14"
+
 typed-assert@^1.0.8:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/typed-assert/-/typed-assert-1.0.9.tgz#8af9d4f93432c4970ec717e3006f33f135b06213"
@@ -30007,9 +30019,9 @@ undici@^5.25.4, undici@^5.28.5:
     "@fastify/busboy" "^2.0.0"
 
 undici@^6.11.1, undici@^6.19.2:
-  version "6.21.1"
-  resolved "https://registry.yarnpkg.com/undici/-/undici-6.21.1.tgz#336025a14162e6837e44ad7b819b35b6c6af0e05"
-  integrity sha512-q/1rj5D0/zayJB2FraXdaWxbhWiNKDvu8naDT2dl1yTlvJp4BLtOcp2a5BvgGNQpYYJzau7tf1WgKv3b+7mqpQ==
+  version "6.21.3"
+  resolved "https://registry.yarnpkg.com/undici/-/undici-6.21.3.tgz#185752ad92c3d0efe7a7d1f6854a50f83b552d7a"
+  integrity sha512-gBLkYIlEnSp8pFbT64yFgGE6UIB9tAkhukC23PmMDCe5Nd+cRqKxSjw5y54MK2AZMgZfJWMaNE4nYUHgi1XEOw==
 
 unenv@2.0.0-rc.17:
   version "2.0.0-rc.17"
@@ -31484,15 +31496,17 @@ which-pm@^2.1.1:
     load-yaml-file "^0.2.0"
     path-exists "^4.0.0"
 
-which-typed-array@^1.1.13, which-typed-array@^1.1.2:
-  version "1.1.15"
-  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.15.tgz#264859e9b11a649b388bfaaf4f767df1f779b38d"
-  integrity sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==
+which-typed-array@^1.1.13, which-typed-array@^1.1.16, which-typed-array@^1.1.2:
+  version "1.1.19"
+  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.19.tgz#df03842e870b6b88e117524a4b364b6fc689f956"
+  integrity sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==
   dependencies:
     available-typed-arrays "^1.0.7"
-    call-bind "^1.0.7"
-    for-each "^0.3.3"
-    gopd "^1.0.1"
+    call-bind "^1.0.8"
+    call-bound "^1.0.4"
+    for-each "^0.3.5"
+    get-proto "^1.0.1"
+    gopd "^1.2.0"
     has-tostringtag "^1.0.2"
 
 which@^1.2.14, which@^1.2.9:

From 49badb04a655513fdb0bd87ae949ce13d8c60f75 Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Wed, 19 Nov 2025 16:03:13 +0100
Subject: [PATCH 099/186] feat(core): Add `gibibyte` and `pebibyte` to
 `InformationUnit` type (#18241)

Both of these units are supported by Relay, see
https://getsentry.github.io/relay/relay_metrics/enum.InformationUnit.html.
---
 packages/core/src/types-hoist/measurement.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/core/src/types-hoist/measurement.ts b/packages/core/src/types-hoist/measurement.ts
index 8aea675d5254..40649ddab439 100644
--- a/packages/core/src/types-hoist/measurement.ts
+++ b/packages/core/src/types-hoist/measurement.ts
@@ -17,9 +17,11 @@ export type InformationUnit =
   | 'megabyte'
   | 'mebibyte'
   | 'gigabyte'
+  | 'gibibyte'
   | 'terabyte'
   | 'tebibyte'
   | 'petabyte'
+  | 'pebibyte'
   | 'exabyte'
   | 'exbibyte';
 

From 93faf616244c7ca7480f2a738543923f54b01b78 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Nov 2025 16:42:40 +0000
Subject: [PATCH 100/186] chore(deps): bump glob from 11.0.1 to 11.1.0 in
 /packages/react-router (#18243)

---
 packages/react-router/package.json |  2 +-
 yarn.lock                          | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/packages/react-router/package.json b/packages/react-router/package.json
index 3d57ad54469f..d988e14aea8a 100644
--- a/packages/react-router/package.json
+++ b/packages/react-router/package.json
@@ -55,7 +55,7 @@
     "@sentry/node": "10.26.0",
     "@sentry/react": "10.26.0",
     "@sentry/vite-plugin": "^4.1.0",
-    "glob": "11.0.1"
+    "glob": "11.1.0"
   },
   "devDependencies": {
     "@react-router/dev": "^7.5.2",
diff --git a/yarn.lock b/yarn.lock
index c93b8a45e748..93c288553b5b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17332,7 +17332,7 @@ for-in@^1.0.2:
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
   integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
 
-foreground-child@^3.1.0:
+foreground-child@^3.1.0, foreground-child@^3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.3.1.tgz#32e8e9ed1b68a3497befb9ac2b6adf92a638576f"
   integrity sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==
@@ -17907,14 +17907,14 @@ glob-to-regexp@0.4.1, glob-to-regexp@^0.4.1:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
-glob@11.0.1:
-  version "11.0.1"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-11.0.1.tgz#1c3aef9a59d680e611b53dcd24bb8639cef064d9"
-  integrity sha512-zrQDm8XPnYEKawJScsnM0QzobJxlT/kHOOlRTio8IH/GrmxRE5fjllkzdaHclIuNjUQTJYH2xHNIGfdpJkDJUw==
+glob@11.1.0:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-11.1.0.tgz#4f826576e4eb99c7dad383793d2f9f08f67e50a6"
+  integrity sha512-vuNwKSaKiqm7g0THUBu2x7ckSs3XJLXE+2ssL7/MfTGPLLcrJQ/4Uq1CjPTtO5cCIiRxqvN6Twy1qOwhL0Xjcw==
   dependencies:
-    foreground-child "^3.1.0"
-    jackspeak "^4.0.1"
-    minimatch "^10.0.0"
+    foreground-child "^3.3.1"
+    jackspeak "^4.1.1"
+    minimatch "^10.1.1"
     minipass "^7.1.2"
     package-json-from-dist "^1.0.0"
     path-scurry "^2.0.0"
@@ -20023,7 +20023,7 @@ jackspeak@^3.1.2:
   optionalDependencies:
     "@pkgjs/parseargs" "^0.11.0"
 
-jackspeak@^4.0.1:
+jackspeak@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-4.1.1.tgz#96876030f450502047fc7e8c7fcf8ce8124e43ae"
   integrity sha512-zptv57P3GpL+O0I7VdMJNBZCu+BPHVQUk55Ft8/QCJjTVxrnJHuVuX/0Bl2A6/+2oyR/ZMEuFKwmzqqZ/U5nPQ==
@@ -22289,10 +22289,10 @@ minimatch@5.1.0, minimatch@^5.0.1, minimatch@^5.1.0:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimatch@^10.0.0:
-  version "10.0.3"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-10.0.3.tgz#cf7a0314a16c4d9ab73a7730a0e8e3c3502d47aa"
-  integrity sha512-IPZ167aShDZZUMdRk66cyQAW3qr0WzbHkPdMYa8bzZhlHhO3jALbKdxcaak7W9FfT2rZNpQuUu4Od7ILEpXSaw==
+minimatch@^10.1.1:
+  version "10.1.1"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-10.1.1.tgz#e6e61b9b0c1dcab116b5a7d1458e8b6ae9e73a55"
+  integrity sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==
   dependencies:
     "@isaacs/brace-expansion" "^5.0.0"
 

From 6d75c8f2894c79596a8489b87cdd0315bf4e7dd4 Mon Sep 17 00:00:00 2001
From: Charly Gomez <charly.gomez@sentry.io>
Date: Thu, 20 Nov 2025 10:24:44 +0100
Subject: [PATCH 101/186] fix(metrics): Update return type of
 `beforeSendMetric`  (#18261)

---
 packages/core/src/types-hoist/options.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/core/src/types-hoist/options.ts b/packages/core/src/types-hoist/options.ts
index ccdc3b180e15..59c4609f01c4 100644
--- a/packages/core/src/types-hoist/options.ts
+++ b/packages/core/src/types-hoist/options.ts
@@ -420,9 +420,9 @@ export interface ClientOptions<TO extends BaseTransportOptions = BaseTransportOp
    * @default undefined
    *
    * @param metric The metric generated by the SDK.
-   * @returns A new metric that will be sent.
+   * @returns A new metric that will be sent | null.
    */
-  beforeSendMetric?: (metric: Metric) => Metric;
+  beforeSendMetric?: (metric: Metric) => Metric | null;
 
   /**
    * Function to compute tracing sample rate dynamically and filter unwanted traces.

From 5503d96ed85d6a32383f702456526a4f83e04753 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Nov 2025 11:17:17 +0100
Subject: [PATCH 102/186] chore(deps): bump astro from 4.16.18 to 5.15.9 in
 /dev-packages/e2e-tests/test-applications/cloudflare-astro (#18259)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps
[astro](https://github.com/withastro/astro/tree/HEAD/packages/astro)
from 4.16.18 to 5.15.9.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/withastro/astro/releases">astro's
releases</a>.</em></p>
<blockquote>
<h2>astro@5.15.9</h2>
<h3>Patch Changes</h3>
<ul>
<li>
<p><a
href="https://github.com/withastro/astro/pull/14786">#14786</a>
<a
href="https://github.com/withastro/astro/commit/758a891112839a108479fd0489a1785640b31ecf"><code>758a891</code></a>
Thanks <a href="https://github.com/mef"><code>@​mef</code></a>! - Add
handling of invalid encrypted props and slots in server islands.</p>
</li>
<li>
<p><a
href="https://github.com/withastro/astro/pull/14783">#14783</a>
<a
href="https://github.com/withastro/astro/commit/504958fe7fccd7bffc177a1f4b1bf4e22989470e"><code>504958f</code></a>
Thanks <a
href="https://github.com/florian-lefebvre"><code>@​florian-lefebvre</code></a>!
- Improves the experimental Fonts API build log to show the number of
downloaded files. This can help spotting excessive downloading because
of misconfiguration</p>
</li>
<li>
<p><a
href="https://github.com/withastro/astro/pull/14791">#14791</a>
<a
href="https://github.com/withastro/astro/commit/9e9c528191b6f5e06db9daf6ad26b8f68016e533"><code>9e9c528</code></a>
Thanks <a
href="https://github.com/Princesseuh"><code>@​Princesseuh</code></a>! -
Changes the remote protocol checks for images to require explicit
authorization in order to use data URIs.</p>
<p>In order to allow data URIs for remote images, you will need to
update your <code>astro.config.mjs</code> file to include the following
configuration:</p>
<pre lang="js"><code>// astro.config.mjs
import { defineConfig } from 'astro/config';
<p>export default defineConfig({
images: {
remotePatterns: [
{
protocol: 'data',
},
],
},
});
</code></pre></p>
</li>
<li>
<p><a
href="https://github.com/withastro/astro/pull/14787">#14787</a>
<a
href="https://github.com/withastro/astro/commit/0f75f6bc637d547e07324e956db21d9f245a3e8e"><code>0f75f6b</code></a>
Thanks <a
href="https://github.com/matthewp"><code>@​matthewp</code></a>! - Fixes
wildcard hostname pattern matching to correctly reject hostnames without
dots</p>
<p>Previously, hostnames like <code>localhost</code> or other
single-part names would incorrectly match patterns like
<code>*.example.com</code>. The wildcard matching logic has been
corrected to ensure that only valid subdomains matching the pattern are
accepted.</p>
</li>
<li>
<p><a
href="https://github.com/withastro/astro/pull/14776">#14776</a>
<a
href="https://github.com/withastro/astro/commit/3537876fde3bdb2a0ded99cc9b00d53f66160a7f"><code>3537876</code></a>
Thanks <a href="https://github.com/ktym4a"><code>@​ktym4a</code></a>! -
Fixes the behavior of <code>passthroughImageService</code> so it does
not generate webp.</p>
</li>
<li>
<p>Updated dependencies [<a
href="https://github.com/withastro/astro/commit/9e9c528191b6f5e06db9daf6ad26b8f68016e533"><code>9e9c528</code></a>,
<a
href="https://github.com/withastro/astro/commit/0f75f6bc637d547e07324e956db21d9f245a3e8e"><code>0f75f6b</code></a>]:</p>
<ul>
<li><code>@​astrojs/internal-helpers</code><a
href="https://github.com/0"><code>@​0</code></a>.7.5</li>
<li><code>@​astrojs/markdown-remark</code><a
href="https://github.com/6"><code>@​6</code></a>.3.9</li>
</ul>
</li>
</ul>
<h2>astro@5.15.8</h2>
<h3>Patch Changes</h3>
<ul>
<li>
<p><a
href="https://github.com/withastro/astro/pull/14772">#14772</a>
<a
href="https://github.com/withastro/astro/commit/00c579a23322d92459e4ccad0ec365c4d1980a5d"><code>00c579a</code></a>
Thanks <a
href="https://github.com/matthewp"><code>@​matthewp</code></a>! -
Improves the security of Server Islands slots by encrypting them before
transmission to the browser, matching the security model used for props.
This improves the integrity of slot content and prevents injection
attacks, even when component templates don't explicitly support
slots.</p>
<p>Slots continue to work as expected for normal usage—this change has
no breaking changes for legitimate requests.</p>
</li>
<li>
<p><a
href="https://github.com/withastro/astro/pull/14771">#14771</a>
<a
href="https://github.com/withastro/astro/commit/6f800813516b07bbe12c666a92937525fddb58ce"><code>6f80081</code></a>
Thanks <a
href="https://github.com/matthewp"><code>@​matthewp</code></a>! - Fix
middleware pathname matching by normalizing URL-encoded paths</p>
<p>Middleware now receives normalized pathname values, ensuring that
encoded paths like <code>/%61dmin</code> are properly decoded to
<code>/admin</code> before middleware checks. This prevents potential
security issues where middleware checks might be bypassed through URL
encoding.</p>
</li>
</ul>
<h2>astro@5.15.7</h2>
<h3>Patch Changes</h3>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/withastro/astro/blob/main/packages/astro/CHANGELOG.md">astro's
changelog</a>.</em></p>
<blockquote>
<h2>5.15.9</h2>
<h3>Patch Changes</h3>
<ul>
<li>
<p><a
href="https://github.com/withastro/astro/pull/14786">#14786</a>
<a
href="https://github.com/withastro/astro/commit/758a891112839a108479fd0489a1785640b31ecf"><code>758a891</code></a>
Thanks <a href="https://github.com/mef"><code>@​mef</code></a>! - Add
handling of invalid encrypted props and slots in server islands.</p>
</li>
<li>
<p><a
href="https://github.com/withastro/astro/pull/14783">#14783</a>
<a
href="https://github.com/withastro/astro/commit/504958fe7fccd7bffc177a1f4b1bf4e22989470e"><code>504958f</code></a>
Thanks <a
href="https://github.com/florian-lefebvre"><code>@​florian-lefebvre</code></a>!
- Improves the experimental Fonts API build log to show the number of
downloaded files. This can help spotting excessive downloading because
of misconfiguration</p>
</li>
<li>
<p><a
href="https://github.com/withastro/astro/pull/14791">#14791</a>
<a
href="https://github.com/withastro/astro/commit/9e9c528191b6f5e06db9daf6ad26b8f68016e533"><code>9e9c528</code></a>
Thanks <a
href="https://github.com/Princesseuh"><code>@​Princesseuh</code></a>! -
Changes the remote protocol checks for images to require explicit
authorization in order to use data URIs.</p>
<p>In order to allow data URIs for remote images, you will need to
update your <code>astro.config.mjs</code> file to include the following
configuration:</p>
<pre lang="js"><code>// astro.config.mjs
import { defineConfig } from 'astro/config';
<p>export default defineConfig({
images: {
remotePatterns: [
{
protocol: 'data',
},
],
},
});
</code></pre></p>
</li>
<li>
<p><a
href="https://github.com/withastro/astro/pull/14787">#14787</a>
<a
href="https://github.com/withastro/astro/commit/0f75f6bc637d547e07324e956db21d9f245a3e8e"><code>0f75f6b</code></a>
Thanks <a
href="https://github.com/matthewp"><code>@​matthewp</code></a>! - Fixes
wildcard hostname pattern matching to correctly reject hostnames without
dots</p>
<p>Previously, hostnames like <code>localhost</code> or other
single-part names would incorrectly match patterns like
<code>*.example.com</code>. The wildcard matching logic has been
corrected to ensure that only valid subdomains matching the pattern are
accepted.</p>
</li>
<li>
<p><a
href="https://github.com/withastro/astro/pull/14776">#14776</a>
<a
href="https://github.com/withastro/astro/commit/3537876fde3bdb2a0ded99cc9b00d53f66160a7f"><code>3537876</code></a>
Thanks <a href="https://github.com/ktym4a"><code>@​ktym4a</code></a>! -
Fixes the behavior of <code>passthroughImageService</code> so it does
not generate webp.</p>
</li>
<li>
<p>Updated dependencies [<a
href="https://github.com/withastro/astro/commit/9e9c528191b6f5e06db9daf6ad26b8f68016e533"><code>9e9c528</code></a>,
<a
href="https://github.com/withastro/astro/commit/0f75f6bc637d547e07324e956db21d9f245a3e8e"><code>0f75f6b</code></a>]:</p>
<ul>
<li><code>@​astrojs/internal-helpers</code><a
href="https://github.com/0"><code>@​0</code></a>.7.5</li>
<li><code>@​astrojs/markdown-remark</code><a
href="https://github.com/6"><code>@​6</code></a>.3.9</li>
</ul>
</li>
</ul>
<h2>5.15.8</h2>
<h3>Patch Changes</h3>
<ul>
<li>
<p><a
href="https://github.com/withastro/astro/pull/14772">#14772</a>
<a
href="https://github.com/withastro/astro/commit/00c579a23322d92459e4ccad0ec365c4d1980a5d"><code>00c579a</code></a>
Thanks <a
href="https://github.com/matthewp"><code>@​matthewp</code></a>! -
Improves the security of Server Islands slots by encrypting them before
transmission to the browser, matching the security model used for props.
This improves the integrity of slot content and prevents injection
attacks, even when component templates don't explicitly support
slots.</p>
<p>Slots continue to work as expected for normal usage—this change has
no breaking changes for legitimate requests.</p>
</li>
<li>
<p><a
href="https://github.com/withastro/astro/pull/14771">#14771</a>
<a
href="https://github.com/withastro/astro/commit/6f800813516b07bbe12c666a92937525fddb58ce"><code>6f80081</code></a>
Thanks <a
href="https://github.com/matthewp"><code>@​matthewp</code></a>! - Fix
middleware pathname matching by normalizing URL-encoded paths</p>
<p>Middleware now receives normalized pathname values, ensuring that
encoded paths like <code>/%61dmin</code> are properly decoded to
<code>/admin</code> before middleware checks. This prevents potential
security issues where middleware checks might be bypassed through URL
encoding.</p>
</li>
</ul>
<h2>5.15.7</h2>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/withastro/astro/commit/7a07f0244c78a8f1889c1e08910ac2033c9a8c4c"><code>7a07f02</code></a>
[ci] release (<a
href="https://github.com/withastro/astro/tree/HEAD/packages/astro/issues/14788">#14788</a>)</li>
<li><a
href="https://github.com/withastro/astro/commit/8cf3f0544fac865848bf6d5cc1d9e9d9b117aa7d"><code>8cf3f05</code></a>
[ci] format</li>
<li><a
href="https://github.com/withastro/astro/commit/758a891112839a108479fd0489a1785640b31ecf"><code>758a891</code></a>
fix(astro): handle invalid encrypted props in server island (<a
href="https://github.com/withastro/astro/tree/HEAD/packages/astro/issues/14786">#14786</a>)</li>
<li><a
href="https://github.com/withastro/astro/commit/3537876fde3bdb2a0ded99cc9b00d53f66160a7f"><code>3537876</code></a>
fix: <code>passthroughImageService</code> generate webp (<a
href="https://github.com/withastro/astro/tree/HEAD/packages/astro/issues/14776">#14776</a>)</li>
<li><a
href="https://github.com/withastro/astro/commit/048e4dc764d0dc2aee4ce67c7a8bb582011980dd"><code>048e4dc</code></a>
[ci] format</li>
<li><a
href="https://github.com/withastro/astro/commit/9e9c528191b6f5e06db9daf6ad26b8f68016e533"><code>9e9c528</code></a>
fix: require explicit authorization to use data urls (<a
href="https://github.com/withastro/astro/tree/HEAD/packages/astro/issues/14791">#14791</a>)</li>
<li><a
href="https://github.com/withastro/astro/commit/0f75f6bc637d547e07324e956db21d9f245a3e8e"><code>0f75f6b</code></a>
Fix wildcard hostname matching to reject hostnames without dots (<a
href="https://github.com/withastro/astro/tree/HEAD/packages/astro/issues/14787">#14787</a>)</li>
<li><a
href="https://github.com/withastro/astro/commit/504958fe7fccd7bffc177a1f4b1bf4e22989470e"><code>504958f</code></a>
feat(fonts): log number of downloaded files (<a
href="https://github.com/withastro/astro/tree/HEAD/packages/astro/issues/14783">#14783</a>)</li>
<li><a
href="https://github.com/withastro/astro/commit/24e28d2aea9f8d3dbace85947e4712a06190568d"><code>24e28d2</code></a>
fix(deps): update astro dependencies (<a
href="https://github.com/withastro/astro/tree/HEAD/packages/astro/issues/14779">#14779</a>)</li>
<li><a
href="https://github.com/withastro/astro/commit/60af4d0a1a56d8db56e3d737f4f9ea680203490e"><code>60af4d0</code></a>
[ci] release (<a
href="https://github.com/withastro/astro/tree/HEAD/packages/astro/issues/14773">#14773</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/withastro/astro/commits/astro@5.15.9/packages/astro">compare
view</a></li>
</ul>
</details>
<details>
<summary>Maintainer changes</summary>
<p>This version was pushed to npm by [GitHub Actions](<a
href="https://www.npmjs.com/~GitHub">https://www.npmjs.com/~GitHub</a>
Actions), a new releaser for astro since your current version.</p>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=astro&package-manager=npm_and_yarn&previous-version=4.16.18&new-version=5.15.9)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
You can disable automated security fix PRs for this repo from the
[Security Alerts
page](https://github.com/getsentry/sentry-javascript/network/alerts).

</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .../e2e-tests/test-applications/cloudflare-astro/package.json   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-astro/package.json b/dev-packages/e2e-tests/test-applications/cloudflare-astro/package.json
index 5adbcd6ad75f..4db15edabbd7 100644
--- a/dev-packages/e2e-tests/test-applications/cloudflare-astro/package.json
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-astro/package.json
@@ -19,7 +19,7 @@
   "dependencies": {
     "@astrojs/cloudflare": "8.1.0",
     "@sentry/astro": "latest || *",
-    "astro": "4.16.18"
+    "astro": "5.15.9"
   },
   "devDependencies": {
     "@astrojs/internal-helpers": "0.4.1"

From f0d5d76046b476f5ab9beaa75803d2987ba2f435 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Nov 2025 11:17:34 +0100
Subject: [PATCH 103/186] build(deps): bump hono from 4.9.7 to 4.10.3 in
 /dev-packages/e2e-tests/test-applications/cloudflare-hono (#18038)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [hono](https://github.com/honojs/hono) from 4.9.7 to 4.10.3.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/honojs/hono/releases">hono's
releases</a>.</em></p>
<blockquote>
<h2>v4.10.3</h2>
<h2>Securiy Fix</h2>
<p>A security issue in the CORS middleware has been fixed. In some
cases, a request header could affect the Vary response header. Please
update to the latest version if you are using the CORS middleware.</p>
<h2>What's Changed</h2>
<ul>
<li>fix(aws-lambda): serve microsoft office files as binary in lambda
handler by <a
href="https://github.com/matthiasfeist"><code>@​matthiasfeist</code></a>
in <a
href="https://github.com/honojs/hono/pull/4469">honojs/hono#4469</a></li>
<li>fix(request-id): validation accepts <code>=</code> by <a
href="https://github.com/ryuapp"><code>@​ryuapp</code></a> in <a
href="https://github.com/honojs/hono/pull/4478">honojs/hono#4478</a></li>
<li>refactor(jwt): reduce the size of the code generated by minification
by <a href="https://github.com/usualoma"><code>@​usualoma</code></a> in
<a
href="https://github.com/honojs/hono/pull/4480">honojs/hono#4480</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a
href="https://github.com/matthiasfeist"><code>@​matthiasfeist</code></a>
made their first contribution in <a
href="https://github.com/honojs/hono/pull/4469">honojs/hono#4469</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/honojs/hono/compare/v4.10.2...v4.10.3">https://github.com/honojs/hono/compare/v4.10.2...v4.10.3</a></p>
<h2>v4.10.2</h2>
<h2>Security hardening improvement</h2>
<p>If you are using JWT middleware, please read the following and
consider applying the configuration.</p>
<h3>Improper Authorization in Hono (JWT Audience Validation)</h3>
<p>Hono’s JWT authentication middleware did not validate the aud
(Audience) claim by default. As a result, applications using the
middleware without an explicit audience check could accept tokens
intended for other audiences, leading to potential cross-service access
(token mix-up).</p>
<p>The issue is addressed by adding a new <code>verification.aud</code>
configuration option to allow RFC 7519–compliant audience validation.
This change is classified as a security hardening improvement, but the
lack of validation can still be considered a vulnerability in
deployments that rely on default JWT verification.</p>
<h3>Recommended secure configuration</h3>
<p>You can enable RFC 7519–compliant audience validation using the new
<code>verification.aud</code> option:</p>
<pre lang="ts"><code>import { Hono } from 'hono'
import { jwt } from 'hono/jwt'
<p>const app = new Hono()</p>
<p>app.use(<br />
'/api/*',<br />
jwt({<br />
secret: 'my-secret',<br />
verification: {<br />
// Require this API to only accept tokens with aud = 'service-a'<br />
aud: 'service-a',<br />
},<br />
})<br />
)<br />
</code></pre></p>
<h2>What's Changed</h2>
<ul>
<li>tests: Fix test case of handlers without a path by <a
href="https://github.com/IAmSSH"><code>@​IAmSSH</code></a> in <a
href="https://github.com/honojs/hono/pull/4472">honojs/hono#4472</a></li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/honojs/hono/commit/fcefd50c65144eda31e2bc6752c81904171d9629"><code>fcefd50</code></a>
4.10.3</li>
<li><a
href="https://github.com/honojs/hono/commit/95ae4d372119cddba32e4935d2bbc6f4e2768dab"><code>95ae4d3</code></a>
refactor(jwt): reduce the size of the code generated by minification (<a
href="https://github.com/honojs/hono/issues/4480">#4480</a>)</li>
<li><a
href="https://github.com/honojs/hono/commit/d9b8b4b73b4f997994f2764013207365fe711282"><code>d9b8b4b</code></a>
Merge commit from fork</li>
<li><a
href="https://github.com/honojs/hono/commit/52161170e83298fc3d13312bfceba3992916bfa2"><code>5216117</code></a>
fix(request-id): validation accepts <code>=</code> (<a
href="https://github.com/honojs/hono/issues/4478">#4478</a>)</li>
<li><a
href="https://github.com/honojs/hono/commit/253ec2857a083595e52a446694923645084e9ecd"><code>253ec28</code></a>
fix(aws-lambda): serve microsoft office files as binary in lambda
handler (<a
href="https://github.com/honojs/hono/issues/4">#4</a>...</li>
<li><a
href="https://github.com/honojs/hono/commit/0c6455dc10db6428257bdd601eca559247e27de6"><code>0c6455d</code></a>
4.10.2</li>
<li><a
href="https://github.com/honojs/hono/commit/45ba3bf9e3dff8e4bd85d6b47d4b71c8d6c66bef"><code>45ba3bf</code></a>
Merge commit from fork</li>
<li><a
href="https://github.com/honojs/hono/commit/4cbad8b3e2a67d77849710ec400d9de020c435fd"><code>4cbad8b</code></a>
tests: Fix test case of handlers without a path (<a
href="https://github.com/honojs/hono/issues/4472">#4472</a>)</li>
<li><a
href="https://github.com/honojs/hono/commit/db764c2f1d8a2905d66c78c41aa47e47d3a4165d"><code>db764c2</code></a>
4.10.1</li>
<li><a
href="https://github.com/honojs/hono/commit/8774bf9a59278a9593d5e91cc85543d5a4bb518c"><code>8774bf9</code></a>
fix(types): cannot <code>.use</code> non-return mw from
<code>createMiddleware</code> (<a
href="https://github.com/honojs/hono/issues/4465">#4465</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/honojs/hono/compare/v4.9.7...v4.10.3">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=hono&package-manager=npm_and_yarn&previous-version=4.9.7&new-version=4.10.3)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
You can disable automated security fix PRs for this repo from the
[Security Alerts
page](https://github.com/getsentry/sentry-javascript/network/alerts).

</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jan Peer Stöcklmair <jan.oster94@gmail.com>
---
 .../e2e-tests/test-applications/cloudflare-hono/package.json    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-hono/package.json b/dev-packages/e2e-tests/test-applications/cloudflare-hono/package.json
index de22031fdda9..5a582b0aa127 100644
--- a/dev-packages/e2e-tests/test-applications/cloudflare-hono/package.json
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-hono/package.json
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@sentry/cloudflare": "latest || *",
-    "hono": "4.9.7"
+    "hono": "4.10.3"
   },
   "devDependencies": {
     "@cloudflare/vitest-pool-workers": "^0.8.31",

From 28e9cc659914c0239e0a488b56e75560b6885826 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Peer=20St=C3=B6cklmair?= <jan.oster94@gmail.com>
Date: Thu, 20 Nov 2025 16:35:45 +0000
Subject: [PATCH 104/186] chore: Do not update opentelemetry (#18254)

This disables the creation of dependabot updates for opentelemetry.
Based on the image below there was not a real benefit of having this,
except noise.

<img width="984" height="820" alt="Screenshot 2025-11-19 at 11 21 02"
src="https://github.com/user-attachments/assets/6849c6e2-16d2-4cfd-874e-cd3241c70deb"
/>
---
 .github/dependabot.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 1df50881932d..66d551fabef8 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -14,9 +14,15 @@ updates:
       interval: 'weekly'
     allow:
       - dependency-name: '@sentry/*'
-      - dependency-name: '@opentelemetry/*'
-      - dependency-name: '@prisma/instrumentation'
       - dependency-name: '@playwright/test'
+      - dependency-name: '@opentelemetry/*'
+    ignore:
+      - dependency-name: '@opentelemetry/instrumentation'
+      - dependency-name: '@opentelemetry/instrumentation-*'
+    groups:
+      opentelemetry:
+        patterns:
+          - '@opentelemetry/*'
     versioning-strategy: increase
     commit-message:
       prefix: feat

From c7e88d4416f2527b279e6fefb9bc8e36589f11b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Peer=20St=C3=B6cklmair?= <jan.peer@sentry.io>
Date: Thu, 20 Nov 2025 16:43:26 +0000
Subject: [PATCH 105/186] fix(core): Add a PromiseBuffer for incoming events on
 the client (#18120)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Problem

Previously, the client would process all incoming events without any
limit, which could lead to unbounded growth of pending events/promises
in memory. This could cause performance issues and memory pressure in
high-throughput scenarios. This occurs when two conditions are met:

- when an integration with an async `processEvent` are added (e.g.
`ContextLines`, which is a defaultIntegration)
- events, e.g. `Sentry.captureException`, are called synchronously

```js
Sentry.init({ ... });

// ...

for (let i = 0; i < 5000; i++) {
  Sentry.captureException(new Error());
}
```

## Solution

This PR adds a `PromiseBuffer` to the `Client` class to limit the number
of concurrent event processing operations.

- Introduced a `_promiseBuffer` in the `Client` class that limits
concurrent event processing
- The buffer size defaults to `DEFAULT_TRANSPORT_BUFFER_SIZE` (64) but
can be configured via `transportOptions.bufferSize`
- When the buffer is full, events are rejected and properly tracked as
dropped events with the `queue_overflow` reason
  - Please tak
- Modified the `_process()` method to:
- Accept a task producer function instead of a promise directly (lazy
evaluation)
  - Use the promise buffer to manage concurrent operations
  - Track the data category for proper dropped event categorization

## Special 👀  on

- About reusing `transportOptions.bufferSize`: Not sure if this is the
best technique, but IMO both should have the same size - because if it
wouldn't it would be capped at a later stage (asking myself if the
transport still needs the promise buffer - as we have it now way earlier
in place)
- The `_process` takes now a `DataCategory`. At the time of the process
the event type is almost unknown. Not sure if I assumed the categories
correctly there, or if there is another technique of getting the type
(**edit:** a [comment by
Cursor](https://github.com/getsentry/sentry-javascript/pull/18120/files/2ee14b484d00432145d4f9a6773fbd31f92921d7#r2504259236)
helped a little and I added [a helper
function](https://github.com/getsentry/sentry-javascript/pull/18120/commits/7381a49ac34964d637f56625b2bf48617820b29d))
- `recordDroppedEvent` is now printing it one after each other -
theoretically we can count all occurences and print the count on it. I
decided against this one, since it would delay the user feedback - this
can be challenged though
---
 .size-limit.js                          | 10 ++--
 packages/core/src/client.ts             | 44 ++++++++++++-----
 packages/core/test/lib/client.test.ts   | 65 ++++++++++++++++++++++++-
 packages/core/test/mocks/integration.ts | 10 ++++
 4 files changed, 112 insertions(+), 17 deletions(-)

diff --git a/.size-limit.js b/.size-limit.js
index 184aad0698f4..100444907e06 100644
--- a/.size-limit.js
+++ b/.size-limit.js
@@ -38,7 +38,7 @@ module.exports = [
     path: 'packages/browser/build/npm/esm/prod/index.js',
     import: createImport('init', 'browserTracingIntegration'),
     gzip: true,
-    limit: '41.38 KB',
+    limit: '41.5 KB',
   },
   {
     name: '@sentry/browser (incl. Tracing, Profiling)',
@@ -127,7 +127,7 @@ module.exports = [
     import: createImport('init', 'ErrorBoundary', 'reactRouterV6BrowserTracingIntegration'),
     ignore: ['react/jsx-runtime'],
     gzip: true,
-    limit: '43.33 KB',
+    limit: '43.5 KB',
   },
   // Vue SDK (ESM)
   {
@@ -142,7 +142,7 @@ module.exports = [
     path: 'packages/vue/build/esm/index.js',
     import: createImport('init', 'browserTracingIntegration'),
     gzip: true,
-    limit: '43.2 KB',
+    limit: '43.3 KB',
   },
   // Svelte SDK (ESM)
   {
@@ -163,7 +163,7 @@ module.exports = [
     name: 'CDN Bundle (incl. Tracing)',
     path: createCDNPath('bundle.tracing.min.js'),
     gzip: true,
-    limit: '42 KB',
+    limit: '42.1 KB',
   },
   {
     name: 'CDN Bundle (incl. Tracing, Replay)',
@@ -231,7 +231,7 @@ module.exports = [
     import: createImport('init'),
     ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
     gzip: true,
-    limit: '51 KB',
+    limit: '51.1 KB',
   },
   // Node SDK (ESM)
   {
diff --git a/packages/core/src/client.ts b/packages/core/src/client.ts
index 1c925d930036..b7e0cab509c1 100644
--- a/packages/core/src/client.ts
+++ b/packages/core/src/client.ts
@@ -11,13 +11,14 @@ import { _INTERNAL_flushMetricsBuffer } from './metrics/internal';
 import type { Scope } from './scope';
 import { updateSession } from './session';
 import { getDynamicSamplingContextFromScope } from './tracing/dynamicSamplingContext';
+import { DEFAULT_TRANSPORT_BUFFER_SIZE } from './transports/base';
 import type { Breadcrumb, BreadcrumbHint, FetchBreadcrumbHint, XhrBreadcrumbHint } from './types-hoist/breadcrumb';
 import type { CheckIn, MonitorConfig } from './types-hoist/checkin';
 import type { EventDropReason, Outcome } from './types-hoist/clientreport';
 import type { DataCategory } from './types-hoist/datacategory';
 import type { DsnComponents } from './types-hoist/dsn';
 import type { DynamicSamplingContext, Envelope } from './types-hoist/envelope';
-import type { ErrorEvent, Event, EventHint, TransactionEvent } from './types-hoist/event';
+import type { ErrorEvent, Event, EventHint, EventType, TransactionEvent } from './types-hoist/event';
 import type { EventProcessor } from './types-hoist/eventprocessor';
 import type { FeedbackEvent } from './types-hoist/feedback';
 import type { Integration } from './types-hoist/integration';
@@ -43,6 +44,7 @@ import { merge } from './utils/merge';
 import { checkOrSetAlreadyCaught, uuid4 } from './utils/misc';
 import { parseSampleRate } from './utils/parseSampleRate';
 import { prepareEvent } from './utils/prepareEvent';
+import { type PromiseBuffer, makePromiseBuffer, SENTRY_BUFFER_FULL_ERROR } from './utils/promisebuffer';
 import { reparentChildSpans, shouldIgnoreSpan } from './utils/should-ignore-span';
 import { showSpanDropWarning } from './utils/spanUtils';
 import { rejectedSyncPromise } from './utils/syncpromise';
@@ -201,6 +203,8 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
   // eslint-disable-next-line @typescript-eslint/ban-types
   private _hooks: Record<string, Set<Function>>;
 
+  private _promiseBuffer: PromiseBuffer<unknown>;
+
   /**
    * Initializes this client instance.
    *
@@ -213,6 +217,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
     this._outcomes = {};
     this._hooks = {};
     this._eventProcessors = [];
+    this._promiseBuffer = makePromiseBuffer(options.transportOptions?.bufferSize ?? DEFAULT_TRANSPORT_BUFFER_SIZE);
 
     if (options.dsn) {
       this._dsn = makeDsn(options.dsn);
@@ -275,9 +280,11 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
     };
 
     this._process(
-      this.eventFromException(exception, hintWithEventId).then(event =>
-        this._captureEvent(event, hintWithEventId, scope),
-      ),
+      () =>
+        this.eventFromException(exception, hintWithEventId)
+          .then(event => this._captureEvent(event, hintWithEventId, scope))
+          .then(res => res),
+      'error',
     );
 
     return hintWithEventId.event_id;
@@ -300,12 +307,15 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
     };
 
     const eventMessage = isParameterizedString(message) ? message : String(message);
-
-    const promisedEvent = isPrimitive(message)
+    const isMessage = isPrimitive(message);
+    const promisedEvent = isMessage
       ? this.eventFromMessage(eventMessage, level, hintWithEventId)
       : this.eventFromException(message, hintWithEventId);
 
-    this._process(promisedEvent.then(event => this._captureEvent(event, hintWithEventId, currentScope)));
+    this._process(
+      () => promisedEvent.then(event => this._captureEvent(event, hintWithEventId, currentScope)),
+      isMessage ? 'unknown' : 'error',
+    );
 
     return hintWithEventId.event_id;
   }
@@ -332,9 +342,11 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
     const sdkProcessingMetadata = event.sdkProcessingMetadata || {};
     const capturedSpanScope: Scope | undefined = sdkProcessingMetadata.capturedSpanScope;
     const capturedSpanIsolationScope: Scope | undefined = sdkProcessingMetadata.capturedSpanIsolationScope;
+    const dataCategory = getDataCategoryByType(event.type);
 
     this._process(
-      this._captureEvent(event, hintWithEventId, capturedSpanScope || currentScope, capturedSpanIsolationScope),
+      () => this._captureEvent(event, hintWithEventId, capturedSpanScope || currentScope, capturedSpanIsolationScope),
+      dataCategory,
     );
 
     return hintWithEventId.event_id;
@@ -1252,7 +1264,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
       );
     }
 
-    const dataCategory = (eventType === 'replay_event' ? 'replay' : eventType) satisfies DataCategory;
+    const dataCategory = getDataCategoryByType(event.type);
 
     return this._prepareEvent(event, hint, currentScope, isolationScope)
       .then(prepared => {
@@ -1335,15 +1347,21 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
   /**
    * Occupies the client with processing and event
    */
-  protected _process<T>(promise: PromiseLike<T>): void {
+  protected _process<T>(taskProducer: () => PromiseLike<T>, dataCategory: DataCategory): void {
     this._numProcessing++;
-    void promise.then(
+
+    void this._promiseBuffer.add(taskProducer).then(
       value => {
         this._numProcessing--;
         return value;
       },
       reason => {
         this._numProcessing--;
+
+        if (reason === SENTRY_BUFFER_FULL_ERROR) {
+          this.recordDroppedEvent('queue_overflow', dataCategory);
+        }
+
         return reason;
       },
     );
@@ -1408,6 +1426,10 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
   ): PromiseLike<Event>;
 }
 
+function getDataCategoryByType(type: EventType | 'replay_event' | undefined): DataCategory {
+  return type === 'replay_event' ? 'replay' : type || 'error';
+}
+
 /**
  * Verifies that return value of configured `beforeSend` or `beforeSendTransaction` is of expected type, and returns the value if so.
  */
diff --git a/packages/core/test/lib/client.test.ts b/packages/core/test/lib/client.test.ts
index c009d0e0c2a8..19ef8a95dff5 100644
--- a/packages/core/test/lib/client.test.ts
+++ b/packages/core/test/lib/client.test.ts
@@ -15,6 +15,7 @@ import {
 import * as integrationModule from '../../src/integration';
 import { _INTERNAL_captureLog } from '../../src/logs/internal';
 import { _INTERNAL_captureMetric } from '../../src/metrics/internal';
+import { DEFAULT_TRANSPORT_BUFFER_SIZE } from '../../src/transports/base';
 import type { Envelope } from '../../src/types-hoist/envelope';
 import type { ErrorEvent, Event, TransactionEvent } from '../../src/types-hoist/event';
 import type { SpanJSON } from '../../src/types-hoist/span';
@@ -23,7 +24,7 @@ import * as miscModule from '../../src/utils/misc';
 import * as stringModule from '../../src/utils/string';
 import * as timeModule from '../../src/utils/time';
 import { getDefaultTestClientOptions, TestClient } from '../mocks/client';
-import { AdHocIntegration, TestIntegration } from '../mocks/integration';
+import { AdHocIntegration, AsyncTestIntegration, TestIntegration } from '../mocks/integration';
 import { makeFakeTransport } from '../mocks/transport';
 import { clearGlobalScope } from '../testutils';
 
@@ -2935,4 +2936,66 @@ describe('Client', () => {
       expect(sendEnvelopeSpy).toHaveBeenCalledTimes(1);
     });
   });
+
+  describe('promise buffer usage', () => {
+    it('respects the default value of the buffer size', async () => {
+      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
+      const client = new TestClient(options);
+
+      client.addIntegration(new AsyncTestIntegration());
+
+      Array.from({ length: DEFAULT_TRANSPORT_BUFFER_SIZE + 1 }).forEach(() => {
+        client.captureException(new Error('ʕノ•ᴥ•ʔノ ︵ ┻━┻'));
+      });
+
+      expect(client._clearOutcomes()).toEqual([{ reason: 'queue_overflow', category: 'error', quantity: 1 }]);
+    });
+
+    it('records queue_overflow when promise buffer is full', async () => {
+      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN, transportOptions: { bufferSize: 1 } });
+      const client = new TestClient(options);
+
+      client.addIntegration(new AsyncTestIntegration());
+
+      client.captureException(new Error('first'));
+      client.captureException(new Error('second'));
+      client.captureException(new Error('third'));
+
+      expect(client._clearOutcomes()).toEqual([{ reason: 'queue_overflow', category: 'error', quantity: 2 }]);
+    });
+
+    it('records different types of dropped events', async () => {
+      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN, transportOptions: { bufferSize: 1 } });
+      const client = new TestClient(options);
+
+      client.addIntegration(new AsyncTestIntegration());
+
+      client.captureException(new Error('first')); // error
+      client.captureException(new Error('second')); // error
+      client.captureMessage('third'); // unknown
+      client.captureEvent({ message: 'fourth' }); // error
+      client.captureEvent({ message: 'fifth', type: 'replay_event' }); // replay
+      client.captureEvent({ message: 'sixth', type: 'transaction' }); // transaction
+
+      expect(client._clearOutcomes()).toEqual([
+        { reason: 'queue_overflow', category: 'error', quantity: 2 },
+        { reason: 'queue_overflow', category: 'unknown', quantity: 1 },
+        { reason: 'queue_overflow', category: 'replay', quantity: 1 },
+        { reason: 'queue_overflow', category: 'transaction', quantity: 1 },
+      ]);
+    });
+
+    it('should skip the promise buffer with sync integrations', async () => {
+      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN, transportOptions: { bufferSize: 1 } });
+      const client = new TestClient(options);
+
+      client.addIntegration(new TestIntegration());
+
+      client.captureException(new Error('first'));
+      client.captureException(new Error('second'));
+      client.captureException(new Error('third'));
+
+      expect(client._clearOutcomes()).toEqual([]);
+    });
+  });
 });
diff --git a/packages/core/test/mocks/integration.ts b/packages/core/test/mocks/integration.ts
index 72a18dabe7b3..f5fc5682265a 100644
--- a/packages/core/test/mocks/integration.ts
+++ b/packages/core/test/mocks/integration.ts
@@ -24,6 +24,16 @@ export class TestIntegration implements Integration {
   }
 }
 
+export class AsyncTestIntegration implements Integration {
+  public static id: string = 'AsyncTestIntegration';
+
+  public name: string = 'AsyncTestIntegration';
+
+  processEvent(event: Event): Event | null | PromiseLike<Event | null> {
+    return new Promise(resolve => setTimeout(() => resolve(event), 1));
+  }
+}
+
 export class AddAttachmentTestIntegration implements Integration {
   public static id: string = 'AddAttachmentTestIntegration';
 

From 67095c8508e8d546f6e762fea161d1b8039e6c74 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Nov 2025 18:22:03 +0100
Subject: [PATCH 106/186] feat(deps): bump @sentry/cli from 2.56.0 to 2.58.2
 (#18271)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [@sentry/cli](https://github.com/getsentry/sentry-cli) from 2.56.0
to 2.58.2.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/getsentry/sentry-cli/releases"><code>@​sentry/cli</code>'s
releases</a>.</em></p>
<blockquote>
<h2>2.58.2</h2>
<h3>Improvements</h3>
<ul>
<li>Added validation for the <code>sentry-cli build upload</code>
command's <code>--head-sha</code> and <code>--base-sha</code> arguments
(<a
href="https://github.com/getsentry/sentry-cli/pull/2945">#2945</a>).
The CLI now validates that these are valid SHA1 sums. Passing an empty
string is also allowed; this prevents the default values from being
used, causing the values to instead be unset.</li>
</ul>
<h3>Fixes</h3>
<ul>
<li>Fixed a bug where providing empty-string values for the
<code>sentry-cli build upload</code> command's
<code>--vcs-provider</code>, <code>--head-repo-name</code>,
<code>--head-ref</code>, <code>--base-ref</code>, and
<code>--base-repo-name</code> arguments resulted in 400 errors (<a
href="https://github.com/getsentry/sentry-cli/pull/2946">#2946</a>).
Now, setting these to empty strings instead explicitly clears the
default value we would set otherwise, as expected.</li>
</ul>
<h2>2.58.1</h2>
<h3>Deprecations</h3>
<ul>
<li>Deprecated API key authentication (<a
href="https://github.com/getsentry/sentry-cli/pull/2934">#2934</a>,
<a
href="https://github.com/getsentry/sentry-cli/pull/2937">#2937</a>).
Users who are still using API keys to authenticate Sentry CLI should
generate and use an <a
href="https://docs.sentry.io/account/auth-tokens/">Auth Token</a>
instead.</li>
</ul>
<h3>Improvements</h3>
<ul>
<li>The <code>sentry-cli debug-files bundle-jvm</code> no longer makes
any HTTP requests to Sentry, meaning auth tokens are no longer needed,
and the command can be run offline (<a
href="https://github.com/getsentry/sentry-cli/pull/2926">#2926</a>).</li>
</ul>
<h3>Fixes</h3>
<ul>
<li>Skip setting <code>base_sha</code> and <code>base_ref</code> when
they equal <code>head_sha</code> during auto-inference, since comparing
a commit to itself provides no meaningful baseline (<a
href="https://github.com/getsentry/sentry-cli/pull/2924">#2924</a>).</li>
<li>Improved error message when supplying a non-existent organization to
<code>sentry-cli sourcemaps upload</code>. The error now correctly
indicates the organization doesn't exist, rather than incorrectly
suggesting the Sentry server lacks artifact bundle support (<a
href="https://github.com/getsentry/sentry-cli/pull/2931">#2931</a>).</li>
</ul>
<h2>2.58.0</h2>
<h3>New Features</h3>
<ul>
<li>Removed experimental status from the <code>sentry-cli build
upload</code> commands (<a
href="https://github.com/getsentry/sentry-cli/pull/2899">#2899</a>,
<a
href="https://github.com/getsentry/sentry-cli/pull/2905">#2905</a>).
At the time of this release, build uploads are still in closed beta on
the server side, so most customers cannot use this functionality quite
yet.</li>
<li>Added CLI version metadata to build upload archives (<a
href="https://github.com/getsentry/sentry-cli/pull/2890">#2890</a>).</li>
</ul>
<h3>Deprecations</h3>
<ul>
<li>Deprecated the <code>upload-proguard</code> subcommand's
<code>--platform</code> flag (<a
href="https://github.com/getsentry/sentry-cli/pull/2863">#2863</a>).
This flag was a no-op for some time, so we will remove it in the next
major.</li>
<li>Deprecated the <code>upload-proguard</code> subcommand's
<code>--android-manifest</code> flag (<a
href="https://github.com/getsentry/sentry-cli/pull/2891">#2891</a>).
This flag was a no-op for some time, so we will remove it in the next
major.</li>
<li>Deprecated the <code>sentry-cli sourcemaps upload</code> command's
<code>--no-dedupe</code> flag (<a
href="https://github.com/getsentry/sentry-cli/pull/2913">#2913</a>).
The flag was no longer relevant for sourcemap uploads to modern Sentry
servers and was made a no-op.</li>
</ul>
<h3>Fixes</h3>
<ul>
<li>Fixed autofilled git base metadata (<code>--base-ref</code>,
<code>--base-sha</code>) when using the <code>build upload</code>
subcommand in git repos. Previously this worked only in the context of
GitHub workflows (<a
href="https://github.com/getsentry/sentry-cli/pull/2897">#2897</a>,
<a
href="https://github.com/getsentry/sentry-cli/pull/2898">#2898</a>).</li>
</ul>
<h3>Performance</h3>
<ul>
<li>Slightly sped up the <code>sentry-cli sourcemaps upload</code>
command by eliminating an HTTP request to the Sentry server, which was
not required in most cases (<a
href="https://github.com/getsentry/sentry-cli/pull/2913">#2913</a>).</li>
</ul>
<h2>2.57.0</h2>
<h3>New Features</h3>
<ul>
<li>(JS API) Add <code>projects</code> field to
<code>SentryCliUploadSourceMapsOptions</code> (<a
href="https://github.com/getsentry/sentry-cli/pull/2856">#2856</a>)</li>
</ul>
<h3>Deprecations</h3>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md"><code>@​sentry/cli</code>'s
changelog</a>.</em></p>
<blockquote>
<h2>2.58.2</h2>
<h3>Improvements</h3>
<ul>
<li>Added validation for the <code>sentry-cli build upload</code>
command's <code>--head-sha</code> and <code>--base-sha</code> arguments
(<a
href="https://github.com/getsentry/sentry-cli/pull/2945">#2945</a>).
The CLI now validates that these are valid SHA1 sums. Passing an empty
string is also allowed; this prevents the default values from being
used, causing the values to instead be unset.</li>
</ul>
<h3>Fixes</h3>
<ul>
<li>Fixed a bug where providing empty-string values for the
<code>sentry-cli build upload</code> command's
<code>--vcs-provider</code>, <code>--head-repo-name</code>,
<code>--head-ref</code>, <code>--base-ref</code>, and
<code>--base-repo-name</code> arguments resulted in 400 errors (<a
href="https://github.com/getsentry/sentry-cli/pull/2946">#2946</a>).
Now, setting these to empty strings instead explicitly clears the
default value we would set otherwise, as expected.</li>
</ul>
<h2>2.58.1</h2>
<h3>Deprecations</h3>
<ul>
<li>Deprecated API key authentication (<a
href="https://github.com/getsentry/sentry-cli/pull/2934">#2934</a>,
<a
href="https://github.com/getsentry/sentry-cli/pull/2937">#2937</a>).
Users who are still using API keys to authenticate Sentry CLI should
generate and use an <a
href="https://docs.sentry.io/account/auth-tokens/">Auth Token</a>
instead.</li>
</ul>
<h3>Improvements</h3>
<ul>
<li>The <code>sentry-cli debug-files bundle-jvm</code> no longer makes
any HTTP requests to Sentry, meaning auth tokens are no longer needed,
and the command can be run offline (<a
href="https://github.com/getsentry/sentry-cli/pull/2926">#2926</a>).</li>
</ul>
<h3>Fixes</h3>
<ul>
<li>Skip setting <code>base_sha</code> and <code>base_ref</code> when
they equal <code>head_sha</code> during auto-inference, since comparing
a commit to itself provides no meaningful baseline (<a
href="https://github.com/getsentry/sentry-cli/pull/2924">#2924</a>).</li>
<li>Improved error message when supplying a non-existent organization to
<code>sentry-cli sourcemaps upload</code>. The error now correctly
indicates the organization doesn't exist, rather than incorrectly
suggesting the Sentry server lacks artifact bundle support (<a
href="https://github.com/getsentry/sentry-cli/pull/2931">#2931</a>).</li>
</ul>
<h2>2.58.0</h2>
<h3>New Features</h3>
<ul>
<li>Removed experimental status from the <code>sentry-cli build
upload</code> commands (<a
href="https://github.com/getsentry/sentry-cli/pull/2899">#2899</a>,
<a
href="https://github.com/getsentry/sentry-cli/pull/2905">#2905</a>).
At the time of this release, build uploads are still in closed beta on
the server side, so most customers cannot use this functionality quite
yet.</li>
<li>Added CLI version metadata to build upload archives (<a
href="https://github.com/getsentry/sentry-cli/pull/2890">#2890</a>).</li>
</ul>
<h3>Deprecations</h3>
<ul>
<li>Deprecated the <code>upload-proguard</code> subcommand's
<code>--platform</code> flag (<a
href="https://github.com/getsentry/sentry-cli/pull/2863">#2863</a>).
This flag was a no-op for some time, so we will remove it in the next
major.</li>
<li>Deprecated the <code>upload-proguard</code> subcommand's
<code>--android-manifest</code> flag (<a
href="https://github.com/getsentry/sentry-cli/pull/2891">#2891</a>).
This flag was a no-op for some time, so we will remove it in the next
major.</li>
<li>Deprecated the <code>sentry-cli sourcemaps upload</code> command's
<code>--no-dedupe</code> flag (<a
href="https://github.com/getsentry/sentry-cli/pull/2913">#2913</a>).
The flag was no longer relevant for sourcemap uploads to modern Sentry
servers and was made a no-op.</li>
</ul>
<h3>Fixes</h3>
<ul>
<li>Fixed autofilled git base metadata (<code>--base-ref</code>,
<code>--base-sha</code>) when using the <code>build upload</code>
subcommand in git repos. Previously this worked only in the context of
GitHub workflows (<a
href="https://github.com/getsentry/sentry-cli/pull/2897">#2897</a>,
<a
href="https://github.com/getsentry/sentry-cli/pull/2898">#2898</a>).</li>
</ul>
<h3>Performance</h3>
<ul>
<li>Slightly sped up the <code>sentry-cli sourcemaps upload</code>
command by eliminating an HTTP request to the Sentry server, which was
not required in most cases (<a
href="https://github.com/getsentry/sentry-cli/pull/2913">#2913</a>).</li>
</ul>
<h3>Internal changes</h3>
<ul>
<li>Migrated JavaScript wrapper to TypeScript for better type safety (<a
href="https://github.com/getsentry/sentry-cli/pull/2910">#2910</a>)</li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/getsentry/sentry-cli/commit/b8965a39887e7e268e2e03ec9584d71adc30d81c"><code>b8965a3</code></a>
release: 2.58.2</li>
<li><a
href="https://github.com/getsentry/sentry-cli/commit/f99509f65a71a5403fea8a569ba094c1fd8f741b"><code>f99509f</code></a>
fix(build): Allow clearing string arguments to <code>build upload</code>
(<a
href="https://github.com/getsentry/sentry-cli/issues/2946">#2946</a>)</li>
<li><a
href="https://github.com/getsentry/sentry-cli/commit/a2cef209eadc9807a398aff0c411b8fb1d407d96"><code>a2cef20</code></a>
ref(build): Add client-side validation for SHA fields (<a
href="https://github.com/getsentry/sentry-cli/issues/2945">#2945</a>)</li>
<li><a
href="https://github.com/getsentry/sentry-cli/commit/c550aa7ba01345303b4a698a93a332c22e59d469"><code>c550aa7</code></a>
ref(build): Move <code>VcsInfo</code> beside other <code>build
upload</code> API types (<a
href="https://github.com/getsentry/sentry-cli/issues/2944">#2944</a>)</li>
<li><a
href="https://github.com/getsentry/sentry-cli/commit/f303fd401eaef1ff59ff20ffc3b9dec78152f610"><code>f303fd4</code></a>
ref(build): Use <code>VcsInfo</code> directly in
<code>ChunkedBuildRequest</code> (<a
href="https://github.com/getsentry/sentry-cli/issues/2943">#2943</a>)</li>
<li><a
href="https://github.com/getsentry/sentry-cli/commit/63b187cee56bc20d595392ef0d768f5063a49391"><code>63b187c</code></a>
meta(cargo): Remove <code>authors</code> from <code>Cargo.toml</code>
(<a
href="https://github.com/getsentry/sentry-cli/issues/2939">#2939</a>)</li>
<li><a
href="https://github.com/getsentry/sentry-cli/commit/1ccff9d8667d7c6364af952055c1437494b3329f"><code>1ccff9d</code></a>
build(npm): 🤖 Bump optional dependencies to 2.58.1</li>
<li><a
href="https://github.com/getsentry/sentry-cli/commit/4362cf600148b8bf564919602da38fc376140b3e"><code>4362cf6</code></a>
Merge branch 'release/2.58.1'</li>
<li><a
href="https://github.com/getsentry/sentry-cli/commit/b25423a2b522badb18a61d612354bf48043d2c50"><code>b25423a</code></a>
release: 2.58.1</li>
<li><a
href="https://github.com/getsentry/sentry-cli/commit/7595ba9b46fa2a28657a70f7a675cd633b3759ff"><code>7595ba9</code></a>
chore(js): Deprecate <code>apiKey</code> field (<a
href="https://github.com/getsentry/sentry-cli/issues/2937">#2937</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/getsentry/sentry-cli/compare/2.56.0...2.58.2">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=@sentry/cli&package-manager=npm_and_yarn&previous-version=2.56.0&new-version=2.58.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 packages/react-router/package.json |   2 +-
 packages/remix/package.json        |   2 +-
 yarn.lock                          | 105 +++++++++++++++--------------
 3 files changed, 55 insertions(+), 54 deletions(-)

diff --git a/packages/react-router/package.json b/packages/react-router/package.json
index d988e14aea8a..a65bd845bdab 100644
--- a/packages/react-router/package.json
+++ b/packages/react-router/package.json
@@ -50,7 +50,7 @@
     "@opentelemetry/instrumentation": "^0.204.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
     "@sentry/browser": "10.26.0",
-    "@sentry/cli": "^2.56.0",
+    "@sentry/cli": "^2.58.2",
     "@sentry/core": "10.26.0",
     "@sentry/node": "10.26.0",
     "@sentry/react": "10.26.0",
diff --git a/packages/remix/package.json b/packages/remix/package.json
index 667f77d53648..181d6e23a63f 100644
--- a/packages/remix/package.json
+++ b/packages/remix/package.json
@@ -68,7 +68,7 @@
     "@opentelemetry/instrumentation": "^0.204.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
     "@remix-run/router": "1.x",
-    "@sentry/cli": "^2.56.0",
+    "@sentry/cli": "^2.58.2",
     "@sentry/core": "10.26.0",
     "@sentry/node": "10.26.0",
     "@sentry/react": "10.26.0",
diff --git a/yarn.lock b/yarn.lock
index 93c288553b5b..e3f84550ba9e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7103,50 +7103,50 @@
     magic-string "0.30.8"
     unplugin "1.0.1"
 
-"@sentry/cli-darwin@2.56.0":
-  version "2.56.0"
-  resolved "https://registry.yarnpkg.com/@sentry/cli-darwin/-/cli-darwin-2.56.0.tgz#53fa7de2c26f6450d5454ba997c26c2471d112c8"
-  integrity sha512-CzXFWbv3GrjU0gFlUM9jt0fvJmyo5ktty4HGxRFfS/eMC6xW58Gg/sEeMVEkdvk5osKooX/YEgfLBdo4zvuWDA==
-
-"@sentry/cli-linux-arm64@2.56.0":
-  version "2.56.0"
-  resolved "https://registry.yarnpkg.com/@sentry/cli-linux-arm64/-/cli-linux-arm64-2.56.0.tgz#5041c8877416a607ddae87b948cbe6c9e86d7f54"
-  integrity sha512-91d5ZlC989j/t+TXor/glPyx6SnLFS/SlJ9fIrHIQohdGKyWWSFb4VKUan8Ok3GYu9SUzKTMByryIOoYEmeGVw==
-
-"@sentry/cli-linux-arm@2.56.0":
-  version "2.56.0"
-  resolved "https://registry.yarnpkg.com/@sentry/cli-linux-arm/-/cli-linux-arm-2.56.0.tgz#c7875cf5f76e254ff1c0f49cf99d8c26b6ec4959"
-  integrity sha512-vQCCMhZLugPmr25XBoP94dpQsFa110qK5SBUVJcRpJKyzMZd+6ueeHNslq2mB0OF4BwL1qd/ZDIa4nxa1+0rjQ==
-
-"@sentry/cli-linux-i686@2.56.0":
-  version "2.56.0"
-  resolved "https://registry.yarnpkg.com/@sentry/cli-linux-i686/-/cli-linux-i686-2.56.0.tgz#aeaff32f9f0d405e413373223e406d66b1d56176"
-  integrity sha512-MZzXuq1Q/TktN81DUs6XSBU752pG3XWSJdZR+NCStIg3l8s3O/Pwh6OcDHTYqgwsYJaGBpA0fP2Afl5XeSAUNg==
-
-"@sentry/cli-linux-x64@2.56.0":
-  version "2.56.0"
-  resolved "https://registry.yarnpkg.com/@sentry/cli-linux-x64/-/cli-linux-x64-2.56.0.tgz#3dd4ef83c2d710c3e6f5d078d05391fda2ce23ee"
-  integrity sha512-INOO2OQ90Y3UzYgHRdrHdKC/0es3YSHLv0iNNgQwllL0YZihSVNYSSrZqcPq8oSDllEy9Vt9oOm/7qEnUP2Kfw==
-
-"@sentry/cli-win32-arm64@2.56.0":
-  version "2.56.0"
-  resolved "https://registry.yarnpkg.com/@sentry/cli-win32-arm64/-/cli-win32-arm64-2.56.0.tgz#2113bcac721970ca4dbd04a6dab37dfb0ec147d2"
-  integrity sha512-eUvkVk9KK01q6/qyugQPh7dAxqFPbgOa62QAoSwo11WQFYc3NPgJLilFWLQo+nahHGYKh6PKuCJ5tcqnQq5Hkg==
-
-"@sentry/cli-win32-i686@2.56.0":
-  version "2.56.0"
-  resolved "https://registry.yarnpkg.com/@sentry/cli-win32-i686/-/cli-win32-i686-2.56.0.tgz#bd8e646f4b5a98aa80bc9751a6e0db6514a935f5"
-  integrity sha512-mpCA8hKXuvT17bl1H/54KOa5i+02VBBHVlOiP3ltyBuQUqfvX/30Zl/86Spy+ikodovZWAHv5e5FpyXbY1/mPw==
-
-"@sentry/cli-win32-x64@2.56.0":
-  version "2.56.0"
-  resolved "https://registry.yarnpkg.com/@sentry/cli-win32-x64/-/cli-win32-x64-2.56.0.tgz#1acc7ca166ed531075a31b2bc1700294747da6b8"
-  integrity sha512-UV0pXNls+/ViAU/3XsHLLNEHCsRYaGEwJdY3HyGIufSlglxrX6BVApkV9ziGi4WAxcJWLjQdfcEs6V5B+wBy0A==
-
-"@sentry/cli@^2.51.0", "@sentry/cli@^2.56.0":
-  version "2.56.0"
-  resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-2.56.0.tgz#13dc043c78687b47285cc45db5bcfb65bbdb6dd9"
-  integrity sha512-br6+1nTPUV5EG1oaxLzxv31kREFKr49Y1+3jutfMUz9Nl8VyVP7o9YwakB/YWl+0Vi0NXg5vq7qsd/OOuV5j8w==
+"@sentry/cli-darwin@2.58.2":
+  version "2.58.2"
+  resolved "https://registry.yarnpkg.com/@sentry/cli-darwin/-/cli-darwin-2.58.2.tgz#61f6f836de8ac2e1992ccadc0368bc403f23c609"
+  integrity sha512-MArsb3zLhA2/cbd4rTm09SmTpnEuZCoZOpuZYkrpDw1qzBVJmRFA1W1hGAQ9puzBIk/ubY3EUhhzuU3zN2uD6w==
+
+"@sentry/cli-linux-arm64@2.58.2":
+  version "2.58.2"
+  resolved "https://registry.yarnpkg.com/@sentry/cli-linux-arm64/-/cli-linux-arm64-2.58.2.tgz#3a7a9c83e31b482599ce08d93d5ba6c8a1a44c7f"
+  integrity sha512-ay3OeObnbbPrt45cjeUyQjsx5ain1laj1tRszWj37NkKu55NZSp4QCg1gGBZ0gBGhckI9nInEsmKtix00alw2g==
+
+"@sentry/cli-linux-arm@2.58.2":
+  version "2.58.2"
+  resolved "https://registry.yarnpkg.com/@sentry/cli-linux-arm/-/cli-linux-arm-2.58.2.tgz#f9bef6802cb707d1603a02e0727fed22d834e133"
+  integrity sha512-HU9lTCzcHqCz/7Mt5n+cv+nFuJdc1hGD2h35Uo92GgxX3/IujNvOUfF+nMX9j6BXH6hUt73R5c0Ycq9+a3Parg==
+
+"@sentry/cli-linux-i686@2.58.2":
+  version "2.58.2"
+  resolved "https://registry.yarnpkg.com/@sentry/cli-linux-i686/-/cli-linux-i686-2.58.2.tgz#a3e6cb24d314f2d948b96457731f9345dc8370f9"
+  integrity sha512-CN9p0nfDFsAT1tTGBbzOUGkIllwS3hygOUyTK7LIm9z+UHw5uNgNVqdM/3Vg+02ymjkjISNB3/+mqEM5osGXdA==
+
+"@sentry/cli-linux-x64@2.58.2":
+  version "2.58.2"
+  resolved "https://registry.yarnpkg.com/@sentry/cli-linux-x64/-/cli-linux-x64-2.58.2.tgz#8e071e11b03524b08d369075f3203b05529ca233"
+  integrity sha512-oX/LLfvWaJO50oBVOn4ZvG2SDWPq0MN8SV9eg5tt2nviq+Ryltfr7Rtoo+HfV+eyOlx1/ZXhq9Wm7OT3cQuz+A==
+
+"@sentry/cli-win32-arm64@2.58.2":
+  version "2.58.2"
+  resolved "https://registry.yarnpkg.com/@sentry/cli-win32-arm64/-/cli-win32-arm64-2.58.2.tgz#af109a165c25245458a6c58b79a91c639b1df1b0"
+  integrity sha512-+cl3x2HPVMpoSVGVM1IDWlAEREZrrVQj4xBb0TRKII7g3hUxRsAIcsrr7+tSkie++0FuH4go/b5fGAv51OEF3w==
+
+"@sentry/cli-win32-i686@2.58.2":
+  version "2.58.2"
+  resolved "https://registry.yarnpkg.com/@sentry/cli-win32-i686/-/cli-win32-i686-2.58.2.tgz#53038b43b2c14c419fb71586f7448e7580ed4e39"
+  integrity sha512-omFVr0FhzJ8oTJSg1Kf+gjLgzpYklY0XPfLxZ5iiMiYUKwF5uo1RJRdkUOiEAv0IqpUKnmKcmVCLaDxsWclB7Q==
+
+"@sentry/cli-win32-x64@2.58.2":
+  version "2.58.2"
+  resolved "https://registry.yarnpkg.com/@sentry/cli-win32-x64/-/cli-win32-x64-2.58.2.tgz#b4c81a3c163344ae8b27523a0391e7f99c533f41"
+  integrity sha512-2NAFs9UxVbRztQbgJSP5i8TB9eJQ7xraciwj/93djrSMHSEbJ0vC47TME0iifgvhlHMs5vqETOKJtfbbpQAQFA==
+
+"@sentry/cli@^2.51.0", "@sentry/cli@^2.58.2":
+  version "2.58.2"
+  resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-2.58.2.tgz#0d6e19a1771d27aae8b2765a6f3e96062e2c7502"
+  integrity sha512-U4u62V4vaTWF+o40Mih8aOpQKqKUbZQt9A3LorIJwaE3tO3XFLRI70eWtW2se1Qmy0RZ74zB14nYcFNFl2t4Rw==
   dependencies:
     https-proxy-agent "^5.0.0"
     node-fetch "^2.6.7"
@@ -7154,14 +7154,14 @@
     proxy-from-env "^1.1.0"
     which "^2.0.2"
   optionalDependencies:
-    "@sentry/cli-darwin" "2.56.0"
-    "@sentry/cli-linux-arm" "2.56.0"
-    "@sentry/cli-linux-arm64" "2.56.0"
-    "@sentry/cli-linux-i686" "2.56.0"
-    "@sentry/cli-linux-x64" "2.56.0"
-    "@sentry/cli-win32-arm64" "2.56.0"
-    "@sentry/cli-win32-i686" "2.56.0"
-    "@sentry/cli-win32-x64" "2.56.0"
+    "@sentry/cli-darwin" "2.58.2"
+    "@sentry/cli-linux-arm" "2.58.2"
+    "@sentry/cli-linux-arm64" "2.58.2"
+    "@sentry/cli-linux-i686" "2.58.2"
+    "@sentry/cli-linux-x64" "2.58.2"
+    "@sentry/cli-win32-arm64" "2.58.2"
+    "@sentry/cli-win32-i686" "2.58.2"
+    "@sentry/cli-win32-x64" "2.58.2"
 
 "@sentry/rollup-plugin@^4.3.0":
   version "4.3.0"
@@ -28836,6 +28836,7 @@ stylus@0.59.0, stylus@^0.59.0:
 
 sucrase@^3.27.0, sucrase@^3.35.0, sucrase@getsentry/sucrase#es2020-polyfills:
   version "3.36.0"
+  uid fd682f6129e507c00bb4e6319cc5d6b767e36061
   resolved "https://codeload.github.com/getsentry/sucrase/tar.gz/fd682f6129e507c00bb4e6319cc5d6b767e36061"
   dependencies:
     "@jridgewell/gen-mapping" "^0.3.2"

From 1a6be80e573ebe27226eb92fb4125390155c9db4 Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Fri, 21 Nov 2025 10:49:25 +0100
Subject: [PATCH 107/186] chore(angular): Add Angular 21 Support (#18274)

Angular 21 was [released](https://www.npmjs.com/package/@angular/cli)
silently yesterday. Migration docs
don't seem to indicate any breaking change for us.
---
 .../angular-21/.editorconfig                  |  17 +
 .../test-applications/angular-21/.gitignore   |  44 +++
 .../test-applications/angular-21/.npmrc       |   2 +
 .../test-applications/angular-21/README.md    |   3 +
 .../test-applications/angular-21/angular.json |  87 +++++
 .../test-applications/angular-21/package.json |  60 ++++
 .../angular-21/playwright.config.mjs          |   8 +
 .../angular-21/public/favicon.ico             | Bin 0 -> 15086 bytes
 .../angular-21/src/app/app.component.ts       |  12 +
 .../angular-21/src/app/app.config.ts          |  29 ++
 .../angular-21/src/app/app.routes.ts          |  42 +++
 .../angular-21/src/app/cancel-guard.guard.ts  |   5 +
 .../src/app/cancel/cancel.components.ts       |   8 +
 .../component-tracking.components.ts          |  21 ++
 .../angular-21/src/app/home/home.component.ts |  26 ++
 .../sample-component.components.ts            |  12 +
 .../angular-21/src/app/user/user.component.ts |  25 ++
 .../angular-21/src/index.html                 |  13 +
 .../test-applications/angular-21/src/main.ts  |  15 +
 .../angular-21/src/styles.css                 |   1 +
 .../angular-21/start-event-proxy.mjs          |   6 +
 .../angular-21/tests/errors.test.ts           |  65 ++++
 .../angular-21/tests/performance.test.ts      | 327 ++++++++++++++++++
 .../angular-21/tsconfig.app.json              |  11 +
 .../angular-21/tsconfig.json                  |  27 ++
 .../angular-21/tsconfig.spec.json             |  10 +
 packages/angular/package.json                 |   6 +-
 27 files changed, 879 insertions(+), 3 deletions(-)
 create mode 100644 dev-packages/e2e-tests/test-applications/angular-21/.editorconfig
 create mode 100644 dev-packages/e2e-tests/test-applications/angular-21/.gitignore
 create mode 100644 dev-packages/e2e-tests/test-applications/angular-21/.npmrc
 create mode 100644 dev-packages/e2e-tests/test-applications/angular-21/README.md
 create mode 100644 dev-packages/e2e-tests/test-applications/angular-21/angular.json
 create mode 100644 dev-packages/e2e-tests/test-applications/angular-21/package.json
 create mode 100644 dev-packages/e2e-tests/test-applications/angular-21/playwright.config.mjs
 create mode 100644 dev-packages/e2e-tests/test-applications/angular-21/public/favicon.ico
 create mode 100644 dev-packages/e2e-tests/test-applications/angular-21/src/app/app.component.ts
 create mode 100644 dev-packages/e2e-tests/test-applications/angular-21/src/app/app.config.ts
 create mode 100644 dev-packages/e2e-tests/test-applications/angular-21/src/app/app.routes.ts
 create mode 100644 dev-packages/e2e-tests/test-applications/angular-21/src/app/cancel-guard.guard.ts
 create mode 100644 dev-packages/e2e-tests/test-applications/angular-21/src/app/cancel/cancel.components.ts
 create mode 100644 dev-packages/e2e-tests/test-applications/angular-21/src/app/component-tracking/component-tracking.components.ts
 create mode 100644 dev-packages/e2e-tests/test-applications/angular-21/src/app/home/home.component.ts
 create mode 100644 dev-packages/e2e-tests/test-applications/angular-21/src/app/sample-component/sample-component.components.ts
 create mode 100644 dev-packages/e2e-tests/test-applications/angular-21/src/app/user/user.component.ts
 create mode 100644 dev-packages/e2e-tests/test-applications/angular-21/src/index.html
 create mode 100644 dev-packages/e2e-tests/test-applications/angular-21/src/main.ts
 create mode 100644 dev-packages/e2e-tests/test-applications/angular-21/src/styles.css
 create mode 100644 dev-packages/e2e-tests/test-applications/angular-21/start-event-proxy.mjs
 create mode 100644 dev-packages/e2e-tests/test-applications/angular-21/tests/errors.test.ts
 create mode 100644 dev-packages/e2e-tests/test-applications/angular-21/tests/performance.test.ts
 create mode 100644 dev-packages/e2e-tests/test-applications/angular-21/tsconfig.app.json
 create mode 100644 dev-packages/e2e-tests/test-applications/angular-21/tsconfig.json
 create mode 100644 dev-packages/e2e-tests/test-applications/angular-21/tsconfig.spec.json

diff --git a/dev-packages/e2e-tests/test-applications/angular-21/.editorconfig b/dev-packages/e2e-tests/test-applications/angular-21/.editorconfig
new file mode 100644
index 000000000000..f166060da1cb
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/angular-21/.editorconfig
@@ -0,0 +1,17 @@
+# Editor configuration, see https://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.ts]
+quote_type = single
+ij_typescript_use_double_quotes = false
+
+[*.md]
+max_line_length = off
+trim_trailing_whitespace = false
diff --git a/dev-packages/e2e-tests/test-applications/angular-21/.gitignore b/dev-packages/e2e-tests/test-applications/angular-21/.gitignore
new file mode 100644
index 000000000000..315c644a53e8
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/angular-21/.gitignore
@@ -0,0 +1,44 @@
+# See https://docs.github.com/get-started/getting-started-with-git/ignoring-files for more about ignoring files.
+
+# Compiled output
+/dist
+/tmp
+/out-tsc
+/bazel-out
+
+# Node
+/node_modules
+npm-debug.log
+yarn-error.log
+
+# IDEs and editors
+.idea/
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+
+# Visual Studio Code
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+.history/*
+
+# Miscellaneous
+/.angular/cache
+.sass-cache/
+/connect.lock
+/coverage
+/libpeerconnection.log
+testem.log
+/typings
+
+# System files
+.DS_Store
+Thumbs.db
+
+test-results
diff --git a/dev-packages/e2e-tests/test-applications/angular-21/.npmrc b/dev-packages/e2e-tests/test-applications/angular-21/.npmrc
new file mode 100644
index 000000000000..070f80f05092
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/angular-21/.npmrc
@@ -0,0 +1,2 @@
+@sentry:registry=http://127.0.0.1:4873
+@sentry-internal:registry=http://127.0.0.1:4873
diff --git a/dev-packages/e2e-tests/test-applications/angular-21/README.md b/dev-packages/e2e-tests/test-applications/angular-21/README.md
new file mode 100644
index 000000000000..6d3a1ff489df
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/angular-21/README.md
@@ -0,0 +1,3 @@
+# Angular 21
+
+E2E test app for Angular 21 and `@sentry/angular`.
diff --git a/dev-packages/e2e-tests/test-applications/angular-21/angular.json b/dev-packages/e2e-tests/test-applications/angular-21/angular.json
new file mode 100644
index 000000000000..18bf58596766
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/angular-21/angular.json
@@ -0,0 +1,87 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "version": 1,
+  "newProjectRoot": "projects",
+  "projects": {
+    "angular-21": {
+      "projectType": "application",
+      "schematics": {},
+      "root": "",
+      "sourceRoot": "src",
+      "prefix": "app",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:application",
+          "options": {
+            "outputPath": "dist/angular-21",
+            "index": "src/index.html",
+            "browser": "src/main.ts",
+            "polyfills": ["zone.js"],
+            "tsConfig": "tsconfig.app.json",
+            "assets": [
+              {
+                "glob": "**/*",
+                "input": "public"
+              }
+            ],
+            "styles": ["src/styles.css"],
+            "scripts": []
+          },
+          "configurations": {
+            "production": {
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "500kB",
+                  "maximumError": "1MB"
+                },
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "4kB",
+                  "maximumError": "8kB"
+                }
+              ],
+              "outputHashing": "all"
+            },
+            "development": {
+              "optimization": false,
+              "extractLicenses": false,
+              "sourceMap": true
+            }
+          },
+          "defaultConfiguration": "production"
+        },
+        "serve": {
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "configurations": {
+            "production": {
+              "buildTarget": "angular-21:build:production"
+            },
+            "development": {
+              "buildTarget": "angular-21:build:development"
+            }
+          },
+          "defaultConfiguration": "development"
+        },
+        "extract-i18n": {
+          "builder": "@angular-devkit/build-angular:extract-i18n"
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "polyfills": ["zone.js", "zone.js/testing"],
+            "tsConfig": "tsconfig.spec.json",
+            "assets": [
+              {
+                "glob": "**/*",
+                "input": "public"
+              }
+            ],
+            "styles": ["src/styles.css"],
+            "scripts": []
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/dev-packages/e2e-tests/test-applications/angular-21/package.json b/dev-packages/e2e-tests/test-applications/angular-21/package.json
new file mode 100644
index 000000000000..315f7eea0492
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/angular-21/package.json
@@ -0,0 +1,60 @@
+{
+  "name": "angular-21",
+  "version": "0.0.0",
+  "scripts": {
+    "ng": "ng",
+    "dev": "ng serve",
+    "proxy": "node start-event-proxy.mjs",
+    "preview": "http-server dist/angular-21/browser --port 8080 --silent",
+    "build": "ng build",
+    "watch": "ng build --watch --configuration development",
+    "test": "playwright test",
+    "test:build": "pnpm install && pnpm build",
+    "test:build-canary": "pnpm install && pnpm add @angular/animations@next @angular/common@next @angular/compiler@next @angular/core@next @angular/forms@next @angular/platform-browser@next @angular/platform-browser-dynamic@next @angular/router@next && pnpm add -D @angular-devkit/build-angular@next @angular/cli@next @angular/compiler-cli@next && pnpm build",
+    "test:assert": "playwright test",
+    "clean": "npx rimraf .angular node_modules pnpm-lock.yaml dist"
+  },
+  "private": true,
+  "dependencies": {
+    "@angular/animations": "^21.0.0",
+    "@angular/common": "^21.0.0",
+    "@angular/compiler": "^21.0.0",
+    "@angular/core": "^21.0.0",
+    "@angular/forms": "^21.0.0",
+    "@angular/platform-browser": "^21.0.0",
+    "@angular/platform-browser-dynamic": "^21.0.0",
+    "@angular/router": "^21.0.0",
+    "@sentry/angular": "* || latest",
+    "rxjs": "~7.8.0",
+    "tslib": "^2.3.0",
+    "zone.js": "~0.15.0"
+  },
+  "devDependencies": {
+    "@angular-devkit/build-angular": "^21.0.0",
+    "@angular/cli": "^21.0.0",
+    "@angular/compiler-cli": "^21.0.0",
+    "@playwright/test": "~1.53.2",
+    "@sentry-internal/test-utils": "link:../../../test-utils",
+    "@sentry/core": "latest || *",
+    "@types/jasmine": "~5.1.0",
+    "http-server": "^14.1.1",
+    "jasmine-core": "~5.4.0",
+    "karma": "~6.4.0",
+    "karma-chrome-launcher": "~3.2.0",
+    "karma-coverage": "~2.2.0",
+    "karma-jasmine": "~5.1.0",
+    "karma-jasmine-html-reporter": "~2.1.0",
+    "typescript": "~5.9.0"
+  },
+  "volta": {
+    "extends": "../../package.json"
+  },
+  "sentryTest": {
+    "optionalVariants": [
+      {
+        "build-command": "pnpm test:build-canary",
+        "label": "angular (canary)"
+      }
+    ]
+  }
+}
diff --git a/dev-packages/e2e-tests/test-applications/angular-21/playwright.config.mjs b/dev-packages/e2e-tests/test-applications/angular-21/playwright.config.mjs
new file mode 100644
index 000000000000..0845325879c9
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/angular-21/playwright.config.mjs
@@ -0,0 +1,8 @@
+import { getPlaywrightConfig } from '@sentry-internal/test-utils';
+
+const config = getPlaywrightConfig({
+  startCommand: `pnpm preview`,
+  port: 8080,
+});
+
+export default config;
diff --git a/dev-packages/e2e-tests/test-applications/angular-21/public/favicon.ico b/dev-packages/e2e-tests/test-applications/angular-21/public/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..57614f9c967596fad0a3989bec2b1deff33034f6
GIT binary patch
literal 15086
zcmd^G33O9Omi+`8$@{|M-I6TH3wzF-p5CV8o}7f~KxR60LK+ApEFB<$bcciv%@SmA
zV{n>g85YMFFeU*Uvl=i4v)C*qgnb;$GQ=3XTe9{Y%c`mO<tM&Bl57ox;hfPqkLUVT
zzv|vsua^I+V3=M^Z)U^@hH5cWC})^|W*9~+?o5X>%su)noNCCQ*@t1WXn|B(hQ7i~
zrUK8|pUkD6#lNo!bt$6)jR!&C?`P5G(`e((P($RaLeq+o0Vd~f11;qB05kdbAOm?r
zXv~GYr_sibQO9NGTCdT;+G(!{4Xs@4fPak8#L8PjgJwcs-Mm#nR_Z0s&u?nDX5^~@
z+A6?}g0|=4e_LoE69pPFO`yCD@BCjgKpzMH0O4Xs{Ahc?K3<?BQv_-<UC>HC5;l=f
zg>}alhBXX&);z$E-wai+9TTRtBX-bWYY@cl$@YN#gMd~tM_5lj6W%8ah4;uZ;jP@Q
zVbuel1rPA?2@x9Y+u?e`l{Z4ngfG5q5BLH5QsEu4GVpt{KIp1?U)=3+KQ;%7ec8l*
zdV=zZgN5>O3G(3L2fqj3;oBbZZw$Ij@`Juz@?+yy#OPw)>#wsTewVgTK9BGt5Ab<U
ze$Tf(VBZpa!SSqoXlj(c_>Z&?K&B3GVF&yu?@(Xj3fR3n+ZP0%+wo)D9_xp>Z$`A4
zfV>}NWjO#3lqumR0`gvnffd9Ka}JJMuHS&|55-*mCD#8e^anA<+sFZVaJe7{=p*oX
zE_Uv?1>e~ga=seYzh{9P+n5<+7&9}<n&VL-3~Og{<S)TZE4h*#P`v^L#_Z0pidV7T
z|Ib<xXZ+do&R-q5D%lf8SW`2_x^ho>&(kwqSaz;1aD|YM3HBiy<))4~QJSIryyqp|
z8nGc(8<b%O&Bp|DVqS`wWF{E*^YfmUv_Uw3r7mDGG4`GR*q(1;f_^;UhdzKc_IbgK
zICR2{aDBicoldxr=tGynCuo=7-^G>>3(_nEI4n)n7j(&d4idW1tVLjZ7QbNLXg;LB
ziHsS5pXHEjGJZb59K<i<Ee&OtiLJ`)M3V_+b)4D=vLUwF0FoC|YuFKcTMx1?`byI+
z(a~UU_3@v>cvS~wv;uZR-+4qEq<Dv4CQD>ow`;JCfB*+b^UL^3!?;-^F%yt=VjU|v
z39SSqKcRu_NVvz!zJzL0CceJaS6%!(eMshPv_0U5G`~!a#I$qI5Ic(>IONej@aH=f
z)($TAT#1I{iCS4f{D2+ApS=$3E7}5=+y(rA9mM#;Cky%b*Gi0KfFA`ofKTzu`AV-9
znW|y@19rrZ*!N2AvDi<_ZeR3O2R{#dh1#3-d%$k${Rx42h+i&GZo5!C^dSL34*AKp
z27mTd>k>?V&X;Nl%GZ(>0s`1UN~Hfyj>KPjtnc|)xM@{H_B9rNr~LuH`Gr5_am&Ep
zTjZA8hljNj5H1Ipm-uD9rC}U{-vR!eay5&6x6FkfupdpT*84MVwGpdd(}ib)zZ3Ky
z7C$p<Hy;Do`sgqRiyt`v4|vWm>njc82(W_y_F{PhYj?o!@3__UUvpX)v69aBSzYj3
zdi}YQkKs^SyXyFG2LTRz9{(w}y~!`{EuAaUr6G1M{*%c+kP1olW9z23dSH!G4_HSK
zzae-DF$OGR{ofP*!$a(r^5Go>I3SObVI6FLY)N@o<*gl0&kLo-OT{Tl*7nCz>Iq=?
zcigIDHtj|H;6sR?or8Wd_a4996GI*CXGU}o;D9`^FM!AT1pBY~?|4h^61BY#_yIfO
zKO?E0<gGmaIqZ?!V)C4TU)ygD!7%{#2Z4PA_Z^sH&W~^s5a8g62h300cYOT~^&L-X
zs{`!igBqM?Qtqn#Sxdn7fL{~!Wf%O|2f%?lFT#H9GR1z8V(0SU_6798%0zpQ{r8}>
zJ{Pc`9rVEI&$xxXu`<5E)&+m(7zX^v0rqofLs&bnQT(1baQkAr^kEsk)15vlzAZ-l
z@OO9RF<+IiJ*O@HE256gCt!bF=NM*vh|WVWmjVawcNoksRTMvR03H{p@cjwKh(CL4
z7_<J2TUZ-fC3|#k{4sefes&DdKHzfT?xA7by!j#_$N_mE2QCko-_cgxX^3a~Gj3bO
zh1n|c9@3V$%VmFxUpsIkI|le1U~R+pH;ZhUcPM`3fIK|;(}}_D7Jv5E*hY66_Q+s+
z#P99{^dX#!I{SgUhb|CXHv)d-aD(~|p96PnL;3FT_?zD%*}XuSbdV?|`-w_aMBMmk
zAF%Tf?FSeO*bj6Zxc5<ek}UfWKXSmnKwrYX0H1<B@Mk{kjtk6%P4be4R_PHJevS{Z
z<Jc1i`aOpA!o0%8j~uxDfIOfdKn_W?8TkH_>PB(dM=kO)!s4fW!1p0f93YN@?ZSG`
z$B!JaAJCtW$B97}HNO9(x-t30&E}Mo1UPi@Av%uHj~?T|!4JLwV;KCx8xO#b9IlUW
zI6+{a@Wj|<2Y=U;a@vXbxqZNngH8^}LleE_4*0&O7#3iGxfJ%Id>+sb;7{L=aIic8
z|EW|{{S)J-wr@;3PmlxRXU8!e2gm_%s|ReH!reFcY8%$Hl4M5>;6^UDUUae?kOy#h
zk~6Ee_@ZAn48Bab__^bN<q%(Zo;%n3!t5yz_MM01_UnKdcmN0F0eu1cG*9pK<QcVj
zCE`a8h+jo<1HYcs(~~mrT~Z>mQ~+k=02<Q%#1pWs`lOPf^+T!%;71PNLrT%U!`!_M
zmVa6r&e&kR0N(-pH(zWg=abv~iYWk=#*}l%06$1$+68m7_~<rIaoMMZn_myiS+E9N
z9c(rN2Y<c|)w1&Vx}i7Q>jz)e0d9Z3>G?RGG!65?d1>9}7iG17?P*=GUV-#<F7Z__
zAx;G$3`2-b<kGq@m#*mT(vU~R!7%BdZ44s<O~2s6xM_Tj<xo2rMgis6-y^Msw3T5{
zH$%FaVNln1rq2?J<6DL~?bi1NWI4lB5UMjlQ@p)7TA>SbLRw)Hu{zx*azHxWk<Mz7
zBi#mR)L~AA4$`Ovgxsg;4Aj&LY?|r{c;1U@deR6wgX#*<0*0}Hl|&5V1g)SvGZfBV
z!27<!DFAItcd&MIraQRyfO}eED!-xPzNh8>GNTWl@HeWjA?39Ia|sCi{e;!^`1Oec
zb>Z|b65OM*;eC=ZLSy?_fg$&^2xI>qSLA2G*$nA3GEnp3$N-)46`|36m*sc#4%C|h
zBN<2U;7k>&G_wL4=Ve5z`ubVD&*Hxi)r@{4RCDw7U_D`lbC(9&pG5C*z#W>8>HU)h
z!h3g?2UL&sS!oY5$3?VlA0Me9W5e~V;2jds*fz^updz#AJ%G8w2V}AEE?E^=MK%Xt
z__Bx1cr7+DQmuHmzn*|hh%~eEc9@m05@clWfpEFcr+06%0&dZJH&@8^&@*$qR@}o3
z@Tuuh2FsLz^zH+dN&T&?0G3I?MpmYJ;GP$J!Ez<EAfkuO_$)Rv+PDYrG)x<4BOp`h
zJq(cPAzCs!NJ-`dHj*yfLn^oUtkjRp8S#4g%oyu5l=laiCeIjXeRo!v{vD9N4p5I@
z98&uSkbeYJjm-`IZftS%xyQ~@eKol<O7B;BUv+ht$L|-IQxpmM{O;a+TKU@GrHk8w
zzHpzF&yO{vu9KTAfa7Vk;jJEMR~wk2GzTtlp9L?7)Bfw`R5Qtl*RJvQ-qU)n30^u|
zAMiOntNttv>jeM#YLJ!W$}MVNb0^HfOA>5Fe~UNn%Zk(PT@~9}1d<z7w`*I>t)1UQ
zU*B5K?Dl#G74qmg|2>^>0WtLX#Jz{lO4NT`NYB*(L#D|5IpXr9v&7a@YsGp3vLR7L
zHYGHZg7{ie6n~2p$6Yz>=^cEg7tEgk-1YRl%-s7^cbqFb(U7&Dp78+&ut5!Tn(hER
z|Gp4Ed@CnOPeAe|N>U(dB;SZ?NU^AzoD^UAH_vamp6Ws}{|mSq`^+VP1<S4$8S@Se
zdq@Do?xA+FBFXjv=6TY2GV_CcsfKO8P|`pSB>g~2B{%N-!mWz<`)G)<vVBk6H#4){
z=Vu$l=6$8~d<`)`{hr#zXE}+Q>>V-<`9`L4?3dM%Qh6<@kba+m`JS{Ya@9Fq*m6$$
zA1%Ogc~VRH33|S9l%CNb4zM%k^EIpqY}@h{w(aBcJ9c05oiZx#SK9t->5lSI`=&l~
z+-Ic)a{FbBhXV$Xt!WRd`R#Jk-$+_Z52rS>?Vpt2IK<84|E-SBEoIw>cs=a{BlQ7O
z-?{Fy_M&84&9|KM5wt~)*!~i~E=(6m8(uCO)I=)M?)&sRbzH$9Rovzd?ZEY}GqX+~
zFbEbLz`BZ49=2Yh-|<`waK-_4!7`ro@zlC|r&I4fc4oyb+m=|c8)8%tZ-z5FwhzDt
zL5kB@u53`d@%nHl0Sp)Dw`(QU&>vujEn?GPEXUW!Wi<+4e%BORl&BIH+SwRcbS}X@
z01Pk|vA%OdJKAs17zSXtO55k!;%m9>1eW9LnyAX4uj7@${O6cfii`49qTNItzny5J
zH&Gj`e}o}?xjQ}r?LrI%FjUd@xflT3|7LA|ka%Q3i}a8gVm<D-KiB{<ME*mIIJvPX
z_?wI2B8`LWm6;zq*T#3f=@x16x)y0E8#iX#r#5i)1K5F{J<#z8^A*_d?BI4g#=_WG
z(g+s@><`HIWoJGH=$EGClX^C0lysQJ>UO(q&;`T#8txuoQ_{l^kEV9CAdXuU1Ghg8
zN_6hHFuy&1x<z(mSz}ryX-+vs&<1V{v0JO#2INfkHdp6~?c+=2jv8nmG2EbI;k%(W
z3#`BVw)knNw=uO+>24q5-(Z7;!poYdt*`UTdrQOIQ!2O7_+AHV2hgXaEz7)>$LEdG
z<8vE^T<d5Y^c`tRKI2e{51fJd7xVqqF#b=-4dqqC+dHlfHtM^3zdr491GL{FId%-@
zzV6ERH2;j~e#`|~>w$|YwZHZDPM!SNOAWG$?J)MdmEk{U!!$M#fp7<eLLj6-0}zjd
zxPG-%QE9&hq6;&EEVqg3K{9Qkvzd<c(@PxbOO`klOER2_UKxZ64OOs`?&y_4<-W)!
zu!(5=B+RBDtM!Cvtpwr}u;~?3amOjT^)gzx^Y@#+ZK)%L=92#qnvVRTuhG4y#C&gh
zOh`k&Q6cJ8uLT)xqv-#~qA>*Wo}jJ$Q(=8>R`Ats?e|VU?Zt7Cdh%AdnfyN3MBWw{
z$OnREvPf7%z6`#2##_7id|H%Y{vV^vWXb?5d5?a_y&t3@p9t$ncHj-NBdo&X{wrfJ
zamN)VMYROYh_SvjJ=Xd!Ga?PY_$;*L=SxFte!4O6%0HEh%iZ4=gvns7IWIyJHa|hT
z2;1+e)`TvbNb3-0z&DD_)Jomsg-7p_Uh`wjGnU1urmv1_oVqRg#=C?e?!7DgtqojU
zWoAB($&53;TsXu^@2;8M`#z{=rPy?JqgYM0CDf4v@z=ZD|ItJ&8%_7A#K?S{wjxgd
z?xA6JdJojrWpB7fr2p_MSsU4(R7=XGS0+Eg#xR=j>`H@R9<ea9ez7LeH1EXlc5;O7
ztyW0w<FMRxhWuo2a;v&b{)6_e><EpxxqhnnP3hXmmGoW-y_ed1?&u9-%Np39lvDXS
zwf#1h1ARzZx2-}}-Q{~*8MpP6hORNjkfroq+=9v5#P(g+JNFl`x5yD$U&cDhl4|7V
zQZBh;Xw6B5KUF5~r1wPVo`qsCge>{XjwBm<mI-HNm*^V3KiPH_-{<RAX>qAiOxOL`
zt?XK-iTEOWV}f<c$uy@9)|c<;`&Ve3zDTSb!GBjJDNSifJ=LyEDrVO#x^Jk`^;`W4
zmdh78CX~tTHPw_uMY8rRK1basFF)9ndd}G@+ILMGyZH@#&esP-no*U>>Pz3H-s*>W
z4~8C&Xq25UQ^xH6H9kY_RM1$ch+%YLF72AA7^b{~VNTG}Tj#qZltz5Q=qxR`&oIlW
Nr__JTFzvMr^FKp4S3v*(

literal 0
HcmV?d00001

diff --git a/dev-packages/e2e-tests/test-applications/angular-21/src/app/app.component.ts b/dev-packages/e2e-tests/test-applications/angular-21/src/app/app.component.ts
new file mode 100644
index 000000000000..90cd343e9449
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/angular-21/src/app/app.component.ts
@@ -0,0 +1,12 @@
+import { Component } from '@angular/core';
+import { RouterOutlet } from '@angular/router';
+
+@Component({
+  selector: 'app-root',
+  standalone: true,
+  imports: [RouterOutlet],
+  template: `<router-outlet></router-outlet>`,
+})
+export class AppComponent {
+  title = 'angular-21';
+}
diff --git a/dev-packages/e2e-tests/test-applications/angular-21/src/app/app.config.ts b/dev-packages/e2e-tests/test-applications/angular-21/src/app/app.config.ts
new file mode 100644
index 000000000000..f5cc30f3615b
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/angular-21/src/app/app.config.ts
@@ -0,0 +1,29 @@
+import {
+  ApplicationConfig,
+  ErrorHandler,
+  inject,
+  provideAppInitializer,
+  provideZoneChangeDetection,
+} from '@angular/core';
+import { Router, provideRouter } from '@angular/router';
+
+import { TraceService, createErrorHandler } from '@sentry/angular';
+import { routes } from './app.routes';
+
+export const appConfig: ApplicationConfig = {
+  providers: [
+    provideZoneChangeDetection({ eventCoalescing: true }),
+    provideRouter(routes),
+    {
+      provide: ErrorHandler,
+      useValue: createErrorHandler(),
+    },
+    {
+      provide: TraceService,
+      deps: [Router],
+    },
+    provideAppInitializer(() => {
+      inject(TraceService);
+    }),
+  ],
+};
diff --git a/dev-packages/e2e-tests/test-applications/angular-21/src/app/app.routes.ts b/dev-packages/e2e-tests/test-applications/angular-21/src/app/app.routes.ts
new file mode 100644
index 000000000000..24bf8b769051
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/angular-21/src/app/app.routes.ts
@@ -0,0 +1,42 @@
+import { Routes } from '@angular/router';
+import { cancelGuard } from './cancel-guard.guard';
+import { CancelComponent } from './cancel/cancel.components';
+import { ComponentTrackingComponent } from './component-tracking/component-tracking.components';
+import { HomeComponent } from './home/home.component';
+import { UserComponent } from './user/user.component';
+
+export const routes: Routes = [
+  {
+    path: 'users/:id',
+    component: UserComponent,
+  },
+  {
+    path: 'home',
+    component: HomeComponent,
+  },
+  {
+    path: 'cancel',
+    component: CancelComponent,
+    canActivate: [cancelGuard],
+  },
+  {
+    path: 'component-tracking',
+    component: ComponentTrackingComponent,
+  },
+  {
+    path: 'redirect1',
+    redirectTo: '/redirect2',
+  },
+  {
+    path: 'redirect2',
+    redirectTo: '/redirect3',
+  },
+  {
+    path: 'redirect3',
+    redirectTo: '/users/456',
+  },
+  {
+    path: '**',
+    redirectTo: 'home',
+  },
+];
diff --git a/dev-packages/e2e-tests/test-applications/angular-21/src/app/cancel-guard.guard.ts b/dev-packages/e2e-tests/test-applications/angular-21/src/app/cancel-guard.guard.ts
new file mode 100644
index 000000000000..16ec4a2ab164
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/angular-21/src/app/cancel-guard.guard.ts
@@ -0,0 +1,5 @@
+import { ActivatedRouteSnapshot, CanActivateFn, RouterStateSnapshot } from '@angular/router';
+
+export const cancelGuard: CanActivateFn = (_next: ActivatedRouteSnapshot, _state: RouterStateSnapshot) => {
+  return false;
+};
diff --git a/dev-packages/e2e-tests/test-applications/angular-21/src/app/cancel/cancel.components.ts b/dev-packages/e2e-tests/test-applications/angular-21/src/app/cancel/cancel.components.ts
new file mode 100644
index 000000000000..b6ee1876e035
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/angular-21/src/app/cancel/cancel.components.ts
@@ -0,0 +1,8 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-cancel',
+  standalone: true,
+  template: `<div></div>`,
+})
+export class CancelComponent {}
diff --git a/dev-packages/e2e-tests/test-applications/angular-21/src/app/component-tracking/component-tracking.components.ts b/dev-packages/e2e-tests/test-applications/angular-21/src/app/component-tracking/component-tracking.components.ts
new file mode 100644
index 000000000000..76bd580ecaf6
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/angular-21/src/app/component-tracking/component-tracking.components.ts
@@ -0,0 +1,21 @@
+import { AfterViewInit, Component, OnInit } from '@angular/core';
+import { TraceClass, TraceMethod, TraceModule } from '@sentry/angular';
+import { SampleComponent } from '../sample-component/sample-component.components';
+
+@Component({
+  selector: 'app-component-tracking',
+  standalone: true,
+  imports: [TraceModule, SampleComponent],
+  template: `
+    <app-sample-component trace="sample-component"></app-sample-component>
+    <app-sample-component trace></app-sample-component>
+  `,
+})
+@TraceClass({ name: 'ComponentTrackingComponent' })
+export class ComponentTrackingComponent implements OnInit, AfterViewInit {
+  @TraceMethod({ name: 'ngOnInit' })
+  ngOnInit() {}
+
+  @TraceMethod()
+  ngAfterViewInit() {}
+}
diff --git a/dev-packages/e2e-tests/test-applications/angular-21/src/app/home/home.component.ts b/dev-packages/e2e-tests/test-applications/angular-21/src/app/home/home.component.ts
new file mode 100644
index 000000000000..78b914602eb9
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/angular-21/src/app/home/home.component.ts
@@ -0,0 +1,26 @@
+import { Component } from '@angular/core';
+import { RouterLink } from '@angular/router';
+
+@Component({
+  selector: 'app-home',
+  standalone: true,
+  imports: [RouterLink],
+  template: `
+    <main>
+      <h1>Welcome to Sentry's Angular 21 E2E test app</h1>
+      <ul>
+        <li><a id="navLink" [routerLink]="['/users', '123']">Visit User 123</a></li>
+        <li><a id="redirectLink" [routerLink]="['/redirect1']">Redirect</a></li>
+        <li><a id="cancelLink" [routerLink]="['/cancel']">Cancel</a></li>
+        <li><a id="nonExistentLink" [routerLink]="['/non-existent']">Error</a></li>
+        <li><a id="componentTracking" [routerLink]="['/component-tracking']">Component Tracking</a></li>
+      </ul>
+      <button id="errorBtn" (click)="throwError()">Throw error</button>
+    </main>
+  `,
+})
+export class HomeComponent {
+  throwError() {
+    throw new Error('Error thrown from Angular 21 E2E test app');
+  }
+}
diff --git a/dev-packages/e2e-tests/test-applications/angular-21/src/app/sample-component/sample-component.components.ts b/dev-packages/e2e-tests/test-applications/angular-21/src/app/sample-component/sample-component.components.ts
new file mode 100644
index 000000000000..da09425c7565
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/angular-21/src/app/sample-component/sample-component.components.ts
@@ -0,0 +1,12 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-sample-component',
+  standalone: true,
+  template: `<div>Component</div>`,
+})
+export class SampleComponent implements OnInit {
+  ngOnInit() {
+    console.log('SampleComponent');
+  }
+}
diff --git a/dev-packages/e2e-tests/test-applications/angular-21/src/app/user/user.component.ts b/dev-packages/e2e-tests/test-applications/angular-21/src/app/user/user.component.ts
new file mode 100644
index 000000000000..db02568d395f
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/angular-21/src/app/user/user.component.ts
@@ -0,0 +1,25 @@
+import { AsyncPipe } from '@angular/common';
+import { Component } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { Observable, map } from 'rxjs';
+
+@Component({
+  selector: 'app-user',
+  standalone: true,
+  imports: [AsyncPipe],
+  template: `
+    <h1>Hello User {{ userId$ | async }}</h1>
+    <button id="userErrorBtn" (click)="throwError()">Throw error</button>
+  `,
+})
+export class UserComponent {
+  public userId$: Observable<string>;
+
+  constructor(private route: ActivatedRoute) {
+    this.userId$ = this.route.paramMap.pipe(map(params => params.get('id') || 'UNKNOWN USER'));
+  }
+
+  throwError() {
+    throw new Error('Error thrown from user page');
+  }
+}
diff --git a/dev-packages/e2e-tests/test-applications/angular-21/src/index.html b/dev-packages/e2e-tests/test-applications/angular-21/src/index.html
new file mode 100644
index 000000000000..ffc9a3f96de6
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/angular-21/src/index.html
@@ -0,0 +1,13 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <title>Angular 21</title>
+    <base href="/" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <link rel="icon" type="image/x-icon" href="favicon.ico" />
+  </head>
+  <body>
+    <app-root></app-root>
+  </body>
+</html>
diff --git a/dev-packages/e2e-tests/test-applications/angular-21/src/main.ts b/dev-packages/e2e-tests/test-applications/angular-21/src/main.ts
new file mode 100644
index 000000000000..a0b841afc333
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/angular-21/src/main.ts
@@ -0,0 +1,15 @@
+import { bootstrapApplication } from '@angular/platform-browser';
+import { AppComponent } from './app/app.component';
+import { appConfig } from './app/app.config';
+
+import * as Sentry from '@sentry/angular';
+
+Sentry.init({
+  // Cannot use process.env here, so we hardcode the DSN
+  dsn: 'https://3b6c388182fb435097f41d181be2b2ba@o4504321058471936.ingest.sentry.io/4504321066008576',
+  tracesSampleRate: 1.0,
+  integrations: [Sentry.browserTracingIntegration({})],
+  tunnel: `http://localhost:3031/`, // proxy server
+});
+
+bootstrapApplication(AppComponent, appConfig).catch(err => console.error(err));
diff --git a/dev-packages/e2e-tests/test-applications/angular-21/src/styles.css b/dev-packages/e2e-tests/test-applications/angular-21/src/styles.css
new file mode 100644
index 000000000000..90d4ee0072ce
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/angular-21/src/styles.css
@@ -0,0 +1 @@
+/* You can add global styles to this file, and also import other style files */
diff --git a/dev-packages/e2e-tests/test-applications/angular-21/start-event-proxy.mjs b/dev-packages/e2e-tests/test-applications/angular-21/start-event-proxy.mjs
new file mode 100644
index 000000000000..2ea1a8ef918c
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/angular-21/start-event-proxy.mjs
@@ -0,0 +1,6 @@
+import { startEventProxyServer } from '@sentry-internal/test-utils';
+
+startEventProxyServer({
+  port: 3031,
+  proxyServerName: 'angular-21',
+});
diff --git a/dev-packages/e2e-tests/test-applications/angular-21/tests/errors.test.ts b/dev-packages/e2e-tests/test-applications/angular-21/tests/errors.test.ts
new file mode 100644
index 000000000000..f4f219373104
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/angular-21/tests/errors.test.ts
@@ -0,0 +1,65 @@
+import { expect, test } from '@playwright/test';
+import { waitForError, waitForTransaction } from '@sentry-internal/test-utils';
+
+test('sends an error', async ({ page }) => {
+  const errorPromise = waitForError('angular-21', async errorEvent => {
+    return !errorEvent.type;
+  });
+
+  await page.goto(`/`);
+
+  await page.locator('#errorBtn').click();
+
+  const error = await errorPromise;
+
+  expect(error).toMatchObject({
+    exception: {
+      values: [
+        {
+          type: 'Error',
+          value: 'Error thrown from Angular 21 E2E test app',
+          mechanism: {
+            type: 'auto.function.angular.error_handler',
+            handled: false,
+          },
+        },
+      ],
+    },
+    transaction: '/home/',
+  });
+});
+
+test('assigns the correct transaction value after a navigation', async ({ page }) => {
+  const pageloadTxnPromise = waitForTransaction('angular-21', async transactionEvent => {
+    return !!transactionEvent?.transaction && transactionEvent.contexts?.trace?.op === 'pageload';
+  });
+
+  const errorPromise = waitForError('angular-21', async errorEvent => {
+    return !errorEvent.type;
+  });
+
+  await page.goto(`/`);
+  await pageloadTxnPromise;
+
+  await page.waitForTimeout(5000);
+
+  await page.locator('#navLink').click();
+
+  const [_, error] = await Promise.all([page.locator('#userErrorBtn').click(), errorPromise]);
+
+  expect(error).toMatchObject({
+    exception: {
+      values: [
+        {
+          type: 'Error',
+          value: 'Error thrown from user page',
+          mechanism: {
+            type: 'auto.function.angular.error_handler',
+            handled: false,
+          },
+        },
+      ],
+    },
+    transaction: '/users/:id/',
+  });
+});
diff --git a/dev-packages/e2e-tests/test-applications/angular-21/tests/performance.test.ts b/dev-packages/e2e-tests/test-applications/angular-21/tests/performance.test.ts
new file mode 100644
index 000000000000..cee1f939c4c6
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/angular-21/tests/performance.test.ts
@@ -0,0 +1,327 @@
+import { expect, test } from '@playwright/test';
+import { waitForTransaction } from '@sentry-internal/test-utils';
+// Cannot use @sentry/angular here due to build stuff
+import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
+
+test('sends a pageload transaction with a parameterized URL', async ({ page }) => {
+  const transactionPromise = waitForTransaction('angular-21', async transactionEvent => {
+    return !!transactionEvent?.transaction && transactionEvent.contexts?.trace?.op === 'pageload';
+  });
+
+  await page.goto(`/`);
+
+  const rootSpan = await transactionPromise;
+
+  expect(rootSpan).toMatchObject({
+    contexts: {
+      trace: {
+        op: 'pageload',
+        origin: 'auto.pageload.angular',
+      },
+    },
+    transaction: '/home/',
+    transaction_info: {
+      source: 'route',
+    },
+  });
+});
+
+test('sends a navigation transaction with a parameterized URL', async ({ page }) => {
+  const pageloadTxnPromise = waitForTransaction('angular-21', async transactionEvent => {
+    return !!transactionEvent?.transaction && transactionEvent.contexts?.trace?.op === 'pageload';
+  });
+
+  const navigationTxnPromise = waitForTransaction('angular-21', async transactionEvent => {
+    return !!transactionEvent?.transaction && transactionEvent.contexts?.trace?.op === 'navigation';
+  });
+
+  await page.goto(`/`);
+  await pageloadTxnPromise;
+
+  await page.waitForTimeout(5000);
+
+  const [_, navigationTxn] = await Promise.all([page.locator('#navLink').click(), navigationTxnPromise]);
+
+  expect(navigationTxn).toMatchObject({
+    contexts: {
+      trace: {
+        op: 'navigation',
+      },
+    },
+    transaction: '/users/:id/',
+    transaction_info: {
+      source: 'route',
+    },
+  });
+});
+
+test('sends a navigation transaction even if the pageload span is still active', async ({ page }) => {
+  const pageloadTxnPromise = waitForTransaction('angular-21', async transactionEvent => {
+    return !!transactionEvent?.transaction && transactionEvent.contexts?.trace?.op === 'pageload';
+  });
+
+  const navigationTxnPromise = waitForTransaction('angular-21', async transactionEvent => {
+    return !!transactionEvent?.transaction && transactionEvent.contexts?.trace?.op === 'navigation';
+  });
+
+  await page.goto(`/`);
+
+  // immediately navigate to a different route
+  const [_, pageloadTxn, navigationTxn] = await Promise.all([
+    page.locator('#navLink').click(),
+    pageloadTxnPromise,
+    navigationTxnPromise,
+  ]);
+
+  expect(pageloadTxn).toMatchObject({
+    contexts: {
+      trace: {
+        op: 'pageload',
+        origin: 'auto.pageload.angular',
+      },
+    },
+    transaction: '/home/',
+    transaction_info: {
+      source: 'route',
+    },
+  });
+
+  expect(navigationTxn).toMatchObject({
+    contexts: {
+      trace: {
+        op: 'navigation',
+        origin: 'auto.navigation.angular',
+      },
+    },
+    transaction: '/users/:id/',
+    transaction_info: {
+      source: 'route',
+    },
+  });
+});
+
+test('groups redirects within one navigation root span', async ({ page }) => {
+  const navigationTxnPromise = waitForTransaction('angular-21', async transactionEvent => {
+    return !!transactionEvent?.transaction && transactionEvent.contexts?.trace?.op === 'navigation';
+  });
+
+  await page.goto(`/`);
+
+  // immediately navigate to a different route
+  const [_, navigationTxn] = await Promise.all([page.locator('#redirectLink').click(), navigationTxnPromise]);
+
+  expect(navigationTxn).toMatchObject({
+    contexts: {
+      trace: {
+        op: 'navigation',
+        origin: 'auto.navigation.angular',
+      },
+    },
+    transaction: '/users/:id/',
+    transaction_info: {
+      source: 'route',
+    },
+  });
+
+  const routingSpan = navigationTxn.spans?.find(span => span.op === 'ui.angular.routing');
+
+  expect(routingSpan).toBeDefined();
+  expect(routingSpan?.description).toBe('/redirect1');
+});
+
+test.describe('finish routing span', () => {
+  test('finishes routing span on navigation cancel', async ({ page }) => {
+    const navigationTxnPromise = waitForTransaction('angular-21', async transactionEvent => {
+      return !!transactionEvent?.transaction && transactionEvent.contexts?.trace?.op === 'navigation';
+    });
+
+    await page.goto(`/`);
+
+    // immediately navigate to a different route
+    const [_, navigationTxn] = await Promise.all([page.locator('#cancelLink').click(), navigationTxnPromise]);
+
+    expect(navigationTxn).toMatchObject({
+      contexts: {
+        trace: {
+          op: 'navigation',
+          origin: 'auto.navigation.angular',
+        },
+      },
+      transaction: '/cancel',
+      transaction_info: {
+        source: 'url',
+      },
+    });
+
+    const routingSpan = navigationTxn.spans?.find(span => span.op === 'ui.angular.routing');
+
+    expect(routingSpan).toBeDefined();
+    expect(routingSpan?.description).toBe('/cancel');
+  });
+
+  test('finishes routing span on navigation error', async ({ page }) => {
+    const navigationTxnPromise = waitForTransaction('angular-21', async transactionEvent => {
+      return !!transactionEvent?.transaction && transactionEvent.contexts?.trace?.op === 'navigation';
+    });
+
+    await page.goto(`/`);
+
+    // immediately navigate to a different route
+    const [_, navigationTxn] = await Promise.all([page.locator('#nonExistentLink').click(), navigationTxnPromise]);
+
+    const nonExistentRoute = '/non-existent';
+
+    expect(navigationTxn).toMatchObject({
+      contexts: {
+        trace: {
+          op: 'navigation',
+          origin: 'auto.navigation.angular',
+        },
+      },
+      transaction: nonExistentRoute,
+      transaction_info: {
+        source: 'url',
+      },
+    });
+
+    const routingSpan = navigationTxn.spans?.find(span => span.op === 'ui.angular.routing');
+
+    expect(routingSpan).toBeDefined();
+    expect(routingSpan?.description).toBe(nonExistentRoute);
+  });
+});
+
+test.describe('TraceDirective', () => {
+  test('creates a child span with the component name as span name on ngOnInit', async ({ page }) => {
+    const navigationTxnPromise = waitForTransaction('angular-21', async transactionEvent => {
+      return !!transactionEvent?.transaction && transactionEvent.contexts?.trace?.op === 'navigation';
+    });
+
+    await page.goto(`/`);
+
+    // immediately navigate to a different route
+    const [_, navigationTxn] = await Promise.all([page.locator('#componentTracking').click(), navigationTxnPromise]);
+
+    const traceDirectiveSpans = navigationTxn.spans?.filter(
+      span => span?.data && span?.data[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN] === 'auto.ui.angular.trace_directive',
+    );
+
+    expect(traceDirectiveSpans).toHaveLength(2);
+    expect(traceDirectiveSpans).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          data: {
+            [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'ui.angular.init',
+            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.angular.trace_directive',
+          },
+          description: '<sample-component>', // custom component name passed to trace directive
+          op: 'ui.angular.init',
+          origin: 'auto.ui.angular.trace_directive',
+          start_timestamp: expect.any(Number),
+          timestamp: expect.any(Number),
+        }),
+        expect.objectContaining({
+          data: {
+            [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'ui.angular.init',
+            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.angular.trace_directive',
+          },
+          description: '<app-sample-component>', // fallback selector name
+          op: 'ui.angular.init',
+          origin: 'auto.ui.angular.trace_directive',
+          start_timestamp: expect.any(Number),
+          timestamp: expect.any(Number),
+        }),
+      ]),
+    );
+  });
+});
+
+test.describe('TraceClass Decorator', () => {
+  test('adds init span for decorated class', async ({ page }) => {
+    const navigationTxnPromise = waitForTransaction('angular-21', async transactionEvent => {
+      return !!transactionEvent?.transaction && transactionEvent.contexts?.trace?.op === 'navigation';
+    });
+
+    await page.goto(`/`);
+
+    // immediately navigate to a different route
+    const [_, navigationTxn] = await Promise.all([page.locator('#componentTracking').click(), navigationTxnPromise]);
+
+    const classDecoratorSpan = navigationTxn.spans?.find(
+      span => span?.data && span?.data[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN] === 'auto.ui.angular.trace_class_decorator',
+    );
+
+    expect(classDecoratorSpan).toBeDefined();
+    expect(classDecoratorSpan).toEqual(
+      expect.objectContaining({
+        data: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'ui.angular.init',
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.angular.trace_class_decorator',
+        },
+        description: '<ComponentTrackingComponent>',
+        op: 'ui.angular.init',
+        origin: 'auto.ui.angular.trace_class_decorator',
+        start_timestamp: expect.any(Number),
+        timestamp: expect.any(Number),
+      }),
+    );
+  });
+});
+
+test.describe('TraceMethod Decorator', () => {
+  test('adds name to span description of decorated method `ngOnInit`', async ({ page }) => {
+    const navigationTxnPromise = waitForTransaction('angular-21', async transactionEvent => {
+      return !!transactionEvent?.transaction && transactionEvent.contexts?.trace?.op === 'navigation';
+    });
+
+    await page.goto(`/`);
+
+    // immediately navigate to a different route
+    const [_, navigationTxn] = await Promise.all([page.locator('#componentTracking').click(), navigationTxnPromise]);
+
+    const ngInitSpan = navigationTxn.spans?.find(span => span.op === 'ui.angular.ngOnInit');
+
+    expect(ngInitSpan).toBeDefined();
+    expect(ngInitSpan).toEqual(
+      expect.objectContaining({
+        data: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'ui.angular.ngOnInit',
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.angular.trace_method_decorator',
+        },
+        description: '<ngOnInit>',
+        op: 'ui.angular.ngOnInit',
+        origin: 'auto.ui.angular.trace_method_decorator',
+        start_timestamp: expect.any(Number),
+        timestamp: expect.any(Number),
+      }),
+    );
+  });
+
+  test('adds fallback name to span description of decorated method `ngAfterViewInit`', async ({ page }) => {
+    const navigationTxnPromise = waitForTransaction('angular-21', async transactionEvent => {
+      return !!transactionEvent?.transaction && transactionEvent.contexts?.trace?.op === 'navigation';
+    });
+
+    await page.goto(`/`);
+
+    // immediately navigate to a different route
+    const [_, navigationTxn] = await Promise.all([page.locator('#componentTracking').click(), navigationTxnPromise]);
+
+    const ngAfterViewInitSpan = navigationTxn.spans?.find(span => span.op === 'ui.angular.ngAfterViewInit');
+
+    expect(ngAfterViewInitSpan).toBeDefined();
+    expect(ngAfterViewInitSpan).toEqual(
+      expect.objectContaining({
+        data: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'ui.angular.ngAfterViewInit',
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.angular.trace_method_decorator',
+        },
+        description: '<unnamed>',
+        op: 'ui.angular.ngAfterViewInit',
+        origin: 'auto.ui.angular.trace_method_decorator',
+        start_timestamp: expect.any(Number),
+        timestamp: expect.any(Number),
+      }),
+    );
+  });
+});
diff --git a/dev-packages/e2e-tests/test-applications/angular-21/tsconfig.app.json b/dev-packages/e2e-tests/test-applications/angular-21/tsconfig.app.json
new file mode 100644
index 000000000000..8886e903f8d0
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/angular-21/tsconfig.app.json
@@ -0,0 +1,11 @@
+/* To learn more about Typescript configuration file: https://www.typescriptlang.org/docs/handbook/tsconfig-json.html. */
+/* To learn more about Angular compiler options: https://angular.dev/reference/configs/angular-compiler-options. */
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./out-tsc/app",
+    "types": []
+  },
+  "files": ["src/main.ts"],
+  "include": ["src/**/*.d.ts"]
+}
diff --git a/dev-packages/e2e-tests/test-applications/angular-21/tsconfig.json b/dev-packages/e2e-tests/test-applications/angular-21/tsconfig.json
new file mode 100644
index 000000000000..5525117c6744
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/angular-21/tsconfig.json
@@ -0,0 +1,27 @@
+/* To learn more about Typescript configuration file: https://www.typescriptlang.org/docs/handbook/tsconfig-json.html. */
+/* To learn more about Angular compiler options: https://angular.dev/reference/configs/angular-compiler-options. */
+{
+  "compileOnSave": false,
+  "compilerOptions": {
+    "outDir": "./dist/out-tsc",
+    "strict": true,
+    "noImplicitOverride": true,
+    "noPropertyAccessFromIndexSignature": true,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true,
+    "skipLibCheck": true,
+    "isolatedModules": true,
+    "esModuleInterop": true,
+    "experimentalDecorators": true,
+    "moduleResolution": "bundler",
+    "importHelpers": true,
+    "target": "ES2022",
+    "module": "ES2022"
+  },
+  "angularCompilerOptions": {
+    "enableI18nLegacyMessageIdFormat": false,
+    "strictInjectionParameters": true,
+    "strictInputAccessModifiers": true,
+    "strictTemplates": true
+  }
+}
diff --git a/dev-packages/e2e-tests/test-applications/angular-21/tsconfig.spec.json b/dev-packages/e2e-tests/test-applications/angular-21/tsconfig.spec.json
new file mode 100644
index 000000000000..e00e30e6d4fb
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/angular-21/tsconfig.spec.json
@@ -0,0 +1,10 @@
+/* To learn more about Typescript configuration file: https://www.typescriptlang.org/docs/handbook/tsconfig-json.html. */
+/* To learn more about Angular compiler options: https://angular.dev/reference/configs/angular-compiler-options. */
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./out-tsc/spec",
+    "types": ["jasmine"]
+  },
+  "include": ["src/**/*.spec.ts", "src/**/*.d.ts"]
+}
diff --git a/packages/angular/package.json b/packages/angular/package.json
index 01912cb13f79..fd378f4af2d8 100644
--- a/packages/angular/package.json
+++ b/packages/angular/package.json
@@ -15,9 +15,9 @@
     "access": "public"
   },
   "peerDependencies": {
-    "@angular/common": ">= 14.x <= 20.x",
-    "@angular/core": ">= 14.x <= 20.x",
-    "@angular/router": ">= 14.x <= 20.x",
+    "@angular/common": ">= 14.x <= 21.x",
+    "@angular/core": ">= 14.x <= 21.x",
+    "@angular/router": ">= 14.x <= 21.x",
     "rxjs": "^6.5.5 || ^7.x"
   },
   "dependencies": {

From 108b027446cfb166a7dca04e69ec9207c2bf2406 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 21 Nov 2025 12:57:05 +0100
Subject: [PATCH 108/186] feat(deps): bump @sentry/bundler-plugin-core from
 4.3.0 to 4.6.1 (#18273)

---
 packages/nextjs/package.json |  2 +-
 yarn.lock                    | 31 +++++++++++++++++++++++++------
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/packages/nextjs/package.json b/packages/nextjs/package.json
index 15b6a2bf3040..9afdfec16d7b 100644
--- a/packages/nextjs/package.json
+++ b/packages/nextjs/package.json
@@ -80,7 +80,7 @@
     "@opentelemetry/semantic-conventions": "^1.37.0",
     "@rollup/plugin-commonjs": "28.0.1",
     "@sentry-internal/browser-utils": "10.26.0",
-    "@sentry/bundler-plugin-core": "^4.3.0",
+    "@sentry/bundler-plugin-core": "^4.6.1",
     "@sentry/core": "10.26.0",
     "@sentry/node": "10.26.0",
     "@sentry/opentelemetry": "10.26.0",
diff --git a/yarn.lock b/yarn.lock
index e3f84550ba9e..8687df6cfa53 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7089,7 +7089,12 @@
   resolved "https://registry.yarnpkg.com/@sentry/babel-plugin-component-annotate/-/babel-plugin-component-annotate-4.3.0.tgz#c5b6cbb986952596d3ad233540a90a1fd18bad80"
   integrity sha512-OuxqBprXRyhe8Pkfyz/4yHQJc5c3lm+TmYWSSx8u48g5yKewSQDOxkiLU5pAk3WnbLPy8XwU/PN+2BG0YFU9Nw==
 
-"@sentry/bundler-plugin-core@4.3.0", "@sentry/bundler-plugin-core@^4.3.0":
+"@sentry/babel-plugin-component-annotate@4.6.1":
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/@sentry/babel-plugin-component-annotate/-/babel-plugin-component-annotate-4.6.1.tgz#94eec0293be8289daa574e18783e64d29203c236"
+  integrity sha512-aSIk0vgBqv7PhX6/Eov+vlI4puCE0bRXzUG5HdCsHBpAfeMkI8Hva6kSOusnzKqs8bf04hU7s3Sf0XxGTj/1AA==
+
+"@sentry/bundler-plugin-core@4.3.0":
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/@sentry/bundler-plugin-core/-/bundler-plugin-core-4.3.0.tgz#cf302522a3e5b8a3bf727635d0c6a7bece981460"
   integrity sha512-dmR4DJhJ4jqVWGWppuTL2blNFqOZZnt4aLkewbD1myFG3KVfUx8CrMQWEmGjkgPOtj5TO6xH9PyTJjXC6o5tnA==
@@ -7103,6 +7108,20 @@
     magic-string "0.30.8"
     unplugin "1.0.1"
 
+"@sentry/bundler-plugin-core@^4.6.1":
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/@sentry/bundler-plugin-core/-/bundler-plugin-core-4.6.1.tgz#d6013e6233bf663114f581bbd3c3a380ff9311d4"
+  integrity sha512-WPeRbnMXm927m4Kr69NTArPfI+p5/34FHftdCRI3LFPMyhZDzz6J3wLy4hzaVUgmMf10eLzmq2HGEMvpQmdynA==
+  dependencies:
+    "@babel/core" "^7.18.5"
+    "@sentry/babel-plugin-component-annotate" "4.6.1"
+    "@sentry/cli" "^2.57.0"
+    dotenv "^16.3.1"
+    find-up "^5.0.0"
+    glob "^10.5.0"
+    magic-string "0.30.8"
+    unplugin "1.0.1"
+
 "@sentry/cli-darwin@2.58.2":
   version "2.58.2"
   resolved "https://registry.yarnpkg.com/@sentry/cli-darwin/-/cli-darwin-2.58.2.tgz#61f6f836de8ac2e1992ccadc0368bc403f23c609"
@@ -7143,7 +7162,7 @@
   resolved "https://registry.yarnpkg.com/@sentry/cli-win32-x64/-/cli-win32-x64-2.58.2.tgz#b4c81a3c163344ae8b27523a0391e7f99c533f41"
   integrity sha512-2NAFs9UxVbRztQbgJSP5i8TB9eJQ7xraciwj/93djrSMHSEbJ0vC47TME0iifgvhlHMs5vqETOKJtfbbpQAQFA==
 
-"@sentry/cli@^2.51.0", "@sentry/cli@^2.58.2":
+"@sentry/cli@^2.51.0", "@sentry/cli@^2.57.0", "@sentry/cli@^2.58.2":
   version "2.58.2"
   resolved "https://registry.yarnpkg.com/@sentry/cli/-/cli-2.58.2.tgz#0d6e19a1771d27aae8b2765a6f3e96062e2c7502"
   integrity sha512-U4u62V4vaTWF+o40Mih8aOpQKqKUbZQt9A3LorIJwaE3tO3XFLRI70eWtW2se1Qmy0RZ74zB14nYcFNFl2t4Rw==
@@ -17942,10 +17961,10 @@ glob@8.0.3:
     minimatch "^5.0.1"
     once "^1.3.0"
 
-glob@^10.0.0, glob@^10.2.2, glob@^10.3.10, glob@^10.3.4, glob@^10.3.7, glob@^10.4.1, glob@^10.4.5:
-  version "10.4.5"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.5.tgz#f4d9f0b90ffdbab09c9d77f5f29b4262517b0956"
-  integrity sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==
+glob@^10.0.0, glob@^10.2.2, glob@^10.3.10, glob@^10.3.4, glob@^10.3.7, glob@^10.4.1, glob@^10.4.5, glob@^10.5.0:
+  version "10.5.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-10.5.0.tgz#8ec0355919cd3338c28428a23d4f24ecc5fe738c"
+  integrity sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==
   dependencies:
     foreground-child "^3.1.0"
     jackspeak "^3.1.2"

From edc1f09dc7f8e6a67647f8c91aa00169319be4fb Mon Sep 17 00:00:00 2001
From: Charly Gomez <charly.gomez@sentry.io>
Date: Fri, 21 Nov 2025 14:31:26 +0100
Subject: [PATCH 109/186] test(e2e): Fix astro config in test app (#18282)

https://5-0-0-beta.docs.astro.build/en/guides/upgrade-to/v5/#removed-hybrid-rendering-mode

the test app was bumped to v5 from dependabot in
https://github.com/getsentry/sentry-javascript/pull/18259

---------

Co-authored-by: Andrei Borza <andrei.borza@sentry.io>
---
 .../test-applications/cloudflare-astro/astro.config.mjs         | 1 -
 .../e2e-tests/test-applications/cloudflare-astro/package.json   | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-astro/astro.config.mjs b/dev-packages/e2e-tests/test-applications/cloudflare-astro/astro.config.mjs
index 36414cf24b7c..026e6e4dac7c 100644
--- a/dev-packages/e2e-tests/test-applications/cloudflare-astro/astro.config.mjs
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-astro/astro.config.mjs
@@ -6,7 +6,6 @@ const dsn = process.env.E2E_TEST_DSN;
 
 // https://astro.build/config
 export default defineConfig({
-  output: 'hybrid',
   adapter: cloudflare({
     imageService: 'passthrough',
   }),
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-astro/package.json b/dev-packages/e2e-tests/test-applications/cloudflare-astro/package.json
index 4db15edabbd7..776cf271e86e 100644
--- a/dev-packages/e2e-tests/test-applications/cloudflare-astro/package.json
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-astro/package.json
@@ -17,7 +17,7 @@
     "test:assert": "pnpm -v"
   },
   "dependencies": {
-    "@astrojs/cloudflare": "8.1.0",
+    "@astrojs/cloudflare": "12.6.11",
     "@sentry/astro": "latest || *",
     "astro": "5.15.9"
   },

From 3375de056e152cd58345a5b87b77a8a1068957bd Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Fri, 21 Nov 2025 15:42:21 +0100
Subject: [PATCH 110/186] feat(core): Add scope attribute APIs (#18165)

This PR adds `scope.setAttribute`, `scope.setAttributes` and
`scope.removeAttribute` methods, as specified in our [develop
docs](https://develop.sentry.dev/sdk/telemetry/scopes/#setting-attributes).

This intial PR only enables setting the attributes (including attributes
with units) as well as the usual scope data operations (clone(),
update(), clear(), getSpanData()). These attributes are not yet applied
to any of the telemetry we eventually want them to apply to. I'll take
care of this in a follow-up PR.

closes https://github.com/getsentry/sentry-javascript/issues/18140

ref
https://linear.app/getsentry/project/implement-global-attributes-api-javascript-02c3c74184fc/issues

---------

Co-authored-by: Sigrid <32902192+s1gr1d@users.noreply.github.com>
---
 .size-limit.js                            |  14 +-
 packages/core/src/attributes.ts           | 141 +++++++++++
 packages/core/src/scope.ts                |  96 +++++++-
 packages/core/test/lib/attributes.test.ts | 286 ++++++++++++++++++++++
 packages/core/test/lib/scope.test.ts      | 167 ++++++++++++-
 5 files changed, 695 insertions(+), 9 deletions(-)
 create mode 100644 packages/core/src/attributes.ts
 create mode 100644 packages/core/test/lib/attributes.test.ts

diff --git a/.size-limit.js b/.size-limit.js
index 100444907e06..6e6ee0f68303 100644
--- a/.size-limit.js
+++ b/.size-limit.js
@@ -38,7 +38,7 @@ module.exports = [
     path: 'packages/browser/build/npm/esm/prod/index.js',
     import: createImport('init', 'browserTracingIntegration'),
     gzip: true,
-    limit: '41.5 KB',
+    limit: '42 KB',
   },
   {
     name: '@sentry/browser (incl. Tracing, Profiling)',
@@ -127,7 +127,7 @@ module.exports = [
     import: createImport('init', 'ErrorBoundary', 'reactRouterV6BrowserTracingIntegration'),
     ignore: ['react/jsx-runtime'],
     gzip: true,
-    limit: '43.5 KB',
+    limit: '44 KB',
   },
   // Vue SDK (ESM)
   {
@@ -142,7 +142,7 @@ module.exports = [
     path: 'packages/vue/build/esm/index.js',
     import: createImport('init', 'browserTracingIntegration'),
     gzip: true,
-    limit: '43.3 KB',
+    limit: '44 KB',
   },
   // Svelte SDK (ESM)
   {
@@ -163,7 +163,7 @@ module.exports = [
     name: 'CDN Bundle (incl. Tracing)',
     path: createCDNPath('bundle.tracing.min.js'),
     gzip: true,
-    limit: '42.1 KB',
+    limit: '42.5 KB',
   },
   {
     name: 'CDN Bundle (incl. Tracing, Replay)',
@@ -183,14 +183,14 @@ module.exports = [
     path: createCDNPath('bundle.min.js'),
     gzip: false,
     brotli: false,
-    limit: '80 KB',
+    limit: '82 KB',
   },
   {
     name: 'CDN Bundle (incl. Tracing) - uncompressed',
     path: createCDNPath('bundle.tracing.min.js'),
     gzip: false,
     brotli: false,
-    limit: '125 KB',
+    limit: '127 KB',
   },
   {
     name: 'CDN Bundle (incl. Tracing, Replay) - uncompressed',
@@ -231,7 +231,7 @@ module.exports = [
     import: createImport('init'),
     ignore: [...builtinModules, ...nodePrefixedBuiltinModules],
     gzip: true,
-    limit: '51.1 KB',
+    limit: '52 KB',
   },
   // Node SDK (ESM)
   {
diff --git a/packages/core/src/attributes.ts b/packages/core/src/attributes.ts
new file mode 100644
index 000000000000..d979d5c4350f
--- /dev/null
+++ b/packages/core/src/attributes.ts
@@ -0,0 +1,141 @@
+import { DEBUG_BUILD } from './debug-build';
+import type { DurationUnit, FractionUnit, InformationUnit } from './types-hoist/measurement';
+import { debug } from './utils/debug-logger';
+
+export type RawAttributes<T> = T & ValidatedAttributes<T>;
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export type RawAttribute<T> = T extends { value: any } | { unit: any } ? AttributeObject : T;
+
+export type Attributes = Record<string, TypedAttributeValue>;
+
+export type AttributeValueType = string | number | boolean | Array<string> | Array<number> | Array<boolean>;
+
+type AttributeTypeMap = {
+  string: string;
+  integer: number;
+  double: number;
+  boolean: boolean;
+  'string[]': Array<string>;
+  'integer[]': Array<number>;
+  'double[]': Array<number>;
+  'boolean[]': Array<boolean>;
+};
+
+/* Generates a type from the AttributeTypeMap like:
+  | { value: string; type: 'string' }
+  | { value: number; type: 'integer' }
+  | { value: number; type: 'double' }
+ */
+type AttributeUnion = {
+  [K in keyof AttributeTypeMap]: {
+    value: AttributeTypeMap[K];
+    type: K;
+  };
+}[keyof AttributeTypeMap];
+
+export type TypedAttributeValue = AttributeUnion & { unit?: AttributeUnit };
+
+export type AttributeObject = {
+  value: unknown;
+  unit?: AttributeUnit;
+};
+
+// Unfortunately, we loose type safety if we did something like Exclude<MeasurementUnit, string>
+// so therefore we unionize between the three supported unit categories.
+type AttributeUnit = DurationUnit | InformationUnit | FractionUnit;
+
+/* If an attribute has either a 'value' or 'unit' property, we use the ValidAttributeObject type. */
+export type ValidatedAttributes<T> = {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  [K in keyof T]: T[K] extends { value: any } | { unit: any } ? AttributeObject : unknown;
+};
+
+/**
+ * Type-guard: The attribute object has the shape the official attribute object (value, type, unit).
+ * https://develop.sentry.dev/sdk/telemetry/scopes/#setting-attributes
+ */
+export function isAttributeObject(maybeObj: unknown): maybeObj is AttributeObject {
+  return (
+    typeof maybeObj === 'object' &&
+    maybeObj != null &&
+    !Array.isArray(maybeObj) &&
+    Object.keys(maybeObj).includes('value')
+  );
+}
+
+/**
+ * Converts an attribute value to a typed attribute value.
+ *
+ * Does not allow mixed arrays. In case of a mixed array, the value is stringified and the type is 'string'.
+ * All values besides the supported attribute types (see {@link AttributeTypeMap}) are stringified to a string attribute value.
+ *
+ * @param value - The value of the passed attribute.
+ * @returns The typed attribute.
+ */
+export function attributeValueToTypedAttributeValue(rawValue: unknown): TypedAttributeValue {
+  const { value, unit } = isAttributeObject(rawValue) ? rawValue : { value: rawValue, unit: undefined };
+  return { ...getTypedAttributeValue(value), ...(unit && typeof unit === 'string' ? { unit } : {}) };
+}
+
+// Only allow string, boolean, or number types
+const getPrimitiveType: (
+  item: unknown,
+) => keyof Pick<AttributeTypeMap, 'string' | 'integer' | 'double' | 'boolean'> | null = item =>
+  typeof item === 'string'
+    ? 'string'
+    : typeof item === 'boolean'
+      ? 'boolean'
+      : typeof item === 'number' && !Number.isNaN(item)
+        ? Number.isInteger(item)
+          ? 'integer'
+          : 'double'
+        : null;
+
+function getTypedAttributeValue(value: unknown): TypedAttributeValue {
+  const primitiveType = getPrimitiveType(value);
+  if (primitiveType) {
+    // @ts-expect-error - TS complains because {@link TypedAttributeValue} is strictly typed to
+    // avoid setting the wrong `type` on the attribute value.
+    // In this case, getPrimitiveType already does the check but TS doesn't know that.
+    // The "clean" alternative is to return an object per `typeof value` case
+    // but that would require more bundle size
+    // Therefore, we ignore it.
+    return { value, type: primitiveType };
+  }
+
+  if (Array.isArray(value)) {
+    const coherentArrayType = value.reduce((acc: 'string' | 'boolean' | 'integer' | 'double' | null, item) => {
+      if (!acc || getPrimitiveType(item) !== acc) {
+        return null;
+      }
+      return acc;
+    }, getPrimitiveType(value[0]));
+
+    if (coherentArrayType) {
+      return { value, type: `${coherentArrayType}[]` };
+    }
+  }
+
+  // Fallback: stringify the passed value
+  let fallbackValue = '';
+  try {
+    fallbackValue = JSON.stringify(value) ?? String(value);
+  } catch {
+    try {
+      fallbackValue = String(value);
+    } catch {
+      DEBUG_BUILD && debug.warn('Failed to stringify attribute value', value);
+      // ignore
+    }
+  }
+
+  // This is quite a low-quality message but we cannot safely log the original `value`
+  // here due to String() or JSON.stringify() potentially throwing.
+  DEBUG_BUILD &&
+    debug.log(`Stringified attribute value to ${fallbackValue} because it's not a supported attribute value type`);
+
+  return {
+    value: fallbackValue,
+    type: 'string',
+  };
+}
diff --git a/packages/core/src/scope.ts b/packages/core/src/scope.ts
index b23b01664431..2ec1f6480788 100644
--- a/packages/core/src/scope.ts
+++ b/packages/core/src/scope.ts
@@ -1,4 +1,5 @@
 /* eslint-disable max-lines */
+import type { AttributeObject, RawAttribute, RawAttributes } from './attributes';
 import type { Client } from './client';
 import { DEBUG_BUILD } from './debug-build';
 import { updateSession } from './session';
@@ -46,6 +47,7 @@ export interface ScopeContext {
   extra: Extras;
   contexts: Contexts;
   tags: { [key: string]: Primitive };
+  attributes?: RawAttributes<Record<string, unknown>>;
   fingerprint: string[];
   propagationContext: PropagationContext;
 }
@@ -71,6 +73,8 @@ export interface ScopeData {
   breadcrumbs: Breadcrumb[];
   user: User;
   tags: { [key: string]: Primitive };
+  // TODO(v11): Make this a required field (could be subtly breaking if we did it today)
+  attributes?: RawAttributes<Record<string, unknown>>;
   extra: Extras;
   contexts: Contexts;
   attachments: Attachment[];
@@ -104,6 +108,9 @@ export class Scope {
   /** Tags */
   protected _tags: { [key: string]: Primitive };
 
+  /** Attributes */
+  protected _attributes: RawAttributes<Record<string, unknown>>;
+
   /** Extra */
   protected _extra: Extras;
 
@@ -155,6 +162,7 @@ export class Scope {
     this._attachments = [];
     this._user = {};
     this._tags = {};
+    this._attributes = {};
     this._extra = {};
     this._contexts = {};
     this._sdkProcessingMetadata = {};
@@ -171,6 +179,7 @@ export class Scope {
     const newScope = new Scope();
     newScope._breadcrumbs = [...this._breadcrumbs];
     newScope._tags = { ...this._tags };
+    newScope._attributes = { ...this._attributes };
     newScope._extra = { ...this._extra };
     newScope._contexts = { ...this._contexts };
     if (this._contexts.flags) {
@@ -294,6 +303,79 @@ export class Scope {
     return this.setTags({ [key]: value });
   }
 
+  /**
+   * Sets attributes onto the scope.
+   *
+   * TODO:
+   * Currently, these attributes are not applied to any telemetry data but they will be in the future.
+   *
+   * @param newAttributes - The attributes to set on the scope. You can either pass in key-value pairs, or
+   * an object with a `value` and an optional `unit` (if applicable to your attribute).
+   *
+   * @example
+   * ```typescript
+   * scope.setAttributes({
+   *   is_admin: true,
+   *   payment_selection: 'credit_card',
+   *   clicked_products: [130, 554, 292],
+   *   render_duration: { value: 'render_duration', unit: 'ms' },
+   * });
+   * ```
+   */
+  public setAttributes<T extends Record<string, unknown>>(newAttributes: RawAttributes<T>): this {
+    this._attributes = {
+      ...this._attributes,
+      ...newAttributes,
+    };
+
+    this._notifyScopeListeners();
+    return this;
+  }
+
+  /**
+   * Sets an attribute onto the scope.
+   *
+   * TODO:
+   * Currently, these attributes are not applied to any telemetry data but they will be in the future.
+   *
+   * @param key - The attribute key.
+   * @param value - the attribute value. You can either pass in a raw value, or an attribute
+   * object with a `value` and an optional `unit` (if applicable to your attribute).
+   *
+   * @example
+   * ```typescript
+   * scope.setAttribute('is_admin', true);
+   * scope.setAttribute('clicked_products', [130, 554, 292]);
+   * scope.setAttribute('render_duration', { value: 'render_duration', unit: 'ms' });
+   * ```
+   */
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  public setAttribute<T extends RawAttribute<T> extends { value: any } | { unit: any } ? AttributeObject : unknown>(
+    key: string,
+    value: RawAttribute<T>,
+  ): this {
+    return this.setAttributes({ [key]: value });
+  }
+
+  /**
+   * Removes the attribute with the given key from the scope.
+   *
+   * @param key - The attribute key.
+   *
+   * @example
+   * ```typescript
+   * scope.removeAttribute('is_admin');
+   * ```
+   */
+  public removeAttribute(key: string): this {
+    if (key in this._attributes) {
+      // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
+      delete this._attributes[key];
+      this._notifyScopeListeners();
+    }
+    return this;
+  }
+
   /**
    * Set an object that will be merged into existing extra on the scope,
    * and will be sent as extra data with the event.
@@ -409,9 +491,19 @@ export class Scope {
           ? (captureContext as ScopeContext)
           : undefined;
 
-    const { tags, extra, user, contexts, level, fingerprint = [], propagationContext } = scopeInstance || {};
+    const {
+      tags,
+      attributes,
+      extra,
+      user,
+      contexts,
+      level,
+      fingerprint = [],
+      propagationContext,
+    } = scopeInstance || {};
 
     this._tags = { ...this._tags, ...tags };
+    this._attributes = { ...this._attributes, ...attributes };
     this._extra = { ...this._extra, ...extra };
     this._contexts = { ...this._contexts, ...contexts };
 
@@ -442,6 +534,7 @@ export class Scope {
     // client is not cleared here on purpose!
     this._breadcrumbs = [];
     this._tags = {};
+    this._attributes = {};
     this._extra = {};
     this._user = {};
     this._contexts = {};
@@ -528,6 +621,7 @@ export class Scope {
       attachments: this._attachments,
       contexts: this._contexts,
       tags: this._tags,
+      attributes: this._attributes,
       extra: this._extra,
       user: this._user,
       level: this._level,
diff --git a/packages/core/test/lib/attributes.test.ts b/packages/core/test/lib/attributes.test.ts
new file mode 100644
index 000000000000..99aa20d07c85
--- /dev/null
+++ b/packages/core/test/lib/attributes.test.ts
@@ -0,0 +1,286 @@
+import { describe, expect, it } from 'vitest';
+import { attributeValueToTypedAttributeValue, isAttributeObject } from '../../src/attributes';
+
+describe('attributeValueToTypedAttributeValue', () => {
+  describe('primitive values', () => {
+    it('converts a string value to a typed attribute value', () => {
+      const result = attributeValueToTypedAttributeValue('test');
+      expect(result).toStrictEqual({
+        value: 'test',
+        type: 'string',
+      });
+    });
+
+    it('converts an interger number value to a typed attribute value', () => {
+      const result = attributeValueToTypedAttributeValue(42);
+      expect(result).toStrictEqual({
+        value: 42,
+        type: 'integer',
+      });
+    });
+
+    it('converts a double number value to a typed attribute value', () => {
+      const result = attributeValueToTypedAttributeValue(42.34);
+      expect(result).toStrictEqual({
+        value: 42.34,
+        type: 'double',
+      });
+    });
+
+    it('converts a boolean value to a typed attribute value', () => {
+      const result = attributeValueToTypedAttributeValue(true);
+      expect(result).toStrictEqual({
+        value: true,
+        type: 'boolean',
+      });
+    });
+  });
+
+  describe('arrays', () => {
+    it('converts an array of strings to a typed attribute value', () => {
+      const result = attributeValueToTypedAttributeValue(['foo', 'bar']);
+      expect(result).toStrictEqual({
+        value: ['foo', 'bar'],
+        type: 'string[]',
+      });
+    });
+
+    it('converts an array of integer numbers to a typed attribute value', () => {
+      const result = attributeValueToTypedAttributeValue([1, 2, 3]);
+      expect(result).toStrictEqual({
+        value: [1, 2, 3],
+        type: 'integer[]',
+      });
+    });
+
+    it('converts an array of double numbers to a typed attribute value', () => {
+      const result = attributeValueToTypedAttributeValue([1.1, 2.2, 3.3]);
+      expect(result).toStrictEqual({
+        value: [1.1, 2.2, 3.3],
+        type: 'double[]',
+      });
+    });
+
+    it('converts an array of booleans to a typed attribute value', () => {
+      const result = attributeValueToTypedAttributeValue([true, false, true]);
+      expect(result).toStrictEqual({
+        value: [true, false, true],
+        type: 'boolean[]',
+      });
+    });
+  });
+
+  describe('attribute objects without units', () => {
+    // Note: These tests only test exemplar type and fallback behaviour (see above for more cases)
+    it('converts a primitive value to a typed attribute value', () => {
+      const result = attributeValueToTypedAttributeValue({ value: 123.45 });
+      expect(result).toStrictEqual({
+        value: 123.45,
+        type: 'double',
+      });
+    });
+
+    it('converts an array of primitive values to a typed attribute value', () => {
+      const result = attributeValueToTypedAttributeValue({ value: [true, false] });
+      expect(result).toStrictEqual({
+        value: [true, false],
+        type: 'boolean[]',
+      });
+    });
+
+    it('converts an unsupported object value to a string attribute value', () => {
+      const result = attributeValueToTypedAttributeValue({ value: { foo: 'bar' } });
+      expect(result).toStrictEqual({
+        value: '{"foo":"bar"}',
+        type: 'string',
+      });
+    });
+  });
+
+  describe('attribute objects with units', () => {
+    // Note: These tests only test exemplar type and fallback behaviour (see above for more cases)
+    it('converts a primitive value to a typed attribute value', () => {
+      const result = attributeValueToTypedAttributeValue({ value: 123.45, unit: 'ms' });
+      expect(result).toStrictEqual({
+        value: 123.45,
+        type: 'double',
+        unit: 'ms',
+      });
+    });
+
+    it('converts an array of primitive values to a typed attribute value', () => {
+      const result = attributeValueToTypedAttributeValue({ value: [true, false], unit: 'count' });
+      expect(result).toStrictEqual({
+        value: [true, false],
+        type: 'boolean[]',
+        unit: 'count',
+      });
+    });
+
+    it('converts an unsupported object value to a string attribute value', () => {
+      const result = attributeValueToTypedAttributeValue({ value: { foo: 'bar' }, unit: 'bytes' });
+      expect(result).toStrictEqual({
+        value: '{"foo":"bar"}',
+        type: 'string',
+        unit: 'bytes',
+      });
+    });
+
+    it('extracts the value property of an object with a value property', () => {
+      // and ignores other properties.
+      // For now we're fine with this but we may reconsider in the future.
+      const result = attributeValueToTypedAttributeValue({ value: 'foo', unit: 'ms', bar: 'baz' });
+      expect(result).toStrictEqual({
+        value: 'foo',
+        unit: 'ms',
+        type: 'string',
+      });
+    });
+  });
+
+  describe('unsupported value types', () => {
+    it('stringifies mixed float and integer numbers to a string attribute value', () => {
+      const result = attributeValueToTypedAttributeValue([1, 2.2, 3]);
+      expect(result).toStrictEqual({
+        value: '[1,2.2,3]',
+        type: 'string',
+      });
+    });
+
+    it('stringifies an array of allowed but incoherent types to a string attribute value', () => {
+      const result = attributeValueToTypedAttributeValue([1, 'foo', true]);
+      expect(result).toStrictEqual({
+        value: '[1,"foo",true]',
+        type: 'string',
+      });
+    });
+
+    it('stringifies an array of disallowed and incoherent types to a string attribute value', () => {
+      const result = attributeValueToTypedAttributeValue([null, undefined, NaN]);
+      expect(result).toStrictEqual({
+        value: '[null,null,null]',
+        type: 'string',
+      });
+    });
+
+    it('stringifies an object value to a string attribute value', () => {
+      const result = attributeValueToTypedAttributeValue({ foo: 'bar' });
+      expect(result).toStrictEqual({
+        value: '{"foo":"bar"}',
+        type: 'string',
+      });
+    });
+
+    it('stringifies a null value to a string attribute value', () => {
+      const result = attributeValueToTypedAttributeValue(null);
+      expect(result).toStrictEqual({
+        value: 'null',
+        type: 'string',
+      });
+    });
+
+    it('stringifies an undefined value to a string attribute value', () => {
+      const result = attributeValueToTypedAttributeValue(undefined);
+      expect(result).toStrictEqual({
+        value: 'undefined',
+        type: 'string',
+      });
+    });
+
+    it('stringifies an NaN number value to a string attribute value', () => {
+      const result = attributeValueToTypedAttributeValue(NaN);
+      expect(result).toStrictEqual({
+        value: 'null',
+        type: 'string',
+      });
+    });
+
+    it('converts an object toString if stringification fails', () => {
+      const result = attributeValueToTypedAttributeValue({
+        value: {
+          toJson: () => {
+            throw new Error('test');
+          },
+        },
+      });
+      expect(result).toStrictEqual({
+        value: '{}',
+        type: 'string',
+      });
+    });
+
+    it('falls back to an empty string if stringification and toString fails', () => {
+      const result = attributeValueToTypedAttributeValue({
+        value: {
+          toJSON: () => {
+            throw new Error('test');
+          },
+          toString: () => {
+            throw new Error('test');
+          },
+        },
+      });
+      expect(result).toStrictEqual({
+        value: '',
+        type: 'string',
+      });
+    });
+
+    it('converts a function toString ', () => {
+      const result = attributeValueToTypedAttributeValue(() => {
+        return 'test';
+      });
+
+      expect(result).toStrictEqual({
+        value: '() => {\n        return "test";\n      }',
+        type: 'string',
+      });
+    });
+
+    it('converts a symbol toString', () => {
+      const result = attributeValueToTypedAttributeValue(Symbol('test'));
+      expect(result).toStrictEqual({
+        value: 'Symbol(test)',
+        type: 'string',
+      });
+    });
+  });
+
+  it.each([1, true, null, undefined, NaN, Symbol('test'), { foo: 'bar' }])(
+    'ignores invalid (non-string) units (%s)',
+    unit => {
+      const result = attributeValueToTypedAttributeValue({ value: 'foo', unit });
+      expect(result).toStrictEqual({
+        value: 'foo',
+        type: 'string',
+      });
+    },
+  );
+});
+
+describe('isAttributeObject', () => {
+  it.each([
+    { value: 123.45, unit: 'ms' },
+    { value: [true, false], unit: 'count' },
+    { value: { foo: 'bar' }, unit: 'bytes' },
+    { value: { value: 123.45, unit: 'ms' }, unit: 'ms' },
+    { value: 1 },
+  ])('returns true for a valid attribute object (%s)', obj => {
+    const result = isAttributeObject(obj);
+    expect(result).toBe(true);
+  });
+
+  it('returns true for an object with a value property', () => {
+    // Explicitly demonstrate this behaviour which for now we're fine with.
+    // We may reconsider in the future.
+    expect(isAttributeObject({ value: 123.45, some: 'other property' })).toBe(true);
+  });
+
+  it.each([1, true, 'test', null, undefined, NaN, Symbol('test')])(
+    'returns false for an invalid attribute object (%s)',
+    obj => {
+      const result = isAttributeObject(obj);
+      expect(result).toBe(false);
+    },
+  );
+});
diff --git a/packages/core/test/lib/scope.test.ts b/packages/core/test/lib/scope.test.ts
index 221ac14a6fa2..339a57828e5b 100644
--- a/packages/core/test/lib/scope.test.ts
+++ b/packages/core/test/lib/scope.test.ts
@@ -27,6 +27,7 @@ describe('Scope', () => {
       attachments: [],
       contexts: {},
       tags: {},
+      attributes: {},
       extra: {},
       user: {},
       level: undefined,
@@ -42,6 +43,7 @@ describe('Scope', () => {
     scope.update({
       tags: { foo: 'bar' },
       extra: { foo2: 'bar2' },
+      attributes: { attr1: { value: 'value1' } },
     });
 
     expect(scope.getScopeData()).toEqual({
@@ -51,6 +53,7 @@ describe('Scope', () => {
       tags: {
         foo: 'bar',
       },
+      attributes: { attr1: { value: 'value1' } },
       extra: {
         foo2: 'bar2',
       },
@@ -71,6 +74,7 @@ describe('Scope', () => {
 
     scope.update({
       tags: { foo: 'bar' },
+      attributes: { attr1: { value: 'value1', type: 'string' } },
       extra: { foo2: 'bar2' },
     });
 
@@ -85,6 +89,7 @@ describe('Scope', () => {
       tags: {
         foo: 'bar',
       },
+      attributes: { attr1: { value: 'value1', type: 'string' } },
       extra: {
         foo2: 'bar2',
       },
@@ -114,7 +119,7 @@ describe('Scope', () => {
     });
   });
 
-  describe('attributes modification', () => {
+  describe('scope data modification', () => {
     test('setFingerprint', () => {
       const scope = new Scope();
       scope.setFingerprint(['abcd']);
@@ -183,6 +188,159 @@ describe('Scope', () => {
       });
     });
 
+    describe('setAttribute', () => {
+      it('accepts a key-value pair', () => {
+        const scope = new Scope();
+
+        scope.setAttribute('str', 'b');
+        scope.setAttribute('int', 1);
+        scope.setAttribute('double', 1.1);
+        scope.setAttribute('bool', true);
+
+        expect(scope['_attributes']).toEqual({
+          str: 'b',
+          bool: true,
+          double: 1.1,
+          int: 1,
+        });
+      });
+
+      it('accepts an attribute value object', () => {
+        const scope = new Scope();
+        scope.setAttribute('str', { value: 'b' });
+        expect(scope['_attributes']).toEqual({
+          str: { value: 'b' },
+        });
+      });
+
+      it('accepts an attribute value object with a unit', () => {
+        const scope = new Scope();
+        scope.setAttribute('str', { value: 1, unit: 'millisecond' });
+        expect(scope['_attributes']).toEqual({
+          str: { value: 1, unit: 'millisecond' },
+        });
+      });
+
+      it('still accepts a custom unit but TS-errors on it', () => {
+        // mostly there for type checking purposes.
+        const scope = new Scope();
+        /** @ts-expect-error we don't support custom units type-wise but we don't actively block them */
+        scope.setAttribute('str', { value: 3, unit: 'inch' });
+        expect(scope['_attributes']).toEqual({
+          str: { value: 3, unit: 'inch' },
+        });
+      });
+
+      it('accepts an array', () => {
+        const scope = new Scope();
+
+        scope.setAttribute('strArray', ['a', 'b', 'c']);
+        scope.setAttribute('intArray', { value: [1, 2, 3], unit: 'millisecond' });
+
+        expect(scope['_attributes']).toEqual({
+          strArray: ['a', 'b', 'c'],
+          intArray: { value: [1, 2, 3], unit: 'millisecond' },
+        });
+      });
+
+      it('notifies scope listeners once per call', () => {
+        const scope = new Scope();
+        const listener = vi.fn();
+        scope.addScopeListener(listener);
+        scope.setAttribute('str', 'b');
+        scope.setAttribute('int', 1);
+        expect(listener).toHaveBeenCalledTimes(2);
+      });
+    });
+
+    describe('setAttributes', () => {
+      it('accepts key-value pairs', () => {
+        const scope = new Scope();
+        scope.setAttributes({ str: 'b', int: 1, double: 1.1, bool: true });
+        expect(scope['_attributes']).toEqual({
+          str: 'b',
+          int: 1,
+          double: 1.1,
+          bool: true,
+        });
+      });
+
+      it('accepts attribute value objects', () => {
+        const scope = new Scope();
+        scope.setAttributes({ str: { value: 'b' }, int: { value: 1 } });
+        expect(scope['_attributes']).toEqual({
+          str: { value: 'b' },
+          int: { value: 1 },
+        });
+      });
+
+      it('accepts attribute value objects with units', () => {
+        const scope = new Scope();
+        scope.setAttributes({ str: { value: 'b', unit: 'millisecond' }, int: { value: 12, unit: 'second' } });
+        expect(scope['_attributes']).toEqual({
+          str: { value: 'b', unit: 'millisecond' },
+          int: { value: 12, unit: 'second' },
+        });
+      });
+
+      it('accepts arrays', () => {
+        const scope = new Scope();
+        scope.setAttributes({
+          strArray: ['a', 'b', 'c'],
+          intArray: { value: [1, 2, 3], unit: 'millisecond' },
+        });
+
+        expect(scope['_attributes']).toEqual({
+          strArray: ['a', 'b', 'c'],
+          intArray: { value: [1, 2, 3], unit: 'millisecond' },
+        });
+      });
+
+      it('notifies scope listeners once per call', () => {
+        const scope = new Scope();
+        const listener = vi.fn();
+        scope.addScopeListener(listener);
+        scope.setAttributes({ str: 'b', int: 1 });
+        scope.setAttributes({ bool: true });
+        expect(listener).toHaveBeenCalledTimes(2);
+      });
+    });
+
+    describe('removeAttribute', () => {
+      it('removes an attribute', () => {
+        const scope = new Scope();
+        scope.setAttribute('str', 'b');
+        scope.setAttribute('int', 1);
+        scope.removeAttribute('str');
+        expect(scope['_attributes']).toEqual({ int: 1 });
+      });
+
+      it('notifies scope listeners after deletion', () => {
+        const scope = new Scope();
+        const listener = vi.fn();
+
+        scope.addScopeListener(listener);
+        scope.setAttribute('str', { value: 'b' });
+        expect(listener).toHaveBeenCalledTimes(1);
+
+        listener.mockClear();
+
+        scope.removeAttribute('str');
+        expect(listener).toHaveBeenCalledTimes(1);
+      });
+
+      it('does nothing if the attribute does not exist', () => {
+        const scope = new Scope();
+        const listener = vi.fn();
+
+        scope.addScopeListener(listener);
+        scope.removeAttribute('str');
+
+        expect(scope['_attributes']).toEqual({});
+        expect(listener).not.toHaveBeenCalled();
+      });
+    });
+
     test('setUser', () => {
       const scope = new Scope();
       scope.setUser({ id: '1' });
@@ -329,12 +487,18 @@ describe('Scope', () => {
     const oldPropagationContext = scope.getScopeData().propagationContext;
     scope.setExtra('a', 2);
     scope.setTag('a', 'b');
+    scope.setAttribute('c', 'd');
     scope.setUser({ id: '1' });
     scope.setFingerprint(['abcd']);
     scope.addBreadcrumb({ message: 'test' });
+
+    expect(scope['_attributes']).toEqual({ c: 'd' });
     expect(scope['_extra']).toEqual({ a: 2 });
+
     scope.clear();
+
     expect(scope['_extra']).toEqual({});
+    expect(scope['_attributes']).toEqual({});
     expect(scope['_propagationContext']).toEqual({
       traceId: expect.any(String),
       sampled: undefined,
@@ -357,6 +521,7 @@ describe('Scope', () => {
     beforeEach(() => {
       scope = new Scope();
       scope.setTags({ foo: '1', bar: '2' });
+      scope.setAttribute('attr1', 'value1');
       scope.setExtras({ foo: '1', bar: '2' });
       scope.setContext('foo', { id: '1' });
       scope.setContext('bar', { id: '2' });

From e8a1826167e19bccd5d4bb5bfdb5cbe2f9b70d73 Mon Sep 17 00:00:00 2001
From: Abdul Mateen <59867217+JealousGx@users.noreply.github.com>
Date: Sat, 6 Sep 2025 10:44:26 +0500
Subject: [PATCH 111/186] feat(node): Fix local variables capturing for
 out-of-app frames (#18245)

Address an issue where local variables were not being captured for
out-of-app frames, even when the `includeOutOfAppFrames` option was
enabled.

The `localVariablesSyncIntegration` had a race condition where it would
process events before the debugger session was fully initialized. Fix
this by awaiting the session creation in `setupOnce`.

The tests for this integration were failing because they were not
setting up a Sentry client, which is required for the integration to be
enabled. Correct by adding a client to the test setup.

Additionally, add tests for the `localVariablesAsyncIntegration` to
ensure it correctly handles the `includeOutOfAppFrames` option.

The `LocalVariables` integrations `setupOnce` method was `async`, which
violates the `Integration` interface. This caused a race condition where
events could be processed before the integration was fully initialized,
leading to missed local variables.

Fix the race condition by:

- Make `setupOnce` synchronous to adhere to the interface contract
- Move the asynchronous initialization logic to a separate `setup`
  function
- Make `processEvent` asynchronous and await the result of the `setup`
  function, so the integration is fully initialized before processing
  any events
- Update tests to correctly `await` the `processEvent` method

Fixes GH-12588
Fixes GH-17545
---
 .../local-variables-out-of-app-default.js     |  28 +++
 .../local-variables-out-of-app.js             |  33 +++
 .../suites/public-api/LocalVariables/test.ts  |  73 +++++-
 .../integrations/local-variables/common.ts    |   6 +
 .../local-variables/local-variables-async.ts  |   4 +-
 .../local-variables/local-variables-sync.ts   | 218 +++++++++---------
 6 files changed, 253 insertions(+), 109 deletions(-)
 create mode 100644 dev-packages/node-integration-tests/suites/public-api/LocalVariables/local-variables-out-of-app-default.js
 create mode 100644 dev-packages/node-integration-tests/suites/public-api/LocalVariables/local-variables-out-of-app.js

diff --git a/dev-packages/node-integration-tests/suites/public-api/LocalVariables/local-variables-out-of-app-default.js b/dev-packages/node-integration-tests/suites/public-api/LocalVariables/local-variables-out-of-app-default.js
new file mode 100644
index 000000000000..9a53436867d9
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/public-api/LocalVariables/local-variables-out-of-app-default.js
@@ -0,0 +1,28 @@
+/* eslint-disable no-unused-vars */
+
+const Sentry = require('@sentry/node');
+const { loggingTransport } = require('@sentry-internal/node-integration-tests');
+
+const externalFunctionFile = require.resolve('./node_modules/out-of-app-function.js');
+
+const { out_of_app_function } = require(externalFunctionFile);
+
+function in_app_function() {
+  const inAppVar = 'in app value';
+  out_of_app_function(`${inAppVar} modified value`);
+}
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  transport: loggingTransport,
+  includeLocalVariables: true,
+});
+
+setTimeout(async () => {
+  try {
+    in_app_function();
+  } catch (e) {
+    Sentry.captureException(e);
+    await Sentry.flush();
+  }
+}, 500);
diff --git a/dev-packages/node-integration-tests/suites/public-api/LocalVariables/local-variables-out-of-app.js b/dev-packages/node-integration-tests/suites/public-api/LocalVariables/local-variables-out-of-app.js
new file mode 100644
index 000000000000..9bbe40004fc7
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/public-api/LocalVariables/local-variables-out-of-app.js
@@ -0,0 +1,33 @@
+/* eslint-disable no-unused-vars */
+
+const Sentry = require('@sentry/node');
+const { loggingTransport } = require('@sentry-internal/node-integration-tests');
+
+const externalFunctionFile = require.resolve('./node_modules/out-of-app-function.js');
+
+const { out_of_app_function } = require(externalFunctionFile);
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  transport: loggingTransport,
+  includeLocalVariables: true,
+  integrations: [
+    Sentry.localVariablesIntegration({
+      includeOutOfAppFrames: true,
+    }),
+  ],
+});
+
+function in_app_function() {
+  const inAppVar = 'in app value';
+  out_of_app_function(`${inAppVar} modified value`);
+}
+
+setTimeout(async () => {
+  try {
+    in_app_function();
+  } catch (e) {
+    Sentry.captureException(e);
+    await Sentry.flush();
+  }
+}, 500);
diff --git a/dev-packages/node-integration-tests/suites/public-api/LocalVariables/test.ts b/dev-packages/node-integration-tests/suites/public-api/LocalVariables/test.ts
index 2c87d14c2b45..6c042d3ecf1f 100644
--- a/dev-packages/node-integration-tests/suites/public-api/LocalVariables/test.ts
+++ b/dev-packages/node-integration-tests/suites/public-api/LocalVariables/test.ts
@@ -1,5 +1,6 @@
+import { mkdirSync, rmdirSync, unlinkSync, writeFileSync } from 'fs';
 import * as path from 'path';
-import { afterAll, describe, expect, test } from 'vitest';
+import { afterAll, beforeAll, describe, expect, test } from 'vitest';
 import { conditionalTest } from '../../../utils';
 import { cleanupChildProcesses, createRunner } from '../../../utils/runner';
 
@@ -39,8 +40,35 @@ const EXPECTED_LOCAL_VARIABLES_EVENT = {
 };
 
 describe('LocalVariables integration', () => {
+  const nodeModules = `${__dirname}/node_modules`;
+  const externalModule = `${nodeModules}//out-of-app-function.js`;
+  function cleanupExternalModuleFile() {
+    try {
+      unlinkSync(externalModule);
+      // eslint-disable-next-line no-empty
+    } catch {}
+    try {
+      rmdirSync(nodeModules);
+      // eslint-disable-next-line no-empty
+    } catch {}
+  }
+
+  beforeAll(() => {
+    cleanupExternalModuleFile();
+    mkdirSync(nodeModules, { recursive: true });
+    writeFileSync(
+      externalModule,
+      `
+function out_of_app_function(passedArg) {
+  const outOfAppVar = "out of app value " + passedArg.substring(13);
+  throw new Error("out-of-app error");
+}
+module.exports = { out_of_app_function };`,
+    );
+  });
   afterAll(() => {
     cleanupChildProcesses();
+    cleanupExternalModuleFile();
   });
 
   test('Should not include local variables by default', async () => {
@@ -127,4 +155,47 @@ describe('LocalVariables integration', () => {
       .start()
       .completed();
   });
+
+  test('adds local variables to out of app frames when includeOutOfAppFrames is true', async () => {
+    await createRunner(__dirname, 'local-variables-out-of-app.js')
+      .expect({
+        event: event => {
+          const frames = event.exception?.values?.[0]?.stacktrace?.frames || [];
+
+          const inAppFrame = frames.find(frame => frame.function === 'in_app_function');
+          const outOfAppFrame = frames.find(frame => frame.function === 'out_of_app_function');
+
+          expect(inAppFrame?.vars).toEqual({ inAppVar: 'in app value' });
+          expect(inAppFrame?.in_app).toEqual(true);
+
+          expect(outOfAppFrame?.vars).toEqual({
+            outOfAppVar: 'out of app value modified value',
+            passedArg: 'in app value modified value',
+          });
+          expect(outOfAppFrame?.in_app).toEqual(false);
+        },
+      })
+      .start()
+      .completed();
+  });
+
+  test('does not add local variables to out of app frames by default', async () => {
+    await createRunner(__dirname, 'local-variables-out-of-app-default.js')
+      .expect({
+        event: event => {
+          const frames = event.exception?.values?.[0]?.stacktrace?.frames || [];
+
+          const inAppFrame = frames.find(frame => frame.function === 'in_app_function');
+          const outOfAppFrame = frames.find(frame => frame.function === 'out_of_app_function');
+
+          expect(inAppFrame?.vars).toEqual({ inAppVar: 'in app value' });
+          expect(inAppFrame?.in_app).toEqual(true);
+
+          expect(outOfAppFrame?.vars).toBeUndefined();
+          expect(outOfAppFrame?.in_app).toEqual(false);
+        },
+      })
+      .start()
+      .completed();
+  });
 });
diff --git a/packages/node-core/src/integrations/local-variables/common.ts b/packages/node-core/src/integrations/local-variables/common.ts
index 471fa1a69864..f86988b4cbfc 100644
--- a/packages/node-core/src/integrations/local-variables/common.ts
+++ b/packages/node-core/src/integrations/local-variables/common.ts
@@ -99,6 +99,12 @@ export interface LocalVariablesIntegrationOptions {
    * Maximum number of exceptions to capture local variables for per second before rate limiting is triggered.
    */
   maxExceptionsPerSecond?: number;
+  /**
+   * When true, local variables will be captured for all frames, including those that are not in_app.
+   *
+   * Defaults to `false`.
+   */
+  includeOutOfAppFrames?: boolean;
 }
 
 export interface LocalVariablesWorkerArgs extends LocalVariablesIntegrationOptions {
diff --git a/packages/node-core/src/integrations/local-variables/local-variables-async.ts b/packages/node-core/src/integrations/local-variables/local-variables-async.ts
index 32fff66bab4e..7bad543c2588 100644
--- a/packages/node-core/src/integrations/local-variables/local-variables-async.ts
+++ b/packages/node-core/src/integrations/local-variables/local-variables-async.ts
@@ -39,8 +39,8 @@ export const localVariablesAsyncIntegration = defineIntegration(((
       if (
         // We need to have vars to add
         frameLocalVariables.vars === undefined ||
-        // We're not interested in frames that are not in_app because the vars are not relevant
-        frame.in_app === false ||
+        // Only skip out-of-app frames if includeOutOfAppFrames is not true
+        (frame.in_app === false && integrationOptions.includeOutOfAppFrames !== true) ||
         // The function names need to match
         !functionNamesMatch(frame.function, frameLocalVariables.function)
       ) {
diff --git a/packages/node-core/src/integrations/local-variables/local-variables-sync.ts b/packages/node-core/src/integrations/local-variables/local-variables-sync.ts
index 7de91a54276e..b2af37b0c7fb 100644
--- a/packages/node-core/src/integrations/local-variables/local-variables-sync.ts
+++ b/packages/node-core/src/integrations/local-variables/local-variables-sync.ts
@@ -268,8 +268,8 @@ const _localVariablesSyncIntegration = ((
       if (
         // We need to have vars to add
         cachedFrameVariable.vars === undefined ||
-        // We're not interested in frames that are not in_app because the vars are not relevant
-        frameVariable.in_app === false ||
+        // Only skip out-of-app frames if includeOutOfAppFrames is not true
+        (frameVariable.in_app === false && options.includeOutOfAppFrames !== true) ||
         // The function names need to match
         !functionNamesMatch(frameVariable.function, cachedFrameVariable.function)
       ) {
@@ -288,122 +288,128 @@ const _localVariablesSyncIntegration = ((
     return event;
   }
 
-  return {
-    name: INTEGRATION_NAME,
-    async setupOnce() {
-      const client = getClient<NodeClient>();
-      const clientOptions = client?.getOptions();
+  let setupPromise: Promise<void> | undefined;
 
-      if (!clientOptions?.includeLocalVariables) {
-        return;
-      }
+  async function setup(): Promise<void> {
+    const client = getClient<NodeClient>();
+    const clientOptions = client?.getOptions();
 
-      // Only setup this integration if the Node version is >= v18
-      // https://github.com/getsentry/sentry-javascript/issues/7697
-      const unsupportedNodeVersion = NODE_MAJOR < 18;
+    if (!clientOptions?.includeLocalVariables) {
+      return;
+    }
 
-      if (unsupportedNodeVersion) {
-        debug.log('The `LocalVariables` integration is only supported on Node >= v18.');
-        return;
-      }
+    // Only setup this integration if the Node version is >= v18
+    // https://github.com/getsentry/sentry-javascript/issues/7697
+    const unsupportedNodeVersion = NODE_MAJOR < 18;
 
-      if (await isDebuggerEnabled()) {
-        debug.warn('Local variables capture has been disabled because the debugger was already enabled');
-        return;
-      }
+    if (unsupportedNodeVersion) {
+      debug.log('The `LocalVariables` integration is only supported on Node >= v18.');
+      return;
+    }
 
-      AsyncSession.create(sessionOverride).then(
-        session => {
-          function handlePaused(
-            stackParser: StackParser,
-            { params: { reason, data, callFrames } }: InspectorNotification<PausedExceptionEvent>,
-            complete: () => void,
-          ): void {
-            if (reason !== 'exception' && reason !== 'promiseRejection') {
-              complete();
-              return;
-            }
-
-            rateLimiter?.();
-
-            // data.description contains the original error.stack
-            const exceptionHash = hashFromStack(stackParser, data.description);
-
-            if (exceptionHash == undefined) {
-              complete();
-              return;
-            }
-
-            const { add, next } = createCallbackList<FrameVariables[]>(frames => {
-              cachedFrames.set(exceptionHash, frames);
-              complete();
-            });
+    if (await isDebuggerEnabled()) {
+      debug.warn('Local variables capture has been disabled because the debugger was already enabled');
+      return;
+    }
 
-            // Because we're queuing up and making all these calls synchronously, we can potentially overflow the stack
-            // For this reason we only attempt to get local variables for the first 5 frames
-            for (let i = 0; i < Math.min(callFrames.length, 5); i++) {
-              // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-              const { scopeChain, functionName, this: obj } = callFrames[i]!;
-
-              const localScope = scopeChain.find(scope => scope.type === 'local');
-
-              // obj.className is undefined in ESM modules
-              const fn =
-                obj.className === 'global' || !obj.className ? functionName : `${obj.className}.${functionName}`;
-
-              if (localScope?.object.objectId === undefined) {
-                add(frames => {
-                  frames[i] = { function: fn };
-                  next(frames);
-                });
-              } else {
-                const id = localScope.object.objectId;
-                add(frames =>
-                  session.getLocalVariables(id, vars => {
-                    frames[i] = { function: fn, vars };
-                    next(frames);
-                  }),
-                );
-              }
-            }
-
-            next([]);
-          }
+    try {
+      const session = await AsyncSession.create(sessionOverride);
+
+      const handlePaused = (
+        stackParser: StackParser,
+        { params: { reason, data, callFrames } }: InspectorNotification<PausedExceptionEvent>,
+        complete: () => void,
+      ): void => {
+        if (reason !== 'exception' && reason !== 'promiseRejection') {
+          complete();
+          return;
+        }
+
+        rateLimiter?.();
+
+        // data.description contains the original error.stack
+        const exceptionHash = hashFromStack(stackParser, data.description);
+
+        if (exceptionHash == undefined) {
+          complete();
+          return;
+        }
 
-          const captureAll = options.captureAllExceptions !== false;
-
-          session.configureAndConnect(
-            (ev, complete) =>
-              handlePaused(clientOptions.stackParser, ev as InspectorNotification<PausedExceptionEvent>, complete),
-            captureAll,
-          );
-
-          if (captureAll) {
-            const max = options.maxExceptionsPerSecond || 50;
-
-            rateLimiter = createRateLimiter(
-              max,
-              () => {
-                debug.log('Local variables rate-limit lifted.');
-                session.setPauseOnExceptions(true);
-              },
-              seconds => {
-                debug.log(
-                  `Local variables rate-limit exceeded. Disabling capturing of caught exceptions for ${seconds} seconds.`,
-                );
-                session.setPauseOnExceptions(false);
-              },
+        const { add, next } = createCallbackList<FrameVariables[]>(frames => {
+          cachedFrames.set(exceptionHash, frames);
+          complete();
+        });
+
+        // Because we're queuing up and making all these calls synchronously, we can potentially overflow the stack
+        // For this reason we only attempt to get local variables for the first 5 frames
+        for (let i = 0; i < Math.min(callFrames.length, 5); i++) {
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+          const { scopeChain, functionName, this: obj } = callFrames[i]!;
+
+          const localScope = scopeChain.find(scope => scope.type === 'local');
+
+          // obj.className is undefined in ESM modules
+          const fn = obj.className === 'global' || !obj.className ? functionName : `${obj.className}.${functionName}`;
+
+          if (localScope?.object.objectId === undefined) {
+            add(frames => {
+              frames[i] = { function: fn };
+              next(frames);
+            });
+          } else {
+            const id = localScope.object.objectId;
+            add(frames =>
+              session.getLocalVariables(id, vars => {
+                frames[i] = { function: fn, vars };
+                next(frames);
+              }),
             );
           }
+        }
+
+        next([]);
+      };
 
-          shouldProcessEvent = true;
-        },
-        error => {
-          debug.log('The `LocalVariables` integration failed to start.', error);
-        },
+      const captureAll = options.captureAllExceptions !== false;
+
+      session.configureAndConnect(
+        (ev, complete) =>
+          handlePaused(clientOptions.stackParser, ev as InspectorNotification<PausedExceptionEvent>, complete),
+        captureAll,
       );
+
+      if (captureAll) {
+        const max = options.maxExceptionsPerSecond || 50;
+
+        rateLimiter = createRateLimiter(
+          max,
+          () => {
+            debug.log('Local variables rate-limit lifted.');
+            session.setPauseOnExceptions(true);
+          },
+          seconds => {
+            debug.log(
+              `Local variables rate-limit exceeded. Disabling capturing of caught exceptions for ${seconds} seconds.`,
+            );
+            session.setPauseOnExceptions(false);
+          },
+        );
+      }
+
+      shouldProcessEvent = true;
+    } catch (error) {
+      debug.log('The `LocalVariables` integration failed to start.', error);
+    }
+  }
+
+  return {
+    name: INTEGRATION_NAME,
+    setupOnce() {
+      setupPromise = setup();
     },
-    processEvent(event: Event): Event {
+    async processEvent(event: Event): Promise<Event> {
+      await setupPromise;
+
       if (shouldProcessEvent) {
         return addLocalVariablesToEvent(event);
       }

From cbecbdf97b0c402afc324226e63427dfbfc21727 Mon Sep 17 00:00:00 2001
From: Andrei <168741329+andreiborza@users.noreply.github.com>
Date: Sat, 22 Nov 2025 00:11:18 +0100
Subject: [PATCH 112/186] feat(deps): Bump OpenTelemetry instrumentations
 (#18239)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR bumps OpenTelemetry instrumentations and SDK packages to their
latest versions.

## Dependency Updates:

* @opentelemetry/context-async-hooks: 2.1.0 → 2.2.0
* @opentelemetry/core: 2.1.0 → 2.2.0
* @opentelemetry/resources: 2.1.0 → 2.2.0
* @opentelemetry/sdk-trace-base: 2.1.0 → 2.2.0
* @opentelemetry/sdk-trace-node: 2.1.0 → 2.2.0
* @opentelemetry/instrumentation: 0.204.0 → 0.208.0
* @opentelemetry/instrumentation-mongodb: 0.57.0 → 0.61.0
* @opentelemetry/instrumentation-pg: 0.57.0 → 0.61.0
* @opentelemetry/instrumentation-mysql: 0.50.0 → 0.54.0
* @opentelemetry/instrumentation-mysql2: 0.51.0 → 0.55.0
* @opentelemetry/instrumentation-tedious: 0.23.0 → 0.27.0
* @opentelemetry/instrumentation-mongoose: 0.51.0 → 0.55.0
* @opentelemetry/instrumentation-redis: 0.53.0 → 0.57.0
* @opentelemetry/instrumentation-ioredis: 0.52.0 → 0.56.0
* @opentelemetry/instrumentation-express: 0.53.0 → 0.57.0
* @opentelemetry/instrumentation-koa: 0.52.0 → 0.57.0
* @opentelemetry/instrumentation-hapi: 0.51.0 → 0.55.0
* @opentelemetry/instrumentation-connect: 0.48.0 → 0.52.0
* @opentelemetry/instrumentation-nestjs-core: 0.50.0 → 0.55.0
* @opentelemetry/instrumentation-http: 0.204.0 → 0.208.0
* @opentelemetry/instrumentation-graphql: 0.52.0 → 0.56.0
* @opentelemetry/instrumentation-amqplib: 0.51.0 → 0.55.0
* @opentelemetry/instrumentation-aws-sdk: 0.59.0 → 0.64.0
* @opentelemetry/instrumentation-dataloader: 0.22.0 → 0.26.0
* @opentelemetry/instrumentation-fs: 0.24.0 → 0.28.0
* @opentelemetry/instrumentation-generic-pool: 0.48.0 → 0.52.0
* @opentelemetry/instrumentation-kafkajs: 0.14.0 → 0.18.0
* @opentelemetry/instrumentation-knex: 0.49.0 → 0.53.0
* @opentelemetry/instrumentation-lru-memoizer: 0.49.0 → 0.53.0
* @opentelemetry/instrumentation-undici: 0.15.0 → 0.19.0
* @prisma/instrumentation: 6.15.0 → 6.19.0

Closes: #18178
---
 CHANGELOG.md                                  |  33 ++
 .../test-applications/nextjs-16/package.json  |   4 +-
 .../package.json                              |  12 +-
 .../package.json                              |  16 +-
 .../node-core-express-otel-v2/package.json    |  12 +-
 .../node-otel-sdk-node/package.json           |   4 +-
 .../node-otel-without-tracing/package.json    |   8 +-
 .../tests/transactions.test.ts                |   4 +
 .../test-applications/node-otel/package.json  |   4 +-
 .../node-core-integration-tests/package.json  |  12 +-
 packages/aws-serverless/package.json          |   4 +-
 packages/nestjs/package.json                  |   6 +-
 packages/node-core/package.json               |  20 +-
 .../src/integrations/diagnostic_channel.d.ts  | 556 ------------------
 packages/node/package.json                    |  58 +-
 packages/opentelemetry/package.json           |  12 +-
 packages/react-router/package.json            |   4 +-
 packages/remix/package.json                   |   2 +-
 packages/sveltekit/src/client/sdk.ts          |   4 +-
 packages/vercel-edge/package.json             |   6 +-
 .../abstract-async-hooks-context-manager.ts   |  14 +-
 .../async-local-storage-context-manager.ts    |  12 +-
 yarn.lock                                     | 423 ++++++-------
 23 files changed, 347 insertions(+), 883 deletions(-)
 delete mode 100644 packages/node-core/src/integrations/diagnostic_channel.d.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5eba860932aa..479b72fc2f08 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,39 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+- feat(deps): Bump OpenTelemetry ([#18239](https://github.com/getsentry/sentry-javascript/pull/18239))
+  - Bump @opentelemetry/context-async-hooks from ^2.1.0 to ^2.2.0
+  - Bump @opentelemetry/core from ^2.1.0 to ^2.2.0
+  - Bump @opentelemetry/resources from ^2.1.0 to ^2.2.0
+  - Bump @opentelemetry/sdk-trace-base from ^2.1.0 to ^2.2.0
+  - Bump @opentelemetry/sdk-trace-node from ^2.1.0 to ^2.2.0
+  - Bump @opentelemetry/instrumentation from 0.204.0 to 0.208.0
+  - Bump @opentelemetry/instrumentation-amqplib from 0.51.0 to 0.55.0
+  - Bump @opentelemetry/instrumentation-aws-sdk from 0.59.0 to 0.64.0
+  - Bump @opentelemetry/instrumentation-connect from 0.48.0 to 0.52.0
+  - Bump @opentelemetry/instrumentation-dataloader from 0.22.0 to 0.26.0
+  - Bump @opentelemetry/instrumentation-express from 0.53.0 to 0.57.0
+  - Bump @opentelemetry/instrumentation-fs from 0.24.0 to 0.28.0
+  - Bump @opentelemetry/instrumentation-generic-pool from 0.48.0 to 0.52.0
+  - Bump @opentelemetry/instrumentation-graphql from 0.52.0 to 0.56.0
+  - Bump @opentelemetry/instrumentation-hapi from 0.51.0 to 0.55.0
+  - Bump @opentelemetry/instrumentation-http from 0.204.0 to 0.208.0
+  - Bump @opentelemetry/instrumentation-ioredis from 0.52.0 to 0.56.0
+  - Bump @opentelemetry/instrumentation-kafkajs from 0.14.0 to 0.18.0
+  - Bump @opentelemetry/instrumentation-knex from 0.49.0 to 0.53.0
+  - Bump @opentelemetry/instrumentation-koa from 0.52.0 to 0.57.0
+  - Bump @opentelemetry/instrumentation-lru-memoizer from 0.49.0 to 0.53.0
+  - Bump @opentelemetry/instrumentation-mongodb from 0.57.0 to 0.61.0
+  - Bump @opentelemetry/instrumentation-mongoose from 0.51.0 to 0.55.0
+  - Bump @opentelemetry/instrumentation-mysql from 0.50.0 to 0.54.0
+  - Bump @opentelemetry/instrumentation-mysql2 from 0.51.0 to 0.55.0
+  - Bump @opentelemetry/instrumentation-nestjs-core from 0.50.0 to 0.55.0
+  - Bump @opentelemetry/instrumentation-pg from 0.57.0 to 0.61.0
+  - Bump @opentelemetry/instrumentation-redis from 0.53.0 to 0.57.0
+  - Bump @opentelemetry/instrumentation-tedious from 0.23.0 to 0.27.0
+  - Bump @opentelemetry/instrumentation-undici from 0.15.0 to 0.19.0
+  - Bump @prisma/instrumentation from 6.15.0 to 6.19.0
+
 ## 10.26.0
 
 ### Important Changes
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16/package.json b/dev-packages/e2e-tests/test-applications/nextjs-16/package.json
index af9f306f017d..662e1b85936a 100644
--- a/dev-packages/e2e-tests/test-applications/nextjs-16/package.json
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16/package.json
@@ -26,11 +26,11 @@
     "@sentry/nextjs": "latest || *",
     "@sentry/core": "latest || *",
     "ai": "^3.0.0",
-    "import-in-the-middle": "^1",
+    "import-in-the-middle": "^2",
     "next": "16.0.0",
     "react": "19.1.0",
     "react-dom": "19.1.0",
-    "require-in-the-middle": "^7",
+    "require-in-the-middle": "^8",
     "zod": "^3.22.4"
   },
   "devDependencies": {
diff --git a/dev-packages/e2e-tests/test-applications/node-core-express-otel-v2-custom-sampler/package.json b/dev-packages/e2e-tests/test-applications/node-core-express-otel-v2-custom-sampler/package.json
index e29a40c2887e..5710105d4ab8 100644
--- a/dev-packages/e2e-tests/test-applications/node-core-express-otel-v2-custom-sampler/package.json
+++ b/dev-packages/e2e-tests/test-applications/node-core-express-otel-v2-custom-sampler/package.json
@@ -12,12 +12,12 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@opentelemetry/context-async-hooks": "^2.1.0",
-    "@opentelemetry/core": "^2.1.0",
-    "@opentelemetry/instrumentation": "^0.204.0",
-    "@opentelemetry/instrumentation-http": "^0.204.0",
-    "@opentelemetry/resources": "^2.1.0",
-    "@opentelemetry/sdk-trace-node": "^2.1.0",
+    "@opentelemetry/context-async-hooks": "^2.2.0",
+    "@opentelemetry/core": "^2.2.0",
+    "@opentelemetry/instrumentation": "^0.208.0",
+    "@opentelemetry/instrumentation-http": "^0.208.0",
+    "@opentelemetry/resources": "^2.2.0",
+    "@opentelemetry/sdk-trace-node": "^2.2.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
     "@sentry/node-core": "latest || *",
     "@sentry/opentelemetry": "latest || *",
diff --git a/dev-packages/e2e-tests/test-applications/node-core-express-otel-v2-sdk-node/package.json b/dev-packages/e2e-tests/test-applications/node-core-express-otel-v2-sdk-node/package.json
index 34b050f350c1..f6074d159bbe 100644
--- a/dev-packages/e2e-tests/test-applications/node-core-express-otel-v2-sdk-node/package.json
+++ b/dev-packages/e2e-tests/test-applications/node-core-express-otel-v2-sdk-node/package.json
@@ -12,15 +12,15 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@opentelemetry/context-async-hooks": "^2.1.0",
-    "@opentelemetry/core": "^2.1.0",
-    "@opentelemetry/instrumentation": "^0.204.0",
-    "@opentelemetry/instrumentation-http": "^0.204.0",
-    "@opentelemetry/resources": "^2.1.0",
-    "@opentelemetry/sdk-trace-node": "^2.1.0",
+    "@opentelemetry/context-async-hooks": "^2.2.0",
+    "@opentelemetry/core": "^2.2.0",
+    "@opentelemetry/instrumentation": "^0.208.0",
+    "@opentelemetry/instrumentation-http": "^0.208.0",
+    "@opentelemetry/resources": "^2.2.0",
+    "@opentelemetry/sdk-trace-node": "^2.2.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@opentelemetry/sdk-node": "^0.204.0",
-    "@opentelemetry/exporter-trace-otlp-http": "^0.204.0",
+    "@opentelemetry/sdk-node": "^0.208.0",
+    "@opentelemetry/exporter-trace-otlp-http": "^0.208.0",
     "@sentry/node-core": "latest || *",
     "@sentry/opentelemetry": "latest || *",
     "@types/express": "4.17.17",
diff --git a/dev-packages/e2e-tests/test-applications/node-core-express-otel-v2/package.json b/dev-packages/e2e-tests/test-applications/node-core-express-otel-v2/package.json
index 2252750e423e..b9ba557d67b5 100644
--- a/dev-packages/e2e-tests/test-applications/node-core-express-otel-v2/package.json
+++ b/dev-packages/e2e-tests/test-applications/node-core-express-otel-v2/package.json
@@ -14,12 +14,12 @@
     "@sentry/node-core": "latest || *",
     "@sentry/opentelemetry": "latest || *",
     "@opentelemetry/api": "^1.9.0",
-    "@opentelemetry/context-async-hooks": "^2.1.0",
-    "@opentelemetry/core": "^2.1.0",
-    "@opentelemetry/instrumentation": "^0.204.0",
-    "@opentelemetry/instrumentation-http": "^0.204.0",
-    "@opentelemetry/resources": "^2.1.0",
-    "@opentelemetry/sdk-trace-node": "^2.1.0",
+    "@opentelemetry/context-async-hooks": "^2.2.0",
+    "@opentelemetry/core": "^2.2.0",
+    "@opentelemetry/instrumentation": "^0.208.0",
+    "@opentelemetry/instrumentation-http": "^0.208.0",
+    "@opentelemetry/resources": "^2.2.0",
+    "@opentelemetry/sdk-trace-node": "^2.2.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
     "@types/express": "^4.17.21",
     "@types/node": "^18.19.1",
diff --git a/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/package.json b/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/package.json
index 7296f72218cd..1eb93f281cf8 100644
--- a/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/package.json
+++ b/dev-packages/e2e-tests/test-applications/node-otel-sdk-node/package.json
@@ -11,8 +11,8 @@
     "test:assert": "pnpm test"
   },
   "dependencies": {
-    "@opentelemetry/sdk-node": "0.204.0",
-    "@opentelemetry/exporter-trace-otlp-http": "0.204.0",
+    "@opentelemetry/sdk-node": "0.208.0",
+    "@opentelemetry/exporter-trace-otlp-http": "0.208.0",
     "@sentry/node": "latest || *",
     "@types/express": "4.17.17",
     "@types/node": "^18.19.1",
diff --git a/dev-packages/e2e-tests/test-applications/node-otel-without-tracing/package.json b/dev-packages/e2e-tests/test-applications/node-otel-without-tracing/package.json
index f13daab2ef6c..fc153ddceeb8 100644
--- a/dev-packages/e2e-tests/test-applications/node-otel-without-tracing/package.json
+++ b/dev-packages/e2e-tests/test-applications/node-otel-without-tracing/package.json
@@ -11,11 +11,11 @@
     "test:assert": "pnpm test"
   },
   "dependencies": {
-    "@opentelemetry/sdk-trace-node": "2.1.0",
-    "@opentelemetry/exporter-trace-otlp-http": "0.204.0",
+    "@opentelemetry/sdk-trace-node": "2.2.0",
+    "@opentelemetry/exporter-trace-otlp-http": "0.208.0",
     "@opentelemetry/instrumentation-undici": "0.13.2",
-    "@opentelemetry/instrumentation-http": "0.204.0",
-    "@opentelemetry/instrumentation": "0.204.0",
+    "@opentelemetry/instrumentation-http": "0.208.0",
+    "@opentelemetry/instrumentation": "0.208.0",
     "@sentry/node": "latest || *",
     "@types/express": "4.17.17",
     "@types/node": "^18.19.1",
diff --git a/dev-packages/e2e-tests/test-applications/node-otel-without-tracing/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/node-otel-without-tracing/tests/transactions.test.ts
index 678841bdb249..26c9d7de5496 100644
--- a/dev-packages/e2e-tests/test-applications/node-otel-without-tracing/tests/transactions.test.ts
+++ b/dev-packages/e2e-tests/test-applications/node-otel-without-tracing/tests/transactions.test.ts
@@ -65,6 +65,7 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
       status: { code: 0 },
       links: [],
       droppedLinksCount: 0,
+      flags: expect.any(Number),
     },
     {
       traceId: expect.any(String),
@@ -80,6 +81,7 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
       status: { code: 0 },
       links: [],
       droppedLinksCount: 0,
+      flags: expect.any(Number),
     },
   ]);
 
@@ -116,6 +118,7 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
       status: { code: 0 },
       links: [],
       droppedLinksCount: 0,
+      flags: expect.any(Number),
     },
   ]);
 
@@ -157,6 +160,7 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
       },
       links: [],
       droppedLinksCount: 0,
+      flags: expect.any(Number),
     },
   ]);
 });
diff --git a/dev-packages/e2e-tests/test-applications/node-otel/package.json b/dev-packages/e2e-tests/test-applications/node-otel/package.json
index 31cf99c32c91..e2b7086f23ba 100644
--- a/dev-packages/e2e-tests/test-applications/node-otel/package.json
+++ b/dev-packages/e2e-tests/test-applications/node-otel/package.json
@@ -11,8 +11,8 @@
     "test:assert": "pnpm test"
   },
   "dependencies": {
-    "@opentelemetry/sdk-node": "0.204.0",
-    "@opentelemetry/exporter-trace-otlp-http": "0.204.0",
+    "@opentelemetry/sdk-node": "0.208.0",
+    "@opentelemetry/exporter-trace-otlp-http": "0.208.0",
     "@sentry/node": "latest || *",
     "@types/express": "4.17.17",
     "@types/node": "^18.19.1",
diff --git a/dev-packages/node-core-integration-tests/package.json b/dev-packages/node-core-integration-tests/package.json
index fe755f16cc6d..24ac2f57ea9e 100644
--- a/dev-packages/node-core-integration-tests/package.json
+++ b/dev-packages/node-core-integration-tests/package.json
@@ -27,12 +27,12 @@
     "@nestjs/core": "^11",
     "@nestjs/platform-express": "^11",
     "@opentelemetry/api": "^1.9.0",
-    "@opentelemetry/context-async-hooks": "^2.1.0",
-    "@opentelemetry/core": "^2.1.0",
-    "@opentelemetry/instrumentation": "^0.204.0",
-    "@opentelemetry/instrumentation-http": "0.204.0",
-    "@opentelemetry/resources": "^2.1.0",
-    "@opentelemetry/sdk-trace-base": "^2.1.0",
+    "@opentelemetry/context-async-hooks": "^2.2.0",
+    "@opentelemetry/core": "^2.2.0",
+    "@opentelemetry/instrumentation": "^0.208.0",
+    "@opentelemetry/instrumentation-http": "0.208.0",
+    "@opentelemetry/resources": "^2.2.0",
+    "@opentelemetry/sdk-trace-base": "^2.2.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
     "@sentry/core": "10.26.0",
     "@sentry/node-core": "10.26.0",
diff --git a/packages/aws-serverless/package.json b/packages/aws-serverless/package.json
index cd0ad16d9e7c..8d6360e82d2a 100644
--- a/packages/aws-serverless/package.json
+++ b/packages/aws-serverless/package.json
@@ -66,8 +66,8 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@opentelemetry/instrumentation": "^0.204.0",
-    "@opentelemetry/instrumentation-aws-sdk": "0.59.0",
+    "@opentelemetry/instrumentation": "^0.208.0",
+    "@opentelemetry/instrumentation-aws-sdk": "0.64.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
     "@sentry/core": "10.26.0",
     "@sentry/node": "10.26.0",
diff --git a/packages/nestjs/package.json b/packages/nestjs/package.json
index 53c3064ed08f..ae39e2dc5d4f 100644
--- a/packages/nestjs/package.json
+++ b/packages/nestjs/package.json
@@ -45,9 +45,9 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@opentelemetry/core": "^2.1.0",
-    "@opentelemetry/instrumentation": "^0.204.0",
-    "@opentelemetry/instrumentation-nestjs-core": "0.50.0",
+    "@opentelemetry/core": "^2.2.0",
+    "@opentelemetry/instrumentation": "^0.208.0",
+    "@opentelemetry/instrumentation-nestjs-core": "0.55.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
     "@sentry/core": "10.26.0",
     "@sentry/node": "10.26.0"
diff --git a/packages/node-core/package.json b/packages/node-core/package.json
index 89dbe5461165..1f845acfa16b 100644
--- a/packages/node-core/package.json
+++ b/packages/node-core/package.json
@@ -58,27 +58,27 @@
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@opentelemetry/context-async-hooks": "^1.30.1 || ^2.1.0",
-    "@opentelemetry/core": "^1.30.1 || ^2.1.0",
+    "@opentelemetry/context-async-hooks": "^1.30.1 || ^2.1.0 || ^2.2.0",
+    "@opentelemetry/core": "^1.30.1 || ^2.1.0 || ^2.2.0",
     "@opentelemetry/instrumentation": ">=0.57.1 <1",
-    "@opentelemetry/resources": "^1.30.1 || ^2.1.0",
-    "@opentelemetry/sdk-trace-base": "^1.30.1 || ^2.1.0",
+    "@opentelemetry/resources": "^1.30.1 || ^2.1.0 || ^2.2.0",
+    "@opentelemetry/sdk-trace-base": "^1.30.1 || ^2.1.0 || ^2.2.0",
     "@opentelemetry/semantic-conventions": "^1.37.0"
   },
   "dependencies": {
     "@apm-js-collab/tracing-hooks": "^0.3.1",
     "@sentry/core": "10.26.0",
     "@sentry/opentelemetry": "10.26.0",
-    "import-in-the-middle": "^1.14.2"
+    "import-in-the-middle": "^2"
   },
   "devDependencies": {
     "@apm-js-collab/code-transformer": "^0.8.2",
     "@opentelemetry/api": "^1.9.0",
-    "@opentelemetry/context-async-hooks": "^2.1.0",
-    "@opentelemetry/core": "^2.1.0",
-    "@opentelemetry/instrumentation": "^0.204.0",
-    "@opentelemetry/resources": "^2.1.0",
-    "@opentelemetry/sdk-trace-base": "^2.1.0",
+    "@opentelemetry/context-async-hooks": "^2.2.0",
+    "@opentelemetry/core": "^2.2.0",
+    "@opentelemetry/instrumentation": "^0.208.0",
+    "@opentelemetry/resources": "^2.2.0",
+    "@opentelemetry/sdk-trace-base": "^2.2.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
     "@types/node": "^18.19.1"
   },
diff --git a/packages/node-core/src/integrations/diagnostic_channel.d.ts b/packages/node-core/src/integrations/diagnostic_channel.d.ts
deleted file mode 100644
index abf3649a617f..000000000000
--- a/packages/node-core/src/integrations/diagnostic_channel.d.ts
+++ /dev/null
@@ -1,556 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-/* eslint-disable @typescript-eslint/ban-types */
-/* eslint-disable @typescript-eslint/explicit-member-accessibility */
-
-/**
- * The `node:diagnostics_channel` module provides an API to create named channels
- * to report arbitrary message data for diagnostics purposes.
- *
- * It can be accessed using:
- *
- * ```js
- * import diagnostics_channel from 'node:diagnostics_channel';
- * ```
- *
- * It is intended that a module writer wanting to report diagnostics messages
- * will create one or many top-level channels to report messages through.
- * Channels may also be acquired at runtime but it is not encouraged
- * due to the additional overhead of doing so. Channels may be exported for
- * convenience, but as long as the name is known it can be acquired anywhere.
- *
- * If you intend for your module to produce diagnostics data for others to
- * consume it is recommended that you include documentation of what named
- * channels are used along with the shape of the message data. Channel names
- * should generally include the module name to avoid collisions with data from
- * other modules.
- * @since v15.1.0, v14.17.0
- * @see [source](https://github.com/nodejs/node/blob/v22.x/lib/diagnostics_channel.js)
- */
-declare module 'diagnostics_channel' {
-  import type { AsyncLocalStorage } from 'node:async_hooks';
-  /**
-   * Check if there are active subscribers to the named channel. This is helpful if
-   * the message you want to send might be expensive to prepare.
-   *
-   * This API is optional but helpful when trying to publish messages from very
-   * performance-sensitive code.
-   *
-   * ```js
-   * import diagnostics_channel from 'node:diagnostics_channel';
-   *
-   * if (diagnostics_channel.hasSubscribers('my-channel')) {
-   *   // There are subscribers, prepare and publish message
-   * }
-   * ```
-   * @since v15.1.0, v14.17.0
-   * @param name The channel name
-   * @return If there are active subscribers
-   */
-  function hasSubscribers(name: string | symbol): boolean;
-  /**
-   * This is the primary entry-point for anyone wanting to publish to a named
-   * channel. It produces a channel object which is optimized to reduce overhead at
-   * publish time as much as possible.
-   *
-   * ```js
-   * import diagnostics_channel from 'node:diagnostics_channel';
-   *
-   * const channel = diagnostics_channel.channel('my-channel');
-   * ```
-   * @since v15.1.0, v14.17.0
-   * @param name The channel name
-   * @return The named channel object
-   */
-  function channel(name: string | symbol): Channel;
-  type ChannelListener = (message: unknown, name: string | symbol) => void;
-  /**
-   * Register a message handler to subscribe to this channel. This message handler
-   * will be run synchronously whenever a message is published to the channel. Any
-   * errors thrown in the message handler will trigger an `'uncaughtException'`.
-   *
-   * ```js
-   * import diagnostics_channel from 'node:diagnostics_channel';
-   *
-   * diagnostics_channel.subscribe('my-channel', (message, name) => {
-   *   // Received data
-   * });
-   * ```
-   * @since v18.7.0, v16.17.0
-   * @param name The channel name
-   * @param onMessage The handler to receive channel messages
-   */
-  function subscribe(name: string | symbol, onMessage: ChannelListener): void;
-  /**
-   * Remove a message handler previously registered to this channel with {@link subscribe}.
-   *
-   * ```js
-   * import diagnostics_channel from 'node:diagnostics_channel';
-   *
-   * function onMessage(message, name) {
-   *   // Received data
-   * }
-   *
-   * diagnostics_channel.subscribe('my-channel', onMessage);
-   *
-   * diagnostics_channel.unsubscribe('my-channel', onMessage);
-   * ```
-   * @since v18.7.0, v16.17.0
-   * @param name The channel name
-   * @param onMessage The previous subscribed handler to remove
-   * @return `true` if the handler was found, `false` otherwise.
-   */
-  function unsubscribe(name: string | symbol, onMessage: ChannelListener): boolean;
-  /**
-   * Creates a `TracingChannel` wrapper for the given `TracingChannel Channels`. If a name is given, the corresponding tracing
-   * channels will be created in the form of `tracing:${name}:${eventType}` where `eventType` corresponds to the types of `TracingChannel Channels`.
-   *
-   * ```js
-   * import diagnostics_channel from 'node:diagnostics_channel';
-   *
-   * const channelsByName = diagnostics_channel.tracingChannel('my-channel');
-   *
-   * // or...
-   *
-   * const channelsByCollection = diagnostics_channel.tracingChannel({
-   *   start: diagnostics_channel.channel('tracing:my-channel:start'),
-   *   end: diagnostics_channel.channel('tracing:my-channel:end'),
-   *   asyncStart: diagnostics_channel.channel('tracing:my-channel:asyncStart'),
-   *   asyncEnd: diagnostics_channel.channel('tracing:my-channel:asyncEnd'),
-   *   error: diagnostics_channel.channel('tracing:my-channel:error'),
-   * });
-   * ```
-   * @since v19.9.0
-   * @experimental
-   * @param nameOrChannels Channel name or object containing all the `TracingChannel Channels`
-   * @return Collection of channels to trace with
-   */
-  function tracingChannel<
-    StoreType = unknown,
-    ContextType extends object = StoreType extends object ? StoreType : object,
-  >(nameOrChannels: string | TracingChannelCollection<StoreType, ContextType>): TracingChannel<StoreType, ContextType>;
-  /**
-   * The class `Channel` represents an individual named channel within the data
-   * pipeline. It is used to track subscribers and to publish messages when there
-   * are subscribers present. It exists as a separate object to avoid channel
-   * lookups at publish time, enabling very fast publish speeds and allowing
-   * for heavy use while incurring very minimal cost. Channels are created with {@link channel}, constructing a channel directly
-   * with `new Channel(name)` is not supported.
-   * @since v15.1.0, v14.17.0
-   */
-  class Channel<StoreType = unknown, ContextType = StoreType> {
-    readonly name: string | symbol;
-    /**
-     * Check if there are active subscribers to this channel. This is helpful if
-     * the message you want to send might be expensive to prepare.
-     *
-     * This API is optional but helpful when trying to publish messages from very
-     * performance-sensitive code.
-     *
-     * ```js
-     * import diagnostics_channel from 'node:diagnostics_channel';
-     *
-     * const channel = diagnostics_channel.channel('my-channel');
-     *
-     * if (channel.hasSubscribers) {
-     *   // There are subscribers, prepare and publish message
-     * }
-     * ```
-     * @since v15.1.0, v14.17.0
-     */
-    readonly hasSubscribers: boolean;
-    private constructor(name: string | symbol);
-    /**
-     * Publish a message to any subscribers to the channel. This will trigger
-     * message handlers synchronously so they will execute within the same context.
-     *
-     * ```js
-     * import diagnostics_channel from 'node:diagnostics_channel';
-     *
-     * const channel = diagnostics_channel.channel('my-channel');
-     *
-     * channel.publish({
-     *   some: 'message',
-     * });
-     * ```
-     * @since v15.1.0, v14.17.0
-     * @param message The message to send to the channel subscribers
-     */
-    publish(message: unknown): void;
-    /**
-     * Register a message handler to subscribe to this channel. This message handler
-     * will be run synchronously whenever a message is published to the channel. Any
-     * errors thrown in the message handler will trigger an `'uncaughtException'`.
-     *
-     * ```js
-     * import diagnostics_channel from 'node:diagnostics_channel';
-     *
-     * const channel = diagnostics_channel.channel('my-channel');
-     *
-     * channel.subscribe((message, name) => {
-     *   // Received data
-     * });
-     * ```
-     * @since v15.1.0, v14.17.0
-     * @deprecated Since v18.7.0,v16.17.0 - Use {@link subscribe(name, onMessage)}
-     * @param onMessage The handler to receive channel messages
-     */
-    subscribe(onMessage: ChannelListener): void;
-    /**
-     * Remove a message handler previously registered to this channel with `channel.subscribe(onMessage)`.
-     *
-     * ```js
-     * import diagnostics_channel from 'node:diagnostics_channel';
-     *
-     * const channel = diagnostics_channel.channel('my-channel');
-     *
-     * function onMessage(message, name) {
-     *   // Received data
-     * }
-     *
-     * channel.subscribe(onMessage);
-     *
-     * channel.unsubscribe(onMessage);
-     * ```
-     * @since v15.1.0, v14.17.0
-     * @deprecated Since v18.7.0,v16.17.0 - Use {@link unsubscribe(name, onMessage)}
-     * @param onMessage The previous subscribed handler to remove
-     * @return `true` if the handler was found, `false` otherwise.
-     */
-    unsubscribe(onMessage: ChannelListener): void;
-    /**
-     * When `channel.runStores(context, ...)` is called, the given context data
-     * will be applied to any store bound to the channel. If the store has already been
-     * bound the previous `transform` function will be replaced with the new one.
-     * The `transform` function may be omitted to set the given context data as the
-     * context directly.
-     *
-     * ```js
-     * import diagnostics_channel from 'node:diagnostics_channel';
-     * import { AsyncLocalStorage } from 'node:async_hooks';
-     *
-     * const store = new AsyncLocalStorage();
-     *
-     * const channel = diagnostics_channel.channel('my-channel');
-     *
-     * channel.bindStore(store, (data) => {
-     *   return { data };
-     * });
-     * ```
-     * @since v19.9.0
-     * @experimental
-     * @param store The store to which to bind the context data
-     * @param transform Transform context data before setting the store context
-     */
-    bindStore(store: AsyncLocalStorage<StoreType>, transform?: (context: ContextType) => StoreType): void;
-    /**
-     * Remove a message handler previously registered to this channel with `channel.bindStore(store)`.
-     *
-     * ```js
-     * import diagnostics_channel from 'node:diagnostics_channel';
-     * import { AsyncLocalStorage } from 'node:async_hooks';
-     *
-     * const store = new AsyncLocalStorage();
-     *
-     * const channel = diagnostics_channel.channel('my-channel');
-     *
-     * channel.bindStore(store);
-     * channel.unbindStore(store);
-     * ```
-     * @since v19.9.0
-     * @experimental
-     * @param store The store to unbind from the channel.
-     * @return `true` if the store was found, `false` otherwise.
-     */
-    unbindStore(store: any): void;
-    /**
-     * Applies the given data to any AsyncLocalStorage instances bound to the channel
-     * for the duration of the given function, then publishes to the channel within
-     * the scope of that data is applied to the stores.
-     *
-     * If a transform function was given to `channel.bindStore(store)` it will be
-     * applied to transform the message data before it becomes the context value for
-     * the store. The prior storage context is accessible from within the transform
-     * function in cases where context linking is required.
-     *
-     * The context applied to the store should be accessible in any async code which
-     * continues from execution which began during the given function, however
-     * there are some situations in which `context loss` may occur.
-     *
-     * ```js
-     * import diagnostics_channel from 'node:diagnostics_channel';
-     * import { AsyncLocalStorage } from 'node:async_hooks';
-     *
-     * const store = new AsyncLocalStorage();
-     *
-     * const channel = diagnostics_channel.channel('my-channel');
-     *
-     * channel.bindStore(store, (message) => {
-     *   const parent = store.getStore();
-     *   return new Span(message, parent);
-     * });
-     * channel.runStores({ some: 'message' }, () => {
-     *   store.getStore(); // Span({ some: 'message' })
-     * });
-     * ```
-     * @since v19.9.0
-     * @experimental
-     * @param context Message to send to subscribers and bind to stores
-     * @param fn Handler to run within the entered storage context
-     * @param thisArg The receiver to be used for the function call.
-     * @param args Optional arguments to pass to the function.
-     */
-    runStores(): void;
-  }
-  interface TracingChannelSubscribers<ContextType extends object> {
-    start: (message: ContextType) => void;
-    end: (
-      message: ContextType & {
-        error?: unknown;
-        result?: unknown;
-      },
-    ) => void;
-    asyncStart: (
-      message: ContextType & {
-        error?: unknown;
-        result?: unknown;
-      },
-    ) => void;
-    asyncEnd: (
-      message: ContextType & {
-        error?: unknown;
-        result?: unknown;
-      },
-    ) => void;
-    error: (
-      message: ContextType & {
-        error: unknown;
-      },
-    ) => void;
-  }
-  interface TracingChannelCollection<StoreType = unknown, ContextType = StoreType> {
-    start: Channel<StoreType, ContextType>;
-    end: Channel<StoreType, ContextType>;
-    asyncStart: Channel<StoreType, ContextType>;
-    asyncEnd: Channel<StoreType, ContextType>;
-    error: Channel<StoreType, ContextType>;
-  }
-  /**
-   * The class `TracingChannel` is a collection of `TracingChannel Channels` which
-   * together express a single traceable action. It is used to formalize and
-   * simplify the process of producing events for tracing application flow. {@link tracingChannel} is used to construct a `TracingChannel`. As with `Channel` it is recommended to create and reuse a
-   * single `TracingChannel` at the top-level of the file rather than creating them
-   * dynamically.
-   * @since v19.9.0
-   * @experimental
-   */
-  class TracingChannel<StoreType = unknown, ContextType extends object = {}> implements TracingChannelCollection {
-    start: Channel<StoreType, ContextType>;
-    end: Channel<StoreType, ContextType>;
-    asyncStart: Channel<StoreType, ContextType>;
-    asyncEnd: Channel<StoreType, ContextType>;
-    error: Channel<StoreType, ContextType>;
-    /**
-     * Helper to subscribe a collection of functions to the corresponding channels.
-     * This is the same as calling `channel.subscribe(onMessage)` on each channel
-     * individually.
-     *
-     * ```js
-     * import diagnostics_channel from 'node:diagnostics_channel';
-     *
-     * const channels = diagnostics_channel.tracingChannel('my-channel');
-     *
-     * channels.subscribe({
-     *   start(message) {
-     *     // Handle start message
-     *   },
-     *   end(message) {
-     *     // Handle end message
-     *   },
-     *   asyncStart(message) {
-     *     // Handle asyncStart message
-     *   },
-     *   asyncEnd(message) {
-     *     // Handle asyncEnd message
-     *   },
-     *   error(message) {
-     *     // Handle error message
-     *   },
-     * });
-     * ```
-     * @since v19.9.0
-     * @experimental
-     * @param subscribers Set of `TracingChannel Channels` subscribers
-     */
-    subscribe(subscribers: TracingChannelSubscribers<ContextType>): void;
-    /**
-     * Helper to unsubscribe a collection of functions from the corresponding channels.
-     * This is the same as calling `channel.unsubscribe(onMessage)` on each channel
-     * individually.
-     *
-     * ```js
-     * import diagnostics_channel from 'node:diagnostics_channel';
-     *
-     * const channels = diagnostics_channel.tracingChannel('my-channel');
-     *
-     * channels.unsubscribe({
-     *   start(message) {
-     *     // Handle start message
-     *   },
-     *   end(message) {
-     *     // Handle end message
-     *   },
-     *   asyncStart(message) {
-     *     // Handle asyncStart message
-     *   },
-     *   asyncEnd(message) {
-     *     // Handle asyncEnd message
-     *   },
-     *   error(message) {
-     *     // Handle error message
-     *   },
-     * });
-     * ```
-     * @since v19.9.0
-     * @experimental
-     * @param subscribers Set of `TracingChannel Channels` subscribers
-     * @return `true` if all handlers were successfully unsubscribed, and `false` otherwise.
-     */
-    unsubscribe(subscribers: TracingChannelSubscribers<ContextType>): void;
-    /**
-     * Trace a synchronous function call. This will always produce a `start event` and `end event` around the execution and may produce an `error event` if the given function throws an error.
-     * This will run the given function using `channel.runStores(context, ...)` on the `start` channel which ensures all
-     * events should have any bound stores set to match this trace context.
-     *
-     * To ensure only correct trace graphs are formed, events will only be published if subscribers are present prior to starting the trace. Subscriptions
-     * which are added after the trace begins will not receive future events from that trace, only future traces will be seen.
-     *
-     * ```js
-     * import diagnostics_channel from 'node:diagnostics_channel';
-     *
-     * const channels = diagnostics_channel.tracingChannel('my-channel');
-     *
-     * channels.traceSync(() => {
-     *   // Do something
-     * }, {
-     *   some: 'thing',
-     * });
-     * ```
-     * @since v19.9.0
-     * @experimental
-     * @param fn Function to wrap a trace around
-     * @param context Shared object to correlate events through
-     * @param thisArg The receiver to be used for the function call
-     * @param args Optional arguments to pass to the function
-     * @return The return value of the given function
-     */
-    traceSync<ThisArg = any, Args extends any[] = any[]>(
-      fn: (this: ThisArg, ...args: Args) => any,
-      context?: ContextType,
-      thisArg?: ThisArg,
-      ...args: Args
-    ): void;
-    /**
-     * Trace a promise-returning function call. This will always produce a `start event` and `end event` around the synchronous portion of the
-     * function execution, and will produce an `asyncStart event` and `asyncEnd event` when a promise continuation is reached. It may also
-     * produce an `error event` if the given function throws an error or the
-     * returned promise rejects. This will run the given function using `channel.runStores(context, ...)` on the `start` channel which ensures all
-     * events should have any bound stores set to match this trace context.
-     *
-     * To ensure only correct trace graphs are formed, events will only be published if subscribers are present prior to starting the trace. Subscriptions
-     * which are added after the trace begins will not receive future events from that trace, only future traces will be seen.
-     *
-     * ```js
-     * import diagnostics_channel from 'node:diagnostics_channel';
-     *
-     * const channels = diagnostics_channel.tracingChannel('my-channel');
-     *
-     * channels.tracePromise(async () => {
-     *   // Do something
-     * }, {
-     *   some: 'thing',
-     * });
-     * ```
-     * @since v19.9.0
-     * @experimental
-     * @param fn Promise-returning function to wrap a trace around
-     * @param context Shared object to correlate trace events through
-     * @param thisArg The receiver to be used for the function call
-     * @param args Optional arguments to pass to the function
-     * @return Chained from promise returned by the given function
-     */
-    tracePromise<ThisArg = any, Args extends any[] = any[]>(
-      fn: (this: ThisArg, ...args: Args) => Promise<any>,
-      context?: ContextType,
-      thisArg?: ThisArg,
-      ...args: Args
-    ): void;
-    /**
-     * Trace a callback-receiving function call. This will always produce a `start event` and `end event` around the synchronous portion of the
-     * function execution, and will produce a `asyncStart event` and `asyncEnd event` around the callback execution. It may also produce an `error event` if the given function throws an error or
-     * the returned
-     * promise rejects. This will run the given function using `channel.runStores(context, ...)` on the `start` channel which ensures all
-     * events should have any bound stores set to match this trace context.
-     *
-     * The `position` will be -1 by default to indicate the final argument should
-     * be used as the callback.
-     *
-     * ```js
-     * import diagnostics_channel from 'node:diagnostics_channel';
-     *
-     * const channels = diagnostics_channel.tracingChannel('my-channel');
-     *
-     * channels.traceCallback((arg1, callback) => {
-     *   // Do something
-     *   callback(null, 'result');
-     * }, 1, {
-     *   some: 'thing',
-     * }, thisArg, arg1, callback);
-     * ```
-     *
-     * The callback will also be run with `channel.runStores(context, ...)` which
-     * enables context loss recovery in some cases.
-     *
-     * To ensure only correct trace graphs are formed, events will only be published if subscribers are present prior to starting the trace. Subscriptions
-     * which are added after the trace begins will not receive future events from that trace, only future traces will be seen.
-     *
-     * ```js
-     * import diagnostics_channel from 'node:diagnostics_channel';
-     * import { AsyncLocalStorage } from 'node:async_hooks';
-     *
-     * const channels = diagnostics_channel.tracingChannel('my-channel');
-     * const myStore = new AsyncLocalStorage();
-     *
-     * // The start channel sets the initial store data to something
-     * // and stores that store data value on the trace context object
-     * channels.start.bindStore(myStore, (data) => {
-     *   const span = new Span(data);
-     *   data.span = span;
-     *   return span;
-     * });
-     *
-     * // Then asyncStart can restore from that data it stored previously
-     * channels.asyncStart.bindStore(myStore, (data) => {
-     *   return data.span;
-     * });
-     * ```
-     * @since v19.9.0
-     * @experimental
-     * @param fn callback using function to wrap a trace around
-     * @param position Zero-indexed argument position of expected callback
-     * @param context Shared object to correlate trace events through
-     * @param thisArg The receiver to be used for the function call
-     * @param args Optional arguments to pass to the function
-     * @return The return value of the given function
-     */
-    traceCallback<Fn extends (this: any, ...args: any[]) => any>(
-      fn: Fn,
-      position?: number,
-      context?: ContextType,
-      thisArg?: any,
-      ...args: Parameters<Fn>
-    ): void;
-  }
-}
-declare module 'node:diagnostics_channel' {
-  export * from 'diagnostics_channel';
-}
diff --git a/packages/node/package.json b/packages/node/package.json
index 6f0bec49c92a..e43d7b04a0ee 100644
--- a/packages/node/package.json
+++ b/packages/node/package.json
@@ -66,39 +66,39 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@opentelemetry/context-async-hooks": "^2.1.0",
-    "@opentelemetry/core": "^2.1.0",
-    "@opentelemetry/instrumentation": "^0.204.0",
-    "@opentelemetry/instrumentation-amqplib": "0.51.0",
-    "@opentelemetry/instrumentation-connect": "0.48.0",
-    "@opentelemetry/instrumentation-dataloader": "0.22.0",
-    "@opentelemetry/instrumentation-express": "0.53.0",
-    "@opentelemetry/instrumentation-fs": "0.24.0",
-    "@opentelemetry/instrumentation-generic-pool": "0.48.0",
-    "@opentelemetry/instrumentation-graphql": "0.52.0",
-    "@opentelemetry/instrumentation-hapi": "0.51.0",
-    "@opentelemetry/instrumentation-http": "0.204.0",
-    "@opentelemetry/instrumentation-ioredis": "0.52.0",
-    "@opentelemetry/instrumentation-kafkajs": "0.14.0",
-    "@opentelemetry/instrumentation-knex": "0.49.0",
-    "@opentelemetry/instrumentation-koa": "0.52.0",
-    "@opentelemetry/instrumentation-lru-memoizer": "0.49.0",
-    "@opentelemetry/instrumentation-mongodb": "0.57.0",
-    "@opentelemetry/instrumentation-mongoose": "0.51.0",
-    "@opentelemetry/instrumentation-mysql": "0.50.0",
-    "@opentelemetry/instrumentation-mysql2": "0.51.0",
-    "@opentelemetry/instrumentation-pg": "0.57.0",
-    "@opentelemetry/instrumentation-redis": "0.53.0",
-    "@opentelemetry/instrumentation-tedious": "0.23.0",
-    "@opentelemetry/instrumentation-undici": "0.15.0",
-    "@opentelemetry/resources": "^2.1.0",
-    "@opentelemetry/sdk-trace-base": "^2.1.0",
+    "@opentelemetry/context-async-hooks": "^2.2.0",
+    "@opentelemetry/core": "^2.2.0",
+    "@opentelemetry/instrumentation": "^0.208.0",
+    "@opentelemetry/instrumentation-amqplib": "0.55.0",
+    "@opentelemetry/instrumentation-connect": "0.52.0",
+    "@opentelemetry/instrumentation-dataloader": "0.26.0",
+    "@opentelemetry/instrumentation-express": "0.57.0",
+    "@opentelemetry/instrumentation-fs": "0.28.0",
+    "@opentelemetry/instrumentation-generic-pool": "0.52.0",
+    "@opentelemetry/instrumentation-graphql": "0.56.0",
+    "@opentelemetry/instrumentation-hapi": "0.55.0",
+    "@opentelemetry/instrumentation-http": "0.208.0",
+    "@opentelemetry/instrumentation-ioredis": "0.56.0",
+    "@opentelemetry/instrumentation-kafkajs": "0.18.0",
+    "@opentelemetry/instrumentation-knex": "0.53.0",
+    "@opentelemetry/instrumentation-koa": "0.57.0",
+    "@opentelemetry/instrumentation-lru-memoizer": "0.53.0",
+    "@opentelemetry/instrumentation-mongodb": "0.61.0",
+    "@opentelemetry/instrumentation-mongoose": "0.55.0",
+    "@opentelemetry/instrumentation-mysql": "0.54.0",
+    "@opentelemetry/instrumentation-mysql2": "0.55.0",
+    "@opentelemetry/instrumentation-pg": "0.61.0",
+    "@opentelemetry/instrumentation-redis": "0.57.0",
+    "@opentelemetry/instrumentation-tedious": "0.27.0",
+    "@opentelemetry/instrumentation-undici": "0.19.0",
+    "@opentelemetry/resources": "^2.2.0",
+    "@opentelemetry/sdk-trace-base": "^2.2.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@prisma/instrumentation": "6.15.0",
+    "@prisma/instrumentation": "6.19.0",
     "@sentry/core": "10.26.0",
     "@sentry/node-core": "10.26.0",
     "@sentry/opentelemetry": "10.26.0",
-    "import-in-the-middle": "^1.14.2",
+    "import-in-the-middle": "^2",
     "minimatch": "^9.0.0"
   },
   "devDependencies": {
diff --git a/packages/opentelemetry/package.json b/packages/opentelemetry/package.json
index 95b7f54cd000..86d73b8555b2 100644
--- a/packages/opentelemetry/package.json
+++ b/packages/opentelemetry/package.json
@@ -43,16 +43,16 @@
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@opentelemetry/context-async-hooks": "^1.30.1 || ^2.1.0",
-    "@opentelemetry/core": "^1.30.1 || ^2.1.0",
-    "@opentelemetry/sdk-trace-base": "^1.30.1 || ^2.1.0",
+    "@opentelemetry/context-async-hooks": "^1.30.1 || ^2.1.0 || ^2.2.0",
+    "@opentelemetry/core": "^1.30.1 || ^2.1.0 || ^2.2.0",
+    "@opentelemetry/sdk-trace-base": "^1.30.1 || ^2.1.0 || ^2.2.0",
     "@opentelemetry/semantic-conventions": "^1.37.0"
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@opentelemetry/context-async-hooks": "^2.1.0",
-    "@opentelemetry/core": "^2.1.0",
-    "@opentelemetry/sdk-trace-base": "^2.1.0",
+    "@opentelemetry/context-async-hooks": "^2.2.0",
+    "@opentelemetry/core": "^2.2.0",
+    "@opentelemetry/sdk-trace-base": "^2.2.0",
     "@opentelemetry/semantic-conventions": "^1.37.0"
   },
   "scripts": {
diff --git a/packages/react-router/package.json b/packages/react-router/package.json
index a65bd845bdab..51ce7bb94122 100644
--- a/packages/react-router/package.json
+++ b/packages/react-router/package.json
@@ -46,8 +46,8 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@opentelemetry/core": "^2.1.0",
-    "@opentelemetry/instrumentation": "^0.204.0",
+    "@opentelemetry/core": "^2.2.0",
+    "@opentelemetry/instrumentation": "^0.208.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
     "@sentry/browser": "10.26.0",
     "@sentry/cli": "^2.58.2",
diff --git a/packages/remix/package.json b/packages/remix/package.json
index 181d6e23a63f..98bdd9a39c7c 100644
--- a/packages/remix/package.json
+++ b/packages/remix/package.json
@@ -65,7 +65,7 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@opentelemetry/instrumentation": "^0.204.0",
+    "@opentelemetry/instrumentation": "^0.208.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
     "@remix-run/router": "1.x",
     "@sentry/cli": "^2.58.2",
diff --git a/packages/sveltekit/src/client/sdk.ts b/packages/sveltekit/src/client/sdk.ts
index 5c3f482cb7d0..a6294ad25977 100644
--- a/packages/sveltekit/src/client/sdk.ts
+++ b/packages/sveltekit/src/client/sdk.ts
@@ -64,7 +64,7 @@ function getDefaultIntegrations(options: BrowserOptions): Integration[] | undefi
  * @returns the function that was previously on `window.fetch`.
  */
 function switchToFetchProxy(): typeof fetch | undefined {
-  const globalWithSentryFetchProxy: WindowWithSentryFetchProxy = WINDOW as WindowWithSentryFetchProxy;
+  const globalWithSentryFetchProxy: WindowWithSentryFetchProxy = WINDOW;
 
   // eslint-disable-next-line @typescript-eslint/unbound-method
   const actualFetch = globalWithSentryFetchProxy.fetch;
@@ -81,7 +81,7 @@ function switchToFetchProxy(): typeof fetch | undefined {
  * and puts our fetch proxy back onto `window._sentryFetchProxy`.
  */
 function restoreFetch(actualFetch: typeof fetch): void {
-  const globalWithSentryFetchProxy: WindowWithSentryFetchProxy = WINDOW as WindowWithSentryFetchProxy;
+  const globalWithSentryFetchProxy: WindowWithSentryFetchProxy = WINDOW;
 
   // eslint-disable-next-line @typescript-eslint/unbound-method
   globalWithSentryFetchProxy._sentryFetchProxy = globalWithSentryFetchProxy.fetch;
diff --git a/packages/vercel-edge/package.json b/packages/vercel-edge/package.json
index d5c9ef78b8c1..1efd9c1af34c 100644
--- a/packages/vercel-edge/package.json
+++ b/packages/vercel-edge/package.json
@@ -40,13 +40,13 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@opentelemetry/resources": "^2.1.0",
+    "@opentelemetry/resources": "^2.2.0",
     "@sentry/core": "10.26.0"
   },
   "devDependencies": {
     "@edge-runtime/types": "3.0.1",
-    "@opentelemetry/core": "^2.1.0",
-    "@opentelemetry/sdk-trace-base": "^2.1.0",
+    "@opentelemetry/core": "^2.2.0",
+    "@opentelemetry/sdk-trace-base": "^2.2.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
     "@sentry/opentelemetry": "10.26.0"
   },
diff --git a/packages/vercel-edge/src/vendored/abstract-async-hooks-context-manager.ts b/packages/vercel-edge/src/vendored/abstract-async-hooks-context-manager.ts
index 72373afdebdf..3ec1934af3f7 100644
--- a/packages/vercel-edge/src/vendored/abstract-async-hooks-context-manager.ts
+++ b/packages/vercel-edge/src/vendored/abstract-async-hooks-context-manager.ts
@@ -32,10 +32,22 @@
 /* eslint-disable @typescript-eslint/no-this-alias */
 
 import type { Context, ContextManager } from '@opentelemetry/api';
-import type { EventEmitter } from 'events';
 
 type Func<T> = (...args: unknown[]) => T;
 
+// Inline EventEmitter interface to avoid Node.js module dependency
+// This prevents Node.js type leaks in edge runtime environments
+interface EventEmitter {
+  addListener?(event: string, listener: Func<void>): this;
+  on?(event: string, listener: Func<void>): this;
+  once?(event: string, listener: Func<void>): this;
+  prependListener?(event: string, listener: Func<void>): this;
+  prependOnceListener?(event: string, listener: Func<void>): this;
+  removeListener?(event: string, listener: Func<void>): this;
+  off?(event: string, listener: Func<void>): this;
+  removeAllListeners?(event?: string): this;
+}
+
 /**
  * Store a map for each event of all original listeners and their "patched"
  * version. So when a listener is removed by the user, the corresponding
diff --git a/packages/vercel-edge/src/vendored/async-local-storage-context-manager.ts b/packages/vercel-edge/src/vendored/async-local-storage-context-manager.ts
index 3fd89f28af7c..257c6c27f041 100644
--- a/packages/vercel-edge/src/vendored/async-local-storage-context-manager.ts
+++ b/packages/vercel-edge/src/vendored/async-local-storage-context-manager.ts
@@ -28,10 +28,17 @@
 import type { Context } from '@opentelemetry/api';
 import { ROOT_CONTEXT } from '@opentelemetry/api';
 import { debug, GLOBAL_OBJ } from '@sentry/core';
-import type { AsyncLocalStorage } from 'async_hooks';
 import { DEBUG_BUILD } from '../debug-build';
 import { AbstractAsyncHooksContextManager } from './abstract-async-hooks-context-manager';
 
+// Inline AsyncLocalStorage interface to avoid Node.js module dependency
+// This prevents Node.js type leaks in edge runtime environments
+interface AsyncLocalStorage<T> {
+  getStore(): T | undefined;
+  run<R>(store: T, callback: (...args: any[]) => R, ...args: any[]): R;
+  disable(): void;
+}
+
 export class AsyncLocalStorageContextManager extends AbstractAsyncHooksContextManager {
   private _asyncLocalStorage: AsyncLocalStorage<Context>;
 
@@ -46,12 +53,11 @@ export class AsyncLocalStorageContextManager extends AbstractAsyncHooksContextMa
           "Tried to register AsyncLocalStorage async context strategy in a runtime that doesn't support AsyncLocalStorage.",
         );
 
-      // @ts-expect-error Vendored type shenanigans
       this._asyncLocalStorage = {
         getStore() {
           return undefined;
         },
-        run(_store: unknown, callback: () => Context, ...args: unknown[]) {
+        run<R>(_store: Context, callback: (...args: any[]) => R, ...args: any[]): R {
           return callback.apply(this, args);
         },
         disable() {
diff --git a/yarn.lock b/yarn.lock
index 8687df6cfa53..41c2c2fe1486 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5959,17 +5959,10 @@
   dependencies:
     "@octokit/openapi-types" "^18.0.0"
 
-"@opentelemetry/api-logs@0.204.0":
-  version "0.204.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/api-logs/-/api-logs-0.204.0.tgz#c0285aa5c79625a1c424854393902d21732fd76b"
-  integrity sha512-DqxY8yoAaiBPivoJD4UtgrMS8gEmzZ5lnaxzPojzLVHBGqPxgWm4zcuvcUHZiqQ6kRX2Klel2r9y8cA2HAtqpw==
-  dependencies:
-    "@opentelemetry/api" "^1.3.0"
-
-"@opentelemetry/api-logs@0.57.2":
-  version "0.57.2"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/api-logs/-/api-logs-0.57.2.tgz#d4001b9aa3580367b40fe889f3540014f766cc87"
-  integrity sha512-uIX52NnTM0iBh84MShlpouI7UKqkZ7MrUszTmaypHBu4r7NofznSnQRfJ+uUeDtQDj6w8eFGg5KBLDAwAPz1+A==
+"@opentelemetry/api-logs@0.208.0":
+  version "0.208.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/api-logs/-/api-logs-0.208.0.tgz#56d3891010a1fa1cf600ba8899ed61b43ace511c"
+  integrity sha512-CjruKY9V6NMssL/T1kAFgzosF1v9o6oeN+aX5JB/C/xPNtmgIJqcXHG7fA82Ou1zCpWGl4lROQUKwUNE1pMCyg==
   dependencies:
     "@opentelemetry/api" "^1.3.0"
 
@@ -5978,277 +5971,260 @@
   resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.9.0.tgz#d03eba68273dc0f7509e2a3d5cba21eae10379fe"
   integrity sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==
 
-"@opentelemetry/context-async-hooks@^2.1.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/context-async-hooks/-/context-async-hooks-2.1.0.tgz#de1de21d9536abfe73769f822b52a59a8c97b083"
-  integrity sha512-zOyetmZppnwTyPrt4S7jMfXiSX9yyfF0hxlA8B5oo2TtKl+/RGCy7fi4DrBfIf3lCPrkKsRBWZZD7RFojK7FDg==
+"@opentelemetry/context-async-hooks@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/context-async-hooks/-/context-async-hooks-2.2.0.tgz#5465f6fad6350f52cf9d95a92907a3a464d50644"
+  integrity sha512-qRkLWiUEZNAmYapZ7KGS5C4OmBLcP/H2foXeOEaowYCR0wi89fHejrfYfbuLVCMLp/dWZXKvQusdbUEZjERfwQ==
 
-"@opentelemetry/core@2.1.0", "@opentelemetry/core@^2.0.0", "@opentelemetry/core@^2.1.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-2.1.0.tgz#5539f04eb9e5245e000b0c3f77bdfaa07557e3a7"
-  integrity sha512-RMEtHsxJs/GiHHxYT58IY57UXAQTuUnZVco6ymDEqTNlJKTimM4qPUPVe8InNFyBjhHBEAx4k3Q8LtNayBsbUQ==
+"@opentelemetry/core@2.2.0", "@opentelemetry/core@^2.0.0", "@opentelemetry/core@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-2.2.0.tgz#2f857d7790ff160a97db3820889b5f4cade6eaee"
+  integrity sha512-FuabnnUm8LflnieVxs6eP7Z383hgQU4W1e3KJS6aOG3RxWxcHyBxH8fDMHNgu/gFx/M2jvTOW/4/PHhLz6bjWw==
   dependencies:
     "@opentelemetry/semantic-conventions" "^1.29.0"
 
-"@opentelemetry/instrumentation-amqplib@0.51.0":
-  version "0.51.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-amqplib/-/instrumentation-amqplib-0.51.0.tgz#1779326433f1ab8a743bbf8e1957e1b1252cf036"
-  integrity sha512-XGmjYwjVRktD4agFnWBWQXo9SiYHKBxR6Ag3MLXwtLE4R99N3a08kGKM5SC1qOFKIELcQDGFEFT9ydXMH00Luw==
+"@opentelemetry/instrumentation-amqplib@0.55.0":
+  version "0.55.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-amqplib/-/instrumentation-amqplib-0.55.0.tgz#4d1afc47e7690693efa690ed06fbda3acc585a2f"
+  integrity sha512-5ULoU8p+tWcQw5PDYZn8rySptGSLZHNX/7srqo2TioPnAAcvTy6sQFQXsNPrAnyRRtYGMetXVyZUy5OaX1+IfA==
   dependencies:
     "@opentelemetry/core" "^2.0.0"
-    "@opentelemetry/instrumentation" "^0.204.0"
-    "@opentelemetry/semantic-conventions" "^1.27.0"
+    "@opentelemetry/instrumentation" "^0.208.0"
 
-"@opentelemetry/instrumentation-aws-sdk@0.59.0":
-  version "0.59.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-aws-sdk/-/instrumentation-aws-sdk-0.59.0.tgz#bd612836a6158f1773369a5646984b95f805273d"
-  integrity sha512-GN/9YGBMb//s0vnchM2jMCkCaIKDB/Piau72fcuqcDXNBffMgu+AA9vCHZD2umriciXLtXJ2GXTh2/yaaHwLIw==
+"@opentelemetry/instrumentation-aws-sdk@0.64.0":
+  version "0.64.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-aws-sdk/-/instrumentation-aws-sdk-0.64.0.tgz#714508bde88be99c936f2191c7ba7f54ccdb5bc0"
+  integrity sha512-8+Y8IcUfME5jD03LISBcd9sFipgOon2uAoiLKSCroiGD6MPuwMzqlVvhlKSzq7uxwtZIhR6CTmjCpLsCHum59A==
   dependencies:
     "@opentelemetry/core" "^2.0.0"
-    "@opentelemetry/instrumentation" "^0.204.0"
+    "@opentelemetry/instrumentation" "^0.208.0"
     "@opentelemetry/semantic-conventions" "^1.34.0"
 
-"@opentelemetry/instrumentation-connect@0.48.0":
-  version "0.48.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-connect/-/instrumentation-connect-0.48.0.tgz#4481c84315b33b54a67c6e787be0eb72a84b23b3"
-  integrity sha512-OMjc3SFL4pC16PeK+tDhwP7MRvDPalYCGSvGqUhX5rASkI2H0RuxZHOWElYeXkV0WP+70Gw6JHWac/2Zqwmhdw==
+"@opentelemetry/instrumentation-connect@0.52.0":
+  version "0.52.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-connect/-/instrumentation-connect-0.52.0.tgz#60cde91c548e9da4528ae47fe69af41d05eeb485"
+  integrity sha512-GXPxfNB5szMbV3I9b7kNWSmQBoBzw7MT0ui6iU/p+NIzVx3a06Ri2cdQO7tG9EKb4aKSLmfX9Cw5cKxXqX6Ohg==
   dependencies:
     "@opentelemetry/core" "^2.0.0"
-    "@opentelemetry/instrumentation" "^0.204.0"
+    "@opentelemetry/instrumentation" "^0.208.0"
     "@opentelemetry/semantic-conventions" "^1.27.0"
     "@types/connect" "3.4.38"
 
-"@opentelemetry/instrumentation-dataloader@0.22.0":
-  version "0.22.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-dataloader/-/instrumentation-dataloader-0.22.0.tgz#a34f8ac6ec18e8f1585dcd89f9f611570868d1a2"
-  integrity sha512-bXnTcwtngQsI1CvodFkTemrrRSQjAjZxqHVc+CJZTDnidT0T6wt3jkKhnsjU/Kkkc0lacr6VdRpCu2CUWa0OKw==
+"@opentelemetry/instrumentation-dataloader@0.26.0":
+  version "0.26.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-dataloader/-/instrumentation-dataloader-0.26.0.tgz#d10d22854ee8eac4471c82b8862b177a40f3bf8e"
+  integrity sha512-P2BgnFfTOarZ5OKPmYfbXfDFjQ4P9WkQ1Jji7yH5/WwB6Wm/knynAoA1rxbjWcDlYupFkyT0M1j6XLzDzy0aCA==
   dependencies:
-    "@opentelemetry/instrumentation" "^0.204.0"
+    "@opentelemetry/instrumentation" "^0.208.0"
 
-"@opentelemetry/instrumentation-express@0.53.0":
-  version "0.53.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-express/-/instrumentation-express-0.53.0.tgz#902634e3de640bd4fa5370924397e716608ecb90"
-  integrity sha512-r/PBafQmFYRjuxLYEHJ3ze1iBnP2GDA1nXOSS6E02KnYNZAVjj6WcDA1MSthtdAUUK0XnotHvvWM8/qz7DMO5A==
+"@opentelemetry/instrumentation-express@0.57.0":
+  version "0.57.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-express/-/instrumentation-express-0.57.0.tgz#7a2a7e90a84ad6c109f42c15acabdc7f6646a412"
+  integrity sha512-HAdx/o58+8tSR5iW+ru4PHnEejyKrAy9fYFhlEI81o10nYxrGahnMAHWiSjhDC7UQSY3I4gjcPgSKQz4rm/asg==
   dependencies:
     "@opentelemetry/core" "^2.0.0"
-    "@opentelemetry/instrumentation" "^0.204.0"
+    "@opentelemetry/instrumentation" "^0.208.0"
     "@opentelemetry/semantic-conventions" "^1.27.0"
 
-"@opentelemetry/instrumentation-fs@0.24.0":
-  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-fs/-/instrumentation-fs-0.24.0.tgz#edf0f7418f6a1cdcbe135857ab75629e7d94b910"
-  integrity sha512-HjIxJ6CBRD770KNVaTdMXIv29Sjz4C1kPCCK5x1Ujpc6SNnLGPqUVyJYZ3LUhhnHAqdbrl83ogVWjCgeT4Q0yw==
+"@opentelemetry/instrumentation-fs@0.28.0":
+  version "0.28.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-fs/-/instrumentation-fs-0.28.0.tgz#6387fb7c19213afa31a2eb1b646d6356b95176bf"
+  integrity sha512-FFvg8fq53RRXVBRHZViP+EMxMR03tqzEGpuq55lHNbVPyFklSVfQBN50syPhK5UYYwaStx0eyCtHtbRreusc5g==
   dependencies:
     "@opentelemetry/core" "^2.0.0"
-    "@opentelemetry/instrumentation" "^0.204.0"
+    "@opentelemetry/instrumentation" "^0.208.0"
 
-"@opentelemetry/instrumentation-generic-pool@0.48.0":
-  version "0.48.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-generic-pool/-/instrumentation-generic-pool-0.48.0.tgz#76fc08d76515db04f3833d730c5cb18cb0b237d4"
-  integrity sha512-TLv/On8pufynNR+pUbpkyvuESVASZZKMlqCm4bBImTpXKTpqXaJJ3o/MUDeMlM91rpen+PEv2SeyOKcHCSlgag==
+"@opentelemetry/instrumentation-generic-pool@0.52.0":
+  version "0.52.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-generic-pool/-/instrumentation-generic-pool-0.52.0.tgz#12b57774ca3664edb9649687674320955e025906"
+  integrity sha512-ISkNcv5CM2IwvsMVL31Tl61/p2Zm2I2NAsYq5SSBgOsOndT0TjnptjufYVScCnD5ZLD1tpl4T3GEYULLYOdIdQ==
   dependencies:
-    "@opentelemetry/instrumentation" "^0.204.0"
+    "@opentelemetry/instrumentation" "^0.208.0"
 
-"@opentelemetry/instrumentation-graphql@0.52.0":
-  version "0.52.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-graphql/-/instrumentation-graphql-0.52.0.tgz#a2d23a669bdd0a1b031f785fe447d5a34ac56343"
-  integrity sha512-3fEJ8jOOMwopvldY16KuzHbRhPk8wSsOTSF0v2psmOCGewh6ad+ZbkTx/xyUK9rUdUMWAxRVU0tFpj4Wx1vkPA==
+"@opentelemetry/instrumentation-graphql@0.56.0":
+  version "0.56.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-graphql/-/instrumentation-graphql-0.56.0.tgz#77464dec65efe5aa53d8787d0760534cf2e2a88f"
+  integrity sha512-IPvNk8AFoVzTAM0Z399t34VDmGDgwT6rIqCUug8P9oAGerl2/PEIYMPOl/rerPGu+q8gSWdmbFSjgg7PDVRd3Q==
   dependencies:
-    "@opentelemetry/instrumentation" "^0.204.0"
+    "@opentelemetry/instrumentation" "^0.208.0"
 
-"@opentelemetry/instrumentation-hapi@0.51.0":
-  version "0.51.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-hapi/-/instrumentation-hapi-0.51.0.tgz#879926dfbb2e1609cc8658392167b1456c75d9e0"
-  integrity sha512-qyf27DaFNL1Qhbo/da+04MSCw982B02FhuOS5/UF+PMhM61CcOiu7fPuXj8TvbqyReQuJFljXE6UirlvoT/62g==
+"@opentelemetry/instrumentation-hapi@0.55.0":
+  version "0.55.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-hapi/-/instrumentation-hapi-0.55.0.tgz#a687b9bddfcc484f2cc85f022c123f83c19883a4"
+  integrity sha512-prqAkRf9e4eEpy4G3UcR32prKE8NLNlA90TdEU1UsghOTg0jUvs40Jz8LQWFEs5NbLbXHYGzB4CYVkCI8eWEVQ==
   dependencies:
     "@opentelemetry/core" "^2.0.0"
-    "@opentelemetry/instrumentation" "^0.204.0"
+    "@opentelemetry/instrumentation" "^0.208.0"
     "@opentelemetry/semantic-conventions" "^1.27.0"
 
-"@opentelemetry/instrumentation-http@0.204.0":
-  version "0.204.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-http/-/instrumentation-http-0.204.0.tgz#faaf009b75e6a68729923b0a2a5270dc7d336f1d"
-  integrity sha512-1afJYyGRA4OmHTv0FfNTrTAzoEjPQUYgd+8ih/lX0LlZBnGio/O80vxA0lN3knsJPS7FiDrsDrWq25K7oAzbkw==
+"@opentelemetry/instrumentation-http@0.208.0":
+  version "0.208.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-http/-/instrumentation-http-0.208.0.tgz#64fcc02bfbc80eb3bbb91cd3c7e0e24c695f2bef"
+  integrity sha512-rhmK46DRWEbQQB77RxmVXGyjs6783crXCnFjYQj+4tDH/Kpv9Rbg3h2kaNyp5Vz2emF1f9HOQQvZoHzwMWOFZQ==
   dependencies:
-    "@opentelemetry/core" "2.1.0"
-    "@opentelemetry/instrumentation" "0.204.0"
+    "@opentelemetry/core" "2.2.0"
+    "@opentelemetry/instrumentation" "0.208.0"
     "@opentelemetry/semantic-conventions" "^1.29.0"
     forwarded-parse "2.1.2"
 
-"@opentelemetry/instrumentation-ioredis@0.52.0":
-  version "0.52.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-ioredis/-/instrumentation-ioredis-0.52.0.tgz#ca5d7b1a49798ed2d29a0f212a7ca5ef95c173c5"
-  integrity sha512-rUvlyZwI90HRQPYicxpDGhT8setMrlHKokCtBtZgYxQWRF5RBbG4q0pGtbZvd7kyseuHbFpA3I/5z7M8b/5ywg==
+"@opentelemetry/instrumentation-ioredis@0.56.0":
+  version "0.56.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-ioredis/-/instrumentation-ioredis-0.56.0.tgz#9b89cca6c3e440ae9e896f81dc6d2ab1dfee2581"
+  integrity sha512-XSWeqsd3rKSsT3WBz/JKJDcZD4QYElZEa0xVdX8f9dh4h4QgXhKRLorVsVkK3uXFbC2sZKAS2Ds+YolGwD83Dg==
   dependencies:
-    "@opentelemetry/instrumentation" "^0.204.0"
-    "@opentelemetry/redis-common" "^0.38.0"
-    "@opentelemetry/semantic-conventions" "^1.27.0"
+    "@opentelemetry/instrumentation" "^0.208.0"
+    "@opentelemetry/redis-common" "^0.38.2"
 
-"@opentelemetry/instrumentation-kafkajs@0.14.0":
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-kafkajs/-/instrumentation-kafkajs-0.14.0.tgz#ffc30728b5845907d2c5b9f3883676c754ef4927"
-  integrity sha512-kbB5yXS47dTIdO/lfbbXlzhvHFturbux4EpP0+6H78Lk0Bn4QXiZQW7rmZY1xBCY16mNcCb8Yt0mhz85hTnSVA==
+"@opentelemetry/instrumentation-kafkajs@0.18.0":
+  version "0.18.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-kafkajs/-/instrumentation-kafkajs-0.18.0.tgz#b836e6883afb7ca6df9fd3b6e024408dcc5e584b"
+  integrity sha512-KCL/1HnZN5zkUMgPyOxfGjLjbXjpd4odDToy+7c+UsthIzVLFf99LnfIBE8YSSrYE4+uS7OwJMhvhg3tWjqMBg==
   dependencies:
-    "@opentelemetry/instrumentation" "^0.204.0"
+    "@opentelemetry/instrumentation" "^0.208.0"
     "@opentelemetry/semantic-conventions" "^1.30.0"
 
-"@opentelemetry/instrumentation-knex@0.49.0":
-  version "0.49.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-knex/-/instrumentation-knex-0.49.0.tgz#8c04c80c00ead5fbdf600cd2460dcd21b4069157"
-  integrity sha512-NKsRRT27fbIYL4Ix+BjjP8h4YveyKc+2gD6DMZbr5R5rUeDqfC8+DTfIt3c3ex3BIc5Vvek4rqHnN7q34ZetLQ==
+"@opentelemetry/instrumentation-knex@0.53.0":
+  version "0.53.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-knex/-/instrumentation-knex-0.53.0.tgz#c2158c9259ff6789f6c2849bfd3c319edc0fcdf6"
+  integrity sha512-xngn5cH2mVXFmiT1XfQ1aHqq1m4xb5wvU6j9lSgLlihJ1bXzsO543cpDwjrZm2nMrlpddBf55w8+bfS4qDh60g==
   dependencies:
-    "@opentelemetry/instrumentation" "^0.204.0"
+    "@opentelemetry/instrumentation" "^0.208.0"
     "@opentelemetry/semantic-conventions" "^1.33.1"
 
-"@opentelemetry/instrumentation-koa@0.52.0":
-  version "0.52.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-koa/-/instrumentation-koa-0.52.0.tgz#7266785ea85334366c3e50dc2b45468df438eb3f"
-  integrity sha512-JJSBYLDx/mNSy8Ibi/uQixu2rH0bZODJa8/cz04hEhRaiZQoeJ5UrOhO/mS87IdgVsHrnBOsZ6vDu09znupyuA==
+"@opentelemetry/instrumentation-koa@0.57.0":
+  version "0.57.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-koa/-/instrumentation-koa-0.57.0.tgz#9a9edcde7de472f7f03904c00d31d87c6ee0ee42"
+  integrity sha512-3JS8PU/D5E3q295mwloU2v7c7/m+DyCqdu62BIzWt+3u9utjxC9QS7v6WmUNuoDN3RM+Q+D1Gpj13ERo+m7CGg==
   dependencies:
     "@opentelemetry/core" "^2.0.0"
-    "@opentelemetry/instrumentation" "^0.204.0"
-    "@opentelemetry/semantic-conventions" "^1.27.0"
+    "@opentelemetry/instrumentation" "^0.208.0"
+    "@opentelemetry/semantic-conventions" "^1.36.0"
 
-"@opentelemetry/instrumentation-lru-memoizer@0.49.0":
-  version "0.49.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-lru-memoizer/-/instrumentation-lru-memoizer-0.49.0.tgz#6353b877628339e3f07189f4fb15919a73fe1503"
-  integrity sha512-ctXu+O/1HSadAxtjoEg2w307Z5iPyLOMM8IRNwjaKrIpNAthYGSOanChbk1kqY6zU5CrpkPHGdAT6jk8dXiMqw==
+"@opentelemetry/instrumentation-lru-memoizer@0.53.0":
+  version "0.53.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-lru-memoizer/-/instrumentation-lru-memoizer-0.53.0.tgz#936c05263b719ee66999a9240b82fded044ebd2c"
+  integrity sha512-LDwWz5cPkWWr0HBIuZUjslyvijljTwmwiItpMTHujaULZCxcYE9eU44Qf/pbVC8TulT0IhZi+RoGvHKXvNhysw==
   dependencies:
-    "@opentelemetry/instrumentation" "^0.204.0"
+    "@opentelemetry/instrumentation" "^0.208.0"
 
-"@opentelemetry/instrumentation-mongodb@0.57.0":
-  version "0.57.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-mongodb/-/instrumentation-mongodb-0.57.0.tgz#e697261b2eac05280134e1851b72c89d5b4b3da8"
-  integrity sha512-KD6Rg0KSHWDkik+qjIOWoksi1xqSpix8TSPfquIK1DTmd9OTFb5PHmMkzJe16TAPVEuElUW8gvgP59cacFcrMQ==
+"@opentelemetry/instrumentation-mongodb@0.61.0":
+  version "0.61.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-mongodb/-/instrumentation-mongodb-0.61.0.tgz#4db130d537d630c3089115d2d214d29bcfb49f41"
+  integrity sha512-OV3i2DSoY5M/pmLk+68xr5RvkHU8DRB3DKMzYJdwDdcxeLs62tLbkmRyqJZsYf3Ht7j11rq35pHOWLuLzXL7pQ==
   dependencies:
-    "@opentelemetry/instrumentation" "^0.204.0"
-    "@opentelemetry/semantic-conventions" "^1.27.0"
+    "@opentelemetry/instrumentation" "^0.208.0"
 
-"@opentelemetry/instrumentation-mongoose@0.51.0":
-  version "0.51.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-mongoose/-/instrumentation-mongoose-0.51.0.tgz#688e9f3448e3d0979c4aaab5b566e14f30a1aa72"
-  integrity sha512-gwWaAlhhV2By7XcbyU3DOLMvzsgeaymwP/jktDC+/uPkCmgB61zurwqOQdeiRq9KAf22Y2dtE5ZLXxytJRbEVA==
+"@opentelemetry/instrumentation-mongoose@0.55.0":
+  version "0.55.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-mongoose/-/instrumentation-mongoose-0.55.0.tgz#e6851aba996b23b9709143c2b640084e92313dea"
+  integrity sha512-5afj0HfF6aM6Nlqgu6/PPHFk8QBfIe3+zF9FGpX76jWPS0/dujoEYn82/XcLSaW5LPUDW8sni+YeK0vTBNri+w==
   dependencies:
     "@opentelemetry/core" "^2.0.0"
-    "@opentelemetry/instrumentation" "^0.204.0"
-    "@opentelemetry/semantic-conventions" "^1.27.0"
+    "@opentelemetry/instrumentation" "^0.208.0"
 
-"@opentelemetry/instrumentation-mysql2@0.51.0":
-  version "0.51.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-mysql2/-/instrumentation-mysql2-0.51.0.tgz#7eec3a0b9e4b27759df5df1c82eaedcf34b27528"
-  integrity sha512-zT2Wg22Xn43RyfU3NOUmnFtb5zlDI0fKcijCj9AcK9zuLZ4ModgtLXOyBJSSfO+hsOCZSC1v/Fxwj+nZJFdzLQ==
+"@opentelemetry/instrumentation-mysql2@0.55.0":
+  version "0.55.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-mysql2/-/instrumentation-mysql2-0.55.0.tgz#a0957590aa8d402d1debd10e42d7b5da359164ec"
+  integrity sha512-0cs8whQG55aIi20gnK8B7cco6OK6N+enNhW0p5284MvqJ5EPi+I1YlWsWXgzv/V2HFirEejkvKiI4Iw21OqDWg==
   dependencies:
-    "@opentelemetry/instrumentation" "^0.204.0"
-    "@opentelemetry/semantic-conventions" "^1.27.0"
-    "@opentelemetry/sql-common" "^0.41.0"
+    "@opentelemetry/instrumentation" "^0.208.0"
+    "@opentelemetry/semantic-conventions" "^1.33.0"
+    "@opentelemetry/sql-common" "^0.41.2"
 
-"@opentelemetry/instrumentation-mysql@0.50.0":
-  version "0.50.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-mysql/-/instrumentation-mysql-0.50.0.tgz#25de9de05191cecf8b01df379544eba50fa6f548"
-  integrity sha512-duKAvMRI3vq6u9JwzIipY9zHfikN20bX05sL7GjDeLKr2qV0LQ4ADtKST7KStdGcQ+MTN5wghWbbVdLgNcB3rA==
+"@opentelemetry/instrumentation-mysql@0.54.0":
+  version "0.54.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-mysql/-/instrumentation-mysql-0.54.0.tgz#6181ae097a2b5501049c518fe90393e1f136341d"
+  integrity sha512-bqC1YhnwAeWmRzy1/Xf9cDqxNG2d/JDkaxnqF5N6iJKN1eVWI+vg7NfDkf52/Nggp3tl1jcC++ptC61BD6738A==
   dependencies:
-    "@opentelemetry/instrumentation" "^0.204.0"
-    "@opentelemetry/semantic-conventions" "^1.27.0"
+    "@opentelemetry/instrumentation" "^0.208.0"
     "@types/mysql" "2.15.27"
 
-"@opentelemetry/instrumentation-nestjs-core@0.50.0":
-  version "0.50.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-nestjs-core/-/instrumentation-nestjs-core-0.50.0.tgz#f803bbeb6c972ac8f0685885cca7f6e5a4e09056"
-  integrity sha512-10u2Gjw260W8vdUem6pM7ENrb8i+UAyrgouhjN7HRdQYh9rcit51tRhgrI52fxTsRjrrBNIItHkX0YM8WnEU2w==
+"@opentelemetry/instrumentation-nestjs-core@0.55.0":
+  version "0.55.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-nestjs-core/-/instrumentation-nestjs-core-0.55.0.tgz#820391be7ed2b699b49fef55b78619832ac0e0ae"
+  integrity sha512-JFLNhbbEGnnQrMKOYoXx0nNk5N9cPeghu4xP/oup40a7VaSeYruyOiFbg9nkbS4ZQiI8aMuRqUT3Mo4lQjKEKg==
   dependencies:
-    "@opentelemetry/instrumentation" "^0.204.0"
+    "@opentelemetry/instrumentation" "^0.208.0"
     "@opentelemetry/semantic-conventions" "^1.30.0"
 
-"@opentelemetry/instrumentation-pg@0.57.0":
-  version "0.57.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-pg/-/instrumentation-pg-0.57.0.tgz#346cb613ccd1100221cef9692271468a3fe92eb0"
-  integrity sha512-dWLGE+r5lBgm2A8SaaSYDE3OKJ/kwwy5WLyGyzor8PLhUL9VnJRiY6qhp4njwhnljiLtzeffRtG2Mf/YyWLeTw==
+"@opentelemetry/instrumentation-pg@0.61.0":
+  version "0.61.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-pg/-/instrumentation-pg-0.61.0.tgz#c755d00dba640e229fe50f817423dcf3376957ab"
+  integrity sha512-UeV7KeTnRSM7ECHa3YscoklhUtTQPs6V6qYpG283AB7xpnPGCUCUfECFT9jFg6/iZOQTt3FHkB1wGTJCNZEvPw==
   dependencies:
     "@opentelemetry/core" "^2.0.0"
-    "@opentelemetry/instrumentation" "^0.204.0"
+    "@opentelemetry/instrumentation" "^0.208.0"
     "@opentelemetry/semantic-conventions" "^1.34.0"
-    "@opentelemetry/sql-common" "^0.41.0"
-    "@types/pg" "8.15.5"
+    "@opentelemetry/sql-common" "^0.41.2"
+    "@types/pg" "8.15.6"
     "@types/pg-pool" "2.0.6"
 
-"@opentelemetry/instrumentation-redis@0.53.0":
-  version "0.53.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-redis/-/instrumentation-redis-0.53.0.tgz#826cfeacebaf7ce571bb932ad410f23caf170b9c"
-  integrity sha512-WUHV8fr+8yo5RmzyU7D5BIE1zwiaNQcTyZPwtxlfr7px6NYYx7IIpSihJK7WA60npWynfxxK1T67RAVF0Gdfjg==
+"@opentelemetry/instrumentation-redis@0.57.0":
+  version "0.57.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-redis/-/instrumentation-redis-0.57.0.tgz#c6996eb8ace9cb16cf5be3db3a6b0fb599f47fab"
+  integrity sha512-bCxTHQFXzrU3eU1LZnOZQ3s5LURxQPDlU3/upBzlWY77qOI1GZuGofazj3jtzjctMJeBEJhNwIFEgRPBX1kp/Q==
   dependencies:
-    "@opentelemetry/instrumentation" "^0.204.0"
-    "@opentelemetry/redis-common" "^0.38.0"
+    "@opentelemetry/instrumentation" "^0.208.0"
+    "@opentelemetry/redis-common" "^0.38.2"
     "@opentelemetry/semantic-conventions" "^1.27.0"
 
-"@opentelemetry/instrumentation-tedious@0.23.0":
-  version "0.23.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-tedious/-/instrumentation-tedious-0.23.0.tgz#a781de2cb33ff71ef65bbefba11c9fe2d79c4b32"
-  integrity sha512-3TMTk/9VtlRonVTaU4tCzbg4YqW+Iq/l5VnN2e5whP6JgEg/PKfrGbqQ+CxQWNLfLaQYIUgEZqAn5gk/inh1uQ==
+"@opentelemetry/instrumentation-tedious@0.27.0":
+  version "0.27.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-tedious/-/instrumentation-tedious-0.27.0.tgz#f4ba662fd17edde80f1b14d0dc4c42c7fa4a3139"
+  integrity sha512-jRtyUJNZppPBjPae4ZjIQ2eqJbcRaRfJkr0lQLHFmOU/no5A6e9s1OHLd5XZyZoBJ/ymngZitanyRRA5cniseA==
   dependencies:
-    "@opentelemetry/instrumentation" "^0.204.0"
-    "@opentelemetry/semantic-conventions" "^1.27.0"
+    "@opentelemetry/instrumentation" "^0.208.0"
     "@types/tedious" "^4.0.14"
 
-"@opentelemetry/instrumentation-undici@0.15.0":
-  version "0.15.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-undici/-/instrumentation-undici-0.15.0.tgz#c8193a162d4abe61c2fd247912e0cb8c0c3bc10c"
-  integrity sha512-sNFGA/iCDlVkNjzTzPRcudmI11vT/WAfAguRdZY9IspCw02N4WSC72zTuQhSMheh2a1gdeM9my1imnKRvEEvEg==
+"@opentelemetry/instrumentation-undici@0.19.0":
+  version "0.19.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-undici/-/instrumentation-undici-0.19.0.tgz#a9db59a7630261269239d17d2990d406e2ecddf8"
+  integrity sha512-Pst/RhR61A2OoZQZkn6OLpdVpXp6qn3Y92wXa6umfJe9rV640r4bc6SWvw4pPN6DiQqPu2c8gnSSZPDtC6JlpQ==
   dependencies:
     "@opentelemetry/core" "^2.0.0"
-    "@opentelemetry/instrumentation" "^0.204.0"
-
-"@opentelemetry/instrumentation@0.204.0", "@opentelemetry/instrumentation@^0.204.0":
-  version "0.204.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation/-/instrumentation-0.204.0.tgz#587c104c02c9ccb38932ce508d9c81514ec7a7c4"
-  integrity sha512-vV5+WSxktzoMP8JoYWKeopChy6G3HKk4UQ2hESCRDUUTZqQ3+nM3u8noVG0LmNfRWwcFBnbZ71GKC7vaYYdJ1g==
-  dependencies:
-    "@opentelemetry/api-logs" "0.204.0"
-    import-in-the-middle "^1.8.1"
-    require-in-the-middle "^7.1.1"
-
-"@opentelemetry/instrumentation@^0.52.0 || ^0.53.0 || ^0.54.0 || ^0.55.0 || ^0.56.0 || ^0.57.0":
-  version "0.57.2"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation/-/instrumentation-0.57.2.tgz#8924549d7941ba1b5c6f04d5529cf48330456d1d"
-  integrity sha512-BdBGhQBh8IjZ2oIIX6F2/Q3LKm/FDDKi6ccYKcBTeilh6SNdNKveDOLk73BkSJjQLJk6qe4Yh+hHw1UPhCDdrg==
-  dependencies:
-    "@opentelemetry/api-logs" "0.57.2"
-    "@types/shimmer" "^1.2.0"
-    import-in-the-middle "^1.8.1"
-    require-in-the-middle "^7.1.1"
-    semver "^7.5.2"
-    shimmer "^1.2.1"
-
-"@opentelemetry/redis-common@^0.38.0":
-  version "0.38.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/redis-common/-/redis-common-0.38.0.tgz#87d2a792dcbcf466a41bb7dfb8a7cd094d643d0b"
-  integrity sha512-4Wc0AWURII2cfXVVoZ6vDqK+s5n4K5IssdrlVrvGsx6OEOKdghKtJZqXAHWFiZv4nTDLH2/2fldjIHY8clMOjQ==
-
-"@opentelemetry/resources@2.1.0", "@opentelemetry/resources@^2.1.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/resources/-/resources-2.1.0.tgz#11772e732af4f27953cf55567a6630d8b4d8282d"
-  integrity sha512-1CJjf3LCvoefUOgegxi8h6r4B/wLSzInyhGP2UmIBYNlo4Qk5CZ73e1eEyWmfXvFtm1ybkmfb2DqWvspsYLrWw==
+    "@opentelemetry/instrumentation" "^0.208.0"
+    "@opentelemetry/semantic-conventions" "^1.24.0"
+
+"@opentelemetry/instrumentation@0.208.0", "@opentelemetry/instrumentation@>=0.52.0 <1", "@opentelemetry/instrumentation@^0.208.0":
+  version "0.208.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation/-/instrumentation-0.208.0.tgz#d764f8e4329dad50804e2e98f010170c14c4ce8f"
+  integrity sha512-Eju0L4qWcQS+oXxi6pgh7zvE2byogAkcsVv0OjHF/97iOz1N/aKE6etSGowYkie+YA1uo6DNwdSxaaNnLvcRlA==
+  dependencies:
+    "@opentelemetry/api-logs" "0.208.0"
+    import-in-the-middle "^2.0.0"
+    require-in-the-middle "^8.0.0"
+
+"@opentelemetry/redis-common@^0.38.2":
+  version "0.38.2"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/redis-common/-/redis-common-0.38.2.tgz#cefa4f3e79db1cd54f19e233b7dfb56621143955"
+  integrity sha512-1BCcU93iwSRZvDAgwUxC/DV4T/406SkMfxGqu5ojc3AvNI+I9GhV7v0J1HljsczuuhcnFLYqD5VmwVXfCGHzxA==
+
+"@opentelemetry/resources@2.2.0", "@opentelemetry/resources@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/resources/-/resources-2.2.0.tgz#b90a950ad98551295b76ea8a0e7efe45a179badf"
+  integrity sha512-1pNQf/JazQTMA0BiO5NINUzH0cbLbbl7mntLa4aJNmCCXSj0q03T5ZXXL0zw4G55TjdL9Tz32cznGClf+8zr5A==
   dependencies:
-    "@opentelemetry/core" "2.1.0"
+    "@opentelemetry/core" "2.2.0"
     "@opentelemetry/semantic-conventions" "^1.29.0"
 
-"@opentelemetry/sdk-trace-base@^2.1.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-base/-/sdk-trace-base-2.1.0.tgz#9d31474824e9ed215f94bf71260d5321f64d402a"
-  integrity sha512-uTX9FBlVQm4S2gVQO1sb5qyBLq/FPjbp+tmGoxu4tIgtYGmBYB44+KX/725RFDe30yBSaA9Ml9fqphe1hbUyLQ==
+"@opentelemetry/sdk-trace-base@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-base/-/sdk-trace-base-2.2.0.tgz#ddef9a0afd01a623d8625a3529f2137b05e67d0b"
+  integrity sha512-xWQgL0Bmctsalg6PaXExmzdedSp3gyKV8mQBwK/j9VGdCDu2fmXIb2gAehBKbkXCpJ4HPkgv3QfoJWRT4dHWbw==
   dependencies:
-    "@opentelemetry/core" "2.1.0"
-    "@opentelemetry/resources" "2.1.0"
+    "@opentelemetry/core" "2.2.0"
+    "@opentelemetry/resources" "2.2.0"
     "@opentelemetry/semantic-conventions" "^1.29.0"
 
-"@opentelemetry/semantic-conventions@^1.27.0", "@opentelemetry/semantic-conventions@^1.29.0", "@opentelemetry/semantic-conventions@^1.30.0", "@opentelemetry/semantic-conventions@^1.33.1", "@opentelemetry/semantic-conventions@^1.34.0", "@opentelemetry/semantic-conventions@^1.37.0":
-  version "1.37.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.37.0.tgz#aa2b4fa0b910b66a050c5ddfcac1d262e91a321a"
-  integrity sha512-JD6DerIKdJGmRp4jQyX5FlrQjA4tjOw1cvfsPAZXfOOEErMUHjPcPSICS+6WnM0nB0efSFARh0KAZss+bvExOA==
+"@opentelemetry/semantic-conventions@^1.24.0", "@opentelemetry/semantic-conventions@^1.27.0", "@opentelemetry/semantic-conventions@^1.29.0", "@opentelemetry/semantic-conventions@^1.30.0", "@opentelemetry/semantic-conventions@^1.33.0", "@opentelemetry/semantic-conventions@^1.33.1", "@opentelemetry/semantic-conventions@^1.34.0", "@opentelemetry/semantic-conventions@^1.36.0", "@opentelemetry/semantic-conventions@^1.37.0":
+  version "1.38.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.38.0.tgz#8b5f415395a7ddb7c8e0c7932171deb9278df1a3"
+  integrity sha512-kocjix+/sSggfJhwXqClZ3i9Y/MI0fp7b+g7kCRm6psy2dsf8uApTRclwG18h8Avm7C9+fnt+O36PspJ/OzoWg==
 
-"@opentelemetry/sql-common@^0.41.0":
-  version "0.41.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/sql-common/-/sql-common-0.41.0.tgz#7ddef1ea7fb6338dcca8a9d2485c7dfd53c076b4"
-  integrity sha512-pmzXctVbEERbqSfiAgdes9Y63xjoOyXcD7B6IXBkVb+vbM7M9U98mn33nGXxPf4dfYR0M+vhcKRZmbSJ7HfqFA==
+"@opentelemetry/sql-common@^0.41.2":
+  version "0.41.2"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/sql-common/-/sql-common-0.41.2.tgz#7f4a14166cfd6c9ffe89096db1cc75eaf6443b19"
+  integrity sha512-4mhWm3Z8z+i508zQJ7r6Xi7y4mmoJpdvH0fZPFRkWrdp5fq7hhZ2HhYokEOLkfqSMgPR4Z9EyB3DBkbKGOqZiQ==
   dependencies:
     "@opentelemetry/core" "^2.0.0"
 
@@ -6456,12 +6432,12 @@
   dependencies:
     "@prisma/debug" "6.15.0"
 
-"@prisma/instrumentation@6.15.0":
-  version "6.15.0"
-  resolved "https://registry.yarnpkg.com/@prisma/instrumentation/-/instrumentation-6.15.0.tgz#40b066dc6b1ea621aa5ae0fd6d54319550b7d8c9"
-  integrity sha512-6TXaH6OmDkMOQvOxwLZ8XS51hU2v4A3vmE2pSijCIiGRJYyNeMcL6nMHQMyYdZRD8wl7LF3Wzc+AMPMV/9Oo7A==
+"@prisma/instrumentation@6.19.0":
+  version "6.19.0"
+  resolved "https://registry.yarnpkg.com/@prisma/instrumentation/-/instrumentation-6.19.0.tgz#46d15adc8bc4a5a3167032eea6d0a7aa64fb7d93"
+  integrity sha512-QcuYy25pkXM8BJ37wVFBO7Zh34nyRV1GOb2n3lPkkbRYfl4hWl3PTcImP41P0KrzVXfa/45p6eVCos27x3exIg==
   dependencies:
-    "@opentelemetry/instrumentation" "^0.52.0 || ^0.53.0 || ^0.54.0 || ^0.55.0 || ^0.56.0 || ^0.57.0"
+    "@opentelemetry/instrumentation" ">=0.52.0 <1"
 
 "@protobuf-ts/plugin-framework@^2.0.7", "@protobuf-ts/plugin-framework@^2.9.4":
   version "2.9.4"
@@ -8947,10 +8923,10 @@
   dependencies:
     "@types/pg" "*"
 
-"@types/pg@*", "@types/pg@8.15.5", "@types/pg@^8.6.5":
-  version "8.15.5"
-  resolved "https://registry.yarnpkg.com/@types/pg/-/pg-8.15.5.tgz#ef43e0f33b62dac95cae2f042888ec7980b30c09"
-  integrity sha512-LF7lF6zWEKxuT3/OR8wAZGzkg4ENGXFNyiV/JeOt9z5B+0ZVwbql9McqX5c/WStFq1GaGso7H1AzP/qSzmlCKQ==
+"@types/pg@*", "@types/pg@8.15.6", "@types/pg@^8.6.5":
+  version "8.15.6"
+  resolved "https://registry.yarnpkg.com/@types/pg/-/pg-8.15.6.tgz#4df7590b9ac557cbe5479e0074ec1540cbddad9b"
+  integrity sha512-NoaMtzhxOrubeL/7UZuNTrejB4MPAJ0RpxZqXQf2qXuVlTPuG6Y8p4u9dKRaue4yjmC7ZhzVO2/Yyyn25znrPQ==
   dependencies:
     "@types/node" "*"
     pg-protocol "*"
@@ -9097,11 +9073,6 @@
     "@types/mime" "*"
     "@types/node" "*"
 
-"@types/shimmer@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@types/shimmer/-/shimmer-1.2.0.tgz#9b706af96fa06416828842397a70dfbbf1c14ded"
-  integrity sha512-UE7oxhQLLd9gub6JKIAhDq06T0F6FnztwMNRvYgjeQSBeMc1ZG/tA47EwfduvkuQS8apbkM/lpLpWsaCeYsXVg==
-
 "@types/sinon@^17.0.3":
   version "17.0.3"
   resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-17.0.3.tgz#9aa7e62f0a323b9ead177ed23a36ea757141a5fa"
@@ -19113,10 +19084,10 @@ import-fresh@^3.0.0, import-fresh@^3.2.1:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
 
-import-in-the-middle@^1.14.2, import-in-the-middle@^1.8.1:
-  version "1.14.2"
-  resolved "https://registry.yarnpkg.com/import-in-the-middle/-/import-in-the-middle-1.14.2.tgz#283661625a88ff7c0462bd2984f77715c3bc967c"
-  integrity sha512-5tCuY9BV8ujfOpwtAGgsTx9CGUapcFMEEyByLv1B+v2+6DhAcw+Zr0nhQT7uwaZ7DiourxFEscghOR8e1aPLQw==
+import-in-the-middle@^2, import-in-the-middle@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/import-in-the-middle/-/import-in-the-middle-2.0.0.tgz#295948cee94d0565314824c6bd75379d13e5b1a5"
+  integrity sha512-yNZhyQYqXpkT0AKq3F3KLasUSK4fHvebNH5hOsKQw2dhGSALvQ4U0BqUc5suziKvydO5u5hgN2hy1RJaho8U5A==
   dependencies:
     acorn "^8.14.0"
     acorn-import-attributes "^1.9.5"
@@ -26741,14 +26712,13 @@ require-from-string@^2.0.2:
   resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
   integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
 
-require-in-the-middle@^7.1.1:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/require-in-the-middle/-/require-in-the-middle-7.2.0.tgz#b539de8f00955444dc8aed95e17c69b0a4f10fcf"
-  integrity sha512-3TLx5TGyAY6AOqLBoXmHkNql0HIf2RGbuMgCDT2WO/uGVAPJs6h7Kl+bN6TIZGd9bWhWPwnDnTHGtW8Iu77sdw==
+require-in-the-middle@^8.0.0:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/require-in-the-middle/-/require-in-the-middle-8.0.1.tgz#dbde2587f669398626d56b20c868ab87bf01cce4"
+  integrity sha512-QT7FVMXfWOYFbeRBF6nu+I6tr2Tf3u0q8RIEjNob/heKY/nh7drD/k7eeMFmSQgnTtCzLDcCu/XEnpW2wk4xCQ==
   dependencies:
-    debug "^4.1.1"
+    debug "^4.3.5"
     module-details-from-path "^1.0.3"
-    resolve "^1.22.1"
 
 require-package-name@^2.0.1:
   version "2.0.1"
@@ -27487,7 +27457,7 @@ semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0, semve
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.0.0, semver@^7.1.1, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.0, semver@^7.5.2, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.6.2, semver@^7.6.3, semver@^7.7.2:
+semver@^7.0.0, semver@^7.1.1, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.0, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.6.2, semver@^7.6.3, semver@^7.7.2:
   version "7.7.2"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.2.tgz#67d99fdcd35cec21e6f8b87a7fd515a33f982b58"
   integrity sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==
@@ -27773,11 +27743,6 @@ shikiji@^0.9.12:
   dependencies:
     shikiji-core "0.9.19"
 
-shimmer@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337"
-  integrity sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==
-
 side-channel-list@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/side-channel-list/-/side-channel-list-1.0.0.tgz#10cb5984263115d3b7a0e336591e290a830af8ad"

From 5e7cd0687fc242201f7f1dbf36de5ae686e9ca54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Bignon?= <bignon.cedric@gmail.com>
Date: Mon, 24 Nov 2025 10:02:04 +0100
Subject: [PATCH 113/186] feat(node): Add tracing support for AzureOpenAI
 (#18281)

This pull request adds the support to Azure OpenAI client in addition to
the existing support of the vanilla OpenAI client.

Fixes issue #18280
---
 .../tracing/openai/scenario-azure-openai.mjs  | 64 +++++++++++++++++++
 .../suites/tracing/openai/test.ts             | 47 ++++++++++++++
 .../openai/v6/scenario-azure-openai.mjs       | 64 +++++++++++++++++++
 .../suites/tracing/openai/v6/test.ts          | 58 +++++++++++++++++
 .../tracing/openai/instrumentation.ts         | 22 +++++--
 5 files changed, 251 insertions(+), 4 deletions(-)
 create mode 100644 dev-packages/node-integration-tests/suites/tracing/openai/scenario-azure-openai.mjs
 create mode 100644 dev-packages/node-integration-tests/suites/tracing/openai/v6/scenario-azure-openai.mjs

diff --git a/dev-packages/node-integration-tests/suites/tracing/openai/scenario-azure-openai.mjs b/dev-packages/node-integration-tests/suites/tracing/openai/scenario-azure-openai.mjs
new file mode 100644
index 000000000000..6d519ae8b313
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/openai/scenario-azure-openai.mjs
@@ -0,0 +1,64 @@
+import express from 'express';
+import { AzureOpenAI } from 'openai';
+
+function startMockOpenAiServer() {
+  const app = express();
+  app.use(express.json());
+
+  app.post('/azureopenai/deployments/:model/chat/completions', (req, res) => {
+    res.send({
+      id: 'chatcmpl-mock123',
+      object: 'chat.completion',
+      created: 1677652288,
+      model: req.body.model,
+      system_fingerprint: 'fp_44709d6fcb',
+      choices: [
+        {
+          index: 0,
+          message: {
+            role: 'assistant',
+            content: 'Hello from OpenAI mock!',
+          },
+          finish_reason: 'stop',
+        },
+      ],
+      usage: {
+        prompt_tokens: 10,
+        completion_tokens: 15,
+        total_tokens: 25,
+      },
+    });
+  });
+  return new Promise(resolve => {
+    const server = app.listen(0, () => {
+      resolve(server);
+    });
+  });
+}
+
+async function run() {
+  const server = await startMockOpenAiServer();
+
+  const client = new AzureOpenAI({
+    baseURL: `http://localhost:${server.address().port}/azureopenai`,
+    apiKey: 'mock-api-key',
+    apiVersion: '2024-02-15-preview',
+  });
+
+  const response = await client.chat.completions.create({
+    model: 'gpt-3.5-turbo',
+    messages: [
+      { role: 'system', content: 'You are a helpful assistant.' },
+      { role: 'user', content: 'What is the capital of France?' },
+    ],
+    temperature: 0.7,
+    max_tokens: 100,
+  });
+
+  // eslint-disable-next-line no-console
+  console.log(JSON.stringify(response));
+
+  server.close();
+}
+
+run();
diff --git a/dev-packages/node-integration-tests/suites/tracing/openai/test.ts b/dev-packages/node-integration-tests/suites/tracing/openai/test.ts
index 116c3a6208fa..a0436d9e5a8b 100644
--- a/dev-packages/node-integration-tests/suites/tracing/openai/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/openai/test.ts
@@ -501,6 +501,53 @@ describe('OpenAI integration', () => {
     });
   });
 
+  createEsmAndCjsTests(__dirname, 'scenario-azure-openai.mjs', 'instrument.mjs', (createRunner, test) => {
+    test('it works with Azure OpenAI', async () => {
+      await createRunner()
+        // First the span that our mock express server is emitting, unrelated to this test
+        .expect({
+          transaction: {
+            transaction: 'POST /azureopenai/deployments/:model/chat/completions',
+          },
+        })
+        .expect({
+          transaction: {
+            transaction: 'chat gpt-3.5-turbo',
+            contexts: {
+              trace: {
+                span_id: expect.any(String),
+                trace_id: expect.any(String),
+                data: {
+                  'gen_ai.operation.name': 'chat',
+                  'sentry.op': 'gen_ai.chat',
+                  'sentry.origin': 'auto.ai.openai',
+                  'gen_ai.system': 'openai',
+                  'gen_ai.request.model': 'gpt-3.5-turbo',
+                  'gen_ai.request.temperature': 0.7,
+                  'gen_ai.response.model': 'gpt-3.5-turbo',
+                  'gen_ai.response.id': 'chatcmpl-mock123',
+                  'gen_ai.response.finish_reasons': '["stop"]',
+                  'gen_ai.usage.input_tokens': 10,
+                  'gen_ai.usage.output_tokens': 15,
+                  'gen_ai.usage.total_tokens': 25,
+                  'openai.response.id': 'chatcmpl-mock123',
+                  'openai.response.model': 'gpt-3.5-turbo',
+                  'openai.response.timestamp': '2023-03-01T06:31:28.000Z',
+                  'openai.usage.completion_tokens': 15,
+                  'openai.usage.prompt_tokens': 10,
+                },
+                op: 'gen_ai.chat',
+                origin: 'auto.ai.openai',
+                status: 'ok',
+              },
+            },
+          },
+        })
+        .start()
+        .completed();
+    });
+  });
+
   createEsmAndCjsTests(
     __dirname,
     'truncation/scenario-message-truncation-completions.mjs',
diff --git a/dev-packages/node-integration-tests/suites/tracing/openai/v6/scenario-azure-openai.mjs b/dev-packages/node-integration-tests/suites/tracing/openai/v6/scenario-azure-openai.mjs
new file mode 100644
index 000000000000..6d519ae8b313
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/openai/v6/scenario-azure-openai.mjs
@@ -0,0 +1,64 @@
+import express from 'express';
+import { AzureOpenAI } from 'openai';
+
+function startMockOpenAiServer() {
+  const app = express();
+  app.use(express.json());
+
+  app.post('/azureopenai/deployments/:model/chat/completions', (req, res) => {
+    res.send({
+      id: 'chatcmpl-mock123',
+      object: 'chat.completion',
+      created: 1677652288,
+      model: req.body.model,
+      system_fingerprint: 'fp_44709d6fcb',
+      choices: [
+        {
+          index: 0,
+          message: {
+            role: 'assistant',
+            content: 'Hello from OpenAI mock!',
+          },
+          finish_reason: 'stop',
+        },
+      ],
+      usage: {
+        prompt_tokens: 10,
+        completion_tokens: 15,
+        total_tokens: 25,
+      },
+    });
+  });
+  return new Promise(resolve => {
+    const server = app.listen(0, () => {
+      resolve(server);
+    });
+  });
+}
+
+async function run() {
+  const server = await startMockOpenAiServer();
+
+  const client = new AzureOpenAI({
+    baseURL: `http://localhost:${server.address().port}/azureopenai`,
+    apiKey: 'mock-api-key',
+    apiVersion: '2024-02-15-preview',
+  });
+
+  const response = await client.chat.completions.create({
+    model: 'gpt-3.5-turbo',
+    messages: [
+      { role: 'system', content: 'You are a helpful assistant.' },
+      { role: 'user', content: 'What is the capital of France?' },
+    ],
+    temperature: 0.7,
+    max_tokens: 100,
+  });
+
+  // eslint-disable-next-line no-console
+  console.log(JSON.stringify(response));
+
+  server.close();
+}
+
+run();
diff --git a/dev-packages/node-integration-tests/suites/tracing/openai/v6/test.ts b/dev-packages/node-integration-tests/suites/tracing/openai/v6/test.ts
index 053f3066a1b0..4929325c6790 100644
--- a/dev-packages/node-integration-tests/suites/tracing/openai/v6/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/openai/v6/test.ts
@@ -562,4 +562,62 @@ describe('OpenAI integration (V6)', () => {
       },
     },
   );
+
+  createEsmAndCjsTests(
+    __dirname,
+    'scenario-azure-openai.mjs',
+    'instrument.mjs',
+    (createRunner, test) => {
+      test('it works with Azure OpenAI (v6)', async () => {
+        await createRunner()
+          // First the span that our mock express server is emitting, unrelated to this test
+          .expect({
+            transaction: {
+              transaction: 'POST /azureopenai/deployments/:model/chat/completions',
+            },
+          })
+          .expect({
+            transaction: {
+              transaction: 'chat gpt-3.5-turbo',
+              contexts: {
+                trace: {
+                  span_id: expect.any(String),
+                  trace_id: expect.any(String),
+                  data: {
+                    'gen_ai.operation.name': 'chat',
+                    'sentry.op': 'gen_ai.chat',
+                    'sentry.origin': 'auto.ai.openai',
+                    'gen_ai.system': 'openai',
+                    'gen_ai.request.model': 'gpt-3.5-turbo',
+                    'gen_ai.request.temperature': 0.7,
+                    'gen_ai.response.model': 'gpt-3.5-turbo',
+                    'gen_ai.response.id': 'chatcmpl-mock123',
+                    'gen_ai.response.finish_reasons': '["stop"]',
+                    'gen_ai.usage.input_tokens': 10,
+                    'gen_ai.usage.output_tokens': 15,
+                    'gen_ai.usage.total_tokens': 25,
+                    'openai.response.id': 'chatcmpl-mock123',
+                    'openai.response.model': 'gpt-3.5-turbo',
+                    'openai.response.timestamp': '2023-03-01T06:31:28.000Z',
+                    'openai.usage.completion_tokens': 15,
+                    'openai.usage.prompt_tokens': 10,
+                  },
+                  op: 'gen_ai.chat',
+                  origin: 'auto.ai.openai',
+                  status: 'ok',
+                },
+              },
+            },
+          })
+          .start()
+          .completed();
+      });
+    },
+    {
+      additionalDependencies: {
+        openai: '6.0.0',
+        express: 'latest',
+      },
+    },
+  );
 });
diff --git a/packages/node/src/integrations/tracing/openai/instrumentation.ts b/packages/node/src/integrations/tracing/openai/instrumentation.ts
index e0682185ff0a..b1a577f9a5f4 100644
--- a/packages/node/src/integrations/tracing/openai/instrumentation.ts
+++ b/packages/node/src/integrations/tracing/openai/instrumentation.ts
@@ -25,6 +25,7 @@ export interface OpenAiIntegration extends Integration {
 interface PatchedModuleExports {
   [key: string]: unknown;
   OpenAI: abstract new (...args: unknown[]) => OpenAiClient;
+  AzureOpenAI?: abstract new (...args: unknown[]) => OpenAiClient;
 }
 
 /**
@@ -56,10 +57,23 @@ export class SentryOpenAiInstrumentation extends InstrumentationBase<Instrumenta
   }
 
   /**
-   * Core patch logic applying instrumentation to the OpenAI client constructor.
+   * Core patch logic applying instrumentation to the OpenAI and AzureOpenAI client constructors.
    */
   private _patch(exports: PatchedModuleExports): PatchedModuleExports | void {
-    const Original = exports.OpenAI;
+    let result = exports;
+    result = this._patchClient(result, 'OpenAI');
+    result = this._patchClient(result, 'AzureOpenAI');
+    return result;
+  }
+
+  /**
+   * Patch logic applying instrumentation to the specified client constructor.
+   */
+  private _patchClient(exports: PatchedModuleExports, exportKey: 'OpenAI' | 'AzureOpenAI'): PatchedModuleExports {
+    const Original = exports[exportKey];
+    if (!Original) {
+      return exports;
+    }
 
     const WrappedOpenAI = function (this: unknown, ...args: unknown[]) {
       // Check if wrapping should be skipped (e.g., when LangChain is handling instrumentation)
@@ -97,10 +111,10 @@ export class SentryOpenAiInstrumentation extends InstrumentationBase<Instrumenta
     // Constructor replacement - handle read-only properties
     // The OpenAI property might have only a getter, so use defineProperty
     try {
-      exports.OpenAI = WrappedOpenAI;
+      exports[exportKey] = WrappedOpenAI;
     } catch (error) {
       // If direct assignment fails, override the property descriptor
-      Object.defineProperty(exports, 'OpenAI', {
+      Object.defineProperty(exports, exportKey, {
         value: WrappedOpenAI,
         writable: true,
         configurable: true,

From cd5ad7ee9948938e8dafe63901aaf87ea2322794 Mon Sep 17 00:00:00 2001
From: Onur Temizkan <onur@narval.co.uk>
Date: Mon, 24 Nov 2025 09:11:08 +0000
Subject: [PATCH 114/186] ref(react): Add more guarding against wildcards in
 lazy route transactions (#18155)

Building on top of  #17962

Added a few more checks to make sure non-resolved (wildcard) routes are
not reported in lazy route pageloads / navigations.

- Improved `patchSpanEnd` with a user-configurable wait timeout for
potentially slow route resolution. Named this option as
`lazyRouteTimeout` and it's defaulted as `idleTimeout` * 3. It may
conditionally delay reporting (if the route resolution is still not done
by the end of the timeout), but will prevent prematurely sent lazy-route
transactions inside that window.
- Added extra checks on `updateNavigationSpan` and `handleNavigation`
for whether any wildcard still exists in a lazy-route, so they are still
marked as open to full resolution. We keep track of pending lazy-route
resolutions inside `pendingLazyRouteLoads`
- Added a final attempt to update the transaction name with
fully-resolved route when the pending resolution is done.

Any of these should not affect the behaviour of non-lazy route usage

---------

Co-authored-by: Sigrid <32902192+s1gr1d@users.noreply.github.com>
---
 .../react-router-7-lazy-routes/src/index.tsx  |  63 +-
 .../src/pages/Deep.tsx                        |  12 +
 .../src/pages/DelayedLazyRoute.tsx            |  50 +
 .../src/pages/Index.tsx                       |  12 +
 .../src/pages/deep/Level1Routes.tsx           |  11 +
 .../src/pages/deep/Level2Routes.tsx           |  14 +
 .../src/pages/deep/Level3.tsx                 |  13 +
 .../tests/timeout-behaviour.test.ts           | 126 +++
 .../tests/transactions.test.ts                | 295 ++++++
 .../src/reactrouter-compat-utils/index.ts     |   1 +
 .../instrumentation.tsx                       | 846 ++++++++++------
 .../src/reactrouter-compat-utils/utils.ts     |   5 +
 .../instrumentation.test.tsx                  | 943 +++++++++++++++++-
 .../reactrouter-compat-utils/utils.test.ts    |  35 +
 14 files changed, 2114 insertions(+), 312 deletions(-)
 create mode 100644 dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/src/pages/Deep.tsx
 create mode 100644 dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/src/pages/DelayedLazyRoute.tsx
 create mode 100644 dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/src/pages/deep/Level1Routes.tsx
 create mode 100644 dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/src/pages/deep/Level2Routes.tsx
 create mode 100644 dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/src/pages/deep/Level3.tsx
 create mode 100644 dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/tests/timeout-behaviour.test.ts

diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/src/index.tsx b/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/src/index.tsx
index 521048fd18f4..7787b60be398 100644
--- a/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/src/index.tsx
+++ b/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/src/index.tsx
@@ -2,7 +2,6 @@ import * as Sentry from '@sentry/react';
 import React from 'react';
 import ReactDOM from 'react-dom/client';
 import {
-  Navigate,
   PatchRoutesOnNavigationFunction,
   RouterProvider,
   createBrowserRouter,
@@ -12,6 +11,49 @@ import {
   useNavigationType,
 } from 'react-router-dom';
 import Index from './pages/Index';
+import Deep from './pages/Deep';
+
+function getRuntimeConfig(): { lazyRouteTimeout?: number; idleTimeout?: number } {
+  if (typeof window === 'undefined') {
+    return {};
+  }
+
+  try {
+    const url = new URL(window.location.href);
+    const timeoutParam = url.searchParams.get('timeout');
+    const idleTimeoutParam = url.searchParams.get('idleTimeout');
+
+    let lazyRouteTimeout: number | undefined = undefined;
+    if (timeoutParam) {
+      if (timeoutParam === 'Infinity') {
+        lazyRouteTimeout = Infinity;
+      } else {
+        const parsed = parseInt(timeoutParam, 10);
+        if (!isNaN(parsed)) {
+          lazyRouteTimeout = parsed;
+        }
+      }
+    }
+
+    let idleTimeout: number | undefined = undefined;
+    if (idleTimeoutParam) {
+      const parsed = parseInt(idleTimeoutParam, 10);
+      if (!isNaN(parsed)) {
+        idleTimeout = parsed;
+      }
+    }
+
+    return {
+      lazyRouteTimeout,
+      idleTimeout,
+    };
+  } catch (error) {
+    console.warn('Failed to read runtime config, falling back to defaults', error);
+    return {};
+  }
+}
+
+const runtimeConfig = getRuntimeConfig();
 
 Sentry.init({
   environment: 'qa', // dynamic sampling bias to keep transactions
@@ -25,6 +67,8 @@ Sentry.init({
       matchRoutes,
       trackFetchStreamPerformance: true,
       enableAsyncRouteHandlers: true,
+      lazyRouteTimeout: runtimeConfig.lazyRouteTimeout,
+      idleTimeout: runtimeConfig.idleTimeout,
     }),
   ],
   // We recommend adjusting this value in production, or using tracesSampler
@@ -66,8 +110,21 @@ const router = sentryCreateBrowserRouter(
       element: <>Hello World</>,
     },
     {
-      path: '*',
-      element: <Navigate to="/" replace />,
+      path: '/delayed-lazy/:id',
+      lazy: async () => {
+        // Simulate slow lazy route loading (400ms delay)
+        await new Promise(resolve => setTimeout(resolve, 400));
+        return {
+          Component: (await import('./pages/DelayedLazyRoute')).default,
+        };
+      },
+    },
+    {
+      path: '/deep',
+      element: <Deep />,
+      handle: {
+        lazyChildren: () => import('./pages/deep/Level1Routes').then(module => module.level2Routes),
+      },
     },
   ],
   {
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/src/pages/Deep.tsx b/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/src/pages/Deep.tsx
new file mode 100644
index 000000000000..c68f7b781e77
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/src/pages/Deep.tsx
@@ -0,0 +1,12 @@
+import React from 'react';
+import { Outlet } from 'react-router-dom';
+
+export default function Deep() {
+  return (
+    <div>
+      <h1>Deep Route Root</h1>
+      <p id="deep-root">You are at the deep route root</p>
+      <Outlet />
+    </div>
+  );
+}
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/src/pages/DelayedLazyRoute.tsx b/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/src/pages/DelayedLazyRoute.tsx
new file mode 100644
index 000000000000..41e5ba5463be
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/src/pages/DelayedLazyRoute.tsx
@@ -0,0 +1,50 @@
+import React from 'react';
+import { Link, useParams, useLocation, useSearchParams } from 'react-router-dom';
+
+const DelayedLazyRoute = () => {
+  const { id } = useParams<{ id: string }>();
+  const location = useLocation();
+  const [searchParams] = useSearchParams();
+  const view = searchParams.get('view') || 'none';
+  const source = searchParams.get('source') || 'none';
+
+  return (
+    <div id="delayed-lazy-ready">
+      <h1>Delayed Lazy Route</h1>
+      <p id="delayed-lazy-id">ID: {id}</p>
+      <p id="delayed-lazy-path">{location.pathname}</p>
+      <p id="delayed-lazy-search">{location.search}</p>
+      <p id="delayed-lazy-hash">{location.hash}</p>
+      <p id="delayed-lazy-view">View: {view}</p>
+      <p id="delayed-lazy-source">Source: {source}</p>
+
+      <div id="navigation-links">
+        <Link to="/" id="delayed-lazy-home-link">
+          Back Home
+        </Link>
+        <br />
+        <Link to={`/delayed-lazy/${id}?view=detailed`} id="link-to-query-view-detailed">
+          View: Detailed (query param)
+        </Link>
+        <br />
+        <Link to={`/delayed-lazy/${id}?view=list`} id="link-to-query-view-list">
+          View: List (query param)
+        </Link>
+        <br />
+        <Link to={`/delayed-lazy/${id}#section1`} id="link-to-hash-section1">
+          Section 1 (hash only)
+        </Link>
+        <br />
+        <Link to={`/delayed-lazy/${id}#section2`} id="link-to-hash-section2">
+          Section 2 (hash only)
+        </Link>
+        <br />
+        <Link to={`/delayed-lazy/${id}?view=grid#results`} id="link-to-query-and-hash">
+          Grid View + Results (query + hash)
+        </Link>
+      </div>
+    </div>
+  );
+};
+
+export default DelayedLazyRoute;
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/src/pages/Index.tsx b/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/src/pages/Index.tsx
index 3053aa57b887..21b965f571f3 100644
--- a/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/src/pages/Index.tsx
+++ b/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/src/pages/Index.tsx
@@ -19,6 +19,18 @@ const Index = () => {
       <Link to="/long-running/slow/12345" id="navigation-to-long-running">
         Navigate to Long Running Lazy Route
       </Link>
+      <br />
+      <Link to="/delayed-lazy/123" id="navigation-to-delayed-lazy">
+        Navigate to Delayed Lazy Parameterized Route
+      </Link>
+      <br />
+      <Link to="/delayed-lazy/123?source=homepage" id="navigation-to-delayed-lazy-with-query">
+        Navigate to Delayed Lazy with Query Param
+      </Link>
+      <br />
+      <Link to="/deep/level2/level3/123" id="navigation-to-deep">
+        Navigate to Deep Nested Route (3 levels, 900ms total)
+      </Link>
     </>
   );
 };
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/src/pages/deep/Level1Routes.tsx b/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/src/pages/deep/Level1Routes.tsx
new file mode 100644
index 000000000000..0e0887b8850b
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/src/pages/deep/Level1Routes.tsx
@@ -0,0 +1,11 @@
+// Delay: 300ms before module loads
+await new Promise(resolve => setTimeout(resolve, 300));
+
+export const level2Routes = [
+  {
+    path: 'level2',
+    handle: {
+      lazyChildren: () => import('./Level2Routes').then(module => module.level3Routes),
+    },
+  },
+];
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/src/pages/deep/Level2Routes.tsx b/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/src/pages/deep/Level2Routes.tsx
new file mode 100644
index 000000000000..43671e1b7eee
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/src/pages/deep/Level2Routes.tsx
@@ -0,0 +1,14 @@
+// Delay: 300ms before module loads
+await new Promise(resolve => setTimeout(resolve, 300));
+
+export const level3Routes = [
+  {
+    path: 'level3/:id',
+    lazy: async () => {
+      await new Promise(resolve => setTimeout(resolve, 300));
+      return {
+        Component: (await import('./Level3')).default,
+      };
+    },
+  },
+];
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/src/pages/deep/Level3.tsx b/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/src/pages/deep/Level3.tsx
new file mode 100644
index 000000000000..e44ecc7da655
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/src/pages/deep/Level3.tsx
@@ -0,0 +1,13 @@
+import React from 'react';
+import { useParams } from 'react-router-dom';
+
+export default function Level3() {
+  const { id } = useParams();
+  return (
+    <div>
+      <h1>Level 3 Deep Route</h1>
+      <p id="deep-level3">Deeply nested route loaded!</p>
+      <p id="deep-level3-id">ID: {id}</p>
+    </div>
+  );
+}
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/tests/timeout-behaviour.test.ts b/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/tests/timeout-behaviour.test.ts
new file mode 100644
index 000000000000..281ebc88e52c
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/tests/timeout-behaviour.test.ts
@@ -0,0 +1,126 @@
+import { expect, test } from '@playwright/test';
+import { waitForTransaction } from '@sentry-internal/test-utils';
+
+test('lazyRouteTimeout: Routes load within timeout window', async ({ page }) => {
+  const transactionPromise = waitForTransaction('react-router-7-lazy-routes', async transactionEvent => {
+    return (
+      !!transactionEvent?.transaction &&
+      transactionEvent.contexts?.trace?.op === 'navigation' &&
+      transactionEvent.transaction.includes('deep')
+    );
+  });
+
+  // Route takes ~900ms, timeout allows 1050ms (50 + 1000)
+  // Routes will load in time → parameterized name
+  await page.goto('/?idleTimeout=50&timeout=1000');
+
+  const navigationLink = page.locator('id=navigation-to-deep');
+  await expect(navigationLink).toBeVisible();
+  await navigationLink.click();
+
+  const event = await transactionPromise;
+
+  // Should get full parameterized route
+  expect(event.transaction).toBe('/deep/level2/level3/:id');
+  expect(event.contexts?.trace?.data?.['sentry.source']).toBe('route');
+  expect(event.contexts?.trace?.data?.['sentry.idle_span_finish_reason']).toBe('idleTimeout');
+});
+
+test('lazyRouteTimeout: Infinity timeout always waits for routes', async ({ page }) => {
+  const transactionPromise = waitForTransaction('react-router-7-lazy-routes', async transactionEvent => {
+    return (
+      !!transactionEvent?.transaction &&
+      transactionEvent.contexts?.trace?.op === 'navigation' &&
+      transactionEvent.transaction.includes('deep')
+    );
+  });
+
+  // Infinity timeout → waits as long as possible (capped at finalTimeout to prevent indefinite hangs)
+  await page.goto('/?idleTimeout=50&timeout=Infinity');
+
+  const navigationLink = page.locator('id=navigation-to-deep');
+  await expect(navigationLink).toBeVisible();
+  await navigationLink.click();
+
+  const event = await transactionPromise;
+
+  // Should wait for routes to load (up to finalTimeout) and get full route
+  expect(event.transaction).toBe('/deep/level2/level3/:id');
+  expect(event.contexts?.trace?.data?.['sentry.source']).toBe('route');
+  expect(event.contexts?.trace?.data?.['sentry.idle_span_finish_reason']).toBe('idleTimeout');
+});
+
+test('idleTimeout: Captures all activity with increased timeout', async ({ page }) => {
+  const transactionPromise = waitForTransaction('react-router-7-lazy-routes', async transactionEvent => {
+    return (
+      !!transactionEvent?.transaction &&
+      transactionEvent.contexts?.trace?.op === 'navigation' &&
+      transactionEvent.transaction.includes('deep')
+    );
+  });
+
+  // High idleTimeout (5000ms) ensures transaction captures all lazy loading activity
+  await page.goto('/?idleTimeout=5000');
+
+  const navigationLink = page.locator('id=navigation-to-deep');
+  await expect(navigationLink).toBeVisible();
+  await navigationLink.click();
+
+  const event = await transactionPromise;
+
+  expect(event.transaction).toBe('/deep/level2/level3/:id');
+  expect(event.contexts?.trace?.data?.['sentry.source']).toBe('route');
+  expect(event.contexts?.trace?.data?.['sentry.idle_span_finish_reason']).toBe('idleTimeout');
+
+  // Transaction should wait for full idle timeout (5+ seconds)
+  const duration = event.timestamp! - event.start_timestamp;
+  expect(duration).toBeGreaterThan(5.0);
+  expect(duration).toBeLessThan(7.0);
+});
+
+test('idleTimeout: Finishes prematurely with low timeout', async ({ page }) => {
+  const transactionPromise = waitForTransaction('react-router-7-lazy-routes', async transactionEvent => {
+    return (
+      !!transactionEvent?.transaction &&
+      transactionEvent.contexts?.trace?.op === 'navigation' &&
+      transactionEvent.transaction.includes('deep')
+    );
+  });
+
+  // Very low idleTimeout (50ms) and lazyRouteTimeout (100ms)
+  // Transaction finishes quickly, but still gets parameterized route name
+  await page.goto('/?idleTimeout=50&timeout=100');
+
+  const navigationLink = page.locator('id=navigation-to-deep');
+  await expect(navigationLink).toBeVisible();
+  await navigationLink.click();
+
+  const event = await transactionPromise;
+
+  expect(event.contexts?.trace?.data?.['sentry.idle_span_finish_reason']).toBe('idleTimeout');
+  expect(event.transaction).toBe('/deep/level2/level3/:id');
+  expect(event.contexts?.trace?.data?.['sentry.source']).toBe('route');
+
+  // Transaction should finish quickly (< 200ms)
+  const duration = event.timestamp! - event.start_timestamp;
+  expect(duration).toBeLessThan(0.2);
+});
+
+test('idleTimeout: Pageload on deeply nested route', async ({ page }) => {
+  const pageloadPromise = waitForTransaction('react-router-7-lazy-routes', async transactionEvent => {
+    return (
+      !!transactionEvent?.transaction &&
+      transactionEvent.contexts?.trace?.op === 'pageload' &&
+      transactionEvent.transaction.includes('deep')
+    );
+  });
+
+  // Direct pageload to deeply nested route (not navigation)
+  await page.goto('/deep/level2/level3/12345');
+
+  const pageloadEvent = await pageloadPromise;
+
+  expect(pageloadEvent.transaction).toBe('/deep/level2/level3/:id');
+  expect(pageloadEvent.contexts?.trace?.data?.['sentry.source']).toBe('route');
+  expect(pageloadEvent.contexts?.trace?.data?.['sentry.idle_span_finish_reason']).toBe('idleTimeout');
+});
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/tests/transactions.test.ts
index e5b9f35042ed..ce8137d7f686 100644
--- a/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/tests/transactions.test.ts
+++ b/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/tests/transactions.test.ts
@@ -588,3 +588,298 @@ test('Creates separate transactions for rapid consecutive navigations', async ({
   expect(secondSpanId).not.toBe(thirdSpanId);
   expect(firstSpanId).not.toBe(thirdSpanId);
 });
+
+test('Creates pageload transaction with parameterized route for delayed lazy route', async ({ page }) => {
+  const pageloadPromise = waitForTransaction('react-router-7-lazy-routes', async transactionEvent => {
+    return (
+      !!transactionEvent?.transaction &&
+      transactionEvent.contexts?.trace?.op === 'pageload' &&
+      transactionEvent.transaction === '/delayed-lazy/:id'
+    );
+  });
+
+  await page.goto('/delayed-lazy/123');
+
+  const pageloadEvent = await pageloadPromise;
+
+  const delayedReady = page.locator('id=delayed-lazy-ready');
+  await expect(delayedReady).toBeVisible();
+  await expect(page.locator('id=delayed-lazy-id')).toHaveText('ID: 123');
+  await expect(page.locator('id=delayed-lazy-path')).toHaveText('/delayed-lazy/123');
+
+  expect(pageloadEvent.transaction).toBe('/delayed-lazy/:id');
+  expect(pageloadEvent.contexts?.trace?.op).toBe('pageload');
+  expect(pageloadEvent.contexts?.trace?.data?.['sentry.source']).toBe('route');
+});
+
+test('Creates navigation transaction with parameterized route for delayed lazy route', async ({ page }) => {
+  await page.goto('/');
+
+  const navigationPromise = waitForTransaction('react-router-7-lazy-routes', async transactionEvent => {
+    return (
+      !!transactionEvent?.transaction &&
+      transactionEvent.contexts?.trace?.op === 'navigation' &&
+      transactionEvent.transaction === '/delayed-lazy/:id'
+    );
+  });
+
+  const navigationLink = page.locator('id=navigation-to-delayed-lazy');
+  await expect(navigationLink).toBeVisible();
+  await navigationLink.click();
+
+  const navigationEvent = await navigationPromise;
+
+  const delayedReady = page.locator('id=delayed-lazy-ready');
+  await expect(delayedReady).toBeVisible();
+  await expect(page.locator('id=delayed-lazy-id')).toHaveText('ID: 123');
+  await expect(page.locator('id=delayed-lazy-path')).toHaveText('/delayed-lazy/123');
+
+  expect(navigationEvent.transaction).toBe('/delayed-lazy/:id');
+  expect(navigationEvent.contexts?.trace?.op).toBe('navigation');
+  expect(navigationEvent.contexts?.trace?.data?.['sentry.source']).toBe('route');
+});
+
+test('Creates navigation transaction when navigating with query parameters from home to route', async ({ page }) => {
+  await page.goto('/');
+
+  // Navigate from / to /delayed-lazy/123?source=homepage
+  // This should create a navigation transaction with the parameterized route name
+  const navigationPromise = waitForTransaction('react-router-7-lazy-routes', async transactionEvent => {
+    return (
+      !!transactionEvent?.transaction &&
+      transactionEvent.contexts?.trace?.op === 'navigation' &&
+      transactionEvent.transaction === '/delayed-lazy/:id'
+    );
+  });
+
+  const navigationLink = page.locator('id=navigation-to-delayed-lazy-with-query');
+  await expect(navigationLink).toBeVisible();
+  await navigationLink.click();
+
+  const navigationEvent = await navigationPromise;
+
+  const delayedReady = page.locator('id=delayed-lazy-ready');
+  await expect(delayedReady).toBeVisible();
+  await expect(page.locator('id=delayed-lazy-id')).toHaveText('ID: 123');
+  await expect(page.locator('id=delayed-lazy-path')).toHaveText('/delayed-lazy/123');
+  await expect(page.locator('id=delayed-lazy-search')).toHaveText('?source=homepage');
+  await expect(page.locator('id=delayed-lazy-source')).toHaveText('Source: homepage');
+
+  // Verify the navigation transaction has the correct parameterized route name
+  // Query parameters should NOT affect the transaction name (still /delayed-lazy/:id)
+  expect(navigationEvent.transaction).toBe('/delayed-lazy/:id');
+  expect(navigationEvent.contexts?.trace?.op).toBe('navigation');
+  expect(navigationEvent.contexts?.trace?.data?.['sentry.source']).toBe('route');
+  expect(navigationEvent.contexts?.trace?.status).toBe('ok');
+});
+
+test('Creates separate navigation transaction when changing only query parameters on same route', async ({ page }) => {
+  await page.goto('/delayed-lazy/123');
+
+  // Wait for the page to fully load
+  const delayedReady = page.locator('id=delayed-lazy-ready');
+  await expect(delayedReady).toBeVisible();
+
+  // Navigate from /delayed-lazy/123 to /delayed-lazy/123?view=detailed
+  // This is a query-only change on the same route
+  const navigationPromise = waitForTransaction('react-router-7-lazy-routes', async transactionEvent => {
+    return (
+      !!transactionEvent?.transaction &&
+      transactionEvent.contexts?.trace?.op === 'navigation' &&
+      transactionEvent.transaction === '/delayed-lazy/:id'
+    );
+  });
+
+  const queryLink = page.locator('id=link-to-query-view-detailed');
+  await expect(queryLink).toBeVisible();
+  await queryLink.click();
+
+  const navigationEvent = await navigationPromise;
+
+  // Verify query param was updated
+  await expect(page.locator('id=delayed-lazy-search')).toHaveText('?view=detailed');
+  await expect(page.locator('id=delayed-lazy-view')).toHaveText('View: detailed');
+
+  // Query-only navigation should create a navigation transaction
+  expect(navigationEvent.transaction).toBe('/delayed-lazy/:id');
+  expect(navigationEvent.contexts?.trace?.op).toBe('navigation');
+  expect(navigationEvent.contexts?.trace?.data?.['sentry.source']).toBe('route');
+  expect(navigationEvent.contexts?.trace?.status).toBe('ok');
+});
+
+test('Creates separate navigation transactions for multiple query parameter changes', async ({ page }) => {
+  await page.goto('/delayed-lazy/123');
+
+  const delayedReady = page.locator('id=delayed-lazy-ready');
+  await expect(delayedReady).toBeVisible();
+
+  // First query change: /delayed-lazy/123 -> /delayed-lazy/123?view=detailed
+  const firstNavigationPromise = waitForTransaction('react-router-7-lazy-routes', async transactionEvent => {
+    return (
+      !!transactionEvent?.transaction &&
+      transactionEvent.contexts?.trace?.op === 'navigation' &&
+      transactionEvent.transaction === '/delayed-lazy/:id'
+    );
+  });
+
+  const firstQueryLink = page.locator('id=link-to-query-view-detailed');
+  await expect(firstQueryLink).toBeVisible();
+  await firstQueryLink.click();
+
+  const firstNavigationEvent = await firstNavigationPromise;
+  const firstTraceId = firstNavigationEvent.contexts?.trace?.trace_id;
+
+  await expect(page.locator('id=delayed-lazy-view')).toHaveText('View: detailed');
+
+  // Second query change: /delayed-lazy/123?view=detailed -> /delayed-lazy/123?view=list
+  const secondNavigationPromise = waitForTransaction('react-router-7-lazy-routes', async transactionEvent => {
+    return (
+      !!transactionEvent?.transaction &&
+      transactionEvent.contexts?.trace?.op === 'navigation' &&
+      transactionEvent.transaction === '/delayed-lazy/:id' &&
+      transactionEvent.contexts?.trace?.trace_id !== firstTraceId
+    );
+  });
+
+  const secondQueryLink = page.locator('id=link-to-query-view-list');
+  await expect(secondQueryLink).toBeVisible();
+  await secondQueryLink.click();
+
+  const secondNavigationEvent = await secondNavigationPromise;
+  const secondTraceId = secondNavigationEvent.contexts?.trace?.trace_id;
+
+  await expect(page.locator('id=delayed-lazy-view')).toHaveText('View: list');
+
+  // Both navigations should have created separate transactions
+  expect(firstNavigationEvent.transaction).toBe('/delayed-lazy/:id');
+  expect(firstNavigationEvent.contexts?.trace?.op).toBe('navigation');
+  expect(secondNavigationEvent.transaction).toBe('/delayed-lazy/:id');
+  expect(secondNavigationEvent.contexts?.trace?.op).toBe('navigation');
+
+  // Trace IDs should be different (separate transactions)
+  expect(firstTraceId).toBeDefined();
+  expect(secondTraceId).toBeDefined();
+  expect(firstTraceId).not.toBe(secondTraceId);
+});
+
+test('Creates navigation transaction when changing only hash on same route', async ({ page }) => {
+  await page.goto('/delayed-lazy/123');
+
+  const delayedReady = page.locator('id=delayed-lazy-ready');
+  await expect(delayedReady).toBeVisible();
+
+  // Navigate from /delayed-lazy/123 to /delayed-lazy/123#section1
+  // This is a hash-only change on the same route
+  const navigationPromise = waitForTransaction('react-router-7-lazy-routes', async transactionEvent => {
+    return (
+      !!transactionEvent?.transaction &&
+      transactionEvent.contexts?.trace?.op === 'navigation' &&
+      transactionEvent.transaction === '/delayed-lazy/:id'
+    );
+  });
+
+  const hashLink = page.locator('id=link-to-hash-section1');
+  await expect(hashLink).toBeVisible();
+  await hashLink.click();
+
+  const navigationEvent = await navigationPromise;
+
+  // Verify hash was updated
+  await expect(page.locator('id=delayed-lazy-hash')).toHaveText('#section1');
+
+  // Hash-only navigation should create a navigation transaction
+  expect(navigationEvent.transaction).toBe('/delayed-lazy/:id');
+  expect(navigationEvent.contexts?.trace?.op).toBe('navigation');
+  expect(navigationEvent.contexts?.trace?.data?.['sentry.source']).toBe('route');
+  expect(navigationEvent.contexts?.trace?.status).toBe('ok');
+});
+
+test('Creates separate navigation transactions for multiple hash changes', async ({ page }) => {
+  await page.goto('/delayed-lazy/123');
+
+  const delayedReady = page.locator('id=delayed-lazy-ready');
+  await expect(delayedReady).toBeVisible();
+
+  // First hash change: /delayed-lazy/123 -> /delayed-lazy/123#section1
+  const firstNavigationPromise = waitForTransaction('react-router-7-lazy-routes', async transactionEvent => {
+    return (
+      !!transactionEvent?.transaction &&
+      transactionEvent.contexts?.trace?.op === 'navigation' &&
+      transactionEvent.transaction === '/delayed-lazy/:id'
+    );
+  });
+
+  const firstHashLink = page.locator('id=link-to-hash-section1');
+  await expect(firstHashLink).toBeVisible();
+  await firstHashLink.click();
+
+  const firstNavigationEvent = await firstNavigationPromise;
+  const firstTraceId = firstNavigationEvent.contexts?.trace?.trace_id;
+
+  await expect(page.locator('id=delayed-lazy-hash')).toHaveText('#section1');
+
+  // Second hash change: /delayed-lazy/123#section1 -> /delayed-lazy/123#section2
+  const secondNavigationPromise = waitForTransaction('react-router-7-lazy-routes', async transactionEvent => {
+    return (
+      !!transactionEvent?.transaction &&
+      transactionEvent.contexts?.trace?.op === 'navigation' &&
+      transactionEvent.transaction === '/delayed-lazy/:id' &&
+      transactionEvent.contexts?.trace?.trace_id !== firstTraceId
+    );
+  });
+
+  const secondHashLink = page.locator('id=link-to-hash-section2');
+  await expect(secondHashLink).toBeVisible();
+  await secondHashLink.click();
+
+  const secondNavigationEvent = await secondNavigationPromise;
+  const secondTraceId = secondNavigationEvent.contexts?.trace?.trace_id;
+
+  await expect(page.locator('id=delayed-lazy-hash')).toHaveText('#section2');
+
+  // Both navigations should have created separate transactions
+  expect(firstNavigationEvent.transaction).toBe('/delayed-lazy/:id');
+  expect(firstNavigationEvent.contexts?.trace?.op).toBe('navigation');
+  expect(secondNavigationEvent.transaction).toBe('/delayed-lazy/:id');
+  expect(secondNavigationEvent.contexts?.trace?.op).toBe('navigation');
+
+  // Trace IDs should be different (separate transactions)
+  expect(firstTraceId).toBeDefined();
+  expect(secondTraceId).toBeDefined();
+  expect(firstTraceId).not.toBe(secondTraceId);
+});
+
+test('Creates navigation transaction when changing both query and hash on same route', async ({ page }) => {
+  await page.goto('/delayed-lazy/123?view=list');
+
+  const delayedReady = page.locator('id=delayed-lazy-ready');
+  await expect(delayedReady).toBeVisible();
+  await expect(page.locator('id=delayed-lazy-view')).toHaveText('View: list');
+
+  // Navigate from /delayed-lazy/123?view=list to /delayed-lazy/123?view=grid#results
+  // This changes both query and hash
+  const navigationPromise = waitForTransaction('react-router-7-lazy-routes', async transactionEvent => {
+    return (
+      !!transactionEvent?.transaction &&
+      transactionEvent.contexts?.trace?.op === 'navigation' &&
+      transactionEvent.transaction === '/delayed-lazy/:id'
+    );
+  });
+
+  const queryAndHashLink = page.locator('id=link-to-query-and-hash');
+  await expect(queryAndHashLink).toBeVisible();
+  await queryAndHashLink.click();
+
+  const navigationEvent = await navigationPromise;
+
+  // Verify both query and hash were updated
+  await expect(page.locator('id=delayed-lazy-search')).toHaveText('?view=grid');
+  await expect(page.locator('id=delayed-lazy-hash')).toHaveText('#results');
+  await expect(page.locator('id=delayed-lazy-view')).toHaveText('View: grid');
+
+  // Combined query + hash navigation should create a navigation transaction
+  expect(navigationEvent.transaction).toBe('/delayed-lazy/:id');
+  expect(navigationEvent.contexts?.trace?.op).toBe('navigation');
+  expect(navigationEvent.contexts?.trace?.data?.['sentry.source']).toBe('route');
+  expect(navigationEvent.contexts?.trace?.status).toBe('ok');
+});
diff --git a/packages/react/src/reactrouter-compat-utils/index.ts b/packages/react/src/reactrouter-compat-utils/index.ts
index c2b56ec446fb..bb91ba8d3072 100644
--- a/packages/react/src/reactrouter-compat-utils/index.ts
+++ b/packages/react/src/reactrouter-compat-utils/index.ts
@@ -25,6 +25,7 @@ export {
   pathEndsWithWildcard,
   pathIsWildcardAndHasChildren,
   getNumberOfUrlSegments,
+  transactionNameHasWildcard,
 } from './utils';
 
 // Lazy route exports
diff --git a/packages/react/src/reactrouter-compat-utils/instrumentation.tsx b/packages/react/src/reactrouter-compat-utils/instrumentation.tsx
index 235b207ed9a0..6e19b9021ba5 100644
--- a/packages/react/src/reactrouter-compat-utils/instrumentation.tsx
+++ b/packages/react/src/reactrouter-compat-utils/instrumentation.tsx
@@ -41,59 +41,118 @@ import type {
   UseRoutes,
 } from '../types';
 import { checkRouteForAsyncHandler } from './lazy-routes';
-import { initializeRouterUtils, resolveRouteNameAndSource } from './utils';
+import { initializeRouterUtils, resolveRouteNameAndSource, transactionNameHasWildcard } from './utils';
 
 let _useEffect: UseEffect;
 let _useLocation: UseLocation;
 let _useNavigationType: UseNavigationType;
 let _createRoutesFromChildren: CreateRoutesFromChildren;
 let _matchRoutes: MatchRoutes;
+
 let _enableAsyncRouteHandlers: boolean = false;
+let _lazyRouteTimeout = 3000;
 
 const CLIENTS_WITH_INSTRUMENT_NAVIGATION = new WeakSet<Client>();
 
+// Prevents duplicate spans when router.subscribe fires multiple times
+const activeNavigationSpans = new WeakMap<
+  Client,
+  { span: Span; routeName: string; pathname: string; locationKey: string; isPlaceholder?: boolean }
+>();
+
+// Exported for testing only
+export const allRoutes = new Set<RouteObject>();
+
+// Tracks lazy route loads to wait before finalizing span names
+const pendingLazyRouteLoads = new WeakMap<Span, Set<Promise<unknown>>>();
+
 /**
- * Tracks last navigation per client to prevent duplicate spans in cross-usage scenarios.
- * Entry persists until the navigation span ends, allowing cross-usage detection during delayed wrapper execution.
+ * Schedules a callback using requestAnimationFrame when available (browser),
+ * or falls back to setTimeout for SSR environments (Node.js, createMemoryRouter tests).
  */
-const LAST_NAVIGATION_PER_CLIENT = new WeakMap<Client, string>();
+function scheduleCallback(callback: () => void): number {
+  if (WINDOW?.requestAnimationFrame) {
+    return WINDOW.requestAnimationFrame(callback);
+  }
+  return setTimeout(callback, 0) as unknown as number;
+}
 
-export function addResolvedRoutesToParent(resolvedRoutes: RouteObject[], parentRoute: RouteObject): void {
-  const existingChildren = parentRoute.children || [];
+/**
+ * Cancels a scheduled callback, handling both RAF (browser) and timeout (SSR) IDs.
+ */
+function cancelScheduledCallback(id: number): void {
+  if (WINDOW?.cancelAnimationFrame) {
+    WINDOW.cancelAnimationFrame(id);
+  } else {
+    clearTimeout(id);
+  }
+}
 
-  const newRoutes = resolvedRoutes.filter(
-    newRoute =>
-      !existingChildren.some(
-        existing =>
-          existing === newRoute ||
-          (newRoute.path && existing.path === newRoute.path) ||
-          (newRoute.id && existing.id === newRoute.id),
-      ),
-  );
+/**
+ * Computes location key for duplicate detection. Normalizes undefined/null to empty strings.
+ * Exported for testing.
+ */
+export function computeLocationKey(location: Location): string {
+  return `${location.pathname}${location.search || ''}${location.hash || ''}`;
+}
 
-  if (newRoutes.length > 0) {
-    parentRoute.children = [...existingChildren, ...newRoutes];
-  }
+/**
+ * Checks if a route name is parameterized (contains route parameters like :id or wildcards like *)
+ * vs a raw URL path.
+ */
+function isParameterizedRoute(routeName: string): boolean {
+  return routeName.includes(':') || routeName.includes('*');
 }
 
 /**
- * Determines if a navigation should be handled based on router state.
- * Only handles:
- * - PUSH navigations (always)
- * - POP navigations (only after initial pageload is complete)
- * - When router state is 'idle' (not 'loading' or 'submitting')
+ * Determines if a navigation should be skipped as a duplicate, and if an existing span should be updated.
+ * Exported for testing.
  *
- * During 'loading' or 'submitting', state.location may still have the old pathname,
- * which would cause us to create a span for the wrong route.
+ * @returns An object with:
+ *   - skip: boolean - Whether to skip creating a new span
+ *   - shouldUpdate: boolean - Whether to update the existing span name (wildcard upgrade)
  */
-function shouldHandleNavigation(
-  state: { historyAction: string; navigation: { state: string } },
-  isInitialPageloadComplete: boolean,
-): boolean {
-  return (
-    (state.historyAction === 'PUSH' || (state.historyAction === 'POP' && isInitialPageloadComplete)) &&
-    state.navigation.state === 'idle'
-  );
+export function shouldSkipNavigation(
+  trackedNav:
+    | { span: Span; routeName: string; pathname: string; locationKey: string; isPlaceholder?: boolean }
+    | undefined,
+  locationKey: string,
+  proposedName: string,
+  spanHasEnded: boolean,
+): { skip: boolean; shouldUpdate: boolean } {
+  if (!trackedNav) {
+    return { skip: false, shouldUpdate: false };
+  }
+
+  // Check if this is a duplicate navigation (same location)
+  // 1. If it's a placeholder, it's always a duplicate (we're waiting for the real one)
+  // 2. If it's a real span, it's a duplicate only if it hasn't ended yet
+  const isDuplicate = trackedNav.locationKey === locationKey && (trackedNav.isPlaceholder || !spanHasEnded);
+
+  if (isDuplicate) {
+    // Check if we should update the span name with a better route
+    // Allow updates if:
+    // 1. Current has wildcard and new doesn't (wildcard → parameterized upgrade)
+    // 2. Current is raw path and new is parameterized (raw → parameterized upgrade)
+    // 3. New name is different and more specific (longer, indicating nested routes resolved)
+    const currentHasWildcard = !!trackedNav.routeName && transactionNameHasWildcard(trackedNav.routeName);
+    const proposedHasWildcard = transactionNameHasWildcard(proposedName);
+    const currentIsParameterized = !!trackedNav.routeName && isParameterizedRoute(trackedNav.routeName);
+    const proposedIsParameterized = isParameterizedRoute(proposedName);
+
+    const isWildcardUpgrade = currentHasWildcard && !proposedHasWildcard;
+    const isRawToParameterized = !currentIsParameterized && proposedIsParameterized;
+    const isMoreSpecific =
+      proposedName !== trackedNav.routeName &&
+      proposedName.length > (trackedNav.routeName?.length || 0) &&
+      !proposedHasWildcard;
+
+    const shouldUpdate = !!(trackedNav.routeName && (isWildcardUpgrade || isRawToParameterized || isMoreSpecific));
+
+    return { skip: true, shouldUpdate };
+  }
+
+  return { skip: false, shouldUpdate: false };
 }
 
 export interface ReactRouterOptions {
@@ -116,13 +175,58 @@ export interface ReactRouterOptions {
    * @default false
    */
   enableAsyncRouteHandlers?: boolean;
+
+  /**
+   * Maximum time (in milliseconds) to wait for lazy routes to load before finalizing span names.
+   *
+   * - Set to `0` to not wait at all (immediate finalization)
+   * - Set to `Infinity` to wait as long as possible (capped at `finalTimeout` to prevent indefinite hangs)
+   * - Negative values will fall back to the default
+   *
+   * Defaults to 3× the configured `idleTimeout` (default: 3000ms).
+   *
+   * @default idleTimeout * 3
+   */
+  lazyRouteTimeout?: number;
 }
 
 type V6CompatibleVersion = '6' | '7';
 
-// Keeping as a global variable for cross-usage in multiple functions
-// only exported for testing purposes
-export const allRoutes = new Set<RouteObject>();
+export function addResolvedRoutesToParent(resolvedRoutes: RouteObject[], parentRoute: RouteObject): void {
+  const existingChildren = parentRoute.children || [];
+
+  const newRoutes = resolvedRoutes.filter(
+    newRoute =>
+      !existingChildren.some(
+        existing =>
+          existing === newRoute ||
+          (newRoute.path && existing.path === newRoute.path) ||
+          (newRoute.id && existing.id === newRoute.id),
+      ),
+  );
+
+  if (newRoutes.length > 0) {
+    parentRoute.children = [...existingChildren, ...newRoutes];
+  }
+}
+
+/** Registers a pending lazy route load promise for a span. */
+function trackLazyRouteLoad(span: Span, promise: Promise<unknown>): void {
+  let promises = pendingLazyRouteLoads.get(span);
+  if (!promises) {
+    promises = new Set();
+    pendingLazyRouteLoads.set(span, promises);
+  }
+  promises.add(promise);
+
+  // Clean up when promise resolves/rejects
+  promise.finally(() => {
+    const currentPromises = pendingLazyRouteLoads.get(span);
+    if (currentPromises) {
+      currentPromises.delete(promise);
+    }
+  });
+}
 
 /**
  * Processes resolved routes by adding them to allRoutes and checking for nested async handlers.
@@ -188,13 +292,14 @@ export function updateNavigationSpan(
   forceUpdate = false,
   matchRoutes: MatchRoutes,
 ): void {
-  // Check if this span has already been named to avoid multiple updates
-  // But allow updates if this is a forced update (e.g., when lazy routes are loaded)
-  const hasBeenNamed =
-    !forceUpdate && (activeRootSpan as { __sentry_navigation_name_set__?: boolean })?.__sentry_navigation_name_set__;
+  const spanJson = spanToJSON(activeRootSpan);
+  const currentName = spanJson.description;
 
-  if (!hasBeenNamed) {
-    // Get fresh branches for the current location with all loaded routes
+  const hasBeenNamed = (activeRootSpan as { __sentry_navigation_name_set__?: boolean })?.__sentry_navigation_name_set__;
+  const currentNameHasWildcard = currentName && transactionNameHasWildcard(currentName);
+  const shouldUpdate = !hasBeenNamed || forceUpdate || currentNameHasWildcard;
+
+  if (shouldUpdate && !spanJson.timestamp) {
     const currentBranches = matchRoutes(allRoutes, location);
     const [name, source] = resolveRouteNameAndSource(
       location,
@@ -204,22 +309,105 @@ export function updateNavigationSpan(
       '',
     );
 
-    // Only update if we have a valid name and the span hasn't finished
-    const spanJson = spanToJSON(activeRootSpan);
-    if (name && !spanJson.timestamp) {
+    const currentSource = spanJson.data?.[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE];
+    const isImprovement =
+      name &&
+      (!currentName || // No current name - always set
+        (!hasBeenNamed && (currentSource !== 'route' || source === 'route')) || // Not finalized - allow unless downgrading route→url
+        (currentSource !== 'route' && source === 'route') || // URL → route upgrade
+        (currentSource === 'route' && source === 'route' && currentNameHasWildcard)); // Route → better route (only if current has wildcard)
+    if (isImprovement) {
       activeRootSpan.updateName(name);
       activeRootSpan.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, source);
 
-      // Mark this span as having its name set to prevent future updates
-      addNonEnumerableProperty(
-        activeRootSpan as { __sentry_navigation_name_set__?: boolean },
-        '__sentry_navigation_name_set__',
-        true,
-      );
+      // Only mark as finalized for non-wildcard route names (allows URL→route upgrades).
+      if (!transactionNameHasWildcard(name) && source === 'route') {
+        addNonEnumerableProperty(
+          activeRootSpan as { __sentry_navigation_name_set__?: boolean },
+          '__sentry_navigation_name_set__',
+          true,
+        );
+      }
     }
   }
 }
 
+function setupRouterSubscription(
+  router: Router,
+  routes: RouteObject[],
+  version: V6CompatibleVersion,
+  basename: string | undefined,
+  activeRootSpan: Span | undefined,
+): void {
+  let isInitialPageloadComplete = false;
+  let hasSeenPageloadSpan = !!activeRootSpan && spanToJSON(activeRootSpan).op === 'pageload';
+  let hasSeenPopAfterPageload = false;
+  let scheduledNavigationHandler: number | null = null;
+  let lastHandledPathname: string | null = null;
+
+  router.subscribe((state: RouterState) => {
+    if (!isInitialPageloadComplete) {
+      const currentRootSpan = getActiveRootSpan();
+      const isCurrentlyInPageload = currentRootSpan && spanToJSON(currentRootSpan).op === 'pageload';
+
+      if (isCurrentlyInPageload) {
+        hasSeenPageloadSpan = true;
+      } else if (hasSeenPageloadSpan) {
+        if (state.historyAction === 'POP' && !hasSeenPopAfterPageload) {
+          hasSeenPopAfterPageload = true;
+        } else {
+          isInitialPageloadComplete = true;
+        }
+      }
+    }
+
+    const shouldHandleNavigation =
+      state.historyAction === 'PUSH' || (state.historyAction === 'POP' && isInitialPageloadComplete);
+
+    if (shouldHandleNavigation) {
+      // Include search and hash to allow query/hash-only navigations
+      // Use computeLocationKey() to ensure undefined/null values are normalized to empty strings
+      const currentLocationKey = computeLocationKey(state.location);
+      const navigationHandler = (): void => {
+        // Prevent multiple calls for the same location within the same navigation cycle
+        if (lastHandledPathname === currentLocationKey) {
+          return;
+        }
+        lastHandledPathname = currentLocationKey;
+        scheduledNavigationHandler = null;
+        handleNavigation({
+          location: state.location,
+          routes,
+          navigationType: state.historyAction,
+          version,
+          basename,
+          allRoutes: Array.from(allRoutes),
+        });
+      };
+
+      if (state.navigation.state !== 'idle') {
+        // Navigation in progress - reset if location changed
+        if (lastHandledPathname !== currentLocationKey) {
+          lastHandledPathname = null;
+        }
+        // Cancel any previously scheduled handler to avoid duplicates
+        if (scheduledNavigationHandler !== null) {
+          cancelScheduledCallback(scheduledNavigationHandler);
+        }
+        scheduledNavigationHandler = scheduleCallback(navigationHandler);
+      } else {
+        // Navigation completed - cancel scheduled handler if any, then call immediately
+        if (scheduledNavigationHandler !== null) {
+          cancelScheduledCallback(scheduledNavigationHandler);
+          scheduledNavigationHandler = null;
+        }
+        navigationHandler();
+        // Don't reset - next navigation cycle resets to prevent duplicates within same cycle.
+      }
+    }
+  });
+}
+
 /**
  * Creates a wrapCreateBrowserRouter function that can be used with all React Router v6 compatible versions.
  */
@@ -242,30 +430,17 @@ export function createV6CompatibleWrapCreateBrowserRouter<
   return function (routes: RouteObject[], opts?: Record<string, unknown> & { basename?: string }): TRouter {
     addRoutesToAllRoutes(routes);
 
-    // Check for async handlers that might contain sub-route declarations (only if enabled)
     if (_enableAsyncRouteHandlers) {
       for (const route of routes) {
         checkRouteForAsyncHandler(route, processResolvedRoutes);
       }
     }
 
-    // Wrap patchRoutesOnNavigation to detect when lazy routes are loaded
     const wrappedOpts = wrapPatchRoutesOnNavigation(opts);
-
     const router = createRouterFunction(routes, wrappedOpts);
     const basename = opts?.basename;
-
     const activeRootSpan = getActiveRootSpan();
 
-    // Track whether we've completed the initial pageload to properly distinguish
-    // between POPs that occur during pageload vs. legitimate back/forward navigation.
-    let isInitialPageloadComplete = false;
-    let hasSeenPageloadSpan = !!activeRootSpan && spanToJSON(activeRootSpan).op === 'pageload';
-    let hasSeenPopAfterPageload = false;
-
-    // The initial load ends when `createBrowserRouter` is called.
-    // This is the earliest convenient time to update the transaction name.
-    // Callbacks to `router.subscribe` are not called for the initial load.
     if (router.state.historyAction === 'POP' && activeRootSpan) {
       updatePageloadTransaction({
         activeRootSpan,
@@ -276,38 +451,7 @@ export function createV6CompatibleWrapCreateBrowserRouter<
       });
     }
 
-    router.subscribe((state: RouterState) => {
-      // Track pageload completion to distinguish POPs during pageload from legitimate back/forward navigation
-      if (!isInitialPageloadComplete) {
-        const currentRootSpan = getActiveRootSpan();
-        const isCurrentlyInPageload = currentRootSpan && spanToJSON(currentRootSpan).op === 'pageload';
-
-        if (isCurrentlyInPageload) {
-          hasSeenPageloadSpan = true;
-        } else if (hasSeenPageloadSpan) {
-          // Pageload span was active but is now gone - pageload has completed
-          if (state.historyAction === 'POP' && !hasSeenPopAfterPageload) {
-            // Pageload ended: ignore the first POP after pageload
-            hasSeenPopAfterPageload = true;
-          } else {
-            // Pageload ended: either non-POP action or subsequent POP
-            isInitialPageloadComplete = true;
-          }
-        }
-        // If we haven't seen a pageload span yet, keep waiting (don't mark as complete)
-      }
-
-      if (shouldHandleNavigation(state, isInitialPageloadComplete)) {
-        handleNavigation({
-          location: state.location,
-          routes,
-          navigationType: state.historyAction,
-          version,
-          basename,
-          allRoutes: Array.from(allRoutes),
-        });
-      }
-    });
+    setupRouterSubscription(router, routes, version, basename, activeRootSpan);
 
     return router;
   };
@@ -342,14 +486,12 @@ export function createV6CompatibleWrapCreateMemoryRouter<
   ): TRouter {
     addRoutesToAllRoutes(routes);
 
-    // Check for async handlers that might contain sub-route declarations (only if enabled)
     if (_enableAsyncRouteHandlers) {
       for (const route of routes) {
         checkRouteForAsyncHandler(route, processResolvedRoutes);
       }
     }
 
-    // Wrap patchRoutesOnNavigation to detect when lazy routes are loaded
     const wrappedOpts = wrapPatchRoutesOnNavigation(opts, true);
 
     const router = createRouterFunction(routes, wrappedOpts);
@@ -387,44 +529,7 @@ export function createV6CompatibleWrapCreateMemoryRouter<
       });
     }
 
-    // Track whether we've completed the initial pageload to properly distinguish
-    // between POPs that occur during pageload vs. legitimate back/forward navigation.
-    let isInitialPageloadComplete = false;
-    let hasSeenPageloadSpan = !!memoryActiveRootSpan && spanToJSON(memoryActiveRootSpan).op === 'pageload';
-    let hasSeenPopAfterPageload = false;
-
-    router.subscribe((state: RouterState) => {
-      // Track pageload completion to distinguish POPs during pageload from legitimate back/forward navigation
-      if (!isInitialPageloadComplete) {
-        const currentRootSpan = getActiveRootSpan();
-        const isCurrentlyInPageload = currentRootSpan && spanToJSON(currentRootSpan).op === 'pageload';
-
-        if (isCurrentlyInPageload) {
-          hasSeenPageloadSpan = true;
-        } else if (hasSeenPageloadSpan) {
-          // Pageload span was active but is now gone - pageload has completed
-          if (state.historyAction === 'POP' && !hasSeenPopAfterPageload) {
-            // Pageload ended: ignore the first POP after pageload
-            hasSeenPopAfterPageload = true;
-          } else {
-            // Pageload ended: either non-POP action or subsequent POP
-            isInitialPageloadComplete = true;
-          }
-        }
-        // If we haven't seen a pageload span yet, keep waiting (don't mark as complete)
-      }
-
-      if (shouldHandleNavigation(state, isInitialPageloadComplete)) {
-        handleNavigation({
-          location: state.location,
-          routes,
-          navigationType: state.historyAction,
-          version,
-          basename,
-          allRoutes: Array.from(allRoutes),
-        });
-      }
-    });
+    setupRouterSubscription(router, routes, version, basename, memoryActiveRootSpan);
 
     return router;
   };
@@ -449,6 +554,7 @@ export function createReactRouterV6CompatibleTracingIntegration(
     enableAsyncRouteHandlers = false,
     instrumentPageLoad = true,
     instrumentNavigation = true,
+    lazyRouteTimeout,
   } = options;
 
   return {
@@ -456,6 +562,36 @@ export function createReactRouterV6CompatibleTracingIntegration(
     setup(client) {
       integration.setup(client);
 
+      const finalTimeout = options.finalTimeout ?? 30000;
+      const defaultMaxWait = (options.idleTimeout ?? 1000) * 3;
+      const configuredMaxWait = lazyRouteTimeout ?? defaultMaxWait;
+
+      // Cap Infinity at finalTimeout to prevent indefinite hangs
+      if (configuredMaxWait === Infinity) {
+        _lazyRouteTimeout = finalTimeout;
+        DEBUG_BUILD &&
+          debug.log(
+            '[React Router] lazyRouteTimeout set to Infinity, capping at finalTimeout:',
+            finalTimeout,
+            'ms to prevent indefinite hangs',
+          );
+      } else if (Number.isNaN(configuredMaxWait)) {
+        DEBUG_BUILD &&
+          debug.warn('[React Router] lazyRouteTimeout must be a number, falling back to default:', defaultMaxWait);
+        _lazyRouteTimeout = defaultMaxWait;
+      } else if (configuredMaxWait < 0) {
+        DEBUG_BUILD &&
+          debug.warn(
+            '[React Router] lazyRouteTimeout must be non-negative or Infinity, got:',
+            configuredMaxWait,
+            'falling back to:',
+            defaultMaxWait,
+          );
+        _lazyRouteTimeout = defaultMaxWait;
+      } else {
+        _lazyRouteTimeout = configuredMaxWait;
+      }
+
       _useEffect = useEffect;
       _useLocation = useLocation;
       _useNavigationType = useNavigationType;
@@ -530,6 +666,9 @@ export function createV6CompatibleWrapUseRoutes(origUseRoutes: UseRoutes, versio
         });
         isMountRenderPass.current = false;
       } else {
+        // Note: Component-based routes don't support lazy route tracking via lazyRouteTimeout
+        // because React.lazy() loads happen at the component level, not the router level.
+        // Use createBrowserRouter with patchRoutesOnNavigation for lazy route tracking.
         handleNavigation({
           location: normalizedLocation,
           routes,
@@ -564,7 +703,8 @@ function wrapPatchRoutesOnNavigation(
       // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-member-access
       const targetPath = (args as any)?.path;
 
-      // For browser router, wrap the patch function to update span during patching
+      const activeRootSpan = getActiveRootSpan();
+
       if (!isMemoryRouter) {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-member-access
         const originalPatch = (args as any)?.patch;
@@ -572,13 +712,13 @@ function wrapPatchRoutesOnNavigation(
           // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-member-access
           (args as any).patch = (routeId: string, children: RouteObject[]) => {
             addRoutesToAllRoutes(children);
-            const activeRootSpan = getActiveRootSpan();
-            if (activeRootSpan && (spanToJSON(activeRootSpan) as { op?: string }).op === 'navigation') {
+            const currentActiveRootSpan = getActiveRootSpan();
+            if (currentActiveRootSpan && (spanToJSON(currentActiveRootSpan) as { op?: string }).op === 'navigation') {
               updateNavigationSpan(
-                activeRootSpan,
+                currentActiveRootSpan,
                 { pathname: targetPath, search: '', hash: '', state: null, key: 'default' },
                 Array.from(allRoutes),
-                true, // forceUpdate = true since we're loading lazy routes
+                true,
                 _matchRoutes,
               );
             }
@@ -587,102 +727,37 @@ function wrapPatchRoutesOnNavigation(
         }
       }
 
-      const result = await originalPatchRoutes(args);
-
-      // Update navigation span after routes are patched
-      const activeRootSpan = getActiveRootSpan();
-      if (activeRootSpan && (spanToJSON(activeRootSpan) as { op?: string }).op === 'navigation') {
-        // Determine pathname based on router type
-        let pathname: string | undefined;
-        if (isMemoryRouter) {
-          // For memory routers, only use targetPath
-          pathname = targetPath;
-        } else {
-          // For browser routers, use targetPath or fall back to window.location
-          pathname = targetPath || WINDOW.location?.pathname;
+      const lazyLoadPromise = (async () => {
+        const result = await originalPatchRoutes(args);
+
+        const currentActiveRootSpan = getActiveRootSpan();
+        if (currentActiveRootSpan && (spanToJSON(currentActiveRootSpan) as { op?: string }).op === 'navigation') {
+          const pathname = isMemoryRouter ? targetPath : targetPath || WINDOW.location?.pathname;
+
+          if (pathname) {
+            updateNavigationSpan(
+              currentActiveRootSpan,
+              { pathname, search: '', hash: '', state: null, key: 'default' },
+              Array.from(allRoutes),
+              false,
+              _matchRoutes,
+            );
+          }
         }
 
-        if (pathname) {
-          updateNavigationSpan(
-            activeRootSpan,
-            { pathname, search: '', hash: '', state: null, key: 'default' },
-            Array.from(allRoutes),
-            false, // forceUpdate = false since this is after lazy routes are loaded
-            _matchRoutes,
-          );
-        }
+        return result;
+      })();
+
+      if (activeRootSpan) {
+        trackLazyRouteLoad(activeRootSpan, lazyLoadPromise);
       }
 
-      return result;
+      return lazyLoadPromise;
     },
   };
 }
 
-function getNavigationKey(location: Location): string {
-  return `${location.pathname}${location.search}${location.hash}`;
-}
-
-function tryUpdateSpanName(
-  activeSpan: Span,
-  currentSpanName: string | undefined,
-  newName: string,
-  newSource: string,
-): void {
-  // Check if the new name contains React Router parameter syntax (/:param/)
-  const isReactRouterParam = /\/:[a-zA-Z0-9_]+/.test(newName);
-  const isNewNameParameterized = newName !== currentSpanName && isReactRouterParam;
-  if (isNewNameParameterized) {
-    activeSpan.updateName(newName);
-    activeSpan.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, newSource as 'route' | 'url' | 'custom');
-  }
-}
-
-function isDuplicateNavigation(client: Client, navigationKey: string): boolean {
-  const lastKey = LAST_NAVIGATION_PER_CLIENT.get(client);
-  return lastKey === navigationKey;
-}
-
-function createNavigationSpan(opts: {
-  client: Client;
-  name: string;
-  source: string;
-  version: string;
-  location: Location;
-  routes: RouteObject[];
-  basename?: string;
-  allRoutes?: RouteObject[];
-  navigationKey: string;
-}): Span | undefined {
-  const { client, name, source, version, location, routes, basename, allRoutes, navigationKey } = opts;
-
-  const navigationSpan = startBrowserTracingNavigationSpan(client, {
-    name,
-    attributes: {
-      [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: source as 'route' | 'url' | 'custom',
-      [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation',
-      [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: `auto.navigation.react.reactrouter_v${version}`,
-    },
-  });
-
-  if (navigationSpan) {
-    LAST_NAVIGATION_PER_CLIENT.set(client, navigationKey);
-    patchNavigationSpanEnd(navigationSpan, location, routes, basename, allRoutes);
-
-    const unsubscribe = client.on('spanEnd', endedSpan => {
-      if (endedSpan === navigationSpan) {
-        // Clear key only if it's still our key (handles overlapping navigations)
-        const lastKey = LAST_NAVIGATION_PER_CLIENT.get(client);
-        if (lastKey === navigationKey) {
-          LAST_NAVIGATION_PER_CLIENT.delete(client);
-        }
-        unsubscribe(); // Prevent memory leak
-      }
-    });
-  }
-
-  return navigationSpan;
-}
-
+// eslint-disable-next-line complexity
 export function handleNavigation(opts: {
   location: Location;
   routes: RouteObject[];
@@ -714,33 +789,84 @@ export function handleNavigation(opts: {
       basename,
     );
 
-    const currentNavigationKey = getNavigationKey(location);
-    const isNavDuplicate = isDuplicateNavigation(client, currentNavigationKey);
+    const locationKey = computeLocationKey(location);
+    const trackedNav = activeNavigationSpans.get(client);
+
+    // Determine if this navigation should be skipped as a duplicate
+    const trackedSpanHasEnded =
+      trackedNav && !trackedNav.isPlaceholder ? !!spanToJSON(trackedNav.span).timestamp : false;
+    const { skip, shouldUpdate } = shouldSkipNavigation(trackedNav, locationKey, name, trackedSpanHasEnded);
+
+    if (skip) {
+      if (shouldUpdate && trackedNav) {
+        const oldName = trackedNav.routeName;
+
+        if (trackedNav.isPlaceholder) {
+          // Update placeholder's route name - the real span will be created with this name
+          trackedNav.routeName = name;
+          DEBUG_BUILD &&
+            debug.log(
+              `[Tracing] Updated placeholder navigation name from "${oldName}" to "${name}" (will apply to real span)`,
+            );
+        } else {
+          // Update existing real span from wildcard to parameterized route name
+          trackedNav.span.updateName(name);
+          trackedNav.span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, source as 'route' | 'url' | 'custom');
+          addNonEnumerableProperty(
+            trackedNav.span as { __sentry_navigation_name_set__?: boolean },
+            '__sentry_navigation_name_set__',
+            true,
+          );
+          trackedNav.routeName = name;
+          DEBUG_BUILD && debug.log(`[Tracing] Updated navigation span name from "${oldName}" to "${name}"`);
+        }
+      } else {
+        DEBUG_BUILD && debug.log(`[Tracing] Skipping duplicate navigation for location: ${locationKey}`);
+      }
+      return;
+    }
 
-    if (isNavDuplicate) {
-      // Cross-usage duplicate - update existing span name if better
-      const activeSpan = getActiveSpan();
-      const spanJson = activeSpan && spanToJSON(activeSpan);
-      const isAlreadyInNavigationSpan = spanJson?.op === 'navigation';
+    // Create new navigation span (first navigation or legitimate new navigation)
+    // Reserve the spot in the map first to prevent race conditions
+    // Mark as placeholder to prevent concurrent handleNavigation calls from creating duplicates
+    const placeholderSpan = { end: () => {} } as unknown as Span;
+    const placeholderEntry = {
+      span: placeholderSpan,
+      routeName: name,
+      pathname: location.pathname,
+      locationKey,
+      isPlaceholder: true as const,
+    };
+    activeNavigationSpans.set(client, placeholderEntry);
+
+    let navigationSpan: Span | undefined;
+    try {
+      navigationSpan = startBrowserTracingNavigationSpan(client, {
+        name: placeholderEntry.routeName, // Use placeholder's routeName in case it was updated
+        attributes: {
+          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: source,
+          [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation',
+          [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: `auto.navigation.react.reactrouter_v${version}`,
+        },
+      });
+    } catch (e) {
+      // If span creation fails, remove the placeholder so we don't block future navigations
+      activeNavigationSpans.delete(client);
+      throw e;
+    }
 
-      if (isAlreadyInNavigationSpan && activeSpan) {
-        tryUpdateSpanName(activeSpan, spanJson?.description, name, source);
-      }
-    } else {
-      // Not a cross-usage duplicate - create new span
-      // This handles: different routes, same route with different params (/user/2 → /user/3)
-      // startBrowserTracingNavigationSpan will end any active navigation span
-      createNavigationSpan({
-        client,
-        name,
-        source,
-        version,
-        location,
-        routes,
-        basename,
-        allRoutes,
-        navigationKey: currentNavigationKey,
+    if (navigationSpan) {
+      // Update the map with the real span (isPlaceholder omitted, defaults to false)
+      activeNavigationSpans.set(client, {
+        span: navigationSpan,
+        routeName: placeholderEntry.routeName, // Use the (potentially updated) placeholder routeName
+        pathname: location.pathname,
+        locationKey,
       });
+      patchSpanEnd(navigationSpan, location, routes, basename, allRoutes, 'navigation');
+    } else {
+      // If no span was created, remove the placeholder
+      activeNavigationSpans.delete(client);
     }
   }
 }
@@ -809,11 +935,93 @@ function updatePageloadTransaction({
       activeRootSpan.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, source);
 
       // Patch span.end() to ensure we update the name one last time before the span is sent
-      patchPageloadSpanEnd(activeRootSpan, location, routes, basename, allRoutes);
+      patchSpanEnd(activeRootSpan, location, routes, basename, allRoutes, 'pageload');
     }
   }
 }
 
+/**
+ * Determines if a span name should be updated during wildcard route resolution.
+ *
+ * Update conditions (in priority order):
+ * 1. No current name + allowNoCurrentName: true → always update (pageload spans)
+ * 2. Current name has wildcard + new is route without wildcard → upgrade (e.g., "/users/*" → "/users/:id")
+ * 3. Current source is not 'route' + new source is 'route' → upgrade (e.g., URL → parameterized route)
+ *
+ * @param currentName - The current span name (may be undefined)
+ * @param currentSource - The current span source ('route', 'url', or undefined)
+ * @param newName - The proposed new span name
+ * @param newSource - The proposed new span source
+ * @param allowNoCurrentName - If true, allow updates when there's no current name (for pageload spans)
+ * @returns true if the span name should be updated
+ */
+function shouldUpdateWildcardSpanName(
+  currentName: string | undefined,
+  currentSource: string | undefined,
+  newName: string,
+  newSource: string,
+  allowNoCurrentName = false,
+): boolean {
+  if (!newName) {
+    return false;
+  }
+
+  if (!currentName && allowNoCurrentName) {
+    return true;
+  }
+
+  const hasWildcard = currentName && transactionNameHasWildcard(currentName);
+
+  if (hasWildcard && newSource === 'route' && !transactionNameHasWildcard(newName)) {
+    return true;
+  }
+
+  if (currentSource !== 'route' && newSource === 'route') {
+    return true;
+  }
+
+  return false;
+}
+
+function tryUpdateSpanNameBeforeEnd(
+  span: Span,
+  spanJson: ReturnType<typeof spanToJSON>,
+  currentName: string | undefined,
+  location: Location,
+  routes: RouteObject[],
+  basename: string | undefined,
+  spanType: 'pageload' | 'navigation',
+  allRoutes: Set<RouteObject>,
+): void {
+  try {
+    const currentSource = spanJson.data?.[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE];
+
+    if (currentSource === 'route' && currentName && !transactionNameHasWildcard(currentName)) {
+      return;
+    }
+
+    const currentAllRoutes = Array.from(allRoutes);
+    const routesToUse = currentAllRoutes.length > 0 ? currentAllRoutes : routes;
+    const branches = _matchRoutes(routesToUse, location, basename) as unknown as RouteMatch[];
+
+    if (!branches) {
+      return;
+    }
+
+    const [name, source] = resolveRouteNameAndSource(location, routesToUse, routesToUse, branches, basename);
+
+    const isImprovement = shouldUpdateWildcardSpanName(currentName, currentSource, name, source, true);
+    const spanNotEnded = spanType === 'pageload' || !spanJson.timestamp;
+
+    if (isImprovement && spanNotEnded) {
+      span.updateName(name);
+      span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, source);
+    }
+  } catch (error) {
+    DEBUG_BUILD && debug.warn(`Error updating span details before ending: ${error}`);
+  }
+}
+
 /**
  * Patches the span.end() method to update the transaction name one last time before the span is sent.
  * This handles cases where the span is cancelled early (e.g., document.hidden) before lazy routes have finished loading.
@@ -833,71 +1041,93 @@ function patchSpanEnd(
     return;
   }
 
+  // Use the passed route context, or fall back to global Set
+  const allRoutesSet = _allRoutes ? new Set(_allRoutes) : allRoutes;
+
   const originalEnd = span.end.bind(span);
+  let endCalled = false;
 
   span.end = function patchedEnd(...args) {
-    try {
-      // Only update if the span source is not already 'route' (i.e., it hasn't been parameterized yet)
-      const spanJson = spanToJSON(span);
-      const currentSource = spanJson.data?.[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE];
-      if (currentSource !== 'route') {
-        // Last chance to update the transaction name with the latest route info
-        // Use the live global allRoutes Set to include any lazy routes loaded after patching
-        const currentAllRoutes = Array.from(allRoutes);
-        const branches = _matchRoutes(
-          currentAllRoutes.length > 0 ? currentAllRoutes : routes,
-          location,
-          basename,
-        ) as unknown as RouteMatch[];
+    if (endCalled) {
+      return;
+    }
+    endCalled = true;
+
+    // Capture timestamp immediately to avoid delay from async operations
+    // If no timestamp was provided, capture the current time now
+    const endTimestamp = args.length > 0 ? args[0] : Date.now() / 1000;
+
+    const spanJson = spanToJSON(span);
+    const currentName = spanJson.description;
+    const currentSource = spanJson.data?.[SEMANTIC_ATTRIBUTE_SENTRY_SOURCE];
+
+    // Helper to clean up activeNavigationSpans after span ends
+    const cleanupNavigationSpan = (): void => {
+      const client = getClient();
+      if (client && spanType === 'navigation') {
+        const trackedNav = activeNavigationSpans.get(client);
+        if (trackedNav && trackedNav.span === span) {
+          activeNavigationSpans.delete(client);
+        }
+      }
+    };
+
+    const pendingPromises = pendingLazyRouteLoads.get(span);
+    // Wait for lazy routes if:
+    // 1. There are pending promises AND
+    // 2. Current name exists AND
+    // 3. Either the name has a wildcard OR the source is not 'route' (URL-based names)
+    const shouldWaitForLazyRoutes =
+      pendingPromises &&
+      pendingPromises.size > 0 &&
+      currentName &&
+      (transactionNameHasWildcard(currentName) || currentSource !== 'route');
+
+    if (shouldWaitForLazyRoutes) {
+      if (_lazyRouteTimeout === 0) {
+        tryUpdateSpanNameBeforeEnd(span, spanJson, currentName, location, routes, basename, spanType, allRoutesSet);
+        cleanupNavigationSpan();
+        originalEnd(endTimestamp);
+        return;
+      }
 
-        if (branches) {
-          const [name, source] = resolveRouteNameAndSource(
+      const allSettled = Promise.allSettled(pendingPromises).then(() => {});
+      const waitPromise =
+        _lazyRouteTimeout === Infinity
+          ? allSettled
+          : Promise.race([allSettled, new Promise<void>(r => setTimeout(r, _lazyRouteTimeout))]);
+
+      waitPromise
+        .then(() => {
+          const updatedSpanJson = spanToJSON(span);
+          tryUpdateSpanNameBeforeEnd(
+            span,
+            updatedSpanJson,
+            updatedSpanJson.description,
             location,
-            currentAllRoutes.length > 0 ? currentAllRoutes : routes,
-            currentAllRoutes.length > 0 ? currentAllRoutes : routes,
-            branches,
+            routes,
             basename,
+            spanType,
+            allRoutesSet,
           );
-
-          // Only update if we have a valid name
-          if (name && (spanType === 'pageload' || !spanJson.timestamp)) {
-            span.updateName(name);
-            span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, source);
-          }
-        }
-      }
-    } catch (error) {
-      // Silently catch errors to ensure span.end() is always called
-      DEBUG_BUILD && debug.warn(`Error updating span details before ending: ${error}`);
+          cleanupNavigationSpan();
+          originalEnd(endTimestamp);
+        })
+        .catch(() => {
+          cleanupNavigationSpan();
+          originalEnd(endTimestamp);
+        });
+      return;
     }
 
-    return originalEnd(...args);
+    tryUpdateSpanNameBeforeEnd(span, spanJson, currentName, location, routes, basename, spanType, allRoutesSet);
+    cleanupNavigationSpan();
+    originalEnd(endTimestamp);
   };
 
-  // Mark this span as having its end() method patched to prevent duplicate patching
   addNonEnumerableProperty(span as unknown as Record<string, boolean>, patchedPropertyName, true);
 }
 
-function patchPageloadSpanEnd(
-  span: Span,
-  location: Location,
-  routes: RouteObject[],
-  basename: string | undefined,
-  _allRoutes: RouteObject[] | undefined,
-): void {
-  patchSpanEnd(span, location, routes, basename, _allRoutes, 'pageload');
-}
-
-function patchNavigationSpanEnd(
-  span: Span,
-  location: Location,
-  routes: RouteObject[],
-  basename: string | undefined,
-  _allRoutes: RouteObject[] | undefined,
-): void {
-  patchSpanEnd(span, location, routes, basename, _allRoutes, 'navigation');
-}
-
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function createV6CompatibleWithSentryReactRouterRouting<P extends Record<string, any>, R extends React.FC<P>>(
   Routes: R,
@@ -933,11 +1163,13 @@ export function createV6CompatibleWithSentryReactRouterRouting<P extends Record<
           });
           isMountRenderPass.current = false;
         } else {
+          // Note: Component-based routes don't support lazy route tracking via lazyRouteTimeout
+          // because React.lazy() loads happen at the component level, not the router level.
+          // Use createBrowserRouter with patchRoutesOnNavigation for lazy route tracking.
           handleNavigation({ location, routes, navigationType, version, allRoutes: Array.from(allRoutes) });
         }
       },
-      // `props.children` is purposely not included in the dependency array, because we do not want to re-run this effect
-      // when the children change. We only want to start transactions when the location or navigation type change.
+      // Re-run only on location/navigation changes, not children changes
       [location, navigationType],
     );
 
diff --git a/packages/react/src/reactrouter-compat-utils/utils.ts b/packages/react/src/reactrouter-compat-utils/utils.ts
index 4cec7bd98dcd..8431e283108b 100644
--- a/packages/react/src/reactrouter-compat-utils/utils.ts
+++ b/packages/react/src/reactrouter-compat-utils/utils.ts
@@ -38,6 +38,11 @@ export function pathEndsWithWildcard(path: string): boolean {
   return path.endsWith('*');
 }
 
+/** Checks if transaction name has wildcard (/* or ends with *). */
+export function transactionNameHasWildcard(name: string): boolean {
+  return name.includes('/*') || name.endsWith('*');
+}
+
 /**
  * Checks if a path is a wildcard and has child routes.
  */
diff --git a/packages/react/test/reactrouter-compat-utils/instrumentation.test.tsx b/packages/react/test/reactrouter-compat-utils/instrumentation.test.tsx
index bad264d3d6b5..276a5b9950fc 100644
--- a/packages/react/test/reactrouter-compat-utils/instrumentation.test.tsx
+++ b/packages/react/test/reactrouter-compat-utils/instrumentation.test.tsx
@@ -2,7 +2,7 @@
  * @vitest-environment jsdom
  */
 import type { Client, Span } from '@sentry/core';
-import { addNonEnumerableProperty } from '@sentry/core';
+import { addNonEnumerableProperty, spanToJSON } from '@sentry/core';
 import * as React from 'react';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 import {
@@ -10,7 +10,13 @@ import {
   createReactRouterV6CompatibleTracingIntegration,
   updateNavigationSpan,
 } from '../../src/reactrouter-compat-utils';
-import { addRoutesToAllRoutes, allRoutes } from '../../src/reactrouter-compat-utils/instrumentation';
+import {
+  addRoutesToAllRoutes,
+  allRoutes,
+  computeLocationKey,
+  shouldSkipNavigation,
+} from '../../src/reactrouter-compat-utils/instrumentation';
+import { resolveRouteNameAndSource, transactionNameHasWildcard } from '../../src/reactrouter-compat-utils/utils';
 import type { Location, RouteObject } from '../../src/types';
 
 const mockUpdateName = vi.fn();
@@ -35,6 +41,7 @@ vi.mock('@sentry/browser', async requireActual => {
   return {
     ...(actual as any),
     startBrowserTracingNavigationSpan: vi.fn(),
+    startBrowserTracingPageLoadSpan: vi.fn(),
     browserTracingIntegration: vi.fn(() => ({
       setup: vi.fn(),
       afterAllSetup: vi.fn(),
@@ -49,6 +56,9 @@ vi.mock('../../src/reactrouter-compat-utils/utils', () => ({
   getGlobalLocation: vi.fn(() => ({ pathname: '/test', search: '', hash: '' })),
   getGlobalPathname: vi.fn(() => '/test'),
   routeIsDescendant: vi.fn(() => false),
+  transactionNameHasWildcard: vi.fn((name: string) => {
+    return name.includes('/*') || name === '*' || name.endsWith('*');
+  }),
 }));
 
 vi.mock('../../src/reactrouter-compat-utils/lazy-routes', () => ({
@@ -370,3 +380,932 @@ describe('addRoutesToAllRoutes', () => {
     expect(firstCount).toBe(secondCount);
   });
 });
+
+describe('updateNavigationSpan with wildcard detection', () => {
+  const sampleLocation: Location = {
+    pathname: '/test',
+    search: '',
+    hash: '',
+    state: null,
+    key: 'default',
+  };
+
+  const sampleRoutes: RouteObject[] = [
+    { path: '/', element: <div>Home</div> },
+    { path: '/about', element: <div>About</div> },
+  ];
+
+  const mockMatchRoutes = vi.fn(() => []);
+
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('should call updateName when provided with valid routes', () => {
+    const testSpan = { ...mockSpan };
+    updateNavigationSpan(testSpan, sampleLocation, sampleRoutes, false, mockMatchRoutes);
+
+    expect(mockUpdateName).toHaveBeenCalledWith('Test Route');
+    expect(mockSetAttribute).toHaveBeenCalledWith('sentry.source', 'route');
+  });
+
+  it('should handle forced updates', () => {
+    const testSpan = { ...mockSpan, __sentry_navigation_name_set__: true };
+    updateNavigationSpan(testSpan, sampleLocation, sampleRoutes, true, mockMatchRoutes);
+
+    // Should update even though already named because forceUpdate=true
+    expect(mockUpdateName).toHaveBeenCalledWith('Test Route');
+  });
+});
+
+describe('tryUpdateSpanNameBeforeEnd - source upgrade logic', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('should upgrade from URL source to route source (regression fix)', async () => {
+    // Setup: Current span has URL source and non-parameterized name
+    vi.mocked(spanToJSON).mockReturnValue({
+      op: 'navigation',
+      description: '/users/123',
+      data: { 'sentry.source': 'url' },
+    } as any);
+
+    // Target: Resolves to route source with parameterized name
+    vi.mocked(resolveRouteNameAndSource).mockReturnValue(['/users/:id', 'route']);
+
+    const mockUpdateName = vi.fn();
+    const mockSetAttribute = vi.fn();
+    const testSpan = {
+      updateName: mockUpdateName,
+      setAttribute: mockSetAttribute,
+      end: vi.fn(),
+    } as unknown as Span;
+
+    // Simulate patchSpanEnd calling tryUpdateSpanNameBeforeEnd
+    // by updating the span name during a navigation
+    updateNavigationSpan(
+      testSpan,
+      { pathname: '/users/123', search: '', hash: '', state: null, key: 'test' },
+      [{ path: '/users/:id', element: <div /> }],
+      false,
+      vi.fn(() => [{ route: { path: '/users/:id' } }]),
+    );
+
+    // Should upgrade from URL to route source
+    expect(mockUpdateName).toHaveBeenCalledWith('/users/:id');
+    expect(mockSetAttribute).toHaveBeenCalledWith('sentry.source', 'route');
+  });
+
+  it('should not downgrade from route source to URL source', async () => {
+    // Setup: Current span has route source with parameterized name (no wildcard)
+    vi.mocked(spanToJSON).mockReturnValue({
+      op: 'navigation',
+      description: '/users/:id',
+      data: { 'sentry.source': 'route' },
+    } as any);
+
+    // Target: Would resolve to URL source (downgrade attempt)
+    vi.mocked(resolveRouteNameAndSource).mockReturnValue(['/users/456', 'url']);
+
+    const mockUpdateName = vi.fn();
+    const mockSetAttribute = vi.fn();
+    const testSpan = {
+      updateName: mockUpdateName,
+      setAttribute: mockSetAttribute,
+      end: vi.fn(),
+      __sentry_navigation_name_set__: true, // Mark as already named
+    } as unknown as Span;
+
+    updateNavigationSpan(
+      testSpan,
+      { pathname: '/users/456', search: '', hash: '', state: null, key: 'test' },
+      [{ path: '/users/:id', element: <div /> }],
+      false,
+      vi.fn(() => [{ route: { path: '/users/:id' } }]),
+    );
+
+    // Should not update because span is already named
+    // The early return in tryUpdateSpanNameBeforeEnd protects against downgrades
+    // This test verifies that route->url downgrades are blocked
+    expect(mockUpdateName).not.toHaveBeenCalled();
+    expect(mockSetAttribute).not.toHaveBeenCalled();
+  });
+
+  it('should upgrade wildcard names to specific routes', async () => {
+    // Setup: Current span has route source with wildcard
+    vi.mocked(spanToJSON).mockReturnValue({
+      op: 'navigation',
+      description: '/users/*',
+      data: { 'sentry.source': 'route' },
+    } as any);
+
+    // Mock wildcard detection: current name has wildcard, new name doesn't
+    vi.mocked(transactionNameHasWildcard).mockImplementation((name: string) => {
+      return name === '/users/*'; // Only the current name has wildcard
+    });
+
+    // Target: Resolves to specific parameterized route
+    vi.mocked(resolveRouteNameAndSource).mockReturnValue(['/users/:id', 'route']);
+
+    const mockUpdateName = vi.fn();
+    const mockSetAttribute = vi.fn();
+    const testSpan = {
+      updateName: mockUpdateName,
+      setAttribute: mockSetAttribute,
+      end: vi.fn(),
+    } as unknown as Span;
+
+    updateNavigationSpan(
+      testSpan,
+      { pathname: '/users/123', search: '', hash: '', state: null, key: 'test' },
+      [{ path: '/users/:id', element: <div /> }],
+      false,
+      vi.fn(() => [{ route: { path: '/users/:id' } }]),
+    );
+
+    // Should upgrade from wildcard to specific
+    expect(mockUpdateName).toHaveBeenCalledWith('/users/:id');
+    expect(mockSetAttribute).toHaveBeenCalledWith('sentry.source', 'route');
+  });
+
+  it('should not downgrade from wildcard route to URL', async () => {
+    // Setup: Current span has route source with wildcard
+    vi.mocked(spanToJSON).mockReturnValue({
+      op: 'navigation',
+      description: '/users/*',
+      data: { 'sentry.source': 'route' },
+    } as any);
+
+    // Mock wildcard detection: current name has wildcard, new name doesn't
+    vi.mocked(transactionNameHasWildcard).mockImplementation((name: string) => {
+      return name === '/users/*'; // Only the current wildcard name returns true
+    });
+
+    // Target: After timeout, resolves to URL (lazy route didn't finish loading)
+    vi.mocked(resolveRouteNameAndSource).mockReturnValue(['/users/123', 'url']);
+
+    const mockUpdateName = vi.fn();
+    const mockSetAttribute = vi.fn();
+    const testSpan = {
+      updateName: mockUpdateName,
+      setAttribute: mockSetAttribute,
+      end: vi.fn(),
+      __sentry_navigation_name_set__: true, // Mark span as already named/finalized
+    } as unknown as Span;
+
+    updateNavigationSpan(
+      testSpan,
+      { pathname: '/users/123', search: '', hash: '', state: null, key: 'test' },
+      [{ path: '/users/*', element: <div /> }],
+      false,
+      vi.fn(() => [{ route: { path: '/users/*' } }]),
+    );
+
+    // Should not update - keep wildcard route instead of downgrading to URL
+    // Wildcard routes are better than URLs for aggregation in performance monitoring
+    expect(mockUpdateName).not.toHaveBeenCalled();
+    expect(mockSetAttribute).not.toHaveBeenCalled();
+  });
+
+  it('should set name when no current name exists', async () => {
+    // Setup: Current span has no name (undefined)
+    vi.mocked(spanToJSON).mockReturnValue({
+      op: 'navigation',
+      description: undefined,
+    } as any);
+
+    // Target: Resolves to route
+    vi.mocked(resolveRouteNameAndSource).mockReturnValue(['/users/:id', 'route']);
+
+    const mockUpdateName = vi.fn();
+    const mockSetAttribute = vi.fn();
+    const testSpan = {
+      updateName: mockUpdateName,
+      setAttribute: mockSetAttribute,
+      end: vi.fn(),
+    } as unknown as Span;
+
+    updateNavigationSpan(
+      testSpan,
+      { pathname: '/users/123', search: '', hash: '', state: null, key: 'test' },
+      [{ path: '/users/:id', element: <div /> }],
+      false,
+      vi.fn(() => [{ route: { path: '/users/:id' } }]),
+    );
+
+    // Should set initial name
+    expect(mockUpdateName).toHaveBeenCalledWith('/users/:id');
+    expect(mockSetAttribute).toHaveBeenCalledWith('sentry.source', 'route');
+  });
+
+  it('should not update when same source and no improvement', async () => {
+    // Setup: Current span has URL source
+    vi.mocked(spanToJSON).mockReturnValue({
+      op: 'navigation',
+      description: '/users/123',
+      data: { 'sentry.source': 'url' },
+    } as any);
+
+    // Target: Resolves to same URL source (no improvement)
+    vi.mocked(resolveRouteNameAndSource).mockReturnValue(['/users/123', 'url']);
+
+    const mockUpdateName = vi.fn();
+    const mockSetAttribute = vi.fn();
+    const testSpan = {
+      updateName: mockUpdateName,
+      setAttribute: mockSetAttribute,
+      end: vi.fn(),
+    } as unknown as Span;
+
+    updateNavigationSpan(
+      testSpan,
+      { pathname: '/users/123', search: '', hash: '', state: null, key: 'test' },
+      [{ path: '/users/:id', element: <div /> }],
+      false,
+      vi.fn(() => [{ route: { path: '/users/:id' } }]),
+    );
+
+    // Note: updateNavigationSpan always updates if not already named
+    // This test validates that the isImprovement logic works correctly in tryUpdateSpanNameBeforeEnd
+    // which is called during span.end() patching
+    expect(mockUpdateName).toHaveBeenCalled(); // Initial set is allowed
+  });
+
+  describe('computeLocationKey (pure function)', () => {
+    it('should include pathname, search, and hash in location key', () => {
+      const location: Location = {
+        pathname: '/search',
+        search: '?q=foo',
+        hash: '#results',
+        state: null,
+        key: 'test',
+      };
+
+      const result = computeLocationKey(location);
+
+      expect(result).toBe('/search?q=foo#results');
+    });
+
+    it('should differentiate locations with same pathname but different query', () => {
+      const loc1: Location = { pathname: '/search', search: '?q=foo', hash: '', state: null, key: 'k1' };
+      const loc2: Location = { pathname: '/search', search: '?q=bar', hash: '', state: null, key: 'k2' };
+
+      const key1 = computeLocationKey(loc1);
+      const key2 = computeLocationKey(loc2);
+
+      // Verifies that search params are included in the location key
+      expect(key1).not.toBe(key2);
+      expect(key1).toBe('/search?q=foo');
+      expect(key2).toBe('/search?q=bar');
+    });
+
+    it('should differentiate locations with same pathname but different hash', () => {
+      const loc1: Location = { pathname: '/page', search: '', hash: '#section1', state: null, key: 'k1' };
+      const loc2: Location = { pathname: '/page', search: '', hash: '#section2', state: null, key: 'k2' };
+
+      const key1 = computeLocationKey(loc1);
+      const key2 = computeLocationKey(loc2);
+
+      // Verifies that hash values are included in the location key
+      expect(key1).not.toBe(key2);
+      expect(key1).toBe('/page#section1');
+      expect(key2).toBe('/page#section2');
+    });
+
+    it('should produce same key for identical locations', () => {
+      const loc1: Location = { pathname: '/users', search: '?id=123', hash: '#profile', state: null, key: 'k1' };
+      const loc2: Location = { pathname: '/users', search: '?id=123', hash: '#profile', state: null, key: 'k2' };
+
+      expect(computeLocationKey(loc1)).toBe(computeLocationKey(loc2));
+    });
+
+    it('should normalize undefined/null search and hash to empty strings (partial location objects)', () => {
+      // When <Routes location="/users"> receives a string, React Router creates a partial location
+      // with search: undefined and hash: undefined. We must normalize these to empty strings
+      // to match the keys from full location objects (which have search: '' and hash: '').
+      // This prevents duplicate navigation spans when using <Routes location> prop (common in modal routes).
+      const partialLocation: Location = {
+        pathname: '/users',
+        search: undefined as unknown as string,
+        hash: undefined as unknown as string,
+        state: null,
+        key: 'test1',
+      };
+
+      const fullLocation: Location = {
+        pathname: '/users',
+        search: '',
+        hash: '',
+        state: null,
+        key: 'test2',
+      };
+
+      const partialKey = computeLocationKey(partialLocation);
+      const fullKey = computeLocationKey(fullLocation);
+
+      // Verifies that undefined values are normalized to empty strings, preventing
+      // '/usersundefinedundefined' !== '/users' mismatches
+      expect(partialKey).toBe('/users');
+      expect(fullKey).toBe('/users');
+      expect(partialKey).toBe(fullKey);
+    });
+
+    it('should normalize null search and hash to empty strings', () => {
+      const locationWithNulls: Location = {
+        pathname: '/products',
+        search: null as unknown as string,
+        hash: null as unknown as string,
+        state: null,
+        key: 'test3',
+      };
+
+      const locationWithEmptyStrings: Location = {
+        pathname: '/products',
+        search: '',
+        hash: '',
+        state: null,
+        key: 'test4',
+      };
+
+      expect(computeLocationKey(locationWithNulls)).toBe('/products');
+      expect(computeLocationKey(locationWithEmptyStrings)).toBe('/products');
+      expect(computeLocationKey(locationWithNulls)).toBe(computeLocationKey(locationWithEmptyStrings));
+    });
+  });
+
+  describe('shouldSkipNavigation (pure function - duplicate detection logic)', () => {
+    const mockSpan: Span = { updateName: vi.fn(), setAttribute: vi.fn(), end: vi.fn() } as unknown as Span;
+
+    it('should not skip when no tracked navigation exists', () => {
+      const result = shouldSkipNavigation(undefined, '/users', '/users/:id', false);
+
+      expect(result).toEqual({ skip: false, shouldUpdate: false });
+    });
+
+    it('should skip placeholder navigations for same locationKey', () => {
+      const trackedNav = {
+        span: mockSpan,
+        routeName: '/search',
+        pathname: '/search',
+        locationKey: '/search?q=foo',
+        isPlaceholder: true,
+      };
+
+      const result = shouldSkipNavigation(trackedNav, '/search?q=foo', '/search', false);
+
+      // Verifies that placeholder navigations for the same locationKey are skipped
+      expect(result.skip).toBe(true);
+      expect(result.shouldUpdate).toBe(false);
+    });
+
+    it('should NOT skip placeholder navigations for different locationKey (query change)', () => {
+      const trackedNav = {
+        span: mockSpan,
+        routeName: '/search',
+        pathname: '/search',
+        locationKey: '/search?q=foo',
+        isPlaceholder: true,
+      };
+
+      const result = shouldSkipNavigation(trackedNav, '/search?q=bar', '/search', false);
+
+      // Verifies that different locationKeys allow new navigation even with same pathname
+      expect(result.skip).toBe(false);
+      expect(result.shouldUpdate).toBe(false);
+    });
+
+    it('should skip real span navigations for same locationKey when span has not ended', () => {
+      const trackedNav = {
+        span: mockSpan,
+        routeName: '/users/:id',
+        pathname: '/users/123',
+        locationKey: '/users/123?tab=profile',
+        isPlaceholder: false,
+      };
+
+      const result = shouldSkipNavigation(trackedNav, '/users/123?tab=profile', '/users/:id', false);
+
+      // Verifies that duplicate navigations are blocked when span hasn't ended
+      expect(result.skip).toBe(true);
+    });
+
+    it('should NOT skip real span navigations for different locationKey (query change)', () => {
+      const trackedNav = {
+        span: mockSpan,
+        routeName: '/users/:id',
+        pathname: '/users/123',
+        locationKey: '/users/123?tab=profile',
+        isPlaceholder: false,
+      };
+
+      const result = shouldSkipNavigation(trackedNav, '/users/123?tab=settings', '/users/:id', false);
+
+      // Verifies that different locationKeys allow new navigation even with same pathname
+      expect(result.skip).toBe(false);
+    });
+
+    it('should NOT skip when tracked span has ended', () => {
+      const trackedNav = {
+        span: mockSpan,
+        routeName: '/users/:id',
+        pathname: '/users/123',
+        locationKey: '/users/123',
+        isPlaceholder: false,
+      };
+
+      const result = shouldSkipNavigation(trackedNav, '/users/123', '/users/:id', true);
+
+      // Allow new navigation when previous span has ended
+      expect(result.skip).toBe(false);
+    });
+
+    it('should set shouldUpdate=true for wildcard to parameterized upgrade', () => {
+      const trackedNav = {
+        span: mockSpan,
+        routeName: '/users/*',
+        pathname: '/users/123',
+        locationKey: '/users/123',
+        isPlaceholder: false,
+      };
+
+      const result = shouldSkipNavigation(trackedNav, '/users/123', '/users/:id', false);
+
+      // Verifies that wildcard names are upgraded to parameterized routes
+      expect(result.skip).toBe(true);
+      expect(result.shouldUpdate).toBe(true);
+    });
+
+    it('should NOT set shouldUpdate=true when both names are wildcards', () => {
+      const trackedNav = {
+        span: mockSpan,
+        routeName: '/users/*',
+        pathname: '/users/123',
+        locationKey: '/users/123',
+        isPlaceholder: false,
+      };
+
+      const result = shouldSkipNavigation(trackedNav, '/users/123', '/users/*', false);
+
+      expect(result.skip).toBe(true);
+      expect(result.shouldUpdate).toBe(false);
+    });
+  });
+
+  describe('handleNavigation integration (verifies wiring to pure functions)', () => {
+    // Verifies that handleNavigation correctly uses computeLocationKey and shouldSkipNavigation
+
+    let mockNavigationSpan: Span;
+
+    beforeEach(async () => {
+      // Reset all mocks
+      vi.clearAllMocks();
+
+      // Import fresh modules to reset internal state
+      const coreModule = await import('@sentry/core');
+      const browserModule = await import('@sentry/browser');
+      const instrumentationModule = await import('../../src/reactrouter-compat-utils/instrumentation');
+
+      // Create a mock span with end() that captures callback
+      mockNavigationSpan = {
+        updateName: vi.fn(),
+        setAttribute: vi.fn(),
+        end: vi.fn(),
+      } as unknown as Span;
+
+      // Mock getClient to return a client that's registered for instrumentation
+      const mockClient = {
+        addIntegration: vi.fn(),
+        emit: vi.fn(),
+        on: vi.fn(),
+        getOptions: vi.fn(() => ({})),
+      } as unknown as Client;
+      vi.mocked(coreModule.getClient).mockReturnValue(mockClient);
+
+      // Mock startBrowserTracingPageLoadSpan to avoid pageload span creation during setup
+      vi.mocked(browserModule.startBrowserTracingPageLoadSpan).mockReturnValue(undefined);
+
+      // Register client for instrumentation by adding it to the internal set
+      const integration = instrumentationModule.createReactRouterV6CompatibleTracingIntegration({
+        useEffect: vi.fn(),
+        useLocation: vi.fn(),
+        useNavigationType: vi.fn(),
+        createRoutesFromChildren: vi.fn(),
+        matchRoutes: vi.fn(),
+      });
+      integration.afterAllSetup(mockClient);
+
+      // Mock startBrowserTracingNavigationSpan to return our mock span
+      vi.mocked(browserModule.startBrowserTracingNavigationSpan).mockReturnValue(mockNavigationSpan);
+
+      // Mock spanToJSON to return different values for different calls
+      vi.mocked(coreModule.spanToJSON).mockReturnValue({ op: 'navigation' } as any);
+
+      // Mock getActiveRootSpan to return undefined (no pageload span)
+      vi.mocked(coreModule.getActiveSpan).mockReturnValue(undefined);
+    });
+
+    it('creates navigation span and uses computeLocationKey for tracking', async () => {
+      const { handleNavigation } = await import('../../src/reactrouter-compat-utils/instrumentation');
+      const { startBrowserTracingNavigationSpan } = await import('@sentry/browser');
+      const { resolveRouteNameAndSource } = await import('../../src/reactrouter-compat-utils/utils');
+
+      // Mock to return a specific route name
+      vi.mocked(resolveRouteNameAndSource).mockReturnValue(['/search', 'route']);
+
+      const location: Location = {
+        pathname: '/search',
+        search: '?q=foo',
+        hash: '#results',
+        state: null,
+        key: 'test1',
+      };
+
+      const matches = [
+        {
+          pathname: '/search',
+          pathnameBase: '/search',
+          route: { path: '/search', element: <div /> },
+          params: {},
+        },
+      ];
+
+      handleNavigation({
+        location,
+        routes: [{ path: '/search', element: <div /> }],
+        navigationType: 'PUSH',
+        version: '6' as const,
+        matches: matches as any,
+      });
+
+      // Verifies that handleNavigation calls startBrowserTracingNavigationSpan
+      expect(startBrowserTracingNavigationSpan).toHaveBeenCalledTimes(1);
+      expect(startBrowserTracingNavigationSpan).toHaveBeenCalledWith(
+        expect.objectContaining({ emit: expect.any(Function) }), // client
+        expect.objectContaining({
+          name: '/search',
+          attributes: expect.objectContaining({
+            'sentry.op': 'navigation',
+            'sentry.source': 'route',
+          }),
+        }),
+      );
+    });
+
+    it('blocks duplicate navigation for exact same locationKey (pathname+query+hash)', async () => {
+      const { handleNavigation } = await import('../../src/reactrouter-compat-utils/instrumentation');
+      const { startBrowserTracingNavigationSpan } = await import('@sentry/browser');
+      const { spanToJSON } = await import('@sentry/core');
+
+      const location: Location = {
+        pathname: '/search',
+        search: '?q=foo',
+        hash: '#results',
+        state: null,
+        key: 'test1',
+      };
+
+      const matches = [
+        {
+          pathname: '/search',
+          pathnameBase: '/search',
+          route: { path: '/search', element: <div /> },
+          params: {},
+        },
+      ];
+
+      // First navigation - should create span
+      handleNavigation({
+        location,
+        routes: [{ path: '/search', element: <div /> }],
+        navigationType: 'PUSH',
+        version: '6' as const,
+        matches: matches as any,
+      });
+
+      // Mock spanToJSON to indicate span hasn't ended yet
+      vi.mocked(spanToJSON).mockReturnValue({ op: 'navigation' } as any);
+
+      // Second navigation - exact same location, should be blocked
+      handleNavigation({
+        location: { ...location, key: 'test2' }, // Different key, same location
+        routes: [{ path: '/search', element: <div /> }],
+        navigationType: 'PUSH',
+        version: '6' as const,
+        matches: matches as any,
+      });
+
+      // Verifies that duplicate detection uses locationKey (not just pathname)
+      expect(startBrowserTracingNavigationSpan).toHaveBeenCalledTimes(1); // Only first call
+    });
+
+    it('allows navigation for same pathname but different query string', async () => {
+      const { handleNavigation } = await import('../../src/reactrouter-compat-utils/instrumentation');
+      const { startBrowserTracingNavigationSpan } = await import('@sentry/browser');
+      const { spanToJSON } = await import('@sentry/core');
+
+      const location1: Location = {
+        pathname: '/search',
+        search: '?q=foo',
+        hash: '',
+        state: null,
+        key: 'test1',
+      };
+
+      const matches = [
+        {
+          pathname: '/search',
+          pathnameBase: '/search',
+          route: { path: '/search', element: <div /> },
+          params: {},
+        },
+      ];
+
+      // First navigation
+      handleNavigation({
+        location: location1,
+        routes: [{ path: '/search', element: <div /> }],
+        navigationType: 'PUSH',
+        version: '6' as const,
+        matches: matches as any,
+      });
+
+      // Mock spanToJSON to indicate span hasn't ended yet
+      vi.mocked(spanToJSON).mockReturnValue({ op: 'navigation' } as any);
+
+      // Second navigation - same pathname, different query
+      const location2: Location = {
+        pathname: '/search',
+        search: '?q=bar',
+        hash: '',
+        state: null,
+        key: 'test2',
+      };
+
+      handleNavigation({
+        location: location2,
+        routes: [{ path: '/search', element: <div /> }],
+        navigationType: 'PUSH',
+        version: '6' as const,
+        matches: matches as any,
+      });
+
+      // Verifies that query params are included in locationKey for duplicate detection
+      expect(startBrowserTracingNavigationSpan).toHaveBeenCalledTimes(2); // Both calls should create spans
+    });
+
+    it('allows navigation for same pathname but different hash', async () => {
+      const { handleNavigation } = await import('../../src/reactrouter-compat-utils/instrumentation');
+      const { startBrowserTracingNavigationSpan } = await import('@sentry/browser');
+      const { spanToJSON } = await import('@sentry/core');
+
+      const location1: Location = {
+        pathname: '/page',
+        search: '',
+        hash: '#section1',
+        state: null,
+        key: 'test1',
+      };
+
+      const matches = [
+        {
+          pathname: '/page',
+          pathnameBase: '/page',
+          route: { path: '/page', element: <div /> },
+          params: {},
+        },
+      ];
+
+      // First navigation
+      handleNavigation({
+        location: location1,
+        routes: [{ path: '/page', element: <div /> }],
+        navigationType: 'PUSH',
+        version: '6' as const,
+        matches: matches as any,
+      });
+
+      // Mock spanToJSON to indicate span hasn't ended yet
+      vi.mocked(spanToJSON).mockReturnValue({ op: 'navigation' } as any);
+
+      // Second navigation - same pathname, different hash
+      const location2: Location = {
+        pathname: '/page',
+        search: '',
+        hash: '#section2',
+        state: null,
+        key: 'test2',
+      };
+
+      handleNavigation({
+        location: location2,
+        routes: [{ path: '/page', element: <div /> }],
+        navigationType: 'PUSH',
+        version: '6' as const,
+        matches: matches as any,
+      });
+
+      // Verifies that hash values are included in locationKey for duplicate detection
+      expect(startBrowserTracingNavigationSpan).toHaveBeenCalledTimes(2); // Both calls should create spans
+    });
+
+    it('updates wildcard span when better parameterized name becomes available', async () => {
+      const { handleNavigation } = await import('../../src/reactrouter-compat-utils/instrumentation');
+      const { startBrowserTracingNavigationSpan } = await import('@sentry/browser');
+      const { spanToJSON } = await import('@sentry/core');
+      const { transactionNameHasWildcard, resolveRouteNameAndSource } = await import(
+        '../../src/reactrouter-compat-utils/utils'
+      );
+
+      const location: Location = {
+        pathname: '/users/123',
+        search: '',
+        hash: '',
+        state: null,
+        key: 'test1',
+      };
+
+      const matches = [
+        {
+          pathname: '/users/123',
+          pathnameBase: '/users',
+          route: { path: '/users/*', element: <div /> },
+          params: { '*': '123' },
+        },
+      ];
+
+      // First navigation - resolves to wildcard name
+      vi.mocked(resolveRouteNameAndSource).mockReturnValue(['/users/*', 'route']);
+      // Mock transactionNameHasWildcard to return true for wildcards, false for parameterized
+      vi.mocked(transactionNameHasWildcard).mockImplementation((name: string) => {
+        return name.includes('/*') || name === '*' || name.endsWith('*');
+      });
+
+      handleNavigation({
+        location,
+        routes: [{ path: '/users/*', element: <div /> }],
+        navigationType: 'PUSH',
+        version: '6' as const,
+        matches: matches as any,
+      });
+
+      const firstSpan = mockNavigationSpan;
+      expect(startBrowserTracingNavigationSpan).toHaveBeenCalledTimes(1);
+
+      // Mock spanToJSON to indicate span hasn't ended yet and has wildcard name
+      vi.mocked(spanToJSON).mockReturnValue({
+        op: 'navigation',
+        description: '/users/*',
+        data: { 'sentry.source': 'route' },
+      } as any);
+
+      // Second navigation - same location but better parameterized name available
+      vi.mocked(resolveRouteNameAndSource).mockReturnValue(['/users/:id', 'route']);
+
+      handleNavigation({
+        location: { ...location, key: 'test2' },
+        routes: [{ path: '/users/:id', element: <div /> }],
+        navigationType: 'PUSH',
+        version: '6' as const,
+        matches: matches as any,
+      });
+
+      // Verifies that wildcard span names are upgraded when parameterized routes become available
+      // eslint-disable-next-line @typescript-eslint/unbound-method
+      expect(vi.mocked(firstSpan.updateName)).toHaveBeenCalledWith('/users/:id');
+      expect(startBrowserTracingNavigationSpan).toHaveBeenCalledTimes(1); // No new span created
+    });
+
+    it('prevents duplicate spans when <Routes location> prop is a string (partial location)', async () => {
+      // This test verifies the fix for the bug where <Routes location="/users"> creates
+      // a partial location object with search: undefined and hash: undefined, which
+      // would result in a different locationKey ('/usersundefinedundefined' vs '/users')
+      // causing duplicate navigation spans.
+      const { handleNavigation } = await import('../../src/reactrouter-compat-utils/instrumentation');
+      const { startBrowserTracingNavigationSpan } = await import('@sentry/browser');
+      const { spanToJSON } = await import('@sentry/core');
+      const { resolveRouteNameAndSource } = await import('../../src/reactrouter-compat-utils/utils');
+
+      // Mock resolveRouteNameAndSource to return consistent route name
+      vi.mocked(resolveRouteNameAndSource).mockReturnValue(['/users', 'route']);
+
+      const matches = [
+        {
+          pathname: '/users',
+          pathnameBase: '/users',
+          route: { path: '/users', element: <div /> },
+          params: {},
+        },
+      ];
+
+      // First call: Partial location (from <Routes location="/users">)
+      // React Router creates location with undefined search and hash
+      const partialLocation: Location = {
+        pathname: '/users',
+        search: undefined as unknown as string,
+        hash: undefined as unknown as string,
+        state: null,
+        key: 'test1',
+      };
+
+      handleNavigation({
+        location: partialLocation,
+        routes: [{ path: '/users', element: <div /> }],
+        navigationType: 'PUSH',
+        version: '6' as const,
+        matches: matches as any,
+      });
+
+      expect(startBrowserTracingNavigationSpan).toHaveBeenCalledTimes(1);
+
+      // Mock spanToJSON to indicate span hasn't ended yet
+      vi.mocked(spanToJSON).mockReturnValue({ op: 'navigation' } as any);
+
+      // Second call: Full location (from router.state)
+      // React Router provides location with empty string search and hash
+      const fullLocation: Location = {
+        pathname: '/users',
+        search: '',
+        hash: '',
+        state: null,
+        key: 'test2',
+      };
+
+      handleNavigation({
+        location: fullLocation,
+        routes: [{ path: '/users', element: <div /> }],
+        navigationType: 'PUSH',
+        version: '6' as const,
+        matches: matches as any,
+      });
+
+      // Verifies that undefined values are normalized, preventing duplicate spans
+      // (without normalization, '/usersundefinedundefined' != '/users' would create 2 spans)
+      expect(startBrowserTracingNavigationSpan).toHaveBeenCalledTimes(1);
+    });
+  });
+
+  describe('SSR-safe RAF fallback (scheduleCallback/cancelScheduledCallback)', () => {
+    // These tests verify that the RAF fallback works correctly in SSR environments
+
+    it('uses requestAnimationFrame when available', () => {
+      // Save original RAF
+      const originalRAF = window.requestAnimationFrame;
+      const rafSpy = vi.fn((cb: () => void) => {
+        cb();
+        return 123;
+      });
+      window.requestAnimationFrame = rafSpy;
+
+      try {
+        // Import module to trigger RAF usage
+        const scheduleCallback = (callback: () => void): number => {
+          if (window?.requestAnimationFrame) {
+            return window.requestAnimationFrame(callback);
+          }
+          return setTimeout(callback, 0) as unknown as number;
+        };
+
+        const mockCallback = vi.fn();
+        scheduleCallback(mockCallback);
+
+        // Verifies that requestAnimationFrame is used when available
+        expect(rafSpy).toHaveBeenCalled();
+        expect(mockCallback).toHaveBeenCalled();
+      } finally {
+        window.requestAnimationFrame = originalRAF;
+      }
+    });
+
+    it('falls back to setTimeout when requestAnimationFrame is unavailable (SSR)', () => {
+      // Simulate SSR by removing RAF
+      const originalRAF = window.requestAnimationFrame;
+      const originalCAF = window.cancelAnimationFrame;
+      // @ts-expect-error - Simulating SSR environment
+      delete window.requestAnimationFrame;
+      // @ts-expect-error - Simulating SSR environment
+      delete window.cancelAnimationFrame;
+
+      try {
+        const timeoutSpy = vi.spyOn(global, 'setTimeout');
+
+        // Import module to trigger setTimeout fallback
+        const scheduleCallback = (callback: () => void): number => {
+          if (window?.requestAnimationFrame) {
+            return window.requestAnimationFrame(callback);
+          }
+          return setTimeout(callback, 0) as unknown as number;
+        };
+
+        const mockCallback = vi.fn();
+        scheduleCallback(mockCallback);
+
+        // Verifies that setTimeout is used when requestAnimationFrame is unavailable
+        expect(timeoutSpy).toHaveBeenCalledWith(mockCallback, 0);
+      } finally {
+        window.requestAnimationFrame = originalRAF;
+        window.cancelAnimationFrame = originalCAF;
+      }
+    });
+  });
+});
diff --git a/packages/react/test/reactrouter-compat-utils/utils.test.ts b/packages/react/test/reactrouter-compat-utils/utils.test.ts
index 9ff48e7450bc..438b026104bd 100644
--- a/packages/react/test/reactrouter-compat-utils/utils.test.ts
+++ b/packages/react/test/reactrouter-compat-utils/utils.test.ts
@@ -9,6 +9,7 @@ import {
   prefixWithSlash,
   rebuildRoutePathFromAllRoutes,
   resolveRouteNameAndSource,
+  transactionNameHasWildcard,
 } from '../../src/reactrouter-compat-utils';
 import type { Location, MatchRoutes, RouteMatch, RouteObject } from '../../src/types';
 
@@ -629,4 +630,38 @@ describe('reactrouter-compat-utils/utils', () => {
       expect(result).toEqual(['/unknown', 'url']);
     });
   });
+
+  describe('transactionNameHasWildcard', () => {
+    it('should detect wildcard at the end of path', () => {
+      expect(transactionNameHasWildcard('/lazy/*')).toBe(true);
+      expect(transactionNameHasWildcard('/users/:id/*')).toBe(true);
+      expect(transactionNameHasWildcard('/products/:category/*')).toBe(true);
+    });
+
+    it('should detect standalone wildcard', () => {
+      expect(transactionNameHasWildcard('*')).toBe(true);
+    });
+
+    it('should detect wildcard in the middle of path', () => {
+      expect(transactionNameHasWildcard('/lazy/*/nested')).toBe(true);
+      expect(transactionNameHasWildcard('/a/*/b/*/c')).toBe(true);
+    });
+
+    it('should not detect wildcards in parameterized routes', () => {
+      expect(transactionNameHasWildcard('/users/:id')).toBe(false);
+      expect(transactionNameHasWildcard('/products/:category/:id')).toBe(false);
+      expect(transactionNameHasWildcard('/items/:itemId/details')).toBe(false);
+    });
+
+    it('should not detect wildcards in static routes', () => {
+      expect(transactionNameHasWildcard('/')).toBe(false);
+      expect(transactionNameHasWildcard('/about')).toBe(false);
+      expect(transactionNameHasWildcard('/users/profile')).toBe(false);
+    });
+
+    it('should handle edge cases', () => {
+      expect(transactionNameHasWildcard('')).toBe(false);
+      expect(transactionNameHasWildcard('/path/to/asterisk')).toBe(false); // 'asterisk' contains 'isk' but not '*'
+    });
+  });
 });

From 2ee464fc1a00c60e9438e6a5c27dc09e976e5e9c Mon Sep 17 00:00:00 2001
From: Daniel Griesser <daniel.griesser.86@gmail.com>
Date: Mon, 24 Nov 2025 10:14:07 +0100
Subject: [PATCH 115/186] chore: Add external contributor to CHANGELOG.md
 (#18297)

This PR adds the external contributor to the CHANGELOG.md file, so that
they are credited for their contribution. See #18281

Co-authored-by: nicohrubec <29484629+nicohrubec@users.noreply.github.com>
---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 479b72fc2f08..ac6b755cbb24 100644
--- a/CHANGELOG.md
+++ b/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 @bignoncedric. Thank you for your contribution!
+
 - feat(deps): Bump OpenTelemetry ([#18239](https://github.com/getsentry/sentry-javascript/pull/18239))
   - Bump @opentelemetry/context-async-hooks from ^2.1.0 to ^2.2.0
   - Bump @opentelemetry/core from ^2.1.0 to ^2.2.0

From b8127fbec3ab3412931eb643911384fa77f5dd9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81d=C3=A1m=20Kov=C3=A1cs?=
 <43071496+adam-kov@users.noreply.github.com>
Date: Mon, 24 Nov 2025 11:01:17 +0100
Subject: [PATCH 116/186] doc(sveltekit): Update documentation link for
 SvelteKit guide (#18298)

Readme incorrectly pointed to NextJS docs
---
 packages/sveltekit/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/sveltekit/README.md b/packages/sveltekit/README.md
index a21adc43b836..a7a51e695255 100644
--- a/packages/sveltekit/README.md
+++ b/packages/sveltekit/README.md
@@ -25,7 +25,7 @@ functionality related to SvelteKit.
 ## Installation
 
 To get started installing the SDK, use the Sentry Next.js Wizard by running the following command in your terminal or
-read the [Getting Started Docs](https://docs.sentry.io/platforms/javascript/guides/nextjs/):
+read the [Getting Started Docs](https://docs.sentry.io/platforms/javascript/guides/sveltekit/):
 
 ```sh
 npx @sentry/wizard@latest -i sveltekit

From 3d48cc66730723653893ebab7d1b3edab6e9ff3c Mon Sep 17 00:00:00 2001
From: Daniel Griesser <daniel.griesser.86@gmail.com>
Date: Mon, 24 Nov 2025 11:11:51 +0100
Subject: [PATCH 117/186] chore: Add external contributor to CHANGELOG.md
 (#18300)

This PR adds the external contributor to the CHANGELOG.md file, so that
they are credited for their contribution. See #18298

Co-authored-by: Lms24 <8420481+Lms24@users.noreply.github.com>
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac6b755cbb24..9bee97ac9189 100644
--- a/CHANGELOG.md
+++ b/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 @bignoncedric. Thank you for your contribution!
+Work in this release was contributed by @bignoncedric and @adam-kov. Thank you for your contributions!
 
 - feat(deps): Bump OpenTelemetry ([#18239](https://github.com/getsentry/sentry-javascript/pull/18239))
   - Bump @opentelemetry/context-async-hooks from ^2.1.0 to ^2.2.0

From 15256034ee8150a5b7dcb97d23eca1a5486f0cae Mon Sep 17 00:00:00 2001
From: Sigrid <32902192+s1gr1d@users.noreply.github.com>
Date: Mon, 24 Nov 2025 14:59:08 +0100
Subject: [PATCH 118/186] feat(browserprofiling): Add `manual` mode and
 deprecate old profiling (#18189)

Adds the `manual` mode for profiling and browser integration tests.

- adds deprecation note for old option
- adds some JSDoc comments to public-facing API to make the difference
between Node and UI profiling better visible.

Closes https://github.com/getsentry/sentry-javascript/issues/17279
---
 .../suites/profiling/manualMode/subject.js    |  76 ++++
 .../suites/profiling/manualMode/test.ts       |  93 +++++
 .../suites/profiling/test-utils.ts            |   2 +-
 packages/browser/src/client.ts                |   1 -
 packages/browser/src/exports.ts               |   1 +
 packages/browser/src/profiling/UIProfiler.ts  | 150 ++++---
 packages/browser/src/profiling/index.ts       |  55 +++
 packages/browser/src/profiling/integration.ts |  23 +-
 packages/browser/src/profiling/utils.ts       |  16 +-
 .../browser/test/profiling/UIProfiler.test.ts | 367 ++++++++++++++----
 packages/core/src/client.ts                   |  28 ++
 packages/core/src/profiling.ts                |   5 +
 .../core/src/types-hoist/browseroptions.ts    |   3 +-
 13 files changed, 681 insertions(+), 139 deletions(-)
 create mode 100644 dev-packages/browser-integration-tests/suites/profiling/manualMode/subject.js
 create mode 100644 dev-packages/browser-integration-tests/suites/profiling/manualMode/test.ts
 create mode 100644 packages/browser/src/profiling/index.ts

diff --git a/dev-packages/browser-integration-tests/suites/profiling/manualMode/subject.js b/dev-packages/browser-integration-tests/suites/profiling/manualMode/subject.js
new file mode 100644
index 000000000000..906f14d06693
--- /dev/null
+++ b/dev-packages/browser-integration-tests/suites/profiling/manualMode/subject.js
@@ -0,0 +1,76 @@
+import * as Sentry from '@sentry/browser';
+import { browserProfilingIntegration } from '@sentry/browser';
+
+window.Sentry = Sentry;
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  integrations: [browserProfilingIntegration()],
+  tracesSampleRate: 1,
+  profileSessionSampleRate: 1,
+  profileLifecycle: 'manual',
+});
+
+function largeSum(amount = 1000000) {
+  let sum = 0;
+  for (let i = 0; i < amount; i++) {
+    sum += Math.sqrt(i) * Math.sin(i);
+  }
+}
+
+function fibonacci(n) {
+  if (n <= 1) {
+    return n;
+  }
+  return fibonacci(n - 1) + fibonacci(n - 2);
+}
+
+function fibonacci1(n) {
+  if (n <= 1) {
+    return n;
+  }
+  return fibonacci1(n - 1) + fibonacci1(n - 2);
+}
+
+function fibonacci2(n) {
+  if (n <= 1) {
+    return n;
+  }
+  return fibonacci1(n - 1) + fibonacci1(n - 2);
+}
+
+function notProfiledFib(n) {
+  if (n <= 1) {
+    return n;
+  }
+  return fibonacci1(n - 1) + fibonacci1(n - 2);
+}
+
+// Adding setTimeout to ensure we cross the sampling interval to avoid flakes
+
+Sentry.uiProfiler.startProfiler();
+
+fibonacci(40);
+await new Promise(resolve => setTimeout(resolve, 25));
+
+largeSum();
+await new Promise(resolve => setTimeout(resolve, 25));
+
+Sentry.uiProfiler.stopProfiler();
+
+// ---
+
+notProfiledFib(40);
+await new Promise(resolve => setTimeout(resolve, 25));
+
+// ---
+
+Sentry.uiProfiler.startProfiler();
+
+fibonacci2(40);
+await new Promise(resolve => setTimeout(resolve, 25));
+
+Sentry.uiProfiler.stopProfiler();
+
+const client = Sentry.getClient();
+await client?.flush(8000);
diff --git a/dev-packages/browser-integration-tests/suites/profiling/manualMode/test.ts b/dev-packages/browser-integration-tests/suites/profiling/manualMode/test.ts
new file mode 100644
index 000000000000..2e4358563aa2
--- /dev/null
+++ b/dev-packages/browser-integration-tests/suites/profiling/manualMode/test.ts
@@ -0,0 +1,93 @@
+import { expect } from '@playwright/test';
+import type { ProfileChunkEnvelope } from '@sentry/core';
+import { sentryTest } from '../../../utils/fixtures';
+import {
+  countEnvelopes,
+  getMultipleSentryEnvelopeRequests,
+  properFullEnvelopeRequestParser,
+  shouldSkipTracingTest,
+} from '../../../utils/helpers';
+import { validateProfile, validateProfilePayloadMetadata } from '../test-utils';
+
+sentryTest(
+  'does not send profile envelope when document-policy is not set',
+  async ({ page, getLocalTestUrl, browserName }) => {
+    if (shouldSkipTracingTest() || browserName !== 'chromium') {
+      // Profiling only works when tracing is enabled
+      sentryTest.skip();
+    }
+
+    const url = await getLocalTestUrl({ testDir: __dirname });
+
+    // Assert that no profile_chunk envelope is sent without policy header
+    const chunkCount = await countEnvelopes(page, { url, envelopeType: 'profile_chunk', timeout: 1500 });
+    expect(chunkCount).toBe(0);
+  },
+);
+
+sentryTest('sends profile_chunk envelopes in manual mode', async ({ page, getLocalTestUrl, browserName }) => {
+  if (shouldSkipTracingTest() || browserName !== 'chromium') {
+    // Profiling only works when tracing is enabled
+    sentryTest.skip();
+  }
+
+  const url = await getLocalTestUrl({ testDir: __dirname, responseHeaders: { 'Document-Policy': 'js-profiling' } });
+
+  // In manual mode we start and stop once -> expect exactly one chunk
+  const profileChunkEnvelopes = await getMultipleSentryEnvelopeRequests<ProfileChunkEnvelope>(
+    page,
+    2,
+    { url, envelopeType: 'profile_chunk', timeout: 8000 },
+    properFullEnvelopeRequestParser,
+  );
+
+  expect(profileChunkEnvelopes.length).toBe(2);
+
+  // Validate the first chunk thoroughly
+  const profileChunkEnvelopeItem = profileChunkEnvelopes[0][1][0];
+  const envelopeItemHeader = profileChunkEnvelopeItem[0];
+  const envelopeItemPayload1 = profileChunkEnvelopeItem[1];
+
+  expect(envelopeItemHeader).toHaveProperty('type', 'profile_chunk');
+  expect(envelopeItemPayload1.profile).toBeDefined();
+
+  const profilerId1 = envelopeItemPayload1.profiler_id;
+
+  validateProfilePayloadMetadata(envelopeItemPayload1);
+
+  validateProfile(envelopeItemPayload1.profile, {
+    expectedFunctionNames: ['startJSSelfProfile', 'fibonacci', 'largeSum'],
+    minSampleDurationMs: 20,
+    isChunkFormat: true,
+  });
+
+  // only contains fibonacci
+  const functionNames1 = envelopeItemPayload1.profile.frames.map(frame => frame.function).filter(name => name !== '');
+  expect(functionNames1).toEqual(expect.not.arrayContaining(['fibonacci1', 'fibonacci2', 'fibonacci3']));
+
+  // === PROFILE CHUNK 2 ===
+
+  const profileChunkEnvelopeItem2 = profileChunkEnvelopes[1][1][0];
+  const envelopeItemHeader2 = profileChunkEnvelopeItem2[0];
+  const envelopeItemPayload2 = profileChunkEnvelopeItem2[1];
+
+  expect(envelopeItemHeader2).toHaveProperty('type', 'profile_chunk');
+  expect(envelopeItemPayload2.profile).toBeDefined();
+
+  expect(envelopeItemPayload2.profiler_id).toBe(profilerId1); // same profiler id for the whole session
+
+  validateProfilePayloadMetadata(envelopeItemPayload2);
+
+  validateProfile(envelopeItemPayload2.profile, {
+    expectedFunctionNames: [
+      'startJSSelfProfile',
+      'fibonacci1', // called by fibonacci2
+      'fibonacci2',
+    ],
+    isChunkFormat: true,
+  });
+
+  // does not contain notProfiledFib (called during unprofiled part)
+  const functionNames2 = envelopeItemPayload2.profile.frames.map(frame => frame.function).filter(name => name !== '');
+  expect(functionNames2).toEqual(expect.not.arrayContaining(['notProfiledFib']));
+});
diff --git a/dev-packages/browser-integration-tests/suites/profiling/test-utils.ts b/dev-packages/browser-integration-tests/suites/profiling/test-utils.ts
index e150be2d56bc..39e6d2ca20b7 100644
--- a/dev-packages/browser-integration-tests/suites/profiling/test-utils.ts
+++ b/dev-packages/browser-integration-tests/suites/profiling/test-utils.ts
@@ -90,7 +90,7 @@ export function validateProfile(
     }
   }
 
-  // Frames
+  // FRAMES
   expect(profile.frames.length).toBeGreaterThan(0);
   for (const frame of profile.frames) {
     expect(frame).toHaveProperty('function');
diff --git a/packages/browser/src/client.ts b/packages/browser/src/client.ts
index ea55174f340c..65fcdf24734a 100644
--- a/packages/browser/src/client.ts
+++ b/packages/browser/src/client.ts
@@ -130,7 +130,6 @@ export class BrowserClient extends Client<BrowserClientOptions> {
 
     // Flush logs and metrics when page becomes hidden (e.g., tab switch, navigation)
     // todo(v11): Remove the experimental flag
-    // eslint-disable-next-line deprecation/deprecation
     if (WINDOW.document && (sendClientReports || enableLogs || enableMetrics)) {
       WINDOW.document.addEventListener('visibilitychange', () => {
         if (WINDOW.document.visibilityState === 'hidden') {
diff --git a/packages/browser/src/exports.ts b/packages/browser/src/exports.ts
index 50223e4b9fd9..1b46687194da 100644
--- a/packages/browser/src/exports.ts
+++ b/packages/browser/src/exports.ts
@@ -78,6 +78,7 @@ export {
 export { WINDOW } from './helpers';
 export { BrowserClient } from './client';
 export { makeFetchTransport } from './transports/fetch';
+export { uiProfiler } from './profiling';
 export {
   defaultStackParser,
   defaultStackLineParsers,
diff --git a/packages/browser/src/profiling/UIProfiler.ts b/packages/browser/src/profiling/UIProfiler.ts
index 731684996d62..fb059b836986 100644
--- a/packages/browser/src/profiling/UIProfiler.ts
+++ b/packages/browser/src/profiling/UIProfiler.ts
@@ -1,4 +1,4 @@
-import type { Client, ProfileChunk, Span } from '@sentry/core';
+import type { Client, ContinuousProfiler, ProfileChunk, Span } from '@sentry/core';
 import {
   type ProfileChunkEnvelope,
   createEnvelope,
@@ -9,67 +9,122 @@ import {
   getSdkMetadataForEnvelopeHeader,
   uuid4,
 } from '@sentry/core';
+import type { BrowserOptions } from '../client';
 import { DEBUG_BUILD } from './../debug-build';
 import type { JSSelfProfiler } from './jsSelfProfiling';
-import { createProfileChunkPayload, startJSSelfProfile, validateProfileChunk } from './utils';
+import { createProfileChunkPayload, shouldProfileSession, startJSSelfProfile, validateProfileChunk } from './utils';
 
 const CHUNK_INTERVAL_MS = 60_000; // 1 minute
 // Maximum length for trace lifecycle profiling per root span (e.g. if spanEnd never fires)
-const MAX_ROOT_SPAN_PROFILE_MS = 300_000; // 5 minutes
+const MAX_ROOT_SPAN_PROFILE_MS = 300_000; // 5 minutes max per root span in trace mode
 
 /**
- * Browser trace-lifecycle profiler (UI Profiling / Profiling V2):
- * - Starts when the first sampled root span starts
- * - Stops when the last sampled root span ends
- * - While running, periodically stops and restarts the JS self-profiling API to collect chunks
+ * UIProfiler (Profiling V2):
+ * Supports two lifecycle modes:
+ *  - 'manual': controlled explicitly via start()/stop()
+ *  - 'trace': automatically runs while there are active sampled root spans
  *
  * Profiles are emitted as standalone `profile_chunk` envelopes either when:
  * - there are no more sampled root spans, or
  * - the 60s chunk timer elapses while profiling is running.
  */
-export class UIProfiler {
+export class UIProfiler implements ContinuousProfiler<Client> {
   private _client: Client | undefined;
   private _profiler: JSSelfProfiler | undefined;
   private _chunkTimer: ReturnType<typeof setTimeout> | undefined;
-  // For keeping track of active root spans
+
+  // Manual + Trace
+  private _profilerId: string | undefined; // one per Profiler session
+  private _isRunning: boolean; // current profiler instance active flag
+  private _sessionSampled: boolean; // sampling decision for entire session
+  private _lifecycleMode: 'manual' | 'trace' | undefined;
+
+  // Trace-only
   private _activeRootSpanIds: Set<string>;
   private _rootSpanTimeouts: Map<string, ReturnType<typeof setTimeout>>;
-  // ID for Profiler session
-  private _profilerId: string | undefined;
-  private _isRunning: boolean;
-  private _sessionSampled: boolean;
 
   public constructor() {
     this._client = undefined;
     this._profiler = undefined;
     this._chunkTimer = undefined;
-    this._activeRootSpanIds = new Set<string>();
-    this._rootSpanTimeouts = new Map<string, ReturnType<typeof setTimeout>>();
+
     this._profilerId = undefined;
     this._isRunning = false;
     this._sessionSampled = false;
+    this._lifecycleMode = undefined;
+
+    this._activeRootSpanIds = new Set();
+    this._rootSpanTimeouts = new Map();
   }
 
   /**
-   * Initialize the profiler with client and session sampling decision computed by the integration.
+   * Initialize the profiler with client, session sampling and lifecycle mode.
    */
-  public initialize(client: Client, sessionSampled: boolean): void {
-    // One Profiler ID per profiling session (user session)
-    this._profilerId = uuid4();
+  public initialize(client: Client): void {
+    const lifecycleMode = (client.getOptions() as BrowserOptions).profileLifecycle;
+    const sessionSampled = shouldProfileSession(client.getOptions());
+
+    DEBUG_BUILD && debug.log(`[Profiling] Initializing profiler (lifecycle='${lifecycleMode}').`);
 
-    DEBUG_BUILD && debug.log("[Profiling] Initializing profiler (lifecycle='trace').");
+    if (!sessionSampled) {
+      DEBUG_BUILD && debug.log('[Profiling] Session not sampled. Skipping lifecycle profiler initialization.');
+    }
 
+    // One Profiler ID per profiling session (user session)
+    this._profilerId = uuid4();
     this._client = client;
     this._sessionSampled = sessionSampled;
+    this._lifecycleMode = lifecycleMode;
 
-    this._setupTraceLifecycleListeners(client);
+    if (lifecycleMode === 'trace') {
+      this._setupTraceLifecycleListeners(client);
+    }
   }
 
-  /**
-   * Handle an already-active root span at integration setup time.
-   */
-  public notifyRootSpanActive(rootSpan: Span): void {
+  /** Starts UI profiling (only effective in 'manual' mode and when sampled). */
+  public start(): void {
+    if (this._lifecycleMode === 'trace') {
+      DEBUG_BUILD &&
+        debug.warn(
+          '[Profiling] `profileLifecycle` is set to "trace". Calls to `uiProfiler.start()` are ignored in trace mode.',
+        );
+      return;
+    }
+
+    if (this._isRunning) {
+      DEBUG_BUILD && debug.warn('[Profiling] Profile session is already running, `uiProfiler.start()` is a no-op.');
+      return;
+    }
+
     if (!this._sessionSampled) {
+      DEBUG_BUILD && debug.warn('[Profiling] Session is not sampled, `uiProfiler.start()` is a no-op.');
+      return;
+    }
+
+    this._beginProfiling();
+  }
+
+  /** Stops UI profiling (only effective in 'manual' mode). */
+  public stop(): void {
+    if (this._lifecycleMode === 'trace') {
+      DEBUG_BUILD &&
+        debug.warn(
+          '[Profiling] `profileLifecycle` is set to "trace". Calls to `uiProfiler.stop()` are ignored in trace mode.',
+        );
+      return;
+    }
+
+    if (!this._isRunning) {
+      DEBUG_BUILD && debug.warn('[Profiling] Profiler is not running, `uiProfiler.stop()` is a no-op.');
+      return;
+    }
+
+    this._endProfiling();
+  }
+
+  /** Handle an already-active root span at integration setup time (used only in trace mode). */
+  public notifyRootSpanActive(rootSpan: Span): void {
+    if (this._lifecycleMode !== 'trace' || !this._sessionSampled) {
       return;
     }
 
@@ -78,7 +133,7 @@ export class UIProfiler {
       return;
     }
 
-    this._activeRootSpanIds.add(spanId);
+    this._registerTraceRootSpan(spanId);
 
     const rootSpanCount = this._activeRootSpanIds.size;
 
@@ -86,20 +141,20 @@ export class UIProfiler {
       DEBUG_BUILD &&
         debug.log('[Profiling] Detected already active root span during setup. Active root spans now:', rootSpanCount);
 
-      this.start();
+      this._beginProfiling();
     }
   }
 
   /**
-   * Start profiling if not already running.
+   * Begin profiling if not already running.
    */
-  public start(): void {
+  private _beginProfiling(): void {
     if (this._isRunning) {
       return;
     }
     this._isRunning = true;
 
-    DEBUG_BUILD && debug.log('[Profiling] Started profiling with profile ID:', this._profilerId);
+    DEBUG_BUILD && debug.log('[Profiling] Started profiling with profiler ID:', this._profilerId);
 
     // Expose profiler_id to match root spans with profiles
     getGlobalScope().setContext('profile', { profiler_id: this._profilerId });
@@ -107,7 +162,7 @@ export class UIProfiler {
     this._startProfilerInstance();
 
     if (!this._profiler) {
-      DEBUG_BUILD && debug.log('[Profiling] Stopping trace lifecycle profiling.');
+      DEBUG_BUILD && debug.log('[Profiling] Failed to start JS Profiler; stopping.');
       this._resetProfilerInfo();
       return;
     }
@@ -115,15 +170,13 @@ export class UIProfiler {
     this._startPeriodicChunking();
   }
 
-  /**
-   * Stop profiling; final chunk will be collected and sent.
-   */
-  public stop(): void {
+  /** End profiling session; final chunk will be collected and sent. */
+  private _endProfiling(): void {
     if (!this._isRunning) {
       return;
     }
-
     this._isRunning = false;
+
     if (this._chunkTimer) {
       clearTimeout(this._chunkTimer);
       this._chunkTimer = undefined;
@@ -135,6 +188,12 @@ export class UIProfiler {
     this._collectCurrentChunk().catch(e => {
       DEBUG_BUILD && debug.error('[Profiling] Failed to collect current profile chunk on `stop()`:', e);
     });
+
+    // Manual: Clear profiling context so spans outside start()/stop() aren't marked as profiled
+    // Trace: Profile context is kept for the whole session duration
+    if (this._lifecycleMode === 'manual') {
+      getGlobalScope().setContext('profile', {});
+    }
   }
 
   /** Trace-mode: attach spanStart/spanEnd listeners. */
@@ -166,7 +225,7 @@ export class UIProfiler {
           debug.log(
             `[Profiling] Root span ${spanId} started. Profiling active while there are active root spans (count=${rootSpanCount}).`,
           );
-        this.start();
+        this._beginProfiling();
       }
     });
 
@@ -189,13 +248,13 @@ export class UIProfiler {
         this._collectCurrentChunk().catch(e => {
           DEBUG_BUILD && debug.error('[Profiling] Failed to collect current profile chunk on last `spanEnd`:', e);
         });
-        this.stop();
+        this._endProfiling();
       }
     });
   }
 
   /**
-   * Resets profiling information from scope and resets running state
+   * Resets profiling information from scope and resets running state (used on failure)
    */
   private _resetProfilerInfo(): void {
     this._isRunning = false;
@@ -210,7 +269,7 @@ export class UIProfiler {
     this._rootSpanTimeouts.clear();
   }
 
-  /** Register root span and schedule safeguard timeout (trace mode). */
+  /** Keep track of root spans and schedule safeguard timeout (trace mode). */
   private _registerTraceRootSpan(spanId: string): void {
     this._activeRootSpanIds.add(spanId);
     const timeout = setTimeout(() => this._onRootSpanTimeout(spanId), MAX_ROOT_SPAN_PROFILE_MS);
@@ -222,11 +281,11 @@ export class UIProfiler {
    */
   private _startProfilerInstance(): void {
     if (this._profiler?.stopped === false) {
-      return;
+      return; // already running
     }
     const profiler = startJSSelfProfile();
     if (!profiler) {
-      DEBUG_BUILD && debug.log('[Profiling] Failed to start JS Profiler in trace lifecycle.');
+      DEBUG_BUILD && debug.log('[Profiling] Failed to start JS Profiler.');
       return;
     }
     this._profiler = profiler;
@@ -283,14 +342,13 @@ export class UIProfiler {
 
     this._activeRootSpanIds.delete(rootSpanId);
 
-    const rootSpanCount = this._activeRootSpanIds.size;
-    if (rootSpanCount === 0) {
-      this.stop();
+    if (this._activeRootSpanIds.size === 0) {
+      this._endProfiling();
     }
   }
 
   /**
-   * Stop the current profiler, convert and send a profile chunk.
+   * Stop current profiler instance, convert profile to chunk & send.
    */
   private async _collectCurrentChunk(): Promise<void> {
     const prevProfiler = this._profiler;
diff --git a/packages/browser/src/profiling/index.ts b/packages/browser/src/profiling/index.ts
new file mode 100644
index 000000000000..5847c070dd48
--- /dev/null
+++ b/packages/browser/src/profiling/index.ts
@@ -0,0 +1,55 @@
+import type { Profiler } from '@sentry/core';
+import { debug, getClient } from '@sentry/core';
+import { DEBUG_BUILD } from '../debug-build';
+
+/**
+ * Starts the Sentry UI profiler.
+ * This mode is exclusive with the transaction profiler and will only work if the profilesSampleRate is set to a falsy value.
+ * In UI profiling mode, the profiler will keep reporting profile chunks to Sentry until it is stopped, which allows for continuous profiling of the application.
+ */
+function startProfiler(): void {
+  const client = getClient();
+  if (!client) {
+    DEBUG_BUILD && debug.warn('No Sentry client available, profiling is not started');
+    return;
+  }
+
+  const integration = client.getIntegrationByName('BrowserProfiling');
+
+  if (!integration) {
+    DEBUG_BUILD && debug.warn('BrowserProfiling integration is not available');
+    return;
+  }
+
+  client.emit('startUIProfiler');
+}
+
+/**
+ * Stops the Sentry UI profiler.
+ * Calls to stop will stop the profiler and flush the currently collected profile data to Sentry.
+ */
+function stopProfiler(): void {
+  const client = getClient();
+  if (!client) {
+    DEBUG_BUILD && debug.warn('No Sentry client available, profiling is not started');
+    return;
+  }
+
+  const integration = client.getIntegrationByName('BrowserProfiling');
+  if (!integration) {
+    DEBUG_BUILD && debug.warn('ProfilingIntegration is not available');
+    return;
+  }
+
+  client.emit('stopUIProfiler');
+}
+
+/**
+ * Profiler namespace for controlling the JS profiler in 'manual' mode.
+ *
+ * Requires the `browserProfilingIntegration` from the `@sentry/browser` package.
+ */
+export const uiProfiler: Profiler = {
+  startProfiler,
+  stopProfiler,
+};
diff --git a/packages/browser/src/profiling/integration.ts b/packages/browser/src/profiling/integration.ts
index 7cd1886e636d..84cd33588320 100644
--- a/packages/browser/src/profiling/integration.ts
+++ b/packages/browser/src/profiling/integration.ts
@@ -14,7 +14,6 @@ import {
   getActiveProfilesCount,
   hasLegacyProfiling,
   isAutomatedPageLoadSpan,
-  shouldProfileSession,
   shouldProfileSpanLegacy,
   takeProfileFromGlobalCache,
 } from './utils';
@@ -26,12 +25,14 @@ const _browserProfilingIntegration = (() => {
     name: INTEGRATION_NAME,
     setup(client) {
       const options = client.getOptions() as BrowserOptions;
+      const profiler = new UIProfiler();
 
       if (!hasLegacyProfiling(options) && !options.profileLifecycle) {
         // Set default lifecycle mode
         options.profileLifecycle = 'manual';
       }
 
+      // eslint-disable-next-line deprecation/deprecation
       if (hasLegacyProfiling(options) && !options.profilesSampleRate) {
         DEBUG_BUILD && debug.log('[Profiling] Profiling disabled, no profiling options found.');
         return;
@@ -49,14 +50,15 @@ const _browserProfilingIntegration = (() => {
 
       // UI PROFILING (Profiling V2)
       if (!hasLegacyProfiling(options)) {
-        const sessionSampled = shouldProfileSession(options);
-        if (!sessionSampled) {
-          DEBUG_BUILD && debug.log('[Profiling] Session not sampled. Skipping lifecycle profiler initialization.');
-        }
-
         const lifecycleMode = options.profileLifecycle;
 
-        if (lifecycleMode === 'trace') {
+        // Registering hooks in all lifecycle modes to be able to notify users in case they want to start/stop the profiler manually in `trace` mode
+        client.on('startUIProfiler', () => profiler.start());
+        client.on('stopUIProfiler', () => profiler.stop());
+
+        if (lifecycleMode === 'manual') {
+          profiler.initialize(client);
+        } else if (lifecycleMode === 'trace') {
           if (!hasSpansEnabled(options)) {
             DEBUG_BUILD &&
               debug.warn(
@@ -65,12 +67,11 @@ const _browserProfilingIntegration = (() => {
             return;
           }
 
-          const traceLifecycleProfiler = new UIProfiler();
-          traceLifecycleProfiler.initialize(client, sessionSampled);
+          profiler.initialize(client);
 
           // If there is an active, sampled root span already, notify the profiler
           if (rootSpan) {
-            traceLifecycleProfiler.notifyRootSpanActive(rootSpan);
+            profiler.notifyRootSpanActive(rootSpan);
           }
 
           // In case rootSpan is created slightly after setup -> schedule microtask to re-check and notify.
@@ -78,7 +79,7 @@ const _browserProfilingIntegration = (() => {
             const laterActiveSpan = getActiveSpan();
             const laterRootSpan = laterActiveSpan && getRootSpan(laterActiveSpan);
             if (laterRootSpan) {
-              traceLifecycleProfiler.notifyRootSpanActive(laterRootSpan);
+              profiler.notifyRootSpanActive(laterRootSpan);
             }
           }, 0);
         }
diff --git a/packages/browser/src/profiling/utils.ts b/packages/browser/src/profiling/utils.ts
index ed794a40a98b..c50c76c84de4 100644
--- a/packages/browser/src/profiling/utils.ts
+++ b/packages/browser/src/profiling/utils.ts
@@ -651,8 +651,10 @@ export function shouldProfileSpanLegacy(span: Span): boolean {
     return false;
   }
 
-  // @ts-expect-error profilesSampleRate is not part of the browser options yet
-  const profilesSampleRate: number | boolean | undefined = options.profilesSampleRate;
+  // eslint-disable-next-line deprecation/deprecation
+  const profilesSampleRate = (options as BrowserOptions).profilesSampleRate as
+    | BrowserOptions['profilesSampleRate']
+    | boolean;
 
   // Since this is coming from the user (or from a function provided by the user), who knows what we might get. (The
   // only valid values are booleans or numbers between 0 and 1.)
@@ -688,18 +690,21 @@ export function shouldProfileSpanLegacy(span: Span): boolean {
 }
 
 /**
- * Determine if a profile should be created for the current session (lifecycle profiling mode).
+ * Determine if a profile should be created for the current session.
  */
 export function shouldProfileSession(options: BrowserOptions): boolean {
   // If constructor failed once, it will always fail, so we can early return.
   if (PROFILING_CONSTRUCTOR_FAILED) {
     if (DEBUG_BUILD) {
-      debug.log('[Profiling] Profiling has been disabled for the duration of the current user session.');
+      debug.log(
+        '[Profiling] Profiling has been disabled for the duration of the current user session as the JS Profiler could not be started.',
+      );
     }
     return false;
   }
 
-  if (options.profileLifecycle !== 'trace') {
+  if (options.profileLifecycle !== 'trace' && options.profileLifecycle !== 'manual') {
+    DEBUG_BUILD && debug.warn('[Profiling] Session not sampled. Invalid `profileLifecycle` option.');
     return false;
   }
 
@@ -724,6 +729,7 @@ export function shouldProfileSession(options: BrowserOptions): boolean {
  * Checks if legacy profiling is configured.
  */
 export function hasLegacyProfiling(options: BrowserOptions): boolean {
+  // eslint-disable-next-line deprecation/deprecation
   return typeof options.profilesSampleRate !== 'undefined';
 }
 
diff --git a/packages/browser/test/profiling/UIProfiler.test.ts b/packages/browser/test/profiling/UIProfiler.test.ts
index f28880960256..6872e1e1beff 100644
--- a/packages/browser/test/profiling/UIProfiler.test.ts
+++ b/packages/browser/test/profiling/UIProfiler.test.ts
@@ -3,8 +3,20 @@
  */
 
 import * as Sentry from '@sentry/browser';
-import type { Span } from '@sentry/core';
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { type Span, debug } from '@sentry/core';
+import { type Mock, afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import type { BrowserOptions } from '../../src/index';
+
+function getBaseOptionsForTraceLifecycle(sendMock: Mock<any>, enableTracing = true): BrowserOptions {
+  return {
+    dsn: 'https://public@o.ingest.sentry.io/1',
+    ...(enableTracing ? { tracesSampleRate: 1 } : {}),
+    profileSessionSampleRate: 1,
+    profileLifecycle: 'trace',
+    integrations: [Sentry.browserProfilingIntegration()],
+    transport: () => ({ flush: vi.fn().mockResolvedValue(true), send: sendMock }),
+  };
+}
 
 describe('Browser Profiling v2 trace lifecycle', () => {
   afterEach(async () => {
@@ -48,12 +60,7 @@ describe('Browser Profiling v2 trace lifecycle', () => {
 
     Sentry.init({
       // tracing disabled
-      dsn: 'https://public@o.ingest.sentry.io/1',
-      profileSessionSampleRate: 1,
-      profileLifecycle: 'trace',
-      integrations: [Sentry.browserProfilingIntegration()],
-      // no tracesSampleRate/tracesSampler
-      transport: () => ({ flush: vi.fn().mockResolvedValue(true), send }),
+      ...getBaseOptionsForTraceLifecycle(send, false),
     });
 
     // warning is logged by our debug logger only when DEBUG_BUILD, so just assert no throw and no profiler
@@ -79,12 +86,7 @@ describe('Browser Profiling v2 trace lifecycle', () => {
       const send = vi.fn().mockResolvedValue(undefined);
 
       Sentry.init({
-        dsn: 'https://public@o.ingest.sentry.io/1',
-        tracesSampleRate: 1,
-        profileSessionSampleRate: 1,
-        profileLifecycle: 'trace',
-        integrations: [Sentry.browserProfilingIntegration()],
-        transport: () => ({ flush: vi.fn().mockResolvedValue(true), send }),
+        ...getBaseOptionsForTraceLifecycle(send),
       });
 
       let spanRef: any;
@@ -112,12 +114,7 @@ describe('Browser Profiling v2 trace lifecycle', () => {
       const send = vi.fn().mockResolvedValue(undefined);
 
       Sentry.init({
-        dsn: 'https://public@o.ingest.sentry.io/1',
-        tracesSampleRate: 1,
-        profileSessionSampleRate: 1,
-        profileLifecycle: 'trace',
-        integrations: [Sentry.browserProfilingIntegration()],
-        transport: () => ({ flush: vi.fn().mockResolvedValue(true), send }),
+        ...getBaseOptionsForTraceLifecycle(send),
       });
 
       let spanA: any;
@@ -159,12 +156,7 @@ describe('Browser Profiling v2 trace lifecycle', () => {
       const send = vi.fn().mockResolvedValue(undefined);
 
       Sentry.init({
-        dsn: 'https://public@o.ingest.sentry.io/1',
-        tracesSampleRate: 1,
-        profileSessionSampleRate: 1,
-        profileLifecycle: 'trace',
-        integrations: [Sentry.browserProfilingIntegration()],
-        transport: () => ({ flush: vi.fn().mockResolvedValue(true), send }),
+        ...getBaseOptionsForTraceLifecycle(send),
       });
 
       let spanRef: any;
@@ -195,12 +187,7 @@ describe('Browser Profiling v2 trace lifecycle', () => {
       const send = vi.fn().mockResolvedValue(undefined);
 
       Sentry.init({
-        dsn: 'https://public@o.ingest.sentry.io/1',
-        tracesSampleRate: 1,
-        profileSessionSampleRate: 1,
-        profileLifecycle: 'trace',
-        integrations: [Sentry.browserProfilingIntegration()],
-        transport: () => ({ flush: vi.fn().mockResolvedValue(true), send }),
+        ...getBaseOptionsForTraceLifecycle(send),
       });
 
       let spanRef: any;
@@ -255,12 +242,7 @@ describe('Browser Profiling v2 trace lifecycle', () => {
       const send = vi.fn().mockResolvedValue(undefined);
 
       Sentry.init({
-        dsn: 'https://public@o.ingest.sentry.io/1',
-        tracesSampleRate: 1,
-        profileSessionSampleRate: 1,
-        profileLifecycle: 'trace',
-        integrations: [Sentry.browserProfilingIntegration()],
-        transport: () => ({ flush: vi.fn().mockResolvedValue(true), send }),
+        ...getBaseOptionsForTraceLifecycle(send),
       });
 
       Sentry.startSpanManual({ name: 'root-manual-never-ends', parentSpan: null, forceTransaction: true }, _span => {
@@ -308,12 +290,7 @@ describe('Browser Profiling v2 trace lifecycle', () => {
       const send = vi.fn().mockResolvedValue(undefined);
 
       Sentry.init({
-        dsn: 'https://public@o.ingest.sentry.io/1',
-        tracesSampleRate: 1,
-        profileSessionSampleRate: 1,
-        profileLifecycle: 'trace',
-        integrations: [Sentry.browserProfilingIntegration()],
-        transport: () => ({ flush: vi.fn().mockResolvedValue(true), send }),
+        ...getBaseOptionsForTraceLifecycle(send),
       });
 
       Sentry.startSpanManual({ name: 'root-manual-never-ends', parentSpan: null, forceTransaction: true }, _span => {
@@ -375,12 +352,7 @@ describe('Browser Profiling v2 trace lifecycle', () => {
       const send = vi.fn().mockResolvedValue(undefined);
 
       Sentry.init({
-        dsn: 'https://public@o.ingest.sentry.io/1',
-        tracesSampleRate: 1,
-        profileSessionSampleRate: 1,
-        profileLifecycle: 'trace',
-        integrations: [Sentry.browserProfilingIntegration()],
-        transport: () => ({ flush: vi.fn().mockResolvedValue(true), send }),
+        ...getBaseOptionsForTraceLifecycle(send),
       });
 
       Sentry.startSpan({ name: 'root-for-context', parentSpan: null, forceTransaction: true }, () => {
@@ -440,12 +412,7 @@ describe('Browser Profiling v2 trace lifecycle', () => {
       const send = vi.fn().mockResolvedValue(undefined);
 
       Sentry.init({
-        dsn: 'https://public@o.ingest.sentry.io/1',
-        tracesSampleRate: 1,
-        profileSessionSampleRate: 1,
-        profileLifecycle: 'trace',
-        integrations: [Sentry.browserProfilingIntegration()],
-        transport: () => ({ flush: vi.fn().mockResolvedValue(true), send }),
+        ...getBaseOptionsForTraceLifecycle(send),
       });
 
       Sentry.startSpan({ name: 'rootSpan-1', parentSpan: null, forceTransaction: true }, () => {
@@ -499,12 +466,7 @@ describe('Browser Profiling v2 trace lifecycle', () => {
       const send = vi.fn().mockResolvedValue(undefined);
 
       Sentry.init({
-        dsn: 'https://public@o.ingest.sentry.io/1',
-        tracesSampleRate: 1,
-        profileSessionSampleRate: 1,
-        profileLifecycle: 'trace',
-        integrations: [Sentry.browserProfilingIntegration()],
-        transport: () => ({ flush: vi.fn().mockResolvedValue(true), send }),
+        ...getBaseOptionsForTraceLifecycle(send),
       });
 
       Sentry.startSpan({ name: 'rootSpan-chunk-1', parentSpan: null, forceTransaction: true }, () => {
@@ -563,12 +525,7 @@ describe('Browser Profiling v2 trace lifecycle', () => {
       // Session 1
       const send1 = vi.fn().mockResolvedValue(undefined);
       Sentry.init({
-        dsn: 'https://public@o.ingest.sentry.io/1',
-        tracesSampleRate: 1,
-        profileSessionSampleRate: 1,
-        profileLifecycle: 'trace',
-        integrations: [Sentry.browserProfilingIntegration()],
-        transport: () => ({ flush: vi.fn().mockResolvedValue(true), send: send1 }),
+        ...getBaseOptionsForTraceLifecycle(send1),
       });
 
       Sentry.startSpan({ name: 'session-1-rootSpan', parentSpan: null, forceTransaction: true }, () => {
@@ -598,12 +555,7 @@ describe('Browser Profiling v2 trace lifecycle', () => {
       // Session 2 (new init simulates new user session)
       const send2 = vi.fn().mockResolvedValue(undefined);
       Sentry.init({
-        dsn: 'https://public@o.ingest.sentry.io/1',
-        tracesSampleRate: 1,
-        profileSessionSampleRate: 1,
-        profileLifecycle: 'trace',
-        integrations: [Sentry.browserProfilingIntegration()],
-        transport: () => ({ flush: vi.fn().mockResolvedValue(true), send: send2 }),
+        ...getBaseOptionsForTraceLifecycle(send2),
       });
 
       Sentry.startSpan({ name: 'session-2-rootSpan', parentSpan: null, forceTransaction: true }, () => {
@@ -628,4 +580,271 @@ describe('Browser Profiling v2 trace lifecycle', () => {
       }
     });
   });
+
+  it('calling start and stop in trace lifecycle prints warnings', async () => {
+    const { stop } = mockProfiler();
+    const send = vi.fn().mockResolvedValue(undefined);
+    const debugWarnSpy = vi.spyOn(debug, 'warn');
+
+    Sentry.init({
+      ...getBaseOptionsForTraceLifecycle(send),
+      debug: true,
+    });
+
+    Sentry.uiProfiler.startProfiler();
+    Sentry.uiProfiler.startProfiler();
+
+    expect(debugWarnSpy).toHaveBeenCalledWith(
+      '[Profiling] `profileLifecycle` is set to "trace". Calls to `uiProfiler.start()` are ignored in trace mode.',
+    );
+
+    Sentry.uiProfiler.stopProfiler();
+    await Promise.resolve();
+
+    debugWarnSpy.mockClear();
+    Sentry.uiProfiler.stopProfiler();
+    await Promise.resolve();
+
+    expect(stop).toHaveBeenCalledTimes(0);
+    expect(debugWarnSpy).toHaveBeenCalledWith(
+      '[Profiling] `profileLifecycle` is set to "trace". Calls to `uiProfiler.stop()` are ignored in trace mode.',
+    );
+  });
+});
+
+function getBaseOptionsForManualLifecycle(sendMock: Mock<any>, enableTracing = true): BrowserOptions {
+  return {
+    dsn: 'https://public@o.ingest.sentry.io/1',
+    ...(enableTracing ? { tracesSampleRate: 1 } : {}),
+    profileSessionSampleRate: 1,
+    profileLifecycle: 'manual',
+    integrations: [Sentry.browserProfilingIntegration()],
+    transport: () => ({ flush: vi.fn().mockResolvedValue(true), send: sendMock }),
+  };
+}
+
+describe('Browser Profiling v2 manual lifecycle', () => {
+  afterEach(async () => {
+    const client = Sentry.getClient();
+    await client?.close();
+    // reset profiler constructor
+    (window as any).Profiler = undefined;
+    vi.restoreAllMocks();
+  });
+
+  function mockProfiler() {
+    const stop = vi.fn().mockResolvedValue({
+      frames: [{ name: 'f' }],
+      stacks: [{ frameId: 0 }],
+      samples: [{ timestamp: 0 }, { timestamp: 10 }],
+      resources: [],
+    });
+
+    class MockProfilerImpl {
+      stopped: boolean = false;
+      constructor(_opts: { sampleInterval: number; maxBufferSize: number }) {}
+      stop() {
+        this.stopped = true;
+        return stop();
+      }
+      addEventListener() {}
+    }
+
+    const mockConstructor = vi.fn().mockImplementation((opts: { sampleInterval: number; maxBufferSize: number }) => {
+      return new MockProfilerImpl(opts);
+    });
+
+    (window as any).Profiler = mockConstructor;
+    return { stop, mockConstructor };
+  }
+
+  it('starts and stops a profile session', async () => {
+    const { stop, mockConstructor } = mockProfiler();
+    const send = vi.fn().mockResolvedValue(undefined);
+
+    Sentry.init({
+      ...getBaseOptionsForManualLifecycle(send),
+    });
+
+    const client = Sentry.getClient();
+    expect(client).toBeDefined();
+
+    Sentry.uiProfiler.startProfiler();
+    expect(mockConstructor).toHaveBeenCalledTimes(1);
+
+    Sentry.uiProfiler.stopProfiler();
+    await Promise.resolve();
+
+    expect(stop).toHaveBeenCalledTimes(1);
+    expect(send).toHaveBeenCalledTimes(1);
+    const envelopeHeader = send.mock.calls?.[0]?.[0]?.[1]?.[0]?.[0];
+    expect(envelopeHeader?.type).toBe('profile_chunk');
+  });
+
+  it('calling start and stop while profile session is running prints warnings', async () => {
+    const { stop, mockConstructor } = mockProfiler();
+    const send = vi.fn().mockResolvedValue(undefined);
+    const debugWarnSpy = vi.spyOn(debug, 'warn');
+
+    Sentry.init({
+      ...getBaseOptionsForManualLifecycle(send),
+      debug: true,
+    });
+
+    Sentry.uiProfiler.startProfiler();
+    Sentry.uiProfiler.startProfiler();
+
+    expect(mockConstructor).toHaveBeenCalledTimes(1);
+    expect(debugWarnSpy).toHaveBeenCalledWith(
+      '[Profiling] Profile session is already running, `uiProfiler.start()` is a no-op.',
+    );
+
+    Sentry.uiProfiler.stopProfiler();
+    await Promise.resolve();
+
+    debugWarnSpy.mockClear();
+    Sentry.uiProfiler.stopProfiler();
+    await Promise.resolve();
+
+    expect(stop).toHaveBeenCalledTimes(1);
+    expect(debugWarnSpy).toHaveBeenCalledWith('[Profiling] Profiler is not running, `uiProfiler.stop()` is a no-op.');
+  });
+
+  it('profileSessionSampleRate is required', async () => {
+    const { stop, mockConstructor } = mockProfiler();
+    const send = vi.fn().mockResolvedValue(undefined);
+    const debugWarnSpy = vi.spyOn(debug, 'warn');
+
+    Sentry.init({
+      ...getBaseOptionsForManualLifecycle(send),
+      profileSessionSampleRate: undefined,
+    });
+
+    Sentry.uiProfiler.startProfiler();
+    expect(debugWarnSpy).toHaveBeenCalledWith(
+      '[Profiling] Invalid sample rate. Sample rate must be a boolean or a number between 0 and 1. Got undefined of type "undefined".',
+    );
+    expect(debugWarnSpy).toHaveBeenCalledWith('[Profiling] Session is not sampled, `uiProfiler.start()` is a no-op.');
+    Sentry.uiProfiler.stopProfiler();
+    await Promise.resolve();
+
+    expect(mockConstructor).not.toHaveBeenCalled();
+    expect(stop).not.toHaveBeenCalled();
+  });
+
+  it('does not start profiler when profileSessionSampleRate is 0', async () => {
+    const { stop, mockConstructor } = mockProfiler();
+    const send = vi.fn().mockResolvedValue(undefined);
+
+    Sentry.init({
+      ...getBaseOptionsForManualLifecycle(send),
+      profileSessionSampleRate: 0,
+    });
+
+    Sentry.uiProfiler.startProfiler();
+    Sentry.uiProfiler.stopProfiler();
+    await Promise.resolve();
+
+    expect(mockConstructor).not.toHaveBeenCalled();
+    expect(stop).not.toHaveBeenCalled();
+  });
+
+  describe('envelope', () => {
+    beforeEach(() => {
+      vi.useRealTimers();
+    });
+
+    it('sends a profile_chunk envelope type', async () => {
+      const stop = vi.fn().mockResolvedValue({
+        frames: [{ name: 'f' }],
+        stacks: [{ frameId: 0 }],
+        samples: [{ timestamp: 0 }, { timestamp: 10 }],
+        resources: [],
+      });
+
+      class MockProfilerImpl {
+        stopped: boolean = false;
+        constructor(_opts: { sampleInterval: number; maxBufferSize: number }) {}
+        stop() {
+          this.stopped = true;
+          return stop();
+        }
+        addEventListener() {}
+      }
+
+      (window as any).Profiler = vi
+        .fn()
+        .mockImplementation((opts: { sampleInterval: number; maxBufferSize: number }) => new MockProfilerImpl(opts));
+
+      const send = vi.fn().mockResolvedValue(undefined);
+
+      Sentry.init({
+        ...getBaseOptionsForManualLifecycle(send),
+      });
+
+      const client = Sentry.getClient();
+
+      Sentry.uiProfiler.startProfiler();
+      await new Promise(resolve => setTimeout(resolve, 10));
+      Sentry.uiProfiler.stopProfiler();
+
+      await client?.flush(1000);
+
+      expect(send.mock.calls?.[0]?.[0]?.[1]?.[0]?.[0]).toMatchObject({
+        type: 'profile_chunk',
+      });
+
+      expect(send.mock.calls?.[0]?.[0]?.[1]?.[0]?.[1]).toMatchObject({
+        profiler_id: expect.any(String),
+        chunk_id: expect.any(String),
+        profile: expect.objectContaining({
+          stacks: expect.any(Array),
+        }),
+      });
+    });
+
+    it('reuses the same profiler_id while profiling across multiple stop/start calls', async () => {
+      mockProfiler();
+      const send = vi.fn().mockResolvedValue(undefined);
+
+      Sentry.init({
+        ...getBaseOptionsForManualLifecycle(send),
+      });
+
+      // 1. profiling cycle
+      Sentry.uiProfiler.startProfiler();
+      Sentry.startSpan({ name: 'manual-span-1', parentSpan: null, forceTransaction: true }, () => {});
+      Sentry.uiProfiler.stopProfiler();
+      await Promise.resolve();
+
+      // Not profiled -> should not have profile context
+      Sentry.startSpan({ name: 'manual-span-between', parentSpan: null, forceTransaction: true }, () => {});
+
+      // 2. profiling cycle
+      Sentry.uiProfiler.startProfiler();
+      Sentry.startSpan({ name: 'manual-span-2', parentSpan: null, forceTransaction: true }, () => {});
+      Sentry.uiProfiler.stopProfiler();
+      await Promise.resolve();
+
+      const client = Sentry.getClient();
+      await client?.flush(1000);
+
+      const calls = send.mock.calls;
+      const transactionEvents = calls
+        .filter(call => call?.[0]?.[1]?.[0]?.[0]?.type === 'transaction')
+        .map(call => call?.[0]?.[1]?.[0]?.[1]);
+
+      expect(transactionEvents.length).toBe(3);
+
+      const firstProfilerId = transactionEvents[0]?.contexts?.profile?.profiler_id;
+      expect(typeof firstProfilerId).toBe('string');
+
+      // Middle transaction (not profiled)
+      expect(transactionEvents[1]?.contexts?.profile?.profiler_id).toBeUndefined();
+
+      const thirdProfilerId = transactionEvents[2]?.contexts?.profile?.profiler_id;
+      expect(typeof thirdProfilerId).toBe('string');
+      expect(firstProfilerId).toBe(thirdProfilerId); // same profiler_id across session
+    });
+  });
 });
diff --git a/packages/core/src/client.ts b/packages/core/src/client.ts
index b7e0cab509c1..ef05750009c3 100644
--- a/packages/core/src/client.ts
+++ b/packages/core/src/client.ts
@@ -813,6 +813,24 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
     callback: (request: unknown, response: unknown, normalizedRequest: RequestEventData) => void,
   ): () => void;
 
+  /**
+   * A hook that is called when the UI Profiler should start profiling.
+   *
+   * This hook is called when running `Sentry.uiProfiler.startProfiler()`.
+   *
+   * @returns {() => void} A function that, when executed, removes the registered callback.
+   */
+  public on(hook: 'startUIProfiler', callback: () => void): () => void;
+
+  /**
+   * A hook that is called when the UI Profiler should stop profiling.
+   *
+   * This hook is called when running `Sentry.uiProfiler.stopProfiler()`.
+   *
+   * @returns {() => void} A function that, when executed, removes the registered callback.
+   */
+  public on(hook: 'stopUIProfiler', callback: () => void): () => void;
+
   /**
    * Register a hook on this client.
    */
@@ -1029,6 +1047,16 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
     normalizedRequest: RequestEventData,
   ): void;
 
+  /**
+   * Emit a hook event for starting the UI Profiler.
+   */
+  public emit(hook: 'startUIProfiler'): void;
+
+  /**
+   * Emit a hook event for stopping the UI Profiler.
+   */
+  public emit(hook: 'stopUIProfiler'): void;
+
   /**
    * Emit a hook that was previously registered via `on()`.
    */
diff --git a/packages/core/src/profiling.ts b/packages/core/src/profiling.ts
index 407c4a07c53c..e2e2c34e38cc 100644
--- a/packages/core/src/profiling.ts
+++ b/packages/core/src/profiling.ts
@@ -65,6 +65,11 @@ function stopProfiler(): void {
   integration._profiler.stop();
 }
 
+/**
+ * Profiler namespace for controlling the profiler in 'manual' mode.
+ *
+ * Requires the `nodeProfilingIntegration` from the `@sentry/profiling-node` package.
+ */
 export const profiler: Profiler = {
   startProfiler,
   stopProfiler,
diff --git a/packages/core/src/types-hoist/browseroptions.ts b/packages/core/src/types-hoist/browseroptions.ts
index 18bbd46af09c..39b414d5140b 100644
--- a/packages/core/src/types-hoist/browseroptions.ts
+++ b/packages/core/src/types-hoist/browseroptions.ts
@@ -18,10 +18,11 @@ export type BrowserClientReplayOptions = {
 };
 
 export type BrowserClientProfilingOptions = {
-  // todo: add deprecation warning for profilesSampleRate: @deprecated Use `profileSessionSampleRate` and `profileLifecycle` instead.
   /**
    * The sample rate for profiling
    * 1.0 will profile all transactions and 0 will profile none.
+   *
+   * @deprecated Use `profileSessionSampleRate` and `profileLifecycle` instead.
    */
   profilesSampleRate?: number;
 

From 6240191d1fef08423b9928846fc4a9a7aa7c8da5 Mon Sep 17 00:00:00 2001
From: Sigrid <32902192+s1gr1d@users.noreply.github.com>
Date: Mon, 24 Nov 2025 15:53:32 +0100
Subject: [PATCH 119/186] feat(core): Use `maxValueLength` on error messages
 (#18301)

It can happen that error messages are too long and exceed the maximum
envelope size (mentioned in
https://github.com/getsentry/sentry-javascript/issues/18219).
`maxValueLength` now also checks for long error messages and truncates
them.
---
 packages/core/src/utils/prepareEvent.ts | 13 ++++++++--
 packages/core/test/lib/client.test.ts   | 32 +++++++++++++++++++++++--
 2 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/packages/core/src/utils/prepareEvent.ts b/packages/core/src/utils/prepareEvent.ts
index 9a4c4685e839..fd1cb62440f4 100644
--- a/packages/core/src/utils/prepareEvent.ts
+++ b/packages/core/src/utils/prepareEvent.ts
@@ -147,8 +147,17 @@ export function applyClientOptions(event: Event, options: ClientOptions): void {
   }
 
   const request = event.request;
-  if (request?.url) {
-    request.url = maxValueLength ? truncate(request.url, maxValueLength) : request.url;
+  if (request?.url && maxValueLength) {
+    request.url = truncate(request.url, maxValueLength);
+  }
+
+  if (maxValueLength) {
+    event.exception?.values?.forEach(exception => {
+      if (exception.value) {
+        // Truncates error messages
+        exception.value = truncate(exception.value, maxValueLength);
+      }
+    });
   }
 }
 
diff --git a/packages/core/test/lib/client.test.ts b/packages/core/test/lib/client.test.ts
index 19ef8a95dff5..2a2d77171880 100644
--- a/packages/core/test/lib/client.test.ts
+++ b/packages/core/test/lib/client.test.ts
@@ -21,7 +21,6 @@ import type { ErrorEvent, Event, TransactionEvent } from '../../src/types-hoist/
 import type { SpanJSON } from '../../src/types-hoist/span';
 import * as debugLoggerModule from '../../src/utils/debug-logger';
 import * as miscModule from '../../src/utils/misc';
-import * as stringModule from '../../src/utils/string';
 import * as timeModule from '../../src/utils/time';
 import { getDefaultTestClientOptions, TestClient } from '../mocks/client';
 import { AdHocIntegration, AsyncTestIntegration, TestIntegration } from '../mocks/integration';
@@ -37,7 +36,6 @@ const clientProcess = vi.spyOn(TestClient.prototype as any, '_process');
 
 vi.spyOn(miscModule, 'uuid4').mockImplementation(() => '12312012123120121231201212312012');
 vi.spyOn(debugLoggerModule, 'consoleSandbox').mockImplementation(cb => cb());
-vi.spyOn(stringModule, 'truncate').mockImplementation(str => str);
 vi.spyOn(timeModule, 'dateTimestampInSeconds').mockImplementation(() => 2020);
 
 describe('Client', () => {
@@ -263,6 +261,36 @@ describe('Client', () => {
       );
     });
 
+    test('does not truncate exception values by default', () => {
+      const exceptionMessageLength = 10_000;
+      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
+      const client = new TestClient(options);
+
+      client.captureException(new Error('a'.repeat(exceptionMessageLength)));
+      expect(TestClient.instance!.event).toEqual(
+        expect.objectContaining({
+          exception: {
+            values: [{ type: 'Error', value: 'a'.repeat(exceptionMessageLength) }],
+          },
+        }),
+      );
+    });
+
+    test('truncates exception values according to `maxValueLength` option', () => {
+      const maxValueLength = 10;
+      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN, maxValueLength });
+      const client = new TestClient(options);
+
+      client.captureException(new Error('a'.repeat(50)));
+      expect(TestClient.instance!.event).toEqual(
+        expect.objectContaining({
+          exception: {
+            values: [{ type: 'Error', value: `${'a'.repeat(maxValueLength)}...` }],
+          },
+        }),
+      );
+    });
+
     test('sets the correct lastEventId', () => {
       const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
       const client = new TestClient(options);

From 4b92c64b75ffb85f31a516ca093ab77a5e55c15d Mon Sep 17 00:00:00 2001
From: Abdelrahman Awad <me@awad.dev>
Date: Mon, 24 Nov 2025 17:41:05 +0200
Subject: [PATCH 120/186] fix(nextjs): universal random tunnel path support
 (#18257)

Summary for changelog: The `tunnelRoute: true` option didn't work well with Turbopack due to repeated runs of the config files leading to different tunnel URLs in client, server and edge runtimes, this PR fixes that while also fixing Sentry requests spans not being dropped by the sampler.

When using Next.js with Turbopack and the Sentry tunnel route feature
(`tunnelRoute: true`), several issues prevented events from being sent
properly:

### 1. Tunnel Route Consistency (Turbopack)

**Problem**: Random tunnel routes were generated separately for client
and server builds in Turbopack.

**Solution**: Implemented processs-level caching in
`withSentryConfig.ts`:
- Extract tunnel route resolution into `resolveTunnelRoute()` function
- Use `process.env` to store the random tunnel value across
server/client builds.

### 2. Filter Tunnel Request Spans

**Problem**: Requests to the tunnel route (before rewrite) and to Sentry
ingest URLs (after rewrite) were creating spans that polluted Sentry
with internal instrumentation noise, spans were being created by the
middleware and OTEL node.js fetch instrumentation.

**Solution**: Implemented server-side span filtering:

- Created `dropMiddlewareTunnelRequests()` utility to detect and drop
tunnel-related spans
- Filter spans originating from `Middleware.execute` (Next.js
middleware)
- Filter spans originating from `auto.http.otel.node_fetch` (Node.js
fetch instrumentation)
- Check both local tunnel paths and Sentry ingest URLs (using
`isSentryRequestSpan` from `@sentry/opentelemetry`)
- Mark matching spans with `TRANSACTION_ATTR_SHOULD_DROP_TRANSACTION` to
prevent them from being sent
- I tried `beforeSampling` hook but it didn't work for some reason, so I
stuck with the drop attribute.

----

The final issue was excluding the tunnel requests from the
middleware/proxy, but there are many blockers for a solution:

1. The `config` must be statically analyzable, so we cannot expose
`withSentryMiddlewareConfig` wrapper of any kind.
2. Warning the user doesn't help much because they can't do anything
about it since the tunnel route is random.
3. Tested out writing a loader for turbopack/webpack to inject the
tunnel into the matcher as an array but user existing matcher can match
still.
4. Only way is to inject an exclusion match into the user existing
matcher, if it is an array then we need to inject it into each single
entry.

I may explore this further later with a loader for both
webpack/turbopack, and figure out a reliable way to inject the negative
matchers into the user expressions.
---
 .../nextjs-16-tunnel/.gitignore               |  46 ++++++
 .../test-applications/nextjs-16-tunnel/.npmrc |   4 +
 .../nextjs-16-tunnel/app/favicon.ico          | Bin 0 -> 25931 bytes
 .../nextjs-16-tunnel/app/global-error.tsx     |  23 +++
 .../nextjs-16-tunnel/app/layout.tsx           |   7 +
 .../nextjs-16-tunnel/app/page.tsx             |   3 +
 .../nextjs-16-tunnel/eslint.config.mjs        |  19 +++
 .../instrumentation-client.ts                 |  12 ++
 .../nextjs-16-tunnel/instrumentation.ts       |  13 ++
 .../nextjs-16-tunnel/next.config.ts           |   9 ++
 .../nextjs-16-tunnel/package.json             |  63 +++++++++
 .../nextjs-16-tunnel/playwright.config.mjs    |  29 ++++
 .../nextjs-16-tunnel/proxy.ts                 |  11 ++
 .../nextjs-16-tunnel/public/file.svg          |   1 +
 .../nextjs-16-tunnel/public/globe.svg         |   1 +
 .../nextjs-16-tunnel/public/next.svg          |   1 +
 .../nextjs-16-tunnel/public/vercel.svg        |   1 +
 .../nextjs-16-tunnel/public/window.svg        |   1 +
 .../nextjs-16-tunnel/sentry.edge.config.ts    |  11 ++
 .../nextjs-16-tunnel/sentry.server.config.ts  |  11 ++
 .../nextjs-16-tunnel/start-event-proxy.mjs    |  14 ++
 .../tests/tunnel-route.test.ts                | 132 ++++++++++++++++++
 .../nextjs-16-tunnel/tsconfig.json            |  27 ++++
 .../utils/dropMiddlewareTunnelRequests.ts     |  59 ++++++++
 .../turbopack/constructTurbopackConfig.ts     |  12 +-
 .../turbopack/generateValueInjectionRules.ts  |   7 +
 .../nextjs/src/config/withSentryConfig.ts     |  39 +++++-
 packages/nextjs/src/edge/index.ts             |  24 ++++
 packages/nextjs/src/server/index.ts           |   3 +
 29 files changed, 576 insertions(+), 7 deletions(-)
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/.gitignore
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/.npmrc
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/app/favicon.ico
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/app/global-error.tsx
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/app/layout.tsx
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/app/page.tsx
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/eslint.config.mjs
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/instrumentation-client.ts
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/instrumentation.ts
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/next.config.ts
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/package.json
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/playwright.config.mjs
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/proxy.ts
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/public/file.svg
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/public/globe.svg
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/public/next.svg
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/public/vercel.svg
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/public/window.svg
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/sentry.edge.config.ts
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/sentry.server.config.ts
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/start-event-proxy.mjs
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/tests/tunnel-route.test.ts
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/tsconfig.json
 create mode 100644 packages/nextjs/src/common/utils/dropMiddlewareTunnelRequests.ts

diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/.gitignore b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/.gitignore
new file mode 100644
index 000000000000..ae044ec5ad53
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/.gitignore
@@ -0,0 +1,46 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/versions
+
+event-dumps
+
+# testing
+/coverage
+
+# next.js
+/.next/
+/out/
+
+# production
+/build
+
+# misc
+.DS_Store
+*.pem
+
+# debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+.pnpm-debug.log*
+
+# env files (can opt-in for committing if needed)
+.env*
+
+# vercel
+.vercel
+
+# typescript
+*.tsbuildinfo
+next-env.d.ts
+
+# Sentry Config File
+.env.sentry-build-plugin
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/.npmrc b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/.npmrc
new file mode 100644
index 000000000000..a3160f4de175
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/.npmrc
@@ -0,0 +1,4 @@
+@sentry:registry=http://127.0.0.1:4873
+@sentry-internal:registry=http://127.0.0.1:4873
+public-hoist-pattern[]=*import-in-the-middle*
+public-hoist-pattern[]=*require-in-the-middle*
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/app/favicon.ico b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/app/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..718d6fea4835ec2d246af9800eddb7ffb276240c
GIT binary patch
literal 25931
zcmeHv30#a{`}aL_*G&7qml|y<+KVaDM2m#dVr!KsA!#An?kSQM(q<_dDNCpjEux83
zLb9Z^XxbDl(w>%i@8hT6>)&Gu{h#Oeyszu?xtw#Zb1mO<?sK2}EE5RAKnxHU7lft+
zNRAPL3?T?25I&drAjl1ssi=G|D?(7bFsgtO(2o>{pgX9699l+Qppw7jXaYf~-84xW
z)w4x8?=youko|}Vr~(D$UX<xm7|19n6Hxvd5m6xx<*9a4%RmR{en}E&p$X-wy5A}T
zU0^dwXVA>IbiXABHh`p1?nn8Po~fxRJv}|0e(BPs|G`(TT%kKVJAdg5*Z|x0leQq0
zkdUBvb#>9F()jo|T~kx@OM8$9wzs~t2l;K=woNssA3l6|sx2r3+kdfVW@e^8e*E}v
zA1y5{bRi+3Z`uD3{F7LgFJDdvm;nJilkzDku>BwXH(8ItVCXk*-lSJnR?-2UN%<G)
zWdETe=&R39RaKR)udn|#TOgZ!e!yM=<=+`Uz{l^5UtkZ2fHDQ;UwMB}v%l$A-`~F-
z{Qr^x^CSUf63Sry{6y#+`<sMA?dPFvg)$lC_RkFRKnCi7&P<a6>hJ){&rlvg`CDTj
z)Bzo!3v7Ou#83zEDEFcKt(f1E0~=rqeEbTnMvWR#{+9pg%7G8y>u1OVRUSoox-ovF
z2Ydma(;=YuBY(eI|04{hXzZD6_f(v~H;C~y5=DhAC{MMS>2fm~1H_t2$56pc$NH8(
z5bH|<)71dV-_oCHIrzrT`2s-5w_+2CM0$95I6X8p^r!gHp+j_gd;9O<1~CEQQGS8)
zS9Qh3#p&JM-G8rHekNmKVewU;pJRcTAog68KYo^dRo}(M<!8cv(gkb9@A>>36U4Us
zfgYWSiHZL3;lpWT=<n~R&zm>zNAW>Dh#mB!_@Lg%$ms8N-;aPqMn+C2HqZgz&9~Eu
z4|Kp<`$q)Uw1R?y(~S>ePdonHxpV1#eSP1B;Ogo+-Pk}6#0GsZZ5!||ev2MGdh}_m
z{DeR7?0-1^zVs&`AV6<!ZvGbtU{7FdY&`9DeD(=q|M30$GCs(E?S0J1$e@G0#Z=wz
zl)*a>Vt;r3`I`OI_wgs*w=eO%_#7Kepl{B<UyBc9U%rn&@xFZ-e{%i>@xiyCANc(l
zzIyd4y|c6PXWq9-|KM8(zIk8LPk(>a)zyFWjhT!$HJ$qX1vo@d25W<<x-(q{Yn-pG
zKTz?fwGmh&&2-F3f57**)?Xk#p#S9h^DhK{VVKE&0KR^-_MMD9nf@pDACnmVll!kp
z3?Tha?LWW70P;AL{}cP~sW|?W|MbA09{7Kt2f!i(y>fvZQ2zUz5WRc(UnFMKHwe1|
zWmlB1qdbiA(C0jmnV<}GfbKtmcu^2*P^O?<jWWPHxu*D53Uq)j1!ZtH3Vi&#Nd^rV
zj`B>MBLZKt|As~ge8&AAO~2K@zbXelK|4T<{|y4`raF{=72kC2Kn(L4YyenWgrPiv
z@^mr$t{#X5VuIMeL!7Ab6_kG$&#&5p*Z{+?5U|TZ`B!7llpVmp@skYz&n^8QfPJzL
z0G6K_OJM9x+Wu2gfN45phANGt{7=C>i34CV{Xqlx(fWpeAoj^N0Biu`w+MVcCUyU*
zDZuzO0>4Z6fbu^T_arWW5n!E45vX8N=bxTVeFoep_G#VmNlQzAI_KTIc{6>c+04vr
zx@W}zE5JNSU>!THJ{J=cqjz+4{L4A{Ob9$ZJ*S1?Ggg3klFp!+Y1@K+pK1DqI|_gq
z5ZDXVpge8-cs!o|;K73#YXZ3AShj50wBvuq3NTOZ`M&qtjj#GOFfgExjg8Gn8>Vq5
z`85n+9|!iLCZF5$HJ$Iu($dm?8~-ofu}tEc+-pyke=3!im#6pk_Wo8IA|fJwD&~~F
zc16osQ)EBo58U7XDuMexaPRjU@h8tXe%S{fA0NH3vGJFhuyyO!Uyl2^&EOpX{9As0
zWj+P>{@}jxH)8|r;2HdupP!vie{sJ28b&bo!8`D^x}TE$%zXNb^X1p@0PJ86`dZyj
z%ce7*{^oo+6%&~I!8hQy-vQ7E)0t0ybH4l%KltWOo~8cO`T=157JqL(oq_rC%ea&4
z2NcTJe-HgFjNg-gZ$6!Y`SMHrlj}Etf7<Kk?_r;;``Uc^3+u}-v3@Q8<@$Nr`<F?K
z-%F>?r!zQTPPSv}{so2e>Fjs1{<qUF=hGRSFDG$<z3x<+@%{Vd%a`e+qodRP&D<om
zAEn>gzk~LGeesX%r(Lh6rbhSo_n)@@G-FTQy93;l#E)hgP@d_SGvyCp0~o(Y;Ee8{
zdVUDbHm5`2taPUOY^MAGOw*<R_VaVlPH<<CgYr!E->>=s7=Gst=D+p+2yON!0%Hk`
zz5mAhyT4lS*T3LS^WSxUy86q&GnoHxzQ6vm8)VS}_zuqG?+3td68_x;etQAdu@sc6
zQJ&5|4(I?~3d-QOAODHpZ=hlSg(lBZ!JZWCtHHSj`0Wh93-Uk)_S%zsJ~aD>{`A0~
z9{AG(e|q3g5B%wYKRxiL2Y$8(4w<boVrLOyLG9R$m+7N>6bzchKuloQW#e&S3n+P-
z8!ds-%f;TJ1>)v)##>gd{PdS2Oc3VaR`fr=`O8QIO(6(N!A?pr5C#6fc~Ge@N%Vvu
zaoAX2&(a6eWy_q&UwOhU)|P3J0Qc%OdhzW=F4D|pt0E4osw;%<%Dn58hAWD^XnZD=
z>9~H(3bmLtxpF?a7su6J7M*x1By7YSUbxGi)Ot0P77`}P<HJ;%@cvfCkvm6xcMjdY
zed_u6xK)F%|1Hy`)`e~K(f*MqTJ?92I+4lga{A5`-U@Cab35G6unNk<*dpB|Rtkp;
z?32o^yBlJsuA-^abQ~7;%<oa^k<DbKc{lOW2!yM#nEALvv)IhY7b|Wfg(UhtiurTM
zY-B6L26$JQo&Kt3nh3JTJ)garEgw^{uEM3__%b$U5{~+aMO*k)6R#grkER2`U6KS-
z=j1=QhCkuy%iiHWrqH8CeGNw*C?epTpl2Bo@ugUPKRFeiVHOpL7PHu-SAgX@qmTGH
z_%ePz1`io8XDfwLmip;Rn;1yo+3>3{)&5Un{KD?`-e?r21!4vTTnN(4Y6Lin?UkSM
z`MXCTC1@4A4~mvz%Rh2&EwY))LeoT=*`tMoqcEXI>TZU9WTP#l?uFv+@Dn~b(>xh2
z;>B?;Tz2SR&KVb>vGiBSB`@U7VIWFSo=LDSb9F{GF^DbmWAfpms8Sx9OX4CnBJca3
zlj9(x!dIjN?OG1X4l*imJNvRCk}F%!?SOfiOq5y^mZW)jFL@<gIi}tCXee1<sGV$i
z4r_`X#mEQbiDh!Efji0GjM9z-0bF}p0(*s(OzMJ|;K&OJBar<ARLp}T>a|r-@d#f7
z2gmU8L3IZq0ynIws=}~m^#@&C%J6QFo~Mo4V`>v7MI-_!EBMMtb%_M&kvAaN)@ZVw
z+`toz&WG#HkWDjnZE!6nk{e-oFdL^$YnbOCN}JC&{$#$O27@|Tn-skXr)2ml2~O!5
zX+gYoxhoc7qoU?C^3~&!U?kRFtnSEecWuH0B0OvLodgUAi}8p1<ZO0#U-k07ifx!>
zrO6RSXHH}D<I*>Mc$&|?D004<Y&c6)m74d`LOLU@ruR+Um4>DiOVMHV8kXCP@7NKB
zgaZq^^O<7PoKEp72kby@W0Z!Y*A<g|TlOeriuPP`vK2IntATvs?Iv|J14j&;NFSFo
zyJ+sca?G+8C%!b{Sq=6cJJqS>y{&vfg#C&gG@YVR9g?FEocMUi1gSN$+V+ayF45{a
zuDZDT<?u;)RfLQwg>N}mS|;BO%gEf}pjBfN2-gIrU#G5~cucA;dokXW89%>AyXJJI
z9X4Ul<x{xc_m~`mWBP0<g-{#wm}Vv~Ef3pKWC&N_<~88zSbEk;;+{DnJ9-u&Zc74s
zJ6TCQyl_^|5cY;wmDdrU@LTL-3v0H#Ui?8ICQV{imof1MHuM$`e*ux>IWA|ZYHgbI
z5?oFk@A=Ik7lrEQPDH!H+b`7_Y~aDb_qa=B2^Y&Ow41cU=4WDd40dp5(QS-WMN-=Y
z9g;6_-JdNU;|6cPwf$ak*aJIcwL@1n$#l~zi{c{EW?T;DaW*E8DYq?Umtz{nJ&w-M
zEMyT<MDk{HKbd#ckg5-pS_?QUVhZv?&Q-ioBS}$nvBd)nE7YO0deN~G(#zCJAbY$E
z!)g3Ytl=_NDUV%pykcE+Q<{EoZ_4FR@&#d<hqs%N>DrC&9K$d|kZe2#ws6)L=7K+{
zQw{XnV6UC$6-rW0emqm8wJoeZK)wJIcV?dST}Z;G0Arq{dVDu0&4kd%N!3F1*;*pW
zR&qUiFzK=@44#QGw7k1`3t_d8&*kBV->O##t|tonFc2YWrL7_eqg+=+k;!F-`^b8>
z#KWCE8%u4k@EprxqiV$VmmtiWxDLgnGu$Vs<8rppV5E<MCr+anDo)-{XRlCJ;D#M(
zT=3WgR02;Nm!54biUb^FtzPh8iGrf412epnki-k+G4mdkzC|lJqaRMbb0~Jjp-{}I
z5Do5afZi>ajBXL4nyyZM$SWVm!wnCj-B!Wjqj5-5dNXukI2$$|Bu3Lrw}z65Lc=1G
z^-#WuQOj$hwNGG?*CM_TO8Bg-1+qc>J7k5c51U8g?ZU5n?HYor;~JIjoWH-G>AoUP
ztrWWLbRNqIjW#RT*WqZgPJXU7C)VaW5}MiijYbABmzoru6EmQ*N8cVK7a3|aOB#O&
zBl8JY2WKfmj;h#Q!pN%9o@VNLv{OUL?rixHwOZuvX7{IJ{(EdPpuVFoQqIOa7gi<U
zTpbX&UCeYeNu>LVkBOKL@^smUA!tZ1CKRK}#SSM)iQHk)*R~?M!qkCruaS!#oIL1c
z<cK@1=jX>?J<BS8bpdt^R+}%A_DEhF^%o}8e!!lc`Y!qU>;U~&FfH#*98^G?i}pA{
z9Jg36t4=%6mhY(quYq*vSxptes9qy|7xSlH?G=S@>u>Ebe;|LVhs~@+06N<4CViBk
zUiY$thvX;>Tby6z9Y1e<Q<iIG*|o$r?OTFp`s)@_nHs4LeWbGvg7^}NK)>dAMQaiH
zm^r3v#$Q#2T=X>bsY#D%s!bhs^M9PMAcHbCc0FMHV{u-dwlL;a1eJ63v5U*?Q_8JO
zT#50!RD619#j_Uf))0ooADz~*9&lN!bBDRUgE>Vud-i5ck%vT=r^yD*^?Mp@Q^v+V
zG#-?gKlr}Eeqifb{|So?HM&g91<J5P5=Ly{?(NNY{6`O~L5r@sJe3rNZn06%SLk);
z9?hvE^Hr{!*G$<_doyzGn#*z*#}?)8dH=eYTgvc)T~}Jw!kCv68<+KL5{5?EXtDAZ
zWeNqp8%KIuBi&icn5s815Vho<+99VW1~m@L8l0=$c`t-L{q))~<!p*~vCdUcBcPz`
zyUi}!-k_`G{>P8|av8hQoCmQXkd?7wIJw<dY^{|7OQJUHKB~nksN_|Xy;DL?xjxU^
zbMa`WdfTBnr<wTd$mY&SgJ4U|X``k`#`gN@M+0x2W{YgC3kbLk<uYFJWglkx_)2#b
ztRiuA!EK9o)f`I2k)l;Of%E`ff91WlZh8yfRi6#N-mC`Ma(yr~U82SyAhc9B+ur!f
zP-3igg*KeYs9mGOAw@OaXYy9DnGjn0<m`JH&Q^h}^!h+uS9Ct*o-oEy(?iT6Yco>b
z_^v8bbg`<ZOL)a;i=IdfK0Zvw4nXsoC?eTOMpY)_ptiORm%J(1CD3dE0Z%Vy<2iHp
zcp>SAn{I*4bH$u(RZ6*x<DqKJ+5;a6Jq~=Y8V&c?Vsyq88!2nD?H?Eww58Mqt$7R8
z5BMjmKx>UhuA~hc=8czK8SHEKTzSxgbwi~9(OqJB&gwb^l4+m`k*Q;_?>Y-APi1{k
zAHQ)P)G)f|AyjSgcCFps)Fh6Bca*Xznq3<?y%xNvu0N78_R?~<RDFQx0ynlRG(E|j
zvEGN3bF<E_9p-I!UwQXFqcSGV#e^98tgFqLp+z9eP}y!jNA{)r*a+%M-_20xg?94<
zzmM{}syi0cd&P)zywMdS&Y_9k5JDtOM!L)b^2WP!+fHYGv>6!pV6Az&m{O8$wGFD?
zY&O*3*J0;_EqM#jh6^gMQKpXV?#1?>$ml1xvh8nSN>-?H=V;nJIwB07YX$e6vLxH(
zqYwQ>qxwR(i4f)DLd)-$P>T-no_c!LsN@)8`e;W@)-Hj0>nJ-}Kla4-ZdPJzI&Mce
zv)V_j;(3ERN3_@I$N<^|4Lf`B;8n+bX@bHbcZTopEmDI*Jfl)-pFDvo6svPRoo@(x
z);_{lY<;);XzT`dBFpRmGrr}z5u1=p<K1~3>C^<jVp}L(pzgMB_Vs-O?{Z?y$8M;)
zi@7zwpzV9#m72%En~(9@E)GWV^(~J*@^*K*TE0mynAnGJ5YSLCEnC42H-`tr4L=oW
zI}N{xQ$HT8Q6CVHf%RY&xw7!Zj(0xmg(K#UQ4u!ej95z7V4phlcTJ2&AR}$)zV-s!
zO7bqY6(=?1t+JCOW_z%HRE>S-{ce6iXQlLGcItwJ^mZx{m$&DA_oEZ)B{_bYPq-HA
zcH8WGoBG(aBU_j)vEy+_71T34@4dmSg!|M8Vf92Zj6WH7Q7t#OHQqWgFE3ARt+%!T
z?oLovLVlnf?2c7pTc)~cc^($_8nyKwsN`RA-23ed3sdj(ys%pjjM+9JrctL;dy8a(
z@en&CQmnV(()bu|Y%G1-4a(6x{aLytn$T-;(&{QIJB9vMox11U-1HpD@d(QkaJdEb
zG{)+6Dos_L+O3NpWo^=gR?evp|CqEG?L&Ut#D*KLaRFOgOEK(Kq1@!EGcTfo+%A&I
z=dLbB+d$u{sh?u)xP{PF8L%;YPPW53+@{>5W=Jt#wQpN;0_HYdw1{ksf_XhO4#2F=
zyPx6Lx2<92L-;L5PD`zn6zwIH`Jk(<gsVPionpJ-imI56$j4P0!br@ny3=!{x2TY^
zCD=)8_PgmN)E!^nczcDGc9Wm7oo5O3@fh=k=kh8J?_3KqEp7JHdv8z_iZ5#KmbiPt
z2Bt8Ro^p$7pS!xL3mtj<iN3f}#r6_&$Es0PnJTE?c;0#$%cGdu`T%~`gW;c^VD-S=
zrAatMf^%Lzr*wQ4kHSOb?WOUuEsJQ3xr{Imf1t{~iNmRwb_SP9!?FFN=b-E){!8P2
ztWCT~262O8`%?3<W4Wg+ovWY<re)?^kZ|Yi>$?Qw({erA$^bC;q33hv!d!>%wRhj#
zal^hk+WGNg;rJtb-EB(?czvOM=H7dl=vblBwAv>}%1@{}mnpUznfq1cE^sgsL0*4I
zJ##!*B?=vI_OEVis5o+_IwMIRrpQyT_Sq~ZU%oY7c5JMIADzpD!Upz9h@iWg_>>~j
zOLS;wp^i$-E?4<_cp?RiS%Rd?i;f*mOz=~(&3lo<=@(nR!_Rqiprh@weZlL!t#NCc
zO!QTcInq|%#>OVgobj{~ixEUec`E25zJ~*DofsQdzIa@5^nOXj2T;8O`l--(QyU<o
zeu8G~Z>^$t?TGY^7#&FQ+2SS3B#qK*k3`ye?8jUYSajE5iBbJls75CCc(m3dk{t?-
zopcER9{Z?TC)mk~gpi^kbbu>b-+a{m#8-y2^p$ka4n60w;Sc2}HMf<8JUvh<G@KZw
z+<GL!lpeahq2+nO{>CL0B&Btk)T`ctE$*qNW8L$`7!r^9T+>=<=2qaq-;ll2{`{Rg
zc5a0ZUI$oG&j-qVOuKa=*v4aY#IsoM+1|c4Z)<}lEDvy;5huB@1RJPquU2U*U-;gu
z=En2m+qjBzR#DEJDO`WU)hdd{Vj%^0V*KoyZ|5lzV87&g_j~NCjwv0uQVqXOb*QrQ
zy|Qn`hxx(58c<SELWpDAg~83oY-J_WoDiI6d7>70$E;L(X0uZZ72M1!6oeg)(cdKO
ze0gDaTz+ohR-#d)NbAH4x{I(21yjwvBQfmpLu$)|m{XolbgF!pmsqJ#D}(ylp6uC>
z{bqtcI#hT#HW=wl7>p!38sKsJ`r8}lt-q%Keqy%u(xk=yiIJiUw6|5IvkS+#?JTBl
z8H5(Q?l#wzazujH!8o>1xtn8#_w+397*<wp?Ryt$UFh41$qd}LyNJ7Oao(Aw2g|wy
zH_nZ+R#~EUME^#j4$@^5&>_cy8!pQGP%K(Ga3pAjsaTbbXJlQF_+m+-UpUUent@xM
zg%jqLUExj~o^vQ3Gl*>wh=_gOr2*|U64_iXb+-111a<qXXnUI&{l`dM&{4Gw)jZn;
zlj{VxW@#OcVE1Y%J*u^Z@H+XSqL6SwA|^jv2RU_+d;O!mk)dw7-m9B4{6*G1zRdR6
zQ}6v&Xt7R2h3Xp}EQk4nF2TULG{Ri=D|JC<a+K7dldN1}CY_f!vK#u}K3`g#TpO&W
z;!;64`0$d9raD!VbYP`kuFUasaMh!;&81y}LHS(SuGRxwEn4LZb4DS1j9iAq$MXd@
z(Ebka7_Gc(ljGaJqtI-OzmA@c@sYB$)Vg!RP4~``vaVyRq$rJXRjIPwtepN;(B%wy
zmU>H}$TjeajM+I20xw(((>fej-@CIz4S1pi$(#}P7`4({6QS2CaQS4NPENDp>sAqD
z$bH4KGzXGffkJ7R>V>)>tC)uax{UsN*dbeNC*v}#8Y#OWYwL4t$ePR?VTyIs!wea+
z5Urmc)X|^`MG~*dS6pGSbU+gPJoq*^a=_>$n4|P^w$sMBBy@f*Z^Jg6?n5?oId6f{
z$LW4M|4m502z0t7g<#Bx%X;9<=)smFolV&(V^(7Cv2-sxbxopQ!)*#ZRhTBpx1)Fc
zNm1T%bONzv6@#|dz(w02AH8OXe>kQ#1FMCzO}2J_mST)+ExmBr9cva-@?;wnmWMOk
z{3_~EX_xadgJGv&H@zK_8{(x84`}+c?oSBX*Ge3VdfTt&F}yCpFP?CpW+BE^cWY0^
zb&uBN!Ja3UzYHK-CTyA5=L<c0d<h!DNBIa<xax8W3(Ru8L0cVXQ18|Y^|*S%)R96z
zBT$(=zQ}2vmt6LzN~Oyf_Y92%P@QOx{7~}5!UIqCdfu?VwC0Nb!2@iiit8-5zUWFG
z*G&+GLIU#J;}hvowNJWnglvb^<2q~lS#?ixVtYT@(O3{TC|4kFJYLB*jni-4YZi0>
zEMW{l3Usky#ly=7px648W31UNV@K)&Ub&zP1c7%)`{);I4b0Q<)B}3;NMG2JH=X$U
zfIW4)4n9ZM`-yRj67I)YSLDK)qfUJ_ij}a#aZN~9EXrh8eZY2&=uY%2N0UFF7<~%M
zsB8=erOWZ>Ct_#^tHZ|*q`H;A)5;ycw*I<Cd*bZlOJ9YmRUK2<qXkpRR3nr6r~%Jz
z*(8tA&DYO)etdgVmoonqD{*<5Fog4ClIs-~_uhjuZOI}#Wy+ce${%#oyHloXelqfz
z8)?D3Y_>cmVxi8_0Xk}aJA^ath+E;xg!x+As(M#0=)3!NJR6H&9+zd#iP(m0PIW8$
z1Y^VX`>jm`W!=WpF*{ioM?C9`yOR>@0q=u7o>BP-eSHqCgMDj!2anwH?s%i2p+Q7D
zzszIf5XJpE)IG4;d_(La-xenmF(tgAxK`Y4sQ}BSJEPs6N_U2vI{8=0C_F?@7<(G;
zo$~G=8p+076G;`}>{MQ>t>7cm=zGtfbdDXm6||jUU|?X?CaE?(<6bKDYKeHlz}DA8
zXT={X=yp_R;HfJ9h%?eWvQ!dRgz&Su*JfNt!Wu>|XfU<MM~gB&J0gc}IH}?|B4WRK
zWPL0FhctFGdMucOFdhrVunIe5)4K^H9IjB#eA)p5w?c#v7kp8jx^~bxxJB{;hPFL9
zkR9Dbpj+T5ZMgHQg|oj*DS;x&jK}1rn&}Shp9sgOI*7puQD-w?3H*cg72;5H(_zW*
zApJBIM-p2~F;qWDj!n|Kd=5|T8OPkQ_G;ujgvKybr5@~eci2{8WAz+%NUSp-&eoG!
zOGLNLJewWl&1*NT467W3god~fYgX?!f0?NCFnjD$qE-fyQ)|Q_DLc*{olmXSVl$g_
z$vj}o?RatMy(o*j8?q1Mgw{OUOgVR6_qvS<Co*&!cR`ROi|*I`ajyG5s@L8agnX2J
zF=DLkMG`z{RP&996y0yAtvJcb<cba?TV#j4VYFPC>&68iRikRrHRW|ZxzRR^`eIGt
zIeiDgVS>IeExKVRWW8-=<xUfo0v~z=RA=cFWKXgcMECd}xHp7iqkBanH}TZ0h0rA=
zqxUZ>A=<k-RjTtwbJkkep{8z*173wY^e%-U0{Ue!n@wbg^2q)Vx5c(_RfvuR4}XXn
z+JE>yA`}`)ZkWBrZD`hpWIxBGkh&f#ijr449~m`j6{4jiJ*C!oVA8ZC?$1RM#K(_b
zL9TW)kN*Y4%^-qPpMP7d4)o?Nk#>aoYHT(*g)qmRUb?**F@pnNiy6Fv9rEiUqD(^O
zzyS?nBrX63BTRYduaG(0VVG2yJRe%o&rVrLjbxTaAFTd8s;<<@Qs>u(<193R8>}2_
zuwp{7;H2a*X7_jryzriZXMg?bTuegABb^87@SsKkr2)0Gyiax8KQWstw^v<oS3Xw7
zu51m`3~hoyxErcHymdFTZd#AO59{EkuFTcpAR33(3xc{zRnn1~1Ei(i*^HdCvM~;;
za&}Uip|u>#ix45EVrcEhr>!NMhprl<CqZuKa#zuI&@zymVzIicetS0bq#u?m(r_@S
zJ79bl%4EyHCQ3fK@en+A1@)e}HWLP|gr_zuoA{}Z<(-*53Zu@k+=^%~5F(z$EFLI;
z-TQTS8$W|GRbZq93Ha1?lu+`O;rn>$InQMzjSFH54x5k9qHc`@9uKQzvL4ihcq{^B
zPrVR=o_ic%Y>6&rMN)hTZsI7I<3&`#(nl+3y3ys9A~<Ao%ZuW})CJ)6^(aRV(gGxR
z89#(FDW;GZEAf;rI$+PU)rEV|rASrwP0_mr^Ldv)IuUf1M>&^=4?PL&nd8)`OfG#n
zwAMN$1&>K++c{^|7<<q5KGu)u(OEfEJJw2aEi(;x-i=Y=j3ram9H2n-Fuqv0dVlXJ
z&WgG5X({!vJFDrEbm+CWDca^zIe2@s1@a;;Y3!U9Q)&P0UXFmCP51_!wvTfAIyR^M
z7^R*O@yz1b-s4VC>4P=2y(B{jJsQ0a#U;HTo4ZmWZYvI{+s;Td{Yzem%0*k#)vjpB
zia;J&>}ICate44SFYY3vEelqStQWFihx%^vQ@Do(sOy7yR2@WNv7Y9I^yL=nZr3mb
zXKV5t@=?-Sk|b{XMhA7ZGB@2hqsx}4xwCW!in#C<kr{U&JG{9FhoZ<aTve_lLz39>
zI@}sc<h3gsW}hp-`WUywKA>Zlr3-NFJ@NFaJlhyfcw{k^vvtGl`N9xSo**rDW4S}i
zM9{fMPWo%4wYDG~BZ18BD+}h|GQKc-g^{++3MY>}W_uq7jGHx{mwE9fZiPCoxN$+7
zrODGGJrOkcPQUB(FD5aoS4g~7#6NR^ma7-!>mHuJfY5kTe6PpNNKC9GGRiu^L31uG
z$7v`*JknQHsYB!Tm_W{a32TM099djW%5e+j0Ve_ct}IM>XLF1Ap+YvcrLV=|CKo6S
zb+<Td{{5RWR}u2f(q<b(D$9JsF0OOzJ*+z0P5kc1t}CXlYgua%x*2lSgp|*WS3H-#
zdYr7?GQOL18zUS<2|;+vi4|4sQBM2Gs&WVS!D`q5Lz;XR@5rEfa{uG-!q?R8Ncz%(
z5K6~LQ@d2wp#)5q4u<ENlFbS)U4o1t9{-d>9Nl3_YdKP6%Cxy@6TxZ>;4&nTneadr
z_ES90ydCev)LV!dN=#(*f}|ZORFdvkYBni^aLbUk>BajeWIOcmHP#8S)*2U~QKI%S
zyrLmtPqb&TphJ;>yAxri#;{uyk`JJqODDw%(Z=2<VfJZemI(PFAD{6Sm|uE%BTbkl
zROsg*MOh20YgGs3H7?@pmQ>`1uc}br^V%>j!gS)D*q*f_-qf8&D;W1dJgQMlaH5er
zN2U<%Smb7==vE}dDI8K7cKz!vs^73o9f>2sgiTzWcwY|BMYHH5%Vn7#kiw&eItCqa
zIkR2~Q}>X=Ar8W|^Ms41Fm8o6IB2_j60eOeBB1Br!boW7JnoeX6Gs)?7rW0^5psc-
zjS16yb>dFn>KPOF;imD}e!enuIniFzv}n$m2#gCCv4jM#ArwlzZ$7@9&XkFxZ4n!V
zj3dyiwW4Ki2QG{@i>yuZXQizw_OkZI^-3otXC{!(lUpJF33gI60ak;Uqitp74|B6I
zgg{b=Iz}WkhCGj1M<xTd?60J5qsr1Cg7F~~U2N!(@lC<>=hu4#Aw173YxIVbISaoc
z-nLZC*6Tgivd5V`K%GxhBsp@SUU60-rfc$=wb>zdJzXS&-5(NRRodFk;Kxk!S(<ov
z$YXcI9;^grAyiJ4dWTv3b}K~Ww09(;mLY4+kj|$A?IMr}`7q?mIS1>O(a0e7oY=E(
zAyS;Ow?6Q&XA+cnkCb{28_1N8H#?J!*$MmIwLq^*T_9-z^&UE@A(z9oGYtFy6EZef
LrJugUA?W`A8`#=m

literal 0
HcmV?d00001

diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/app/global-error.tsx b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/app/global-error.tsx
new file mode 100644
index 000000000000..20c175015b03
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/app/global-error.tsx
@@ -0,0 +1,23 @@
+'use client';
+
+import * as Sentry from '@sentry/nextjs';
+import NextError from 'next/error';
+import { useEffect } from 'react';
+
+export default function GlobalError({ error }: { error: Error & { digest?: string } }) {
+  useEffect(() => {
+    Sentry.captureException(error);
+  }, [error]);
+
+  return (
+    <html>
+      <body>
+        {/* `NextError` is the default Next.js error page component. Its type
+        definition requires a `statusCode` prop. However, since the App Router
+        does not expose status codes for errors, we simply pass 0 to render a
+        generic error message. */}
+        <NextError statusCode={0} />
+      </body>
+    </html>
+  );
+}
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/app/layout.tsx b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/app/layout.tsx
new file mode 100644
index 000000000000..c8f9cee0b787
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/app/layout.tsx
@@ -0,0 +1,7 @@
+export default function Layout({ children }: { children: React.ReactNode }) {
+  return (
+    <html lang="en">
+      <body>{children}</body>
+    </html>
+  );
+}
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/app/page.tsx b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/app/page.tsx
new file mode 100644
index 000000000000..f28a670096bf
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/app/page.tsx
@@ -0,0 +1,3 @@
+export default function Page() {
+  return <p>Next.js 16 Tunnel Route Test</p>;
+}
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/eslint.config.mjs b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/eslint.config.mjs
new file mode 100644
index 000000000000..60f7af38f6c2
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/eslint.config.mjs
@@ -0,0 +1,19 @@
+import { dirname } from 'path';
+import { fileURLToPath } from 'url';
+import { FlatCompat } from '@eslint/eslintrc';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+const compat = new FlatCompat({
+  baseDirectory: __dirname,
+});
+
+const eslintConfig = [
+  ...compat.extends('next/core-web-vitals', 'next/typescript'),
+  {
+    ignores: ['node_modules/**', '.next/**', 'out/**', 'build/**', 'next-env.d.ts'],
+  },
+];
+
+export default eslintConfig;
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/instrumentation-client.ts b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/instrumentation-client.ts
new file mode 100644
index 000000000000..d40b790f18a5
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/instrumentation-client.ts
@@ -0,0 +1,12 @@
+import * as Sentry from '@sentry/nextjs';
+
+Sentry.init({
+  environment: 'qa', // dynamic sampling bias to keep transactions
+  // Use a fake but properly formatted Sentry SaaS DSN for tunnel route testing
+  dsn: 'https://public@o12345.ingest.us.sentry.io/67890',
+  // No tunnel option - using tunnelRoute from withSentryConfig
+  tracesSampleRate: 1.0,
+  sendDefaultPii: true,
+});
+
+export const onRouterTransitionStart = Sentry.captureRouterTransitionStart;
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/instrumentation.ts b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/instrumentation.ts
new file mode 100644
index 000000000000..964f937c439a
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/instrumentation.ts
@@ -0,0 +1,13 @@
+import * as Sentry from '@sentry/nextjs';
+
+export async function register() {
+  if (process.env.NEXT_RUNTIME === 'nodejs') {
+    await import('./sentry.server.config');
+  }
+
+  if (process.env.NEXT_RUNTIME === 'edge') {
+    await import('./sentry.edge.config');
+  }
+}
+
+export const onRequestError = Sentry.captureRequestError;
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/next.config.ts b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/next.config.ts
new file mode 100644
index 000000000000..cad68b926a58
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/next.config.ts
@@ -0,0 +1,9 @@
+import { withSentryConfig } from '@sentry/nextjs';
+import type { NextConfig } from 'next';
+
+const nextConfig: NextConfig = {};
+
+export default withSentryConfig(nextConfig, {
+  silent: true,
+  tunnelRoute: true,
+});
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/package.json b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/package.json
new file mode 100644
index 000000000000..40389ad0888f
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/package.json
@@ -0,0 +1,63 @@
+{
+  "name": "nextjs-16-tunnel",
+  "version": "0.1.0",
+  "private": true,
+  "scripts": {
+    "dev": " next dev",
+    "build": "_SENTRY_TUNNEL_DESTINATION_OVERRIDE=http://localhost:3031/ next build > .tmp_build_stdout 2> .tmp_build_stderr || (cat .tmp_build_stdout && cat .tmp_build_stderr && exit 1)",
+    "clean": "npx rimraf node_modules pnpm-lock.yaml .tmp_dev_server_logs",
+    "dev:webpack": "_SENTRY_TUNNEL_DESTINATION_OVERRIDE=http://localhost:3031/ next dev --webpack",
+    "build-webpack": "_SENTRY_TUNNEL_DESTINATION_OVERRIDE=http://localhost:3031/ next build --webpack > .tmp_build_stdout 2> .tmp_build_stderr || (cat .tmp_build_stdout && cat .tmp_build_stderr && exit 1)",
+    "start": "_SENTRY_TUNNEL_DESTINATION_OVERRIDE=http://localhost:3031/ next start",
+    "lint": "eslint",
+    "test:prod": "TEST_ENV=production playwright test",
+    "test:dev": "TEST_ENV=development _SENTRY_TUNNEL_DESTINATION_OVERRIDE=http://localhost:3031/ playwright test",
+    "test:dev-webpack": "TEST_ENV=development-webpack _SENTRY_TUNNEL_DESTINATION_OVERRIDE=http://localhost:3031/ playwright test",
+    "test:build": "pnpm install && pnpm build",
+    "test:build-webpack": "pnpm install && pnpm build-webpack",
+    "test:build-canary": "pnpm install && pnpm add next@canary && pnpm build",
+    "test:build-latest": "pnpm install && pnpm add next@latest && pnpm build",
+    "test:build-latest-webpack": "pnpm install && pnpm add next@latest && pnpm build-webpack",
+    "test:build-canary-webpack": "pnpm install && pnpm add next@canary && pnpm build-webpack",
+    "test:assert": "pnpm test:prod && pnpm test:dev",
+    "test:assert-webpack": "pnpm test:prod && pnpm test:dev-webpack"
+  },
+  "dependencies": {
+    "@sentry/nextjs": "latest || *",
+    "@sentry/core": "latest || *",
+    "ai": "^3.0.0",
+    "import-in-the-middle": "^1",
+    "next": "16.0.0",
+    "react": "19.1.0",
+    "react-dom": "19.1.0",
+    "require-in-the-middle": "^7",
+    "zod": "^3.22.4"
+  },
+  "devDependencies": {
+    "@playwright/test": "~1.53.2",
+    "@sentry-internal/test-utils": "link:../../../test-utils",
+    "@types/node": "^20",
+    "@types/react": "^19",
+    "@types/react-dom": "^19",
+    "eslint": "^9",
+    "eslint-config-next": "canary",
+    "typescript": "^5"
+  },
+  "volta": {
+    "extends": "../../package.json"
+  },
+  "sentryTest": {
+    "variants": [
+      {
+        "build-command": "pnpm test:build-webpack",
+        "label": "nextjs-16-tunnel (webpack)",
+        "assert-command": "pnpm test:assert-webpack"
+      },
+      {
+        "build-command": "pnpm test:build",
+        "label": "nextjs-16-tunnel (turbopack)",
+        "assert-command": "pnpm test:assert"
+      }
+    ]
+  }
+}
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/playwright.config.mjs b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/playwright.config.mjs
new file mode 100644
index 000000000000..797418b8cf7d
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/playwright.config.mjs
@@ -0,0 +1,29 @@
+import { getPlaywrightConfig } from '@sentry-internal/test-utils';
+const testEnv = process.env.TEST_ENV;
+
+if (!testEnv) {
+  throw new Error('No test env defined');
+}
+
+const getStartCommand = () => {
+  if (testEnv === 'development-webpack') {
+    return 'pnpm next dev -p 3030 --webpack 2>&1 | tee .tmp_dev_server_logs';
+  }
+
+  if (testEnv === 'development') {
+    return 'pnpm next dev -p 3030 2>&1 | tee .tmp_dev_server_logs';
+  }
+
+  if (testEnv === 'production') {
+    return 'pnpm next start -p 3030';
+  }
+
+  throw new Error(`Unknown test env: ${testEnv}`);
+};
+
+const config = getPlaywrightConfig({
+  startCommand: getStartCommand(),
+  port: 3030,
+});
+
+export default config;
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/proxy.ts b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/proxy.ts
new file mode 100644
index 000000000000..28639f60bbe4
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/proxy.ts
@@ -0,0 +1,11 @@
+import { NextResponse } from 'next/server';
+import type { NextRequest } from 'next/server';
+
+export async function proxy(_request: NextRequest) {
+  return NextResponse.next();
+}
+
+// Match all routes to test that tunnel requests are properly filtered
+export const config = {
+  matcher: '/:path*',
+};
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/public/file.svg b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/public/file.svg
new file mode 100644
index 000000000000..004145cddf3f
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/public/file.svg
@@ -0,0 +1 @@
+<svg fill="none" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><path d="M14.5 13.5V5.41a1 1 0 0 0-.3-.7L9.8.29A1 1 0 0 0 9.08 0H1.5v13.5A2.5 2.5 0 0 0 4 16h8a2.5 2.5 0 0 0 2.5-2.5m-1.5 0v-7H8v-5H3v12a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1M9.5 5V2.12L12.38 5zM5.13 5h-.62v1.25h2.12V5zm-.62 3h7.12v1.25H4.5zm.62 3h-.62v1.25h7.12V11z" clip-rule="evenodd" fill="#666" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/public/globe.svg b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/public/globe.svg
new file mode 100644
index 000000000000..567f17b0d7c7
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/public/globe.svg
@@ -0,0 +1 @@
+<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><g clip-path="url(#a)"><path fill-rule="evenodd" clip-rule="evenodd" d="M10.27 14.1a6.5 6.5 0 0 0 3.67-3.45q-1.24.21-2.7.34-.31 1.83-.97 3.1M8 16A8 8 0 1 0 8 0a8 8 0 0 0 0 16m.48-1.52a7 7 0 0 1-.96 0H7.5a4 4 0 0 1-.84-1.32q-.38-.89-.63-2.08a40 40 0 0 0 3.92 0q-.25 1.2-.63 2.08a4 4 0 0 1-.84 1.31zm2.94-4.76q1.66-.15 2.95-.43a7 7 0 0 0 0-2.58q-1.3-.27-2.95-.43a18 18 0 0 1 0 3.44m-1.27-3.54a17 17 0 0 1 0 3.64 39 39 0 0 1-4.3 0 17 17 0 0 1 0-3.64 39 39 0 0 1 4.3 0m1.1-1.17q1.45.13 2.69.34a6.5 6.5 0 0 0-3.67-3.44q.65 1.26.98 3.1M8.48 1.5l.01.02q.41.37.84 1.31.38.89.63 2.08a40 40 0 0 0-3.92 0q.25-1.2.63-2.08a4 4 0 0 1 .85-1.32 7 7 0 0 1 .96 0m-2.75.4a6.5 6.5 0 0 0-3.67 3.44 29 29 0 0 1 2.7-.34q.31-1.83.97-3.1M4.58 6.28q-1.66.16-2.95.43a7 7 0 0 0 0 2.58q1.3.27 2.95.43a18 18 0 0 1 0-3.44m.17 4.71q-1.45-.12-2.69-.34a6.5 6.5 0 0 0 3.67 3.44q-.65-1.27-.98-3.1" fill="#666"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h16v16H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/public/next.svg b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/public/next.svg
new file mode 100644
index 000000000000..5174b28c565c
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/public/next.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 394 80"><path fill="#000" d="M262 0h68.5v12.7h-27.2v66.6h-13.6V12.7H262V0ZM149 0v12.7H94v20.4h44.3v12.6H94v21h55v12.6H80.5V0h68.7zm34.3 0h-17.8l63.8 79.4h17.9l-32-39.7 32-39.6h-17.9l-23 28.6-23-28.6zm18.3 56.7-9-11-27.1 33.7h17.8l18.3-22.7z"/><path fill="#000" d="M81 79.3 17 0H0v79.3h13.6V17l50.2 62.3H81Zm252.6-.4c-1 0-1.8-.4-2.5-1s-1.1-1.6-1.1-2.6.3-1.8 1-2.5 1.6-1 2.6-1 1.8.3 2.5 1a3.4 3.4 0 0 1 .6 4.3 3.7 3.7 0 0 1-3 1.8zm23.2-33.5h6v23.3c0 2.1-.4 4-1.3 5.5a9.1 9.1 0 0 1-3.8 3.5c-1.6.8-3.5 1.3-5.7 1.3-2 0-3.7-.4-5.3-1s-2.8-1.8-3.7-3.2c-.9-1.3-1.4-3-1.4-5h6c.1.8.3 1.6.7 2.2s1 1.2 1.6 1.5c.7.4 1.5.5 2.4.5 1 0 1.8-.2 2.4-.6a4 4 0 0 0 1.6-1.8c.3-.8.5-1.8.5-3V45.5zm30.9 9.1a4.4 4.4 0 0 0-2-3.3 7.5 7.5 0 0 0-4.3-1.1c-1.3 0-2.4.2-3.3.5-.9.4-1.6 1-2 1.6a3.5 3.5 0 0 0-.3 4c.3.5.7.9 1.3 1.2l1.8 1 2 .5 3.2.8c1.3.3 2.5.7 3.7 1.2a13 13 0 0 1 3.2 1.8 8.1 8.1 0 0 1 3 6.5c0 2-.5 3.7-1.5 5.1a10 10 0 0 1-4.4 3.5c-1.8.8-4.1 1.2-6.8 1.2-2.6 0-4.9-.4-6.8-1.2-2-.8-3.4-2-4.5-3.5a10 10 0 0 1-1.7-5.6h6a5 5 0 0 0 3.5 4.6c1 .4 2.2.6 3.4.6 1.3 0 2.5-.2 3.5-.6 1-.4 1.8-1 2.4-1.7a4 4 0 0 0 .8-2.4c0-.9-.2-1.6-.7-2.2a11 11 0 0 0-2.1-1.4l-3.2-1-3.8-1c-2.8-.7-5-1.7-6.6-3.2a7.2 7.2 0 0 1-2.4-5.7 8 8 0 0 1 1.7-5 10 10 0 0 1 4.3-3.5c2-.8 4-1.2 6.4-1.2 2.3 0 4.4.4 6.2 1.2 1.8.8 3.2 2 4.3 3.4 1 1.4 1.5 3 1.5 5h-5.8z"/></svg>
\ No newline at end of file
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/public/vercel.svg b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/public/vercel.svg
new file mode 100644
index 000000000000..77053960334e
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/public/vercel.svg
@@ -0,0 +1 @@
+<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1155 1000"><path d="m577.3 0 577.4 1000H0z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/public/window.svg b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/public/window.svg
new file mode 100644
index 000000000000..b2b2a44f6ebc
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/public/window.svg
@@ -0,0 +1 @@
+<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill-rule="evenodd" clip-rule="evenodd" d="M1.5 2.5h13v10a1 1 0 0 1-1 1h-11a1 1 0 0 1-1-1zM0 1h16v11.5a2.5 2.5 0 0 1-2.5 2.5h-11A2.5 2.5 0 0 1 0 12.5zm3.75 4.5a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5M7 4.75a.75.75 0 1 1-1.5 0 .75.75 0 0 1 1.5 0m1.75.75a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5" fill="#666"/></svg>
\ No newline at end of file
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/sentry.edge.config.ts b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/sentry.edge.config.ts
new file mode 100644
index 000000000000..8ba3a3bf2faa
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/sentry.edge.config.ts
@@ -0,0 +1,11 @@
+import * as Sentry from '@sentry/nextjs';
+
+Sentry.init({
+  environment: 'qa', // dynamic sampling bias to keep transactions
+  // Use a fake but properly formatted Sentry SaaS DSN for tunnel route testing
+  dsn: 'https://public@o12345.ingest.us.sentry.io/67890',
+  // No tunnel option - using tunnelRoute from withSentryConfig
+  tracesSampleRate: 1.0,
+  sendDefaultPii: true,
+  // debug: true,
+});
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/sentry.server.config.ts b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/sentry.server.config.ts
new file mode 100644
index 000000000000..8ba3a3bf2faa
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/sentry.server.config.ts
@@ -0,0 +1,11 @@
+import * as Sentry from '@sentry/nextjs';
+
+Sentry.init({
+  environment: 'qa', // dynamic sampling bias to keep transactions
+  // Use a fake but properly formatted Sentry SaaS DSN for tunnel route testing
+  dsn: 'https://public@o12345.ingest.us.sentry.io/67890',
+  // No tunnel option - using tunnelRoute from withSentryConfig
+  tracesSampleRate: 1.0,
+  sendDefaultPii: true,
+  // debug: true,
+});
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/start-event-proxy.mjs b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/start-event-proxy.mjs
new file mode 100644
index 000000000000..976073d3d2c4
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/start-event-proxy.mjs
@@ -0,0 +1,14 @@
+import * as fs from 'fs';
+import * as path from 'path';
+import { startEventProxyServer } from '@sentry-internal/test-utils';
+
+const packageJson = JSON.parse(fs.readFileSync(path.join(process.cwd(), 'package.json')));
+
+startEventProxyServer({
+  port: 3031,
+  proxyServerName: 'nextjs-16-tunnel',
+  envelopeDumpPath: path.join(
+    process.cwd(),
+    `event-dumps/nextjs-16-tunnel-v${packageJson.dependencies.next}-${process.env.TEST_ENV}.dump`,
+  ),
+});
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/tests/tunnel-route.test.ts b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/tests/tunnel-route.test.ts
new file mode 100644
index 000000000000..a8bd7b4d925e
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/tests/tunnel-route.test.ts
@@ -0,0 +1,132 @@
+import { expect, test } from '@playwright/test';
+import { waitForTransaction } from '@sentry-internal/test-utils';
+
+test('Tunnel route should proxy pageload transaction to Sentry', async ({ page }) => {
+  // Wait for the pageload transaction to be sent through the tunnel
+  const pageloadTransactionPromise = waitForTransaction('nextjs-16-tunnel', async transactionEvent => {
+    return transactionEvent?.contexts?.trace?.op === 'pageload' && transactionEvent?.transaction === '/';
+  });
+
+  // Navigate to the page
+  await page.goto('/');
+
+  const pageloadTransaction = await pageloadTransactionPromise;
+
+  // Verify the pageload transaction was received successfully
+  expect(pageloadTransaction).toBeDefined();
+  expect(pageloadTransaction.transaction).toBe('/');
+  expect(pageloadTransaction.contexts?.trace?.op).toBe('pageload');
+  expect(pageloadTransaction.contexts?.trace?.status).toBe('ok');
+  expect(pageloadTransaction.type).toBe('transaction');
+});
+
+test('Tunnel route should send multiple pageload transactions consistently', async ({ page }) => {
+  // This test verifies that the tunnel route remains consistent across multiple page loads
+  // (important for Turbopack which could generate different tunnel routes for client/server)
+
+  // First pageload
+  const firstPageloadPromise = waitForTransaction('nextjs-16-tunnel', async transactionEvent => {
+    return transactionEvent?.contexts?.trace?.op === 'pageload' && transactionEvent?.transaction === '/';
+  });
+
+  await page.goto('/');
+  const firstPageload = await firstPageloadPromise;
+
+  expect(firstPageload).toBeDefined();
+  expect(firstPageload.transaction).toBe('/');
+  expect(firstPageload.contexts?.trace?.op).toBe('pageload');
+  expect(firstPageload.contexts?.trace?.status).toBe('ok');
+
+  // Second pageload (reload)
+  const secondPageloadPromise = waitForTransaction('nextjs-16-tunnel', async transactionEvent => {
+    return transactionEvent?.contexts?.trace?.op === 'pageload' && transactionEvent?.transaction === '/';
+  });
+
+  await page.reload();
+  const secondPageload = await secondPageloadPromise;
+
+  expect(secondPageload).toBeDefined();
+  expect(secondPageload.transaction).toBe('/');
+  expect(secondPageload.contexts?.trace?.op).toBe('pageload');
+  expect(secondPageload.contexts?.trace?.status).toBe('ok');
+});
+
+test('Tunnel requests should not create middleware or fetch spans', async ({ page }) => {
+  // This test verifies that our span filtering logic works correctly
+  // The proxy runs on all routes, so we'll get a middleware transaction for `/`
+  // But we should NOT get middleware or fetch transactions for the tunnel route itself
+
+  const allTransactions: any[] = [];
+
+  // Collect all transactions
+  const collectPromise = (async () => {
+    // Keep collecting for 3 seconds after pageload
+    const endTime = Date.now() + 3000;
+    while (Date.now() < endTime) {
+      try {
+        const tx = await Promise.race([
+          waitForTransaction('nextjs-16-tunnel', () => true),
+          new Promise((_, reject) => setTimeout(() => reject(), 500)),
+        ]);
+        allTransactions.push(tx);
+      } catch {
+        // Timeout, continue collecting
+      }
+    }
+  })();
+
+  // Wait for pageload transaction
+  const pageloadPromise = waitForTransaction('nextjs-16-tunnel', async transactionEvent => {
+    return transactionEvent?.contexts?.trace?.op === 'pageload';
+  });
+
+  await page.goto('/');
+  const pageloadTransaction = await pageloadPromise;
+
+  // Trigger errors to force tunnel POST requests
+  await page
+    .evaluate(() => {
+      throw new Error('Test tunnel error 1');
+    })
+    .catch(() => {
+      // Expected to throw
+    });
+
+  await page
+    .evaluate(() => {
+      throw new Error('Test tunnel error 2');
+    })
+    .catch(() => {
+      // Expected to throw
+    });
+
+  // Wait for events to be sent through tunnel
+  await page.waitForTimeout(2000);
+
+  // Continue collecting for a bit
+  await collectPromise;
+
+  // We should have received the pageload transaction
+  expect(pageloadTransaction).toBeDefined();
+  expect(pageloadTransaction.contexts?.trace?.op).toBe('pageload');
+
+  const middlewareTransactions = allTransactions.filter(tx => tx.contexts?.trace?.op === 'http.server.middleware');
+
+  // We WILL have a middleware transaction for GET / (the pageload)
+  // But we should NOT have middleware transactions for POST requests (tunnel route)
+  const postMiddlewareTransactions = middlewareTransactions.filter(
+    tx => tx.transaction?.includes('POST') || tx.contexts?.trace?.data?.['http.request.method'] === 'POST',
+  );
+
+  expect(postMiddlewareTransactions).toHaveLength(0);
+
+  // We should NOT have any fetch transactions to Sentry ingest
+  const sentryFetchTransactions = allTransactions.filter(
+    tx =>
+      tx.contexts?.trace?.op === 'http.client' &&
+      (tx.contexts?.trace?.data?.['url.full']?.includes('sentry.io') ||
+        tx.contexts?.trace?.data?.['url.full']?.includes('ingest')),
+  );
+
+  expect(sentryFetchTransactions).toHaveLength(0);
+});
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/tsconfig.json b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/tsconfig.json
new file mode 100644
index 000000000000..cc9ed39b5aa2
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/tsconfig.json
@@ -0,0 +1,27 @@
+{
+  "compilerOptions": {
+    "target": "ES2017",
+    "lib": ["dom", "dom.iterable", "esnext"],
+    "allowJs": true,
+    "skipLibCheck": true,
+    "strict": true,
+    "noEmit": true,
+    "esModuleInterop": true,
+    "module": "esnext",
+    "moduleResolution": "bundler",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "jsx": "react-jsx",
+    "incremental": true,
+    "plugins": [
+      {
+        "name": "next"
+      }
+    ],
+    "paths": {
+      "@/*": ["./*"]
+    }
+  },
+  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts", ".next/dev/types/**/*.ts", "**/*.mts"],
+  "exclude": ["node_modules"]
+}
diff --git a/packages/nextjs/src/common/utils/dropMiddlewareTunnelRequests.ts b/packages/nextjs/src/common/utils/dropMiddlewareTunnelRequests.ts
new file mode 100644
index 000000000000..6f8b4eb96603
--- /dev/null
+++ b/packages/nextjs/src/common/utils/dropMiddlewareTunnelRequests.ts
@@ -0,0 +1,59 @@
+import { SEMATTRS_HTTP_TARGET } from '@opentelemetry/semantic-conventions';
+import { type Span, type SpanAttributes, GLOBAL_OBJ, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
+import { isSentryRequestSpan } from '@sentry/opentelemetry';
+import { ATTR_NEXT_SPAN_TYPE } from '../nextSpanAttributes';
+import { TRANSACTION_ATTR_SHOULD_DROP_TRANSACTION } from '../span-attributes-with-logic-attached';
+
+const globalWithInjectedValues = GLOBAL_OBJ as typeof GLOBAL_OBJ & {
+  _sentryRewritesTunnelPath?: string;
+};
+
+/**
+ * Drops spans for tunnel requests from middleware or fetch instrumentation.
+ * This catches both:
+ * 1. Requests to the local tunnel route (before rewrite)
+ * 2. Requests to Sentry ingest (after rewrite)
+ */
+export function dropMiddlewareTunnelRequests(span: Span, attrs: SpanAttributes | undefined): void {
+  // Only filter middleware spans or HTTP fetch spans
+  const isMiddleware = attrs?.[ATTR_NEXT_SPAN_TYPE] === 'Middleware.execute';
+  // The fetch span could be originating from rewrites re-writing a tunnel request
+  // So we want to filter it out
+  const isFetchSpan = attrs?.[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN] === 'auto.http.otel.node_fetch';
+
+  // If the span is not a middleware span or a fetch span, return
+  if (!isMiddleware && !isFetchSpan) {
+    return;
+  }
+
+  // Check if this is either a tunnel route request or a Sentry ingest request
+  const isTunnel = isTunnelRouteSpan(attrs || {});
+  const isSentry = isSentryRequestSpan(span);
+
+  if (isTunnel || isSentry) {
+    // Mark the span to be dropped
+    span.setAttribute(TRANSACTION_ATTR_SHOULD_DROP_TRANSACTION, true);
+  }
+}
+
+/**
+ * Checks if a span's HTTP target matches the tunnel route.
+ */
+function isTunnelRouteSpan(spanAttributes: Record<string, unknown>): boolean {
+  const tunnelPath = globalWithInjectedValues._sentryRewritesTunnelPath || process.env._sentryRewritesTunnelPath;
+  if (!tunnelPath) {
+    return false;
+  }
+
+  // eslint-disable-next-line deprecation/deprecation
+  const httpTarget = spanAttributes[SEMATTRS_HTTP_TARGET];
+
+  if (typeof httpTarget === 'string') {
+    // Extract pathname from the target (e.g., "/tunnel?o=123&p=456" -> "/tunnel")
+    const pathname = httpTarget.split('?')[0] || '';
+
+    return pathname.startsWith(tunnelPath);
+  }
+
+  return false;
+}
diff --git a/packages/nextjs/src/config/turbopack/constructTurbopackConfig.ts b/packages/nextjs/src/config/turbopack/constructTurbopackConfig.ts
index e46d3f6bb5c7..b96b8e7f77ee 100644
--- a/packages/nextjs/src/config/turbopack/constructTurbopackConfig.ts
+++ b/packages/nextjs/src/config/turbopack/constructTurbopackConfig.ts
@@ -20,23 +20,31 @@ export function constructTurbopackConfig({
   nextJsVersion,
 }: {
   userNextConfig: NextConfigObject;
-  userSentryOptions: SentryBuildOptions;
+  userSentryOptions?: SentryBuildOptions;
   routeManifest?: RouteManifest;
   nextJsVersion?: string;
 }): TurbopackOptions {
   // If sourcemaps are disabled, we don't need to enable native debug ids as this will add build time.
   const shouldEnableNativeDebugIds =
     (supportsNativeDebugIds(nextJsVersion ?? '') && userNextConfig?.turbopack?.debugIds) ??
-    userSentryOptions.sourcemaps?.disable !== true;
+    userSentryOptions?.sourcemaps?.disable !== true;
 
   const newConfig: TurbopackOptions = {
     ...userNextConfig.turbopack,
     ...(shouldEnableNativeDebugIds ? { debugIds: true } : {}),
   };
 
+  const tunnelPath =
+    userSentryOptions?.tunnelRoute !== undefined &&
+    userNextConfig.output !== 'export' &&
+    typeof userSentryOptions.tunnelRoute === 'string'
+      ? `${userNextConfig.basePath ?? ''}${userSentryOptions.tunnelRoute}`
+      : undefined;
+
   const valueInjectionRules = generateValueInjectionRules({
     routeManifest,
     nextJsVersion,
+    tunnelPath,
   });
 
   for (const { matcher, rule } of valueInjectionRules) {
diff --git a/packages/nextjs/src/config/turbopack/generateValueInjectionRules.ts b/packages/nextjs/src/config/turbopack/generateValueInjectionRules.ts
index 58cf7cdd0a15..2cf96b5f5ad7 100644
--- a/packages/nextjs/src/config/turbopack/generateValueInjectionRules.ts
+++ b/packages/nextjs/src/config/turbopack/generateValueInjectionRules.ts
@@ -8,9 +8,11 @@ import type { JSONValue, TurbopackMatcherWithRule } from '../types';
 export function generateValueInjectionRules({
   routeManifest,
   nextJsVersion,
+  tunnelPath,
 }: {
   routeManifest?: RouteManifest;
   nextJsVersion?: string;
+  tunnelPath?: string;
 }): TurbopackMatcherWithRule[] {
   const rules: TurbopackMatcherWithRule[] = [];
   const isomorphicValues: Record<string, JSONValue> = {};
@@ -26,6 +28,11 @@ export function generateValueInjectionRules({
     clientValues._sentryRouteManifest = JSON.stringify(routeManifest);
   }
 
+  // Inject tunnel route path for both client and server
+  if (tunnelPath) {
+    isomorphicValues._sentryRewritesTunnelPath = tunnelPath;
+  }
+
   if (Object.keys(isomorphicValues).length > 0) {
     clientValues = { ...clientValues, ...isomorphicValues };
     serverValues = { ...serverValues, ...isomorphicValues };
diff --git a/packages/nextjs/src/config/withSentryConfig.ts b/packages/nextjs/src/config/withSentryConfig.ts
index 7ac61d73aa73..892f4d6745fa 100644
--- a/packages/nextjs/src/config/withSentryConfig.ts
+++ b/packages/nextjs/src/config/withSentryConfig.ts
@@ -121,11 +121,10 @@ function getFinalConfigObject(
         );
       }
     } else {
-      const resolvedTunnelRoute =
-        userSentryOptions.tunnelRoute === true ? generateRandomTunnelRoute() : userSentryOptions.tunnelRoute;
-
       // Update the global options object to use the resolved value everywhere
+      const resolvedTunnelRoute = resolveTunnelRoute(userSentryOptions.tunnelRoute);
       userSentryOptions.tunnelRoute = resolvedTunnelRoute || undefined;
+
       setUpTunnelRewriteRules(incomingUserNextConfigObject, resolvedTunnelRoute);
     }
   }
@@ -392,6 +391,13 @@ function getFinalConfigObject(
  */
 function setUpTunnelRewriteRules(userNextConfig: NextConfigObject, tunnelPath: string): void {
   const originalRewrites = userNextConfig.rewrites;
+  // Allow overriding the tunnel destination for E2E tests via environment variable
+  const destinationOverride = process.env._SENTRY_TUNNEL_DESTINATION_OVERRIDE;
+
+  // Make sure destinations are statically defined at build time
+  const destination = destinationOverride || 'https://o:orgid.ingest.sentry.io/api/:projectid/envelope/?hsts=0';
+  const destinationWithRegion =
+    destinationOverride || 'https://o:orgid.ingest.:region.sentry.io/api/:projectid/envelope/?hsts=0';
 
   // This function doesn't take any arguments at the time of writing but we future-proof
   // here in case Next.js ever decides to pass some
@@ -412,7 +418,7 @@ function setUpTunnelRewriteRules(userNextConfig: NextConfigObject, tunnelPath: s
           value: '(?<projectid>\\d*)',
         },
       ],
-      destination: 'https://o:orgid.ingest.sentry.io/api/:projectid/envelope/?hsts=0',
+      destination,
     };
 
     const tunnelRouteRewriteWithRegion = {
@@ -436,7 +442,7 @@ function setUpTunnelRewriteRules(userNextConfig: NextConfigObject, tunnelPath: s
           value: '(?<region>[a-z]{2})',
         },
       ],
-      destination: 'https://o:orgid.ingest.:region.sentry.io/api/:projectid/envelope/?hsts=0',
+      destination: destinationWithRegion,
     };
 
     // Order of these is important, they get applied first to last.
@@ -550,3 +556,26 @@ function getInstrumentationClientFileContents(): string | void {
     }
   }
 }
+
+/**
+ * Resolves the tunnel route based on the user's configuration and the environment.
+ * @param tunnelRoute - The user-provided tunnel route option
+ */
+function resolveTunnelRoute(tunnelRoute: string | true): string {
+  if (process.env.__SENTRY_TUNNEL_ROUTE__) {
+    // Reuse cached value from previous build (server/client)
+    return process.env.__SENTRY_TUNNEL_ROUTE__;
+  }
+
+  const resolvedTunnelRoute = typeof tunnelRoute === 'string' ? tunnelRoute : generateRandomTunnelRoute();
+
+  // Cache for subsequent builds (only during build time)
+  // Turbopack runs the config twice, so we need a shared context to avoid generating a new tunnel route for each build.
+  // env works well here
+  // https://linear.app/getsentry/issue/JS-549/adblock-plus-blocking-requests-to-sentry-and-monitoring-tunnel
+  if (resolvedTunnelRoute) {
+    process.env.__SENTRY_TUNNEL_ROUTE__ = resolvedTunnelRoute;
+  }
+
+  return resolvedTunnelRoute;
+}
diff --git a/packages/nextjs/src/edge/index.ts b/packages/nextjs/src/edge/index.ts
index 5fd92707b912..091adab98dee 100644
--- a/packages/nextjs/src/edge/index.ts
+++ b/packages/nextjs/src/edge/index.ts
@@ -1,5 +1,6 @@
 import { context } from '@opentelemetry/api';
 import {
+  type EventProcessor,
   applySdkMetadata,
   getCapturedScopesOnSpan,
   getCurrentScope,
@@ -19,7 +20,9 @@ import {
 import { getScopesFromContext } from '@sentry/opentelemetry';
 import type { VercelEdgeOptions } from '@sentry/vercel-edge';
 import { getDefaultIntegrations, init as vercelEdgeInit } from '@sentry/vercel-edge';
+import { TRANSACTION_ATTR_SHOULD_DROP_TRANSACTION } from '../common/span-attributes-with-logic-attached';
 import { addHeadersAsAttributes } from '../common/utils/addHeadersAsAttributes';
+import { dropMiddlewareTunnelRequests } from '../common/utils/dropMiddlewareTunnelRequests';
 import { isBuild } from '../common/utils/isBuild';
 import { flushSafelyWithTimeout } from '../common/utils/responseEnd';
 import { setUrlProcessingMetadata } from '../common/utils/setUrlProcessingMetadata';
@@ -35,6 +38,7 @@ export type EdgeOptions = VercelEdgeOptions;
 const globalWithInjectedValues = GLOBAL_OBJ as typeof GLOBAL_OBJ & {
   _sentryRewriteFramesDistDir?: string;
   _sentryRelease?: string;
+  _sentryRewritesTunnelPath?: string;
 };
 
 /** Inits the Sentry NextJS SDK on the Edge Runtime. */
@@ -70,6 +74,8 @@ export function init(options: VercelEdgeOptions = {}): void {
     const rootSpan = getRootSpan(span);
     const isRootSpan = span === rootSpan;
 
+    dropMiddlewareTunnelRequests(span, spanAttributes);
+
     // Mark all spans generated by Next.js as 'auto'
     if (spanAttributes?.['next.span_type'] !== undefined) {
       span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, 'auto');
@@ -137,6 +143,24 @@ export function init(options: VercelEdgeOptions = {}): void {
     }
   });
 
+  getGlobalScope().addEventProcessor(
+    Object.assign(
+      (event => {
+        // Filter transactions that we explicitly want to drop.
+        if (event.type === 'transaction') {
+          if (event.contexts?.trace?.data?.[TRANSACTION_ATTR_SHOULD_DROP_TRANSACTION]) {
+            return null;
+          }
+
+          return event;
+        } else {
+          return event;
+        }
+      }) satisfies EventProcessor,
+      { id: 'NextLowQualityTransactionsFilter' },
+    ),
+  );
+
   try {
     // @ts-expect-error `process.turbopack` is a magic string that will be replaced by Next.js
     if (process.turbopack) {
diff --git a/packages/nextjs/src/server/index.ts b/packages/nextjs/src/server/index.ts
index ce8ac7c56cea..caec9a9f1af1 100644
--- a/packages/nextjs/src/server/index.ts
+++ b/packages/nextjs/src/server/index.ts
@@ -38,6 +38,7 @@ import {
   TRANSACTION_ATTR_SHOULD_DROP_TRANSACTION,
 } from '../common/span-attributes-with-logic-attached';
 import { addHeadersAsAttributes } from '../common/utils/addHeadersAsAttributes';
+import { dropMiddlewareTunnelRequests } from '../common/utils/dropMiddlewareTunnelRequests';
 import { isBuild } from '../common/utils/isBuild';
 import { setUrlProcessingMetadata } from '../common/utils/setUrlProcessingMetadata';
 import { distDirRewriteFramesIntegration } from './distDirRewriteFramesIntegration';
@@ -169,6 +170,8 @@ export function init(options: NodeOptions): NodeClient | undefined {
     const rootSpan = getRootSpan(span);
     const isRootSpan = span === rootSpan;
 
+    dropMiddlewareTunnelRequests(span, spanAttributes);
+
     // What we do in this glorious piece of code, is hoist any information about parameterized routes from spans emitted
     // by Next.js via the `next.route` attribute, up to the transaction by setting the http.route attribute.
     if (typeof spanAttributes?.[ATTR_NEXT_ROUTE] === 'string') {

From 235c8651356fb66b6214ff5b88f16419c65f3478 Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Mon, 24 Nov 2025 17:18:17 +0100
Subject: [PATCH 121/186] feat(core): Re-add `_experiments.enableLogs` option
 (#18299)

We're re-introducing
`_experiments.enableLogs`. The option stays deprecated and maybe we can
actually remove it or type it as `undefined` in the next major to sunset
it for good. Main motivation for re-adding: The flag was introduced in
v9 while we already worked on v10 where we removed it again. Therefore,
it had an unusually short lifespan. Some users didn't realize this when
upgrading to v10 and were wondering where their logs went.
---
 .../suites/public-api/logger/init.js          |  5 +++-
 .../public-api/logger/integration/init.js     |  5 ++++
 .../suites/winston/subject.ts                 |  6 +++-
 packages/core/src/client.ts                   |  5 ++++
 packages/core/src/types-hoist/options.ts      |  8 +++++
 packages/core/test/lib/client.test.ts         | 30 +++++++++++++++++++
 6 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/dev-packages/browser-integration-tests/suites/public-api/logger/init.js b/dev-packages/browser-integration-tests/suites/public-api/logger/init.js
index 8026df91ea46..1fa010f49659 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/logger/init.js
+++ b/dev-packages/browser-integration-tests/suites/public-api/logger/init.js
@@ -4,5 +4,8 @@ window.Sentry = Sentry;
 
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
-  enableLogs: true,
+  // purposefully testing against the experimental flag here
+  _experiments: {
+    enableLogs: true,
+  },
 });
diff --git a/dev-packages/browser-integration-tests/suites/public-api/logger/integration/init.js b/dev-packages/browser-integration-tests/suites/public-api/logger/integration/init.js
index 809b78739e77..e26b03d7fc61 100644
--- a/dev-packages/browser-integration-tests/suites/public-api/logger/integration/init.js
+++ b/dev-packages/browser-integration-tests/suites/public-api/logger/integration/init.js
@@ -5,5 +5,10 @@ window.Sentry = Sentry;
 Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   enableLogs: true,
+  // Purposefully specifying the experimental flag here
+  // to ensure the top level option is used instead.
+  _experiments: {
+    enableLogs: false,
+  },
   integrations: [Sentry.consoleLoggingIntegration()],
 });
diff --git a/dev-packages/node-core-integration-tests/suites/winston/subject.ts b/dev-packages/node-core-integration-tests/suites/winston/subject.ts
index 3c31ddb63fa5..02ffcdb0f5cb 100644
--- a/dev-packages/node-core-integration-tests/suites/winston/subject.ts
+++ b/dev-packages/node-core-integration-tests/suites/winston/subject.ts
@@ -8,7 +8,11 @@ const client = Sentry.init({
   dsn: 'https://public@dsn.ingest.sentry.io/1337',
   release: '1.0.0',
   environment: 'test',
-  enableLogs: true,
+  // Purposefully specifying the experimental flag here
+  // to ensure the top level option is still respected.
+  _experiments: {
+    enableLogs: true,
+  },
   transport: loggingTransport,
 });
 
diff --git a/packages/core/src/client.ts b/packages/core/src/client.ts
index ef05750009c3..805d8e596528 100644
--- a/packages/core/src/client.ts
+++ b/packages/core/src/client.ts
@@ -239,6 +239,11 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
       });
     }
 
+    // Backfill enableLogs option from _experiments.enableLogs
+    // TODO(v11): Remove or change default value
+    // eslint-disable-next-line deprecation/deprecation
+    this._options.enableLogs = this._options.enableLogs ?? this._options._experiments?.enableLogs;
+
     // Setup log flushing with weight and timeout tracking
     if (this._options.enableLogs) {
       setupWeightBasedFlushing(this, 'afterCaptureLog', 'flushLogs', estimateLogSizeInBytes, _INTERNAL_flushLogsBuffer);
diff --git a/packages/core/src/types-hoist/options.ts b/packages/core/src/types-hoist/options.ts
index 59c4609f01c4..c33d0107df5f 100644
--- a/packages/core/src/types-hoist/options.ts
+++ b/packages/core/src/types-hoist/options.ts
@@ -306,6 +306,14 @@ export interface ClientOptions<TO extends BaseTransportOptions = BaseTransportOp
      * @deprecated Use the top level`beforeSendMetric` option instead.
      */
     beforeSendMetric?: (metric: Metric) => Metric | null;
+
+    /**
+     * Determines if logs support should be enabled.
+     *
+     * @default false
+     * @deprecated Use the top level `enableLogs` option instead.
+     */
+    enableLogs?: boolean;
   };
 
   /**
diff --git a/packages/core/test/lib/client.test.ts b/packages/core/test/lib/client.test.ts
index 2a2d77171880..a59a8bbb8780 100644
--- a/packages/core/test/lib/client.test.ts
+++ b/packages/core/test/lib/client.test.ts
@@ -2734,6 +2734,36 @@ describe('Client', () => {
     });
   });
 
+  describe('enableLogs', () => {
+    it('defaults to  `undefined`', () => {
+      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN });
+      const client = new TestClient(options);
+      expect(client.getOptions().enableLogs).toBeUndefined();
+    });
+
+    it('can be set as a top-level option', () => {
+      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN, enableLogs: true });
+      const client = new TestClient(options);
+      expect(client.getOptions().enableLogs).toBe(true);
+    });
+
+    it('can be set as an experimental option', () => {
+      const options = getDefaultTestClientOptions({ dsn: PUBLIC_DSN, _experiments: { enableLogs: true } });
+      const client = new TestClient(options);
+      expect(client.getOptions().enableLogs).toBe(true);
+    });
+
+    test('top-level option takes precedence over experimental option', () => {
+      const options = getDefaultTestClientOptions({
+        dsn: PUBLIC_DSN,
+        enableLogs: true,
+        _experiments: { enableLogs: false },
+      });
+      const client = new TestClient(options);
+      expect(client.getOptions().enableLogs).toBe(true);
+    });
+  });
+
   describe('log weight-based flushing', () => {
     beforeEach(() => {
       vi.useFakeTimers();

From 6ce620e983814a263eb036a3ee79f80e780a880a Mon Sep 17 00:00:00 2001
From: Sigrid <32902192+s1gr1d@users.noreply.github.com>
Date: Mon, 24 Nov 2025 18:31:48 +0100
Subject: [PATCH 122/186] fix(core): Always redact content of sensitive headers
 regardless of `sendDefaultPii` (#18311)

In case an HTTP header is considered "sensitive" (could contain tokens),
the value is already filtered within the SDK.

---

Follow-up on this PR:
- https://github.com/getsentry/sentry-javascript/pull/17475
---
 packages/astro/src/server/middleware.ts       |  5 +-
 packages/bun/src/integrations/bunserver.ts    |  5 +-
 packages/cloudflare/src/request.ts            |  3 +-
 packages/core/src/utils/request.ts            | 39 ++++++----
 packages/core/test/lib/utils/request.test.ts  | 76 ++++++++-----------
 .../common/utils/addHeadersAsAttributes.ts    |  7 +-
 .../http/httpServerSpansIntegration.ts        |  3 +-
 .../runtime/hooks/wrapMiddlewareHandler.ts    |  7 +-
 packages/remix/src/server/instrumentServer.ts |  5 +-
 .../sveltekit/src/server-common/handle.ts     | 11 +--
 10 files changed, 68 insertions(+), 93 deletions(-)

diff --git a/packages/astro/src/server/middleware.ts b/packages/astro/src/server/middleware.ts
index a12c25ff6045..64fde266a3f8 100644
--- a/packages/astro/src/server/middleware.ts
+++ b/packages/astro/src/server/middleware.ts
@@ -219,10 +219,7 @@ async function instrumentRequestStartHttpServerSpan(
             // This is here for backwards compatibility, we used to set this here before
             method,
             url: stripUrlQueryAndFragment(ctx.url.href),
-            ...httpHeadersToSpanAttributes(
-              winterCGHeadersToDict(request.headers),
-              getClient()?.getOptions().sendDefaultPii ?? false,
-            ),
+            ...httpHeadersToSpanAttributes(winterCGHeadersToDict(request.headers)),
           };
 
           if (parametrizedRoute) {
diff --git a/packages/bun/src/integrations/bunserver.ts b/packages/bun/src/integrations/bunserver.ts
index 4a079f488474..73998e529349 100644
--- a/packages/bun/src/integrations/bunserver.ts
+++ b/packages/bun/src/integrations/bunserver.ts
@@ -3,7 +3,6 @@ import {
   captureException,
   continueTrace,
   defineIntegration,
-  getClient,
   httpHeadersToSpanAttributes,
   isURLObjectRelative,
   parseStringToURLObject,
@@ -207,9 +206,7 @@ function wrapRequestHandler<T extends RouteHandler = RouteHandler>(
       routeName = route;
     }
 
-    const client = getClient();
-    const sendDefaultPii = client?.getOptions().sendDefaultPii ?? false;
-    Object.assign(attributes, httpHeadersToSpanAttributes(request.headers.toJSON(), sendDefaultPii));
+    Object.assign(attributes, httpHeadersToSpanAttributes(request.headers.toJSON()));
 
     isolationScope.setSDKProcessingMetadata({
       normalizedRequest: {
diff --git a/packages/cloudflare/src/request.ts b/packages/cloudflare/src/request.ts
index 5c97562d9fde..7908d3dcf48e 100644
--- a/packages/cloudflare/src/request.ts
+++ b/packages/cloudflare/src/request.ts
@@ -66,8 +66,7 @@ export function wrapRequestHandler(
       attributes['user_agent.original'] = userAgentHeader;
     }
 
-    const sendDefaultPii = options.sendDefaultPii ?? false;
-    Object.assign(attributes, httpHeadersToSpanAttributes(winterCGHeadersToDict(request.headers), sendDefaultPii));
+    Object.assign(attributes, httpHeadersToSpanAttributes(winterCGHeadersToDict(request.headers)));
 
     attributes[SEMANTIC_ATTRIBUTE_SENTRY_OP] = 'http.server';
 
diff --git a/packages/core/src/utils/request.ts b/packages/core/src/utils/request.ts
index ffd60f3e8486..1d3985dd8479 100644
--- a/packages/core/src/utils/request.ts
+++ b/packages/core/src/utils/request.ts
@@ -129,7 +129,19 @@ function getAbsoluteUrl({
 }
 
 // "-user" because otherwise it would match "user-agent"
-const SENSITIVE_HEADER_SNIPPETS = ['auth', 'token', 'secret', 'cookie', '-user', 'password', 'key'];
+const SENSITIVE_HEADER_SNIPPETS = [
+  'auth',
+  'token',
+  'secret',
+  'cookie',
+  '-user',
+  'password',
+  'key',
+  'jwt',
+  'bearer',
+  'sso',
+  'saml',
+];
 
 /**
  * Converts incoming HTTP request headers to OpenTelemetry span attributes following semantic conventions.
@@ -140,26 +152,25 @@ const SENSITIVE_HEADER_SNIPPETS = ['auth', 'token', 'secret', 'cookie', '-user',
  */
 export function httpHeadersToSpanAttributes(
   headers: Record<string, string | string[] | undefined>,
-  sendDefaultPii: boolean = false,
 ): Record<string, string> {
   const spanAttributes: Record<string, string> = {};
 
   try {
     Object.entries(headers).forEach(([key, value]) => {
-      if (value !== undefined) {
-        const lowerCasedKey = key.toLowerCase();
-
-        if (!sendDefaultPii && SENSITIVE_HEADER_SNIPPETS.some(snippet => lowerCasedKey.includes(snippet))) {
-          return;
-        }
+      if (value == null) {
+        return;
+      }
 
-        const normalizedKey = `http.request.header.${lowerCasedKey.replace(/-/g, '_')}`;
+      const lowerCasedKey = key.toLowerCase();
+      const isSensitive = SENSITIVE_HEADER_SNIPPETS.some(snippet => lowerCasedKey.includes(snippet));
+      const normalizedKey = `http.request.header.${lowerCasedKey.replace(/-/g, '_')}`;
 
-        if (Array.isArray(value)) {
-          spanAttributes[normalizedKey] = value.map(v => (v !== null && v !== undefined ? String(v) : v)).join(';');
-        } else if (typeof value === 'string') {
-          spanAttributes[normalizedKey] = value;
-        }
+      if (isSensitive) {
+        spanAttributes[normalizedKey] = '[Filtered]';
+      } else if (Array.isArray(value)) {
+        spanAttributes[normalizedKey] = value.map(v => (v != null ? String(v) : v)).join(';');
+      } else if (typeof value === 'string') {
+        spanAttributes[normalizedKey] = value;
       }
     });
   } catch {
diff --git a/packages/core/test/lib/utils/request.test.ts b/packages/core/test/lib/utils/request.test.ts
index b37ee860f43f..328aebf29209 100644
--- a/packages/core/test/lib/utils/request.test.ts
+++ b/packages/core/test/lib/utils/request.test.ts
@@ -613,61 +613,25 @@ describe('request utils', () => {
     });
 
     describe('PII filtering', () => {
-      it('filters out sensitive headers when sendDefaultPii is false (default)', () => {
-        const headers = {
-          'Content-Type': 'application/json',
-          'User-Agent': 'test-agent',
-          Authorization: 'Bearer secret-token',
-          Cookie: 'session=abc123',
-          'X-API-Key': 'api-key-123',
-          'X-Auth-Token': 'auth-token-456',
-        };
-
-        const result = httpHeadersToSpanAttributes(headers, false);
-
-        expect(result).toEqual({
-          'http.request.header.content_type': 'application/json',
-          'http.request.header.user_agent': 'test-agent',
-          // Sensitive headers should be filtered out
-        });
-      });
-
-      it('includes sensitive headers when sendDefaultPii is true', () => {
-        const headers = {
-          'Content-Type': 'application/json',
-          'User-Agent': 'test-agent',
-          Authorization: 'Bearer secret-token',
-          Cookie: 'session=abc123',
-          'X-API-Key': 'api-key-123',
-        };
-
-        const result = httpHeadersToSpanAttributes(headers, true);
-
-        expect(result).toEqual({
-          'http.request.header.content_type': 'application/json',
-          'http.request.header.user_agent': 'test-agent',
-          'http.request.header.authorization': 'Bearer secret-token',
-          'http.request.header.cookie': 'session=abc123',
-          'http.request.header.x_api_key': 'api-key-123',
-        });
-      });
-
       it('filters sensitive headers case-insensitively', () => {
         const headers = {
           AUTHORIZATION: 'Bearer secret-token',
           Cookie: 'session=abc123',
-          'x-api-key': 'key-123',
+          'x-aPi-kEy': 'key-123',
           'Content-Type': 'application/json',
         };
 
-        const result = httpHeadersToSpanAttributes(headers, false);
+        const result = httpHeadersToSpanAttributes(headers);
 
         expect(result).toEqual({
           'http.request.header.content_type': 'application/json',
+          'http.request.header.cookie': '[Filtered]',
+          'http.request.header.x_api_key': '[Filtered]',
+          'http.request.header.authorization': '[Filtered]',
         });
       });
 
-      it('filters comprehensive list of sensitive headers', () => {
+      it('always filters comprehensive list of sensitive headers', () => {
         const headers = {
           'Content-Type': 'application/json',
           'User-Agent': 'test-agent',
@@ -692,15 +656,41 @@ describe('request utils', () => {
           'X-Private-Key': 'private',
           'X-Forwarded-user': 'user',
           'X-Forwarded-authorization': 'auth',
+          'x-jwt-token': 'jwt',
+          'x-bearer-token': 'bearer',
+          'x-sso-token': 'sso',
+          'x-saml-token': 'saml',
         };
 
-        const result = httpHeadersToSpanAttributes(headers, false);
+        const result = httpHeadersToSpanAttributes(headers);
 
+        // Sensitive headers are always included and redacted
         expect(result).toEqual({
           'http.request.header.content_type': 'application/json',
           'http.request.header.user_agent': 'test-agent',
           'http.request.header.accept': 'application/json',
           'http.request.header.host': 'example.com',
+          'http.request.header.authorization': '[Filtered]',
+          'http.request.header.cookie': '[Filtered]',
+          'http.request.header.set_cookie': '[Filtered]',
+          'http.request.header.x_api_key': '[Filtered]',
+          'http.request.header.x_auth_token': '[Filtered]',
+          'http.request.header.x_secret': '[Filtered]',
+          'http.request.header.x_secret_key': '[Filtered]',
+          'http.request.header.www_authenticate': '[Filtered]',
+          'http.request.header.proxy_authorization': '[Filtered]',
+          'http.request.header.x_access_token': '[Filtered]',
+          'http.request.header.x_csrf_token': '[Filtered]',
+          'http.request.header.x_xsrf_token': '[Filtered]',
+          'http.request.header.x_session_token': '[Filtered]',
+          'http.request.header.x_password': '[Filtered]',
+          'http.request.header.x_private_key': '[Filtered]',
+          'http.request.header.x_forwarded_user': '[Filtered]',
+          'http.request.header.x_forwarded_authorization': '[Filtered]',
+          'http.request.header.x_jwt_token': '[Filtered]',
+          'http.request.header.x_bearer_token': '[Filtered]',
+          'http.request.header.x_sso_token': '[Filtered]',
+          'http.request.header.x_saml_token': '[Filtered]',
         });
       });
     });
diff --git a/packages/nextjs/src/common/utils/addHeadersAsAttributes.ts b/packages/nextjs/src/common/utils/addHeadersAsAttributes.ts
index 4e8cdb3fe7c9..ff025fc3ecc7 100644
--- a/packages/nextjs/src/common/utils/addHeadersAsAttributes.ts
+++ b/packages/nextjs/src/common/utils/addHeadersAsAttributes.ts
@@ -1,5 +1,5 @@
 import type { Span, WebFetchHeaders } from '@sentry/core';
-import { getClient, httpHeadersToSpanAttributes, winterCGHeadersToDict } from '@sentry/core';
+import { httpHeadersToSpanAttributes, winterCGHeadersToDict } from '@sentry/core';
 
 /**
  * Extracts HTTP request headers as span attributes and optionally applies them to a span.
@@ -12,15 +12,12 @@ export function addHeadersAsAttributes(
     return {};
   }
 
-  const client = getClient();
-  const sendDefaultPii = client?.getOptions().sendDefaultPii ?? false;
-
   const headersDict: Record<string, string | string[] | undefined> =
     headers instanceof Headers || (typeof headers === 'object' && 'get' in headers)
       ? winterCGHeadersToDict(headers as Headers)
       : headers;
 
-  const headerAttributes = httpHeadersToSpanAttributes(headersDict, sendDefaultPii);
+  const headerAttributes = httpHeadersToSpanAttributes(headersDict);
 
   if (span) {
     span.setAttributes(headerAttributes);
diff --git a/packages/node-core/src/integrations/http/httpServerSpansIntegration.ts b/packages/node-core/src/integrations/http/httpServerSpansIntegration.ts
index c24c0c68d1da..34741e95c912 100644
--- a/packages/node-core/src/integrations/http/httpServerSpansIntegration.ts
+++ b/packages/node-core/src/integrations/http/httpServerSpansIntegration.ts
@@ -136,7 +136,6 @@ const _httpServerSpansIntegration = ((options: HttpServerSpansIntegrationOptions
           const method = normalizedRequest.method || request.method?.toUpperCase() || 'GET';
           const httpTargetWithoutQueryFragment = urlObj ? urlObj.pathname : stripUrlQueryAndFragment(fullUrl);
           const bestEffortTransactionName = `${method} ${httpTargetWithoutQueryFragment}`;
-          const shouldSendDefaultPii = client.getOptions().sendDefaultPii ?? false;
 
           // We use the plain tracer.startSpan here so we can pass the span kind
           const span = tracer.startSpan(bestEffortTransactionName, {
@@ -158,7 +157,7 @@ const _httpServerSpansIntegration = ((options: HttpServerSpansIntegrationOptions
               'http.flavor': httpVersion,
               'net.transport': httpVersion?.toUpperCase() === 'QUIC' ? 'ip_udp' : 'ip_tcp',
               ...getRequestContentLengthAttribute(request),
-              ...httpHeadersToSpanAttributes(normalizedRequest.headers || {}, shouldSendDefaultPii),
+              ...httpHeadersToSpanAttributes(normalizedRequest.headers || {}),
             },
           });
 
diff --git a/packages/nuxt/src/runtime/hooks/wrapMiddlewareHandler.ts b/packages/nuxt/src/runtime/hooks/wrapMiddlewareHandler.ts
index a04b866cd774..4b41d6e8ab82 100644
--- a/packages/nuxt/src/runtime/hooks/wrapMiddlewareHandler.ts
+++ b/packages/nuxt/src/runtime/hooks/wrapMiddlewareHandler.ts
@@ -3,7 +3,6 @@ import {
   captureException,
   debug,
   flushIfServerless,
-  getClient,
   httpHeadersToSpanAttributes,
   SEMANTIC_ATTRIBUTE_SENTRY_OP,
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
@@ -171,13 +170,9 @@ function getSpanAttributes(
     attributes['http.route'] = event.path;
   }
 
-  // Extract and add HTTP headers as span attributes
-  const client = getClient();
-  const sendDefaultPii = client?.getOptions().sendDefaultPii ?? false;
-
   // Get headers from the Node.js request object
   const headers = event.node?.req?.headers || {};
-  const headerAttributes = httpHeadersToSpanAttributes(headers, sendDefaultPii);
+  const headerAttributes = httpHeadersToSpanAttributes(headers);
 
   // Merge header attributes with existing attributes
   Object.assign(attributes, headerAttributes);
diff --git a/packages/remix/src/server/instrumentServer.ts b/packages/remix/src/server/instrumentServer.ts
index fda9b3f10b75..2416699cb2a6 100644
--- a/packages/remix/src/server/instrumentServer.ts
+++ b/packages/remix/src/server/instrumentServer.ts
@@ -310,10 +310,7 @@ function wrapRequestHandler<T extends ServerBuild | (() => ServerBuild | Promise
                   [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: source,
                   [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'http.server',
                   method: request.method,
-                  ...httpHeadersToSpanAttributes(
-                    winterCGHeadersToDict(request.headers),
-                    clientOptions.sendDefaultPii ?? false,
-                  ),
+                  ...httpHeadersToSpanAttributes(winterCGHeadersToDict(request.headers)),
                 },
               },
               async span => {
diff --git a/packages/sveltekit/src/server-common/handle.ts b/packages/sveltekit/src/server-common/handle.ts
index 26872a0f6f24..3d9963bd1056 100644
--- a/packages/sveltekit/src/server-common/handle.ts
+++ b/packages/sveltekit/src/server-common/handle.ts
@@ -3,7 +3,6 @@ import {
   continueTrace,
   debug,
   flushIfServerless,
-  getClient,
   getCurrentScope,
   getDefaultIsolationScope,
   getIsolationScope,
@@ -179,10 +178,7 @@ async function instrumentHandle(
           [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.sveltekit',
           [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: routeName ? 'route' : 'url',
           'sveltekit.tracing.original_name': originalName,
-          ...httpHeadersToSpanAttributes(
-            winterCGHeadersToDict(event.request.headers),
-            getClient()?.getOptions().sendDefaultPii ?? false,
-          ),
+          ...httpHeadersToSpanAttributes(winterCGHeadersToDict(event.request.headers)),
         });
       }
 
@@ -208,10 +204,7 @@ async function instrumentHandle(
               [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.sveltekit',
               [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: routeId ? 'route' : 'url',
               'http.method': event.request.method,
-              ...httpHeadersToSpanAttributes(
-                winterCGHeadersToDict(event.request.headers),
-                getClient()?.getOptions().sendDefaultPii ?? false,
-              ),
+              ...httpHeadersToSpanAttributes(winterCGHeadersToDict(event.request.headers)),
             },
             name: routeName,
           },

From 02aa2ea072fa956c805eeb6f463fb6ed763efa57 Mon Sep 17 00:00:00 2001
From: s1gr1d <32902192+s1gr1d@users.noreply.github.com>
Date: Mon, 24 Nov 2025 18:45:17 +0100
Subject: [PATCH 123/186] meta(changelog): Update changelog for 10.27.0

---
 CHANGELOG.md | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 47 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9bee97ac9189..58e2cf7bd830 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,9 +4,11 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
-Work in this release was contributed by @bignoncedric and @adam-kov. Thank you for your contributions!
+## 10.27.0
+
+### Important Changes
 
-- feat(deps): Bump OpenTelemetry ([#18239](https://github.com/getsentry/sentry-javascript/pull/18239))
+- **feat(deps): Bump OpenTelemetry ([#18239](https://github.com/getsentry/sentry-javascript/pull/18239))**
   - Bump @opentelemetry/context-async-hooks from ^2.1.0 to ^2.2.0
   - Bump @opentelemetry/core from ^2.1.0 to ^2.2.0
   - Bump @opentelemetry/resources from ^2.1.0 to ^2.2.0
@@ -39,6 +41,49 @@ Work in this release was contributed by @bignoncedric and @adam-kov. Thank you f
   - Bump @opentelemetry/instrumentation-undici from 0.15.0 to 0.19.0
   - Bump @prisma/instrumentation from 6.15.0 to 6.19.0
 
+- **feat(browserprofiling): Add `manual` mode and deprecate old profiling ([#18189](https://github.com/getsentry/sentry-javascript/pull/18189))**
+
+  Adds the `manual` lifecycle mode for UI profiling (the default mode), allowing profiles to be captured manually with `Sentry.uiProfiler.startProfiler()` and `Sentry.uiProfiler.stopProfiler()`.
+  The previous transaction-based profiling is with `profilesSampleRate` is now deprecated in favor of the new UI Profiling with `profileSessionSampleRate`.
+
+### Other Changes
+
+- feat(core): Add `gibibyte` and `pebibyte` to `InformationUnit` type ([#18241](https://github.com/getsentry/sentry-javascript/pull/18241))
+- feat(core): Add scope attribute APIs ([#18165](https://github.com/getsentry/sentry-javascript/pull/18165))
+- feat(core): Re-add `_experiments.enableLogs` option ([#18299](https://github.com/getsentry/sentry-javascript/pull/18299))
+- feat(core): Use `maxValueLength` on error messages ([#18301](https://github.com/getsentry/sentry-javascript/pull/18301))
+- feat(deps): bump @sentry/bundler-plugin-core from 4.3.0 to 4.6.1 ([#18273](https://github.com/getsentry/sentry-javascript/pull/18273))
+- feat(deps): bump @sentry/cli from 2.56.0 to 2.58.2 ([#18271](https://github.com/getsentry/sentry-javascript/pull/18271))
+- feat(node): Add tracing support for AzureOpenAI ([#18281](https://github.com/getsentry/sentry-javascript/pull/18281))
+- feat(node): Fix local variables capturing for out-of-app frames ([#18245](https://github.com/getsentry/sentry-javascript/pull/18245))
+- fix(core): Add a PromiseBuffer for incoming events on the client ([#18120](https://github.com/getsentry/sentry-javascript/pull/18120))
+- fix(core): Always redact content of sensitive headers regardless of `sendDefaultPii` ([#18311](https://github.com/getsentry/sentry-javascript/pull/18311))
+- fix(metrics): Update return type of `beforeSendMetric` ([#18261](https://github.com/getsentry/sentry-javascript/pull/18261))
+- fix(nextjs): universal random tunnel path support ([#18257](https://github.com/getsentry/sentry-javascript/pull/18257))
+- ref(react): Add more guarding against wildcards in lazy route transactions ([#18155](https://github.com/getsentry/sentry-javascript/pull/18155))
+- chore(deps): bump glob from 11.0.1 to 11.1.0 in /packages/react-router ([#18243](https://github.com/getsentry/sentry-javascript/pull/18243))
+
+<details>
+  <summary> <strong>Internal Changes</strong> </summary>
+    - build(deps): bump hono from 4.9.7 to 4.10.3 in /dev-packages/e2e-tests/test-applications/cloudflare-hono ([#18038](https://github.com/getsentry/sentry-javascript/pull/18038))
+    - chore: Add `bump_otel_instrumentations` cursor command ([#18253](https://github.com/getsentry/sentry-javascript/pull/18253))
+    - chore: Add external contributor to CHANGELOG.md ([#18297](https://github.com/getsentry/sentry-javascript/pull/18297))
+    - chore: Add external contributor to CHANGELOG.md ([#18300](https://github.com/getsentry/sentry-javascript/pull/18300))
+    - chore: Do not update opentelemetry ([#18254](https://github.com/getsentry/sentry-javascript/pull/18254))
+    - chore(angular): Add Angular 21 Support ([#18274](https://github.com/getsentry/sentry-javascript/pull/18274))
+    - chore(deps): bump astro from 4.16.18 to 5.15.9 in /dev-packages/e2e-tests/test-applications/cloudflare-astro ([#18259](https://github.com/getsentry/sentry-javascript/pull/18259))
+    - chore(dev-deps): Update some dev dependencies ([#17816](https://github.com/getsentry/sentry-javascript/pull/17816))
+    - ci(deps): Bump actions/create-github-app-token from 2.1.1 to 2.1.4 ([#17825](https://github.com/getsentry/sentry-javascript/pull/17825))
+    - ci(deps): bump actions/setup-node from 4 to 6 ([#18077](https://github.com/getsentry/sentry-javascript/pull/18077))
+    - ci(deps): bump actions/upload-artifact from 4 to 5 ([#18075](https://github.com/getsentry/sentry-javascript/pull/18075))
+    - ci(deps): bump github/codeql-action from 3 to 4 ([#18076](https://github.com/getsentry/sentry-javascript/pull/18076))
+    - doc(sveltekit): Update documentation link for SvelteKit guide ([#18298](https://github.com/getsentry/sentry-javascript/pull/18298))
+    - test(e2e): Fix astro config in test app ([#18282](https://github.com/getsentry/sentry-javascript/pull/18282))
+    - test(nextjs): Remove debug logs from e2e test ([#18250](https://github.com/getsentry/sentry-javascript/pull/18250))
+</details>
+
+Work in this release was contributed by @bignoncedric and @adam-kov. Thank you for your contributions!
+
 ## 10.26.0
 
 ### Important Changes

From 0b0151d6be13a23c06eb957ace12085f760fae2c Mon Sep 17 00:00:00 2001
From: getsentry-bot <bot@sentry.io>
Date: Mon, 24 Nov 2025 18:39:39 +0000
Subject: [PATCH 124/186] release: 10.27.0

---
 .../browser-integration-tests/package.json         |  4 ++--
 .../bundle-analyzer-scenarios/package.json         |  2 +-
 dev-packages/bundler-tests/package.json            |  4 ++--
 dev-packages/clear-cache-gh-action/package.json    |  2 +-
 .../cloudflare-integration-tests/package.json      |  6 +++---
 dev-packages/e2e-tests/package.json                |  2 +-
 .../external-contributor-gh-action/package.json    |  2 +-
 .../node-core-integration-tests/package.json       |  6 +++---
 dev-packages/node-integration-tests/package.json   | 10 +++++-----
 dev-packages/node-overhead-gh-action/package.json  |  4 ++--
 dev-packages/rollup-utils/package.json             |  2 +-
 dev-packages/size-limit-gh-action/package.json     |  2 +-
 dev-packages/test-utils/package.json               |  4 ++--
 lerna.json                                         |  2 +-
 packages/angular/package.json                      |  6 +++---
 packages/astro/package.json                        |  8 ++++----
 packages/aws-serverless/package.json               |  8 ++++----
 packages/browser-utils/package.json                |  4 ++--
 packages/browser/package.json                      | 14 +++++++-------
 packages/bun/package.json                          |  6 +++---
 packages/cloudflare/package.json                   |  4 ++--
 packages/core/package.json                         |  2 +-
 packages/deno/package.json                         |  4 ++--
 packages/ember/package.json                        |  6 +++---
 packages/eslint-config-sdk/package.json            |  6 +++---
 packages/eslint-plugin-sdk/package.json            |  2 +-
 packages/feedback/package.json                     |  4 ++--
 packages/gatsby/package.json                       |  6 +++---
 packages/google-cloud-serverless/package.json      |  6 +++---
 packages/integration-shims/package.json            |  4 ++--
 packages/nestjs/package.json                       |  6 +++---
 packages/nextjs/package.json                       | 14 +++++++-------
 packages/node-core/package.json                    |  6 +++---
 packages/node-native/package.json                  |  6 +++---
 packages/node/package.json                         |  8 ++++----
 packages/nuxt/package.json                         | 12 ++++++------
 packages/opentelemetry/package.json                |  4 ++--
 packages/profiling-node/package.json               |  6 +++---
 packages/react-router/package.json                 | 10 +++++-----
 packages/react/package.json                        |  6 +++---
 packages/remix/package.json                        |  8 ++++----
 packages/replay-canvas/package.json                |  6 +++---
 packages/replay-internal/package.json              |  8 ++++----
 packages/replay-worker/package.json                |  2 +-
 packages/solid/package.json                        |  6 +++---
 packages/solidstart/package.json                   |  8 ++++----
 packages/svelte/package.json                       |  6 +++---
 packages/sveltekit/package.json                    | 10 +++++-----
 packages/tanstackstart-react/package.json          | 10 +++++-----
 packages/tanstackstart/package.json                |  2 +-
 packages/types/package.json                        |  4 ++--
 packages/typescript/package.json                   |  2 +-
 packages/vercel-edge/package.json                  |  6 +++---
 packages/vue/package.json                          |  6 +++---
 packages/wasm/package.json                         |  6 +++---
 55 files changed, 155 insertions(+), 155 deletions(-)

diff --git a/dev-packages/browser-integration-tests/package.json b/dev-packages/browser-integration-tests/package.json
index 6350a0826572..e5ff62a58084 100644
--- a/dev-packages/browser-integration-tests/package.json
+++ b/dev-packages/browser-integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/browser-integration-tests",
-  "version": "10.26.0",
+  "version": "10.27.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": "10.26.0",
+    "@sentry/browser": "10.27.0",
     "@supabase/supabase-js": "2.49.3",
     "axios": "^1.12.2",
     "babel-loader": "^8.2.2",
diff --git a/dev-packages/bundle-analyzer-scenarios/package.json b/dev-packages/bundle-analyzer-scenarios/package.json
index 72928caf3708..518da1c1e8af 100644
--- a/dev-packages/bundle-analyzer-scenarios/package.json
+++ b/dev-packages/bundle-analyzer-scenarios/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/bundle-analyzer-scenarios",
-  "version": "10.26.0",
+  "version": "10.27.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",
diff --git a/dev-packages/bundler-tests/package.json b/dev-packages/bundler-tests/package.json
index 14bfa512f433..b2a307291c90 100644
--- a/dev-packages/bundler-tests/package.json
+++ b/dev-packages/bundler-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/bundler-tests",
-  "version": "10.26.0",
+  "version": "10.27.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.26.0",
+    "@sentry/browser": "10.27.0",
     "rollup": "^4.0.0",
     "vite": "^5.0.0",
     "vitest": "^3.2.4",
diff --git a/dev-packages/clear-cache-gh-action/package.json b/dev-packages/clear-cache-gh-action/package.json
index 22f0c16d2680..9592fba2a84d 100644
--- a/dev-packages/clear-cache-gh-action/package.json
+++ b/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.26.0",
+  "version": "10.27.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
diff --git a/dev-packages/cloudflare-integration-tests/package.json b/dev-packages/cloudflare-integration-tests/package.json
index e4af74f7edfe..89c3abb7d5e8 100644
--- a/dev-packages/cloudflare-integration-tests/package.json
+++ b/dev-packages/cloudflare-integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/cloudflare-integration-tests",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
@@ -14,11 +14,11 @@
   },
   "dependencies": {
     "@langchain/langgraph": "^1.0.1",
-    "@sentry/cloudflare": "10.26.0"
+    "@sentry/cloudflare": "10.27.0"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20250922.0",
-    "@sentry-internal/test-utils": "10.26.0",
+    "@sentry-internal/test-utils": "10.27.0",
     "eslint-plugin-regexp": "^1.15.0",
     "vitest": "^3.2.4",
     "wrangler": "4.22.0"
diff --git a/dev-packages/e2e-tests/package.json b/dev-packages/e2e-tests/package.json
index 7712bbac10ee..be48359c7045 100644
--- a/dev-packages/e2e-tests/package.json
+++ b/dev-packages/e2e-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/e2e-tests",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "license": "MIT",
   "private": true,
   "scripts": {
diff --git a/dev-packages/external-contributor-gh-action/package.json b/dev-packages/external-contributor-gh-action/package.json
index 9e99c2b66ae0..8c839a63b4aa 100644
--- a/dev-packages/external-contributor-gh-action/package.json
+++ b/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": "10.26.0",
+  "version": "10.27.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
diff --git a/dev-packages/node-core-integration-tests/package.json b/dev-packages/node-core-integration-tests/package.json
index 24ac2f57ea9e..a5be477c7334 100644
--- a/dev-packages/node-core-integration-tests/package.json
+++ b/dev-packages/node-core-integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/node-core-integration-tests",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
@@ -34,8 +34,8 @@
     "@opentelemetry/resources": "^2.2.0",
     "@opentelemetry/sdk-trace-base": "^2.2.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry/core": "10.26.0",
-    "@sentry/node-core": "10.26.0",
+    "@sentry/core": "10.27.0",
+    "@sentry/node-core": "10.27.0",
     "body-parser": "^1.20.3",
     "cors": "^2.8.5",
     "cron": "^3.1.6",
diff --git a/dev-packages/node-integration-tests/package.json b/dev-packages/node-integration-tests/package.json
index 1799e7c9b306..8a81e262d33f 100644
--- a/dev-packages/node-integration-tests/package.json
+++ b/dev-packages/node-integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/node-integration-tests",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
@@ -36,9 +36,9 @@
     "@nestjs/core": "^11",
     "@nestjs/platform-express": "^11",
     "@prisma/client": "6.15.0",
-    "@sentry/aws-serverless": "10.26.0",
-    "@sentry/core": "10.26.0",
-    "@sentry/node": "10.26.0",
+    "@sentry/aws-serverless": "10.27.0",
+    "@sentry/core": "10.27.0",
+    "@sentry/node": "10.27.0",
     "@types/mongodb": "^3.6.20",
     "@types/mysql": "^2.15.21",
     "@types/pg": "^8.6.5",
@@ -83,7 +83,7 @@
     "yargs": "^16.2.0"
   },
   "devDependencies": {
-    "@sentry-internal/test-utils": "10.26.0",
+    "@sentry-internal/test-utils": "10.27.0",
     "@types/amqplib": "^0.10.5",
     "@types/node-cron": "^3.0.11",
     "@types/node-schedule": "^2.1.7",
diff --git a/dev-packages/node-overhead-gh-action/package.json b/dev-packages/node-overhead-gh-action/package.json
index 498cefecf053..d044b8047bcc 100644
--- a/dev-packages/node-overhead-gh-action/package.json
+++ b/dev-packages/node-overhead-gh-action/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/node-overhead-gh-action",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
@@ -23,7 +23,7 @@
     "fix": "eslint . --format stylish --fix"
   },
   "dependencies": {
-    "@sentry/node": "10.26.0",
+    "@sentry/node": "10.27.0",
     "express": "^4.21.1",
     "mysql2": "^3.14.4"
   },
diff --git a/dev-packages/rollup-utils/package.json b/dev-packages/rollup-utils/package.json
index 62cec9c7f9f9..3c8e3a029d28 100644
--- a/dev-packages/rollup-utils/package.json
+++ b/dev-packages/rollup-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/rollup-utils",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "description": "Rollup utilities used at Sentry for the Sentry JavaScript SDK",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/rollup-utils",
diff --git a/dev-packages/size-limit-gh-action/package.json b/dev-packages/size-limit-gh-action/package.json
index 5de80ac560c7..59d885937a9f 100644
--- a/dev-packages/size-limit-gh-action/package.json
+++ b/dev-packages/size-limit-gh-action/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@sentry-internal/size-limit-gh-action",
   "description": "An internal Github Action to compare the current size of a PR against the one on develop.",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
diff --git a/dev-packages/test-utils/package.json b/dev-packages/test-utils/package.json
index 7d0400748c94..3df8bcc441ea 100644
--- a/dev-packages/test-utils/package.json
+++ b/dev-packages/test-utils/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "10.26.0",
+  "version": "10.27.0",
   "name": "@sentry-internal/test-utils",
   "author": "Sentry",
   "license": "MIT",
@@ -48,7 +48,7 @@
   },
   "devDependencies": {
     "@playwright/test": "~1.53.2",
-    "@sentry/core": "10.26.0",
+    "@sentry/core": "10.27.0",
     "eslint-plugin-regexp": "^1.15.0"
   },
   "volta": {
diff --git a/lerna.json b/lerna.json
index 7363d9e257e2..9ad4c26bf2a7 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "npmClient": "yarn"
 }
diff --git a/packages/angular/package.json b/packages/angular/package.json
index fd378f4af2d8..72d29ca6b272 100644
--- a/packages/angular/package.json
+++ b/packages/angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/angular",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "description": "Official Sentry SDK for Angular",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/angular",
@@ -21,8 +21,8 @@
     "rxjs": "^6.5.5 || ^7.x"
   },
   "dependencies": {
-    "@sentry/browser": "10.26.0",
-    "@sentry/core": "10.26.0",
+    "@sentry/browser": "10.27.0",
+    "@sentry/core": "10.27.0",
     "tslib": "^2.4.1"
   },
   "devDependencies": {
diff --git a/packages/astro/package.json b/packages/astro/package.json
index 32a2cf0e3833..99d5eabae3e9 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/astro",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "description": "Official Sentry SDK for Astro",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/astro",
@@ -56,9 +56,9 @@
     "astro": ">=3.x || >=4.0.0-beta || >=5.x"
   },
   "dependencies": {
-    "@sentry/browser": "10.26.0",
-    "@sentry/core": "10.26.0",
-    "@sentry/node": "10.26.0",
+    "@sentry/browser": "10.27.0",
+    "@sentry/core": "10.27.0",
+    "@sentry/node": "10.27.0",
     "@sentry/vite-plugin": "^4.1.0"
   },
   "devDependencies": {
diff --git a/packages/aws-serverless/package.json b/packages/aws-serverless/package.json
index 8d6360e82d2a..2aaaa292cd93 100644
--- a/packages/aws-serverless/package.json
+++ b/packages/aws-serverless/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/aws-serverless",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "description": "Official Sentry SDK for AWS Lambda and AWS Serverless Environments",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/aws-serverless",
@@ -69,9 +69,9 @@
     "@opentelemetry/instrumentation": "^0.208.0",
     "@opentelemetry/instrumentation-aws-sdk": "0.64.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry/core": "10.26.0",
-    "@sentry/node": "10.26.0",
-    "@sentry/node-core": "10.26.0",
+    "@sentry/core": "10.27.0",
+    "@sentry/node": "10.27.0",
+    "@sentry/node-core": "10.27.0",
     "@types/aws-lambda": "^8.10.62"
   },
   "devDependencies": {
diff --git a/packages/browser-utils/package.json b/packages/browser-utils/package.json
index 117fec1f473c..37ac4a317bc8 100644
--- a/packages/browser-utils/package.json
+++ b/packages/browser-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/browser-utils",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "description": "Browser Utilities for all Sentry JavaScript SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/browser-utils",
@@ -39,7 +39,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.26.0"
+    "@sentry/core": "10.27.0"
   },
   "scripts": {
     "build": "run-p build:transpile build:types",
diff --git a/packages/browser/package.json b/packages/browser/package.json
index c7b21beb6766..2ecab4e6119e 100644
--- a/packages/browser/package.json
+++ b/packages/browser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/browser",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "description": "Official Sentry SDK for browsers",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/browser",
@@ -44,14 +44,14 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry-internal/browser-utils": "10.26.0",
-    "@sentry-internal/feedback": "10.26.0",
-    "@sentry-internal/replay": "10.26.0",
-    "@sentry-internal/replay-canvas": "10.26.0",
-    "@sentry/core": "10.26.0"
+    "@sentry-internal/browser-utils": "10.27.0",
+    "@sentry-internal/feedback": "10.27.0",
+    "@sentry-internal/replay": "10.27.0",
+    "@sentry-internal/replay-canvas": "10.27.0",
+    "@sentry/core": "10.27.0"
   },
   "devDependencies": {
-    "@sentry-internal/integration-shims": "10.26.0",
+    "@sentry-internal/integration-shims": "10.27.0",
     "fake-indexeddb": "^6.2.4"
   },
   "scripts": {
diff --git a/packages/bun/package.json b/packages/bun/package.json
index fcd538862c17..f1464af7a732 100644
--- a/packages/bun/package.json
+++ b/packages/bun/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/bun",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "description": "Official Sentry SDK for bun",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/bun",
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.26.0",
-    "@sentry/node": "10.26.0"
+    "@sentry/core": "10.27.0",
+    "@sentry/node": "10.27.0"
   },
   "devDependencies": {
     "bun-types": "^1.2.9"
diff --git a/packages/cloudflare/package.json b/packages/cloudflare/package.json
index ee8cba264e5f..163afddca271 100644
--- a/packages/cloudflare/package.json
+++ b/packages/cloudflare/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/cloudflare",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "description": "Official Sentry SDK for Cloudflare Workers and Pages",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/cloudflare",
@@ -50,7 +50,7 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@sentry/core": "10.26.0"
+    "@sentry/core": "10.27.0"
   },
   "peerDependencies": {
     "@cloudflare/workers-types": "^4.x"
diff --git a/packages/core/package.json b/packages/core/package.json
index 8ffc256e2f26..76ac4bc3e96f 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/core",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "description": "Base implementation for all Sentry JavaScript SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/core",
diff --git a/packages/deno/package.json b/packages/deno/package.json
index 04ac8f592fd1..cc40ededd6e7 100644
--- a/packages/deno/package.json
+++ b/packages/deno/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/deno",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "description": "Official Sentry SDK for Deno",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/deno",
@@ -25,7 +25,7 @@
   ],
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@sentry/core": "10.26.0"
+    "@sentry/core": "10.27.0"
   },
   "scripts": {
     "deno-types": "node ./scripts/download-deno-types.mjs",
diff --git a/packages/ember/package.json b/packages/ember/package.json
index 69a111ab54a9..a2307bb11013 100644
--- a/packages/ember/package.json
+++ b/packages/ember/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/ember",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "description": "Official Sentry SDK for Ember.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/ember",
@@ -32,8 +32,8 @@
   "dependencies": {
     "@babel/core": "^7.27.7",
     "@embroider/macros": "^1.16.0",
-    "@sentry/browser": "10.26.0",
-    "@sentry/core": "10.26.0",
+    "@sentry/browser": "10.27.0",
+    "@sentry/core": "10.27.0",
     "ember-auto-import": "^2.7.2",
     "ember-cli-babel": "^8.2.0",
     "ember-cli-htmlbars": "^6.1.1",
diff --git a/packages/eslint-config-sdk/package.json b/packages/eslint-config-sdk/package.json
index d45a301e1590..8982ce90c026 100644
--- a/packages/eslint-config-sdk/package.json
+++ b/packages/eslint-config-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/eslint-config-sdk",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "description": "Official Sentry SDK eslint config",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-config-sdk",
@@ -22,8 +22,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry-internal/eslint-plugin-sdk": "10.26.0",
-    "@sentry-internal/typescript": "10.26.0",
+    "@sentry-internal/eslint-plugin-sdk": "10.27.0",
+    "@sentry-internal/typescript": "10.27.0",
     "@typescript-eslint/eslint-plugin": "^5.48.0",
     "@typescript-eslint/parser": "^5.48.0",
     "eslint-config-prettier": "^6.11.0",
diff --git a/packages/eslint-plugin-sdk/package.json b/packages/eslint-plugin-sdk/package.json
index bad2ae248475..2ee8a4be4925 100644
--- a/packages/eslint-plugin-sdk/package.json
+++ b/packages/eslint-plugin-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/eslint-plugin-sdk",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "description": "Official Sentry SDK eslint plugin",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-plugin-sdk",
diff --git a/packages/feedback/package.json b/packages/feedback/package.json
index 7c9899ffd305..b2b17bad3033 100644
--- a/packages/feedback/package.json
+++ b/packages/feedback/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/feedback",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "description": "Sentry SDK integration for user feedback",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/feedback",
@@ -39,7 +39,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.26.0"
+    "@sentry/core": "10.27.0"
   },
   "devDependencies": {
     "preact": "^10.19.4"
diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json
index 8236ee72e0e9..f46070324187 100644
--- a/packages/gatsby/package.json
+++ b/packages/gatsby/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/gatsby",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "description": "Official Sentry SDK for Gatsby.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/gatsby",
@@ -45,8 +45,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.26.0",
-    "@sentry/react": "10.26.0",
+    "@sentry/core": "10.27.0",
+    "@sentry/react": "10.27.0",
     "@sentry/webpack-plugin": "^4.1.1"
   },
   "peerDependencies": {
diff --git a/packages/google-cloud-serverless/package.json b/packages/google-cloud-serverless/package.json
index 6afb10e14c42..3495aff8de55 100644
--- a/packages/google-cloud-serverless/package.json
+++ b/packages/google-cloud-serverless/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/google-cloud-serverless",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "description": "Official Sentry SDK for Google Cloud Functions",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/google-cloud-serverless",
@@ -48,8 +48,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.26.0",
-    "@sentry/node": "10.26.0",
+    "@sentry/core": "10.27.0",
+    "@sentry/node": "10.27.0",
     "@types/express": "^4.17.14"
   },
   "devDependencies": {
diff --git a/packages/integration-shims/package.json b/packages/integration-shims/package.json
index 8569a5b837f6..437b12de6c33 100644
--- a/packages/integration-shims/package.json
+++ b/packages/integration-shims/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/integration-shims",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "description": "Shims for integrations in Sentry SDK.",
   "main": "build/cjs/index.js",
   "module": "build/esm/index.js",
@@ -56,7 +56,7 @@
     "url": "https://github.com/getsentry/sentry-javascript/issues"
   },
   "dependencies": {
-    "@sentry/core": "10.26.0"
+    "@sentry/core": "10.27.0"
   },
   "engines": {
     "node": ">=18"
diff --git a/packages/nestjs/package.json b/packages/nestjs/package.json
index ae39e2dc5d4f..2b4e04b097b9 100644
--- a/packages/nestjs/package.json
+++ b/packages/nestjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/nestjs",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "description": "Official Sentry SDK for NestJS",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/nestjs",
@@ -49,8 +49,8 @@
     "@opentelemetry/instrumentation": "^0.208.0",
     "@opentelemetry/instrumentation-nestjs-core": "0.55.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry/core": "10.26.0",
-    "@sentry/node": "10.26.0"
+    "@sentry/core": "10.27.0",
+    "@sentry/node": "10.27.0"
   },
   "devDependencies": {
     "@nestjs/common": "^10.0.0",
diff --git a/packages/nextjs/package.json b/packages/nextjs/package.json
index 9afdfec16d7b..f633ee64b3bf 100644
--- a/packages/nextjs/package.json
+++ b/packages/nextjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/nextjs",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "description": "Official Sentry SDK for Next.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/nextjs",
@@ -79,13 +79,13 @@
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
     "@rollup/plugin-commonjs": "28.0.1",
-    "@sentry-internal/browser-utils": "10.26.0",
+    "@sentry-internal/browser-utils": "10.27.0",
     "@sentry/bundler-plugin-core": "^4.6.1",
-    "@sentry/core": "10.26.0",
-    "@sentry/node": "10.26.0",
-    "@sentry/opentelemetry": "10.26.0",
-    "@sentry/react": "10.26.0",
-    "@sentry/vercel-edge": "10.26.0",
+    "@sentry/core": "10.27.0",
+    "@sentry/node": "10.27.0",
+    "@sentry/opentelemetry": "10.27.0",
+    "@sentry/react": "10.27.0",
+    "@sentry/vercel-edge": "10.27.0",
     "@sentry/webpack-plugin": "^4.3.0",
     "resolve": "1.22.8",
     "rollup": "^4.35.0",
diff --git a/packages/node-core/package.json b/packages/node-core/package.json
index 1f845acfa16b..57100fc16cf3 100644
--- a/packages/node-core/package.json
+++ b/packages/node-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/node-core",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "description": "Sentry Node-Core SDK",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/node-core",
@@ -67,8 +67,8 @@
   },
   "dependencies": {
     "@apm-js-collab/tracing-hooks": "^0.3.1",
-    "@sentry/core": "10.26.0",
-    "@sentry/opentelemetry": "10.26.0",
+    "@sentry/core": "10.27.0",
+    "@sentry/opentelemetry": "10.27.0",
     "import-in-the-middle": "^2"
   },
   "devDependencies": {
diff --git a/packages/node-native/package.json b/packages/node-native/package.json
index 9a4c40818556..e193f26ae795 100644
--- a/packages/node-native/package.json
+++ b/packages/node-native/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/node-native",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "description": "Native Tools for the Official Sentry Node.js SDK",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/node-native",
@@ -64,8 +64,8 @@
   },
   "dependencies": {
     "@sentry-internal/node-native-stacktrace": "^0.2.2",
-    "@sentry/core": "10.26.0",
-    "@sentry/node": "10.26.0"
+    "@sentry/core": "10.27.0",
+    "@sentry/node": "10.27.0"
   },
   "devDependencies": {
     "@types/node": "^18.19.1"
diff --git a/packages/node/package.json b/packages/node/package.json
index e43d7b04a0ee..95e0610c9828 100644
--- a/packages/node/package.json
+++ b/packages/node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/node",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "description": "Sentry Node SDK using OpenTelemetry for performance instrumentation",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/node",
@@ -95,9 +95,9 @@
     "@opentelemetry/sdk-trace-base": "^2.2.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
     "@prisma/instrumentation": "6.19.0",
-    "@sentry/core": "10.26.0",
-    "@sentry/node-core": "10.26.0",
-    "@sentry/opentelemetry": "10.26.0",
+    "@sentry/core": "10.27.0",
+    "@sentry/node-core": "10.27.0",
+    "@sentry/opentelemetry": "10.27.0",
     "import-in-the-middle": "^2",
     "minimatch": "^9.0.0"
   },
diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json
index e054d1b9938a..0ce5df7bb8d5 100644
--- a/packages/nuxt/package.json
+++ b/packages/nuxt/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/nuxt",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "description": "Official Sentry SDK for Nuxt",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/nuxt",
@@ -49,13 +49,13 @@
   },
   "dependencies": {
     "@nuxt/kit": "^3.13.2",
-    "@sentry/browser": "10.26.0",
-    "@sentry/cloudflare": "10.26.0",
-    "@sentry/core": "10.26.0",
-    "@sentry/node": "10.26.0",
+    "@sentry/browser": "10.27.0",
+    "@sentry/cloudflare": "10.27.0",
+    "@sentry/core": "10.27.0",
+    "@sentry/node": "10.27.0",
     "@sentry/rollup-plugin": "^4.3.0",
     "@sentry/vite-plugin": "^4.3.0",
-    "@sentry/vue": "10.26.0"
+    "@sentry/vue": "10.27.0"
   },
   "devDependencies": {
     "@nuxt/module-builder": "^0.8.4",
diff --git a/packages/opentelemetry/package.json b/packages/opentelemetry/package.json
index 86d73b8555b2..4a21c884155f 100644
--- a/packages/opentelemetry/package.json
+++ b/packages/opentelemetry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/opentelemetry",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "description": "Official Sentry utilities for OpenTelemetry",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/opentelemetry",
@@ -39,7 +39,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.26.0"
+    "@sentry/core": "10.27.0"
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.9.0",
diff --git a/packages/profiling-node/package.json b/packages/profiling-node/package.json
index e897b8d5611e..f1082191997e 100644
--- a/packages/profiling-node/package.json
+++ b/packages/profiling-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/profiling-node",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "description": "Official Sentry SDK for Node.js Profiling",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/profiling-node",
@@ -63,8 +63,8 @@
   },
   "dependencies": {
     "@sentry-internal/node-cpu-profiler": "^2.2.0",
-    "@sentry/core": "10.26.0",
-    "@sentry/node": "10.26.0"
+    "@sentry/core": "10.27.0",
+    "@sentry/node": "10.27.0"
   },
   "devDependencies": {
     "@types/node": "^18.19.1"
diff --git a/packages/react-router/package.json b/packages/react-router/package.json
index 51ce7bb94122..fe662890fa7a 100644
--- a/packages/react-router/package.json
+++ b/packages/react-router/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/react-router",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "description": "Official Sentry SDK for React Router (Framework)",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/react-router",
@@ -49,11 +49,11 @@
     "@opentelemetry/core": "^2.2.0",
     "@opentelemetry/instrumentation": "^0.208.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry/browser": "10.26.0",
+    "@sentry/browser": "10.27.0",
     "@sentry/cli": "^2.58.2",
-    "@sentry/core": "10.26.0",
-    "@sentry/node": "10.26.0",
-    "@sentry/react": "10.26.0",
+    "@sentry/core": "10.27.0",
+    "@sentry/node": "10.27.0",
+    "@sentry/react": "10.27.0",
     "@sentry/vite-plugin": "^4.1.0",
     "glob": "11.1.0"
   },
diff --git a/packages/react/package.json b/packages/react/package.json
index afd5f5f25bdd..06d56f58b6f5 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/react",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "description": "Official Sentry SDK for React.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/react",
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "10.26.0",
-    "@sentry/core": "10.26.0",
+    "@sentry/browser": "10.27.0",
+    "@sentry/core": "10.27.0",
     "hoist-non-react-statics": "^3.3.2"
   },
   "peerDependencies": {
diff --git a/packages/remix/package.json b/packages/remix/package.json
index 98bdd9a39c7c..7230064df963 100644
--- a/packages/remix/package.json
+++ b/packages/remix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/remix",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "description": "Official Sentry SDK for Remix",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/remix",
@@ -69,9 +69,9 @@
     "@opentelemetry/semantic-conventions": "^1.37.0",
     "@remix-run/router": "1.x",
     "@sentry/cli": "^2.58.2",
-    "@sentry/core": "10.26.0",
-    "@sentry/node": "10.26.0",
-    "@sentry/react": "10.26.0",
+    "@sentry/core": "10.27.0",
+    "@sentry/node": "10.27.0",
+    "@sentry/react": "10.27.0",
     "glob": "^10.3.4",
     "yargs": "^17.6.0"
   },
diff --git a/packages/replay-canvas/package.json b/packages/replay-canvas/package.json
index 63ee871ddfdf..f66b691a42fa 100644
--- a/packages/replay-canvas/package.json
+++ b/packages/replay-canvas/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/replay-canvas",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "description": "Replay canvas integration",
   "main": "build/npm/cjs/index.js",
   "module": "build/npm/esm/index.js",
@@ -69,8 +69,8 @@
     "@sentry-internal/rrweb": "2.40.0"
   },
   "dependencies": {
-    "@sentry-internal/replay": "10.26.0",
-    "@sentry/core": "10.26.0"
+    "@sentry-internal/replay": "10.27.0",
+    "@sentry/core": "10.27.0"
   },
   "engines": {
     "node": ">=18"
diff --git a/packages/replay-internal/package.json b/packages/replay-internal/package.json
index f1678cea2a15..1cccb4c2ef50 100644
--- a/packages/replay-internal/package.json
+++ b/packages/replay-internal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/replay",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "description": "User replays for Sentry",
   "main": "build/npm/cjs/index.js",
   "module": "build/npm/esm/index.js",
@@ -81,7 +81,7 @@
   "homepage": "https://docs.sentry.io/platforms/javascript/session-replay/",
   "devDependencies": {
     "@babel/core": "^7.27.7",
-    "@sentry-internal/replay-worker": "10.26.0",
+    "@sentry-internal/replay-worker": "10.27.0",
     "@sentry-internal/rrweb": "2.40.0",
     "@sentry-internal/rrweb-snapshot": "2.40.0",
     "fflate": "0.8.2",
@@ -89,8 +89,8 @@
     "jsdom-worker": "^0.3.0"
   },
   "dependencies": {
-    "@sentry-internal/browser-utils": "10.26.0",
-    "@sentry/core": "10.26.0"
+    "@sentry-internal/browser-utils": "10.27.0",
+    "@sentry/core": "10.27.0"
   },
   "engines": {
     "node": ">=18"
diff --git a/packages/replay-worker/package.json b/packages/replay-worker/package.json
index e9a968061841..cdd3dd4059b1 100644
--- a/packages/replay-worker/package.json
+++ b/packages/replay-worker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/replay-worker",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "description": "Worker for @sentry-internal/replay",
   "main": "build/esm/index.js",
   "module": "build/esm/index.js",
diff --git a/packages/solid/package.json b/packages/solid/package.json
index c75a0eadb4ce..9d6138147612 100644
--- a/packages/solid/package.json
+++ b/packages/solid/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/solid",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "description": "Official Sentry SDK for Solid",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/solid",
@@ -54,8 +54,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "10.26.0",
-    "@sentry/core": "10.26.0"
+    "@sentry/browser": "10.27.0",
+    "@sentry/core": "10.27.0"
   },
   "peerDependencies": {
     "@solidjs/router": "^0.13.4",
diff --git a/packages/solidstart/package.json b/packages/solidstart/package.json
index 8bb0e4e0471f..1069905423fa 100644
--- a/packages/solidstart/package.json
+++ b/packages/solidstart/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/solidstart",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "description": "Official Sentry SDK for Solid Start",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/solidstart",
@@ -66,9 +66,9 @@
     }
   },
   "dependencies": {
-    "@sentry/core": "10.26.0",
-    "@sentry/node": "10.26.0",
-    "@sentry/solid": "10.26.0",
+    "@sentry/core": "10.27.0",
+    "@sentry/node": "10.27.0",
+    "@sentry/solid": "10.27.0",
     "@sentry/vite-plugin": "^4.1.0"
   },
   "devDependencies": {
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 6e9cbdf5b54a..83af1efee4a5 100644
--- a/packages/svelte/package.json
+++ b/packages/svelte/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/svelte",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "description": "Official Sentry SDK for Svelte",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/svelte",
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "10.26.0",
-    "@sentry/core": "10.26.0",
+    "@sentry/browser": "10.27.0",
+    "@sentry/core": "10.27.0",
     "magic-string": "^0.30.0"
   },
   "peerDependencies": {
diff --git a/packages/sveltekit/package.json b/packages/sveltekit/package.json
index 7802db426793..a39ef877222e 100644
--- a/packages/sveltekit/package.json
+++ b/packages/sveltekit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/sveltekit",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "description": "Official Sentry SDK for SvelteKit",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/sveltekit",
@@ -48,10 +48,10 @@
   },
   "dependencies": {
     "@babel/parser": "7.26.9",
-    "@sentry/cloudflare": "10.26.0",
-    "@sentry/core": "10.26.0",
-    "@sentry/node": "10.26.0",
-    "@sentry/svelte": "10.26.0",
+    "@sentry/cloudflare": "10.27.0",
+    "@sentry/core": "10.27.0",
+    "@sentry/node": "10.27.0",
+    "@sentry/svelte": "10.27.0",
     "@sentry/vite-plugin": "^4.1.0",
     "magic-string": "0.30.7",
     "recast": "0.23.11",
diff --git a/packages/tanstackstart-react/package.json b/packages/tanstackstart-react/package.json
index 03688bdd6aad..dac0c980b1f5 100644
--- a/packages/tanstackstart-react/package.json
+++ b/packages/tanstackstart-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/tanstackstart-react",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "description": "Official Sentry SDK for TanStack Start React",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/tanstackstart-react",
@@ -52,10 +52,10 @@
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry-internal/browser-utils": "10.26.0",
-    "@sentry/core": "10.26.0",
-    "@sentry/node": "10.26.0",
-    "@sentry/react": "10.26.0"
+    "@sentry-internal/browser-utils": "10.27.0",
+    "@sentry/core": "10.27.0",
+    "@sentry/node": "10.27.0",
+    "@sentry/react": "10.27.0"
   },
   "scripts": {
     "build": "run-p build:transpile build:types",
diff --git a/packages/tanstackstart/package.json b/packages/tanstackstart/package.json
index 3918ecd9a3fa..6a99cfefdb99 100644
--- a/packages/tanstackstart/package.json
+++ b/packages/tanstackstart/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/tanstackstart",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "description": "Utilities for the Sentry TanStack Start SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/tanstackstart",
diff --git a/packages/types/package.json b/packages/types/package.json
index 2287d86014da..70cd501b4eb6 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/types",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "description": "Types for all Sentry JavaScript SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/types",
@@ -57,7 +57,7 @@
     "yalc:publish": "yalc publish --push --sig"
   },
   "dependencies": {
-    "@sentry/core": "10.26.0"
+    "@sentry/core": "10.27.0"
   },
   "volta": {
     "extends": "../../package.json"
diff --git a/packages/typescript/package.json b/packages/typescript/package.json
index ab02fe16f828..f1d5c80f4954 100644
--- a/packages/typescript/package.json
+++ b/packages/typescript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/typescript",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "description": "Typescript configuration used at Sentry",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/typescript",
diff --git a/packages/vercel-edge/package.json b/packages/vercel-edge/package.json
index 1efd9c1af34c..90d61f964f34 100644
--- a/packages/vercel-edge/package.json
+++ b/packages/vercel-edge/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/vercel-edge",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "description": "Official Sentry SDK for the Vercel Edge Runtime",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/vercel-edge",
@@ -41,14 +41,14 @@
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/resources": "^2.2.0",
-    "@sentry/core": "10.26.0"
+    "@sentry/core": "10.27.0"
   },
   "devDependencies": {
     "@edge-runtime/types": "3.0.1",
     "@opentelemetry/core": "^2.2.0",
     "@opentelemetry/sdk-trace-base": "^2.2.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry/opentelemetry": "10.26.0"
+    "@sentry/opentelemetry": "10.27.0"
   },
   "scripts": {
     "build": "run-p build:transpile build:types",
diff --git a/packages/vue/package.json b/packages/vue/package.json
index abdb956018c6..6cb37663ebbf 100644
--- a/packages/vue/package.json
+++ b/packages/vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/vue",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "description": "Official Sentry SDK for Vue.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/vue",
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "10.26.0",
-    "@sentry/core": "10.26.0"
+    "@sentry/browser": "10.27.0",
+    "@sentry/core": "10.27.0"
   },
   "peerDependencies": {
     "pinia": "2.x || 3.x",
diff --git a/packages/wasm/package.json b/packages/wasm/package.json
index 2e7883644276..a864eca972f7 100644
--- a/packages/wasm/package.json
+++ b/packages/wasm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/wasm",
-  "version": "10.26.0",
+  "version": "10.27.0",
   "description": "Support for WASM.",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/wasm",
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "10.26.0",
-    "@sentry/core": "10.26.0"
+    "@sentry/browser": "10.27.0",
+    "@sentry/core": "10.27.0"
   },
   "scripts": {
     "build": "run-p build:transpile build:bundle build:types",

From 850d4ccd206bb73b23fb678c1103d3b73f2f6fff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Nov 2025 19:44:46 +0100
Subject: [PATCH 125/186] feat(deps): bump @sentry/webpack-plugin from 4.3.0 to
 4.6.1 (#18272)

---
 packages/gatsby/package.json |  2 +-
 packages/nextjs/package.json |  2 +-
 yarn.lock                    | 13 ++++++-------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json
index 8236ee72e0e9..3a5f766d0e2b 100644
--- a/packages/gatsby/package.json
+++ b/packages/gatsby/package.json
@@ -47,7 +47,7 @@
   "dependencies": {
     "@sentry/core": "10.26.0",
     "@sentry/react": "10.26.0",
-    "@sentry/webpack-plugin": "^4.1.1"
+    "@sentry/webpack-plugin": "^4.6.1"
   },
   "peerDependencies": {
     "gatsby": "^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0",
diff --git a/packages/nextjs/package.json b/packages/nextjs/package.json
index 9afdfec16d7b..d172a2154b35 100644
--- a/packages/nextjs/package.json
+++ b/packages/nextjs/package.json
@@ -86,7 +86,7 @@
     "@sentry/opentelemetry": "10.26.0",
     "@sentry/react": "10.26.0",
     "@sentry/vercel-edge": "10.26.0",
-    "@sentry/webpack-plugin": "^4.3.0",
+    "@sentry/webpack-plugin": "^4.6.1",
     "resolve": "1.22.8",
     "rollup": "^4.35.0",
     "stacktrace-parser": "^0.1.10"
diff --git a/yarn.lock b/yarn.lock
index 41c2c2fe1486..c62e944194d0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7084,7 +7084,7 @@
     magic-string "0.30.8"
     unplugin "1.0.1"
 
-"@sentry/bundler-plugin-core@^4.6.1":
+"@sentry/bundler-plugin-core@4.6.1", "@sentry/bundler-plugin-core@^4.6.1":
   version "4.6.1"
   resolved "https://registry.yarnpkg.com/@sentry/bundler-plugin-core/-/bundler-plugin-core-4.6.1.tgz#d6013e6233bf663114f581bbd3c3a380ff9311d4"
   integrity sha512-WPeRbnMXm927m4Kr69NTArPfI+p5/34FHftdCRI3LFPMyhZDzz6J3wLy4hzaVUgmMf10eLzmq2HGEMvpQmdynA==
@@ -7174,12 +7174,12 @@
     "@sentry/bundler-plugin-core" "4.3.0"
     unplugin "1.0.1"
 
-"@sentry/webpack-plugin@^4.1.1", "@sentry/webpack-plugin@^4.3.0":
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/@sentry/webpack-plugin/-/webpack-plugin-4.3.0.tgz#a96db7d8ada8646ec3ffdec2a7db6143c8061e85"
-  integrity sha512-K4nU1SheK/tvyakBws2zfd+MN6hzmpW+wPTbSbDWn1+WL9+g9hsPh8hjFFiVe47AhhUoUZ3YgiH2HyeHXjHflA==
+"@sentry/webpack-plugin@^4.6.1":
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/@sentry/webpack-plugin/-/webpack-plugin-4.6.1.tgz#8041ef27f302c3f63902bc4bb01e2ee53ea94c15"
+  integrity sha512-CJgT/t2pQWsPsMx9VJ86goU/orCQhL2HhDj5ZYBol6fPPoEGeTqKOPCnv/xsbCAfGSp1uHpyRLTA/Gx96u7VVA==
   dependencies:
-    "@sentry/bundler-plugin-core" "4.3.0"
+    "@sentry/bundler-plugin-core" "4.6.1"
     unplugin "1.0.1"
     uuid "^9.0.0"
 
@@ -28820,7 +28820,6 @@ stylus@0.59.0, stylus@^0.59.0:
 
 sucrase@^3.27.0, sucrase@^3.35.0, sucrase@getsentry/sucrase#es2020-polyfills:
   version "3.36.0"
-  uid fd682f6129e507c00bb4e6319cc5d6b767e36061
   resolved "https://codeload.github.com/getsentry/sucrase/tar.gz/fd682f6129e507c00bb4e6319cc5d6b767e36061"
   dependencies:
     "@jridgewell/gen-mapping" "^0.3.2"

From ebb8eed864058a39ada4e1fac63ea3567f79b149 Mon Sep 17 00:00:00 2001
From: Andrei <168741329+andreiborza@users.noreply.github.com>
Date: Tue, 25 Nov 2025 10:19:03 +0100
Subject: [PATCH 126/186] ci: Add action to creatae issue on gitflow merge
 conflicts (#18319)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It's often hard to notice when our Gitflow merge PRs fail due to merge
conflicts and the longer they are open the harder it will be to fix
these merge conflicts eventually.

e.g. https://github.com/getsentry/sentry-javascript/pull/18314

This is an attempt at notifying us better when these happen by creating
an issue in our repo (did not actually test this yet so we might have to
go through some iterations 😅).

Idea by Abhi:
https://github.com/getsentry/sentry-javascript/pull/18317#pullrequestreview-3502254482
---
 .github/workflows/gitflow-merge-conflict.yml | 107 +++++++++++++++++++
 1 file changed, 107 insertions(+)
 create mode 100644 .github/workflows/gitflow-merge-conflict.yml

diff --git a/.github/workflows/gitflow-merge-conflict.yml b/.github/workflows/gitflow-merge-conflict.yml
new file mode 100644
index 000000000000..c2ad1f42ad1d
--- /dev/null
+++ b/.github/workflows/gitflow-merge-conflict.yml
@@ -0,0 +1,107 @@
+name: 'Gitflow: Merge Conflict Issue'
+
+on:
+  pull_request:
+    types: [opened]
+    branches:
+      - develop
+
+jobs:
+  check-merge-conflicts:
+    name: Detect merge conflicts in gitflow PRs
+    runs-on: ubuntu-24.04
+    if: |
+      ${{ contains(github.event.pull_request.labels.*.name, 'Dev: Gitflow') }}
+    permissions:
+      issues: write
+    steps:
+      - name: Check for merge conflicts with retry
+        uses: actions/github-script@v8
+        with:
+          script: |
+            const retryInterval = 30_000;
+            const maxRetries = 10; // (30 seconds * 10 retries) = 5 minutes
+
+            async function isMergeable() {
+              const { data: pr } = await github.rest.pulls.get({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                pull_number: context.payload.pull_request.number
+              });
+
+              return pr.mergeable;
+            }
+
+            async function sleep(ms) {
+              return new Promise(resolve => setTimeout(resolve, ms));
+            }
+
+            let attempt = 0;
+            let mergeable = null;
+
+            while (attempt < maxRetries) {
+              attempt++;
+              console.log(`Attempt ${attempt}/${maxRetries}: Checking if PR is mergeable...`);
+
+              mergeable = await isMergeable();
+              console.log(`Mergeable: ${mergeable}`);
+
+              // If mergeable is not null, GitHub has finished computing merge state
+              if (mergeable !== null) {
+                break;
+              }
+
+              if (attempt < maxRetries) {
+                console.log(`Waiting ${retryInterval/1000} seconds before retry...`);
+                await sleep(retryInterval);
+              }
+            }
+
+            // Check if we have merge conflicts
+            if (mergeable === false) {
+              const issueTitle = '[Gitflow] Merge Conflict';
+
+              // Check for existing open issues with the same title
+              const { data: existingIssues } = await github.rest.issues.listForRepo({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                state: 'open',
+                labels: 'Dev: Gitflow'
+              });
+
+              const existingOpenIssue = existingIssues.find(issue =>
+                issue.title === issueTitle && !issue.pull_request
+              );
+
+              if (!existingOpenIssue) {
+                const issueBody = [
+                  '## Gitflow Merge Conflict Detected',
+                  '',
+                  `The automated gitflow PR #${context.payload.pull_request.number} has merge conflicts and cannot be merged automatically.`,
+                  '',
+                  '### How to resolve',
+                  '',
+                  `Follow the steps documented in [docs/gitflow.md](https://github.com/${context.repo.owner}/${context.repo.repo}/blob/develop/docs/gitflow.md#what-to-do-if-there-is-a-merge-conflict):`,
+                  '',
+                  `1. Close the automated PR #${context.payload.pull_request.number}`,
+                  '2. Create a new branch on top of `master` (e.g., `manual-develop-sync`)',
+                  '3. Merge `develop` into this branch with a **merge commit** (fix any merge conflicts)',
+                  '4. Create a PR against `develop` from your branch',
+                  '5. Merge that PR with a **merge commit**'
+                ].join('\n');
+
+                await github.rest.issues.create({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  title: issueTitle,
+                  body: issueBody,
+                  labels: ['Dev: Gitflow']
+                });
+
+                console.log('Created new issue for merge conflict');
+              }
+            } else if (mergeable === null) {
+              console.log('Could not determine mergeable state after maximum retries');
+            } else {
+              console.log('No merge conflicts detected - PR can be merged');
+            }

From 2f3144e4dec1927e54eada3f9a33c2a09914673d Mon Sep 17 00:00:00 2001
From: Charly Gomez <charly.gomez@sentry.io>
Date: Tue, 25 Nov 2025 15:50:31 +0100
Subject: [PATCH 127/186] feat(nextjs): Support `cacheComponents` on turbopack
 (#18304)

With this PR we stop breaking builds by simply re-exporting APIs that
make use of synchronous random APIs:
- `startSpan`
- `startSpanManual`
- `startInactiveSpan`

We do this with a naive approach of detecting a prod build phase and
returning a noop span in cases where we call these APIs. We hope to get
a more solid API for this from Vercel at some point so we can make this
more bulletproof. The current version will also still emit a warning in
webpack as the behaviour seems to change there.

This will only work for Turbopack as of now, as we still need to get rid
of build time instrumentation in webpack in order for this to work.

closes https://github.com/getsentry/sentry-javascript/issues/17895
---
 .../nextjs-16-cacheComponents/.gitignore      |  44 ++++++++++
 .../nextjs-16-cacheComponents/.npmrc          |   4 +
 .../app/cache/page.tsx                        |  25 ++++++
 .../nextjs-16-cacheComponents/app/favicon.ico | Bin 0 -> 25931 bytes
 .../app/global-error.tsx                      |  23 +++++
 .../nextjs-16-cacheComponents/app/layout.tsx  |   7 ++
 .../nextjs-16-cacheComponents/app/page.tsx    |   3 +
 .../app/suspense/page.tsx                     |  26 ++++++
 .../eslint.config.mjs                         |  19 ++++
 .../instrumentation-client.ts                 |  11 +++
 .../instrumentation.ts                        |  13 +++
 .../nextjs-16-cacheComponents/next.config.ts  |  10 +++
 .../nextjs-16-cacheComponents/package.json    |  51 +++++++++++
 .../playwright.config.mjs                     |  29 ++++++
 .../nextjs-16-cacheComponents/proxy.ts        |  24 +++++
 .../nextjs-16-cacheComponents/public/file.svg |   1 +
 .../public/globe.svg                          |   1 +
 .../nextjs-16-cacheComponents/public/next.svg |   1 +
 .../public/vercel.svg                         |   1 +
 .../public/window.svg                         |   1 +
 .../sentry.edge.config.ts                     |  10 +++
 .../sentry.server.config.ts                   |  11 +++
 .../start-event-proxy.mjs                     |  14 +++
 .../tests/cacheComponents.spec.ts             |  28 ++++++
 .../nextjs-16-cacheComponents/tsconfig.json   |  27 ++++++
 packages/nextjs/src/client/index.ts           |   3 +
 .../src/common/utils/isUseCacheFunction.ts    |  58 ++++++++++++
 packages/nextjs/src/common/utils/nextSpan.ts  |  83 ++++++++++++++++++
 packages/nextjs/src/edge/index.ts             |   3 +
 packages/nextjs/src/server/index.ts           |   3 +
 30 files changed, 534 insertions(+)
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/.gitignore
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/.npmrc
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/cache/page.tsx
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/favicon.ico
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/global-error.tsx
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/layout.tsx
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/page.tsx
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/suspense/page.tsx
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/eslint.config.mjs
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/instrumentation-client.ts
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/instrumentation.ts
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/next.config.ts
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/package.json
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/playwright.config.mjs
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/proxy.ts
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/public/file.svg
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/public/globe.svg
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/public/next.svg
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/public/vercel.svg
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/public/window.svg
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/sentry.edge.config.ts
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/sentry.server.config.ts
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/start-event-proxy.mjs
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/tests/cacheComponents.spec.ts
 create mode 100644 dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/tsconfig.json
 create mode 100644 packages/nextjs/src/common/utils/isUseCacheFunction.ts
 create mode 100644 packages/nextjs/src/common/utils/nextSpan.ts

diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/.gitignore b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/.gitignore
new file mode 100644
index 000000000000..dd146b53d966
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/.gitignore
@@ -0,0 +1,44 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/versions
+
+# testing
+/coverage
+
+# next.js
+/.next/
+/out/
+
+# production
+/build
+
+# misc
+.DS_Store
+*.pem
+
+# debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+.pnpm-debug.log*
+
+# env files (can opt-in for committing if needed)
+.env*
+
+# vercel
+.vercel
+
+# typescript
+*.tsbuildinfo
+next-env.d.ts
+
+# Sentry Config File
+.env.sentry-build-plugin
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/.npmrc b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/.npmrc
new file mode 100644
index 000000000000..a3160f4de175
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/.npmrc
@@ -0,0 +1,4 @@
+@sentry:registry=http://127.0.0.1:4873
+@sentry-internal:registry=http://127.0.0.1:4873
+public-hoist-pattern[]=*import-in-the-middle*
+public-hoist-pattern[]=*require-in-the-middle*
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/cache/page.tsx b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/cache/page.tsx
new file mode 100644
index 000000000000..6cf490b75430
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/cache/page.tsx
@@ -0,0 +1,25 @@
+import { Suspense } from 'react';
+import * as Sentry from '@sentry/nextjs';
+
+export default function Page() {
+  return (
+    <>
+      <h1>This will be pre-rendered</h1>
+      <DynamicContent />
+    </>
+  );
+}
+
+async function DynamicContent() {
+  const getTodos = async () => {
+    return Sentry.startSpan({ name: 'getTodos', op: 'get.todos' }, async () => {
+      'use cache';
+      await new Promise(resolve => setTimeout(resolve, 100));
+      return [1, 2, 3, 4, 5];
+    });
+  };
+
+  const todos = await getTodos();
+
+  return <div id="todos-fetched">Todos fetched: {todos.length}</div>;
+}
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/favicon.ico b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..718d6fea4835ec2d246af9800eddb7ffb276240c
GIT binary patch
literal 25931
zcmeHv30#a{`}aL_*G&7qml|y<+KVaDM2m#dVr!KsA!#An?kSQM(q<_dDNCpjEux83
zLb9Z^XxbDl(w>%i@8hT6>)&Gu{h#Oeyszu?xtw#Zb1mO<?sK2}EE5RAKnxHU7lft+
zNRAPL3?T?25I&drAjl1ssi=G|D?(7bFsgtO(2o>{pgX9699l+Qppw7jXaYf~-84xW
z)w4x8?=youko|}Vr~(D$UX<xm7|19n6Hxvd5m6xx<*9a4%RmR{en}E&p$X-wy5A}T
zU0^dwXVA>IbiXABHh`p1?nn8Po~fxRJv}|0e(BPs|G`(TT%kKVJAdg5*Z|x0leQq0
zkdUBvb#>9F()jo|T~kx@OM8$9wzs~t2l;K=woNssA3l6|sx2r3+kdfVW@e^8e*E}v
zA1y5{bRi+3Z`uD3{F7LgFJDdvm;nJilkzDku>BwXH(8ItVCXk*-lSJnR?-2UN%<G)
zWdETe=&R39RaKR)udn|#TOgZ!e!yM=<=+`Uz{l^5UtkZ2fHDQ;UwMB}v%l$A-`~F-
z{Qr^x^CSUf63Sry{6y#+`<sMA?dPFvg)$lC_RkFRKnCi7&P<a6>hJ){&rlvg`CDTj
z)Bzo!3v7Ou#83zEDEFcKt(f1E0~=rqeEbTnMvWR#{+9pg%7G8y>u1OVRUSoox-ovF
z2Ydma(;=YuBY(eI|04{hXzZD6_f(v~H;C~y5=DhAC{MMS>2fm~1H_t2$56pc$NH8(
z5bH|<)71dV-_oCHIrzrT`2s-5w_+2CM0$95I6X8p^r!gHp+j_gd;9O<1~CEQQGS8)
zS9Qh3#p&JM-G8rHekNmKVewU;pJRcTAog68KYo^dRo}(M<!8cv(gkb9@A>>36U4Us
zfgYWSiHZL3;lpWT=<n~R&zm>zNAW>Dh#mB!_@Lg%$ms8N-;aPqMn+C2HqZgz&9~Eu
z4|Kp<`$q)Uw1R?y(~S>ePdonHxpV1#eSP1B;Ogo+-Pk}6#0GsZZ5!||ev2MGdh}_m
z{DeR7?0-1^zVs&`AV6<!ZvGbtU{7FdY&`9DeD(=q|M30$GCs(E?S0J1$e@G0#Z=wz
zl)*a>Vt;r3`I`OI_wgs*w=eO%_#7Kepl{B<UyBc9U%rn&@xFZ-e{%i>@xiyCANc(l
zzIyd4y|c6PXWq9-|KM8(zIk8LPk(>a)zyFWjhT!$HJ$qX1vo@d25W<<x-(q{Yn-pG
zKTz?fwGmh&&2-F3f57**)?Xk#p#S9h^DhK{VVKE&0KR^-_MMD9nf@pDACnmVll!kp
z3?Tha?LWW70P;AL{}cP~sW|?W|MbA09{7Kt2f!i(y>fvZQ2zUz5WRc(UnFMKHwe1|
zWmlB1qdbiA(C0jmnV<}GfbKtmcu^2*P^O?<jWWPHxu*D53Uq)j1!ZtH3Vi&#Nd^rV
zj`B>MBLZKt|As~ge8&AAO~2K@zbXelK|4T<{|y4`raF{=72kC2Kn(L4YyenWgrPiv
z@^mr$t{#X5VuIMeL!7Ab6_kG$&#&5p*Z{+?5U|TZ`B!7llpVmp@skYz&n^8QfPJzL
z0G6K_OJM9x+Wu2gfN45phANGt{7=C>i34CV{Xqlx(fWpeAoj^N0Biu`w+MVcCUyU*
zDZuzO0>4Z6fbu^T_arWW5n!E45vX8N=bxTVeFoep_G#VmNlQzAI_KTIc{6>c+04vr
zx@W}zE5JNSU>!THJ{J=cqjz+4{L4A{Ob9$ZJ*S1?Ggg3klFp!+Y1@K+pK1DqI|_gq
z5ZDXVpge8-cs!o|;K73#YXZ3AShj50wBvuq3NTOZ`M&qtjj#GOFfgExjg8Gn8>Vq5
z`85n+9|!iLCZF5$HJ$Iu($dm?8~-ofu}tEc+-pyke=3!im#6pk_Wo8IA|fJwD&~~F
zc16osQ)EBo58U7XDuMexaPRjU@h8tXe%S{fA0NH3vGJFhuyyO!Uyl2^&EOpX{9As0
zWj+P>{@}jxH)8|r;2HdupP!vie{sJ28b&bo!8`D^x}TE$%zXNb^X1p@0PJ86`dZyj
z%ce7*{^oo+6%&~I!8hQy-vQ7E)0t0ybH4l%KltWOo~8cO`T=157JqL(oq_rC%ea&4
z2NcTJe-HgFjNg-gZ$6!Y`SMHrlj}Etf7<Kk?_r;;``Uc^3+u}-v3@Q8<@$Nr`<F?K
z-%F>?r!zQTPPSv}{so2e>Fjs1{<qUF=hGRSFDG$<z3x<+@%{Vd%a`e+qodRP&D<om
zAEn>gzk~LGeesX%r(Lh6rbhSo_n)@@G-FTQy93;l#E)hgP@d_SGvyCp0~o(Y;Ee8{
zdVUDbHm5`2taPUOY^MAGOw*<R_VaVlPH<<CgYr!E->>=s7=Gst=D+p+2yON!0%Hk`
zz5mAhyT4lS*T3LS^WSxUy86q&GnoHxzQ6vm8)VS}_zuqG?+3td68_x;etQAdu@sc6
zQJ&5|4(I?~3d-QOAODHpZ=hlSg(lBZ!JZWCtHHSj`0Wh93-Uk)_S%zsJ~aD>{`A0~
z9{AG(e|q3g5B%wYKRxiL2Y$8(4w<boVrLOyLG9R$m+7N>6bzchKuloQW#e&S3n+P-
z8!ds-%f;TJ1>)v)##>gd{PdS2Oc3VaR`fr=`O8QIO(6(N!A?pr5C#6fc~Ge@N%Vvu
zaoAX2&(a6eWy_q&UwOhU)|P3J0Qc%OdhzW=F4D|pt0E4osw;%<%Dn58hAWD^XnZD=
z>9~H(3bmLtxpF?a7su6J7M*x1By7YSUbxGi)Ot0P77`}P<HJ;%@cvfCkvm6xcMjdY
zed_u6xK)F%|1Hy`)`e~K(f*MqTJ?92I+4lga{A5`-U@Cab35G6unNk<*dpB|Rtkp;
z?32o^yBlJsuA-^abQ~7;%<oa^k<DbKc{lOW2!yM#nEALvv)IhY7b|Wfg(UhtiurTM
zY-B6L26$JQo&Kt3nh3JTJ)garEgw^{uEM3__%b$U5{~+aMO*k)6R#grkER2`U6KS-
z=j1=QhCkuy%iiHWrqH8CeGNw*C?epTpl2Bo@ugUPKRFeiVHOpL7PHu-SAgX@qmTGH
z_%ePz1`io8XDfwLmip;Rn;1yo+3>3{)&5Un{KD?`-e?r21!4vTTnN(4Y6Lin?UkSM
z`MXCTC1@4A4~mvz%Rh2&EwY))LeoT=*`tMoqcEXI>TZU9WTP#l?uFv+@Dn~b(>xh2
z;>B?;Tz2SR&KVb>vGiBSB`@U7VIWFSo=LDSb9F{GF^DbmWAfpms8Sx9OX4CnBJca3
zlj9(x!dIjN?OG1X4l*imJNvRCk}F%!?SOfiOq5y^mZW)jFL@<gIi}tCXee1<sGV$i
z4r_`X#mEQbiDh!Efji0GjM9z-0bF}p0(*s(OzMJ|;K&OJBar<ARLp}T>a|r-@d#f7
z2gmU8L3IZq0ynIws=}~m^#@&C%J6QFo~Mo4V`>v7MI-_!EBMMtb%_M&kvAaN)@ZVw
z+`toz&WG#HkWDjnZE!6nk{e-oFdL^$YnbOCN}JC&{$#$O27@|Tn-skXr)2ml2~O!5
zX+gYoxhoc7qoU?C^3~&!U?kRFtnSEecWuH0B0OvLodgUAi}8p1<ZO0#U-k07ifx!>
zrO6RSXHH}D<I*>Mc$&|?D004<Y&c6)m74d`LOLU@ruR+Um4>DiOVMHV8kXCP@7NKB
zgaZq^^O<7PoKEp72kby@W0Z!Y*A<g|TlOeriuPP`vK2IntATvs?Iv|J14j&;NFSFo
zyJ+sca?G+8C%!b{Sq=6cJJqS>y{&vfg#C&gG@YVR9g?FEocMUi1gSN$+V+ayF45{a
zuDZDT<?u;)RfLQwg>N}mS|;BO%gEf}pjBfN2-gIrU#G5~cucA;dokXW89%>AyXJJI
z9X4Ul<x{xc_m~`mWBP0<g-{#wm}Vv~Ef3pKWC&N_<~88zSbEk;;+{DnJ9-u&Zc74s
zJ6TCQyl_^|5cY;wmDdrU@LTL-3v0H#Ui?8ICQV{imof1MHuM$`e*ux>IWA|ZYHgbI
z5?oFk@A=Ik7lrEQPDH!H+b`7_Y~aDb_qa=B2^Y&Ow41cU=4WDd40dp5(QS-WMN-=Y
z9g;6_-JdNU;|6cPwf$ak*aJIcwL@1n$#l~zi{c{EW?T;DaW*E8DYq?Umtz{nJ&w-M
zEMyT<MDk{HKbd#ckg5-pS_?QUVhZv?&Q-ioBS}$nvBd)nE7YO0deN~G(#zCJAbY$E
z!)g3Ytl=_NDUV%pykcE+Q<{EoZ_4FR@&#d<hqs%N>DrC&9K$d|kZe2#ws6)L=7K+{
zQw{XnV6UC$6-rW0emqm8wJoeZK)wJIcV?dST}Z;G0Arq{dVDu0&4kd%N!3F1*;*pW
zR&qUiFzK=@44#QGw7k1`3t_d8&*kBV->O##t|tonFc2YWrL7_eqg+=+k;!F-`^b8>
z#KWCE8%u4k@EprxqiV$VmmtiWxDLgnGu$Vs<8rppV5E<MCr+anDo)-{XRlCJ;D#M(
zT=3WgR02;Nm!54biUb^FtzPh8iGrf412epnki-k+G4mdkzC|lJqaRMbb0~Jjp-{}I
z5Do5afZi>ajBXL4nyyZM$SWVm!wnCj-B!Wjqj5-5dNXukI2$$|Bu3Lrw}z65Lc=1G
z^-#WuQOj$hwNGG?*CM_TO8Bg-1+qc>J7k5c51U8g?ZU5n?HYor;~JIjoWH-G>AoUP
ztrWWLbRNqIjW#RT*WqZgPJXU7C)VaW5}MiijYbABmzoru6EmQ*N8cVK7a3|aOB#O&
zBl8JY2WKfmj;h#Q!pN%9o@VNLv{OUL?rixHwOZuvX7{IJ{(EdPpuVFoQqIOa7gi<U
zTpbX&UCeYeNu>LVkBOKL@^smUA!tZ1CKRK}#SSM)iQHk)*R~?M!qkCruaS!#oIL1c
z<cK@1=jX>?J<BS8bpdt^R+}%A_DEhF^%o}8e!!lc`Y!qU>;U~&FfH#*98^G?i}pA{
z9Jg36t4=%6mhY(quYq*vSxptes9qy|7xSlH?G=S@>u>Ebe;|LVhs~@+06N<4CViBk
zUiY$thvX;>Tby6z9Y1e<Q<iIG*|o$r?OTFp`s)@_nHs4LeWbGvg7^}NK)>dAMQaiH
zm^r3v#$Q#2T=X>bsY#D%s!bhs^M9PMAcHbCc0FMHV{u-dwlL;a1eJ63v5U*?Q_8JO
zT#50!RD619#j_Uf))0ooADz~*9&lN!bBDRUgE>Vud-i5ck%vT=r^yD*^?Mp@Q^v+V
zG#-?gKlr}Eeqifb{|So?HM&g91<J5P5=Ly{?(NNY{6`O~L5r@sJe3rNZn06%SLk);
z9?hvE^Hr{!*G$<_doyzGn#*z*#}?)8dH=eYTgvc)T~}Jw!kCv68<+KL5{5?EXtDAZ
zWeNqp8%KIuBi&icn5s815Vho<+99VW1~m@L8l0=$c`t-L{q))~<!p*~vCdUcBcPz`
zyUi}!-k_`G{>P8|av8hQoCmQXkd?7wIJw<dY^{|7OQJUHKB~nksN_|Xy;DL?xjxU^
zbMa`WdfTBnr<wTd$mY&SgJ4U|X``k`#`gN@M+0x2W{YgC3kbLk<uYFJWglkx_)2#b
ztRiuA!EK9o)f`I2k)l;Of%E`ff91WlZh8yfRi6#N-mC`Ma(yr~U82SyAhc9B+ur!f
zP-3igg*KeYs9mGOAw@OaXYy9DnGjn0<m`JH&Q^h}^!h+uS9Ct*o-oEy(?iT6Yco>b
z_^v8bbg`<ZOL)a;i=IdfK0Zvw4nXsoC?eTOMpY)_ptiORm%J(1CD3dE0Z%Vy<2iHp
zcp>SAn{I*4bH$u(RZ6*x<DqKJ+5;a6Jq~=Y8V&c?Vsyq88!2nD?H?Eww58Mqt$7R8
z5BMjmKx>UhuA~hc=8czK8SHEKTzSxgbwi~9(OqJB&gwb^l4+m`k*Q;_?>Y-APi1{k
zAHQ)P)G)f|AyjSgcCFps)Fh6Bca*Xznq3<?y%xNvu0N78_R?~<RDFQx0ynlRG(E|j
zvEGN3bF<E_9p-I!UwQXFqcSGV#e^98tgFqLp+z9eP}y!jNA{)r*a+%M-_20xg?94<
zzmM{}syi0cd&P)zywMdS&Y_9k5JDtOM!L)b^2WP!+fHYGv>6!pV6Az&m{O8$wGFD?
zY&O*3*J0;_EqM#jh6^gMQKpXV?#1?>$ml1xvh8nSN>-?H=V;nJIwB07YX$e6vLxH(
zqYwQ>qxwR(i4f)DLd)-$P>T-no_c!LsN@)8`e;W@)-Hj0>nJ-}Kla4-ZdPJzI&Mce
zv)V_j;(3ERN3_@I$N<^|4Lf`B;8n+bX@bHbcZTopEmDI*Jfl)-pFDvo6svPRoo@(x
z);_{lY<;);XzT`dBFpRmGrr}z5u1=p<K1~3>C^<jVp}L(pzgMB_Vs-O?{Z?y$8M;)
zi@7zwpzV9#m72%En~(9@E)GWV^(~J*@^*K*TE0mynAnGJ5YSLCEnC42H-`tr4L=oW
zI}N{xQ$HT8Q6CVHf%RY&xw7!Zj(0xmg(K#UQ4u!ej95z7V4phlcTJ2&AR}$)zV-s!
zO7bqY6(=?1t+JCOW_z%HRE>S-{ce6iXQlLGcItwJ^mZx{m$&DA_oEZ)B{_bYPq-HA
zcH8WGoBG(aBU_j)vEy+_71T34@4dmSg!|M8Vf92Zj6WH7Q7t#OHQqWgFE3ARt+%!T
z?oLovLVlnf?2c7pTc)~cc^($_8nyKwsN`RA-23ed3sdj(ys%pjjM+9JrctL;dy8a(
z@en&CQmnV(()bu|Y%G1-4a(6x{aLytn$T-;(&{QIJB9vMox11U-1HpD@d(QkaJdEb
zG{)+6Dos_L+O3NpWo^=gR?evp|CqEG?L&Ut#D*KLaRFOgOEK(Kq1@!EGcTfo+%A&I
z=dLbB+d$u{sh?u)xP{PF8L%;YPPW53+@{>5W=Jt#wQpN;0_HYdw1{ksf_XhO4#2F=
zyPx6Lx2<92L-;L5PD`zn6zwIH`Jk(<gsVPionpJ-imI56$j4P0!br@ny3=!{x2TY^
zCD=)8_PgmN)E!^nczcDGc9Wm7oo5O3@fh=k=kh8J?_3KqEp7JHdv8z_iZ5#KmbiPt
z2Bt8Ro^p$7pS!xL3mtj<iN3f}#r6_&$Es0PnJTE?c;0#$%cGdu`T%~`gW;c^VD-S=
zrAatMf^%Lzr*wQ4kHSOb?WOUuEsJQ3xr{Imf1t{~iNmRwb_SP9!?FFN=b-E){!8P2
ztWCT~262O8`%?3<W4Wg+ovWY<re)?^kZ|Yi>$?Qw({erA$^bC;q33hv!d!>%wRhj#
zal^hk+WGNg;rJtb-EB(?czvOM=H7dl=vblBwAv>}%1@{}mnpUznfq1cE^sgsL0*4I
zJ##!*B?=vI_OEVis5o+_IwMIRrpQyT_Sq~ZU%oY7c5JMIADzpD!Upz9h@iWg_>>~j
zOLS;wp^i$-E?4<_cp?RiS%Rd?i;f*mOz=~(&3lo<=@(nR!_Rqiprh@weZlL!t#NCc
zO!QTcInq|%#>OVgobj{~ixEUec`E25zJ~*DofsQdzIa@5^nOXj2T;8O`l--(QyU<o
zeu8G~Z>^$t?TGY^7#&FQ+2SS3B#qK*k3`ye?8jUYSajE5iBbJls75CCc(m3dk{t?-
zopcER9{Z?TC)mk~gpi^kbbu>b-+a{m#8-y2^p$ka4n60w;Sc2}HMf<8JUvh<G@KZw
z+<GL!lpeahq2+nO{>CL0B&Btk)T`ctE$*qNW8L$`7!r^9T+>=<=2qaq-;ll2{`{Rg
zc5a0ZUI$oG&j-qVOuKa=*v4aY#IsoM+1|c4Z)<}lEDvy;5huB@1RJPquU2U*U-;gu
z=En2m+qjBzR#DEJDO`WU)hdd{Vj%^0V*KoyZ|5lzV87&g_j~NCjwv0uQVqXOb*QrQ
zy|Qn`hxx(58c<SELWpDAg~83oY-J_WoDiI6d7>70$E;L(X0uZZ72M1!6oeg)(cdKO
ze0gDaTz+ohR-#d)NbAH4x{I(21yjwvBQfmpLu$)|m{XolbgF!pmsqJ#D}(ylp6uC>
z{bqtcI#hT#HW=wl7>p!38sKsJ`r8}lt-q%Keqy%u(xk=yiIJiUw6|5IvkS+#?JTBl
z8H5(Q?l#wzazujH!8o>1xtn8#_w+397*<wp?Ryt$UFh41$qd}LyNJ7Oao(Aw2g|wy
zH_nZ+R#~EUME^#j4$@^5&>_cy8!pQGP%K(Ga3pAjsaTbbXJlQF_+m+-UpUUent@xM
zg%jqLUExj~o^vQ3Gl*>wh=_gOr2*|U64_iXb+-111a<qXXnUI&{l`dM&{4Gw)jZn;
zlj{VxW@#OcVE1Y%J*u^Z@H+XSqL6SwA|^jv2RU_+d;O!mk)dw7-m9B4{6*G1zRdR6
zQ}6v&Xt7R2h3Xp}EQk4nF2TULG{Ri=D|JC<a+K7dldN1}CY_f!vK#u}K3`g#TpO&W
z;!;64`0$d9raD!VbYP`kuFUasaMh!;&81y}LHS(SuGRxwEn4LZb4DS1j9iAq$MXd@
z(Ebka7_Gc(ljGaJqtI-OzmA@c@sYB$)Vg!RP4~``vaVyRq$rJXRjIPwtepN;(B%wy
zmU>H}$TjeajM+I20xw(((>fej-@CIz4S1pi$(#}P7`4({6QS2CaQS4NPENDp>sAqD
z$bH4KGzXGffkJ7R>V>)>tC)uax{UsN*dbeNC*v}#8Y#OWYwL4t$ePR?VTyIs!wea+
z5Urmc)X|^`MG~*dS6pGSbU+gPJoq*^a=_>$n4|P^w$sMBBy@f*Z^Jg6?n5?oId6f{
z$LW4M|4m502z0t7g<#Bx%X;9<=)smFolV&(V^(7Cv2-sxbxopQ!)*#ZRhTBpx1)Fc
zNm1T%bONzv6@#|dz(w02AH8OXe>kQ#1FMCzO}2J_mST)+ExmBr9cva-@?;wnmWMOk
z{3_~EX_xadgJGv&H@zK_8{(x84`}+c?oSBX*Ge3VdfTt&F}yCpFP?CpW+BE^cWY0^
zb&uBN!Ja3UzYHK-CTyA5=L<c0d<h!DNBIa<xax8W3(Ru8L0cVXQ18|Y^|*S%)R96z
zBT$(=zQ}2vmt6LzN~Oyf_Y92%P@QOx{7~}5!UIqCdfu?VwC0Nb!2@iiit8-5zUWFG
z*G&+GLIU#J;}hvowNJWnglvb^<2q~lS#?ixVtYT@(O3{TC|4kFJYLB*jni-4YZi0>
zEMW{l3Usky#ly=7px648W31UNV@K)&Ub&zP1c7%)`{);I4b0Q<)B}3;NMG2JH=X$U
zfIW4)4n9ZM`-yRj67I)YSLDK)qfUJ_ij}a#aZN~9EXrh8eZY2&=uY%2N0UFF7<~%M
zsB8=erOWZ>Ct_#^tHZ|*q`H;A)5;ycw*I<Cd*bZlOJ9YmRUK2<qXkpRR3nr6r~%Jz
z*(8tA&DYO)etdgVmoonqD{*<5Fog4ClIs-~_uhjuZOI}#Wy+ce${%#oyHloXelqfz
z8)?D3Y_>cmVxi8_0Xk}aJA^ath+E;xg!x+As(M#0=)3!NJR6H&9+zd#iP(m0PIW8$
z1Y^VX`>jm`W!=WpF*{ioM?C9`yOR>@0q=u7o>BP-eSHqCgMDj!2anwH?s%i2p+Q7D
zzszIf5XJpE)IG4;d_(La-xenmF(tgAxK`Y4sQ}BSJEPs6N_U2vI{8=0C_F?@7<(G;
zo$~G=8p+076G;`}>{MQ>t>7cm=zGtfbdDXm6||jUU|?X?CaE?(<6bKDYKeHlz}DA8
zXT={X=yp_R;HfJ9h%?eWvQ!dRgz&Su*JfNt!Wu>|XfU<MM~gB&J0gc}IH}?|B4WRK
zWPL0FhctFGdMucOFdhrVunIe5)4K^H9IjB#eA)p5w?c#v7kp8jx^~bxxJB{;hPFL9
zkR9Dbpj+T5ZMgHQg|oj*DS;x&jK}1rn&}Shp9sgOI*7puQD-w?3H*cg72;5H(_zW*
zApJBIM-p2~F;qWDj!n|Kd=5|T8OPkQ_G;ujgvKybr5@~eci2{8WAz+%NUSp-&eoG!
zOGLNLJewWl&1*NT467W3god~fYgX?!f0?NCFnjD$qE-fyQ)|Q_DLc*{olmXSVl$g_
z$vj}o?RatMy(o*j8?q1Mgw{OUOgVR6_qvS<Co*&!cR`ROi|*I`ajyG5s@L8agnX2J
zF=DLkMG`z{RP&996y0yAtvJcb<cba?TV#j4VYFPC>&68iRikRrHRW|ZxzRR^`eIGt
zIeiDgVS>IeExKVRWW8-=<xUfo0v~z=RA=cFWKXgcMECd}xHp7iqkBanH}TZ0h0rA=
zqxUZ>A=<k-RjTtwbJkkep{8z*173wY^e%-U0{Ue!n@wbg^2q)Vx5c(_RfvuR4}XXn
z+JE>yA`}`)ZkWBrZD`hpWIxBGkh&f#ijr449~m`j6{4jiJ*C!oVA8ZC?$1RM#K(_b
zL9TW)kN*Y4%^-qPpMP7d4)o?Nk#>aoYHT(*g)qmRUb?**F@pnNiy6Fv9rEiUqD(^O
zzyS?nBrX63BTRYduaG(0VVG2yJRe%o&rVrLjbxTaAFTd8s;<<@Qs>u(<193R8>}2_
zuwp{7;H2a*X7_jryzriZXMg?bTuegABb^87@SsKkr2)0Gyiax8KQWstw^v<oS3Xw7
zu51m`3~hoyxErcHymdFTZd#AO59{EkuFTcpAR33(3xc{zRnn1~1Ei(i*^HdCvM~;;
za&}Uip|u>#ix45EVrcEhr>!NMhprl<CqZuKa#zuI&@zymVzIicetS0bq#u?m(r_@S
zJ79bl%4EyHCQ3fK@en+A1@)e}HWLP|gr_zuoA{}Z<(-*53Zu@k+=^%~5F(z$EFLI;
z-TQTS8$W|GRbZq93Ha1?lu+`O;rn>$InQMzjSFH54x5k9qHc`@9uKQzvL4ihcq{^B
zPrVR=o_ic%Y>6&rMN)hTZsI7I<3&`#(nl+3y3ys9A~<Ao%ZuW})CJ)6^(aRV(gGxR
z89#(FDW;GZEAf;rI$+PU)rEV|rASrwP0_mr^Ldv)IuUf1M>&^=4?PL&nd8)`OfG#n
zwAMN$1&>K++c{^|7<<q5KGu)u(OEfEJJw2aEi(;x-i=Y=j3ram9H2n-Fuqv0dVlXJ
z&WgG5X({!vJFDrEbm+CWDca^zIe2@s1@a;;Y3!U9Q)&P0UXFmCP51_!wvTfAIyR^M
z7^R*O@yz1b-s4VC>4P=2y(B{jJsQ0a#U;HTo4ZmWZYvI{+s;Td{Yzem%0*k#)vjpB
zia;J&>}ICate44SFYY3vEelqStQWFihx%^vQ@Do(sOy7yR2@WNv7Y9I^yL=nZr3mb
zXKV5t@=?-Sk|b{XMhA7ZGB@2hqsx}4xwCW!in#C<kr{U&JG{9FhoZ<aTve_lLz39>
zI@}sc<h3gsW}hp-`WUywKA>Zlr3-NFJ@NFaJlhyfcw{k^vvtGl`N9xSo**rDW4S}i
zM9{fMPWo%4wYDG~BZ18BD+}h|GQKc-g^{++3MY>}W_uq7jGHx{mwE9fZiPCoxN$+7
zrODGGJrOkcPQUB(FD5aoS4g~7#6NR^ma7-!>mHuJfY5kTe6PpNNKC9GGRiu^L31uG
z$7v`*JknQHsYB!Tm_W{a32TM099djW%5e+j0Ve_ct}IM>XLF1Ap+YvcrLV=|CKo6S
zb+<Td{{5RWR}u2f(q<b(D$9JsF0OOzJ*+z0P5kc1t}CXlYgua%x*2lSgp|*WS3H-#
zdYr7?GQOL18zUS<2|;+vi4|4sQBM2Gs&WVS!D`q5Lz;XR@5rEfa{uG-!q?R8Ncz%(
z5K6~LQ@d2wp#)5q4u<ENlFbS)U4o1t9{-d>9Nl3_YdKP6%Cxy@6TxZ>;4&nTneadr
z_ES90ydCev)LV!dN=#(*f}|ZORFdvkYBni^aLbUk>BajeWIOcmHP#8S)*2U~QKI%S
zyrLmtPqb&TphJ;>yAxri#;{uyk`JJqODDw%(Z=2<VfJZemI(PFAD{6Sm|uE%BTbkl
zROsg*MOh20YgGs3H7?@pmQ>`1uc}br^V%>j!gS)D*q*f_-qf8&D;W1dJgQMlaH5er
zN2U<%Smb7==vE}dDI8K7cKz!vs^73o9f>2sgiTzWcwY|BMYHH5%Vn7#kiw&eItCqa
zIkR2~Q}>X=Ar8W|^Ms41Fm8o6IB2_j60eOeBB1Br!boW7JnoeX6Gs)?7rW0^5psc-
zjS16yb>dFn>KPOF;imD}e!enuIniFzv}n$m2#gCCv4jM#ArwlzZ$7@9&XkFxZ4n!V
zj3dyiwW4Ki2QG{@i>yuZXQizw_OkZI^-3otXC{!(lUpJF33gI60ak;Uqitp74|B6I
zgg{b=Iz}WkhCGj1M<xTd?60J5qsr1Cg7F~~U2N!(@lC<>=hu4#Aw173YxIVbISaoc
z-nLZC*6Tgivd5V`K%GxhBsp@SUU60-rfc$=wb>zdJzXS&-5(NRRodFk;Kxk!S(<ov
z$YXcI9;^grAyiJ4dWTv3b}K~Ww09(;mLY4+kj|$A?IMr}`7q?mIS1>O(a0e7oY=E(
zAyS;Ow?6Q&XA+cnkCb{28_1N8H#?J!*$MmIwLq^*T_9-z^&UE@A(z9oGYtFy6EZef
LrJugUA?W`A8`#=m

literal 0
HcmV?d00001

diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/global-error.tsx b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/global-error.tsx
new file mode 100644
index 000000000000..20c175015b03
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/global-error.tsx
@@ -0,0 +1,23 @@
+'use client';
+
+import * as Sentry from '@sentry/nextjs';
+import NextError from 'next/error';
+import { useEffect } from 'react';
+
+export default function GlobalError({ error }: { error: Error & { digest?: string } }) {
+  useEffect(() => {
+    Sentry.captureException(error);
+  }, [error]);
+
+  return (
+    <html>
+      <body>
+        {/* `NextError` is the default Next.js error page component. Its type
+        definition requires a `statusCode` prop. However, since the App Router
+        does not expose status codes for errors, we simply pass 0 to render a
+        generic error message. */}
+        <NextError statusCode={0} />
+      </body>
+    </html>
+  );
+}
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/layout.tsx b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/layout.tsx
new file mode 100644
index 000000000000..c8f9cee0b787
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/layout.tsx
@@ -0,0 +1,7 @@
+export default function Layout({ children }: { children: React.ReactNode }) {
+  return (
+    <html lang="en">
+      <body>{children}</body>
+    </html>
+  );
+}
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/page.tsx b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/page.tsx
new file mode 100644
index 000000000000..433db8283beb
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/page.tsx
@@ -0,0 +1,3 @@
+export default function Page() {
+  return <p>Next 16 CacheComponents test app</p>;
+}
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/suspense/page.tsx b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/suspense/page.tsx
new file mode 100644
index 000000000000..32e5a73afc14
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/app/suspense/page.tsx
@@ -0,0 +1,26 @@
+import { Suspense } from 'react';
+import * as Sentry from '@sentry/nextjs';
+
+export default function Page() {
+  return (
+    <>
+      <h1>This will be pre-rendered</h1>
+      <Suspense fallback={<div>Loading...</div>}>
+        <DynamicContent />
+      </Suspense>
+    </>
+  );
+}
+
+async function DynamicContent() {
+  const getTodos = async () => {
+    return Sentry.startSpan({ name: 'getTodos', op: 'get.todos' }, async () => {
+      await new Promise(resolve => setTimeout(resolve, 100));
+      return [1, 2, 3, 4, 5];
+    });
+  };
+
+  const todos = await getTodos();
+
+  return <div id="todos-fetched">Todos fetched: {todos.length}</div>;
+}
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/eslint.config.mjs b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/eslint.config.mjs
new file mode 100644
index 000000000000..60f7af38f6c2
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/eslint.config.mjs
@@ -0,0 +1,19 @@
+import { dirname } from 'path';
+import { fileURLToPath } from 'url';
+import { FlatCompat } from '@eslint/eslintrc';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+const compat = new FlatCompat({
+  baseDirectory: __dirname,
+});
+
+const eslintConfig = [
+  ...compat.extends('next/core-web-vitals', 'next/typescript'),
+  {
+    ignores: ['node_modules/**', '.next/**', 'out/**', 'build/**', 'next-env.d.ts'],
+  },
+];
+
+export default eslintConfig;
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/instrumentation-client.ts b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/instrumentation-client.ts
new file mode 100644
index 000000000000..4870c64e7959
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/instrumentation-client.ts
@@ -0,0 +1,11 @@
+import * as Sentry from '@sentry/nextjs';
+
+Sentry.init({
+  environment: 'qa', // dynamic sampling bias to keep transactions
+  dsn: process.env.NEXT_PUBLIC_E2E_TEST_DSN,
+  tunnel: `http://localhost:3031/`, // proxy server
+  tracesSampleRate: 1.0,
+  sendDefaultPii: true,
+});
+
+export const onRouterTransitionStart = Sentry.captureRouterTransitionStart;
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/instrumentation.ts b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/instrumentation.ts
new file mode 100644
index 000000000000..964f937c439a
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/instrumentation.ts
@@ -0,0 +1,13 @@
+import * as Sentry from '@sentry/nextjs';
+
+export async function register() {
+  if (process.env.NEXT_RUNTIME === 'nodejs') {
+    await import('./sentry.server.config');
+  }
+
+  if (process.env.NEXT_RUNTIME === 'edge') {
+    await import('./sentry.edge.config');
+  }
+}
+
+export const onRequestError = Sentry.captureRequestError;
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/next.config.ts b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/next.config.ts
new file mode 100644
index 000000000000..2841f1c0c5da
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/next.config.ts
@@ -0,0 +1,10 @@
+import { withSentryConfig } from '@sentry/nextjs';
+import type { NextConfig } from 'next';
+
+const nextConfig: NextConfig = {
+  cacheComponents: true,
+};
+
+export default withSentryConfig(nextConfig, {
+  silent: true,
+});
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/package.json b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/package.json
new file mode 100644
index 000000000000..de2d67b0ed4b
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/package.json
@@ -0,0 +1,51 @@
+{
+  "name": "nextjs-16-cacheComponents",
+  "version": "0.1.0",
+  "private": true,
+  "scripts": {
+    "dev": "next dev",
+    "build": "next build",
+    "clean": "npx rimraf node_modules pnpm-lock.yaml .tmp_dev_server_logs",
+    "dev:webpack": "next dev --webpack",
+    "build-webpack": "next build --webpack",
+    "start": "next start",
+    "lint": "eslint",
+    "test:prod": "TEST_ENV=production playwright test",
+    "test:dev": "TEST_ENV=development playwright test",
+    "test:dev-webpack": "TEST_ENV=development-webpack playwright test",
+    "test:build": "pnpm install && pnpm build",
+    "test:build-webpack": "pnpm install && pnpm build-webpack",
+    "test:build-canary": "pnpm install && pnpm add next@canary && pnpm build",
+    "test:build-latest": "pnpm install && pnpm add next@latest && pnpm build",
+    "test:build-latest-webpack": "pnpm install && pnpm add next@latest && pnpm build-webpack",
+    "test:build-canary-webpack": "pnpm install && pnpm add next@canary && pnpm build-webpack",
+    "test:assert": "pnpm test:prod && pnpm test:dev",
+    "test:assert-webpack": "pnpm test:prod && pnpm test:dev-webpack"
+  },
+  "dependencies": {
+    "@sentry/nextjs": "latest || *",
+    "@sentry/core": "latest || *",
+    "import-in-the-middle": "^1",
+    "next": "16.0.0",
+    "react": "19.1.0",
+    "react-dom": "19.1.0",
+    "require-in-the-middle": "^7",
+    "zod": "^3.22.4"
+  },
+  "devDependencies": {
+    "@playwright/test": "~1.53.2",
+    "@sentry-internal/test-utils": "link:../../../test-utils",
+    "@types/node": "^20",
+    "@types/react": "^19",
+    "@types/react-dom": "^19",
+    "eslint": "^9",
+    "eslint-config-next": "canary",
+    "typescript": "^5"
+  },
+  "volta": {
+    "extends": "../../package.json"
+  },
+  "sentryTest": {
+    "//": "TODO: Add variants for webpack once supported"
+  }
+}
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/playwright.config.mjs b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/playwright.config.mjs
new file mode 100644
index 000000000000..797418b8cf7d
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/playwright.config.mjs
@@ -0,0 +1,29 @@
+import { getPlaywrightConfig } from '@sentry-internal/test-utils';
+const testEnv = process.env.TEST_ENV;
+
+if (!testEnv) {
+  throw new Error('No test env defined');
+}
+
+const getStartCommand = () => {
+  if (testEnv === 'development-webpack') {
+    return 'pnpm next dev -p 3030 --webpack 2>&1 | tee .tmp_dev_server_logs';
+  }
+
+  if (testEnv === 'development') {
+    return 'pnpm next dev -p 3030 2>&1 | tee .tmp_dev_server_logs';
+  }
+
+  if (testEnv === 'production') {
+    return 'pnpm next start -p 3030';
+  }
+
+  throw new Error(`Unknown test env: ${testEnv}`);
+};
+
+const config = getPlaywrightConfig({
+  startCommand: getStartCommand(),
+  port: 3030,
+});
+
+export default config;
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/proxy.ts b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/proxy.ts
new file mode 100644
index 000000000000..60722f329fa0
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/proxy.ts
@@ -0,0 +1,24 @@
+import { getDefaultIsolationScope } from '@sentry/core';
+import * as Sentry from '@sentry/nextjs';
+import { NextResponse } from 'next/server';
+import type { NextRequest } from 'next/server';
+
+export async function proxy(request: NextRequest) {
+  Sentry.setTag('my-isolated-tag', true);
+  Sentry.setTag('my-global-scope-isolated-tag', getDefaultIsolationScope().getScopeData().tags['my-isolated-tag']); // We set this tag to be able to assert that the previously set tag has not leaked into the global isolation scope
+
+  if (request.headers.has('x-should-throw')) {
+    throw new Error('Middleware Error');
+  }
+
+  if (request.headers.has('x-should-make-request')) {
+    await fetch('http://localhost:3030/');
+  }
+
+  return NextResponse.next();
+}
+
+// See "Matching Paths" below to learn more
+export const config = {
+  matcher: ['/api/endpoint-behind-middleware', '/api/endpoint-behind-faulty-middleware'],
+};
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/public/file.svg b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/public/file.svg
new file mode 100644
index 000000000000..004145cddf3f
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/public/file.svg
@@ -0,0 +1 @@
+<svg fill="none" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><path d="M14.5 13.5V5.41a1 1 0 0 0-.3-.7L9.8.29A1 1 0 0 0 9.08 0H1.5v13.5A2.5 2.5 0 0 0 4 16h8a2.5 2.5 0 0 0 2.5-2.5m-1.5 0v-7H8v-5H3v12a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1M9.5 5V2.12L12.38 5zM5.13 5h-.62v1.25h2.12V5zm-.62 3h7.12v1.25H4.5zm.62 3h-.62v1.25h7.12V11z" clip-rule="evenodd" fill="#666" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/public/globe.svg b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/public/globe.svg
new file mode 100644
index 000000000000..567f17b0d7c7
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/public/globe.svg
@@ -0,0 +1 @@
+<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><g clip-path="url(#a)"><path fill-rule="evenodd" clip-rule="evenodd" d="M10.27 14.1a6.5 6.5 0 0 0 3.67-3.45q-1.24.21-2.7.34-.31 1.83-.97 3.1M8 16A8 8 0 1 0 8 0a8 8 0 0 0 0 16m.48-1.52a7 7 0 0 1-.96 0H7.5a4 4 0 0 1-.84-1.32q-.38-.89-.63-2.08a40 40 0 0 0 3.92 0q-.25 1.2-.63 2.08a4 4 0 0 1-.84 1.31zm2.94-4.76q1.66-.15 2.95-.43a7 7 0 0 0 0-2.58q-1.3-.27-2.95-.43a18 18 0 0 1 0 3.44m-1.27-3.54a17 17 0 0 1 0 3.64 39 39 0 0 1-4.3 0 17 17 0 0 1 0-3.64 39 39 0 0 1 4.3 0m1.1-1.17q1.45.13 2.69.34a6.5 6.5 0 0 0-3.67-3.44q.65 1.26.98 3.1M8.48 1.5l.01.02q.41.37.84 1.31.38.89.63 2.08a40 40 0 0 0-3.92 0q.25-1.2.63-2.08a4 4 0 0 1 .85-1.32 7 7 0 0 1 .96 0m-2.75.4a6.5 6.5 0 0 0-3.67 3.44 29 29 0 0 1 2.7-.34q.31-1.83.97-3.1M4.58 6.28q-1.66.16-2.95.43a7 7 0 0 0 0 2.58q1.3.27 2.95.43a18 18 0 0 1 0-3.44m.17 4.71q-1.45-.12-2.69-.34a6.5 6.5 0 0 0 3.67 3.44q-.65-1.27-.98-3.1" fill="#666"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h16v16H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/public/next.svg b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/public/next.svg
new file mode 100644
index 000000000000..5174b28c565c
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/public/next.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 394 80"><path fill="#000" d="M262 0h68.5v12.7h-27.2v66.6h-13.6V12.7H262V0ZM149 0v12.7H94v20.4h44.3v12.6H94v21h55v12.6H80.5V0h68.7zm34.3 0h-17.8l63.8 79.4h17.9l-32-39.7 32-39.6h-17.9l-23 28.6-23-28.6zm18.3 56.7-9-11-27.1 33.7h17.8l18.3-22.7z"/><path fill="#000" d="M81 79.3 17 0H0v79.3h13.6V17l50.2 62.3H81Zm252.6-.4c-1 0-1.8-.4-2.5-1s-1.1-1.6-1.1-2.6.3-1.8 1-2.5 1.6-1 2.6-1 1.8.3 2.5 1a3.4 3.4 0 0 1 .6 4.3 3.7 3.7 0 0 1-3 1.8zm23.2-33.5h6v23.3c0 2.1-.4 4-1.3 5.5a9.1 9.1 0 0 1-3.8 3.5c-1.6.8-3.5 1.3-5.7 1.3-2 0-3.7-.4-5.3-1s-2.8-1.8-3.7-3.2c-.9-1.3-1.4-3-1.4-5h6c.1.8.3 1.6.7 2.2s1 1.2 1.6 1.5c.7.4 1.5.5 2.4.5 1 0 1.8-.2 2.4-.6a4 4 0 0 0 1.6-1.8c.3-.8.5-1.8.5-3V45.5zm30.9 9.1a4.4 4.4 0 0 0-2-3.3 7.5 7.5 0 0 0-4.3-1.1c-1.3 0-2.4.2-3.3.5-.9.4-1.6 1-2 1.6a3.5 3.5 0 0 0-.3 4c.3.5.7.9 1.3 1.2l1.8 1 2 .5 3.2.8c1.3.3 2.5.7 3.7 1.2a13 13 0 0 1 3.2 1.8 8.1 8.1 0 0 1 3 6.5c0 2-.5 3.7-1.5 5.1a10 10 0 0 1-4.4 3.5c-1.8.8-4.1 1.2-6.8 1.2-2.6 0-4.9-.4-6.8-1.2-2-.8-3.4-2-4.5-3.5a10 10 0 0 1-1.7-5.6h6a5 5 0 0 0 3.5 4.6c1 .4 2.2.6 3.4.6 1.3 0 2.5-.2 3.5-.6 1-.4 1.8-1 2.4-1.7a4 4 0 0 0 .8-2.4c0-.9-.2-1.6-.7-2.2a11 11 0 0 0-2.1-1.4l-3.2-1-3.8-1c-2.8-.7-5-1.7-6.6-3.2a7.2 7.2 0 0 1-2.4-5.7 8 8 0 0 1 1.7-5 10 10 0 0 1 4.3-3.5c2-.8 4-1.2 6.4-1.2 2.3 0 4.4.4 6.2 1.2 1.8.8 3.2 2 4.3 3.4 1 1.4 1.5 3 1.5 5h-5.8z"/></svg>
\ No newline at end of file
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/public/vercel.svg b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/public/vercel.svg
new file mode 100644
index 000000000000..77053960334e
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/public/vercel.svg
@@ -0,0 +1 @@
+<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1155 1000"><path d="m577.3 0 577.4 1000H0z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/public/window.svg b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/public/window.svg
new file mode 100644
index 000000000000..b2b2a44f6ebc
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/public/window.svg
@@ -0,0 +1 @@
+<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill-rule="evenodd" clip-rule="evenodd" d="M1.5 2.5h13v10a1 1 0 0 1-1 1h-11a1 1 0 0 1-1-1zM0 1h16v11.5a2.5 2.5 0 0 1-2.5 2.5h-11A2.5 2.5 0 0 1 0 12.5zm3.75 4.5a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5M7 4.75a.75.75 0 1 1-1.5 0 .75.75 0 0 1 1.5 0m1.75.75a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5" fill="#666"/></svg>
\ No newline at end of file
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/sentry.edge.config.ts b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/sentry.edge.config.ts
new file mode 100644
index 000000000000..2199afc46eaf
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/sentry.edge.config.ts
@@ -0,0 +1,10 @@
+import * as Sentry from '@sentry/nextjs';
+
+Sentry.init({
+  environment: 'qa', // dynamic sampling bias to keep transactions
+  dsn: process.env.NEXT_PUBLIC_E2E_TEST_DSN,
+  tunnel: `http://localhost:3031/`, // proxy server
+  tracesSampleRate: 1.0,
+  sendDefaultPii: true,
+  // debug: true,
+});
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/sentry.server.config.ts b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/sentry.server.config.ts
new file mode 100644
index 000000000000..08d5d580b314
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/sentry.server.config.ts
@@ -0,0 +1,11 @@
+import * as Sentry from '@sentry/nextjs';
+
+Sentry.init({
+  environment: 'qa', // dynamic sampling bias to keep transactions
+  dsn: process.env.NEXT_PUBLIC_E2E_TEST_DSN,
+  tunnel: `http://localhost:3031/`, // proxy server
+  tracesSampleRate: 1.0,
+  sendDefaultPii: true,
+  // debug: true,
+  integrations: [Sentry.vercelAIIntegration()],
+});
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/start-event-proxy.mjs b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/start-event-proxy.mjs
new file mode 100644
index 000000000000..f0fae444f2eb
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/start-event-proxy.mjs
@@ -0,0 +1,14 @@
+import * as fs from 'fs';
+import * as path from 'path';
+import { startEventProxyServer } from '@sentry-internal/test-utils';
+
+const packageJson = JSON.parse(fs.readFileSync(path.join(process.cwd(), 'package.json')));
+
+startEventProxyServer({
+  port: 3031,
+  proxyServerName: 'nextjs-16-cacheComponents',
+  envelopeDumpPath: path.join(
+    process.cwd(),
+    `event-dumps/next-16-cacheComponents-v${packageJson.dependencies.next}-${process.env.TEST_ENV}.dump`,
+  ),
+});
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/tests/cacheComponents.spec.ts b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/tests/cacheComponents.spec.ts
new file mode 100644
index 000000000000..9f7b0ca559be
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/tests/cacheComponents.spec.ts
@@ -0,0 +1,28 @@
+import { expect, test } from '@playwright/test';
+import { waitForTransaction } from '@sentry-internal/test-utils';
+
+test('Should render cached component', async ({ page }) => {
+  const serverTxPromise = waitForTransaction('nextjs-16-cacheComponents', async transactionEvent => {
+    return transactionEvent.contexts?.trace?.op === 'http.server';
+  });
+
+  await page.goto('/cache');
+  const serverTx = await serverTxPromise;
+
+  // we want to skip creating spans in cached environments
+  expect(serverTx.spans?.filter(span => span.op === 'get.todos')).toHaveLength(0);
+  await expect(page.locator('#todos-fetched')).toHaveText('Todos fetched: 5');
+});
+
+test('Should render suspense component', async ({ page }) => {
+  const serverTxPromise = waitForTransaction('nextjs-16-cacheComponents', async transactionEvent => {
+    return transactionEvent.contexts?.trace?.op === 'http.server';
+  });
+
+  await page.goto('/suspense');
+  const serverTx = await serverTxPromise;
+
+  // this will be called several times in development mode, so we need to check for at least one span
+  expect(serverTx.spans?.filter(span => span.op === 'get.todos').length).toBeGreaterThan(0);
+  await expect(page.locator('#todos-fetched')).toHaveText('Todos fetched: 5');
+});
diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/tsconfig.json b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/tsconfig.json
new file mode 100644
index 000000000000..cc9ed39b5aa2
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/tsconfig.json
@@ -0,0 +1,27 @@
+{
+  "compilerOptions": {
+    "target": "ES2017",
+    "lib": ["dom", "dom.iterable", "esnext"],
+    "allowJs": true,
+    "skipLibCheck": true,
+    "strict": true,
+    "noEmit": true,
+    "esModuleInterop": true,
+    "module": "esnext",
+    "moduleResolution": "bundler",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "jsx": "react-jsx",
+    "incremental": true,
+    "plugins": [
+      {
+        "name": "next"
+      }
+    ],
+    "paths": {
+      "@/*": ["./*"]
+    }
+  },
+  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts", ".next/dev/types/**/*.ts", "**/*.mts"],
+  "exclude": ["node_modules"]
+}
diff --git a/packages/nextjs/src/client/index.ts b/packages/nextjs/src/client/index.ts
index a171652b7221..9cc8d3b10bfe 100644
--- a/packages/nextjs/src/client/index.ts
+++ b/packages/nextjs/src/client/index.ts
@@ -14,6 +14,9 @@ import { applyTunnelRouteOption } from './tunnelRoute';
 export * from '@sentry/react';
 export * from '../common';
 export { captureUnderscoreErrorException } from '../common/pages-router-instrumentation/_error';
+
+// Override core span methods with Next.js-specific implementations that support Cache Components
+export { startSpan, startSpanManual, startInactiveSpan } from '../common/utils/nextSpan';
 export { browserTracingIntegration } from './browserTracingIntegration';
 export { captureRouterTransitionStart } from './routing/appRouterRoutingInstrumentation';
 
diff --git a/packages/nextjs/src/common/utils/isUseCacheFunction.ts b/packages/nextjs/src/common/utils/isUseCacheFunction.ts
new file mode 100644
index 000000000000..fb392c18c125
--- /dev/null
+++ b/packages/nextjs/src/common/utils/isUseCacheFunction.ts
@@ -0,0 +1,58 @@
+// Vendored from: https://github.com/vercel/next.js/blob/canary/packages/next/src/lib/client-and-server-references.ts
+
+interface ServerReferenceInfo {
+  type: 'server-action' | 'use-cache';
+  usedArgs: [boolean, boolean, boolean, boolean, boolean, boolean];
+  hasRestArgs: boolean;
+}
+
+export interface ServerReference {
+  $$typeof: symbol;
+  $$id: string;
+}
+
+export type ServerFunction = ServerReference & ((...args: unknown[]) => Promise<unknown>);
+
+function extractInfoFromServerReferenceId(id: string): ServerReferenceInfo {
+  const infoByte = parseInt(id.slice(0, 2), 16);
+  // eslint-disable-next-line no-bitwise
+  const typeBit = (infoByte >> 7) & 0x1;
+  // eslint-disable-next-line no-bitwise
+  const argMask = (infoByte >> 1) & 0x3f;
+  // eslint-disable-next-line no-bitwise
+  const restArgs = infoByte & 0x1;
+  const usedArgs = Array(6);
+
+  for (let index = 0; index < 6; index++) {
+    const bitPosition = 5 - index;
+    // eslint-disable-next-line no-bitwise
+    const bit = (argMask >> bitPosition) & 0x1;
+    usedArgs[index] = bit === 1;
+  }
+
+  return {
+    type: typeBit === 1 ? 'use-cache' : 'server-action',
+    usedArgs: usedArgs as [boolean, boolean, boolean, boolean, boolean, boolean],
+    hasRestArgs: restArgs === 1,
+  };
+}
+
+function isServerReference<T>(value: T & Partial<ServerReference>): value is T & ServerFunction {
+  return value.$$typeof === Symbol.for('react.server.reference');
+}
+
+/**
+ * Check if the function is a use cache function.
+ *
+ * @param value - The function to check.
+ * @returns true if the function is a use cache function, false otherwise.
+ */
+export function isUseCacheFunction<T>(value: T & Partial<ServerReference>): value is T & ServerFunction {
+  if (!isServerReference(value)) {
+    return false;
+  }
+
+  const { type } = extractInfoFromServerReferenceId(value.$$id);
+
+  return type === 'use-cache';
+}
diff --git a/packages/nextjs/src/common/utils/nextSpan.ts b/packages/nextjs/src/common/utils/nextSpan.ts
new file mode 100644
index 000000000000..1c9c47119a6d
--- /dev/null
+++ b/packages/nextjs/src/common/utils/nextSpan.ts
@@ -0,0 +1,83 @@
+import type { Span, StartSpanOptions } from '@sentry/core';
+import {
+  debug,
+  SentryNonRecordingSpan,
+  startInactiveSpan as coreStartInactiveSpan,
+  startSpan as coreStartSpan,
+  startSpanManual as coreStartSpanManual,
+} from '@sentry/core';
+import { DEBUG_BUILD } from '../debug-build';
+import { isBuild } from './isBuild';
+import type { ServerReference } from './isUseCacheFunction';
+import { isUseCacheFunction } from './isUseCacheFunction';
+
+function shouldNoopSpan<T>(callback?: T & Partial<ServerReference>): boolean {
+  const isBuildContext = isBuild();
+  const isUseCacheFunctionContext = callback ? isUseCacheFunction(callback) : false;
+
+  if (isUseCacheFunctionContext) {
+    DEBUG_BUILD && debug.log('Skipping span creation in Cache Components context');
+  }
+
+  return isBuildContext || isUseCacheFunctionContext;
+}
+
+function createNonRecordingSpan(): Span {
+  return new SentryNonRecordingSpan({
+    traceId: '00000000000000000000000000000000',
+    spanId: '0000000000000000',
+  });
+}
+
+/**
+ * Next.js-specific implementation of `startSpan` that skips span creation
+ * in Cache Components contexts (which render at build time).
+ *
+ * When in a Cache Components context, we execute the callback with a non-recording span
+ * and return early without creating an actual span, since spans don't make sense at build/cache time.
+ *
+ * @param options - Options for starting the span
+ * @param callback - Callback function that receives the span
+ * @returns The return value of the callback
+ */
+export function startSpan<T>(options: StartSpanOptions, callback: (span: Span) => T): T {
+  if (shouldNoopSpan(callback)) {
+    return callback(createNonRecordingSpan());
+  }
+
+  return coreStartSpan(options, callback);
+}
+
+/**
+ *
+ * When in a Cache Components context, we execute the callback with a non-recording span
+ * and return early without creating an actual span, since spans don't make sense at build/cache time.
+ *
+ * @param options - Options for starting the span
+ * @param callback - Callback function that receives the span and finish function
+ * @returns The return value of the callback
+ */
+export function startSpanManual<T>(options: StartSpanOptions, callback: (span: Span, finish: () => void) => T): T {
+  if (shouldNoopSpan(callback)) {
+    const nonRecordingSpan = createNonRecordingSpan();
+    return callback(nonRecordingSpan, () => nonRecordingSpan.end());
+  }
+
+  return coreStartSpanManual(options, callback);
+}
+
+/**
+ *
+ * When in a Cache Components context, we return a non-recording span and return early
+ * without creating an actual span, since spans don't make sense at build/cache time.
+ *
+ * @param options - Options for starting the span
+ * @returns A non-recording span (in Cache Components context) or the created span
+ */
+export function startInactiveSpan(options: StartSpanOptions): Span {
+  if (shouldNoopSpan()) {
+    return createNonRecordingSpan();
+  }
+
+  return coreStartInactiveSpan(options);
+}
diff --git a/packages/nextjs/src/edge/index.ts b/packages/nextjs/src/edge/index.ts
index 091adab98dee..2232d259ec11 100644
--- a/packages/nextjs/src/edge/index.ts
+++ b/packages/nextjs/src/edge/index.ts
@@ -31,6 +31,9 @@ import { distDirRewriteFramesIntegration } from './distDirRewriteFramesIntegrati
 export * from '@sentry/vercel-edge';
 export * from '../common';
 export { captureUnderscoreErrorException } from '../common/pages-router-instrumentation/_error';
+
+// Override core span methods with Next.js-specific implementations that support Cache Components
+export { startSpan, startSpanManual, startInactiveSpan } from '../common/utils/nextSpan';
 export { wrapApiHandlerWithSentry } from './wrapApiHandlerWithSentry';
 
 export type EdgeOptions = VercelEdgeOptions;
diff --git a/packages/nextjs/src/server/index.ts b/packages/nextjs/src/server/index.ts
index caec9a9f1af1..ca387d752a1d 100644
--- a/packages/nextjs/src/server/index.ts
+++ b/packages/nextjs/src/server/index.ts
@@ -47,6 +47,9 @@ export * from '@sentry/node';
 
 export { captureUnderscoreErrorException } from '../common/pages-router-instrumentation/_error';
 
+// Override core span methods with Next.js-specific implementations that support Cache Components
+export { startSpan, startSpanManual, startInactiveSpan } from '../common/utils/nextSpan';
+
 const globalWithInjectedValues = GLOBAL_OBJ as typeof GLOBAL_OBJ & {
   _sentryRewriteFramesDistDir?: string;
   _sentryRewritesTunnelPath?: string;

From 26af7b15d2a43a3d9141f6fb44f709bc350c6a29 Mon Sep 17 00:00:00 2001
From: Abhijeet Prasad <aprasad@sentry.io>
Date: Tue, 25 Nov 2025 09:51:49 -0500
Subject: [PATCH 128/186] feat: Publish AWS Lambda Layer for Node 24 (#18327)

Node 24 is now supported:
https://docs.aws.amazon.com/lambda/latest/dg/lambda-runtimes.html#runtimes-supported,
we can publish.
---
 .craft.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.craft.yml b/.craft.yml
index c5055acf329c..cf86175ca43d 100644
--- a/.craft.yml
+++ b/.craft.yml
@@ -153,6 +153,7 @@ targets:
           - nodejs18.x
           - nodejs20.x
           - nodejs22.x
+          - nodejs24.x
     license: MIT
 
   # CDN Bundle Target

From ee4146e01c7a951aa48928f417884d4e5243f9f4 Mon Sep 17 00:00:00 2001
From: Charly Gomez <charly.gomez@sentry.io>
Date: Tue, 25 Nov 2025 16:05:22 +0100
Subject: [PATCH 129/186] chore(changelog): Add entry for #18304 (#18329)

ref https://github.com/getsentry/sentry-javascript/pull/18304
---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58e2cf7bd830..eeb05346b9d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+- **feat(nextjs): Support cacheComponents on turbopack ([#18304](https://github.com/getsentry/sentry-javascript/pull/18304))**
+
+This release adds support for `cacheComponents` on turbopack builds. We are working on adding support for this feature in webpack builds as well.
+
 ## 10.27.0
 
 ### Important Changes

From f31b89962849e6acb0c8594dc7106da09373d857 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Peer=20St=C3=B6cklmair?= <jan.peer@sentry.io>
Date: Wed, 26 Nov 2025 06:55:36 +0000
Subject: [PATCH 130/186] test(cloudflare): Add typechecks for
 cloudflare-worker e2e test (#18321)

This PR is a result of
https://github.com/getsentry/sentry-javascript/pull/18302. This ensures
that the types are checked throughout the development of the Cloudflare
SDK
---
 .../test-applications/cloudflare-workers/package.json         | 2 +-
 .../{worker-configuration.d.ts => src/env.d.ts}               | 0
 .../test-applications/cloudflare-workers/tests/tsconfig.json  | 2 +-
 .../test-applications/cloudflare-workers/tsconfig.json        | 4 ++--
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename dev-packages/e2e-tests/test-applications/cloudflare-workers/{worker-configuration.d.ts => src/env.d.ts} (100%)

diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-workers/package.json b/dev-packages/e2e-tests/test-applications/cloudflare-workers/package.json
index 91a49e0788f4..5d7cfc35e469 100644
--- a/dev-packages/e2e-tests/test-applications/cloudflare-workers/package.json
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-workers/package.json
@@ -10,7 +10,7 @@
     "typecheck": "tsc --noEmit",
     "cf-typegen": "wrangler types",
     "test:build": "pnpm install && pnpm build",
-    "test:assert": "pnpm test:dev && pnpm test:prod",
+    "test:assert": "pnpm typecheck && pnpm test:dev && pnpm test:prod",
     "test:prod": "TEST_ENV=production playwright test",
     "test:dev": "TEST_ENV=development playwright test"
   },
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-workers/worker-configuration.d.ts b/dev-packages/e2e-tests/test-applications/cloudflare-workers/src/env.d.ts
similarity index 100%
rename from dev-packages/e2e-tests/test-applications/cloudflare-workers/worker-configuration.d.ts
rename to dev-packages/e2e-tests/test-applications/cloudflare-workers/src/env.d.ts
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-workers/tests/tsconfig.json b/dev-packages/e2e-tests/test-applications/cloudflare-workers/tests/tsconfig.json
index 9a3b10f6cdc8..80bfbd97acc1 100644
--- a/dev-packages/e2e-tests/test-applications/cloudflare-workers/tests/tsconfig.json
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-workers/tests/tsconfig.json
@@ -3,6 +3,6 @@
   "compilerOptions": {
     "types": ["@cloudflare/vitest-pool-workers"]
   },
-  "include": ["./**/*.ts", "../worker-configuration.d.ts"],
+  "include": ["./**/*.ts"],
   "exclude": []
 }
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-workers/tsconfig.json b/dev-packages/e2e-tests/test-applications/cloudflare-workers/tsconfig.json
index f42019fb0915..87d4bbd5fab8 100644
--- a/dev-packages/e2e-tests/test-applications/cloudflare-workers/tsconfig.json
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-workers/tsconfig.json
@@ -36,8 +36,8 @@
 
     /* Skip type checking all .d.ts files. */
     "skipLibCheck": true,
-    "types": ["./worker-configuration.d.ts"]
+    "types": ["@cloudflare/workers-types/experimental"]
   },
   "exclude": ["test"],
-  "include": ["worker-configuration.d.ts", "src/**/*.ts"]
+  "include": ["src/**/*.ts"]
 }

From 3b0728fcf44e2385b06cfe5ae8228832708e2a4c Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Wed, 26 Nov 2025 09:12:06 +0100
Subject: [PATCH 131/186] fix(node-core): Handle custom scope in log messages
 without parameters (#18322)

Fixes a bug reported in
https://github.com/getsentry/sentry-javascript/issues/18318 where

```js
Sentry.logger.info('Test message', { key: 'value' }, { scope: customScope });
```

would not forward the `customScope` but instead drop the log all
together.
---
 .../suites/public-api/logs/subject.ts         |  27 ++++
 .../suites/public-api/logs/test.ts            | 124 ++++++++++++++++++
 packages/node-core/src/logs/capture.ts        |   6 +-
 packages/node-core/test/logs/exports.test.ts  |  47 +++++++
 4 files changed, 202 insertions(+), 2 deletions(-)
 create mode 100644 dev-packages/node-core-integration-tests/suites/public-api/logs/subject.ts
 create mode 100644 dev-packages/node-core-integration-tests/suites/public-api/logs/test.ts

diff --git a/dev-packages/node-core-integration-tests/suites/public-api/logs/subject.ts b/dev-packages/node-core-integration-tests/suites/public-api/logs/subject.ts
new file mode 100644
index 000000000000..7a1bc01025d8
--- /dev/null
+++ b/dev-packages/node-core-integration-tests/suites/public-api/logs/subject.ts
@@ -0,0 +1,27 @@
+import * as Sentry from '@sentry/node-core';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+
+const client = new Sentry.NodeClient({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  transport: loggingTransport,
+  stackParser: Sentry.defaultStackParser,
+  integrations: [],
+  enableLogs: true,
+  sendDefaultPii: true,
+});
+
+const customScope = new Sentry.Scope();
+customScope.setClient(client);
+customScope.update({ user: { username: 'h4cktor' } });
+client.init();
+
+async function run(): Promise<void> {
+  Sentry.logger.info('test info', { foo: 'bar1' }, { scope: customScope });
+  Sentry.logger.info('test info with %d', [1], { foo: 'bar2' }, { scope: customScope });
+  Sentry.logger.info(Sentry.logger.fmt`test info with fmt ${1}`, { foo: 'bar3' }, { scope: customScope });
+
+  await Sentry.flush();
+}
+
+// eslint-disable-next-line @typescript-eslint/no-floating-promises
+void run();
diff --git a/dev-packages/node-core-integration-tests/suites/public-api/logs/test.ts b/dev-packages/node-core-integration-tests/suites/public-api/logs/test.ts
new file mode 100644
index 000000000000..9469308c1ed6
--- /dev/null
+++ b/dev-packages/node-core-integration-tests/suites/public-api/logs/test.ts
@@ -0,0 +1,124 @@
+import { afterAll, describe, expect, test } from 'vitest';
+import { cleanupChildProcesses, createRunner } from '../../../utils/runner';
+
+describe('logger public API', () => {
+  afterAll(() => {
+    cleanupChildProcesses();
+  });
+
+  test('captures logs with custom scopes and parameters in different forms', async () => {
+    const runner = createRunner(__dirname, 'subject.ts')
+      .expect({
+        log: {
+          items: [
+            {
+              attributes: {
+                foo: {
+                  type: 'string',
+                  value: 'bar1',
+                },
+                'sentry.sdk.name': {
+                  type: 'string',
+                  value: 'sentry.javascript.node',
+                },
+                'sentry.sdk.version': {
+                  type: 'string',
+                  value: expect.any(String),
+                },
+                'server.address': {
+                  type: 'string',
+                  value: 'M6QX4Q5HKV.local',
+                },
+                'user.name': {
+                  type: 'string',
+                  value: 'h4cktor',
+                },
+              },
+              body: 'test info',
+              level: 'info',
+              severity_number: 9,
+              timestamp: expect.any(Number),
+              trace_id: expect.stringMatching(/^[\da-f]{32}$/),
+            },
+            {
+              attributes: {
+                foo: {
+                  type: 'string',
+                  value: 'bar2',
+                },
+                'sentry.message.parameter.0': {
+                  type: 'integer',
+                  value: 1,
+                },
+                'sentry.message.template': {
+                  type: 'string',
+                  value: 'test info with %d',
+                },
+                'sentry.sdk.name': {
+                  type: 'string',
+                  value: 'sentry.javascript.node',
+                },
+                'sentry.sdk.version': {
+                  type: 'string',
+                  value: expect.any(String),
+                },
+                'server.address': {
+                  type: 'string',
+                  value: 'M6QX4Q5HKV.local',
+                },
+                'user.name': {
+                  type: 'string',
+                  value: 'h4cktor',
+                },
+              },
+              body: 'test info with 1',
+              level: 'info',
+              severity_number: 9,
+              timestamp: expect.any(Number),
+              trace_id: expect.stringMatching(/^[\da-f]{32}$/),
+            },
+            {
+              attributes: {
+                foo: {
+                  type: 'string',
+                  value: 'bar3',
+                },
+                'sentry.message.parameter.0': {
+                  type: 'integer',
+                  value: 1,
+                },
+                'sentry.message.template': {
+                  type: 'string',
+                  value: 'test info with fmt %s',
+                },
+                'sentry.sdk.name': {
+                  type: 'string',
+                  value: 'sentry.javascript.node',
+                },
+                'sentry.sdk.version': {
+                  type: 'string',
+                  value: expect.any(String),
+                },
+                'server.address': {
+                  type: 'string',
+                  value: 'M6QX4Q5HKV.local',
+                },
+                'user.name': {
+                  type: 'string',
+                  value: 'h4cktor',
+                },
+              },
+              body: 'test info with fmt 1',
+              level: 'info',
+              severity_number: 9,
+              timestamp: expect.any(Number),
+              trace_id: expect.stringMatching(/^[\da-f]{32}$/),
+            },
+          ],
+        },
+      })
+      .start();
+
+    await runner.completed();
+  });
+});
diff --git a/packages/node-core/src/logs/capture.ts b/packages/node-core/src/logs/capture.ts
index 4c2fdc73a34c..8c77186785ff 100644
--- a/packages/node-core/src/logs/capture.ts
+++ b/packages/node-core/src/logs/capture.ts
@@ -34,7 +34,8 @@ export type CaptureLogArgs = CaptureLogArgWithTemplate | CaptureLogArgWithoutTem
 export function captureLog(level: LogSeverityLevel, ...args: CaptureLogArgs): void {
   const [messageOrMessageTemplate, paramsOrAttributes, maybeAttributesOrMetadata, maybeMetadata] = args;
   if (Array.isArray(paramsOrAttributes)) {
-    const attributes = { ...(maybeAttributesOrMetadata as Log['attributes']) };
+    // type-casting here because from the type definitions we know that `maybeAttributesOrMetadata` is an attributes object (or undefined)
+    const attributes = { ...(maybeAttributesOrMetadata as Log['attributes'] | undefined) };
     attributes['sentry.message.template'] = messageOrMessageTemplate;
     paramsOrAttributes.forEach((param, index) => {
       attributes[`sentry.message.parameter.${index}`] = param;
@@ -44,7 +45,8 @@ export function captureLog(level: LogSeverityLevel, ...args: CaptureLogArgs): vo
   } else {
     _INTERNAL_captureLog(
       { level, message: messageOrMessageTemplate, attributes: paramsOrAttributes },
-      maybeMetadata?.scope,
+      // type-casting here because from the type definitions we know that `maybeAttributesOrMetadata` is a metadata object (or undefined)
+      (maybeAttributesOrMetadata as CaptureLogMetadata | undefined)?.scope ?? maybeMetadata?.scope,
     );
   }
 }
diff --git a/packages/node-core/test/logs/exports.test.ts b/packages/node-core/test/logs/exports.test.ts
index 45da1722abc8..782ba85ee2c0 100644
--- a/packages/node-core/test/logs/exports.test.ts
+++ b/packages/node-core/test/logs/exports.test.ts
@@ -1,4 +1,5 @@
 import * as sentryCore from '@sentry/core';
+import { Scope } from '@sentry/core';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import * as nodeLogger from '../../src/logs/exports';
 
@@ -172,4 +173,50 @@ describe('Node Logger', () => {
       );
     });
   });
+
+  describe('scustom cope', () => {
+    it('calls _INTERNAL_captureLog with custom scope for basic log message', () => {
+      const customScope = new Scope();
+      nodeLogger.debug('User logged in', undefined, { scope: customScope });
+      expect(mockCaptureLog).toHaveBeenCalledWith(
+        {
+          level: 'debug',
+          message: 'User logged in',
+        },
+        customScope,
+      );
+    });
+
+    it('calls _INTERNAL_captureLog with custom scope for parametrized log message', () => {
+      const customScope = new Scope();
+      nodeLogger.debug('User %s logged in from %s', ['Alice', 'mobile'], undefined, { scope: customScope });
+      expect(mockCaptureLog).toHaveBeenCalledWith(
+        {
+          level: 'debug',
+          message: 'User Alice logged in from mobile',
+          attributes: {
+            'sentry.message.template': 'User %s logged in from %s',
+            'sentry.message.parameter.0': 'Alice',
+            'sentry.message.parameter.1': 'mobile',
+          },
+        },
+        customScope,
+      );
+    });
+
+    it('calls _INTERNAL_captureLog with custom scope for fmt log message', () => {
+      const customScope = new Scope();
+      nodeLogger.debug(nodeLogger.fmt`User ${'Alice'} logged in from ${'mobile'}`, undefined, { scope: customScope });
+      expect(mockCaptureLog).toHaveBeenCalledWith(
+        {
+          level: 'debug',
+          message: expect.objectContaining({
+            __sentry_template_string__: 'User %s logged in from %s',
+            __sentry_template_values__: ['Alice', 'mobile'],
+          }),
+        },
+        customScope,
+      );
+    });
+  });
 });

From a3875c527cce90c10ef0d30b90d11517bd701260 Mon Sep 17 00:00:00 2001
From: Onur Temizkan <onur@narval.co.uk>
Date: Wed, 26 Nov 2025 13:42:23 +0000
Subject: [PATCH 132/186] feat(remix): Add parameterized transaction naming for
 routes (#17951)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR adds parameterized routes for Remix SDK, similarly to the NextJS
SDK

Resolves: #16690
_Needs docs PR for the Vite plugin_

Adds automatic parameterization of Remix route IDs for transaction
naming. Converts internal Remix route file patterns to parameterized
paths similar to the other SDKs (`routes/user.$id` -> `/user/:id`).

- Created `sentryRemixVitePlugin` that extracts route information from
Remix builds and generates a manifest file containing route ID to
parameterized route mappings.
- Added `remixRouteParameterization.ts` with regex-based route
conversion that handles dynamic segments (`$param` → `:param`), splat
routes (`$` → `:*`), and nested routes.
- Updated both client and server instrumentation in `performance.tsx`
and `instrumentServer.ts` to use parameterized transaction names.
- It also works with Hydrogen

Vite plugin is used like:

```javascript
// vite.config.ts
import { defineConfig } from 'vite';
import { vitePlugin as remix } from '@remix-run/dev';
import { sentryRemixVitePlugin } from '@sentry/remix';

export default defineConfig({
  plugins: [
    remix(),
    sentryRemixVitePlugin({
      appDirPath: './app', // Default is 'app' in project root
    }),
  ],
});
```

Updated all Remix E2E test applications to expect parameterized route
names. Added new E2E test application `create-remix-app-v2-non-vite` for
testing backward compatibility for non-Vite builds - these continue to
use `routes/user.$id` format.

  ## Summary

| Route File | Example URL | Before | After (Server - All Apps) | After
(Client - Vite Plugin) |

|------------|-------------|--------|---------------------------|------------------------------|
| `_index.tsx` | `/` | `routes/_index` | `/` | `/` |
| `user.$id.tsx` | `/user/123` | `routes/user.$id` | `/user/:id` |
`/user/:id` |
| `users.$userId.posts.$postId.tsx` | `/users/123/posts/456` |
`routes/users.$userId.posts.$postId` | `/users/:userId/posts/:postId` |
`/users/:userId/posts/:postId` |
| `$.tsx` (splat) | `/docs/guide/intro` | `routes/$` | `/:*` | `/:*` |
| `docs.$.tsx` (scoped splat) | `/docs/guide/intro` | `routes/docs.$` |
`/docs/:*` | `/docs/:*` |

  ### Notes
- **Server-side**: Parameterization works automatically for all Remix
apps (Vite, non-Vite, Hydrogen, Express).
- **Client-side**: Requires the Vite plugin. Without it, client
transactions continue using route IDs (e.g., `routes/user.$id`).
---
 .github/workflows/build.yml                   |   2 +-
 .../tests/client-transactions.test.ts         |  20 +-
 .../tests/server-transactions.test.ts         |   2 +-
 .../vite.config.ts                            |   5 +-
 .../tests/client-transactions.test.ts         |   4 +-
 .../tests/server-transactions.test.ts         |   4 +-
 .../create-remix-app-express/vite.config.ts   |   5 +-
 .../create-remix-app-v2-non-vite/.eslintrc.js |   4 +
 .../create-remix-app-v2-non-vite/.gitignore   |   6 +
 .../create-remix-app-v2-non-vite/.npmrc       |   2 +
 .../app/entry.client.tsx                      |  48 ++
 .../app/entry.server.tsx                      | 136 ++++
 .../create-remix-app-v2-non-vite/app/root.tsx |  80 +++
 .../app/routes/_index.tsx                     |  27 +
 .../app/routes/client-error.tsx               |  13 +
 .../app/routes/navigate.tsx                   |  20 +
 .../app/routes/user.$id.tsx                   |   3 +
 .../create-remix-app-v2-non-vite/globals.d.ts |   7 +
 .../instrument.server.cjs                     |   8 +
 .../create-remix-app-v2-non-vite/package.json |  39 ++
 .../playwright.config.mjs                     |   8 +
 .../remix.config.js                           |   9 +
 .../remix.env.d.ts                            |   2 +
 .../start-event-proxy.mjs                     |   6 +
 .../tests/client-errors.test.ts               |  29 +
 .../tests/client-transactions.test.ts         |  57 ++
 .../tests/server-transactions.test.ts         |  58 ++
 .../tsconfig.json                             |  22 +
 .../create-remix-app-v2/package.json          |   9 +-
 .../tests/client-transactions.test.ts         |   4 +-
 .../tests/server-transactions.test.ts         |   2 +-
 .../create-remix-app-v2/vite.config.ts        |  15 +
 .../tests/client-transactions.test.ts         |   6 +-
 .../tests/server-transactions.test.ts         |   4 +-
 .../remix-hydrogen/vite.config.ts             |   2 +
 packages/cloudflare/src/request.ts            |   4 +
 packages/remix/src/client/performance.tsx     |  58 +-
 .../src/client/remixRouteParameterization.ts  | 165 +++++
 .../src/config/createRemixRouteManifest.ts    | 249 +++++++
 .../remix/src/config/remixRouteManifest.ts    |  33 +
 packages/remix/src/config/vite.ts             | 174 +++++
 packages/remix/src/index.server.ts            |   5 +
 packages/remix/src/server/instrumentServer.ts |  65 +-
 packages/remix/src/utils/utils.ts             |  80 ++-
 .../client/remixRouteParameterization.test.ts | 416 ++++++++++++
 .../manifest/createRemixRouteManifest.test.ts | 227 +++++++
 packages/remix/test/config/vite.test.ts       | 629 ++++++++++++++++++
 .../app/routes/api.v1.data.$id.tsx            |  10 +
 .../routes/deeply.$nested.$structure.$id.tsx  |  26 +
 .../app/routes/manual-tracing.$id.tsx         |  14 +-
 .../products.$productId.reviews.$reviewId.tsx |  24 +
 .../routes/users.$userId.posts.$postId.tsx    |  24 +
 packages/remix/test/integration/package.json  |   9 +-
 .../regexPatternValidation.test.ts            | 235 +++++++
 .../remix/test/integration/remix.config.js    |   7 -
 .../routeConversionConsistency.test.ts        | 188 ++++++
 .../test/client/capture-exception.test.ts     |   2 +-
 .../test/client/capture-message.test.ts       |   2 +-
 .../test/client/errorboundary.test.ts         |   4 +-
 .../test/client/manualtracing.test.ts         |   2 +-
 .../client/navigation-transactions.test.ts    |  72 ++
 .../integration/test/client/pageload.test.ts  |   4 +-
 .../test/client/root-loader.test.ts           |  91 +--
 .../instrumentation/nested-routes.test.ts     | 128 ++++
 .../integration/test/server/utils/helpers.ts  |   3 +-
 packages/remix/test/integration/tsconfig.json |  13 +-
 .../remix/test/integration/vite.config.ts     |  42 ++
 packages/remix/test/utils/utils.test.ts       | 183 +++++
 68 files changed, 3702 insertions(+), 154 deletions(-)
 create mode 100644 dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/.eslintrc.js
 create mode 100644 dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/.gitignore
 create mode 100644 dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/.npmrc
 create mode 100644 dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/app/entry.client.tsx
 create mode 100644 dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/app/entry.server.tsx
 create mode 100644 dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/app/root.tsx
 create mode 100644 dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/app/routes/_index.tsx
 create mode 100644 dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/app/routes/client-error.tsx
 create mode 100644 dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/app/routes/navigate.tsx
 create mode 100644 dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/app/routes/user.$id.tsx
 create mode 100644 dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/globals.d.ts
 create mode 100644 dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/instrument.server.cjs
 create mode 100644 dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/package.json
 create mode 100644 dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/playwright.config.mjs
 create mode 100644 dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/remix.config.js
 create mode 100644 dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/remix.env.d.ts
 create mode 100644 dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/start-event-proxy.mjs
 create mode 100644 dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/tests/client-errors.test.ts
 create mode 100644 dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/tests/client-transactions.test.ts
 create mode 100644 dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/tests/server-transactions.test.ts
 create mode 100644 dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/tsconfig.json
 create mode 100644 dev-packages/e2e-tests/test-applications/create-remix-app-v2/vite.config.ts
 create mode 100644 packages/remix/src/client/remixRouteParameterization.ts
 create mode 100644 packages/remix/src/config/createRemixRouteManifest.ts
 create mode 100644 packages/remix/src/config/remixRouteManifest.ts
 create mode 100644 packages/remix/src/config/vite.ts
 create mode 100644 packages/remix/test/client/remixRouteParameterization.test.ts
 create mode 100644 packages/remix/test/config/manifest/createRemixRouteManifest.test.ts
 create mode 100644 packages/remix/test/config/vite.test.ts
 create mode 100644 packages/remix/test/integration/app/routes/api.v1.data.$id.tsx
 create mode 100644 packages/remix/test/integration/app/routes/deeply.$nested.$structure.$id.tsx
 create mode 100644 packages/remix/test/integration/app/routes/products.$productId.reviews.$reviewId.tsx
 create mode 100644 packages/remix/test/integration/app/routes/users.$userId.posts.$postId.tsx
 create mode 100644 packages/remix/test/integration/regexPatternValidation.test.ts
 delete mode 100644 packages/remix/test/integration/remix.config.js
 create mode 100644 packages/remix/test/integration/routeConversionConsistency.test.ts
 create mode 100644 packages/remix/test/integration/test/client/navigation-transactions.test.ts
 create mode 100644 packages/remix/test/integration/test/server/instrumentation/nested-routes.test.ts
 create mode 100644 packages/remix/test/integration/vite.config.ts
 create mode 100644 packages/remix/test/utils/utils.test.ts

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 881b5f4b6580..7c5d801c5f6a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -810,7 +810,7 @@ jobs:
     needs: [job_get_metadata, job_build]
     if: needs.job_build.outputs.changed_remix == 'true' || github.event_name != 'pull_request'
     runs-on: ubuntu-24.04
-    timeout-minutes: 10
+    timeout-minutes: 15
     strategy:
       fail-fast: false
       matrix:
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/tests/client-transactions.test.ts b/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/tests/client-transactions.test.ts
index 9a5caf46fd66..d85d9d82747d 100644
--- a/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/tests/client-transactions.test.ts
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/tests/client-transactions.test.ts
@@ -3,7 +3,7 @@ import { waitForTransaction } from '@sentry-internal/test-utils';
 
 test('Sends a pageload transaction to Sentry', async ({ page }) => {
   const transactionPromise = waitForTransaction('create-remix-app-express-vite-dev', transactionEvent => {
-    return transactionEvent.contexts?.trace?.op === 'pageload' && transactionEvent.transaction === 'routes/_index';
+    return transactionEvent.contexts?.trace?.op === 'pageload' && transactionEvent.transaction === '/';
   });
 
   await page.goto('/');
@@ -15,7 +15,7 @@ test('Sends a pageload transaction to Sentry', async ({ page }) => {
 
 test('Sends a navigation transaction to Sentry', async ({ page }) => {
   const transactionPromise = waitForTransaction('create-remix-app-express-vite-dev', transactionEvent => {
-    return transactionEvent.contexts?.trace?.op === 'navigation' && transactionEvent.transaction === 'routes/user.$id';
+    return transactionEvent.contexts?.trace?.op === 'navigation' && transactionEvent.transaction === '/user/:id';
   });
 
   await page.goto('/');
@@ -28,6 +28,22 @@ test('Sends a navigation transaction to Sentry', async ({ page }) => {
   expect(transactionEvent).toBeDefined();
 });
 
+test('Sends a navigation transaction with parameterized route to Sentry', async ({ page }) => {
+  const transactionPromise = waitForTransaction('create-remix-app-express-vite-dev', transactionEvent => {
+    return transactionEvent.contexts?.trace?.op === 'navigation';
+  });
+
+  await page.goto('/');
+
+  const linkElement = page.locator('id=navigation');
+  await linkElement.click();
+
+  const transactionEvent = await transactionPromise;
+
+  expect(transactionEvent).toBeDefined();
+  expect(transactionEvent.transaction).toBeTruthy();
+});
+
 test('Renders `sentry-trace` and `baggage` meta tags for the root route', async ({ page }) => {
   await page.goto('/');
 
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/tests/server-transactions.test.ts b/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/tests/server-transactions.test.ts
index 58e81eeee529..4213aae3e3de 100644
--- a/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/tests/server-transactions.test.ts
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/tests/server-transactions.test.ts
@@ -48,7 +48,7 @@ test('Sends two linked transactions (server & client) to Sentry', async ({ page
   const pageLoadParentSpanId = pageloadTransaction.contexts?.trace?.parent_span_id;
 
   expect(httpServerTransaction.transaction).toBe('GET http://localhost:3030/');
-  expect(pageloadTransaction.transaction).toBe('routes/_index');
+  expect(pageloadTransaction.transaction).toBe('/');
 
   expect(httpServerTraceId).toBeDefined();
   expect(httpServerSpanId).toBeDefined();
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/vite.config.ts b/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/vite.config.ts
index 13de9243b22a..6ebb8eacc6a5 100644
--- a/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/vite.config.ts
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/vite.config.ts
@@ -1,14 +1,15 @@
+import { installGlobals } from '@remix-run/node';
 import { vitePlugin as remix } from '@remix-run/dev';
+import { sentryRemixVitePlugin } from '@sentry/remix';
 import { defineConfig } from 'vite';
 import tsconfigPaths from 'vite-tsconfig-paths';
 
-import { installGlobals } from '@remix-run/node';
-
 installGlobals();
 
 export default defineConfig({
   plugins: [
     remix(),
+    sentryRemixVitePlugin(),
     tsconfigPaths({
       // The dev server config errors are not relevant to this test app
       // https://github.com/aleclarson/vite-tsconfig-paths?tab=readme-ov-file#options
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-express/tests/client-transactions.test.ts b/dev-packages/e2e-tests/test-applications/create-remix-app-express/tests/client-transactions.test.ts
index a06aa02ceb9c..68237301b635 100644
--- a/dev-packages/e2e-tests/test-applications/create-remix-app-express/tests/client-transactions.test.ts
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-express/tests/client-transactions.test.ts
@@ -3,7 +3,7 @@ import { waitForTransaction } from '@sentry-internal/test-utils';
 
 test('Sends a pageload transaction to Sentry', async ({ page }) => {
   const transactionPromise = waitForTransaction('create-remix-app-express', transactionEvent => {
-    return transactionEvent.contexts?.trace?.op === 'pageload' && transactionEvent.transaction === 'routes/_index';
+    return transactionEvent.contexts?.trace?.op === 'pageload' && transactionEvent.transaction === '/';
   });
 
   await page.goto('/');
@@ -15,7 +15,7 @@ test('Sends a pageload transaction to Sentry', async ({ page }) => {
 
 test('Sends a navigation transaction to Sentry', async ({ page }) => {
   const transactionPromise = waitForTransaction('create-remix-app-express', transactionEvent => {
-    return transactionEvent.contexts?.trace?.op === 'navigation' && transactionEvent.transaction === 'routes/user.$id';
+    return transactionEvent.contexts?.trace?.op === 'navigation' && transactionEvent.transaction === '/user/:id';
   });
 
   await page.goto('/');
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-express/tests/server-transactions.test.ts b/dev-packages/e2e-tests/test-applications/create-remix-app-express/tests/server-transactions.test.ts
index d57c45545caf..ddb866e5dbaa 100644
--- a/dev-packages/e2e-tests/test-applications/create-remix-app-express/tests/server-transactions.test.ts
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-express/tests/server-transactions.test.ts
@@ -90,7 +90,7 @@ test('Propagates trace when ErrorBoundary is triggered', async ({ page }) => {
   const pageLoadParentSpanId = pageloadTransaction.contexts?.trace?.parent_span_id;
 
   expect(httpServerTransaction.transaction).toBe('GET client-error');
-  expect(pageloadTransaction.transaction).toBe('routes/client-error');
+  expect(pageloadTransaction.transaction).toBe('/client-error');
 
   expect(httpServerTraceId).toBeDefined();
   expect(httpServerSpanId).toBeDefined();
@@ -132,7 +132,7 @@ test('Sends two linked transactions (server & client) to Sentry', async ({ page
   const pageLoadParentSpanId = pageloadTransaction.contexts?.trace?.parent_span_id;
 
   expect(httpServerTransaction.transaction).toBe('GET http://localhost:3030/');
-  expect(pageloadTransaction.transaction).toBe('routes/_index');
+  expect(pageloadTransaction.transaction).toBe('/');
 
   expect(httpServerTraceId).toBeDefined();
   expect(httpServerSpanId).toBeDefined();
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-express/vite.config.ts b/dev-packages/e2e-tests/test-applications/create-remix-app-express/vite.config.ts
index 13de9243b22a..6ebb8eacc6a5 100644
--- a/dev-packages/e2e-tests/test-applications/create-remix-app-express/vite.config.ts
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-express/vite.config.ts
@@ -1,14 +1,15 @@
+import { installGlobals } from '@remix-run/node';
 import { vitePlugin as remix } from '@remix-run/dev';
+import { sentryRemixVitePlugin } from '@sentry/remix';
 import { defineConfig } from 'vite';
 import tsconfigPaths from 'vite-tsconfig-paths';
 
-import { installGlobals } from '@remix-run/node';
-
 installGlobals();
 
 export default defineConfig({
   plugins: [
     remix(),
+    sentryRemixVitePlugin(),
     tsconfigPaths({
       // The dev server config errors are not relevant to this test app
       // https://github.com/aleclarson/vite-tsconfig-paths?tab=readme-ov-file#options
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/.eslintrc.js b/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/.eslintrc.js
new file mode 100644
index 000000000000..f2faf1470fd8
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/.eslintrc.js
@@ -0,0 +1,4 @@
+/** @type {import('eslint').Linter.Config} */
+module.exports = {
+  extends: ['@remix-run/eslint-config', '@remix-run/eslint-config/node'],
+};
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/.gitignore b/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/.gitignore
new file mode 100644
index 000000000000..3f7bf98da3e1
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/.gitignore
@@ -0,0 +1,6 @@
+node_modules
+
+/.cache
+/build
+/public/build
+.env
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/.npmrc b/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/.npmrc
new file mode 100644
index 000000000000..070f80f05092
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/.npmrc
@@ -0,0 +1,2 @@
+@sentry:registry=http://127.0.0.1:4873
+@sentry-internal:registry=http://127.0.0.1:4873
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/app/entry.client.tsx b/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/app/entry.client.tsx
new file mode 100644
index 000000000000..f540f3c35c1d
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/app/entry.client.tsx
@@ -0,0 +1,48 @@
+/**
+ * By default, Remix will handle hydrating your app on the client for you.
+ * You are free to delete this file if you'd like to, but if you ever want it revealed again, you can run `npx remix reveal` ✨
+ * For more information, see https://remix.run/file-conventions/entry.client
+ */
+
+// Extend the Window interface to include ENV
+declare global {
+  interface Window {
+    ENV: {
+      SENTRY_DSN: string;
+      [key: string]: unknown;
+    };
+  }
+}
+
+import { RemixBrowser, useLocation, useMatches } from '@remix-run/react';
+import * as Sentry from '@sentry/remix';
+import { StrictMode, startTransition, useEffect } from 'react';
+import { hydrateRoot } from 'react-dom/client';
+
+Sentry.init({
+  environment: 'qa', // dynamic sampling bias to keep transactions
+  dsn: window.ENV.SENTRY_DSN,
+  integrations: [
+    Sentry.browserTracingIntegration({
+      useEffect,
+      useLocation,
+      useMatches,
+    }),
+    Sentry.replayIntegration(),
+  ],
+  // Performance Monitoring
+  tracesSampleRate: 1.0, // Capture 100% of the transactions, reduce in production!
+  // Session Replay
+  replaysSessionSampleRate: 0.1, // This sets the sample rate at 10%. You may want to change it to 100% while in development and then sample at a lower rate in production.
+  replaysOnErrorSampleRate: 1.0, // If you're not already sampling the entire session, change the sample rate to 100% when sampling sessions where errors occur.
+  tunnel: 'http://localhost:3032/', // proxy server
+});
+
+startTransition(() => {
+  hydrateRoot(
+    document,
+    <StrictMode>
+      <RemixBrowser />
+    </StrictMode>,
+  );
+});
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/app/entry.server.tsx b/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/app/entry.server.tsx
new file mode 100644
index 000000000000..41974897eeae
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/app/entry.server.tsx
@@ -0,0 +1,136 @@
+/**
+ * By default, Remix will handle generating the HTTP Response for you.
+ * You are free to delete this file if you'd like to, but if you ever want it revealed again, you can run `npx remix reveal` ✨
+ * For more information, see https://remix.run/file-conventions/entry.server
+ */
+
+import { PassThrough } from 'node:stream';
+
+import type { AppLoadContext, EntryContext } from '@remix-run/node';
+import { createReadableStreamFromReadable } from '@remix-run/node';
+import { installGlobals } from '@remix-run/node';
+import { RemixServer } from '@remix-run/react';
+import isbot from 'isbot';
+import { renderToPipeableStream } from 'react-dom/server';
+import * as Sentry from '@sentry/remix';
+
+installGlobals();
+
+const ABORT_DELAY = 5_000;
+
+Sentry.init({
+  environment: 'qa', // dynamic sampling bias to keep transactions
+  dsn: process.env.E2E_TEST_DSN,
+  tunnel: 'http://localhost:3031/', // proxy server
+  tracesSampleRate: 1.0, // Capture 100% of the transactions, reduce in production!
+});
+
+const handleErrorImpl = () => {
+  Sentry.setTag('remix-test-tag', 'remix-test-value');
+};
+
+export const handleError = Sentry.wrapHandleErrorWithSentry(handleErrorImpl);
+
+export default function handleRequest(
+  request: Request,
+  responseStatusCode: number,
+  responseHeaders: Headers,
+  remixContext: EntryContext,
+  loadContext: AppLoadContext,
+) {
+  return isbot(request.headers.get('user-agent'))
+    ? handleBotRequest(request, responseStatusCode, responseHeaders, remixContext)
+    : handleBrowserRequest(request, responseStatusCode, responseHeaders, remixContext);
+}
+
+function handleBotRequest(
+  request: Request,
+  responseStatusCode: number,
+  responseHeaders: Headers,
+  remixContext: EntryContext,
+) {
+  return new Promise((resolve, reject) => {
+    let shellRendered = false;
+    const { pipe, abort } = renderToPipeableStream(
+      <RemixServer context={remixContext} url={request.url} abortDelay={ABORT_DELAY} />,
+      {
+        onAllReady() {
+          shellRendered = true;
+          const body = new PassThrough();
+          const stream = createReadableStreamFromReadable(body);
+
+          responseHeaders.set('Content-Type', 'text/html');
+
+          resolve(
+            new Response(stream, {
+              headers: responseHeaders,
+              status: responseStatusCode,
+            }),
+          );
+
+          pipe(body);
+        },
+        onShellError(error: unknown) {
+          reject(error);
+        },
+        onError(error: unknown) {
+          responseStatusCode = 500;
+          // Log streaming rendering errors from inside the shell.  Don't log
+          // errors encountered during initial shell rendering since they'll
+          // reject and get logged in handleDocumentRequest.
+          if (shellRendered) {
+            console.error(error);
+          }
+        },
+      },
+    );
+
+    setTimeout(abort, ABORT_DELAY);
+  });
+}
+
+function handleBrowserRequest(
+  request: Request,
+  responseStatusCode: number,
+  responseHeaders: Headers,
+  remixContext: EntryContext,
+) {
+  return new Promise((resolve, reject) => {
+    let shellRendered = false;
+    const { pipe, abort } = renderToPipeableStream(
+      <RemixServer context={remixContext} url={request.url} abortDelay={ABORT_DELAY} />,
+      {
+        onShellReady() {
+          shellRendered = true;
+          const body = new PassThrough();
+          const stream = createReadableStreamFromReadable(body);
+
+          responseHeaders.set('Content-Type', 'text/html');
+
+          resolve(
+            new Response(stream, {
+              headers: responseHeaders,
+              status: responseStatusCode,
+            }),
+          );
+
+          pipe(body);
+        },
+        onShellError(error: unknown) {
+          reject(error);
+        },
+        onError(error: unknown) {
+          responseStatusCode = 500;
+          // Log streaming rendering errors from inside the shell.  Don't log
+          // errors encountered during initial shell rendering since they'll
+          // reject and get logged in handleDocumentRequest.
+          if (shellRendered) {
+            console.error(error);
+          }
+        },
+      },
+    );
+
+    setTimeout(abort, ABORT_DELAY);
+  });
+}
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/app/root.tsx b/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/app/root.tsx
new file mode 100644
index 000000000000..517a37a9d76b
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/app/root.tsx
@@ -0,0 +1,80 @@
+import { cssBundleHref } from '@remix-run/css-bundle';
+import { LinksFunction, MetaFunction, json } from '@remix-run/node';
+import {
+  Links,
+  LiveReload,
+  Meta,
+  Outlet,
+  Scripts,
+  ScrollRestoration,
+  useLoaderData,
+  useRouteError,
+} from '@remix-run/react';
+import { captureRemixErrorBoundaryError, withSentry } from '@sentry/remix';
+import type { SentryMetaArgs } from '@sentry/remix';
+
+export const links: LinksFunction = () => [...(cssBundleHref ? [{ rel: 'stylesheet', href: cssBundleHref }] : [])];
+
+export const loader = () => {
+  return json({
+    ENV: {
+      SENTRY_DSN: process.env.E2E_TEST_DSN,
+    },
+  });
+};
+
+export const meta = ({ data }: SentryMetaArgs<MetaFunction<typeof loader>>) => {
+  return [
+    {
+      env: data.ENV,
+    },
+    {
+      name: 'sentry-trace',
+      content: data.sentryTrace,
+    },
+    {
+      name: 'baggage',
+      content: data.sentryBaggage,
+    },
+  ];
+};
+
+export function ErrorBoundary() {
+  const error = useRouteError();
+  const eventId = captureRemixErrorBoundaryError(error);
+
+  return (
+    <div>
+      <span>ErrorBoundary Error</span>
+      <span id="event-id">{eventId}</span>
+    </div>
+  );
+}
+
+function App() {
+  const { ENV } = useLoaderData();
+
+  return (
+    <html lang="en">
+      <head>
+        <meta charSet="utf-8" />
+        <meta name="viewport" content="width=device-width,initial-scale=1" />
+        <script
+          dangerouslySetInnerHTML={{
+            __html: `window.ENV = ${JSON.stringify(ENV)}`,
+          }}
+        />
+        <Meta />
+        <Links />
+      </head>
+      <body>
+        <Outlet />
+        <ScrollRestoration />
+        <Scripts />
+        <LiveReload />
+      </body>
+    </html>
+  );
+}
+
+export default withSentry(App);
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/app/routes/_index.tsx b/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/app/routes/_index.tsx
new file mode 100644
index 000000000000..b646c62ee4da
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/app/routes/_index.tsx
@@ -0,0 +1,27 @@
+import { Link, useSearchParams } from '@remix-run/react';
+import * as Sentry from '@sentry/remix';
+
+export default function Index() {
+  const [searchParams] = useSearchParams();
+
+  if (searchParams.get('tag')) {
+    Sentry.setTag('sentry_test', searchParams.get('tag'));
+  }
+
+  return (
+    <div>
+      <input
+        type="button"
+        value="Capture Exception"
+        id="exception-button"
+        onClick={() => {
+          const eventId = Sentry.captureException(new Error('I am an error!'));
+          window.capturedExceptionId = eventId;
+        }}
+      />
+      <Link to="/user/5" id="navigation">
+        navigate
+      </Link>
+    </div>
+  );
+}
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/app/routes/client-error.tsx b/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/app/routes/client-error.tsx
new file mode 100644
index 000000000000..4e5330621191
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/app/routes/client-error.tsx
@@ -0,0 +1,13 @@
+import { useState } from 'react';
+
+export default function ErrorBoundaryCapture() {
+  const [count, setCount] = useState(0);
+
+  if (count > 0) {
+    throw new Error('Sentry React Component Error');
+  } else {
+    setTimeout(() => setCount(count + 1), 0);
+  }
+
+  return <div>{count}</div>;
+}
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/app/routes/navigate.tsx b/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/app/routes/navigate.tsx
new file mode 100644
index 000000000000..c7dcea798501
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/app/routes/navigate.tsx
@@ -0,0 +1,20 @@
+import { LoaderFunction } from '@remix-run/node';
+import { useLoaderData } from '@remix-run/react';
+
+export const loader: LoaderFunction = async ({ params: { id } }) => {
+  if (id === '-1') {
+    throw new Error('Unexpected Server Error');
+  }
+
+  return null;
+};
+
+export default function LoaderError() {
+  const data = useLoaderData();
+
+  return (
+    <div>
+      <h1>{data && data.test ? data.test : 'Not Found'}</h1>
+    </div>
+  );
+}
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/app/routes/user.$id.tsx b/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/app/routes/user.$id.tsx
new file mode 100644
index 000000000000..13b2e0a34d1e
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/app/routes/user.$id.tsx
@@ -0,0 +1,3 @@
+export default function User() {
+  return <div>I am a blank page</div>;
+}
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/globals.d.ts b/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/globals.d.ts
new file mode 100644
index 000000000000..4130ac6a8a09
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/globals.d.ts
@@ -0,0 +1,7 @@
+interface Window {
+  recordedTransactions?: string[];
+  capturedExceptionId?: string;
+  ENV: {
+    SENTRY_DSN: string;
+  };
+}
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/instrument.server.cjs b/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/instrument.server.cjs
new file mode 100644
index 000000000000..557ab8d18f17
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/instrument.server.cjs
@@ -0,0 +1,8 @@
+const Sentry = require('@sentry/remix');
+
+Sentry.init({
+  tracesSampleRate: 1.0, // Capture 100% of the transactions, reduce in production!
+  environment: 'qa', // dynamic sampling bias to keep transactions
+  dsn: process.env.E2E_TEST_DSN,
+  tunnel: 'http://localhost:3032/', // proxy server
+});
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/package.json b/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/package.json
new file mode 100644
index 000000000000..57b106540701
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/package.json
@@ -0,0 +1,39 @@
+{
+  "private": true,
+  "sideEffects": false,
+  "scripts": {
+    "build": "remix build",
+    "dev": "remix dev",
+    "start": "NODE_OPTIONS='--require=./instrument.server.cjs' remix-serve build/index.js",
+    "typecheck": "tsc",
+    "clean": "npx rimraf node_modules pnpm-lock.yaml",
+    "test:build": "pnpm install && npx playwright install && pnpm build",
+    "test:assert": "pnpm playwright test"
+  },
+  "dependencies": {
+    "@sentry/remix": "latest || *",
+    "@remix-run/css-bundle": "2.7.2",
+    "@remix-run/node": "2.7.2",
+    "@remix-run/react": "2.7.2",
+    "@remix-run/serve": "2.7.2",
+    "isbot": "^3.6.8",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
+  },
+  "devDependencies": {
+    "@playwright/test": "~1.53.2",
+    "@sentry-internal/test-utils": "link:../../../test-utils",
+    "@remix-run/dev": "2.7.2",
+    "@remix-run/eslint-config": "2.7.2",
+    "@types/react": "^18.0.35",
+    "@types/react-dom": "^18.0.11",
+    "eslint": "^8.38.0",
+    "typescript": "^5.0.4"
+  },
+  "resolutions": {
+    "@types/react": "18.2.22"
+  },
+  "volta": {
+    "extends": "../../package.json"
+  }
+}
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/playwright.config.mjs b/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/playwright.config.mjs
new file mode 100644
index 000000000000..ff07870b17cb
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/playwright.config.mjs
@@ -0,0 +1,8 @@
+import { getPlaywrightConfig } from '@sentry-internal/test-utils';
+
+const config = getPlaywrightConfig({
+  startCommand: `pnpm start`,
+  eventProxyPort: 3032,
+});
+
+export default config;
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/remix.config.js b/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/remix.config.js
new file mode 100644
index 000000000000..cb3c8c7a9fb7
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/remix.config.js
@@ -0,0 +1,9 @@
+/** @type {import('@remix-run/dev').AppConfig} */
+module.exports = {
+  ignoredRouteFiles: ['**/.*'],
+  // appDirectory: 'app',
+  // assetsBuildDirectory: 'public/build',
+  // serverBuildPath: 'build/index.js',
+  // publicPath: '/build/',
+  serverModuleFormat: 'cjs',
+};
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/remix.env.d.ts b/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/remix.env.d.ts
new file mode 100644
index 000000000000..dcf8c45e1d4c
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/remix.env.d.ts
@@ -0,0 +1,2 @@
+/// <reference types="@remix-run/dev" />
+/// <reference types="@remix-run/node" />
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/start-event-proxy.mjs b/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/start-event-proxy.mjs
new file mode 100644
index 000000000000..5bb1c1618659
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/start-event-proxy.mjs
@@ -0,0 +1,6 @@
+import { startEventProxyServer } from '@sentry-internal/test-utils';
+
+startEventProxyServer({
+  port: 3032,
+  proxyServerName: 'create-remix-app-v2-non-vite',
+});
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/tests/client-errors.test.ts b/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/tests/client-errors.test.ts
new file mode 100644
index 000000000000..a3aff46d47e3
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/tests/client-errors.test.ts
@@ -0,0 +1,29 @@
+import { expect, test } from '@playwright/test';
+import { waitForError } from '@sentry-internal/test-utils';
+
+test('Sends a client-side exception to Sentry', async ({ page }) => {
+  const errorPromise = waitForError('create-remix-app-v2-non-vite', errorEvent => {
+    return errorEvent.exception?.values?.[0].value === 'I am an error!';
+  });
+
+  await page.goto('/');
+
+  const exceptionButton = page.locator('id=exception-button');
+  await exceptionButton.click();
+
+  const errorEvent = await errorPromise;
+
+  expect(errorEvent).toBeDefined();
+});
+
+test('Sends a client-side ErrorBoundary exception to Sentry', async ({ page }) => {
+  const errorPromise = waitForError('create-remix-app-v2-non-vite', errorEvent => {
+    return errorEvent.exception?.values?.[0].value === 'Sentry React Component Error';
+  });
+
+  await page.goto('/client-error');
+
+  const errorEvent = await errorPromise;
+
+  expect(errorEvent).toBeDefined();
+});
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/tests/client-transactions.test.ts b/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/tests/client-transactions.test.ts
new file mode 100644
index 000000000000..cf5098686759
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/tests/client-transactions.test.ts
@@ -0,0 +1,57 @@
+import { expect, test } from '@playwright/test';
+import { waitForTransaction } from '@sentry-internal/test-utils';
+
+test('Sends a pageload transaction to Sentry', async ({ page }) => {
+  const transactionPromise = waitForTransaction('create-remix-app-v2-non-vite', transactionEvent => {
+    return transactionEvent.contexts?.trace?.op === 'pageload' && transactionEvent.transaction === 'routes/_index';
+  });
+
+  await page.goto('/');
+
+  const transactionEvent = await transactionPromise;
+
+  expect(transactionEvent).toBeDefined();
+});
+
+test('Sends a navigation transaction to Sentry', async ({ page }) => {
+  const transactionPromise = waitForTransaction('create-remix-app-v2-non-vite', transactionEvent => {
+    return transactionEvent.contexts?.trace?.op === 'navigation' && transactionEvent.transaction === 'routes/user.$id';
+  });
+
+  await page.goto('/');
+
+  const linkElement = page.locator('id=navigation');
+  await linkElement.click();
+
+  const transactionEvent = await transactionPromise;
+
+  expect(transactionEvent).toBeDefined();
+});
+
+test('Renders `sentry-trace` and `baggage` meta tags for the root route', async ({ page }) => {
+  await page.goto('/');
+
+  const sentryTraceMetaTag = await page.waitForSelector('meta[name="sentry-trace"]', {
+    state: 'attached',
+  });
+  const baggageMetaTag = await page.waitForSelector('meta[name="baggage"]', {
+    state: 'attached',
+  });
+
+  expect(sentryTraceMetaTag).toBeTruthy();
+  expect(baggageMetaTag).toBeTruthy();
+});
+
+test('Renders `sentry-trace` and `baggage` meta tags for a sub-route', async ({ page }) => {
+  await page.goto('/user/123');
+
+  const sentryTraceMetaTag = await page.waitForSelector('meta[name="sentry-trace"]', {
+    state: 'attached',
+  });
+  const baggageMetaTag = await page.waitForSelector('meta[name="baggage"]', {
+    state: 'attached',
+  });
+
+  expect(sentryTraceMetaTag).toBeTruthy();
+  expect(baggageMetaTag).toBeTruthy();
+});
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/tests/server-transactions.test.ts b/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/tests/server-transactions.test.ts
new file mode 100644
index 000000000000..e624c578ce19
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/tests/server-transactions.test.ts
@@ -0,0 +1,58 @@
+import { expect, test } from '@playwright/test';
+import { waitForTransaction } from '@sentry-internal/test-utils';
+
+test.describe.configure({ mode: 'serial' });
+
+test('Sends parameterized transaction name to Sentry', async ({ page }) => {
+  const transactionPromise = waitForTransaction('create-remix-app-v2-non-vite', transactionEvent => {
+    return transactionEvent.contexts?.trace?.op === 'http.server';
+  });
+
+  await page.goto('/user/123');
+
+  const transaction = await transactionPromise;
+
+  expect(transaction).toBeDefined();
+  expect(transaction.transaction).toBe('GET user/:id');
+});
+
+test('Sends two linked transactions (server & client) to Sentry', async ({ page }) => {
+  // We use this to identify the transactions
+  const testTag = crypto.randomUUID();
+
+  const httpServerTransactionPromise = waitForTransaction('create-remix-app-v2-non-vite', transactionEvent => {
+    return transactionEvent.contexts?.trace?.op === 'http.server' && transactionEvent.tags?.['sentry_test'] === testTag;
+  });
+
+  const pageLoadTransactionPromise = waitForTransaction('create-remix-app-v2-non-vite', transactionEvent => {
+    return transactionEvent.contexts?.trace?.op === 'pageload' && transactionEvent.tags?.['sentry_test'] === testTag;
+  });
+
+  page.goto(`/?tag=${testTag}`);
+
+  const pageloadTransaction = await pageLoadTransactionPromise;
+  const httpServerTransaction = await httpServerTransactionPromise;
+
+  expect(pageloadTransaction).toBeDefined();
+  expect(httpServerTransaction).toBeDefined();
+
+  const httpServerTraceId = httpServerTransaction.contexts?.trace?.trace_id;
+  const httpServerSpanId = httpServerTransaction.contexts?.trace?.span_id;
+  const loaderSpanId = httpServerTransaction?.spans?.find(
+    span => span.data && span.data['code.function'] === 'loader',
+  )?.span_id;
+
+  const pageLoadTraceId = pageloadTransaction.contexts?.trace?.trace_id;
+  const pageLoadSpanId = pageloadTransaction.contexts?.trace?.span_id;
+  const pageLoadParentSpanId = pageloadTransaction.contexts?.trace?.parent_span_id;
+
+  expect(httpServerTransaction.transaction).toBe('GET http://localhost:3030/');
+  expect(pageloadTransaction.transaction).toBe('routes/_index');
+
+  expect(httpServerTraceId).toBeDefined();
+  expect(httpServerSpanId).toBeDefined();
+
+  expect(pageLoadTraceId).toEqual(httpServerTraceId);
+  expect(pageLoadParentSpanId).toEqual(loaderSpanId);
+  expect(pageLoadSpanId).not.toEqual(httpServerSpanId);
+});
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/tsconfig.json b/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/tsconfig.json
new file mode 100644
index 000000000000..20f8a386a6c4
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-v2-non-vite/tsconfig.json
@@ -0,0 +1,22 @@
+{
+  "include": ["remix.env.d.ts", "**/*.ts", "**/*.tsx"],
+  "compilerOptions": {
+    "lib": ["DOM", "DOM.Iterable", "ES2019"],
+    "isolatedModules": true,
+    "esModuleInterop": true,
+    "jsx": "react-jsx",
+    "moduleResolution": "node",
+    "resolveJsonModule": true,
+    "target": "ES2019",
+    "strict": true,
+    "allowJs": true,
+    "forceConsistentCasingInFileNames": true,
+    "baseUrl": ".",
+    "paths": {
+      "~/*": ["./app/*"]
+    },
+
+    // Remix takes care of building everything in `remix build`.
+    "noEmit": true
+  }
+}
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-v2/package.json b/dev-packages/e2e-tests/test-applications/create-remix-app-v2/package.json
index 47454c27e22b..535264a09978 100644
--- a/dev-packages/e2e-tests/test-applications/create-remix-app-v2/package.json
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-v2/package.json
@@ -2,9 +2,9 @@
   "private": true,
   "sideEffects": false,
   "scripts": {
-    "build": "remix build && pnpm typecheck",
-    "dev": "remix dev",
-    "start": "NODE_OPTIONS='--require=./instrument.server.cjs' remix-serve build/index.js",
+    "build": "remix vite:build && pnpm typecheck",
+    "dev": "remix vite:dev",
+    "start": "NODE_OPTIONS='--require=./instrument.server.cjs' remix-serve build/server/index.js",
     "typecheck": "tsc",
     "clean": "npx rimraf node_modules pnpm-lock.yaml",
     "test:build": "pnpm install && pnpm build",
@@ -30,7 +30,8 @@
     "@types/prop-types": "15.7.7",
     "eslint": "^8.38.0",
     "typescript": "^5.1.6",
-    "vite": "^5.4.11"
+    "vite": "^5.4.11",
+    "vite-tsconfig-paths": "^4.2.1"
   },
   "resolutions": {
     "@types/react": "18.2.22"
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-v2/tests/client-transactions.test.ts b/dev-packages/e2e-tests/test-applications/create-remix-app-v2/tests/client-transactions.test.ts
index 39fd065aa959..3619368f81bb 100644
--- a/dev-packages/e2e-tests/test-applications/create-remix-app-v2/tests/client-transactions.test.ts
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-v2/tests/client-transactions.test.ts
@@ -3,7 +3,7 @@ import { waitForTransaction } from '@sentry-internal/test-utils';
 
 test('Sends a pageload transaction to Sentry', async ({ page }) => {
   const transactionPromise = waitForTransaction('create-remix-app-v2', transactionEvent => {
-    return transactionEvent.contexts?.trace?.op === 'pageload' && transactionEvent.transaction === 'routes/_index';
+    return transactionEvent.contexts?.trace?.op === 'pageload' && transactionEvent.transaction === '/';
   });
 
   await page.goto('/');
@@ -15,7 +15,7 @@ test('Sends a pageload transaction to Sentry', async ({ page }) => {
 
 test('Sends a navigation transaction to Sentry', async ({ page }) => {
   const transactionPromise = waitForTransaction('create-remix-app-v2', transactionEvent => {
-    return transactionEvent.contexts?.trace?.op === 'navigation' && transactionEvent.transaction === 'routes/user.$id';
+    return transactionEvent.contexts?.trace?.op === 'navigation' && transactionEvent.transaction === '/user/:id';
   });
 
   await page.goto('/');
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-v2/tests/server-transactions.test.ts b/dev-packages/e2e-tests/test-applications/create-remix-app-v2/tests/server-transactions.test.ts
index 9c24209e3f10..75d8fa0d2b9e 100644
--- a/dev-packages/e2e-tests/test-applications/create-remix-app-v2/tests/server-transactions.test.ts
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-v2/tests/server-transactions.test.ts
@@ -47,7 +47,7 @@ test('Sends two linked transactions (server & client) to Sentry', async ({ page
   const pageLoadParentSpanId = pageloadTransaction.contexts?.trace?.parent_span_id;
 
   expect(httpServerTransaction.transaction).toBe('GET http://localhost:3030/');
-  expect(pageloadTransaction.transaction).toBe('routes/_index');
+  expect(pageloadTransaction.transaction).toBe('/');
 
   expect(httpServerTraceId).toBeDefined();
   expect(httpServerSpanId).toBeDefined();
diff --git a/dev-packages/e2e-tests/test-applications/create-remix-app-v2/vite.config.ts b/dev-packages/e2e-tests/test-applications/create-remix-app-v2/vite.config.ts
new file mode 100644
index 000000000000..d4d7f23895c1
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/create-remix-app-v2/vite.config.ts
@@ -0,0 +1,15 @@
+import { vitePlugin as remix } from '@remix-run/dev';
+import { sentryRemixVitePlugin } from '@sentry/remix';
+import { defineConfig } from 'vite';
+import tsconfigPaths from 'vite-tsconfig-paths';
+
+export default defineConfig({
+  plugins: [
+    remix({
+      ignoredRouteFiles: ['**/.*'],
+      serverModuleFormat: 'cjs',
+    }),
+    sentryRemixVitePlugin(),
+    tsconfigPaths(),
+  ],
+});
diff --git a/dev-packages/e2e-tests/test-applications/remix-hydrogen/tests/client-transactions.test.ts b/dev-packages/e2e-tests/test-applications/remix-hydrogen/tests/client-transactions.test.ts
index 918fcba1fb3d..4d0fa8f92bdc 100644
--- a/dev-packages/e2e-tests/test-applications/remix-hydrogen/tests/client-transactions.test.ts
+++ b/dev-packages/e2e-tests/test-applications/remix-hydrogen/tests/client-transactions.test.ts
@@ -3,7 +3,7 @@ import { waitForTransaction } from '@sentry-internal/test-utils';
 
 test('Sends a pageload transaction to Sentry', async ({ page }) => {
   const transactionPromise = waitForTransaction('remix-hydrogen', transactionEvent => {
-    return transactionEvent.contexts?.trace?.op === 'pageload' && transactionEvent.transaction === 'routes/_index';
+    return transactionEvent.contexts?.trace?.op === 'pageload' && transactionEvent.transaction === '/';
   });
 
   await page.goto('/');
@@ -15,7 +15,7 @@ test('Sends a pageload transaction to Sentry', async ({ page }) => {
 
 test('Sends a navigation transaction to Sentry', async ({ page }) => {
   const transactionPromise = waitForTransaction('remix-hydrogen', transactionEvent => {
-    return transactionEvent.contexts?.trace?.op === 'navigation' && transactionEvent.transaction === 'routes/user.$id';
+    return transactionEvent.contexts?.trace?.op === 'navigation' && transactionEvent.transaction === '/user/:id';
   });
 
   await page.goto('/');
@@ -27,7 +27,7 @@ test('Sends a navigation transaction to Sentry', async ({ page }) => {
 
   expect(transactionEvent).toBeDefined();
   expect(transactionEvent).toMatchObject({
-    transaction: 'routes/user.$id',
+    transaction: '/user/:id',
   });
 });
 
diff --git a/dev-packages/e2e-tests/test-applications/remix-hydrogen/tests/server-transactions.test.ts b/dev-packages/e2e-tests/test-applications/remix-hydrogen/tests/server-transactions.test.ts
index 025e843021b1..b6f17bc18c37 100644
--- a/dev-packages/e2e-tests/test-applications/remix-hydrogen/tests/server-transactions.test.ts
+++ b/dev-packages/e2e-tests/test-applications/remix-hydrogen/tests/server-transactions.test.ts
@@ -13,7 +13,7 @@ test('Sends parameterized transaction name to Sentry', async ({ page }) => {
   const transaction = await transactionPromise;
 
   expect(transaction).toBeDefined();
-  expect(transaction.transaction).toBe('GET /user/123');
+  expect(transaction.transaction).toBe('GET /user/:id');
 });
 
 test('Sends two linked transactions (server & client) to Sentry', async ({ page }) => {
@@ -43,7 +43,7 @@ test('Sends two linked transactions (server & client) to Sentry', async ({ page
   const pageLoadSpanId = pageloadTransaction.contexts?.trace?.span_id;
 
   expect(httpServerTransaction.transaction).toBe('GET /');
-  expect(pageloadTransaction.transaction).toBe('routes/_index');
+  expect(pageloadTransaction.transaction).toBe('/');
 
   expect(httpServerTraceId).toBeDefined();
   expect(httpServerSpanId).toBeDefined();
diff --git a/dev-packages/e2e-tests/test-applications/remix-hydrogen/vite.config.ts b/dev-packages/e2e-tests/test-applications/remix-hydrogen/vite.config.ts
index 03a2f7539924..b128a147ff52 100644
--- a/dev-packages/e2e-tests/test-applications/remix-hydrogen/vite.config.ts
+++ b/dev-packages/e2e-tests/test-applications/remix-hydrogen/vite.config.ts
@@ -1,4 +1,5 @@
 import { vitePlugin as remix } from '@remix-run/dev';
+import { sentryRemixVitePlugin } from '@sentry/remix';
 import { hydrogen } from '@shopify/hydrogen/vite';
 import { oxygen } from '@shopify/mini-oxygen/vite';
 import { defineConfig } from 'vite';
@@ -16,6 +17,7 @@ export default defineConfig({
         v3_throwAbortReason: true,
       },
     }),
+    sentryRemixVitePlugin(),
     tsconfigPaths({
       // The dev server config errors are not relevant to this test app
       // https://github.com/aleclarson/vite-tsconfig-paths?tab=readme-ov-file#options
diff --git a/packages/cloudflare/src/request.ts b/packages/cloudflare/src/request.ts
index 7908d3dcf48e..bd79cd65fc59 100644
--- a/packages/cloudflare/src/request.ts
+++ b/packages/cloudflare/src/request.ts
@@ -106,6 +106,10 @@ export function wrapRequestHandler(
             try {
               const res = await handler();
               setHttpStatus(span, res.status);
+
+              // After the handler runs, the span name might have been updated by nested instrumentation
+              // (e.g., Remix parameterizing routes). The span should already have the correct name
+              // from that instrumentation, so we don't need to do anything here.
               return res;
             } catch (e) {
               if (captureErrors) {
diff --git a/packages/remix/src/client/performance.tsx b/packages/remix/src/client/performance.tsx
index 18b923c8b6d4..213f4eb43176 100644
--- a/packages/remix/src/client/performance.tsx
+++ b/packages/remix/src/client/performance.tsx
@@ -12,6 +12,7 @@ import type { BrowserClient, browserTracingIntegration as originalBrowserTracing
 import { getClient, startBrowserTracingNavigationSpan, startBrowserTracingPageLoadSpan, WINDOW } from '@sentry/react';
 import * as React from 'react';
 import { DEBUG_BUILD } from '../utils/debug-build';
+import { hasManifest, maybeParameterizeRemixRoute } from './remixRouteParameterization';
 
 export type Params<Key extends string = string> = {
   readonly [key in Key]: string | undefined;
@@ -55,6 +56,35 @@ function getInitPathName(): string | undefined {
   return undefined;
 }
 
+/**
+ * Determines the transaction name and source for a route.
+ * Handles three cases:
+ * 1. Dynamic routes with manifest (Vite apps): Use parameterized path with source 'route'
+ * 2. Static routes with manifest (Vite apps): Use pathname with source 'url'
+ * 3. Legacy apps without manifest: Use route ID with source 'route'
+ */
+function getTransactionNameAndSource(
+  pathname: string | undefined,
+  routeId: string,
+): { name: string; source: 'route' | 'url' } {
+  const parameterizedRoute = pathname ? maybeParameterizeRemixRoute(pathname) : undefined;
+
+  if (parameterizedRoute) {
+    // We have a parameterized route from the manifest (dynamic route)
+    return { name: parameterizedRoute, source: 'route' };
+  }
+
+  if (hasManifest()) {
+    // We have a manifest but no parameterization (static route)
+    // Use the pathname with source 'url'
+    return { name: pathname || routeId, source: 'url' };
+  }
+
+  // No manifest available (legacy app without Vite plugin)
+  // Fall back to route ID for backward compatibility
+  return { name: routeId, source: 'route' };
+}
+
 export function startPageloadSpan(client: Client): void {
   const initPathName = getInitPathName();
 
@@ -62,19 +92,24 @@ export function startPageloadSpan(client: Client): void {
     return;
   }
 
+  // Try to parameterize the route using the route manifest
+  const parameterizedRoute = maybeParameterizeRemixRoute(initPathName);
+  const spanName = parameterizedRoute || initPathName;
+  const source = parameterizedRoute ? 'route' : 'url';
+
   const spanContext: StartSpanOptions = {
-    name: initPathName,
+    name: spanName,
     op: 'pageload',
     attributes: {
       [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.remix',
-      [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
+      [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: source,
     },
   };
 
   startBrowserTracingPageLoadSpan(client, spanContext);
 }
 
-function startNavigationSpan(matches: RouteMatch<string>[]): void {
+function startNavigationSpan(matches: RouteMatch<string>[], location: ReturnType<UseLocation>): void {
   const lastMatch = matches[matches.length - 1];
 
   const client = getClient<BrowserClient>();
@@ -83,12 +118,14 @@ function startNavigationSpan(matches: RouteMatch<string>[]): void {
     return;
   }
 
+  const { name, source } = getTransactionNameAndSource(location.pathname, lastMatch.id);
+
   const spanContext: StartSpanOptions = {
-    name: lastMatch.id,
+    name,
     op: 'navigation',
     attributes: {
       [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.remix',
-      [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
+      [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: source,
     },
   };
 
@@ -134,16 +171,17 @@ export function withSentry<P extends Record<string, unknown>, R extends React.Co
     _useEffect(() => {
       const lastMatch = matches && matches[matches.length - 1];
       if (lastMatch) {
-        const routeName = lastMatch.id;
-        getCurrentScope().setTransactionName(routeName);
+        const { name, source } = getTransactionNameAndSource(location.pathname, lastMatch.id);
+
+        getCurrentScope().setTransactionName(name);
 
         const activeRootSpan = getActiveSpan();
         if (activeRootSpan) {
           const transaction = getRootSpan(activeRootSpan);
 
           if (transaction) {
-            transaction.updateName(routeName);
-            transaction.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, 'route');
+            transaction.updateName(name);
+            transaction.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, source);
           }
         }
       }
@@ -167,7 +205,7 @@ export function withSentry<P extends Record<string, unknown>, R extends React.Co
           activeRootSpan.end();
         }
 
-        startNavigationSpan(matches);
+        startNavigationSpan(matches, location);
       }
     }, [location]);
 
diff --git a/packages/remix/src/client/remixRouteParameterization.ts b/packages/remix/src/client/remixRouteParameterization.ts
new file mode 100644
index 000000000000..1714a64d058c
--- /dev/null
+++ b/packages/remix/src/client/remixRouteParameterization.ts
@@ -0,0 +1,165 @@
+import { debug, GLOBAL_OBJ } from '@sentry/core';
+import type { RouteManifest } from '../config/remixRouteManifest';
+import { DEBUG_BUILD } from '../utils/debug-build';
+
+const globalWithInjectedManifest = GLOBAL_OBJ as typeof GLOBAL_OBJ & {
+  _sentryRemixRouteManifest: string | undefined;
+};
+
+// Performance caches
+let cachedManifest: RouteManifest | null = null;
+let cachedManifestString: string | undefined = undefined;
+const compiledRegexCache: Map<string, RegExp> = new Map();
+const routeResultCache: Map<string, string | undefined> = new Map();
+
+/**
+ * Calculate specificity score for route matching. Lower scores = more specific routes.
+ */
+function getRouteSpecificity(routePath: string): number {
+  const segments = routePath.split('/').filter(Boolean);
+  let score = 0;
+
+  for (const segment of segments) {
+    if (segment.startsWith(':')) {
+      const paramName = segment.substring(1);
+      if (paramName.endsWith('*')) {
+        // Splat/catchall routes are least specific
+        score += 100;
+      } else {
+        // Dynamic segments are more specific than splats
+        score += 10;
+      }
+    }
+    // Static segments add 0 (most specific)
+  }
+
+  return score;
+}
+
+/**
+ * Get compiled regex from cache or create and cache it.
+ */
+function getCompiledRegex(regexString: string): RegExp | null {
+  if (compiledRegexCache.has(regexString)) {
+    return compiledRegexCache.get(regexString) ?? null;
+  }
+
+  try {
+    // eslint-disable-next-line @sentry-internal/sdk/no-regexp-constructor -- regex patterns are from build-time route manifest, not user input
+    const regex = new RegExp(regexString);
+    compiledRegexCache.set(regexString, regex);
+    return regex;
+  } catch (error) {
+    DEBUG_BUILD && debug.warn('Could not compile regex', { regexString, error });
+    return null;
+  }
+}
+
+/**
+ * Get and cache the route manifest from the global object.
+ * @returns The parsed route manifest or null if not available/invalid.
+ */
+function getManifest(): RouteManifest | null {
+  if (
+    !globalWithInjectedManifest?._sentryRemixRouteManifest ||
+    typeof globalWithInjectedManifest._sentryRemixRouteManifest !== 'string'
+  ) {
+    return null;
+  }
+
+  const currentManifestString = globalWithInjectedManifest._sentryRemixRouteManifest;
+
+  if (cachedManifest && cachedManifestString === currentManifestString) {
+    return cachedManifest;
+  }
+
+  compiledRegexCache.clear();
+  routeResultCache.clear();
+
+  let manifest: RouteManifest = {
+    staticRoutes: [],
+    dynamicRoutes: [],
+  };
+
+  try {
+    // The manifest string is JSON-stringified in the Vite plugin for safe injection into JavaScript.
+    // We parse once to convert the JSON string back to an object.
+    manifest = JSON.parse(currentManifestString);
+    if (!Array.isArray(manifest.staticRoutes) || !Array.isArray(manifest.dynamicRoutes)) {
+      return null;
+    }
+
+    cachedManifest = manifest;
+    cachedManifestString = currentManifestString;
+    return manifest;
+  } catch (error) {
+    DEBUG_BUILD && debug.warn('Could not extract route manifest');
+    return null;
+  }
+}
+
+/**
+ * Find matching routes from static and dynamic route collections.
+ * @param route - The route to match against.
+ * @param staticRoutes - Array of static route objects.
+ * @param dynamicRoutes - Array of dynamic route objects.
+ * @returns Array of matching parameterized route paths.
+ */
+function findMatchingRoutes(
+  route: string,
+  staticRoutes: RouteManifest['staticRoutes'],
+  dynamicRoutes: RouteManifest['dynamicRoutes'],
+): string[] {
+  const matches: string[] = [];
+
+  // Static routes don't need parameterization - return empty to keep source as 'url'
+  if (staticRoutes.some(r => r.path === route)) {
+    return matches;
+  }
+
+  // Check dynamic routes
+  for (const dynamicRoute of dynamicRoutes) {
+    if (dynamicRoute.regex) {
+      const regex = getCompiledRegex(dynamicRoute.regex);
+      if (regex?.test(route)) {
+        matches.push(dynamicRoute.path);
+      }
+    }
+  }
+
+  return matches;
+}
+
+/**
+ * Check if the route manifest is available (injected by the Vite plugin).
+ * @returns True if the manifest is available, false otherwise.
+ */
+export function hasManifest(): boolean {
+  return getManifest() !== null;
+}
+
+/**
+ * Parameterize a route using the route manifest.
+ *
+ * @param route - The route to parameterize.
+ * @returns The parameterized route or undefined if no parameterization is needed.
+ */
+export const maybeParameterizeRemixRoute = (route: string): string | undefined => {
+  const manifest = getManifest();
+  if (!manifest) {
+    return undefined;
+  }
+
+  if (routeResultCache.has(route)) {
+    return routeResultCache.get(route);
+  }
+
+  const { staticRoutes, dynamicRoutes } = manifest;
+  const matches = findMatchingRoutes(route, staticRoutes, dynamicRoutes);
+
+  const result = matches.sort((a, b) => getRouteSpecificity(a) - getRouteSpecificity(b))[0];
+
+  routeResultCache.set(route, result);
+
+  return result;
+};
diff --git a/packages/remix/src/config/createRemixRouteManifest.ts b/packages/remix/src/config/createRemixRouteManifest.ts
new file mode 100644
index 000000000000..b954061f4816
--- /dev/null
+++ b/packages/remix/src/config/createRemixRouteManifest.ts
@@ -0,0 +1,249 @@
+import * as fs from 'fs';
+import * as path from 'path';
+import type { RouteInfo, RouteManifest } from './remixRouteManifest';
+
+export type CreateRemixRouteManifestOptions = {
+  /**
+   * Path to the app directory (where routes folder is located)
+   */
+  appDirPath?: string;
+  /**
+   * The root directory of the project (defaults to process.cwd())
+   */
+  rootDir?: string;
+};
+
+let manifestCache: RouteManifest | null = null;
+let lastAppDirPath: string | null = null;
+
+/**
+ * Check if a file is a route file
+ */
+function isRouteFile(filename: string): boolean {
+  return filename.endsWith('.tsx') || filename.endsWith('.ts') || filename.endsWith('.jsx') || filename.endsWith('.js');
+}
+
+/**
+ * Convert Remix route file paths to parameterized paths at build time.
+ *
+ * Examples:
+ *   - index.tsx -> /
+ *   - users.tsx -> /users
+ *   - users.$id.tsx -> /users/:id
+ *   - users.$id.posts.$postId.tsx -> /users/:id/posts/:postId
+ *   - $.tsx -> /:*
+ *   - docs.$.tsx -> /docs/:*
+ *   - users/$id.tsx (nested folder) -> /users/:id
+ *   - users/$id/posts.tsx (nested folder) -> /users/:id/posts
+ *   - users/index.tsx (nested folder) -> /users
+ *   - _layout.tsx -> null (pathless layout route, not URL-addressable)
+ *   - _auth.tsx -> null (pathless layout route, not URL-addressable)
+ *
+ * @param filename - The route filename or path (can include directory separators for nested routes)
+ * @returns Object containing the parameterized path and whether it's dynamic, or null for pathless layout routes
+ * @internal Exported for testing purposes
+ */
+export function convertRemixRouteToPath(filename: string): { path: string; isDynamic: boolean } | null {
+  // Remove file extension
+  const basename = filename.replace(/\.(tsx?|jsx?)$/, '');
+
+  // Handle root index route
+  if (basename === 'index' || basename === '_index') {
+    return { path: '/', isDynamic: false };
+  }
+
+  const normalizedBasename = basename.replace(/[/\\]/g, '.');
+  const segments = normalizedBasename.split('.');
+  const pathSegments: string[] = [];
+  let isDynamic = false;
+  let isIndexRoute = false;
+
+  for (let i = 0; i < segments.length; i++) {
+    const segment = segments[i];
+
+    if (!segment) {
+      continue;
+    }
+
+    if (segment.startsWith('_') && segment !== '_index') {
+      continue;
+    }
+
+    // Handle '_index' segments at the end (always skip - indicates an index route)
+    if (segment === '_index' && i === segments.length - 1) {
+      isIndexRoute = true;
+      continue;
+    }
+
+    // Handle 'index' segments at the end (skip only if there are path segments,
+    // otherwise root index is handled by the early return above)
+    if (segment === 'index' && i === segments.length - 1 && pathSegments.length > 0) {
+      isIndexRoute = true;
+      continue;
+    }
+
+    if (segment === '$') {
+      pathSegments.push(':*');
+      isDynamic = true;
+      continue;
+    }
+
+    if (segment.startsWith('$')) {
+      const paramName = segment.substring(1);
+      pathSegments.push(`:${paramName}`);
+      isDynamic = true;
+    } else if (segment !== 'index') {
+      pathSegments.push(segment);
+    }
+  }
+
+  // If all segments were skipped AND it's not an index route,
+  // it's a pathless layout route (like _layout.tsx, _auth.tsx) - exclude from manifest
+  if (pathSegments.length === 0 && !isIndexRoute) {
+    return null;
+  }
+
+  const path = pathSegments.length > 0 ? `/${pathSegments.join('/')}` : '/';
+  return { path, isDynamic };
+}
+
+/**
+ * Build a regex pattern for a dynamic route
+ */
+function buildRegexForDynamicRoute(routePath: string): { regex: string; paramNames: string[] } {
+  const segments = routePath.split('/').filter(Boolean);
+  const regexSegments: string[] = [];
+  const paramNames: string[] = [];
+
+  for (const segment of segments) {
+    if (segment.startsWith(':')) {
+      const paramName = segment.substring(1);
+
+      if (paramName.endsWith('*')) {
+        const cleanParamName = paramName.slice(0, -1);
+        paramNames.push(cleanParamName);
+        regexSegments.push('(.+)');
+      } else {
+        paramNames.push(paramName);
+        regexSegments.push('([^/]+)');
+      }
+    } else {
+      regexSegments.push(segment.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'));
+    }
+  }
+
+  const pattern = `^/${regexSegments.join('/')}$`;
+
+  return { regex: pattern, paramNames };
+}
+
+/**
+ * Scan the routes directory and build the manifest, recursively processing subdirectories
+ *
+ * @param routesDir - The directory to scan for route files
+ * @param prefix - Path prefix for nested routes (used internally for recursion)
+ * @returns Object containing arrays of dynamic and static routes
+ */
+function scanRoutesDirectory(
+  routesDir: string,
+  prefix: string = '',
+): { dynamicRoutes: RouteInfo[]; staticRoutes: RouteInfo[] } {
+  const dynamicRoutes: RouteInfo[] = [];
+  const staticRoutes: RouteInfo[] = [];
+
+  try {
+    if (!fs.existsSync(routesDir)) {
+      return { dynamicRoutes, staticRoutes };
+    }
+
+    const entries = fs.readdirSync(routesDir);
+
+    for (const entry of entries) {
+      const fullPath = path.join(routesDir, entry);
+      const stat = fs.lstatSync(fullPath);
+
+      if (stat.isDirectory()) {
+        const nestedPrefix = prefix ? `${prefix}/${entry}` : entry;
+        const nested = scanRoutesDirectory(fullPath, nestedPrefix);
+        dynamicRoutes.push(...nested.dynamicRoutes);
+        staticRoutes.push(...nested.staticRoutes);
+      } else if (stat.isFile() && isRouteFile(entry)) {
+        const routeName = prefix ? `${prefix}/${entry}` : entry;
+        const result = convertRemixRouteToPath(routeName);
+
+        // Skip pathless layout routes (e.g., _layout.tsx, _auth.tsx)
+        if (result === null) {
+          continue;
+        }
+
+        const { path: routePath, isDynamic } = result;
+
+        if (isDynamic) {
+          const { regex, paramNames } = buildRegexForDynamicRoute(routePath);
+          dynamicRoutes.push({
+            path: routePath,
+            regex,
+            paramNames,
+          });
+        } else {
+          staticRoutes.push({
+            path: routePath,
+          });
+        }
+      }
+    }
+  } catch (error) {
+    // eslint-disable-next-line no-console
+    console.warn('Error building Remix route manifest:', error);
+  }
+
+  return { dynamicRoutes, staticRoutes };
+}
+
+/**
+ * Scans Remix routes directory and generates a manifest containing all static
+ * and dynamic routes with their regex patterns for client-side route parameterization.
+ *
+ * @param options - Configuration options
+ * @param options.appDirPath - Path to the app directory (where routes folder is located)
+ * @param options.rootDir - The root directory of the project (defaults to process.cwd())
+ * @returns A RouteManifest containing arrays of dynamic and static routes
+ */
+export function createRemixRouteManifest(options?: CreateRemixRouteManifestOptions): RouteManifest {
+  const rootDir = options?.rootDir || process.cwd();
+  let appDirPath: string | undefined;
+
+  if (options?.appDirPath) {
+    appDirPath = options.appDirPath;
+  } else {
+    const maybeAppDirPath = path.join(rootDir, 'app');
+
+    if (fs.existsSync(maybeAppDirPath) && fs.lstatSync(maybeAppDirPath).isDirectory()) {
+      appDirPath = maybeAppDirPath;
+    }
+  }
+
+  if (!appDirPath) {
+    return {
+      dynamicRoutes: [],
+      staticRoutes: [],
+    };
+  }
+
+  if (manifestCache && lastAppDirPath === appDirPath) {
+    return manifestCache;
+  }
+
+  const routesDir = path.join(appDirPath, 'routes');
+  const { dynamicRoutes, staticRoutes } = scanRoutesDirectory(routesDir);
+
+  const manifest: RouteManifest = {
+    dynamicRoutes,
+    staticRoutes,
+  };
+
+  manifestCache = manifest;
+  lastAppDirPath = appDirPath;
+
+  return manifest;
+}
diff --git a/packages/remix/src/config/remixRouteManifest.ts b/packages/remix/src/config/remixRouteManifest.ts
new file mode 100644
index 000000000000..a29c3431945f
--- /dev/null
+++ b/packages/remix/src/config/remixRouteManifest.ts
@@ -0,0 +1,33 @@
+/**
+ * Information about a single route in the manifest
+ */
+export type RouteInfo = {
+  /**
+   * The parameterized route path, e.g. "/users/:id"
+   * This is what gets returned by the parameterization function.
+   */
+  path: string;
+  /**
+   * (Optional) The regex pattern for dynamic routes
+   */
+  regex?: string;
+  /**
+   * (Optional) The names of dynamic parameters in the route
+   */
+  paramNames?: string[];
+};
+
+/**
+ * The manifest containing all routes discovered in the app
+ */
+export type RouteManifest = {
+  /**
+   * List of all dynamic routes
+   */
+  dynamicRoutes: RouteInfo[];
+
+  /**
+   * List of all static routes
+   */
+  staticRoutes: RouteInfo[];
+};
diff --git a/packages/remix/src/config/vite.ts b/packages/remix/src/config/vite.ts
new file mode 100644
index 000000000000..83b033104530
--- /dev/null
+++ b/packages/remix/src/config/vite.ts
@@ -0,0 +1,174 @@
+import * as path from 'path';
+import type { Plugin } from 'vite';
+import { createRemixRouteManifest } from './createRemixRouteManifest';
+
+/**
+ * Escapes a JSON string for safe embedding in HTML script tags.
+ * JSON.stringify alone doesn't escape </script> or <!-- which can break out of script context.
+ */
+function escapeJsonForHtml(jsonString: string): string {
+  return jsonString
+    .replace(/<\//g, '<\\/') // Escape </ to prevent </script> injection
+    .replace(/<!--/g, '<\\!--'); // Escape <!-- to prevent HTML comment injection
+}
+
+export type SentryRemixVitePluginOptions = {
+  /**
+   * Path to the app directory (where routes folder is located).
+   * Can be relative to project root or absolute.
+   * Defaults to 'app' in the project root.
+   *
+   * @example './app'
+   * @example '/absolute/path/to/app'
+   */
+  appDirPath?: string;
+};
+
+// Global variable key used to store the route manifest
+const MANIFEST_GLOBAL_KEY = '_sentryRemixRouteManifest' as const;
+
+/**
+ * Vite plugin to inject Remix route manifest for Sentry client-side route parameterization.
+ *
+ * @param options - Plugin configuration options
+ * @returns Vite plugin
+ *
+ * @example
+ * ```typescript
+ * // vite.config.ts
+ * import { defineConfig } from 'vite';
+ * import { vitePlugin as remix } from '@remix-run/dev';
+ * import { sentryRemixVitePlugin } from '@sentry/remix';
+ *
+ * export default defineConfig({
+ *   plugins: [
+ *     remix(),
+ *     sentryRemixVitePlugin({
+ *       appDirPath: './app',
+ *     }),
+ *   ],
+ * });
+ * ```
+ */
+export function sentryRemixVitePlugin(options: SentryRemixVitePluginOptions = {}): Plugin {
+  let routeManifestJson: string = '';
+  let isDevMode = false;
+
+  return {
+    name: 'sentry-remix-route-manifest',
+    enforce: 'post',
+
+    configResolved(config) {
+      isDevMode = config.command === 'serve' || config.mode === 'development';
+
+      try {
+        const rootDir = config.root || process.cwd();
+
+        let resolvedAppDirPath = options.appDirPath;
+        if (resolvedAppDirPath && !path.isAbsolute(resolvedAppDirPath)) {
+          resolvedAppDirPath = path.resolve(rootDir, resolvedAppDirPath);
+        }
+
+        const manifest = createRemixRouteManifest({
+          appDirPath: resolvedAppDirPath,
+          rootDir,
+        });
+
+        routeManifestJson = JSON.stringify(manifest);
+
+        if (isDevMode) {
+          // eslint-disable-next-line no-console
+          console.log(
+            `[Sentry Remix] Found ${manifest.staticRoutes.length} static and ${manifest.dynamicRoutes.length} dynamic routes`,
+          );
+        }
+      } catch (error) {
+        // eslint-disable-next-line no-console
+        console.error('[Sentry Remix] Failed to generate route manifest:', error);
+        routeManifestJson = JSON.stringify({ dynamicRoutes: [], staticRoutes: [] });
+      }
+    },
+
+    transformIndexHtml: {
+      order: 'pre',
+      handler(html) {
+        if (!routeManifestJson) {
+          return html;
+        }
+
+        /**
+         * XSS Prevention: JSON.stringify escapes quotes/backslashes, but we also need to escape
+         * HTML-dangerous sequences like </script> and <!-- that could break out of the script context.
+         */
+        const safeJsonValue = escapeJsonForHtml(JSON.stringify(routeManifestJson));
+        const script = `<script>window.${MANIFEST_GLOBAL_KEY} = ${safeJsonValue};</script>`;
+
+        if (/<head>/i.test(html)) {
+          return html.replace(/<head>/i, match => `${match}\n  ${script}`);
+        }
+
+        if (/<html[^>]*>/i.test(html)) {
+          return html.replace(/<html[^>]*>/i, match => `${match}\n<head>${script}</head>`);
+        }
+
+        return `<!DOCTYPE html><html><head>${script}</head><body>${html}</body></html>`;
+      },
+    },
+
+    transform(code, id) {
+      if (!routeManifestJson) {
+        return null;
+      }
+
+      const isClientEntry =
+        /entry[.-]client\.[jt]sx?$/.test(id) ||
+        // Also handle Remix's default entry.client location
+        id.includes('/entry.client.') ||
+        id.includes('/entry-client.');
+
+      const isServerEntry =
+        /entry[.-]server\.[jt]sx?$/.test(id) ||
+        // Also handle Remix's default entry.server location
+        id.includes('/entry.server.') ||
+        id.includes('/entry-server.') ||
+        // Also handle Hydrogen/Cloudflare Workers server files
+        /(^|\/)server\.[jt]sx?$/.test(id);
+
+      if (isClientEntry) {
+        // XSS Prevention: Escape HTML-dangerous sequences in addition to JSON escaping
+        const safeJsonValue = escapeJsonForHtml(JSON.stringify(routeManifestJson));
+        const injectedCode = `
+// Sentry Remix Route Manifest - Auto-injected
+if (typeof window !== 'undefined') {
+  window.${MANIFEST_GLOBAL_KEY} = window.${MANIFEST_GLOBAL_KEY} || ${safeJsonValue};
+}
+${code}`;
+
+        return {
+          code: injectedCode,
+          map: null,
+        };
+      }
+
+      if (isServerEntry) {
+        // Inject into server entry for server-side transaction naming
+        // Use globalThis for Cloudflare Workers/Hydrogen compatibility
+        // XSS Prevention: Escape HTML-dangerous sequences (important if server renders this)
+        const safeJsonValue = escapeJsonForHtml(JSON.stringify(routeManifestJson));
+        const injectedCode = `
+// Sentry Remix Route Manifest - Auto-injected
+if (typeof globalThis !== 'undefined') {
+  globalThis.${MANIFEST_GLOBAL_KEY} = globalThis.${MANIFEST_GLOBAL_KEY} || ${safeJsonValue};
+}
+${code}`;
+
+        return {
+          code: injectedCode,
+          map: null,
+        };
+      }
+
+      return null;
+    },
+  };
+}
diff --git a/packages/remix/src/index.server.ts b/packages/remix/src/index.server.ts
index 4ba64d609317..e4eb8ad6236e 100644
--- a/packages/remix/src/index.server.ts
+++ b/packages/remix/src/index.server.ts
@@ -1,4 +1,9 @@
 export * from './server';
 export { captureRemixErrorBoundaryError, withSentry, ErrorBoundary, browserTracingIntegration } from './client';
 
+export { sentryRemixVitePlugin } from './config/vite';
+export { createRemixRouteManifest } from './config/createRemixRouteManifest';
+export type { CreateRemixRouteManifestOptions } from './config/createRemixRouteManifest';
+
 export type { SentryMetaArgs } from './utils/types';
+export type { RouteManifest, RouteInfo } from './config/remixRouteManifest';
diff --git a/packages/remix/src/server/instrumentServer.ts b/packages/remix/src/server/instrumentServer.ts
index 2416699cb2a6..273f72d809c1 100644
--- a/packages/remix/src/server/instrumentServer.ts
+++ b/packages/remix/src/server/instrumentServer.ts
@@ -149,20 +149,56 @@ function makeWrappedDocumentRequestFunction(instrumentTracing?: boolean) {
   };
 }
 
+/**
+ * Updates the root span name with the parameterized route name.
+ * This is necessary for runtimes like Cloudflare Workers/Hydrogen where
+ * the request handler is not wrapped by Remix's wrapRequestHandler.
+ */
+function updateSpanWithRoute(args: DataFunctionArgs, build: ServerBuild): void {
+  try {
+    const activeSpan = getActiveSpan();
+    const rootSpan = activeSpan && getRootSpan(activeSpan);
+
+    if (!rootSpan) {
+      return;
+    }
+
+    const routes = createRoutes(build.routes);
+    const url = new URL(args.request.url);
+    const [transactionName] = getTransactionName(routes, url);
+
+    // Preserve the HTTP method prefix if the span already has one
+    const method = args.request.method.toUpperCase();
+    const currentSpanName = spanToJSON(rootSpan).description;
+    const newSpanName = currentSpanName?.startsWith(method) ? `${method} ${transactionName}` : transactionName;
+
+    rootSpan.updateName(newSpanName);
+  } catch (e) {
+    DEBUG_BUILD && debug.warn('Failed to update span name with route', e);
+  }
+}
+
 function makeWrappedDataFunction(
   origFn: DataFunction,
   id: string,
   name: 'action' | 'loader',
   instrumentTracing?: boolean,
+  build?: ServerBuild,
 ): DataFunction {
   return async function (this: unknown, args: DataFunctionArgs): Promise<Response | AppData> {
     if (instrumentTracing) {
+      // Update span name for Cloudflare Workers/Hydrogen environments
+      if (build) {
+        updateSpanWithRoute(args, build);
+      }
+
       return startSpan(
         {
           op: `function.remix.${name}`,
           name: id,
           attributes: {
             [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.ui.remix',
+            [SEMANTIC_ATTRIBUTE_SENTRY_OP]: `function.remix.${name}`,
             name,
           },
         },
@@ -177,20 +213,26 @@ function makeWrappedDataFunction(
 }
 
 const makeWrappedAction =
-  (id: string, instrumentTracing?: boolean) =>
+  (id: string, instrumentTracing?: boolean, build?: ServerBuild) =>
   (origAction: DataFunction): DataFunction => {
-    return makeWrappedDataFunction(origAction, id, 'action', instrumentTracing);
+    return makeWrappedDataFunction(origAction, id, 'action', instrumentTracing, build);
   };
 
 const makeWrappedLoader =
-  (id: string, instrumentTracing?: boolean) =>
+  (id: string, instrumentTracing?: boolean, build?: ServerBuild) =>
   (origLoader: DataFunction): DataFunction => {
-    return makeWrappedDataFunction(origLoader, id, 'loader', instrumentTracing);
+    return makeWrappedDataFunction(origLoader, id, 'loader', instrumentTracing, build);
   };
 
-function makeWrappedRootLoader() {
+function makeWrappedRootLoader(instrumentTracing?: boolean, build?: ServerBuild) {
   return function (origLoader: DataFunction): DataFunction {
     return async function (this: unknown, args: DataFunctionArgs): Promise<Response | AppData> {
+      // Update span name for Cloudflare Workers/Hydrogen environments
+      // The root loader always runs, even for routes that don't have their own loaders
+      if (instrumentTracing && build) {
+        updateSpanWithRoute(args, build);
+      }
+
       const res = await origLoader.call(this, args);
       const traceAndBaggage = getTraceAndBaggage();
 
@@ -283,6 +325,13 @@ function wrapRequestHandler<T extends ServerBuild | (() => ServerBuild | Promise
         [name, source] = getTransactionName(resolvedRoutes, url);
 
         isolationScope.setTransactionName(name);
+
+        // Update the span name if we're running inside an existing span
+        const parentSpan = getActiveSpan();
+        if (parentSpan) {
+          const rootSpan = getRootSpan(parentSpan);
+          rootSpan?.updateName(name);
+        }
       }
 
       isolationScope.setSDKProcessingMetadata({ normalizedRequest });
@@ -362,18 +411,18 @@ function instrumentBuildCallback(
       }
 
       if (!(wrappedRoute.module.loader as WrappedFunction).__sentry_original__) {
-        fill(wrappedRoute.module, 'loader', makeWrappedRootLoader());
+        fill(wrappedRoute.module, 'loader', makeWrappedRootLoader(options?.instrumentTracing, build));
       }
     }
 
     const routeAction = wrappedRoute.module.action as undefined | WrappedFunction;
     if (routeAction && !routeAction.__sentry_original__) {
-      fill(wrappedRoute.module, 'action', makeWrappedAction(id, options?.instrumentTracing));
+      fill(wrappedRoute.module, 'action', makeWrappedAction(id, options?.instrumentTracing, build));
     }
 
     const routeLoader = wrappedRoute.module.loader as undefined | WrappedFunction;
     if (routeLoader && !routeLoader.__sentry_original__) {
-      fill(wrappedRoute.module, 'loader', makeWrappedLoader(id, options?.instrumentTracing));
+      fill(wrappedRoute.module, 'loader', makeWrappedLoader(id, options?.instrumentTracing, build));
     }
 
     routes[id] = wrappedRoute;
diff --git a/packages/remix/src/utils/utils.ts b/packages/remix/src/utils/utils.ts
index 9cc02341ac0a..83dda0b816a3 100644
--- a/packages/remix/src/utils/utils.ts
+++ b/packages/remix/src/utils/utils.ts
@@ -8,7 +8,7 @@ import { getRequestMatch, matchServerRoutes } from './vendor/response';
 type ServerRouteManifest = ServerBuild['routes'];
 
 /**
- *
+ * Store configured FormData keys as span attributes for Remix actions.
  */
 export async function storeFormDataKeys(
   args: LoaderFunctionArgs | ActionFunctionArgs,
@@ -43,13 +43,89 @@ export async function storeFormDataKeys(
   }
 }
 
+/**
+ * Converts Remix route IDs to parameterized paths at runtime.
+ * (e.g., "routes/users.$id" -> "/users/:id")
+ *
+ * @param routeId - The Remix route ID
+ * @returns The parameterized path
+ * @internal
+ */
+export function convertRemixRouteIdToPath(routeId: string): string {
+  // Remove the "routes/" prefix if present
+  const path = routeId.replace(/^routes\//, '');
+
+  // Handle root index route
+  if (path === 'index' || path === '_index') {
+    return '/';
+  }
+
+  // Split by dots to get segments
+  const segments = path.split('.');
+  const pathSegments: string[] = [];
+
+  for (let i = 0; i < segments.length; i++) {
+    const segment = segments[i];
+
+    if (!segment) {
+      continue;
+    }
+
+    // Skip layout route segments (prefixed with _)
+    if (segment.startsWith('_') && segment !== '_index') {
+      continue;
+    }
+
+    // Handle '_index' segments at the end (always skip - indicates an index route)
+    if (segment === '_index' && i === segments.length - 1) {
+      continue;
+    }
+
+    // Handle 'index' segments at the end (skip only if there are path segments,
+    // otherwise root index is handled by the early return above)
+    if (segment === 'index' && i === segments.length - 1 && pathSegments.length > 0) {
+      continue;
+    }
+
+    // Handle splat routes (catch-all)
+    // Remix accesses splat params via params["*"] at runtime
+    if (segment === '$') {
+      pathSegments.push(':*');
+      continue;
+    }
+
+    // Handle dynamic segments (prefixed with $)
+    if (segment.startsWith('$')) {
+      const paramName = segment.substring(1);
+      pathSegments.push(`:${paramName}`);
+    } else if (segment !== 'index') {
+      // Static segment (skip remaining 'index' segments)
+      pathSegments.push(segment);
+    }
+  }
+
+  // Return with leading slash for consistency with client-side URL paths
+  const routePath = pathSegments.length > 0 ? `/${pathSegments.join('/')}` : '/';
+  return routePath;
+}
+
 /**
  * Get transaction name from routes and url
  */
 export function getTransactionName(routes: AgnosticRouteObject[], url: URL): [string, TransactionSource] {
   const matches = matchServerRoutes(routes, url.pathname);
   const match = matches && getRequestMatch(url, matches);
-  return match === null ? [url.pathname, 'url'] : [match.route.id || 'no-route-id', 'route'];
+
+  if (match === null) {
+    return [url.pathname, 'url'];
+  }
+
+  const routeId = match.route.id || 'no-route-id';
+
+  // Convert route ID to parameterized path (e.g., "routes/users.$id" -> "/users/:id")
+  // This is a pure string transformation that works without the Vite plugin manifest
+  const parameterizedPath = convertRemixRouteIdToPath(routeId);
+  return [parameterizedPath, 'route'];
 }
 
 /**
diff --git a/packages/remix/test/client/remixRouteParameterization.test.ts b/packages/remix/test/client/remixRouteParameterization.test.ts
new file mode 100644
index 000000000000..59eb2c1796c1
--- /dev/null
+++ b/packages/remix/test/client/remixRouteParameterization.test.ts
@@ -0,0 +1,416 @@
+import { GLOBAL_OBJ } from '@sentry/core';
+import { afterEach, describe, expect, it } from 'vitest';
+import { maybeParameterizeRemixRoute } from '../../src/client/remixRouteParameterization';
+import type { RouteManifest } from '../../src/config/remixRouteManifest';
+
+const globalWithInjectedManifest = GLOBAL_OBJ as typeof GLOBAL_OBJ & {
+  _sentryRemixRouteManifest: string | undefined;
+};
+
+describe('maybeParameterizeRemixRoute', () => {
+  const originalManifest = globalWithInjectedManifest._sentryRemixRouteManifest;
+
+  afterEach(() => {
+    globalWithInjectedManifest._sentryRemixRouteManifest = originalManifest;
+  });
+
+  describe('when no manifest is available', () => {
+    it('should return undefined', () => {
+      globalWithInjectedManifest._sentryRemixRouteManifest = undefined;
+
+      expect(maybeParameterizeRemixRoute('/users/123')).toBeUndefined();
+      expect(maybeParameterizeRemixRoute('/blog/my-post')).toBeUndefined();
+      expect(maybeParameterizeRemixRoute('/')).toBeUndefined();
+    });
+  });
+
+  describe('when manifest has static routes', () => {
+    it('should return undefined for static routes', () => {
+      const manifest: RouteManifest = {
+        staticRoutes: [{ path: '/' }, { path: '/about' }, { path: '/contact' }, { path: '/blog/posts' }],
+        dynamicRoutes: [],
+      };
+      globalWithInjectedManifest._sentryRemixRouteManifest = JSON.stringify(manifest);
+
+      expect(maybeParameterizeRemixRoute('/')).toBeUndefined();
+      expect(maybeParameterizeRemixRoute('/about')).toBeUndefined();
+      expect(maybeParameterizeRemixRoute('/contact')).toBeUndefined();
+      expect(maybeParameterizeRemixRoute('/blog/posts')).toBeUndefined();
+    });
+  });
+
+  describe('when manifest has dynamic routes', () => {
+    it('should return parameterized routes for matching dynamic routes', () => {
+      const manifest: RouteManifest = {
+        staticRoutes: [{ path: '/' }, { path: '/about' }],
+        dynamicRoutes: [
+          {
+            path: '/users/:id',
+            regex: '^/users/([^/]+)$',
+            paramNames: ['id'],
+          },
+          {
+            path: '/blog/:slug',
+            regex: '^/blog/([^/]+)$',
+            paramNames: ['slug'],
+          },
+          {
+            path: '/users/:userId/posts/:postId',
+            regex: '^/users/([^/]+)/posts/([^/]+)$',
+            paramNames: ['userId', 'postId'],
+          },
+        ],
+      };
+      globalWithInjectedManifest._sentryRemixRouteManifest = JSON.stringify(manifest);
+
+      expect(maybeParameterizeRemixRoute('/users/123')).toBe('/users/:id');
+      expect(maybeParameterizeRemixRoute('/users/john-doe')).toBe('/users/:id');
+      expect(maybeParameterizeRemixRoute('/blog/my-post')).toBe('/blog/:slug');
+      expect(maybeParameterizeRemixRoute('/blog/hello-world')).toBe('/blog/:slug');
+      expect(maybeParameterizeRemixRoute('/users/123/posts/456')).toBe('/users/:userId/posts/:postId');
+      expect(maybeParameterizeRemixRoute('/users/john/posts/my-post')).toBe('/users/:userId/posts/:postId');
+    });
+
+    it('should return undefined for static routes even when dynamic routes exist', () => {
+      const manifest: RouteManifest = {
+        staticRoutes: [{ path: '/' }, { path: '/about' }],
+        dynamicRoutes: [
+          {
+            path: '/users/:id',
+            regex: '^/users/([^/]+)$',
+            paramNames: ['id'],
+          },
+        ],
+      };
+      globalWithInjectedManifest._sentryRemixRouteManifest = JSON.stringify(manifest);
+
+      expect(maybeParameterizeRemixRoute('/')).toBeUndefined();
+      expect(maybeParameterizeRemixRoute('/about')).toBeUndefined();
+    });
+
+    it('should handle splat/catch-all routes', () => {
+      const manifest: RouteManifest = {
+        staticRoutes: [{ path: '/' }],
+        dynamicRoutes: [
+          {
+            path: '/docs/:*',
+            regex: '^/docs/(.+)$',
+            paramNames: ['*'],
+          },
+          {
+            path: '/:*',
+            regex: '^/(.+)$',
+            paramNames: ['*'],
+          },
+        ],
+      };
+      globalWithInjectedManifest._sentryRemixRouteManifest = JSON.stringify(manifest);
+
+      expect(maybeParameterizeRemixRoute('/docs/intro')).toBe('/docs/:*');
+      expect(maybeParameterizeRemixRoute('/docs/guide/getting-started')).toBe('/docs/:*');
+      expect(maybeParameterizeRemixRoute('/anything/else')).toBe('/:*');
+    });
+
+    it('should handle routes with special characters', () => {
+      const manifest: RouteManifest = {
+        staticRoutes: [],
+        dynamicRoutes: [
+          {
+            path: '/users/:id/settings',
+            regex: '^/users/([^/]+)/settings$',
+            paramNames: ['id'],
+          },
+        ],
+      };
+      globalWithInjectedManifest._sentryRemixRouteManifest = JSON.stringify(manifest);
+
+      expect(maybeParameterizeRemixRoute('/users/user-with-dashes/settings')).toBe('/users/:id/settings');
+      expect(maybeParameterizeRemixRoute('/users/user_with_underscores/settings')).toBe('/users/:id/settings');
+      expect(maybeParameterizeRemixRoute('/users/123/settings')).toBe('/users/:id/settings');
+    });
+
+    it('should return the first matching dynamic route when sorted by specificity', () => {
+      const manifest: RouteManifest = {
+        staticRoutes: [],
+        dynamicRoutes: [
+          {
+            path: '/:*',
+            regex: '^/(.+)$',
+            paramNames: ['*'],
+          },
+          {
+            path: '/users/:id',
+            regex: '^/users/([^/]+)$',
+            paramNames: ['id'],
+          },
+        ],
+      };
+      globalWithInjectedManifest._sentryRemixRouteManifest = JSON.stringify(manifest);
+
+      // Should prefer more specific route over catch-all
+      expect(maybeParameterizeRemixRoute('/users/123')).toBe('/users/:id');
+      expect(maybeParameterizeRemixRoute('/about/something')).toBe('/:*');
+    });
+
+    it('should return undefined for dynamic routes without regex', () => {
+      const manifest: RouteManifest = {
+        staticRoutes: [],
+        dynamicRoutes: [
+          {
+            path: '/users/:id',
+            paramNames: ['id'],
+          },
+        ],
+      };
+      globalWithInjectedManifest._sentryRemixRouteManifest = JSON.stringify(manifest);
+
+      expect(maybeParameterizeRemixRoute('/users/123')).toBeUndefined();
+    });
+
+    it('should handle invalid regex patterns gracefully', () => {
+      const manifest: RouteManifest = {
+        staticRoutes: [],
+        dynamicRoutes: [
+          {
+            path: '/users/:id',
+            regex: '[invalid-regex',
+            paramNames: ['id'],
+          },
+        ],
+      };
+      globalWithInjectedManifest._sentryRemixRouteManifest = JSON.stringify(manifest);
+
+      expect(maybeParameterizeRemixRoute('/users/123')).toBeUndefined();
+    });
+  });
+
+  describe('when route does not match any pattern', () => {
+    it('should return undefined for unknown routes', () => {
+      const manifest: RouteManifest = {
+        staticRoutes: [{ path: '/about' }],
+        dynamicRoutes: [
+          {
+            path: '/users/:id',
+            regex: '^/users/([^/]+)$',
+            paramNames: ['id'],
+          },
+        ],
+      };
+      globalWithInjectedManifest._sentryRemixRouteManifest = JSON.stringify(manifest);
+
+      expect(maybeParameterizeRemixRoute('/unknown')).toBeUndefined();
+      expect(maybeParameterizeRemixRoute('/posts/123')).toBeUndefined();
+      expect(maybeParameterizeRemixRoute('/users/123/extra')).toBeUndefined();
+    });
+  });
+
+  describe('edge cases', () => {
+    it('should handle empty route', () => {
+      const manifest: RouteManifest = {
+        staticRoutes: [],
+        dynamicRoutes: [],
+      };
+      globalWithInjectedManifest._sentryRemixRouteManifest = JSON.stringify(manifest);
+
+      expect(maybeParameterizeRemixRoute('')).toBeUndefined();
+    });
+
+    it('should handle root route', () => {
+      const manifest: RouteManifest = {
+        staticRoutes: [{ path: '/' }],
+        dynamicRoutes: [],
+      };
+      globalWithInjectedManifest._sentryRemixRouteManifest = JSON.stringify(manifest);
+
+      expect(maybeParameterizeRemixRoute('/')).toBeUndefined();
+    });
+
+    it('should handle complex nested dynamic routes', () => {
+      const manifest: RouteManifest = {
+        staticRoutes: [],
+        dynamicRoutes: [
+          {
+            path: '/api/v1/users/:id/posts/:postId/comments/:commentId',
+            regex: '^/api/v1/users/([^/]+)/posts/([^/]+)/comments/([^/]+)$',
+            paramNames: ['id', 'postId', 'commentId'],
+          },
+        ],
+      };
+      globalWithInjectedManifest._sentryRemixRouteManifest = JSON.stringify(manifest);
+
+      expect(maybeParameterizeRemixRoute('/api/v1/users/123/posts/456/comments/789')).toBe(
+        '/api/v1/users/:id/posts/:postId/comments/:commentId',
+      );
+    });
+  });
+
+  describe('realistic Remix patterns', () => {
+    it.each([
+      ['/', undefined],
+      ['/about', undefined],
+      ['/contact', undefined],
+      ['/blog/posts', undefined],
+
+      ['/users/123', '/users/:id'],
+      ['/users/john-doe', '/users/:id'],
+      ['/blog/my-post', '/blog/:slug'],
+      ['/blog/hello-world', '/blog/:slug'],
+      ['/users/123/posts/456', '/users/:userId/posts/:postId'],
+      ['/users/john/posts/my-post', '/users/:userId/posts/:postId'],
+
+      ['/docs/intro', '/docs/:*'],
+      ['/docs/guide/getting-started', '/docs/:*'],
+
+      ['/unknown-route', undefined],
+      ['/api/unknown', undefined],
+    ])('should handle route "%s" and return %s', (inputRoute, expectedRoute) => {
+      const manifest: RouteManifest = {
+        staticRoutes: [{ path: '/' }, { path: '/about' }, { path: '/contact' }, { path: '/blog/posts' }],
+        dynamicRoutes: [
+          {
+            path: '/users/:id',
+            regex: '^/users/([^/]+)$',
+            paramNames: ['id'],
+          },
+          {
+            path: '/blog/:slug',
+            regex: '^/blog/([^/]+)$',
+            paramNames: ['slug'],
+          },
+          {
+            path: '/users/:userId/posts/:postId',
+            regex: '^/users/([^/]+)/posts/([^/]+)$',
+            paramNames: ['userId', 'postId'],
+          },
+          {
+            path: '/docs/:*',
+            regex: '^/docs/(.+)$',
+            paramNames: ['*'],
+          },
+        ],
+      };
+      globalWithInjectedManifest._sentryRemixRouteManifest = JSON.stringify(manifest);
+
+      if (expectedRoute === undefined) {
+        expect(maybeParameterizeRemixRoute(inputRoute)).toBeUndefined();
+      } else {
+        expect(maybeParameterizeRemixRoute(inputRoute)).toBe(expectedRoute);
+      }
+    });
+  });
+
+  describe('route specificity and precedence', () => {
+    it('should prefer more specific routes over catch-all routes', () => {
+      const manifest: RouteManifest = {
+        staticRoutes: [],
+        dynamicRoutes: [
+          {
+            path: '/:parameter',
+            regex: '^/([^/]+)$',
+            paramNames: ['parameter'],
+          },
+          {
+            path: '/:*',
+            regex: '^/(.+)$',
+            paramNames: ['*'],
+          },
+        ],
+      };
+      globalWithInjectedManifest._sentryRemixRouteManifest = JSON.stringify(manifest);
+
+      // Single segment should match the specific route, not the catch-all
+      expect(maybeParameterizeRemixRoute('/123')).toBe('/:parameter');
+      expect(maybeParameterizeRemixRoute('/abc')).toBe('/:parameter');
+
+      // Multiple segments should match the catch-all
+      expect(maybeParameterizeRemixRoute('/123/456')).toBe('/:*');
+    });
+
+    it('should prefer routes with more static segments', () => {
+      const manifest: RouteManifest = {
+        staticRoutes: [],
+        dynamicRoutes: [
+          {
+            path: '/api/users/:id',
+            regex: '^/api/users/([^/]+)$',
+            paramNames: ['id'],
+          },
+          {
+            path: '/api/:resource/:id',
+            regex: '^/api/([^/]+)/([^/]+)$',
+            paramNames: ['resource', 'id'],
+          },
+          {
+            path: '/:*',
+            regex: '^/(.+)$',
+            paramNames: ['*'],
+          },
+        ],
+      };
+      globalWithInjectedManifest._sentryRemixRouteManifest = JSON.stringify(manifest);
+
+      // More specific route with static segments should win
+      expect(maybeParameterizeRemixRoute('/api/users/123')).toBe('/api/users/:id');
+
+      // Less specific but still targeted route should win over catch-all
+      expect(maybeParameterizeRemixRoute('/api/posts/456')).toBe('/api/:resource/:id');
+
+      // Unmatched patterns should fall back to catch-all
+      expect(maybeParameterizeRemixRoute('/some/other/path')).toBe('/:*');
+    });
+  });
+
+  describe('caching behavior', () => {
+    it('should cache route results', () => {
+      const manifest: RouteManifest = {
+        staticRoutes: [],
+        dynamicRoutes: [
+          {
+            path: '/users/:id',
+            regex: '^/users/([^/]+)$',
+            paramNames: ['id'],
+          },
+        ],
+      };
+      globalWithInjectedManifest._sentryRemixRouteManifest = JSON.stringify(manifest);
+
+      const result1 = maybeParameterizeRemixRoute('/users/123');
+      const result2 = maybeParameterizeRemixRoute('/users/123');
+
+      expect(result1).toBe(result2);
+      expect(result1).toBe('/users/:id');
+    });
+
+    it('should clear cache when manifest changes', () => {
+      const manifest1: RouteManifest = {
+        staticRoutes: [],
+        dynamicRoutes: [
+          {
+            path: '/users/:id',
+            regex: '^/users/([^/]+)$',
+            paramNames: ['id'],
+          },
+        ],
+      };
+      globalWithInjectedManifest._sentryRemixRouteManifest = JSON.stringify(manifest1);
+
+      expect(maybeParameterizeRemixRoute('/users/123')).toBe('/users/:id');
+
+      // Change manifest
+      const manifest2: RouteManifest = {
+        staticRoutes: [],
+        dynamicRoutes: [
+          {
+            path: '/members/:id',
+            regex: '^/members/([^/]+)$',
+            paramNames: ['id'],
+          },
+        ],
+      };
+      globalWithInjectedManifest._sentryRemixRouteManifest = JSON.stringify(manifest2);
+
+      expect(maybeParameterizeRemixRoute('/users/123')).toBeUndefined();
+      expect(maybeParameterizeRemixRoute('/members/123')).toBe('/members/:id');
+    });
+  });
+});
diff --git a/packages/remix/test/config/manifest/createRemixRouteManifest.test.ts b/packages/remix/test/config/manifest/createRemixRouteManifest.test.ts
new file mode 100644
index 000000000000..bdc1a4c5811e
--- /dev/null
+++ b/packages/remix/test/config/manifest/createRemixRouteManifest.test.ts
@@ -0,0 +1,227 @@
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
+import { afterAll, describe, expect, it } from 'vitest';
+import { createRemixRouteManifest } from '../../../src/config/createRemixRouteManifest';
+
+describe('createRemixRouteManifest', () => {
+  const tempDirs: string[] = [];
+
+  function createTestDir(): { tempDir: string; appDir: string; routesDir: string } {
+    const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'remix-test-'));
+    const appDir = path.join(tempDir, 'app');
+    const routesDir = path.join(appDir, 'routes');
+    fs.mkdirSync(routesDir, { recursive: true });
+    tempDirs.push(tempDir);
+    return { tempDir, appDir, routesDir };
+  }
+
+  afterAll(() => {
+    // Clean up all temporary directories
+    tempDirs.forEach(dir => {
+      if (fs.existsSync(dir)) {
+        fs.rmSync(dir, { recursive: true, force: true });
+      }
+    });
+  });
+
+  describe('flat route structure', () => {
+    it('should handle basic flat routes', () => {
+      const { tempDir, routesDir } = createTestDir();
+
+      // Create test route files
+      fs.writeFileSync(path.join(routesDir, 'index.tsx'), '// index route');
+      fs.writeFileSync(path.join(routesDir, 'about.tsx'), '// about route');
+      fs.writeFileSync(path.join(routesDir, 'users.$id.tsx'), '// users dynamic route');
+
+      const manifest = createRemixRouteManifest({ rootDir: tempDir });
+
+      expect(manifest.staticRoutes).toHaveLength(2);
+      expect(manifest.staticRoutes).toContainEqual({ path: '/' });
+      expect(manifest.staticRoutes).toContainEqual({ path: '/about' });
+
+      expect(manifest.dynamicRoutes).toHaveLength(1);
+      expect(manifest.dynamicRoutes[0]).toMatchObject({
+        path: '/users/:id',
+        regex: '^/users/([^/]+)$',
+        paramNames: ['id'],
+      });
+
+      // Clean up
+      fs.unlinkSync(path.join(routesDir, 'index.tsx'));
+      fs.unlinkSync(path.join(routesDir, 'about.tsx'));
+      fs.unlinkSync(path.join(routesDir, 'users.$id.tsx'));
+    });
+  });
+
+  describe('nested route structure', () => {
+    it('should handle nested directory routes', () => {
+      const { tempDir, routesDir } = createTestDir();
+      const usersDir = path.join(routesDir, 'users');
+      fs.mkdirSync(usersDir, { recursive: true });
+
+      fs.writeFileSync(path.join(routesDir, 'index.tsx'), '// root index');
+      fs.writeFileSync(path.join(usersDir, '$id.tsx'), '// user id');
+      fs.writeFileSync(path.join(usersDir, 'index.tsx'), '// users index');
+
+      const manifest = createRemixRouteManifest({ rootDir: tempDir });
+
+      expect(manifest.staticRoutes).toContainEqual({ path: '/' });
+      expect(manifest.staticRoutes).toContainEqual({ path: '/users' });
+
+      expect(manifest.dynamicRoutes).toContainEqual(
+        expect.objectContaining({
+          path: '/users/:id',
+          regex: '^/users/([^/]+)$',
+          paramNames: ['id'],
+        }),
+      );
+    });
+
+    it('should handle deeply nested routes', () => {
+      const { tempDir, routesDir } = createTestDir();
+      const usersDir = path.join(routesDir, 'users');
+      const userIdDir = path.join(usersDir, '$id');
+      const postsDir = path.join(userIdDir, 'posts');
+
+      fs.mkdirSync(postsDir, { recursive: true });
+
+      fs.writeFileSync(path.join(userIdDir, 'index.tsx'), '// user index');
+      fs.writeFileSync(path.join(postsDir, '$postId.tsx'), '// post id');
+
+      const manifest = createRemixRouteManifest({ rootDir: tempDir });
+
+      // users/$id/index.tsx should map to /users/:id (dynamic route)
+      expect(manifest.dynamicRoutes).toContainEqual(
+        expect.objectContaining({
+          path: '/users/:id',
+          regex: '^/users/([^/]+)$',
+          paramNames: ['id'],
+        }),
+      );
+
+      // users/$id/posts/$postId.tsx should map to /users/:id/posts/:postId
+      expect(manifest.dynamicRoutes).toContainEqual(
+        expect.objectContaining({
+          path: '/users/:id/posts/:postId',
+          regex: '^/users/([^/]+)/posts/([^/]+)$',
+          paramNames: ['id', 'postId'],
+        }),
+      );
+    });
+
+    it('should handle mixed flat and nested routes', () => {
+      const { tempDir, routesDir } = createTestDir();
+      const usersDir = path.join(routesDir, 'users');
+      fs.mkdirSync(usersDir, { recursive: true });
+
+      fs.writeFileSync(path.join(routesDir, 'index.tsx'), '// root');
+      fs.writeFileSync(path.join(routesDir, 'about.tsx'), '// about');
+      fs.writeFileSync(path.join(usersDir, '$id.tsx'), '// user');
+
+      const manifest = createRemixRouteManifest({ rootDir: tempDir });
+
+      expect(manifest.staticRoutes).toContainEqual({ path: '/' });
+      expect(manifest.staticRoutes).toContainEqual({ path: '/about' });
+
+      expect(manifest.dynamicRoutes).toContainEqual(
+        expect.objectContaining({
+          path: '/users/:id',
+          regex: '^/users/([^/]+)$',
+          paramNames: ['id'],
+        }),
+      );
+    });
+  });
+
+  describe('_index route handling', () => {
+    it('should handle root _index route', () => {
+      const { tempDir, routesDir } = createTestDir();
+
+      fs.writeFileSync(path.join(routesDir, '_index.tsx'), '// root index');
+
+      const manifest = createRemixRouteManifest({ rootDir: tempDir });
+
+      expect(manifest.staticRoutes).toHaveLength(1);
+      expect(manifest.staticRoutes).toContainEqual({ path: '/' });
+    });
+
+    it('should handle nested _index routes using flat file convention', () => {
+      const { tempDir, routesDir } = createTestDir();
+
+      // Flat file convention: users._index.tsx represents /users index
+      fs.writeFileSync(path.join(routesDir, '_index.tsx'), '// root index');
+      fs.writeFileSync(path.join(routesDir, 'users._index.tsx'), '// users index');
+      fs.writeFileSync(path.join(routesDir, 'users.$id.tsx'), '// user detail');
+
+      const manifest = createRemixRouteManifest({ rootDir: tempDir });
+
+      // Both root and users index should map to their parent paths
+      expect(manifest.staticRoutes).toContainEqual({ path: '/' });
+      expect(manifest.staticRoutes).toContainEqual({ path: '/users' });
+
+      // users.$id.tsx should be a dynamic route
+      expect(manifest.dynamicRoutes).toContainEqual(
+        expect.objectContaining({
+          path: '/users/:id',
+          regex: '^/users/([^/]+)$',
+          paramNames: ['id'],
+        }),
+      );
+
+      // Should NOT contain /users/_index as a path
+      expect(manifest.staticRoutes).not.toContainEqual({ path: '/users/_index' });
+    });
+
+    it('should handle deeply nested _index routes', () => {
+      const { tempDir, routesDir } = createTestDir();
+
+      // Flat file convention for deeply nested index
+      fs.writeFileSync(path.join(routesDir, 'admin.settings._index.tsx'), '// admin settings index');
+
+      const manifest = createRemixRouteManifest({ rootDir: tempDir });
+
+      expect(manifest.staticRoutes).toContainEqual({ path: '/admin/settings' });
+      expect(manifest.staticRoutes).not.toContainEqual({ path: '/admin/settings/_index' });
+    });
+
+    it('should handle _index in directory-based nested routes', () => {
+      const { tempDir, routesDir } = createTestDir();
+      const usersDir = path.join(routesDir, 'users');
+      fs.mkdirSync(usersDir, { recursive: true });
+
+      fs.writeFileSync(path.join(routesDir, '_index.tsx'), '// root index');
+      fs.writeFileSync(path.join(usersDir, '_index.tsx'), '// users index');
+      fs.writeFileSync(path.join(usersDir, '$id.tsx'), '// user detail');
+
+      const manifest = createRemixRouteManifest({ rootDir: tempDir });
+
+      expect(manifest.staticRoutes).toContainEqual({ path: '/' });
+      expect(manifest.staticRoutes).toContainEqual({ path: '/users' });
+      expect(manifest.dynamicRoutes).toContainEqual(
+        expect.objectContaining({
+          path: '/users/:id',
+        }),
+      );
+    });
+
+    it('should handle _index with layout routes', () => {
+      const { tempDir, routesDir } = createTestDir();
+
+      // _auth is a pathless layout, _auth._index is its index
+      fs.writeFileSync(path.join(routesDir, '_auth.tsx'), '// auth layout');
+      fs.writeFileSync(path.join(routesDir, '_auth._index.tsx'), '// auth index');
+      fs.writeFileSync(path.join(routesDir, '_auth.login.tsx'), '// login page');
+
+      const manifest = createRemixRouteManifest({ rootDir: tempDir });
+
+      // _auth layout should be excluded (pathless layout)
+      // _auth._index should map to / (root under pathless layout)
+      // _auth.login should map to /login
+      expect(manifest.staticRoutes).toContainEqual({ path: '/' });
+      expect(manifest.staticRoutes).toContainEqual({ path: '/login' });
+      expect(manifest.staticRoutes).not.toContainEqual({ path: '/_auth' });
+      expect(manifest.staticRoutes).not.toContainEqual({ path: '/_auth/_index' });
+    });
+  });
+});
diff --git a/packages/remix/test/config/vite.test.ts b/packages/remix/test/config/vite.test.ts
new file mode 100644
index 000000000000..2f3ccc5464ca
--- /dev/null
+++ b/packages/remix/test/config/vite.test.ts
@@ -0,0 +1,629 @@
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
+import type { Plugin, ResolvedConfig } from 'vite';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { sentryRemixVitePlugin } from '../../src/config/vite';
+
+describe('sentryRemixVitePlugin', () => {
+  let tempDir: string;
+  let appDir: string;
+  let routesDir: string;
+  let consoleLogSpy: ReturnType<typeof vi.spyOn>;
+  let consoleErrorSpy: ReturnType<typeof vi.spyOn>;
+
+  beforeEach(() => {
+    // Create a temporary directory for test fixtures
+    tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'vite-plugin-test-'));
+    appDir = path.join(tempDir, 'app');
+    routesDir = path.join(appDir, 'routes');
+    fs.mkdirSync(routesDir, { recursive: true });
+
+    // Spy on console methods
+    consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
+    consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+  });
+
+  afterEach(() => {
+    // Clean up
+    if (fs.existsSync(tempDir)) {
+      fs.rmSync(tempDir, { recursive: true, force: true });
+    }
+    consoleLogSpy.mockRestore();
+    consoleErrorSpy.mockRestore();
+  });
+
+  describe('plugin configuration', () => {
+    it('should return a valid Vite plugin with correct name', () => {
+      const plugin = sentryRemixVitePlugin();
+
+      expect(plugin).toBeDefined();
+      expect(plugin.name).toBe('sentry-remix-route-manifest');
+      expect(plugin.enforce).toBe('post');
+    });
+
+    it('should accept custom appDirPath option', () => {
+      const plugin = sentryRemixVitePlugin({ appDirPath: '/custom/path' });
+
+      expect(plugin).toBeDefined();
+    });
+
+    it('should work with no options', () => {
+      const plugin = sentryRemixVitePlugin();
+
+      expect(plugin).toBeDefined();
+    });
+  });
+
+  describe('configResolved hook', () => {
+    it('should generate route manifest from routes directory', () => {
+      // Create test routes
+      fs.writeFileSync(path.join(routesDir, 'index.tsx'), '// index');
+      fs.writeFileSync(path.join(routesDir, 'about.tsx'), '// about');
+      fs.writeFileSync(path.join(routesDir, 'users.$id.tsx'), '// users');
+
+      const plugin = sentryRemixVitePlugin() as Plugin & {
+        configResolved: (config: ResolvedConfig) => void;
+      };
+
+      const mockConfig: Partial<ResolvedConfig> = {
+        root: tempDir,
+        command: 'build',
+        mode: 'production',
+      };
+
+      plugin.configResolved(mockConfig);
+
+      // Should not log in production mode
+      expect(consoleLogSpy).not.toHaveBeenCalled();
+      expect(consoleErrorSpy).not.toHaveBeenCalled();
+    });
+
+    it('should log manifest info in development mode', () => {
+      fs.writeFileSync(path.join(routesDir, 'index.tsx'), '// index');
+      fs.writeFileSync(path.join(routesDir, 'users.$id.tsx'), '// users');
+
+      const plugin = sentryRemixVitePlugin() as Plugin & {
+        configResolved: (config: ResolvedConfig) => void;
+      };
+
+      const mockConfig: Partial<ResolvedConfig> = {
+        root: tempDir,
+        command: 'serve',
+        mode: 'development',
+      };
+
+      plugin.configResolved(mockConfig);
+
+      expect(consoleLogSpy).toHaveBeenCalledWith(
+        expect.stringContaining('[Sentry Remix] Found 1 static and 1 dynamic routes'),
+      );
+    });
+
+    it('should handle errors gracefully and set empty manifest', () => {
+      const plugin = sentryRemixVitePlugin({ appDirPath: '/nonexistent/path' }) as Plugin & {
+        configResolved: (config: ResolvedConfig) => void;
+      };
+
+      const mockConfig: Partial<ResolvedConfig> = {
+        root: tempDir,
+        command: 'build',
+        mode: 'production',
+      };
+
+      // Should not throw
+      expect(() => plugin.configResolved(mockConfig)).not.toThrow();
+
+      // Should log error but not crash
+      expect(consoleErrorSpy).not.toHaveBeenCalled(); // No error if directory doesn't exist
+    });
+
+    it('should use custom appDirPath when provided', () => {
+      const customAppDir = path.join(tempDir, 'custom-app');
+      const customRoutesDir = path.join(customAppDir, 'routes');
+      fs.mkdirSync(customRoutesDir, { recursive: true });
+      fs.writeFileSync(path.join(customRoutesDir, 'index.tsx'), '// index');
+
+      const plugin = sentryRemixVitePlugin({ appDirPath: customAppDir }) as Plugin & {
+        configResolved: (config: ResolvedConfig) => void;
+      };
+
+      const mockConfig: Partial<ResolvedConfig> = {
+        root: tempDir,
+        command: 'serve',
+        mode: 'development',
+      };
+
+      plugin.configResolved(mockConfig);
+
+      expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining('[Sentry Remix] Found 1 static'));
+    });
+  });
+
+  describe('transformIndexHtml hook', () => {
+    it('should inject manifest into HTML with <head> tag', () => {
+      fs.writeFileSync(path.join(routesDir, 'index.tsx'), '// index');
+
+      const plugin = sentryRemixVitePlugin() as Plugin & {
+        configResolved: (config: ResolvedConfig) => void;
+        transformIndexHtml: {
+          order: string;
+          handler: (html: string) => string;
+        };
+      };
+
+      const mockConfig: Partial<ResolvedConfig> = {
+        root: tempDir,
+        command: 'build',
+        mode: 'production',
+      };
+
+      plugin.configResolved(mockConfig);
+
+      const html = '<html><head><title>Test</title></head><body></body></html>';
+      const result = plugin.transformIndexHtml.handler(html);
+
+      expect(result).toContain('<head>');
+      expect(result).toContain('window._sentryRemixRouteManifest');
+      expect(result).toContain('<script>');
+      expect(result).toMatch(/<head>\s*<script>/);
+    });
+
+    it('should handle HTML without <head> tag by creating one', () => {
+      fs.writeFileSync(path.join(routesDir, 'index.tsx'), '// index');
+
+      const plugin = sentryRemixVitePlugin() as Plugin & {
+        configResolved: (config: ResolvedConfig) => void;
+        transformIndexHtml: {
+          order: string;
+          handler: (html: string) => string;
+        };
+      };
+
+      const mockConfig: Partial<ResolvedConfig> = {
+        root: tempDir,
+        command: 'build',
+        mode: 'production',
+      };
+
+      plugin.configResolved(mockConfig);
+
+      const html = '<html><body>Content</body></html>';
+      const result = plugin.transformIndexHtml.handler(html);
+
+      expect(result).toContain('<head>');
+      expect(result).toContain('window._sentryRemixRouteManifest');
+    });
+
+    it('should handle HTML with uppercase <HEAD> tag', () => {
+      fs.writeFileSync(path.join(routesDir, 'index.tsx'), '// index');
+
+      const plugin = sentryRemixVitePlugin() as Plugin & {
+        configResolved: (config: ResolvedConfig) => void;
+        transformIndexHtml: {
+          order: string;
+          handler: (html: string) => string;
+        };
+      };
+
+      const mockConfig: Partial<ResolvedConfig> = {
+        root: tempDir,
+        command: 'build',
+        mode: 'production',
+      };
+
+      plugin.configResolved(mockConfig);
+
+      const html = '<HTML><HEAD><TITLE>Test</TITLE></HEAD><BODY></BODY></HTML>';
+      const result = plugin.transformIndexHtml.handler(html);
+
+      expect(result).toContain('window._sentryRemixRouteManifest');
+    });
+
+    it('should handle minimal HTML by wrapping it', () => {
+      fs.writeFileSync(path.join(routesDir, 'index.tsx'), '// index');
+
+      const plugin = sentryRemixVitePlugin() as Plugin & {
+        configResolved: (config: ResolvedConfig) => void;
+        transformIndexHtml: {
+          order: string;
+          handler: (html: string) => string;
+        };
+      };
+
+      const mockConfig: Partial<ResolvedConfig> = {
+        root: tempDir,
+        command: 'build',
+        mode: 'production',
+      };
+
+      plugin.configResolved(mockConfig);
+
+      const html = '<div>Content</div>';
+      const result = plugin.transformIndexHtml.handler(html);
+
+      expect(result).toContain('<!DOCTYPE html>');
+      expect(result).toContain('<head>');
+      expect(result).toContain('window._sentryRemixRouteManifest');
+    });
+
+    it('should properly escape manifest JSON', () => {
+      // Create a route that might have special characters
+      fs.writeFileSync(path.join(routesDir, 'test.tsx'), '// test');
+
+      const plugin = sentryRemixVitePlugin() as Plugin & {
+        configResolved: (config: ResolvedConfig) => void;
+        transformIndexHtml: {
+          order: string;
+          handler: (html: string) => string;
+        };
+      };
+
+      const mockConfig: Partial<ResolvedConfig> = {
+        root: tempDir,
+        command: 'build',
+        mode: 'production',
+      };
+
+      plugin.configResolved(mockConfig);
+
+      const html = '<html><head></head><body></body></html>';
+      const result = plugin.transformIndexHtml.handler(html);
+
+      // Check that the JSON is properly escaped (no unescaped quotes that would break JS)
+      expect(result).toMatch(/window\._sentryRemixRouteManifest = "[^"]*"/);
+    });
+
+    it('should escape HTML-dangerous sequences to prevent XSS attacks', () => {
+      // Create a route file with a name that could be used for XSS injection
+      // The path "</script><script>alert(1)</script>" would break out of the script tag
+      // without proper escaping
+      fs.writeFileSync(path.join(routesDir, 'index.tsx'), '// test');
+
+      const plugin = sentryRemixVitePlugin() as Plugin & {
+        configResolved: (config: ResolvedConfig) => void;
+        transformIndexHtml: {
+          order: string;
+          handler: (html: string) => string;
+        };
+        transform: (code: string, id: string) => { code: string; map: null } | null;
+      };
+
+      const mockConfig: Partial<ResolvedConfig> = {
+        root: tempDir,
+        command: 'build',
+        mode: 'production',
+      };
+
+      plugin.configResolved(mockConfig);
+
+      // Test transformIndexHtml
+      const html = '<html><head></head><body></body></html>';
+      const htmlResult = plugin.transformIndexHtml.handler(html);
+
+      // Should NOT contain unescaped </script> that could break out of script context
+      // The </script> in route paths must be escaped as <\/script>
+      expect(htmlResult).not.toMatch(/<\/script>.*<\/script>.*<\/script>/);
+
+      // The output should be valid - only one closing script tag for the injected script
+      const scriptTagCount = (htmlResult.match(/<\/script>/g) || []).length;
+      expect(scriptTagCount).toBe(1);
+
+      // Test transform (client entry)
+      const clientCode = 'console.log("entry");';
+      const clientResult = plugin.transform(clientCode, '/app/entry.client.tsx');
+      expect(clientResult).not.toBeNull();
+
+      // Verify no unescaped </script> in the transform output either
+      expect(clientResult?.code).not.toContain('</script>');
+    });
+  });
+
+  describe('transform hook', () => {
+    it('should inject manifest into entry.client.tsx file', () => {
+      fs.writeFileSync(path.join(routesDir, 'index.tsx'), '// index');
+
+      const plugin = sentryRemixVitePlugin() as Plugin & {
+        configResolved: (config: ResolvedConfig) => void;
+        transform: (code: string, id: string) => { code: string; map: null } | null;
+      };
+
+      const mockConfig: Partial<ResolvedConfig> = {
+        root: tempDir,
+        command: 'build',
+        mode: 'production',
+      };
+
+      plugin.configResolved(mockConfig);
+
+      const code = 'console.log("entry client");';
+      const id = '/app/entry.client.tsx';
+      const result = plugin.transform(code, id);
+
+      expect(result).not.toBeNull();
+      expect(result?.code).toContain('window._sentryRemixRouteManifest');
+      expect(result?.code).toContain(code);
+      expect(result?.code).toContain("typeof window !== 'undefined'");
+    });
+
+    it('should inject manifest into entry-client.ts file', () => {
+      fs.writeFileSync(path.join(routesDir, 'index.tsx'), '// index');
+
+      const plugin = sentryRemixVitePlugin() as Plugin & {
+        configResolved: (config: ResolvedConfig) => void;
+        transform: (code: string, id: string) => { code: string; map: null } | null;
+      };
+
+      const mockConfig: Partial<ResolvedConfig> = {
+        root: tempDir,
+        command: 'build',
+        mode: 'production',
+      };
+
+      plugin.configResolved(mockConfig);
+
+      const code = 'console.log("entry client");';
+      const id = '/app/entry-client.ts';
+      const result = plugin.transform(code, id);
+
+      expect(result).not.toBeNull();
+      expect(result?.code).toContain('window._sentryRemixRouteManifest');
+    });
+
+    it('should not inject into non-entry files', () => {
+      fs.writeFileSync(path.join(routesDir, 'index.tsx'), '// index');
+
+      const plugin = sentryRemixVitePlugin() as Plugin & {
+        configResolved: (config: ResolvedConfig) => void;
+        transform: (code: string, id: string) => { code: string; map: null } | null;
+      };
+
+      const mockConfig: Partial<ResolvedConfig> = {
+        root: tempDir,
+        command: 'build',
+        mode: 'production',
+      };
+
+      plugin.configResolved(mockConfig);
+
+      const code = 'console.log("some file");';
+      const id = '/app/routes/index.tsx';
+      const result = plugin.transform(code, id);
+
+      expect(result).toBeNull();
+    });
+
+    it('should inject manifest into entry.server.tsx for server-side transaction naming', () => {
+      fs.writeFileSync(path.join(routesDir, 'index.tsx'), '// index');
+
+      const plugin = sentryRemixVitePlugin() as Plugin & {
+        configResolved: (config: ResolvedConfig) => void;
+        transform: (code: string, id: string) => { code: string; map: null } | null;
+      };
+
+      const mockConfig: Partial<ResolvedConfig> = {
+        root: tempDir,
+        command: 'build',
+        mode: 'production',
+      };
+
+      plugin.configResolved(mockConfig);
+
+      const code = 'console.log("entry server");';
+      const id = '/app/entry.server.tsx';
+      const result = plugin.transform(code, id);
+
+      expect(result).not.toBeNull();
+      expect(result?.code).toContain('globalThis._sentryRemixRouteManifest');
+      expect(result?.code).toContain(code);
+      expect(result?.code).toContain("typeof globalThis !== 'undefined'");
+    });
+
+    it('should handle files with "entry.client" in path', () => {
+      fs.writeFileSync(path.join(routesDir, 'index.tsx'), '// index');
+
+      const plugin = sentryRemixVitePlugin() as Plugin & {
+        configResolved: (config: ResolvedConfig) => void;
+        transform: (code: string, id: string) => { code: string; map: null } | null;
+      };
+
+      const mockConfig: Partial<ResolvedConfig> = {
+        root: tempDir,
+        command: 'build',
+        mode: 'production',
+      };
+
+      plugin.configResolved(mockConfig);
+
+      const code = 'console.log("entry client");';
+      const id = '/some/path/entry.client.js';
+      const result = plugin.transform(code, id);
+
+      expect(result).not.toBeNull();
+      expect(result?.code).toContain('window._sentryRemixRouteManifest');
+    });
+
+    it('should not double-inject if transformIndexHtml already ran', () => {
+      fs.writeFileSync(path.join(routesDir, 'index.tsx'), '// index');
+
+      const plugin = sentryRemixVitePlugin() as Plugin & {
+        configResolved: (config: ResolvedConfig) => void;
+        transform: (code: string, id: string) => { code: string; map: null } | null;
+      };
+
+      const mockConfig: Partial<ResolvedConfig> = {
+        root: tempDir,
+        command: 'build',
+        mode: 'production',
+      };
+
+      plugin.configResolved(mockConfig);
+
+      const code = 'console.log("entry client");';
+      const id = '/app/entry.client.tsx';
+      const result = plugin.transform(code, id);
+
+      // Should have conditional check to avoid overwriting
+      expect(result?.code).toMatch(/window\._sentryRemixRouteManifest = window\._sentryRemixRouteManifest \|\|/);
+    });
+  });
+
+  describe('manifest content', () => {
+    it('should include both static and dynamic routes in manifest', () => {
+      fs.writeFileSync(path.join(routesDir, 'index.tsx'), '// index');
+      fs.writeFileSync(path.join(routesDir, 'about.tsx'), '// about');
+      fs.writeFileSync(path.join(routesDir, 'users.$id.tsx'), '// users');
+
+      const plugin = sentryRemixVitePlugin() as Plugin & {
+        configResolved: (config: ResolvedConfig) => void;
+        transformIndexHtml: {
+          order: string;
+          handler: (html: string) => string;
+        };
+      };
+
+      const mockConfig: Partial<ResolvedConfig> = {
+        root: tempDir,
+        command: 'build',
+        mode: 'production',
+      };
+
+      plugin.configResolved(mockConfig);
+
+      const html = '<html><head></head><body></body></html>';
+      const result = plugin.transformIndexHtml.handler(html);
+
+      // Extract the manifest from the result
+      // The manifest is double-stringified: once by createRemixRouteManifest, then again for injection
+      const match = result.match(/window\._sentryRemixRouteManifest = (".*?");/);
+      expect(match).toBeTruthy();
+
+      if (match?.[1]) {
+        // First parse to get the JSON string, then parse again to get the object
+        const manifestJsonString = JSON.parse(match[1]);
+        const manifest = JSON.parse(manifestJsonString);
+
+        expect(manifest.staticRoutes).toHaveLength(2);
+        expect(manifest.dynamicRoutes).toHaveLength(1);
+        expect(manifest.dynamicRoutes[0].path).toBe('/users/:id');
+      }
+    });
+
+    it('should handle nested routes in manifest', () => {
+      const usersDir = path.join(routesDir, 'users');
+      fs.mkdirSync(usersDir);
+      fs.writeFileSync(path.join(usersDir, '$id.tsx'), '// user');
+
+      const plugin = sentryRemixVitePlugin() as Plugin & {
+        configResolved: (config: ResolvedConfig) => void;
+        transformIndexHtml: {
+          order: string;
+          handler: (html: string) => string;
+        };
+      };
+
+      const mockConfig: Partial<ResolvedConfig> = {
+        root: tempDir,
+        command: 'build',
+        mode: 'production',
+      };
+
+      plugin.configResolved(mockConfig);
+
+      const html = '<html><head></head><body></body></html>';
+      const result = plugin.transformIndexHtml.handler(html);
+
+      expect(result).toContain('window._sentryRemixRouteManifest');
+
+      // Extract and verify the manifest contains the nested route
+      // The manifest is double-stringified: once by createRemixRouteManifest, then again for injection
+      const match = result.match(/window\._sentryRemixRouteManifest = (".*?");/);
+      expect(match).toBeTruthy();
+
+      if (match?.[1]) {
+        // First parse to get the JSON string, then parse again to get the object
+        const manifestJsonString = JSON.parse(match[1]);
+        const manifest = JSON.parse(manifestJsonString);
+        expect(manifest.dynamicRoutes).toHaveLength(1);
+        expect(manifest.dynamicRoutes[0].path).toBe('/users/:id');
+      }
+    });
+
+    it('should inject manifest into entry-server.ts file', () => {
+      fs.writeFileSync(path.join(routesDir, 'index.tsx'), '// index');
+
+      const plugin = sentryRemixVitePlugin() as Plugin & {
+        configResolved: (config: ResolvedConfig) => void;
+        transform: (code: string, id: string) => { code: string; map: null } | null;
+      };
+
+      const mockConfig: Partial<ResolvedConfig> = {
+        root: tempDir,
+        command: 'build',
+        mode: 'production',
+      };
+
+      plugin.configResolved(mockConfig);
+
+      const code = 'console.log("entry server");';
+      const id = '/app/entry-server.ts';
+      const result = plugin.transform(code, id);
+
+      expect(result).not.toBeNull();
+      expect(result?.code).toContain('globalThis._sentryRemixRouteManifest');
+    });
+
+    it('should handle files with "entry.server" in path', () => {
+      fs.writeFileSync(path.join(routesDir, 'index.tsx'), '// index');
+
+      const plugin = sentryRemixVitePlugin() as Plugin & {
+        configResolved: (config: ResolvedConfig) => void;
+        transform: (code: string, id: string) => { code: string; map: null } | null;
+      };
+
+      const mockConfig: Partial<ResolvedConfig> = {
+        root: tempDir,
+        command: 'build',
+        mode: 'production',
+      };
+
+      plugin.configResolved(mockConfig);
+
+      const code = 'console.log("entry server");';
+      const id = '/some/path/entry.server.js';
+      const result = plugin.transform(code, id);
+
+      expect(result).not.toBeNull();
+      expect(result?.code).toContain('globalThis._sentryRemixRouteManifest');
+    });
+
+    it('should inject manifest into Hydrogen/Cloudflare server.ts files', () => {
+      fs.writeFileSync(path.join(routesDir, 'index.tsx'), '// index');
+
+      const plugin = sentryRemixVitePlugin() as Plugin & {
+        configResolved: (config: ResolvedConfig) => void;
+        transform: (code: string, id: string) => { code: string; map: null } | null;
+      };
+
+      const mockConfig: Partial<ResolvedConfig> = {
+        root: tempDir,
+        command: 'build',
+        mode: 'production',
+      };
+
+      plugin.configResolved(mockConfig);
+
+      const code = 'console.log("Hydrogen server");';
+
+      // Test various server.ts paths
+      const paths = ['/app/server.ts', 'server.ts', '/Users/project/server.ts'];
+
+      paths.forEach(id => {
+        const result = plugin.transform(code, id);
+        expect(result).not.toBeNull();
+        expect(result?.code).toContain('globalThis._sentryRemixRouteManifest');
+        expect(result?.code).toContain('console.log("Hydrogen server");');
+      });
+    });
+  });
+});
diff --git a/packages/remix/test/integration/app/routes/api.v1.data.$id.tsx b/packages/remix/test/integration/app/routes/api.v1.data.$id.tsx
new file mode 100644
index 000000000000..3ab0454a50b8
--- /dev/null
+++ b/packages/remix/test/integration/app/routes/api.v1.data.$id.tsx
@@ -0,0 +1,10 @@
+import type { LoaderFunctionArgs } from '@remix-run/node';
+import { json } from '@remix-run/node';
+
+export const loader = async ({ params }: LoaderFunctionArgs) => {
+  return json({
+    id: params.id,
+    api_version: 'v1',
+    data: { nested: true, level: 3 },
+  });
+};
diff --git a/packages/remix/test/integration/app/routes/deeply.$nested.$structure.$id.tsx b/packages/remix/test/integration/app/routes/deeply.$nested.$structure.$id.tsx
new file mode 100644
index 000000000000..0d65b9c0ad02
--- /dev/null
+++ b/packages/remix/test/integration/app/routes/deeply.$nested.$structure.$id.tsx
@@ -0,0 +1,26 @@
+import type { LoaderFunctionArgs } from '@remix-run/node';
+import { json } from '@remix-run/node';
+import { useLoaderData } from '@remix-run/react';
+
+export const loader = async ({ params }: LoaderFunctionArgs) => {
+  return json({
+    nested: params.nested,
+    structure: params.structure,
+    id: params.id,
+    depth: 4,
+  });
+};
+
+export default function DeeplyNested() {
+  const data = useLoaderData<typeof loader>();
+
+  return (
+    <div>
+      <h1>Deeply Nested Route Test (Flat Syntax)</h1>
+      <p>Nested: {data.nested}</p>
+      <p>Structure: {data.structure}</p>
+      <p>ID: {data.id}</p>
+      <p>Depth: {data.depth} levels</p>
+    </div>
+  );
+}
diff --git a/packages/remix/test/integration/app/routes/manual-tracing.$id.tsx b/packages/remix/test/integration/app/routes/manual-tracing.$id.tsx
index 1a3cc359c7c1..1d972ca28e0a 100644
--- a/packages/remix/test/integration/app/routes/manual-tracing.$id.tsx
+++ b/packages/remix/test/integration/app/routes/manual-tracing.$id.tsx
@@ -1,10 +1,14 @@
+import { useEffect } from 'react';
 import * as Sentry from '@sentry/remix';
 
 export default function ManualTracing() {
-  const span = Sentry.startInactiveSpan({
-    name: 'test_transaction_1',
-    forceTransaction: true,
-  });
-  span.end();
+  useEffect(() => {
+    const span = Sentry.startInactiveSpan({
+      name: 'test_transaction_1',
+      forceTransaction: true,
+    });
+    span.end();
+  }, []);
+
   return <div />;
 }
diff --git a/packages/remix/test/integration/app/routes/products.$productId.reviews.$reviewId.tsx b/packages/remix/test/integration/app/routes/products.$productId.reviews.$reviewId.tsx
new file mode 100644
index 000000000000..65e0972de887
--- /dev/null
+++ b/packages/remix/test/integration/app/routes/products.$productId.reviews.$reviewId.tsx
@@ -0,0 +1,24 @@
+import type { LoaderFunctionArgs } from '@remix-run/node';
+import { json } from '@remix-run/node';
+import { useLoaderData } from '@remix-run/react';
+
+export const loader = async ({ params }: LoaderFunctionArgs) => {
+  return json({
+    productId: params.productId,
+    reviewId: params.reviewId,
+    pattern: 'flat-dot-notation',
+  });
+};
+
+export default function ProductReview() {
+  const data = useLoaderData<typeof loader>();
+
+  return (
+    <div>
+      <h1>Flat Route Pattern Test</h1>
+      <p>Product ID: {data.productId}</p>
+      <p>Review ID: {data.reviewId}</p>
+      <p>Pattern: {data.pattern}</p>
+    </div>
+  );
+}
diff --git a/packages/remix/test/integration/app/routes/users.$userId.posts.$postId.tsx b/packages/remix/test/integration/app/routes/users.$userId.posts.$postId.tsx
new file mode 100644
index 000000000000..36f5c919531d
--- /dev/null
+++ b/packages/remix/test/integration/app/routes/users.$userId.posts.$postId.tsx
@@ -0,0 +1,24 @@
+import type { LoaderFunctionArgs } from '@remix-run/node';
+import { json } from '@remix-run/node';
+import { useLoaderData } from '@remix-run/react';
+
+export const loader = async ({ params }: LoaderFunctionArgs) => {
+  return json({
+    userId: params.userId,
+    postId: params.postId,
+    timestamp: Date.now(),
+  });
+};
+
+export default function UserPost() {
+  const data = useLoaderData<typeof loader>();
+
+  return (
+    <div>
+      <h1>Nested Route Test (Flat Syntax)</h1>
+      <p>User ID: {data.userId}</p>
+      <p>Post ID: {data.postId}</p>
+      <p>Timestamp: {data.timestamp}</p>
+    </div>
+  );
+}
diff --git a/packages/remix/test/integration/package.json b/packages/remix/test/integration/package.json
index d138a0eb8eaa..e776c44c3b47 100644
--- a/packages/remix/test/integration/package.json
+++ b/packages/remix/test/integration/package.json
@@ -3,9 +3,9 @@
   "sideEffects": false,
   "type": "module",
   "scripts": {
-    "build": "remix build",
-    "dev": "remix dev",
-    "start": "NODE_OPTIONS='--import=./instrument.server.mjs' remix-serve build/index.js"
+    "build": "vite build && vite build --ssr",
+    "dev": "remix vite:dev",
+    "start": "NODE_OPTIONS='--import=./instrument.server.mjs' remix-serve build/server/index.js"
   },
   "dependencies": {
     "@remix-run/express": "2.16.3",
@@ -21,7 +21,8 @@
     "@types/react": "^18",
     "@types/react-dom": "^18",
     "nock": "^13.5.5",
-    "typescript": "~5.8.0"
+    "typescript": "~5.8.0",
+    "vite": "^5.0.0"
   },
   "resolutions": {
     "@sentry/browser": "file:../../../browser",
diff --git a/packages/remix/test/integration/regexPatternValidation.test.ts b/packages/remix/test/integration/regexPatternValidation.test.ts
new file mode 100644
index 000000000000..77b6f99162eb
--- /dev/null
+++ b/packages/remix/test/integration/regexPatternValidation.test.ts
@@ -0,0 +1,235 @@
+import { describe, expect, it } from 'vitest';
+import { createRemixRouteManifest } from '../../src/config/createRemixRouteManifest';
+
+describe('Regex Pattern Validation', () => {
+  describe('Dynamic route regex patterns', () => {
+    it('should generate regex that matches simple dynamic segments', () => {
+      const manifest = createRemixRouteManifest({ rootDir: './test/fixtures/app-basic' });
+      const userIdRoute = manifest.dynamicRoutes.find(r => r.path === '/users/:id');
+
+      expect(userIdRoute).toBeDefined();
+      expect(userIdRoute?.regex).toBeDefined();
+
+      const regex = new RegExp(userIdRoute!.regex!);
+      expect(regex.test('/users/123')).toBe(true);
+      expect(regex.test('/users/abc')).toBe(true);
+      expect(regex.test('/users/user-123')).toBe(true);
+      expect(regex.test('/users')).toBe(false);
+      expect(regex.test('/users/')).toBe(false);
+      expect(regex.test('/users/123/posts')).toBe(false);
+    });
+
+    it('should generate regex that matches nested dynamic segments', () => {
+      const manifest = createRemixRouteManifest({ rootDir: './test/fixtures/app-basic' });
+      const nestedRoute = manifest.dynamicRoutes.find(r => r.path === '/users/:userId/posts/:postId');
+
+      expect(nestedRoute).toBeDefined();
+      expect(nestedRoute?.regex).toBeDefined();
+
+      const regex = new RegExp(nestedRoute!.regex!);
+      expect(regex.test('/users/123/posts/456')).toBe(true);
+      expect(regex.test('/users/abc/posts/def')).toBe(true);
+      expect(regex.test('/users/123/posts')).toBe(false);
+      expect(regex.test('/users/123')).toBe(false);
+      expect(regex.test('/users/123/posts/456/comments')).toBe(false);
+    });
+
+    it('should generate regex that matches splat routes', () => {
+      const manifest = createRemixRouteManifest({ rootDir: './test/fixtures/app-basic' });
+      const splatRoute = manifest.dynamicRoutes.find(r => r.path === '/docs/:*');
+
+      expect(splatRoute).toBeDefined();
+      expect(splatRoute?.regex).toBeDefined();
+
+      const regex = new RegExp(splatRoute!.regex!);
+      expect(regex.test('/docs/intro')).toBe(true);
+      expect(regex.test('/docs/getting-started')).toBe(true);
+      expect(regex.test('/docs/api/users')).toBe(true);
+      expect(regex.test('/docs/api/users/create')).toBe(true);
+      expect(regex.test('/docs')).toBe(false);
+      expect(regex.test('/docs/')).toBe(false);
+    });
+
+    it('should generate regex that matches root splat routes', () => {
+      const manifest = createRemixRouteManifest({ rootDir: './test/fixtures/app-basic' });
+      const rootSplatRoute = manifest.dynamicRoutes.find(r => r.path === '/:*');
+
+      if (rootSplatRoute) {
+        const regex = new RegExp(rootSplatRoute.regex!);
+        expect(regex.test('/anything')).toBe(true);
+        expect(regex.test('/deeply/nested/path')).toBe(true);
+        expect(regex.test('/')).toBe(false);
+      }
+    });
+  });
+
+  describe('Edge cases and special characters', () => {
+    it('should handle URL-encoded characters correctly', () => {
+      const manifest = createRemixRouteManifest({ rootDir: './test/fixtures/app-basic' });
+      const userIdRoute = manifest.dynamicRoutes.find(r => r.path === '/users/:id');
+
+      if (userIdRoute?.regex) {
+        const regex = new RegExp(userIdRoute.regex);
+        // URL-encoded space: %20
+        expect(regex.test('/users/john%20doe')).toBe(true);
+        // URL-encoded special chars
+        expect(regex.test('/users/user%40email')).toBe(true);
+        // Should not match slashes even when encoded (segment boundary)
+        expect(regex.test('/users/foo%2Fbar')).toBe(true); // %2F is encoded slash, should match as part of segment
+      }
+    });
+
+    it('should handle hyphens and underscores in dynamic segments', () => {
+      const manifest = createRemixRouteManifest({ rootDir: './test/fixtures/app-basic' });
+      const userIdRoute = manifest.dynamicRoutes.find(r => r.path === '/users/:id');
+
+      if (userIdRoute?.regex) {
+        const regex = new RegExp(userIdRoute.regex);
+        expect(regex.test('/users/user-123')).toBe(true);
+        expect(regex.test('/users/user_123')).toBe(true);
+        expect(regex.test('/users/user-name-with-dashes')).toBe(true);
+      }
+    });
+
+    it('should handle numeric IDs', () => {
+      const manifest = createRemixRouteManifest({ rootDir: './test/fixtures/app-basic' });
+      const userIdRoute = manifest.dynamicRoutes.find(r => r.path === '/users/:id');
+
+      if (userIdRoute?.regex) {
+        const regex = new RegExp(userIdRoute.regex);
+        expect(regex.test('/users/123')).toBe(true);
+        expect(regex.test('/users/0')).toBe(true);
+        expect(regex.test('/users/999999')).toBe(true);
+      }
+    });
+
+    it('should handle UUIDs', () => {
+      const manifest = createRemixRouteManifest({ rootDir: './test/fixtures/app-basic' });
+      const userIdRoute = manifest.dynamicRoutes.find(r => r.path === '/users/:id');
+
+      if (userIdRoute?.regex) {
+        const regex = new RegExp(userIdRoute.regex);
+        expect(regex.test('/users/550e8400-e29b-41d4-a716-446655440000')).toBe(true);
+      }
+    });
+
+    it('should not match trailing slashes', () => {
+      const manifest = createRemixRouteManifest({ rootDir: './test/fixtures/app-basic' });
+      const userIdRoute = manifest.dynamicRoutes.find(r => r.path === '/users/:id');
+
+      if (userIdRoute?.regex) {
+        const regex = new RegExp(userIdRoute.regex);
+        expect(regex.test('/users/123/')).toBe(false);
+      }
+    });
+
+    it('should handle dots in dynamic segments', () => {
+      const manifest = createRemixRouteManifest({ rootDir: './test/fixtures/app-basic' });
+      const userIdRoute = manifest.dynamicRoutes.find(r => r.path === '/users/:id');
+
+      if (userIdRoute?.regex) {
+        const regex = new RegExp(userIdRoute.regex);
+        expect(regex.test('/users/user.name')).toBe(true);
+        expect(regex.test('/users/file.txt')).toBe(true);
+      }
+    });
+  });
+
+  describe('Regex escaping', () => {
+    it('should properly escape special regex characters in static segments', () => {
+      // If you have a route like /api.v1/users, the dot should be treated literally
+      const manifest = createRemixRouteManifest({ rootDir: './test/fixtures/app-basic' });
+      const apiRoute = manifest.dynamicRoutes.find(r => r.path.includes('api'));
+
+      if (apiRoute?.regex && apiRoute.path.includes('.')) {
+        const regex = new RegExp(apiRoute.regex);
+        const testPath = apiRoute.path.replace(/:[\w*]+/g, 'test');
+        expect(regex.test(testPath)).toBe(true);
+      }
+    });
+
+    it('should handle parentheses in static segments', () => {
+      // Routes with special chars should have them escaped in regex
+      const routePath = '/api/(v1)/users/:id';
+      const regexPattern = routePath
+        .split('/')
+        .filter(Boolean)
+        .map(segment => {
+          if (segment.startsWith(':')) {
+            return segment.endsWith('*') ? '(.+)' : '([^/]+)';
+          }
+          return segment.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+        })
+        .join('/');
+
+      const regex = new RegExp(`^/${regexPattern}$`);
+      expect(regex.test('/api/(v1)/users/123')).toBe(true);
+      expect(regex.test('/api/xv1x/users/123')).toBe(false);
+    });
+  });
+
+  describe('Param name extraction', () => {
+    it('should extract param names for dynamic segments', () => {
+      const manifest = createRemixRouteManifest({ rootDir: './test/fixtures/app-basic' });
+      const userIdRoute = manifest.dynamicRoutes.find(r => r.path === '/users/:id');
+
+      expect(userIdRoute?.paramNames).toEqual(['id']);
+    });
+
+    it('should extract multiple param names', () => {
+      const manifest = createRemixRouteManifest({ rootDir: './test/fixtures/app-basic' });
+      const nestedRoute = manifest.dynamicRoutes.find(r => r.path === '/users/:userId/posts/:postId');
+
+      expect(nestedRoute?.paramNames).toEqual(['userId', 'postId']);
+    });
+
+    it('should extract splat param names', () => {
+      const manifest = createRemixRouteManifest({ rootDir: './test/fixtures/app-basic' });
+      const splatRoute = manifest.dynamicRoutes.find(r => r.path === '/docs/:*');
+
+      // Splat params are named '*' in Remix
+      expect(splatRoute?.paramNames).toEqual(['']);
+    });
+  });
+
+  describe('Real-world routing scenarios', () => {
+    it('should match blog post URLs', () => {
+      const manifest = createRemixRouteManifest({ rootDir: './test/fixtures/app-basic' });
+      const blogRoute = manifest.dynamicRoutes.find(r => r.path.includes('blog') || r.path === '/posts/:slug');
+
+      if (blogRoute?.regex) {
+        const regex = new RegExp(blogRoute.regex);
+        expect(regex.test('/posts/my-first-post')).toBe(true);
+        expect(regex.test('/posts/getting-started-with-remix')).toBe(true);
+        expect(regex.test('/posts/2024-01-15-announcement')).toBe(true);
+      }
+    });
+
+    it('should correctly prioritize more specific routes over less specific', () => {
+      const manifest = createRemixRouteManifest({ rootDir: './test/fixtures/app-basic' });
+
+      // More specific routes should come first when sorted by specificity
+      const routes = manifest.dynamicRoutes.filter(r => r.path.startsWith('/users'));
+
+      // /users/:id/posts/:postId is more specific than /users/:id
+      const specificRoute = routes.find(r => r.path === '/users/:userId/posts/:postId');
+      const generalRoute = routes.find(r => r.path === '/users/:id');
+
+      if (specificRoute && generalRoute) {
+        // Both should have valid regex patterns
+        expect(specificRoute.regex).toBeDefined();
+        expect(generalRoute.regex).toBeDefined();
+
+        const specificRegex = new RegExp(specificRoute.regex!);
+        const generalRegex = new RegExp(generalRoute.regex!);
+
+        // More specific should match its pattern
+        expect(specificRegex.test('/users/123/posts/456')).toBe(true);
+        // But general should NOT match the more specific pattern
+        expect(generalRegex.test('/users/123/posts/456')).toBe(false);
+        // General should match its own pattern
+        expect(generalRegex.test('/users/123')).toBe(true);
+      }
+    });
+  });
+});
diff --git a/packages/remix/test/integration/remix.config.js b/packages/remix/test/integration/remix.config.js
deleted file mode 100644
index e74f084ccbfd..000000000000
--- a/packages/remix/test/integration/remix.config.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/** @type {import('@remix-run/dev').AppConfig} */
-export default {
-  appDirectory: 'app',
-  assetsBuildDirectory: 'public/build',
-  serverBuildPath: 'build/index.js',
-  publicPath: '/build/',
-};
diff --git a/packages/remix/test/integration/routeConversionConsistency.test.ts b/packages/remix/test/integration/routeConversionConsistency.test.ts
new file mode 100644
index 000000000000..e7f6fcadc6fe
--- /dev/null
+++ b/packages/remix/test/integration/routeConversionConsistency.test.ts
@@ -0,0 +1,188 @@
+import { describe, expect, it } from 'vitest';
+import { convertRemixRouteToPath } from '../../src/config/createRemixRouteManifest';
+import { convertRemixRouteIdToPath } from '../../src/utils/utils';
+
+describe('Route Conversion Consistency', () => {
+  describe('Build-time vs Runtime conversion', () => {
+    it('should produce identical results for simple static routes', () => {
+      // Build-time: filename
+      const buildTime = convertRemixRouteToPath('about.tsx');
+      // Runtime: route ID
+      const runtime = convertRemixRouteIdToPath('routes/about');
+
+      expect(buildTime?.path).toBe(runtime);
+      expect(buildTime?.path).toBe('/about');
+    });
+
+    it('should produce identical results for index routes', () => {
+      const buildTime = convertRemixRouteToPath('index.tsx');
+      const runtime = convertRemixRouteIdToPath('routes/index');
+
+      expect(buildTime?.path).toBe(runtime);
+      expect(buildTime?.path).toBe('/');
+    });
+
+    it('should produce identical results for dynamic parameter routes', () => {
+      const buildTime = convertRemixRouteToPath('users.$id.tsx');
+      const runtime = convertRemixRouteIdToPath('routes/users.$id');
+
+      expect(buildTime?.path).toBe(runtime);
+      expect(buildTime?.path).toBe('/users/:id');
+    });
+
+    it('should produce identical results for nested dynamic routes', () => {
+      const buildTime = convertRemixRouteToPath('users.$userId.posts.$postId.tsx');
+      const runtime = convertRemixRouteIdToPath('routes/users.$userId.posts.$postId');
+
+      expect(buildTime?.path).toBe(runtime);
+      expect(buildTime?.path).toBe('/users/:userId/posts/:postId');
+    });
+
+    it('should produce identical results for splat routes', () => {
+      const buildTime = convertRemixRouteToPath('docs.$.tsx');
+      const runtime = convertRemixRouteIdToPath('routes/docs.$');
+
+      expect(buildTime?.path).toBe(runtime);
+      expect(buildTime?.path).toBe('/docs/:*');
+    });
+
+    it('should produce identical results for root splat routes', () => {
+      const buildTime = convertRemixRouteToPath('$.tsx');
+      const runtime = convertRemixRouteIdToPath('routes/$');
+
+      expect(buildTime?.path).toBe(runtime);
+      expect(buildTime?.path).toBe('/:*');
+    });
+
+    it('should produce identical results for nested folder routes', () => {
+      const buildTime = convertRemixRouteToPath('users/$id.tsx');
+      const runtime = convertRemixRouteIdToPath('routes/users.$id');
+
+      expect(buildTime?.path).toBe(runtime);
+      expect(buildTime?.path).toBe('/users/:id');
+    });
+
+    it('should produce identical results for nested folder with index', () => {
+      const buildTime = convertRemixRouteToPath('users/index.tsx');
+      const runtime = convertRemixRouteIdToPath('routes/users.index');
+
+      expect(buildTime?.path).toBe(runtime);
+      expect(buildTime?.path).toBe('/users');
+    });
+
+    it('should produce identical results for layout routes (underscore prefix)', () => {
+      const buildTime = convertRemixRouteToPath('users._layout.profile.tsx');
+      const runtime = convertRemixRouteIdToPath('routes/users._layout.profile');
+
+      expect(buildTime?.path).toBe(runtime);
+      expect(buildTime?.path).toBe('/users/profile');
+    });
+
+    it('should produce identical results for complex nested routes', () => {
+      const buildTime = convertRemixRouteToPath('api.v1.users.$userId.posts.$postId.comments.tsx');
+      const runtime = convertRemixRouteIdToPath('routes/api.v1.users.$userId.posts.$postId.comments');
+
+      expect(buildTime?.path).toBe(runtime);
+      expect(buildTime?.path).toBe('/api/v1/users/:userId/posts/:postId/comments');
+    });
+
+    it('should produce identical results for _index routes', () => {
+      const buildTime = convertRemixRouteToPath('_index.tsx');
+      const runtime = convertRemixRouteIdToPath('routes/_index');
+
+      expect(buildTime?.path).toBe(runtime);
+      expect(buildTime?.path).toBe('/');
+    });
+  });
+
+  describe('Dynamic flag consistency', () => {
+    it('should correctly identify static routes', () => {
+      const result = convertRemixRouteToPath('about.tsx');
+      expect(result?.isDynamic).toBe(false);
+    });
+
+    it('should correctly identify dynamic parameter routes', () => {
+      const result = convertRemixRouteToPath('users.$id.tsx');
+      expect(result?.isDynamic).toBe(true);
+    });
+
+    it('should correctly identify splat routes as dynamic', () => {
+      const result = convertRemixRouteToPath('docs.$.tsx');
+      expect(result?.isDynamic).toBe(true);
+    });
+
+    it('should correctly identify layout routes as static when no dynamic segments', () => {
+      const result = convertRemixRouteToPath('users._layout.profile.tsx');
+      expect(result?.isDynamic).toBe(false);
+    });
+
+    it('should correctly identify routes with both static and dynamic segments', () => {
+      const result = convertRemixRouteToPath('users.$id.posts.tsx');
+      expect(result?.isDynamic).toBe(true);
+    });
+  });
+
+  describe('Edge cases', () => {
+    it('should handle routes with multiple file extensions', () => {
+      expect(convertRemixRouteToPath('users.tsx')?.path).toBe('/users');
+      expect(convertRemixRouteToPath('users.ts')?.path).toBe('/users');
+      expect(convertRemixRouteToPath('users.jsx')?.path).toBe('/users');
+      expect(convertRemixRouteToPath('users.js')?.path).toBe('/users');
+    });
+
+    it('should handle empty segments gracefully', () => {
+      const buildTime = convertRemixRouteToPath('users..posts.tsx');
+      const runtime = convertRemixRouteIdToPath('routes/users..posts');
+
+      expect(buildTime?.path).toBe(runtime);
+    });
+
+    it('should handle trailing index segments', () => {
+      const buildTime = convertRemixRouteToPath('users.profile.index.tsx');
+      const runtime = convertRemixRouteIdToPath('routes/users.profile.index');
+
+      expect(buildTime?.path).toBe(runtime);
+      expect(buildTime?.path).toBe('/users/profile');
+    });
+
+    it('should handle routes with directory separators in build-time', () => {
+      const withSlash = convertRemixRouteToPath('users/$id/posts.tsx');
+      const withDots = convertRemixRouteToPath('users.$id.posts.tsx');
+
+      expect(withSlash?.path).toBe(withDots?.path);
+      expect(withSlash?.path).toBe('/users/:id/posts');
+    });
+  });
+
+  describe('Pathless layout routes', () => {
+    it('should return null for standalone pathless layout routes', () => {
+      // These are layout routes that don't contribute to the URL path
+      // They should NOT be added to the route manifest
+      expect(convertRemixRouteToPath('_layout.tsx')).toBeNull();
+      expect(convertRemixRouteToPath('_auth.tsx')).toBeNull();
+      expect(convertRemixRouteToPath('_middleware.tsx')).toBeNull();
+      expect(convertRemixRouteToPath('_error.tsx')).toBeNull();
+    });
+
+    it('should NOT return null for _index routes', () => {
+      // _index is special - it's the index route, not a pathless layout
+      const result = convertRemixRouteToPath('_index.tsx');
+      expect(result).not.toBeNull();
+      expect(result?.path).toBe('/');
+    });
+
+    it('should handle pathless layouts with child routes correctly', () => {
+      // _auth.login.tsx -> /login (only _auth is skipped)
+      const result = convertRemixRouteToPath('_auth.login.tsx');
+      expect(result).not.toBeNull();
+      expect(result?.path).toBe('/login');
+    });
+
+    it('should handle nested pathless layouts correctly', () => {
+      // users._layout.profile.tsx -> /users/profile (only _layout is skipped)
+      const result = convertRemixRouteToPath('users._layout.profile.tsx');
+      expect(result).not.toBeNull();
+      expect(result?.path).toBe('/users/profile');
+    });
+  });
+});
diff --git a/packages/remix/test/integration/test/client/capture-exception.test.ts b/packages/remix/test/integration/test/client/capture-exception.test.ts
index 3f0aaaa4d83d..b844f7e81b70 100644
--- a/packages/remix/test/integration/test/client/capture-exception.test.ts
+++ b/packages/remix/test/integration/test/client/capture-exception.test.ts
@@ -20,5 +20,5 @@ test('should report a manually captured error.', async ({ page }) => {
 
   expect(pageloadEnvelope.contexts?.trace?.op).toBe('pageload');
   expect(pageloadEnvelope.type).toBe('transaction');
-  expect(pageloadEnvelope.transaction).toBe('routes/capture-exception');
+  expect(pageloadEnvelope.transaction).toBe('/capture-exception');
 });
diff --git a/packages/remix/test/integration/test/client/capture-message.test.ts b/packages/remix/test/integration/test/client/capture-message.test.ts
index 09a1720f94fa..4e25d32c90ab 100644
--- a/packages/remix/test/integration/test/client/capture-message.test.ts
+++ b/packages/remix/test/integration/test/client/capture-message.test.ts
@@ -13,5 +13,5 @@ test('should report a manually captured message.', async ({ page }) => {
 
   expect(pageloadEnvelope.contexts?.trace?.op).toBe('pageload');
   expect(pageloadEnvelope.type).toBe('transaction');
-  expect(pageloadEnvelope.transaction).toBe('routes/capture-message');
+  expect(pageloadEnvelope.transaction).toBe('/capture-message');
 });
diff --git a/packages/remix/test/integration/test/client/errorboundary.test.ts b/packages/remix/test/integration/test/client/errorboundary.test.ts
index cb30c5c15c89..56abc1774362 100644
--- a/packages/remix/test/integration/test/client/errorboundary.test.ts
+++ b/packages/remix/test/integration/test/client/errorboundary.test.ts
@@ -11,7 +11,7 @@ test('should capture React component errors.', async ({ page }) => {
 
   expect(pageloadEnvelope.contexts?.trace?.op).toBe('pageload');
   expect(pageloadEnvelope.type).toBe('transaction');
-  expect(pageloadEnvelope.transaction).toBe('routes/error-boundary-capture.$id');
+  expect(pageloadEnvelope.transaction).toBe('/error-boundary-capture/:id');
 
   expect(errorEnvelope.level).toBe('error');
   expect(errorEnvelope.sdk?.name).toBe('sentry.javascript.remix');
@@ -23,7 +23,7 @@ test('should capture React component errors.', async ({ page }) => {
       mechanism: { type: 'instrument', handled: false },
     },
   ]);
-  expect(errorEnvelope.transaction).toBe('routes/error-boundary-capture.$id');
+  expect(errorEnvelope.transaction).toBe('/error-boundary-capture/:id');
 
   // The error boundary should be rendered
   expect(await page.textContent('#error-header')).toBe('ErrorBoundary Error');
diff --git a/packages/remix/test/integration/test/client/manualtracing.test.ts b/packages/remix/test/integration/test/client/manualtracing.test.ts
index cc9b5b086e0b..23b97264b4f2 100644
--- a/packages/remix/test/integration/test/client/manualtracing.test.ts
+++ b/packages/remix/test/integration/test/client/manualtracing.test.ts
@@ -17,5 +17,5 @@ test('should report a manually created / finished transaction.', async ({ page }
 
   expect(pageloadEnvelope.contexts?.trace?.op).toBe('pageload');
   expect(pageloadEnvelope.type).toBe('transaction');
-  expect(pageloadEnvelope.transaction).toBe('routes/manual-tracing.$id');
+  expect(pageloadEnvelope.transaction).toBe('/manual-tracing/:id');
 });
diff --git a/packages/remix/test/integration/test/client/navigation-transactions.test.ts b/packages/remix/test/integration/test/client/navigation-transactions.test.ts
new file mode 100644
index 000000000000..f4d8123bb1db
--- /dev/null
+++ b/packages/remix/test/integration/test/client/navigation-transactions.test.ts
@@ -0,0 +1,72 @@
+import { expect, test } from '@playwright/test';
+import type { Event } from '@sentry/core';
+import { getMultipleSentryEnvelopeRequests } from './utils/helpers';
+
+test('should create parameterized transactions for dynamic routes', async ({ page }) => {
+  // Navigate directly to a parameterized route
+  const envelopes = await getMultipleSentryEnvelopeRequests<Event>(page, 1, {
+    url: '/error-boundary-capture/123',
+    envelopeType: 'transaction',
+  });
+
+  const [transactionEnvelope] = envelopes;
+
+  expect(transactionEnvelope).toBeDefined();
+  expect(transactionEnvelope!.contexts?.trace?.op).toBe('pageload');
+  expect(transactionEnvelope!.type).toBe('transaction');
+  // Should be parameterized to /error-boundary-capture/:id
+  expect(transactionEnvelope!.transaction).toBe('/error-boundary-capture/:id');
+  expect(transactionEnvelope!.contexts?.trace?.data?.['sentry.source']).toBe('route');
+});
+
+test('should create parameterized transactions for nested routes', async ({ page }) => {
+  // Navigate directly to a nested parameterized route
+  const envelopes = await getMultipleSentryEnvelopeRequests<Event>(page, 1, {
+    url: '/users/user123/posts/post456',
+    envelopeType: 'transaction',
+  });
+
+  const [transactionEnvelope] = envelopes;
+
+  expect(transactionEnvelope).toBeDefined();
+  expect(transactionEnvelope!.contexts?.trace?.op).toBe('pageload');
+  expect(transactionEnvelope!.type).toBe('transaction');
+  // Should be parameterized to /users/:userId/posts/:postId
+  expect(transactionEnvelope!.transaction).toBe('/users/:userId/posts/:postId');
+  expect(transactionEnvelope!.contexts?.trace?.data?.['sentry.source']).toBe('route');
+});
+
+test('should create parameterized transactions for deeply nested routes', async ({ page }) => {
+  // Navigate directly to a deeply nested route
+  const envelopes = await getMultipleSentryEnvelopeRequests<Event>(page, 1, {
+    url: '/deeply/level1/level2/level3',
+    envelopeType: 'transaction',
+  });
+
+  const [transactionEnvelope] = envelopes;
+
+  expect(transactionEnvelope).toBeDefined();
+  expect(transactionEnvelope!.contexts?.trace?.op).toBe('pageload');
+  expect(transactionEnvelope!.type).toBe('transaction');
+  // Should be parameterized to /deeply/:nested/:structure/:id
+  expect(transactionEnvelope!.transaction).toBe('/deeply/:nested/:structure/:id');
+  expect(transactionEnvelope!.contexts?.trace?.data?.['sentry.source']).toBe('route');
+});
+
+test('should handle static routes without parameterization', async ({ page }) => {
+  // Navigate directly to a static route
+  const envelopes = await getMultipleSentryEnvelopeRequests<Event>(page, 1, {
+    url: '/capture-exception',
+    envelopeType: 'transaction',
+  });
+
+  const [transactionEnvelope] = envelopes;
+
+  expect(transactionEnvelope).toBeDefined();
+  expect(transactionEnvelope!.contexts?.trace?.op).toBe('pageload');
+  expect(transactionEnvelope!.type).toBe('transaction');
+  // Static routes should keep their original path
+  expect(transactionEnvelope!.transaction).toBe('/capture-exception');
+  // Static routes are sourced from URL since they don't have parameters
+  expect(transactionEnvelope!.contexts?.trace?.data?.['sentry.source']).toBe('url');
+});
diff --git a/packages/remix/test/integration/test/client/pageload.test.ts b/packages/remix/test/integration/test/client/pageload.test.ts
index 967eb3952623..ccaa80ed3f06 100644
--- a/packages/remix/test/integration/test/client/pageload.test.ts
+++ b/packages/remix/test/integration/test/client/pageload.test.ts
@@ -8,5 +8,7 @@ test('should add `pageload` transaction on load.', async ({ page }) => {
   expect(envelope.contexts?.trace.op).toBe('pageload');
   expect(envelope.type).toBe('transaction');
 
-  expect(envelope.transaction).toBe('root');
+  // Static root route should use '/' (URL) since it doesn't need parameterization
+  expect(envelope.transaction).toBe('/');
+  expect(envelope.contexts?.trace?.data?.['sentry.source']).toBe('url');
 });
diff --git a/packages/remix/test/integration/test/client/root-loader.test.ts b/packages/remix/test/integration/test/client/root-loader.test.ts
index fc557509e941..eb26654cf85a 100644
--- a/packages/remix/test/integration/test/client/root-loader.test.ts
+++ b/packages/remix/test/integration/test/client/root-loader.test.ts
@@ -1,12 +1,4 @@
-import { type Page, expect, test, chromium } from '@playwright/test';
-
-async function getRouteData(page: Page): Promise<any> {
-  return page.evaluate('window.__remixContext.state.loaderData').catch(err => {
-    console.warn(err);
-
-    return {};
-  });
-}
+import { type Page, expect, test } from '@playwright/test';
 
 async function extractTraceAndBaggageFromMeta(
   page: Page,
@@ -20,103 +12,55 @@ async function extractTraceAndBaggageFromMeta(
   return { sentryTrace: sentryTraceContent, sentryBaggage: sentryBaggageContent };
 }
 
-test('should inject `sentry-trace` and `baggage` into root loader returning an empty object.', async ({ page }) => {
+test('should inject `sentry-trace` and `baggage` meta tags with empty loader', async ({ page }) => {
   await page.goto('/?type=empty');
   const { sentryTrace, sentryBaggage } = await extractTraceAndBaggageFromMeta(page);
 
   expect(sentryTrace).toMatch(/.+/);
   expect(sentryBaggage).toMatch(/.+/);
-
-  const rootData = (await getRouteData(page))['root'];
-
-  expect(rootData).toMatchObject({
-    sentryTrace,
-    sentryBaggage,
-  });
 });
 
-test('should inject `sentry-trace` and `baggage` into root loader returning a plain object.', async ({ page }) => {
+test('should inject `sentry-trace` and `baggage` meta tags with plain object loader', async ({ page }) => {
   await page.goto('/?type=plain');
   const { sentryTrace, sentryBaggage } = await extractTraceAndBaggageFromMeta(page);
 
   expect(sentryTrace).toMatch(/.+/);
   expect(sentryBaggage).toMatch(/.+/);
-
-  const rootData = (await getRouteData(page))['root'];
-
-  expect(rootData).toMatchObject({
-    data_one: [],
-    data_two: 'a string',
-    sentryTrace: sentryTrace,
-    sentryBaggage: sentryBaggage,
-  });
 });
 
-test('should inject `sentry-trace` and `baggage` into root loader returning a `JSON response`.', async ({ page }) => {
+test('should inject `sentry-trace` and `baggage` meta tags with JSON response loader', async ({ page }) => {
   await page.goto('/?type=json');
   const { sentryTrace, sentryBaggage } = await extractTraceAndBaggageFromMeta(page);
 
   expect(sentryTrace).toMatch(/.+/);
   expect(sentryBaggage).toMatch(/.+/);
-
-  const rootData = (await getRouteData(page))['root'];
-
-  expect(rootData).toMatchObject({
-    data_one: [],
-    data_two: 'a string',
-    sentryTrace: sentryTrace,
-    sentryBaggage: sentryBaggage,
-  });
 });
 
-test('should inject `sentry-trace` and `baggage` into root loader returning a deferred response', async ({ page }) => {
+test('should inject `sentry-trace` and `baggage` meta tags with deferred response loader', async ({ page }) => {
   await page.goto('/?type=defer');
   const { sentryTrace, sentryBaggage } = await extractTraceAndBaggageFromMeta(page);
 
   expect(sentryTrace).toMatch(/.+/);
   expect(sentryBaggage).toMatch(/.+/);
-
-  const rootData = (await getRouteData(page))['root'];
-
-  expect(rootData).toMatchObject({
-    sentryTrace: sentryTrace,
-    sentryBaggage: sentryBaggage,
-  });
 });
 
-test('should inject `sentry-trace` and `baggage` into root loader returning `null`.', async ({ page }) => {
+test('should inject `sentry-trace` and `baggage` meta tags with null loader', async ({ page }) => {
   await page.goto('/?type=null');
   const { sentryTrace, sentryBaggage } = await extractTraceAndBaggageFromMeta(page);
 
   expect(sentryTrace).toMatch(/.+/);
   expect(sentryBaggage).toMatch(/.+/);
-
-  const rootData = (await getRouteData(page))['root'];
-
-  expect(rootData).toMatchObject({
-    sentryTrace: sentryTrace,
-    sentryBaggage: sentryBaggage,
-  });
 });
 
-test('should inject `sentry-trace` and `baggage` into root loader returning `undefined`.', async ({ page }) => {
+test('should inject `sentry-trace` and `baggage` meta tags with undefined loader', async ({ page }) => {
   await page.goto('/?type=undefined');
   const { sentryTrace, sentryBaggage } = await extractTraceAndBaggageFromMeta(page);
 
   expect(sentryTrace).toMatch(/.+/);
   expect(sentryBaggage).toMatch(/.+/);
-
-  const rootData = (await getRouteData(page))['root'];
-
-  expect(rootData).toMatchObject({
-    sentryTrace: sentryTrace,
-    sentryBaggage: sentryBaggage,
-  });
 });
 
-test('should inject `sentry-trace` and `baggage` into root loader throwing a redirection to a plain object.', async ({
-  page,
-}) => {
+test('should inject `sentry-trace` and `baggage` meta tags with throw redirect loader', async ({ page }) => {
   await page.goto('/?type=throwRedirect');
   const { sentryTrace, sentryBaggage } = await extractTraceAndBaggageFromMeta(page);
 
@@ -125,19 +69,9 @@ test('should inject `sentry-trace` and `baggage` into root loader throwing a red
 
   expect(sentryTrace).toMatch(/.+/);
   expect(sentryBaggage).toMatch(/.+/);
-
-  const rootData = (await getRouteData(page))['root'];
-
-  expect(rootData).toMatchObject({
-    sentryTrace: sentryTrace,
-    sentryBaggage: sentryBaggage,
-  });
 });
 
-test('should inject `sentry-trace` and `baggage` into root loader returning a redirection to valid path.', async ({
-  page,
-  baseURL,
-}) => {
+test('should inject `sentry-trace` and `baggage` meta tags with return redirect loader', async ({ page, baseURL }) => {
   await page.goto(`${baseURL}/?type=returnRedirect`);
   const { sentryTrace, sentryBaggage } = await extractTraceAndBaggageFromMeta(page);
 
@@ -146,13 +80,6 @@ test('should inject `sentry-trace` and `baggage` into root loader returning a re
 
   expect(sentryTrace).toMatch(/.+/);
   expect(sentryBaggage).toMatch(/.+/);
-
-  const rootData = (await getRouteData(page))['root'];
-
-  expect(rootData).toMatchObject({
-    sentryTrace: sentryTrace,
-    sentryBaggage: sentryBaggage,
-  });
 });
 
 test('should return redirect to an external path with no baggage and trace injected.', async ({ page, baseURL }) => {
diff --git a/packages/remix/test/integration/test/server/instrumentation/nested-routes.test.ts b/packages/remix/test/integration/test/server/instrumentation/nested-routes.test.ts
new file mode 100644
index 000000000000..da0f94eb154e
--- /dev/null
+++ b/packages/remix/test/integration/test/server/instrumentation/nested-routes.test.ts
@@ -0,0 +1,128 @@
+import type { Event, TransactionEvent } from '@sentry/core';
+import { describe, expect, it } from 'vitest';
+import { RemixTestEnv, assertSentryTransaction } from '../utils/helpers';
+
+describe('Nested Route Parameterization', () => {
+  it('correctly parameterizes a 2-level nested route (users/:userId/posts/:postId)', async () => {
+    const env = await RemixTestEnv.init();
+    const url = `${env.url}/users/user123/posts/post456`;
+    const envelope = await env.getEnvelopeRequest({ url, envelopeType: 'transaction' });
+    const transaction = envelope[2] as unknown as TransactionEvent;
+
+    assertSentryTransaction(transaction, {
+      transaction: 'GET users/:userId/posts/:postId',
+      transaction_info: {
+        source: 'route',
+      },
+      contexts: {
+        trace: {
+          op: 'http.server',
+          status: 'ok',
+        },
+      },
+    });
+  });
+
+  it('correctly parameterizes a 3-level nested API route (api/v1/data/:id)', async () => {
+    const env = await RemixTestEnv.init();
+    const url = `${env.url}/api/v1/data/abc123`;
+    const envelope = await env.getEnvelopeRequest({ url, envelopeType: 'transaction' });
+    const transaction = envelope[2] as unknown as TransactionEvent;
+
+    assertSentryTransaction(transaction, {
+      transaction: 'GET api/v1/data/:id',
+      transaction_info: {
+        source: 'route',
+      },
+      contexts: {
+        trace: {
+          op: 'http.server',
+          status: 'ok',
+        },
+      },
+    });
+  });
+
+  it('correctly parameterizes a deeply nested route (deeply/:nested/:structure/:id)', async () => {
+    const env = await RemixTestEnv.init();
+    const url = `${env.url}/deeply/level1/level2/level3`;
+    const envelope = await env.getEnvelopeRequest({ url, envelopeType: 'transaction' });
+    const transaction = envelope[2] as unknown as TransactionEvent;
+
+    assertSentryTransaction(transaction, {
+      transaction: 'GET deeply/:nested/:structure/:id',
+      transaction_info: {
+        source: 'route',
+      },
+      contexts: {
+        trace: {
+          op: 'http.server',
+          status: 'ok',
+        },
+      },
+    });
+  });
+
+  it('correctly parameterizes flat routes with dot notation (products/:productId/reviews/:reviewId)', async () => {
+    const env = await RemixTestEnv.init();
+    const url = `${env.url}/products/prod789/reviews/rev101`;
+    const envelope = await env.getEnvelopeRequest({ url, envelopeType: 'transaction' });
+    const transaction = envelope[2] as unknown as TransactionEvent;
+
+    assertSentryTransaction(transaction, {
+      transaction: 'GET products/:productId/reviews/:reviewId',
+      transaction_info: {
+        source: 'route',
+      },
+      contexts: {
+        trace: {
+          op: 'http.server',
+          status: 'ok',
+        },
+      },
+    });
+  });
+
+  it('sends loader span for nested route', async () => {
+    const env = await RemixTestEnv.init();
+    const url = `${env.url}/users/user999/posts/post888`;
+    const envelope = await env.getEnvelopeRequest({ url, envelopeType: 'transaction' });
+    const transaction = envelope[2] as unknown as TransactionEvent;
+
+    assertSentryTransaction(transaction, {
+      transaction: 'GET users/:userId/posts/:postId',
+      spans: expect.arrayContaining([
+        expect.objectContaining({
+          data: expect.objectContaining({
+            'code.function': 'loader',
+            'sentry.op': 'loader.remix',
+          }),
+        }),
+      ]),
+    });
+  });
+
+  it('differentiates between nested and flat routes with same parameter names', async () => {
+    const env = await RemixTestEnv.init();
+
+    // Request flat route
+    const flatEnvelope = await env.getEnvelopeRequest({
+      url: `${env.url}/loader-json-response/flat123`,
+      envelopeType: 'transaction',
+      endServer: false,
+    });
+
+    // Request nested route
+    const nestedEnvelope = await env.getEnvelopeRequest({
+      url: `${env.url}/users/nested123/posts/post123`,
+      envelopeType: 'transaction',
+    });
+
+    const flatTransaction = flatEnvelope[2];
+    const nestedTransaction = nestedEnvelope[2];
+
+    // Verify they have different transaction names
+    expect((flatTransaction as Event).transaction).toBe('GET loader-json-response/:id');
+    expect((nestedTransaction as Event).transaction).toBe('GET users/:userId/posts/:postId');
+  });
+});
diff --git a/packages/remix/test/integration/test/server/utils/helpers.ts b/packages/remix/test/integration/test/server/utils/helpers.ts
index af9a4934ee1e..b338b783bac0 100644
--- a/packages/remix/test/integration/test/server/utils/helpers.ts
+++ b/packages/remix/test/integration/test/server/utils/helpers.ts
@@ -270,7 +270,8 @@ export class RemixTestEnv extends TestEnv {
     const server = await new Promise<http.Server>(async resolve => {
       const app = express();
 
-      app.all('*', createRequestHandler({ build: await import('../../../build') }));
+      // Vite builds to build/server/index.js instead of build/index.js
+      app.all('*', createRequestHandler({ build: await import('../../../build/server/index.js') }));
 
       const server = app.listen(0, () => {
         serverPort = (server.address() as AddressInfo).port;
diff --git a/packages/remix/test/integration/tsconfig.json b/packages/remix/test/integration/tsconfig.json
index e269d26457d3..a6d18f97a35f 100644
--- a/packages/remix/test/integration/tsconfig.json
+++ b/packages/remix/test/integration/tsconfig.json
@@ -1,20 +1,23 @@
 {
-  "include": ["remix.env.d.ts", "**/*.ts", "**/*.tsx"],
+  "include": ["remix.env.d.ts", "**/*.ts", "**/*.tsx", "vite.config.ts"],
   "compilerOptions": {
     "lib": ["DOM", "DOM.Iterable", "ES2020"],
     "isolatedModules": true,
     "esModuleInterop": true,
     "jsx": "react-jsx",
-    "moduleResolution": "node",
+    "module": "ESNext",
+    "moduleResolution": "Bundler",
     "resolveJsonModule": true,
-    "target": "es2020",
+    "target": "ES2020",
     "strict": true,
     "allowJs": true,
+    "skipLibCheck": true,
     "forceConsistentCasingInFileNames": true,
     "baseUrl": ".",
     "paths": {
-      "~/*": ["app_v2/*"]
+      "~/*": ["./app/*"]
     },
-    "noEmit": true
+    "noEmit": true,
+    "types": ["@remix-run/node", "vite/client"]
   }
 }
diff --git a/packages/remix/test/integration/vite.config.ts b/packages/remix/test/integration/vite.config.ts
new file mode 100644
index 000000000000..5355e209498f
--- /dev/null
+++ b/packages/remix/test/integration/vite.config.ts
@@ -0,0 +1,42 @@
+import { vitePlugin as remix } from '@remix-run/dev';
+import { defineConfig, Plugin } from 'vite';
+import { sentryRemixVitePlugin } from '@sentry/remix';
+import path from 'path';
+
+// Custom plugin to resolve @sentry/remix to ESM builds for Vite
+function sentryRemixEsmResolver(): Plugin {
+  const remixPackageRoot = path.resolve(__dirname, '../..');
+
+  return {
+    name: 'sentry-remix-esm-resolver',
+    enforce: 'pre',
+    resolveId(source, importer, options) {
+      if (source === '@sentry/remix') {
+        // For SSR build, use the server ESM build
+        if (options.ssr) {
+          return path.join(remixPackageRoot, 'build/esm/index.server.js');
+        }
+        // For client build, use the client ESM build
+        return path.join(remixPackageRoot, 'build/esm/index.client.js');
+      }
+      return null;
+    },
+  };
+}
+
+export default defineConfig({
+  plugins: [
+    sentryRemixEsmResolver(),
+    remix({
+      future: {
+        v3_fetcherPersist: true,
+        v3_relativeSplatPath: true,
+        v3_throwAbortReason: true,
+        // v3_singleFetch disabled - causes SDK initialization issues in test environment
+        v3_singleFetch: false,
+        v3_lazyRouteDiscovery: true,
+      },
+    }),
+    sentryRemixVitePlugin(),
+  ],
+});
diff --git a/packages/remix/test/utils/utils.test.ts b/packages/remix/test/utils/utils.test.ts
new file mode 100644
index 000000000000..cd8bb3f4f5e3
--- /dev/null
+++ b/packages/remix/test/utils/utils.test.ts
@@ -0,0 +1,183 @@
+import type { AgnosticRouteObject } from '@remix-run/router';
+import { describe, expect, it } from 'vitest';
+import { convertRemixRouteIdToPath, getTransactionName } from '../../src/utils/utils';
+
+describe('getTransactionName', () => {
+  const mockRoutes: AgnosticRouteObject[] = [
+    {
+      id: 'routes/_index',
+      path: '/',
+    },
+    {
+      id: 'routes/user.$id',
+      path: '/user/:id',
+    },
+    {
+      id: 'routes/blog.$slug',
+      path: '/blog/:slug',
+    },
+  ];
+
+  describe('route parameterization', () => {
+    it('should return parameterized path for matched dynamic routes', () => {
+      const url = new URL('http://localhost/user/123');
+      const [name, source] = getTransactionName(mockRoutes, url);
+
+      // Server-side always converts route ID to parameterized path
+      expect(name).toBe('/user/:id');
+      expect(source).toBe('route');
+    });
+
+    it('should return parameterized path for index routes', () => {
+      const url = new URL('http://localhost/');
+      const [name, source] = getTransactionName(mockRoutes, url);
+
+      // Server-side always converts route ID to parameterized path
+      expect(name).toBe('/');
+      expect(source).toBe('route');
+    });
+
+    it('should return URL pathname for unmatched routes', () => {
+      const url = new URL('http://localhost/unknown');
+      const [name, source] = getTransactionName(mockRoutes, url);
+
+      expect(name).toBe('/unknown');
+      expect(source).toBe('url');
+    });
+
+    it('should handle routes with multiple dynamic segments', () => {
+      const routesWithNested: AgnosticRouteObject[] = [
+        {
+          id: 'routes/users.$userId.posts.$postId',
+          path: '/users/:userId/posts/:postId',
+        },
+      ];
+
+      const url = new URL('http://localhost/users/123/posts/456');
+      const [name, source] = getTransactionName(routesWithNested, url);
+
+      expect(name).toBe('/users/:userId/posts/:postId');
+      expect(source).toBe('route');
+    });
+
+    it('should handle splat routes', () => {
+      const routesWithSplat: AgnosticRouteObject[] = [
+        {
+          id: 'routes/docs.$',
+          path: '/docs/*',
+        },
+      ];
+
+      const url = new URL('http://localhost/docs/api/reference/intro');
+      const [name, source] = getTransactionName(routesWithSplat, url);
+
+      expect(name).toBe('/docs/:*');
+      expect(source).toBe('route');
+    });
+
+    it('should handle nested _index routes', () => {
+      const routesWithNestedIndex: AgnosticRouteObject[] = [
+        {
+          id: 'routes/users._index',
+          path: '/users',
+        },
+      ];
+
+      const url = new URL('http://localhost/users');
+      const [name, source] = getTransactionName(routesWithNestedIndex, url);
+
+      // Should return /users, not /users/_index
+      expect(name).toBe('/users');
+      expect(source).toBe('route');
+    });
+  });
+});
+
+describe('convertRemixRouteIdToPath', () => {
+  describe('basic routes', () => {
+    it('should convert root _index route', () => {
+      expect(convertRemixRouteIdToPath('routes/_index')).toBe('/');
+    });
+
+    it('should convert root index route', () => {
+      expect(convertRemixRouteIdToPath('routes/index')).toBe('/');
+    });
+
+    it('should convert static routes', () => {
+      expect(convertRemixRouteIdToPath('routes/about')).toBe('/about');
+      expect(convertRemixRouteIdToPath('routes/contact')).toBe('/contact');
+    });
+
+    it('should convert dynamic routes', () => {
+      expect(convertRemixRouteIdToPath('routes/user.$id')).toBe('/user/:id');
+      expect(convertRemixRouteIdToPath('routes/blog.$slug')).toBe('/blog/:slug');
+    });
+  });
+
+  describe('_index route handling', () => {
+    it('should handle nested _index routes (flat file convention)', () => {
+      // users._index should map to /users, not /users/_index
+      expect(convertRemixRouteIdToPath('routes/users._index')).toBe('/users');
+    });
+
+    it('should handle deeply nested _index routes', () => {
+      expect(convertRemixRouteIdToPath('routes/admin.settings._index')).toBe('/admin/settings');
+      expect(convertRemixRouteIdToPath('routes/api.v1.users._index')).toBe('/api/v1/users');
+    });
+
+    it('should handle _index with dynamic segments', () => {
+      // This represents an index route under a dynamic segment
+      expect(convertRemixRouteIdToPath('routes/users.$id._index')).toBe('/users/:id');
+    });
+
+    it('should handle _index under pathless layouts', () => {
+      // _auth is a pathless layout, _auth._index is its index (maps to /)
+      expect(convertRemixRouteIdToPath('routes/_auth._index')).toBe('/');
+      // _dashboard.settings._index maps to /settings (skipping _dashboard)
+      expect(convertRemixRouteIdToPath('routes/_dashboard.settings._index')).toBe('/settings');
+    });
+
+    it('should NOT include _index as a path segment', () => {
+      const result = convertRemixRouteIdToPath('routes/users._index');
+      expect(result).not.toContain('_index');
+    });
+  });
+
+  describe('index route handling (non-underscore)', () => {
+    it('should handle nested index routes', () => {
+      expect(convertRemixRouteIdToPath('routes/users.index')).toBe('/users');
+    });
+
+    it('should handle deeply nested index routes', () => {
+      expect(convertRemixRouteIdToPath('routes/admin.settings.index')).toBe('/admin/settings');
+    });
+  });
+
+  describe('layout routes', () => {
+    it('should skip pathless layout segments', () => {
+      expect(convertRemixRouteIdToPath('routes/_auth.login')).toBe('/login');
+      expect(convertRemixRouteIdToPath('routes/_dashboard.settings')).toBe('/settings');
+    });
+
+    it('should handle multiple pathless layouts', () => {
+      expect(convertRemixRouteIdToPath('routes/_auth._layout.login')).toBe('/login');
+    });
+  });
+
+  describe('splat routes', () => {
+    it('should convert splat routes', () => {
+      expect(convertRemixRouteIdToPath('routes/docs.$')).toBe('/docs/:*');
+      expect(convertRemixRouteIdToPath('routes/$')).toBe('/:*');
+    });
+  });
+
+  describe('complex nested routes', () => {
+    it('should handle multiple dynamic segments', () => {
+      expect(convertRemixRouteIdToPath('routes/users.$userId.posts.$postId')).toBe('/users/:userId/posts/:postId');
+    });
+
+    it('should handle mixed static and dynamic segments', () => {
+      expect(convertRemixRouteIdToPath('routes/api.v1.users.$id.comments')).toBe('/api/v1/users/:id/comments');
+    });
+  });
+});

From b306a357b9a27e58e3e040db4b7d245d40a20013 Mon Sep 17 00:00:00 2001
From: Abdelrahman Awad <me@awad.dev>
Date: Wed, 26 Nov 2025 18:51:17 +0200
Subject: [PATCH 133/186] feat(nextjs): Add cloudflare `waitUntil` detection
 (#18336)

This is part of the work done for supporting Next.js on cloudflare
workers in #14931, one of the issues is our flusher didn't take
cloudflare into account and the events were being cut off due to early
shutdowns by the worker environment.

We cannot use our core's `flushIfServerless` because it requires
explicit `cloudflareWaitUntil` to be passed down to it.

Also The symbol we are grabbing here is [specific to
opennext](https://github.com/opennextjs/opennextjs-cloudflare/blob/b53a046bd5c30e94a42e36b67747cefbf7785f9a/packages/cloudflare/src/cli/templates/init.ts#L17)
and isn't something that is globally available on the worker
environment. I had initially created #18330 because I mistook it for a
worker environment API thing.

So this PR adds that detection to Next.js since it is relevant here and
will use it if available, local tests show flushing is done correctly
and events aren't being cut off.
---
 .../nextjs/src/common/captureRequestError.ts  |  6 +-
 .../pages-router-instrumentation/_error.ts    |  6 +-
 .../wrapApiHandlerWithSentry.ts               |  5 +-
 .../nextjs/src/common/utils/responseEnd.ts    | 52 +++++++++-
 .../common/withServerActionInstrumentation.ts |  5 +-
 .../src/common/wrapMiddlewareWithSentry.ts    |  5 +-
 .../src/common/wrapRouteHandlerWithSentry.ts  |  5 +-
 .../common/wrapServerComponentWithSentry.ts   |  5 +-
 packages/nextjs/src/edge/index.ts             |  5 +-
 .../src/edge/wrapApiHandlerWithSentry.ts      |  5 +-
 .../test/common/utils/responseEnd.test.ts     | 99 +++++++++++++++++++
 11 files changed, 170 insertions(+), 28 deletions(-)
 create mode 100644 packages/nextjs/test/common/utils/responseEnd.test.ts

diff --git a/packages/nextjs/src/common/captureRequestError.ts b/packages/nextjs/src/common/captureRequestError.ts
index 6fd2e83d3188..41fd5d15bea6 100644
--- a/packages/nextjs/src/common/captureRequestError.ts
+++ b/packages/nextjs/src/common/captureRequestError.ts
@@ -1,6 +1,6 @@
 import type { RequestEventData } from '@sentry/core';
-import { captureException, headersToDict, vercelWaitUntil, withScope } from '@sentry/core';
-import { flushSafelyWithTimeout } from './utils/responseEnd';
+import { captureException, headersToDict, withScope } from '@sentry/core';
+import { flushSafelyWithTimeout, waitUntil } from './utils/responseEnd';
 
 type RequestInfo = {
   path: string;
@@ -42,6 +42,6 @@ export function captureRequestError(error: unknown, request: RequestInfo, errorC
       },
     });
 
-    vercelWaitUntil(flushSafelyWithTimeout());
+    waitUntil(flushSafelyWithTimeout());
   });
 }
diff --git a/packages/nextjs/src/common/pages-router-instrumentation/_error.ts b/packages/nextjs/src/common/pages-router-instrumentation/_error.ts
index 354fbe0438e2..8c372f89e39c 100644
--- a/packages/nextjs/src/common/pages-router-instrumentation/_error.ts
+++ b/packages/nextjs/src/common/pages-router-instrumentation/_error.ts
@@ -1,6 +1,6 @@
-import { captureException, httpRequestToRequestData, vercelWaitUntil, withScope } from '@sentry/core';
+import { captureException, httpRequestToRequestData, withScope } from '@sentry/core';
 import type { NextPageContext } from 'next';
-import { flushSafelyWithTimeout } from '../utils/responseEnd';
+import { flushSafelyWithTimeout, waitUntil } from '../utils/responseEnd';
 
 type ContextOrProps = {
   req?: NextPageContext['req'];
@@ -54,5 +54,5 @@ export async function captureUnderscoreErrorException(contextOrProps: ContextOrP
     });
   });
 
-  vercelWaitUntil(flushSafelyWithTimeout());
+  waitUntil(flushSafelyWithTimeout());
 }
diff --git a/packages/nextjs/src/common/pages-router-instrumentation/wrapApiHandlerWithSentry.ts b/packages/nextjs/src/common/pages-router-instrumentation/wrapApiHandlerWithSentry.ts
index 8f02df798f84..60a9b0d617f7 100644
--- a/packages/nextjs/src/common/pages-router-instrumentation/wrapApiHandlerWithSentry.ts
+++ b/packages/nextjs/src/common/pages-router-instrumentation/wrapApiHandlerWithSentry.ts
@@ -10,12 +10,11 @@ import {
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
   setHttpStatus,
   startSpanManual,
-  vercelWaitUntil,
   withIsolationScope,
 } from '@sentry/core';
 import type { NextApiRequest } from 'next';
 import type { AugmentedNextApiResponse, NextApiHandler } from '../types';
-import { flushSafelyWithTimeout } from '../utils/responseEnd';
+import { flushSafelyWithTimeout, waitUntil } from '../utils/responseEnd';
 import { dropNextjsRootContext, escapeNextjsTracing } from '../utils/tracingUtils';
 
 export type AugmentedNextApiRequest = NextApiRequest & {
@@ -95,7 +94,7 @@ export function wrapApiHandlerWithSentry(apiHandler: NextApiHandler, parameteriz
                     apply(target, thisArg, argArray) {
                       setHttpStatus(span, res.statusCode);
                       span.end();
-                      vercelWaitUntil(flushSafelyWithTimeout());
+                      waitUntil(flushSafelyWithTimeout());
                       return target.apply(thisArg, argArray);
                     },
                   });
diff --git a/packages/nextjs/src/common/utils/responseEnd.ts b/packages/nextjs/src/common/utils/responseEnd.ts
index 745908c2bb61..5159897f076e 100644
--- a/packages/nextjs/src/common/utils/responseEnd.ts
+++ b/packages/nextjs/src/common/utils/responseEnd.ts
@@ -1,5 +1,5 @@
 import type { Span } from '@sentry/core';
-import { debug, fill, flush, setHttpStatus } from '@sentry/core';
+import { debug, fill, flush, GLOBAL_OBJ, setHttpStatus, vercelWaitUntil } from '@sentry/core';
 import type { ServerResponse } from 'http';
 import { DEBUG_BUILD } from '../debug-build';
 import type { ResponseEndMethod, WrappedResponseEndMethod } from '../types';
@@ -54,3 +54,53 @@ export async function flushSafelyWithTimeout(): Promise<void> {
     DEBUG_BUILD && debug.log('Error while flushing events:\n', e);
   }
 }
+
+/**
+ * Uses platform-specific waitUntil function to wait for the provided task to complete without blocking.
+ */
+export function waitUntil(task: Promise<unknown>): void {
+  // If deployed on Cloudflare, use the Cloudflare waitUntil function to flush the events
+  if (isCloudflareWaitUntilAvailable()) {
+    cloudflareWaitUntil(task);
+    return;
+  }
+
+  // otherwise, use vercel's
+  vercelWaitUntil(task);
+}
+
+type MinimalCloudflareContext = {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  waitUntil(promise: Promise<any>): void;
+};
+
+/**
+ * Gets the Cloudflare context from the global object.
+ * Relevant to opennext
+ * https://github.com/opennextjs/opennextjs-cloudflare/blob/b53a046bd5c30e94a42e36b67747cefbf7785f9a/packages/cloudflare/src/cli/templates/init.ts#L17
+ */
+function _getOpenNextCloudflareContext(): MinimalCloudflareContext | undefined {
+  const openNextCloudflareContextSymbol = Symbol.for('__cloudflare-context__');
+
+  return (
+    GLOBAL_OBJ as typeof GLOBAL_OBJ & {
+      [openNextCloudflareContextSymbol]?: {
+        ctx: MinimalCloudflareContext;
+      };
+    }
+  )[openNextCloudflareContextSymbol]?.ctx;
+}
+
+/**
+ * Function that delays closing of a Cloudflare lambda until the provided promise is resolved.
+ */
+export function cloudflareWaitUntil(task: Promise<unknown>): void {
+  _getOpenNextCloudflareContext()?.waitUntil(task);
+}
+
+/**
+ * Checks if the Cloudflare waitUntil function is available globally.
+ */
+export function isCloudflareWaitUntilAvailable(): boolean {
+  return typeof _getOpenNextCloudflareContext()?.waitUntil === 'function';
+}
diff --git a/packages/nextjs/src/common/withServerActionInstrumentation.ts b/packages/nextjs/src/common/withServerActionInstrumentation.ts
index f5a1170cc44b..2096d1004e01 100644
--- a/packages/nextjs/src/common/withServerActionInstrumentation.ts
+++ b/packages/nextjs/src/common/withServerActionInstrumentation.ts
@@ -11,10 +11,9 @@ import {
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
   SPAN_STATUS_ERROR,
   startSpan,
-  vercelWaitUntil,
   withIsolationScope,
 } from '@sentry/core';
-import { flushSafelyWithTimeout } from '../common/utils/responseEnd';
+import { flushSafelyWithTimeout, waitUntil } from '../common/utils/responseEnd';
 import { DEBUG_BUILD } from './debug-build';
 import { isNotFoundNavigationError, isRedirectNavigationError } from './nextNavigationErrorUtils';
 
@@ -155,7 +154,7 @@ async function withServerActionInstrumentationImplementation<A extends (...args:
             },
           );
         } finally {
-          vercelWaitUntil(flushSafelyWithTimeout());
+          waitUntil(flushSafelyWithTimeout());
         }
       },
     );
diff --git a/packages/nextjs/src/common/wrapMiddlewareWithSentry.ts b/packages/nextjs/src/common/wrapMiddlewareWithSentry.ts
index ba4f7a852d45..985354543a0d 100644
--- a/packages/nextjs/src/common/wrapMiddlewareWithSentry.ts
+++ b/packages/nextjs/src/common/wrapMiddlewareWithSentry.ts
@@ -9,11 +9,10 @@ import {
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
   setCapturedScopesOnSpan,
   startSpan,
-  vercelWaitUntil,
   winterCGRequestToRequestData,
   withIsolationScope,
 } from '@sentry/core';
-import { flushSafelyWithTimeout } from '../common/utils/responseEnd';
+import { flushSafelyWithTimeout, waitUntil } from '../common/utils/responseEnd';
 import type { EdgeRouteHandler } from '../edge/types';
 
 /**
@@ -108,7 +107,7 @@ export function wrapMiddlewareWithSentry<H extends EdgeRouteHandler>(
                 });
               },
               () => {
-                vercelWaitUntil(flushSafelyWithTimeout());
+                waitUntil(flushSafelyWithTimeout());
               },
             );
           },
diff --git a/packages/nextjs/src/common/wrapRouteHandlerWithSentry.ts b/packages/nextjs/src/common/wrapRouteHandlerWithSentry.ts
index 068ab7960ae4..dc5e7fb4f79b 100644
--- a/packages/nextjs/src/common/wrapRouteHandlerWithSentry.ts
+++ b/packages/nextjs/src/common/wrapRouteHandlerWithSentry.ts
@@ -12,14 +12,13 @@ import {
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
   setCapturedScopesOnSpan,
   setHttpStatus,
-  vercelWaitUntil,
   winterCGHeadersToDict,
   withIsolationScope,
   withScope,
 } from '@sentry/core';
 import { isNotFoundNavigationError, isRedirectNavigationError } from './nextNavigationErrorUtils';
 import type { RouteHandlerContext } from './types';
-import { flushSafelyWithTimeout } from './utils/responseEnd';
+import { flushSafelyWithTimeout, waitUntil } from './utils/responseEnd';
 import { commonObjectToIsolationScope } from './utils/tracingUtils';
 
 /**
@@ -96,7 +95,7 @@ export function wrapRouteHandlerWithSentry<F extends (...args: any[]) => any>(
                 }
               },
               () => {
-                vercelWaitUntil(flushSafelyWithTimeout());
+                waitUntil(flushSafelyWithTimeout());
               },
             );
 
diff --git a/packages/nextjs/src/common/wrapServerComponentWithSentry.ts b/packages/nextjs/src/common/wrapServerComponentWithSentry.ts
index 63871413f006..bdf8f77f4f97 100644
--- a/packages/nextjs/src/common/wrapServerComponentWithSentry.ts
+++ b/packages/nextjs/src/common/wrapServerComponentWithSentry.ts
@@ -13,14 +13,13 @@ import {
   SPAN_STATUS_ERROR,
   SPAN_STATUS_OK,
   startSpanManual,
-  vercelWaitUntil,
   winterCGHeadersToDict,
   withIsolationScope,
   withScope,
 } from '@sentry/core';
 import { isNotFoundNavigationError, isRedirectNavigationError } from '../common/nextNavigationErrorUtils';
 import type { ServerComponentContext } from '../common/types';
-import { flushSafelyWithTimeout } from '../common/utils/responseEnd';
+import { flushSafelyWithTimeout, waitUntil } from '../common/utils/responseEnd';
 import { TRANSACTION_ATTR_SENTRY_TRACE_BACKFILL } from './span-attributes-with-logic-attached';
 import { commonObjectToIsolationScope, commonObjectToPropagationContext } from './utils/tracingUtils';
 
@@ -117,7 +116,7 @@ export function wrapServerComponentWithSentry<F extends (...args: any[]) => any>
                 },
                 () => {
                   span.end();
-                  vercelWaitUntil(flushSafelyWithTimeout());
+                  waitUntil(flushSafelyWithTimeout());
                 },
               );
             },
diff --git a/packages/nextjs/src/edge/index.ts b/packages/nextjs/src/edge/index.ts
index 2232d259ec11..cefec05dcfe5 100644
--- a/packages/nextjs/src/edge/index.ts
+++ b/packages/nextjs/src/edge/index.ts
@@ -15,7 +15,6 @@ import {
   setCapturedScopesOnSpan,
   spanToJSON,
   stripUrlQueryAndFragment,
-  vercelWaitUntil,
 } from '@sentry/core';
 import { getScopesFromContext } from '@sentry/opentelemetry';
 import type { VercelEdgeOptions } from '@sentry/vercel-edge';
@@ -24,7 +23,7 @@ import { TRANSACTION_ATTR_SHOULD_DROP_TRANSACTION } from '../common/span-attribu
 import { addHeadersAsAttributes } from '../common/utils/addHeadersAsAttributes';
 import { dropMiddlewareTunnelRequests } from '../common/utils/dropMiddlewareTunnelRequests';
 import { isBuild } from '../common/utils/isBuild';
-import { flushSafelyWithTimeout } from '../common/utils/responseEnd';
+import { flushSafelyWithTimeout, waitUntil } from '../common/utils/responseEnd';
 import { setUrlProcessingMetadata } from '../common/utils/setUrlProcessingMetadata';
 import { distDirRewriteFramesIntegration } from './distDirRewriteFramesIntegration';
 
@@ -142,7 +141,7 @@ export function init(options: VercelEdgeOptions = {}): void {
 
   client?.on('spanEnd', span => {
     if (span === getRootSpan(span)) {
-      vercelWaitUntil(flushSafelyWithTimeout());
+      waitUntil(flushSafelyWithTimeout());
     }
   });
 
diff --git a/packages/nextjs/src/edge/wrapApiHandlerWithSentry.ts b/packages/nextjs/src/edge/wrapApiHandlerWithSentry.ts
index 9d3d4e4427fa..528c174e45fa 100644
--- a/packages/nextjs/src/edge/wrapApiHandlerWithSentry.ts
+++ b/packages/nextjs/src/edge/wrapApiHandlerWithSentry.ts
@@ -9,12 +9,11 @@ import {
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
   setCapturedScopesOnSpan,
   startSpan,
-  vercelWaitUntil,
   winterCGRequestToRequestData,
   withIsolationScope,
 } from '@sentry/core';
 import { addHeadersAsAttributes } from '../common/utils/addHeadersAsAttributes';
-import { flushSafelyWithTimeout } from '../common/utils/responseEnd';
+import { flushSafelyWithTimeout, waitUntil } from '../common/utils/responseEnd';
 import type { EdgeRouteHandler } from './types';
 
 /**
@@ -94,7 +93,7 @@ export function wrapApiHandlerWithSentry<H extends EdgeRouteHandler>(
                 });
               },
               () => {
-                vercelWaitUntil(flushSafelyWithTimeout());
+                waitUntil(flushSafelyWithTimeout());
               },
             );
           },
diff --git a/packages/nextjs/test/common/utils/responseEnd.test.ts b/packages/nextjs/test/common/utils/responseEnd.test.ts
new file mode 100644
index 000000000000..77755e605c85
--- /dev/null
+++ b/packages/nextjs/test/common/utils/responseEnd.test.ts
@@ -0,0 +1,99 @@
+import { GLOBAL_OBJ } from '@sentry/core';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { waitUntil } from '../../../src/common/utils/responseEnd';
+
+vi.mock('@sentry/core', async () => {
+  const actual = await vi.importActual('@sentry/core');
+  return {
+    ...actual,
+    debug: {
+      log: vi.fn(),
+    },
+    flush: vi.fn(),
+    vercelWaitUntil: vi.fn(),
+  };
+});
+
+describe('responseEnd utils', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    // Clear Cloudflare context
+    const cfContextSymbol = Symbol.for('__cloudflare-context__');
+    (GLOBAL_OBJ as any)[cfContextSymbol] = undefined;
+    // Clear Vercel context
+    const vercelContextSymbol = Symbol.for('@vercel/request-context');
+    (GLOBAL_OBJ as any)[vercelContextSymbol] = undefined;
+  });
+
+  describe('waitUntil', () => {
+    it('should use cloudflareWaitUntil when Cloudflare context is available', async () => {
+      const cfContextSymbol = Symbol.for('__cloudflare-context__');
+      const cfWaitUntilMock = vi.fn();
+      (GLOBAL_OBJ as any)[cfContextSymbol] = {
+        ctx: {
+          waitUntil: cfWaitUntilMock,
+        },
+      };
+
+      const testTask = Promise.resolve('test');
+      waitUntil(testTask);
+
+      expect(cfWaitUntilMock).toHaveBeenCalledWith(testTask);
+      expect(cfWaitUntilMock).toHaveBeenCalledTimes(1);
+
+      // Should not call vercelWaitUntil when Cloudflare is available
+      const { vercelWaitUntil } = await import('@sentry/core');
+      expect(vercelWaitUntil).not.toHaveBeenCalled();
+    });
+
+    it('should use vercelWaitUntil when Cloudflare context is not available', async () => {
+      const { vercelWaitUntil } = await import('@sentry/core');
+      const testTask = Promise.resolve('test');
+
+      waitUntil(testTask);
+
+      expect(vercelWaitUntil).toHaveBeenCalledWith(testTask);
+      expect(vercelWaitUntil).toHaveBeenCalledTimes(1);
+    });
+
+    it('should prefer Cloudflare over Vercel when both are available', async () => {
+      // Set up Cloudflare context
+      const cfContextSymbol = Symbol.for('__cloudflare-context__');
+      const cfWaitUntilMock = vi.fn();
+      (GLOBAL_OBJ as any)[cfContextSymbol] = {
+        ctx: {
+          waitUntil: cfWaitUntilMock,
+        },
+      };
+
+      // Set up Vercel context
+      const vercelWaitUntilMock = vi.fn();
+      (GLOBAL_OBJ as any)[Symbol.for('@vercel/request-context')] = {
+        get: () => ({ waitUntil: vercelWaitUntilMock }),
+      };
+
+      const testTask = Promise.resolve('test');
+      waitUntil(testTask);
+
+      // Should use Cloudflare
+      expect(cfWaitUntilMock).toHaveBeenCalledWith(testTask);
+      expect(cfWaitUntilMock).toHaveBeenCalledTimes(1);
+
+      // Should not use Vercel
+      const { vercelWaitUntil } = await import('@sentry/core');
+      expect(vercelWaitUntil).not.toHaveBeenCalled();
+    });
+
+    it('should handle errors gracefully when waitUntil is called with a rejected promise', async () => {
+      const { vercelWaitUntil } = await import('@sentry/core');
+      const testTask = Promise.reject(new Error('test error'));
+
+      // Should not throw synchronously
+      expect(() => waitUntil(testTask)).not.toThrow();
+      expect(vercelWaitUntil).toHaveBeenCalledWith(testTask);
+
+      // Prevent unhandled rejection in test
+      testTask.catch(() => {});
+    });
+  });
+});

From f3bdfd7605ac3c4ff0496e0ed0cc7581d37e89d2 Mon Sep 17 00:00:00 2001
From: Rola Abuhasna <rola.abuhasna@sentry.io>
Date: Wed, 26 Nov 2025 21:12:37 +0100
Subject: [PATCH 134/186] feat(node): Add LangChain v1 support (#18306)

This PR adds support for LangChain v1.

## Changes

- LangChain v1 Response Metadata Extraction

- Updated response attribute extraction to support LangChain v1's
different data structure:

- Instrument ConfigurableModel from `chat_models/universal.cjs`

Quick context:

The `initChatModel` unified API (introduced in LangChain v1) was not
being instrumented in CJS applications. This happened because:

1. `initChatModel` uses dynamic `import()` to load providers (even in
CJS mode)
2. OpenTelemetry's CJS instrumentation only hooks `require()`, not
dynamic `import()`
3. Provider packages like `@langchain/openai` were never being patched
when loaded via `initChatModel`

**Solution**: Added instrumentation for the main `langchain` package.
When `langchain/dist/chat_models/universal.cjs` is loaded, we patch the
`ConfigurableModel` prototype. Since `initChatModel` returns a
`ConfigurableModel` instance, it inherits the patched methods regardless
of how the provider is loaded.

This fix ensures `initChatModel` works in CJS applications without
requiring users to manually import provider packages.

- Add tests for node integrations tests testing v1 changes
- All existing tests continue to pass
- New v1 test suite validates:
    - Basic chat model spans with and without PII
    - Tool call instrumentation
    - Message truncation behavior
    - Timing issues with pre-imported clients
    - `initChatModel` API with OpenAI (now working in both ESM and CJS)

Closes https://linear.app/getsentry/issue/JS-1071/support-langchain-v1
---
 .../langchain/v1/instrument-with-pii.mjs      |  17 +
 .../tracing/langchain/v1/instrument.mjs       |  17 +
 .../langchain/v1/scenario-init-chat-model.mjs | 110 +++++
 .../v1/scenario-message-truncation.mjs        |  72 +++
 .../v1/scenario-openai-before-langchain.mjs   |  95 ++++
 .../tracing/langchain/v1/scenario-tools.mjs   |  90 ++++
 .../suites/tracing/langchain/v1/scenario.mjs  | 110 +++++
 .../suites/tracing/langchain/v1/test.ts       | 449 ++++++++++++++++++
 packages/core/src/tracing/langchain/types.ts  |  12 +-
 packages/core/src/tracing/langchain/utils.ts  |  34 +-
 .../tracing/langchain/instrumentation.ts      |  32 +-
 11 files changed, 1023 insertions(+), 15 deletions(-)
 create mode 100644 dev-packages/node-integration-tests/suites/tracing/langchain/v1/instrument-with-pii.mjs
 create mode 100644 dev-packages/node-integration-tests/suites/tracing/langchain/v1/instrument.mjs
 create mode 100644 dev-packages/node-integration-tests/suites/tracing/langchain/v1/scenario-init-chat-model.mjs
 create mode 100644 dev-packages/node-integration-tests/suites/tracing/langchain/v1/scenario-message-truncation.mjs
 create mode 100644 dev-packages/node-integration-tests/suites/tracing/langchain/v1/scenario-openai-before-langchain.mjs
 create mode 100644 dev-packages/node-integration-tests/suites/tracing/langchain/v1/scenario-tools.mjs
 create mode 100644 dev-packages/node-integration-tests/suites/tracing/langchain/v1/scenario.mjs
 create mode 100644 dev-packages/node-integration-tests/suites/tracing/langchain/v1/test.ts

diff --git a/dev-packages/node-integration-tests/suites/tracing/langchain/v1/instrument-with-pii.mjs b/dev-packages/node-integration-tests/suites/tracing/langchain/v1/instrument-with-pii.mjs
new file mode 100644
index 000000000000..3d911666a7d7
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/langchain/v1/instrument-with-pii.mjs
@@ -0,0 +1,17 @@
+import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  release: '1.0',
+  tracesSampleRate: 1.0,
+  sendDefaultPii: true,
+  transport: loggingTransport,
+  beforeSendTransaction: event => {
+    // Filter out mock express server transactions
+    if (event.transaction.includes('/v1/messages') || event.transaction.includes('/v1/chat/completions')) {
+      return null;
+    }
+    return event;
+  },
+});
diff --git a/dev-packages/node-integration-tests/suites/tracing/langchain/v1/instrument.mjs b/dev-packages/node-integration-tests/suites/tracing/langchain/v1/instrument.mjs
new file mode 100644
index 000000000000..05985d888de9
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/langchain/v1/instrument.mjs
@@ -0,0 +1,17 @@
+import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  release: '1.0',
+  tracesSampleRate: 1.0,
+  sendDefaultPii: false,
+  transport: loggingTransport,
+  beforeSendTransaction: event => {
+    // Filter out mock express server transactions
+    if (event.transaction.includes('/v1/messages') || event.transaction.includes('/v1/chat/completions')) {
+      return null;
+    }
+    return event;
+  },
+});
diff --git a/dev-packages/node-integration-tests/suites/tracing/langchain/v1/scenario-init-chat-model.mjs b/dev-packages/node-integration-tests/suites/tracing/langchain/v1/scenario-init-chat-model.mjs
new file mode 100644
index 000000000000..1ca0337f238f
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/langchain/v1/scenario-init-chat-model.mjs
@@ -0,0 +1,110 @@
+import * as Sentry from '@sentry/node';
+import express from 'express';
+import { initChatModel } from 'langchain';
+
+function startMockOpenAIServer() {
+  const app = express();
+  app.use(express.json());
+
+  app.post('/v1/chat/completions', (req, res) => {
+    const model = req.body.model;
+
+    if (model === 'error-model') {
+      res.status(404).json({
+        error: {
+          message: 'Model not found',
+          type: 'invalid_request_error',
+          param: null,
+          code: 'model_not_found',
+        },
+      });
+      return;
+    }
+
+    // Simulate OpenAI response
+    res.json({
+      id: 'chatcmpl-init-test-123',
+      object: 'chat.completion',
+      created: 1677652288,
+      model: model,
+      system_fingerprint: 'fp_44709d6fcb',
+      choices: [
+        {
+          index: 0,
+          message: {
+            role: 'assistant',
+            content: 'Hello from initChatModel!',
+          },
+          finish_reason: 'stop',
+        },
+      ],
+      usage: {
+        prompt_tokens: 8,
+        completion_tokens: 12,
+        total_tokens: 20,
+      },
+    });
+  });
+
+  return new Promise(resolve => {
+    const server = app.listen(0, () => {
+      resolve(server);
+    });
+  });
+}
+
+async function run() {
+  const server = await startMockOpenAIServer();
+  const baseUrl = `http://localhost:${server.address().port}/v1`;
+
+  await Sentry.startSpan({ op: 'function', name: 'main' }, async () => {
+    // Set OpenAI API key in environment
+    process.env.OPENAI_API_KEY = 'mock-api-key';
+
+    // Test 1: Initialize chat model using unified API with model string
+    const model1 = await initChatModel('gpt-4o', {
+      temperature: 0.7,
+      maxTokens: 100,
+      modelProvider: 'openai',
+      configurableFields: ['model'],
+      configuration: {
+        baseURL: baseUrl,
+      },
+    });
+
+    await model1.invoke('Tell me about LangChain');
+
+    // Test 2: Initialize with different model
+    const model2 = await initChatModel('gpt-3.5-turbo', {
+      temperature: 0.5,
+      modelProvider: 'openai',
+      configuration: {
+        baseURL: baseUrl,
+      },
+    });
+
+    await model2.invoke([
+      { role: 'system', content: 'You are a helpful assistant' },
+      { role: 'user', content: 'What is AI?' },
+    ]);
+
+    // Test 3: Error handling
+    try {
+      const errorModel = await initChatModel('error-model', {
+        modelProvider: 'openai',
+        configuration: {
+          baseURL: baseUrl,
+        },
+      });
+      await errorModel.invoke('This will fail');
+    } catch {
+      // Expected error
+    }
+  });
+
+  await Sentry.flush(2000);
+
+  server.close();
+}
+
+run();
diff --git a/dev-packages/node-integration-tests/suites/tracing/langchain/v1/scenario-message-truncation.mjs b/dev-packages/node-integration-tests/suites/tracing/langchain/v1/scenario-message-truncation.mjs
new file mode 100644
index 000000000000..6dafe8572cec
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/langchain/v1/scenario-message-truncation.mjs
@@ -0,0 +1,72 @@
+import { ChatAnthropic } from '@langchain/anthropic';
+import * as Sentry from '@sentry/node';
+import express from 'express';
+
+function startMockAnthropicServer() {
+  const app = express();
+  app.use(express.json());
+
+  app.post('/v1/messages', (req, res) => {
+    const model = req.body.model;
+
+    res.json({
+      id: 'msg_truncation_test',
+      type: 'message',
+      role: 'assistant',
+      content: [
+        {
+          type: 'text',
+          text: 'Response to truncated messages',
+        },
+      ],
+      model: model,
+      stop_reason: 'end_turn',
+      stop_sequence: null,
+      usage: {
+        input_tokens: 10,
+        output_tokens: 15,
+      },
+    });
+  });
+
+  return new Promise(resolve => {
+    const server = app.listen(0, () => {
+      resolve(server);
+    });
+  });
+}
+
+async function run() {
+  const server = await startMockAnthropicServer();
+  const baseUrl = `http://localhost:${server.address().port}`;
+
+  await Sentry.startSpan({ op: 'function', name: 'main' }, async () => {
+    const model = new ChatAnthropic({
+      model: 'claude-3-5-sonnet-20241022',
+      apiKey: 'mock-api-key',
+      clientOptions: {
+        baseURL: baseUrl,
+      },
+    });
+
+    const largeContent1 = 'A'.repeat(15000); // ~15KB
+    const largeContent2 = 'B'.repeat(15000); // ~15KB
+    const largeContent3 = 'C'.repeat(25000); // ~25KB (will be truncated)
+
+    // Create one very large string that gets truncated to only include Cs
+    await model.invoke(largeContent3 + largeContent2);
+
+    // Create an array of messages that gets truncated to only include the last message (result should again contain only Cs)
+    await model.invoke([
+      { role: 'system', content: largeContent1 },
+      { role: 'user', content: largeContent2 },
+      { role: 'user', content: largeContent3 },
+    ]);
+  });
+
+  await Sentry.flush(2000);
+
+  server.close();
+}
+
+run();
diff --git a/dev-packages/node-integration-tests/suites/tracing/langchain/v1/scenario-openai-before-langchain.mjs b/dev-packages/node-integration-tests/suites/tracing/langchain/v1/scenario-openai-before-langchain.mjs
new file mode 100644
index 000000000000..f194acb1672b
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/langchain/v1/scenario-openai-before-langchain.mjs
@@ -0,0 +1,95 @@
+import * as Sentry from '@sentry/node';
+import express from 'express';
+
+function startMockAnthropicServer() {
+  const app = express();
+  app.use(express.json());
+
+  app.post('/v1/messages', (req, res) => {
+    res.json({
+      id: 'msg_test123',
+      type: 'message',
+      role: 'assistant',
+      content: [
+        {
+          type: 'text',
+          text: 'Mock response from Anthropic!',
+        },
+      ],
+      model: req.body.model,
+      stop_reason: 'end_turn',
+      stop_sequence: null,
+      usage: {
+        input_tokens: 10,
+        output_tokens: 15,
+      },
+    });
+  });
+
+  return new Promise(resolve => {
+    const server = app.listen(0, () => {
+      resolve(server);
+    });
+  });
+}
+
+async function run() {
+  const server = await startMockAnthropicServer();
+  const baseURL = `http://localhost:${server.address().port}`;
+
+  await Sentry.startSpan({ op: 'function', name: 'main' }, async () => {
+    // EDGE CASE: Import and instantiate Anthropic client BEFORE LangChain is imported
+    // This simulates the timing issue where a user creates an Anthropic client in one file
+    // before importing LangChain in another file
+    const { default: Anthropic } = await import('@anthropic-ai/sdk');
+    const anthropicClient = new Anthropic({
+      apiKey: 'mock-api-key',
+      baseURL,
+    });
+
+    // Use the Anthropic client directly - this will be instrumented by the Anthropic integration
+    await anthropicClient.messages.create({
+      model: 'claude-3-5-sonnet-20241022',
+      messages: [{ role: 'user', content: 'Direct Anthropic call' }],
+      temperature: 0.7,
+      max_tokens: 100,
+    });
+
+    // NOW import LangChain - at this point it will mark Anthropic to be skipped
+    // But the client created above is already instrumented
+    const { ChatAnthropic } = await import('@langchain/anthropic');
+
+    // Create a LangChain model - this uses Anthropic under the hood
+    const langchainModel = new ChatAnthropic({
+      model: 'claude-3-5-sonnet-20241022',
+      temperature: 0.7,
+      maxTokens: 100,
+      apiKey: 'mock-api-key',
+      clientOptions: {
+        baseURL,
+      },
+    });
+
+    // Use LangChain - this will be instrumented by LangChain integration
+    await langchainModel.invoke('LangChain Anthropic call');
+
+    // Create ANOTHER Anthropic client after LangChain was imported
+    // This one should NOT be instrumented (skip mechanism works correctly)
+    const anthropicClient2 = new Anthropic({
+      apiKey: 'mock-api-key',
+      baseURL,
+    });
+
+    await anthropicClient2.messages.create({
+      model: 'claude-3-5-sonnet-20241022',
+      messages: [{ role: 'user', content: 'Second direct Anthropic call' }],
+      temperature: 0.7,
+      max_tokens: 100,
+    });
+  });
+
+  await Sentry.flush(2000);
+  server.close();
+}
+
+run();
diff --git a/dev-packages/node-integration-tests/suites/tracing/langchain/v1/scenario-tools.mjs b/dev-packages/node-integration-tests/suites/tracing/langchain/v1/scenario-tools.mjs
new file mode 100644
index 000000000000..256ee4568884
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/langchain/v1/scenario-tools.mjs
@@ -0,0 +1,90 @@
+import { ChatAnthropic } from '@langchain/anthropic';
+import * as Sentry from '@sentry/node';
+import express from 'express';
+
+function startMockAnthropicServer() {
+  const app = express();
+  app.use(express.json());
+
+  app.post('/v1/messages', (req, res) => {
+    const model = req.body.model;
+
+    // Simulate tool call response
+    res.json({
+      id: 'msg_tool_test_123',
+      type: 'message',
+      role: 'assistant',
+      model: model,
+      content: [
+        {
+          type: 'text',
+          text: 'Let me check the weather for you.',
+        },
+        {
+          type: 'tool_use',
+          id: 'toolu_01A09q90qw90lq917835lq9',
+          name: 'get_weather',
+          input: { location: 'San Francisco, CA' },
+        },
+        {
+          type: 'text',
+          text: 'The weather looks great!',
+        },
+      ],
+      stop_reason: 'tool_use',
+      stop_sequence: null,
+      usage: {
+        input_tokens: 20,
+        output_tokens: 30,
+      },
+    });
+  });
+
+  return new Promise(resolve => {
+    const server = app.listen(0, () => {
+      resolve(server);
+    });
+  });
+}
+
+async function run() {
+  const server = await startMockAnthropicServer();
+  const baseUrl = `http://localhost:${server.address().port}`;
+
+  await Sentry.startSpan({ op: 'function', name: 'main' }, async () => {
+    const model = new ChatAnthropic({
+      model: 'claude-3-5-sonnet-20241022',
+      temperature: 0.7,
+      maxTokens: 150,
+      apiKey: 'mock-api-key',
+      clientOptions: {
+        baseURL: baseUrl,
+      },
+    });
+
+    await model.invoke('What is the weather in San Francisco?', {
+      tools: [
+        {
+          name: 'get_weather',
+          description: 'Get the current weather in a given location',
+          input_schema: {
+            type: 'object',
+            properties: {
+              location: {
+                type: 'string',
+                description: 'The city and state, e.g. San Francisco, CA',
+              },
+            },
+            required: ['location'],
+          },
+        },
+      ],
+    });
+  });
+
+  await Sentry.flush(2000);
+
+  server.close();
+}
+
+run();
diff --git a/dev-packages/node-integration-tests/suites/tracing/langchain/v1/scenario.mjs b/dev-packages/node-integration-tests/suites/tracing/langchain/v1/scenario.mjs
new file mode 100644
index 000000000000..2c60e55ff77e
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/langchain/v1/scenario.mjs
@@ -0,0 +1,110 @@
+import { ChatAnthropic } from '@langchain/anthropic';
+import * as Sentry from '@sentry/node';
+import express from 'express';
+
+function startMockAnthropicServer() {
+  const app = express();
+  app.use(express.json());
+
+  app.post('/v1/messages', (req, res) => {
+    const model = req.body.model;
+
+    if (model === 'error-model') {
+      res
+        .status(400)
+        .set('request-id', 'mock-request-123')
+        .json({
+          type: 'error',
+          error: {
+            type: 'invalid_request_error',
+            message: 'Model not found',
+          },
+        });
+      return;
+    }
+
+    // Simulate basic response
+    res.json({
+      id: 'msg_test123',
+      type: 'message',
+      role: 'assistant',
+      content: [
+        {
+          type: 'text',
+          text: 'Mock response from Anthropic!',
+        },
+      ],
+      model: model,
+      stop_reason: 'end_turn',
+      stop_sequence: null,
+      usage: {
+        input_tokens: 10,
+        output_tokens: 15,
+      },
+    });
+  });
+
+  return new Promise(resolve => {
+    const server = app.listen(0, () => {
+      resolve(server);
+    });
+  });
+}
+
+async function run() {
+  const server = await startMockAnthropicServer();
+  const baseUrl = `http://localhost:${server.address().port}`;
+
+  await Sentry.startSpan({ op: 'function', name: 'main' }, async () => {
+    // Test 1: Basic chat model invocation
+    const model1 = new ChatAnthropic({
+      model: 'claude-3-5-sonnet-20241022',
+      temperature: 0.7,
+      maxTokens: 100,
+      apiKey: 'mock-api-key',
+      clientOptions: {
+        baseURL: baseUrl,
+      },
+    });
+
+    await model1.invoke('Tell me a joke');
+
+    // Test 2: Chat with different model
+    const model2 = new ChatAnthropic({
+      model: 'claude-3-opus-20240229',
+      temperature: 0.9,
+      topP: 0.95,
+      maxTokens: 200,
+      apiKey: 'mock-api-key',
+      clientOptions: {
+        baseURL: baseUrl,
+      },
+    });
+
+    await model2.invoke([
+      { role: 'system', content: 'You are a helpful assistant' },
+      { role: 'user', content: 'What is the capital of France?' },
+    ]);
+
+    // Test 3: Error handling
+    const errorModel = new ChatAnthropic({
+      model: 'error-model',
+      apiKey: 'mock-api-key',
+      clientOptions: {
+        baseURL: baseUrl,
+      },
+    });
+
+    try {
+      await errorModel.invoke('This will fail');
+    } catch {
+      // Expected error
+    }
+  });
+
+  await Sentry.flush(2000);
+
+  server.close();
+}
+
+run();
diff --git a/dev-packages/node-integration-tests/suites/tracing/langchain/v1/test.ts b/dev-packages/node-integration-tests/suites/tracing/langchain/v1/test.ts
new file mode 100644
index 000000000000..eaa40887fc66
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/langchain/v1/test.ts
@@ -0,0 +1,449 @@
+import { afterAll, expect } from 'vitest';
+import { conditionalTest } from '../../../../utils';
+import { cleanupChildProcesses, createEsmAndCjsTests } from '../../../../utils/runner';
+
+// LangChain v1 requires Node.js 20+ (dropped Node 18 support)
+// See: https://docs.langchain.com/oss/javascript/migrate/langgraph-v1#dropped-node-18-support
+conditionalTest({ min: 20 })('LangChain integration (v1)', () => {
+  afterAll(() => {
+    cleanupChildProcesses();
+  });
+
+  const EXPECTED_TRANSACTION_DEFAULT_PII_FALSE = {
+    transaction: 'main',
+    spans: expect.arrayContaining([
+      // First span - chat model with claude-3-5-sonnet
+      expect.objectContaining({
+        data: expect.objectContaining({
+          'gen_ai.operation.name': 'chat',
+          'sentry.op': 'gen_ai.chat',
+          'sentry.origin': 'auto.ai.langchain',
+          'gen_ai.system': 'anthropic',
+          'gen_ai.request.model': 'claude-3-5-sonnet-20241022',
+          'gen_ai.request.temperature': 0.7,
+          'gen_ai.request.max_tokens': 100,
+          'gen_ai.usage.input_tokens': 10,
+          'gen_ai.usage.output_tokens': 15,
+          'gen_ai.usage.total_tokens': 25,
+          'gen_ai.response.id': expect.any(String),
+          'gen_ai.response.model': expect.any(String),
+          'gen_ai.response.stop_reason': expect.any(String),
+        }),
+        description: 'chat claude-3-5-sonnet-20241022',
+        op: 'gen_ai.chat',
+        origin: 'auto.ai.langchain',
+        status: 'ok',
+      }),
+      // Second span - chat model with claude-3-opus
+      expect.objectContaining({
+        data: expect.objectContaining({
+          'gen_ai.operation.name': 'chat',
+          'sentry.op': 'gen_ai.chat',
+          'sentry.origin': 'auto.ai.langchain',
+          'gen_ai.system': 'anthropic',
+          'gen_ai.request.model': 'claude-3-opus-20240229',
+          'gen_ai.request.temperature': 0.9,
+          'gen_ai.request.top_p': 0.95,
+          'gen_ai.request.max_tokens': 200,
+          'gen_ai.usage.input_tokens': 10,
+          'gen_ai.usage.output_tokens': 15,
+          'gen_ai.usage.total_tokens': 25,
+          'gen_ai.response.id': expect.any(String),
+          'gen_ai.response.model': expect.any(String),
+          'gen_ai.response.stop_reason': expect.any(String),
+        }),
+        description: 'chat claude-3-opus-20240229',
+        op: 'gen_ai.chat',
+        origin: 'auto.ai.langchain',
+        status: 'ok',
+      }),
+      // Third span - error handling
+      expect.objectContaining({
+        data: expect.objectContaining({
+          'gen_ai.operation.name': 'chat',
+          'sentry.op': 'gen_ai.chat',
+          'sentry.origin': 'auto.ai.langchain',
+          'gen_ai.system': 'anthropic',
+          'gen_ai.request.model': 'error-model',
+        }),
+        description: 'chat error-model',
+        op: 'gen_ai.chat',
+        origin: 'auto.ai.langchain',
+        status: 'internal_error',
+      }),
+    ]),
+  };
+
+  const EXPECTED_TRANSACTION_DEFAULT_PII_TRUE = {
+    transaction: 'main',
+    spans: expect.arrayContaining([
+      // First span - chat model with PII
+      expect.objectContaining({
+        data: expect.objectContaining({
+          'gen_ai.operation.name': 'chat',
+          'sentry.op': 'gen_ai.chat',
+          'sentry.origin': 'auto.ai.langchain',
+          'gen_ai.system': 'anthropic',
+          'gen_ai.request.model': 'claude-3-5-sonnet-20241022',
+          'gen_ai.request.temperature': 0.7,
+          'gen_ai.request.max_tokens': 100,
+          'gen_ai.request.messages': expect.any(String), // Should include messages when recordInputs: true
+          'gen_ai.response.text': expect.any(String), // Should include response when recordOutputs: true
+          'gen_ai.response.id': expect.any(String),
+          'gen_ai.response.model': expect.any(String),
+          'gen_ai.response.stop_reason': expect.any(String),
+          'gen_ai.usage.input_tokens': 10,
+          'gen_ai.usage.output_tokens': 15,
+          'gen_ai.usage.total_tokens': 25,
+        }),
+        description: 'chat claude-3-5-sonnet-20241022',
+        op: 'gen_ai.chat',
+        origin: 'auto.ai.langchain',
+        status: 'ok',
+      }),
+      // Second span - chat model with PII
+      expect.objectContaining({
+        data: expect.objectContaining({
+          'gen_ai.operation.name': 'chat',
+          'sentry.op': 'gen_ai.chat',
+          'sentry.origin': 'auto.ai.langchain',
+          'gen_ai.system': 'anthropic',
+          'gen_ai.request.model': 'claude-3-opus-20240229',
+          'gen_ai.request.temperature': 0.9,
+          'gen_ai.request.top_p': 0.95,
+          'gen_ai.request.max_tokens': 200,
+          'gen_ai.request.messages': expect.any(String), // Should include messages when recordInputs: true
+          'gen_ai.response.text': expect.any(String), // Should include response when recordOutputs: true
+          'gen_ai.response.id': expect.any(String),
+          'gen_ai.response.model': expect.any(String),
+          'gen_ai.response.stop_reason': expect.any(String),
+          'gen_ai.usage.input_tokens': 10,
+          'gen_ai.usage.output_tokens': 15,
+          'gen_ai.usage.total_tokens': 25,
+        }),
+        description: 'chat claude-3-opus-20240229',
+        op: 'gen_ai.chat',
+        origin: 'auto.ai.langchain',
+        status: 'ok',
+      }),
+      // Third span - error handling with PII
+      expect.objectContaining({
+        data: expect.objectContaining({
+          'gen_ai.operation.name': 'chat',
+          'sentry.op': 'gen_ai.chat',
+          'sentry.origin': 'auto.ai.langchain',
+          'gen_ai.system': 'anthropic',
+          'gen_ai.request.model': 'error-model',
+          'gen_ai.request.messages': expect.any(String), // Should include messages when recordInputs: true
+        }),
+        description: 'chat error-model',
+        op: 'gen_ai.chat',
+        origin: 'auto.ai.langchain',
+        status: 'internal_error',
+      }),
+    ]),
+  };
+
+  createEsmAndCjsTests(
+    __dirname,
+    'scenario.mjs',
+    'instrument.mjs',
+    (createRunner, test) => {
+      test('creates langchain related spans with sendDefaultPii: false', async () => {
+        await createRunner()
+          .ignore('event')
+          .expect({ transaction: EXPECTED_TRANSACTION_DEFAULT_PII_FALSE })
+          .start()
+          .completed();
+      });
+    },
+    {
+      additionalDependencies: {
+        langchain: '^1.0.0',
+        '@langchain/core': '^1.0.0',
+        '@langchain/anthropic': '^1.0.0',
+      },
+    },
+  );
+
+  createEsmAndCjsTests(
+    __dirname,
+    'scenario.mjs',
+    'instrument-with-pii.mjs',
+    (createRunner, test) => {
+      test('creates langchain related spans with sendDefaultPii: true', async () => {
+        await createRunner()
+          .ignore('event')
+          .expect({ transaction: EXPECTED_TRANSACTION_DEFAULT_PII_TRUE })
+          .start()
+          .completed();
+      });
+    },
+    {
+      additionalDependencies: {
+        langchain: '^1.0.0',
+        '@langchain/core': '^1.0.0',
+        '@langchain/anthropic': '^1.0.0',
+      },
+    },
+  );
+
+  const EXPECTED_TRANSACTION_TOOL_CALLS = {
+    transaction: 'main',
+    spans: expect.arrayContaining([
+      expect.objectContaining({
+        data: expect.objectContaining({
+          'gen_ai.operation.name': 'chat',
+          'sentry.op': 'gen_ai.chat',
+          'sentry.origin': 'auto.ai.langchain',
+          'gen_ai.system': 'anthropic',
+          'gen_ai.request.model': 'claude-3-5-sonnet-20241022',
+          'gen_ai.request.temperature': 0.7,
+          'gen_ai.request.max_tokens': 150,
+          'gen_ai.usage.input_tokens': 20,
+          'gen_ai.usage.output_tokens': 30,
+          'gen_ai.usage.total_tokens': 50,
+          'gen_ai.response.id': expect.any(String),
+          'gen_ai.response.model': expect.any(String),
+          'gen_ai.response.stop_reason': 'tool_use',
+          'gen_ai.response.tool_calls': expect.any(String),
+        }),
+        description: 'chat claude-3-5-sonnet-20241022',
+        op: 'gen_ai.chat',
+        origin: 'auto.ai.langchain',
+        status: 'ok',
+      }),
+    ]),
+  };
+
+  createEsmAndCjsTests(
+    __dirname,
+    'scenario-tools.mjs',
+    'instrument.mjs',
+    (createRunner, test) => {
+      test('creates langchain spans with tool calls', async () => {
+        await createRunner()
+          .ignore('event')
+          .expect({ transaction: EXPECTED_TRANSACTION_TOOL_CALLS })
+          .start()
+          .completed();
+      });
+    },
+    {
+      additionalDependencies: {
+        langchain: '^1.0.0',
+        '@langchain/core': '^1.0.0',
+        '@langchain/anthropic': '^1.0.0',
+      },
+    },
+  );
+
+  const EXPECTED_TRANSACTION_MESSAGE_TRUNCATION = {
+    transaction: 'main',
+    spans: expect.arrayContaining([
+      expect.objectContaining({
+        data: expect.objectContaining({
+          'gen_ai.operation.name': 'chat',
+          'sentry.op': 'gen_ai.chat',
+          'sentry.origin': 'auto.ai.langchain',
+          'gen_ai.system': 'anthropic',
+          'gen_ai.request.model': 'claude-3-5-sonnet-20241022',
+          // Messages should be present and should include truncated string input (contains only Cs)
+          'gen_ai.request.messages': expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
+        }),
+        description: 'chat claude-3-5-sonnet-20241022',
+        op: 'gen_ai.chat',
+        origin: 'auto.ai.langchain',
+        status: 'ok',
+      }),
+      expect.objectContaining({
+        data: expect.objectContaining({
+          'gen_ai.operation.name': 'chat',
+          'sentry.op': 'gen_ai.chat',
+          'sentry.origin': 'auto.ai.langchain',
+          'gen_ai.system': 'anthropic',
+          'gen_ai.request.model': 'claude-3-5-sonnet-20241022',
+          // Messages should be present (truncation happened) and should be a JSON array of a single index (contains only Cs)
+          'gen_ai.request.messages': expect.stringMatching(/^\[\{"role":"user","content":"C+"\}\]$/),
+        }),
+        description: 'chat claude-3-5-sonnet-20241022',
+        op: 'gen_ai.chat',
+        origin: 'auto.ai.langchain',
+        status: 'ok',
+      }),
+    ]),
+  };
+
+  createEsmAndCjsTests(
+    __dirname,
+    'scenario-message-truncation.mjs',
+    'instrument-with-pii.mjs',
+    (createRunner, test) => {
+      test('truncates messages when they exceed byte limit', async () => {
+        await createRunner()
+          .ignore('event')
+          .expect({ transaction: EXPECTED_TRANSACTION_MESSAGE_TRUNCATION })
+          .start()
+          .completed();
+      });
+    },
+    {
+      additionalDependencies: {
+        langchain: '^1.0.0',
+        '@langchain/core': '^1.0.0',
+        '@langchain/anthropic': '^1.0.0',
+      },
+    },
+  );
+
+  createEsmAndCjsTests(
+    __dirname,
+    'scenario-openai-before-langchain.mjs',
+    'instrument.mjs',
+    (createRunner, test) => {
+      test('demonstrates timing issue with duplicate spans (ESM only)', async () => {
+        await createRunner()
+          .ignore('event')
+          .expect({
+            transaction: event => {
+              // This test highlights the limitation: if a user creates an Anthropic client
+              // before importing LangChain, that client will still be instrumented and
+              // could cause duplicate spans when used alongside LangChain.
+
+              const spans = event.spans || [];
+
+              // First call: Direct Anthropic call made BEFORE LangChain import
+              // This should have Anthropic instrumentation (origin: 'auto.ai.anthropic')
+              const firstAnthropicSpan = spans.find(
+                span =>
+                  span.description === 'messages claude-3-5-sonnet-20241022' && span.origin === 'auto.ai.anthropic',
+              );
+
+              // Second call: LangChain call
+              // This should have LangChain instrumentation (origin: 'auto.ai.langchain')
+              const langchainSpan = spans.find(
+                span => span.description === 'chat claude-3-5-sonnet-20241022' && span.origin === 'auto.ai.langchain',
+              );
+
+              // Third call: Direct Anthropic call made AFTER LangChain import
+              // This should NOT have Anthropic instrumentation (skip works correctly)
+              // Count how many Anthropic spans we have - should be exactly 1
+              const anthropicSpans = spans.filter(
+                span =>
+                  span.description === 'messages claude-3-5-sonnet-20241022' && span.origin === 'auto.ai.anthropic',
+              );
+
+              // Verify the edge case limitation:
+              // - First Anthropic client (created before LangChain) IS instrumented
+              expect(firstAnthropicSpan).toBeDefined();
+              expect(firstAnthropicSpan?.origin).toBe('auto.ai.anthropic');
+
+              // - LangChain call IS instrumented by LangChain
+              expect(langchainSpan).toBeDefined();
+              expect(langchainSpan?.origin).toBe('auto.ai.langchain');
+
+              // - Second Anthropic client (created after LangChain) is NOT instrumented
+              // This demonstrates that the skip mechanism works for NEW clients
+              // We should only have ONE Anthropic span (the first one), not two
+              expect(anthropicSpans).toHaveLength(1);
+            },
+          })
+          .start()
+          .completed();
+      });
+    },
+    {
+      failsOnCjs: true,
+      additionalDependencies: {
+        langchain: '^1.0.0',
+        '@langchain/core': '^1.0.0',
+        '@langchain/anthropic': '^1.0.0',
+      },
+    },
+  );
+
+  const EXPECTED_TRANSACTION_INIT_CHAT_MODEL = {
+    transaction: 'main',
+    spans: expect.arrayContaining([
+      // First span - initChatModel with gpt-4o
+      expect.objectContaining({
+        data: expect.objectContaining({
+          'gen_ai.operation.name': 'chat',
+          'sentry.op': 'gen_ai.chat',
+          'sentry.origin': 'auto.ai.langchain',
+          'gen_ai.system': 'openai',
+          'gen_ai.request.model': 'gpt-4o',
+          'gen_ai.request.temperature': 0.7,
+          'gen_ai.request.max_tokens': 100,
+          'gen_ai.usage.input_tokens': 8,
+          'gen_ai.usage.output_tokens': 12,
+          'gen_ai.usage.total_tokens': 20,
+          'gen_ai.response.id': expect.any(String),
+          'gen_ai.response.model': 'gpt-4o',
+          'gen_ai.response.stop_reason': 'stop',
+        }),
+        description: 'chat gpt-4o',
+        op: 'gen_ai.chat',
+        origin: 'auto.ai.langchain',
+        status: 'ok',
+      }),
+      // Second span - initChatModel with gpt-3.5-turbo
+      expect.objectContaining({
+        data: expect.objectContaining({
+          'gen_ai.operation.name': 'chat',
+          'sentry.op': 'gen_ai.chat',
+          'sentry.origin': 'auto.ai.langchain',
+          'gen_ai.system': 'openai',
+          'gen_ai.request.model': 'gpt-3.5-turbo',
+          'gen_ai.request.temperature': 0.5,
+          'gen_ai.usage.input_tokens': 8,
+          'gen_ai.usage.output_tokens': 12,
+          'gen_ai.usage.total_tokens': 20,
+          'gen_ai.response.id': expect.any(String),
+          'gen_ai.response.model': 'gpt-3.5-turbo',
+          'gen_ai.response.stop_reason': 'stop',
+        }),
+        description: 'chat gpt-3.5-turbo',
+        op: 'gen_ai.chat',
+        origin: 'auto.ai.langchain',
+        status: 'ok',
+      }),
+      // Third span - error handling
+      expect.objectContaining({
+        data: expect.objectContaining({
+          'gen_ai.operation.name': 'chat',
+          'sentry.op': 'gen_ai.chat',
+          'sentry.origin': 'auto.ai.langchain',
+          'gen_ai.system': 'openai',
+          'gen_ai.request.model': 'error-model',
+        }),
+        description: 'chat error-model',
+        op: 'gen_ai.chat',
+        origin: 'auto.ai.langchain',
+        status: 'internal_error',
+      }),
+    ]),
+  };
+
+  createEsmAndCjsTests(
+    __dirname,
+    'scenario-init-chat-model.mjs',
+    'instrument.mjs',
+    (createRunner, test) => {
+      test('creates langchain spans using initChatModel with OpenAI', async () => {
+        await createRunner()
+          .ignore('event')
+          .expect({ transaction: EXPECTED_TRANSACTION_INIT_CHAT_MODEL })
+          .start()
+          .completed();
+      });
+    },
+    {
+      additionalDependencies: {
+        langchain: '^1.0.0',
+        '@langchain/core': '^1.0.0',
+        '@langchain/openai': '^1.0.0',
+      },
+    },
+  );
+});
diff --git a/packages/core/src/tracing/langchain/types.ts b/packages/core/src/tracing/langchain/types.ts
index e08542eefd60..7379de764817 100644
--- a/packages/core/src/tracing/langchain/types.ts
+++ b/packages/core/src/tracing/langchain/types.ts
@@ -46,7 +46,11 @@ export interface LangChainMessage {
   additional_kwargs?: Record<string, unknown>;
   // LangChain serialized format
   lc?: number;
-  id?: string[];
+  id?: string[] | string;
+  response_metadata?: {
+    model_name?: string;
+    finish_reason?: string;
+  };
   kwargs?: {
     [key: string]: unknown;
     content?: string;
@@ -70,6 +74,12 @@ export interface LangChainLLMResult {
         finish_reason?: string;
         logprobs?: unknown;
       };
+      // v1+ uses generationInfo instead of generation_info
+      generationInfo?: {
+        [key: string]: unknown;
+        finish_reason?: string;
+        logprobs?: unknown;
+      };
     }>
   >;
   llmOutput?: {
diff --git a/packages/core/src/tracing/langchain/utils.ts b/packages/core/src/tracing/langchain/utils.ts
index caacf5059bdc..9a8fa9aed26d 100644
--- a/packages/core/src/tracing/langchain/utils.ts
+++ b/packages/core/src/tracing/langchain/utils.ts
@@ -385,7 +385,17 @@ export function extractLlmResponseAttributes(
   if (Array.isArray(llmResult.generations)) {
     const finishReasons = llmResult.generations
       .flat()
-      .map(g => g.generation_info?.finish_reason)
+      .map(g => {
+        // v1 uses generationInfo.finish_reason
+        if (g.generationInfo?.finish_reason) {
+          return g.generationInfo.finish_reason;
+        }
+        // v0.3+ uses generation_info.finish_reason
+        if (g.generation_info?.finish_reason) {
+          return g.generation_info.finish_reason;
+        }
+        return null;
+      })
       .filter((r): r is string => typeof r === 'string');
 
     if (finishReasons.length > 0) {
@@ -409,17 +419,27 @@ export function extractLlmResponseAttributes(
 
   addTokenUsageAttributes(llmResult.llmOutput, attrs);
 
-  const llmOutput = llmResult.llmOutput as { model_name?: string; model?: string; id?: string; stop_reason?: string };
+  const llmOutput = llmResult.llmOutput;
+
+  // Extract from v1 generations structure if available
+  const firstGeneration = llmResult.generations?.[0]?.[0];
+  const v1Message = firstGeneration?.message;
+
   // Provider model identifier: `model_name` (OpenAI-style) or `model` (others)
-  const modelName = llmOutput?.model_name ?? llmOutput?.model;
+  // v1 stores this in message.response_metadata.model_name
+  const modelName = llmOutput?.model_name ?? llmOutput?.model ?? v1Message?.response_metadata?.model_name;
   if (modelName) setIfDefined(attrs, GEN_AI_RESPONSE_MODEL_ATTRIBUTE, modelName);
 
-  if (llmOutput?.id) {
-    setIfDefined(attrs, GEN_AI_RESPONSE_ID_ATTRIBUTE, llmOutput.id);
+  // Response ID: v1 stores this in message.id
+  const responseId = llmOutput?.id ?? v1Message?.id;
+  if (responseId) {
+    setIfDefined(attrs, GEN_AI_RESPONSE_ID_ATTRIBUTE, responseId);
   }
 
-  if (llmOutput?.stop_reason) {
-    setIfDefined(attrs, GEN_AI_RESPONSE_STOP_REASON_ATTRIBUTE, asString(llmOutput.stop_reason));
+  // Stop reason: v1 stores this in message.response_metadata.finish_reason
+  const stopReason = llmOutput?.stop_reason ?? v1Message?.response_metadata?.finish_reason;
+  if (stopReason) {
+    setIfDefined(attrs, GEN_AI_RESPONSE_STOP_REASON_ATTRIBUTE, asString(stopReason));
   }
 
   return attrs;
diff --git a/packages/node/src/integrations/tracing/langchain/instrumentation.ts b/packages/node/src/integrations/tracing/langchain/instrumentation.ts
index 09c6002a4629..8d5c42111f3d 100644
--- a/packages/node/src/integrations/tracing/langchain/instrumentation.ts
+++ b/packages/node/src/integrations/tracing/langchain/instrumentation.ts
@@ -16,7 +16,7 @@ import {
   SDK_VERSION,
 } from '@sentry/core';
 
-const supportedVersions = ['>=0.1.0 <1.0.0'];
+const supportedVersions = ['>=0.1.0 <2.0.0'];
 
 type LangChainInstrumentationOptions = InstrumentationConfig & LangChainOptions;
 
@@ -143,6 +143,25 @@ export class SentryLangChainInstrumentation extends InstrumentationBase<LangChai
       );
     }
 
+    // Hook into main 'langchain' package to catch initChatModel (v1+)
+    modules.push(
+      new InstrumentationNodeModuleDefinition(
+        'langchain',
+        supportedVersions,
+        this._patch.bind(this),
+        exports => exports,
+        [
+          // To catch the CJS build that contains ConfigurableModel / initChatModel for v1
+          new InstrumentationNodeModuleFile(
+            'langchain/dist/chat_models/universal.cjs',
+            supportedVersions,
+            this._patch.bind(this),
+            exports => exports,
+          ),
+        ],
+      ),
+    );
+
     return modules;
   }
 
@@ -193,14 +212,13 @@ export class SentryLangChainInstrumentation extends InstrumentationBase<LangChai
       'ChatMistralAI',
       'ChatVertexAI',
       'ChatGroq',
+      'ConfigurableModel',
     ];
 
-    // Find a chat model class in the exports by checking known class names
-    const chatModelClass = Object.values(exports).find(exp => {
-      if (typeof exp !== 'function') {
-        return false;
-      }
-      return knownChatModelNames.includes(exp.name);
+    const exportsToPatch = (exports.universal_exports ?? exports) as Record<string, unknown>;
+
+    const chatModelClass = Object.values(exportsToPatch).find(exp => {
+      return typeof exp === 'function' && knownChatModelNames.includes(exp.name);
     }) as { prototype: unknown; name: string } | undefined;
 
     if (!chatModelClass) {

From 98854d436588922e9d4fbf3ef8110f306d3cc1f2 Mon Sep 17 00:00:00 2001
From: Nicolas Hrubec <nico.hrubec@sentry.io>
Date: Thu, 27 Nov 2025 09:16:04 +0100
Subject: [PATCH 135/186] fix(core): continueTrace doesn't propagate given
 trace ID if active span exists (#18328)

During investigation of [this
issue](https://github.com/getsentry/sentry-javascript/issues/18296), we
discovered that `continueTrace` does not propagate the given trace ID if
it is called from within an already active span (in this instance this
happened because of the already active span started by the cloudflare
auto-instrumentation.

Solution: This PR resolves this behavior by setting the currently active
span to undefined when forking the propagation context in
`continueTrace`.

Tests:
- After introducing the fix one of the `@sentry/sveltekit` unit tests
started to fail. Not sure why this was triggered by this change, but I
fixed it by setting the `isSubRequest` property on the event instead of
the route, which seems correct to me.
- Added a unit test in `@sentry/core` that calls `continueTrace` inside
an active span and checks that the trace id is now propagated as we
would expect.
---
 packages/core/src/tracing/trace.ts            |  1 +
 packages/core/test/lib/tracing/trace.test.ts  | 69 +++++++++++++++++++
 .../test/server-common/handle.test.ts         |  2 +-
 3 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/packages/core/src/tracing/trace.ts b/packages/core/src/tracing/trace.ts
index 98c3a33a8a79..b147bb92fa63 100644
--- a/packages/core/src/tracing/trace.ts
+++ b/packages/core/src/tracing/trace.ts
@@ -226,6 +226,7 @@ export const continueTrace = <V>(
   return withScope(scope => {
     const propagationContext = propagationContextFromHeaders(sentryTrace, baggage);
     scope.setPropagationContext(propagationContext);
+    _setSpanForScope(scope, undefined);
     return callback();
   });
 };
diff --git a/packages/core/test/lib/tracing/trace.test.ts b/packages/core/test/lib/tracing/trace.test.ts
index a1d786dfdd10..271cd669d56c 100644
--- a/packages/core/test/lib/tracing/trace.test.ts
+++ b/packages/core/test/lib/tracing/trace.test.ts
@@ -4,6 +4,7 @@ import {
   getGlobalScope,
   getIsolationScope,
   getMainCarrier,
+  getTraceData,
   Scope,
   SEMANTIC_ATTRIBUTE_SENTRY_OP,
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
@@ -2021,6 +2022,74 @@ describe('continueTrace', () => {
       });
     });
   });
+
+  it('updates the propagation context when called inside an active span', () => {
+    const client = new TestClient(
+      getDefaultTestClientOptions({
+        dsn: 'https://username@domain/123',
+        tracesSampleRate: 1,
+      }),
+    );
+    setCurrentClient(client);
+    client.init();
+
+    const sentryTrace = '12312012123120121231201212312012-1121201211212012-1';
+    const sentryTraceId = '12312012123120121231201212312012';
+    const sentryBaggage = 'sentry-org_id=123';
+
+    startSpan({ name: 'outer' }, () => {
+      continueTrace(
+        {
+          sentryTrace: sentryTrace,
+          baggage: sentryBaggage,
+        },
+        () => {
+          const traceDataInContinuedTrace = getTraceData();
+          const traceIdInContinuedTrace = traceDataInContinuedTrace['sentry-trace']?.split('-')[0];
+          const traceIdInCurrentScope = getCurrentScope().getPropagationContext().traceId;
+
+          expect(getActiveSpan()).toBeUndefined();
+          expect(traceIdInContinuedTrace).toBe(sentryTraceId);
+          expect(traceIdInCurrentScope).toBe(sentryTraceId);
+        },
+      );
+    });
+  });
+
+  it('sets the correct trace and parent span ids when called inside an active span and a new span is started from within the callback', () => {
+    const client = new TestClient(
+      getDefaultTestClientOptions({
+        dsn: 'https://username@domain/123',
+        tracesSampleRate: 1,
+      }),
+    );
+    setCurrentClient(client);
+    client.init();
+
+    const sentryTrace = '12312012123120121231201212312012-1121201211212012-1';
+    const sentryTraceId = '12312012123120121231201212312012';
+    const sentrySpanId = '1121201211212012';
+    const sentryBaggage = 'sentry-org_id=123';
+
+    startSpan({ name: 'outer' }, () => {
+      continueTrace(
+        {
+          sentryTrace: sentryTrace,
+          baggage: sentryBaggage,
+        },
+        () => {
+          startSpan({ name: 'inner' }, span => {
+            const innerSpanJson = spanToJSON(span);
+            const innerTraceId = innerSpanJson.trace_id;
+            const innerParentSpanId = innerSpanJson.parent_span_id;
+
+            expect(innerTraceId).toBe(sentryTraceId);
+            expect(innerParentSpanId).toBe(sentrySpanId);
+          });
+        },
+      );
+    });
+  });
 });
 
 describe('getActiveSpan', () => {
diff --git a/packages/sveltekit/test/server-common/handle.test.ts b/packages/sveltekit/test/server-common/handle.test.ts
index fdb4a1103d90..7ecd222ad780 100644
--- a/packages/sveltekit/test/server-common/handle.test.ts
+++ b/packages/sveltekit/test/server-common/handle.test.ts
@@ -186,7 +186,7 @@ describe('sentryHandle', () => {
           resolve: async _ => {
             // simulating a nested load call:
             await sentryHandle()({
-              event: mockEvent({ route: { id: 'api/users/details/[id]', isSubRequest: true } }),
+              event: mockEvent({ route: { id: 'api/users/details/[id]' }, isSubRequest: true }),
               resolve: resolve(type, isError),
             });
             return mockResponse;

From 9afaabfede54fe58eb9a08e055978e95fc2fdfd5 Mon Sep 17 00:00:00 2001
From: Nicolas Hrubec <nico.hrubec@sentry.io>
Date: Thu, 27 Nov 2025 10:45:53 +0100
Subject: [PATCH 136/186] chore(tanstackstart-react)!: Remove empty placeholder
 implementations (#18338)

Just cleaning up, we won't be needing any of these. I am aware this is
breaking, but I think it's fine since we are still in alpha and these
are empty anyways.
---
 .../tanstackstart-react/src/common/index.ts   | 24 +------------------
 .../tanstackstart-react/src/config/index.ts   | 17 +------------
 .../tanstackstart-react/src/index.server.ts   |  2 ++
 .../tanstackstart-react/src/server/index.ts   | 14 -----------
 4 files changed, 4 insertions(+), 53 deletions(-)

diff --git a/packages/tanstackstart-react/src/common/index.ts b/packages/tanstackstart-react/src/common/index.ts
index d83c684d1523..cb0ff5c3b541 100644
--- a/packages/tanstackstart-react/src/common/index.ts
+++ b/packages/tanstackstart-react/src/common/index.ts
@@ -1,23 +1 @@
-/**
- * A middleware handler that can be passed to TanStack Start's `createMiddleware().server(...)` method as [global middleware](https://tanstack.com/start/latest/docs/framework/react/middleware#global-middleware) for instrumenting server functions.
- */
-export function sentryGlobalServerMiddlewareHandler() {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  return function <T>(server: { next: (...args: any[]) => T }): T {
-    return server.next();
-  };
-}
-
-/**
- * Wraps a TanStack Start stream handler with Sentry instrumentation that can be passed to `createStartHandler(...)`.
- */
-export function wrapStreamHandlerWithSentry<H>(handler: H): H {
-  return handler;
-}
-
-/**
- * Wraps the create root route function with Sentry for server-client tracing with SSR.
- */
-export function wrapCreateRootRouteWithSentry<F>(createRootRoute: F): F {
-  return createRootRoute;
-}
+export {};
diff --git a/packages/tanstackstart-react/src/config/index.ts b/packages/tanstackstart-react/src/config/index.ts
index e41b60609c43..cb0ff5c3b541 100644
--- a/packages/tanstackstart-react/src/config/index.ts
+++ b/packages/tanstackstart-react/src/config/index.ts
@@ -1,16 +1 @@
-/**
- * Wraps a TanStack Start config.
- */
-export function wrapVinxiConfigWithSentry<C>(
-  config: C,
-  // TODO: Expand this type in the future. Right now it is just so that TS doesn't complain for our users when they copy paste from the docs.
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  sentryBuildOptions: {
-    org?: string;
-    project?: string;
-    silent?: boolean;
-    authToken?: string;
-  } = {},
-): C {
-  return config;
-}
+export {};
diff --git a/packages/tanstackstart-react/src/index.server.ts b/packages/tanstackstart-react/src/index.server.ts
index 3295df71604b..6b8974481131 100644
--- a/packages/tanstackstart-react/src/index.server.ts
+++ b/packages/tanstackstart-react/src/index.server.ts
@@ -1,3 +1,5 @@
+/* eslint-disable import/export */
+
 export * from './config';
 export * from './server';
 export * from './common';
diff --git a/packages/tanstackstart-react/src/server/index.ts b/packages/tanstackstart-react/src/server/index.ts
index 91f80547f143..c79572a7f318 100644
--- a/packages/tanstackstart-react/src/server/index.ts
+++ b/packages/tanstackstart-react/src/server/index.ts
@@ -16,13 +16,6 @@ export const ErrorBoundary = (props: React.PropsWithChildren<unknown>): React.Re
   return props.children;
 };
 
-/**
- * A passthrough redux enhancer for the server that doesn't depend on anything from the `@sentry/react` package.
- */
-export function createReduxEnhancer() {
-  return (createStore: unknown) => createStore;
-}
-
 /**
  * A passthrough error boundary wrapper for the server that doesn't depend on any react. Error boundaries don't catch
  * SSR errors so they should simply be a passthrough.
@@ -33,10 +26,3 @@ export function withErrorBoundary<P extends Record<string, any>>(
 ): React.FC<P> {
   return WrappedComponent as React.FC<P>;
 }
-
-/**
- * Just a passthrough since we're on the server and showing the report dialog on the server doesn't make any sense.
- */
-export function showReportDialog(): void {
-  return;
-}

From b822f8fc2a1f9e8e32b29ddcce15bac79f03b36d Mon Sep 17 00:00:00 2001
From: Nicolas Hrubec <nico.hrubec@sentry.io>
Date: Thu, 27 Nov 2025 15:19:15 +0100
Subject: [PATCH 137/186] feat(browser): Expose langgraph instrumentation
 (#18345)

We are exposing AI instrument methods for Langgraph enabling users to
use it directly from the browser SDK.
---
 .../tracing/ai-providers/langgraph/init.js    |  9 ++++
 .../tracing/ai-providers/langgraph/mocks.js   | 29 ++++++++++++
 .../tracing/ai-providers/langgraph/subject.js | 16 +++++++
 .../tracing/ai-providers/langgraph/test.ts    | 45 +++++++++++++++++++
 .../utils/generatePlugin.ts                   |  1 +
 packages/browser/rollup.bundle.config.mjs     |  1 +
 packages/browser/src/index.ts                 |  1 +
 .../index.instrumentlanggraph.ts              |  1 +
 .../browser/src/utils/lazyLoadIntegration.ts  |  1 +
 9 files changed, 104 insertions(+)
 create mode 100644 dev-packages/browser-integration-tests/suites/tracing/ai-providers/langgraph/init.js
 create mode 100644 dev-packages/browser-integration-tests/suites/tracing/ai-providers/langgraph/mocks.js
 create mode 100644 dev-packages/browser-integration-tests/suites/tracing/ai-providers/langgraph/subject.js
 create mode 100644 dev-packages/browser-integration-tests/suites/tracing/ai-providers/langgraph/test.ts
 create mode 100644 packages/browser/src/integrations-bundle/index.instrumentlanggraph.ts

diff --git a/dev-packages/browser-integration-tests/suites/tracing/ai-providers/langgraph/init.js b/dev-packages/browser-integration-tests/suites/tracing/ai-providers/langgraph/init.js
new file mode 100644
index 000000000000..d90a3acf6157
--- /dev/null
+++ b/dev-packages/browser-integration-tests/suites/tracing/ai-providers/langgraph/init.js
@@ -0,0 +1,9 @@
+import * as Sentry from '@sentry/browser';
+
+window.Sentry = Sentry;
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  tracesSampleRate: 1,
+  debug: true,
+});
diff --git a/dev-packages/browser-integration-tests/suites/tracing/ai-providers/langgraph/mocks.js b/dev-packages/browser-integration-tests/suites/tracing/ai-providers/langgraph/mocks.js
new file mode 100644
index 000000000000..54792b827a43
--- /dev/null
+++ b/dev-packages/browser-integration-tests/suites/tracing/ai-providers/langgraph/mocks.js
@@ -0,0 +1,29 @@
+// Mock LangGraph graph for browser testing
+export class MockStateGraph {
+  compile(options = {}) {
+    const compiledGraph = {
+      name: options.name,
+      graph_name: options.name,
+      lc_kwargs: {
+        name: options.name,
+      },
+      builder: {
+        nodes: {},
+      },
+      invoke: async input => {
+        const messages = input?.messages;
+        return {
+          messages: [
+            ...messages,
+            {
+              role: 'assistant',
+              content: 'Mock response from LangGraph',
+            },
+          ],
+        };
+      },
+    };
+
+    return compiledGraph;
+  }
+}
diff --git a/dev-packages/browser-integration-tests/suites/tracing/ai-providers/langgraph/subject.js b/dev-packages/browser-integration-tests/suites/tracing/ai-providers/langgraph/subject.js
new file mode 100644
index 000000000000..70741f5d111f
--- /dev/null
+++ b/dev-packages/browser-integration-tests/suites/tracing/ai-providers/langgraph/subject.js
@@ -0,0 +1,16 @@
+import { MockStateGraph } from './mocks.js';
+import { instrumentLangGraph } from '@sentry/browser';
+
+// Test that manual instrumentation doesn't crash the browser
+// The instrumentation automatically creates spans
+// Test both agent creation and invocation
+
+const graph = new MockStateGraph();
+instrumentLangGraph(graph, { recordInputs: false, recordOutputs: false });
+const compiledGraph = graph.compile({ name: 'mock-graph' });
+
+const response = await compiledGraph.invoke({
+  messages: [{ role: 'user', content: 'What is the capital of France?' }],
+});
+
+console.log('Received response', response);
diff --git a/dev-packages/browser-integration-tests/suites/tracing/ai-providers/langgraph/test.ts b/dev-packages/browser-integration-tests/suites/tracing/ai-providers/langgraph/test.ts
new file mode 100644
index 000000000000..1feabd48c8d2
--- /dev/null
+++ b/dev-packages/browser-integration-tests/suites/tracing/ai-providers/langgraph/test.ts
@@ -0,0 +1,45 @@
+import { expect } from '@playwright/test';
+import { sentryTest } from '../../../../utils/fixtures';
+import { envelopeRequestParser, waitForTransactionRequest } from '../../../../utils/helpers';
+
+// These tests are not exhaustive because the instrumentation is
+// already tested in the node integration tests and we merely
+// want to test that the instrumentation does not crash in the browser
+// and that gen_ai transactions are sent.
+
+sentryTest('manual LangGraph instrumentation sends gen_ai transactions', async ({ getLocalTestUrl, page }) => {
+  const createTransactionPromise = waitForTransactionRequest(page, event => {
+    return !!event.transaction?.includes('create_agent mock-graph');
+  });
+
+  const invokeTransactionPromise = waitForTransactionRequest(page, event => {
+    return !!event.transaction?.includes('invoke_agent mock-graph');
+  });
+
+  const url = await getLocalTestUrl({ testDir: __dirname });
+  await page.goto(url);
+
+  const createReq = await createTransactionPromise;
+  const invokeReq = await invokeTransactionPromise;
+
+  const createEventData = envelopeRequestParser(createReq);
+  const invokeEventData = envelopeRequestParser(invokeReq);
+
+  // Verify create_agent transaction
+  expect(createEventData.transaction).toBe('create_agent mock-graph');
+  expect(createEventData.contexts?.trace?.op).toBe('gen_ai.create_agent');
+  expect(createEventData.contexts?.trace?.origin).toBe('auto.ai.langgraph');
+  expect(createEventData.contexts?.trace?.data).toMatchObject({
+    'gen_ai.operation.name': 'create_agent',
+    'gen_ai.agent.name': 'mock-graph',
+  });
+
+  // Verify invoke_agent transaction
+  expect(invokeEventData.transaction).toBe('invoke_agent mock-graph');
+  expect(invokeEventData.contexts?.trace?.op).toBe('gen_ai.invoke_agent');
+  expect(invokeEventData.contexts?.trace?.origin).toBe('auto.ai.langgraph');
+  expect(invokeEventData.contexts?.trace?.data).toMatchObject({
+    'gen_ai.operation.name': 'invoke_agent',
+    'gen_ai.agent.name': 'mock-graph',
+  });
+});
diff --git a/dev-packages/browser-integration-tests/utils/generatePlugin.ts b/dev-packages/browser-integration-tests/utils/generatePlugin.ts
index 6e3ef99aa7ea..548dfb2a6150 100644
--- a/dev-packages/browser-integration-tests/utils/generatePlugin.ts
+++ b/dev-packages/browser-integration-tests/utils/generatePlugin.ts
@@ -40,6 +40,7 @@ const IMPORTED_INTEGRATION_CDN_BUNDLE_PATHS: Record<string, string> = {
   instrumentAnthropicAiClient: 'instrumentanthropicaiclient',
   instrumentOpenAiClient: 'instrumentopenaiclient',
   instrumentGoogleGenAIClient: 'instrumentgooglegenaiclient',
+  instrumentLangGraph: 'instrumentlanggraph',
   // technically, this is not an integration, but let's add it anyway for simplicity
   makeMultiplexedTransport: 'multiplexedtransport',
 };
diff --git a/packages/browser/rollup.bundle.config.mjs b/packages/browser/rollup.bundle.config.mjs
index 4893e66f49ef..13bdee685821 100644
--- a/packages/browser/rollup.bundle.config.mjs
+++ b/packages/browser/rollup.bundle.config.mjs
@@ -16,6 +16,7 @@ const reexportedPluggableIntegrationFiles = [
   'instrumentanthropicaiclient',
   'instrumentopenaiclient',
   'instrumentgooglegenaiclient',
+  'instrumentlanggraph',
 ];
 
 browserPluggableIntegrationFiles.forEach(integrationName => {
diff --git a/packages/browser/src/index.ts b/packages/browser/src/index.ts
index 03416fa41af7..a58714f312d7 100644
--- a/packages/browser/src/index.ts
+++ b/packages/browser/src/index.ts
@@ -66,6 +66,7 @@ export {
   instrumentAnthropicAiClient,
   instrumentOpenAiClient,
   instrumentGoogleGenAIClient,
+  instrumentLangGraph,
   logger,
 } from '@sentry/core';
 export type { Span, FeatureFlagsIntegration } from '@sentry/core';
diff --git a/packages/browser/src/integrations-bundle/index.instrumentlanggraph.ts b/packages/browser/src/integrations-bundle/index.instrumentlanggraph.ts
new file mode 100644
index 000000000000..c7a8c0e9e591
--- /dev/null
+++ b/packages/browser/src/integrations-bundle/index.instrumentlanggraph.ts
@@ -0,0 +1 @@
+export { instrumentLangGraph } from '@sentry/core';
diff --git a/packages/browser/src/utils/lazyLoadIntegration.ts b/packages/browser/src/utils/lazyLoadIntegration.ts
index 6d5e48542f56..8eeb6b95b66b 100644
--- a/packages/browser/src/utils/lazyLoadIntegration.ts
+++ b/packages/browser/src/utils/lazyLoadIntegration.ts
@@ -24,6 +24,7 @@ const LazyLoadableIntegrations = {
   instrumentAnthropicAiClient: 'instrumentanthropicaiclient',
   instrumentOpenAiClient: 'instrumentopenaiclient',
   instrumentGoogleGenAIClient: 'instrumentgooglegenaiclient',
+  instrumentLangGraph: 'instrumentlanggraph',
 } as const;
 
 const WindowWithMaybeIntegration = WINDOW as {

From de270e2fa4f0b10b78a2d9fa0a78fce09e708767 Mon Sep 17 00:00:00 2001
From: Nicolas Hrubec <nico.hrubec@sentry.io>
Date: Thu, 27 Nov 2025 17:01:17 +0100
Subject: [PATCH 138/186] feat(browser): Expose langchain instrumentation
 (#18342)

We are exposing AI instrument methods for Langchain enabling users to
use it directly from the browser SDK.
---
 .../tracing/ai-providers/langchain/init.js    |  9 +++
 .../tracing/ai-providers/langchain/mocks.js   | 76 +++++++++++++++++++
 .../tracing/ai-providers/langchain/subject.js | 22 ++++++
 .../tracing/ai-providers/langchain/test.ts    | 37 +++++++++
 .../utils/generatePlugin.ts                   |  1 +
 packages/browser/rollup.bundle.config.mjs     |  1 +
 packages/browser/src/index.ts                 |  1 +
 .../index.createlangchaincallbackhandler.ts   |  1 +
 .../browser/src/utils/lazyLoadIntegration.ts  |  1 +
 9 files changed, 149 insertions(+)
 create mode 100644 dev-packages/browser-integration-tests/suites/tracing/ai-providers/langchain/init.js
 create mode 100644 dev-packages/browser-integration-tests/suites/tracing/ai-providers/langchain/mocks.js
 create mode 100644 dev-packages/browser-integration-tests/suites/tracing/ai-providers/langchain/subject.js
 create mode 100644 dev-packages/browser-integration-tests/suites/tracing/ai-providers/langchain/test.ts
 create mode 100644 packages/browser/src/integrations-bundle/index.createlangchaincallbackhandler.ts

diff --git a/dev-packages/browser-integration-tests/suites/tracing/ai-providers/langchain/init.js b/dev-packages/browser-integration-tests/suites/tracing/ai-providers/langchain/init.js
new file mode 100644
index 000000000000..d90a3acf6157
--- /dev/null
+++ b/dev-packages/browser-integration-tests/suites/tracing/ai-providers/langchain/init.js
@@ -0,0 +1,9 @@
+import * as Sentry from '@sentry/browser';
+
+window.Sentry = Sentry;
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  tracesSampleRate: 1,
+  debug: true,
+});
diff --git a/dev-packages/browser-integration-tests/suites/tracing/ai-providers/langchain/mocks.js b/dev-packages/browser-integration-tests/suites/tracing/ai-providers/langchain/mocks.js
new file mode 100644
index 000000000000..e7d4dbf00961
--- /dev/null
+++ b/dev-packages/browser-integration-tests/suites/tracing/ai-providers/langchain/mocks.js
@@ -0,0 +1,76 @@
+// Mock LangChain Chat Model for browser testing
+export class MockChatAnthropic {
+  constructor(params) {
+    this._model = params.model;
+    this._temperature = params.temperature;
+    this._maxTokens = params.maxTokens;
+  }
+
+  async invoke(messages, config = { callbacks: [] }) {
+    const callbacks = config.callbacks;
+    const runId = 'mock-run-id-123';
+
+    const invocationParams = {
+      model: this._model,
+      temperature: this._temperature,
+      max_tokens: this._maxTokens,
+    };
+
+    const serialized = {
+      lc: 1,
+      type: 'constructor',
+      id: ['langchain', 'anthropic', 'anthropic'],
+      kwargs: invocationParams,
+    };
+
+    // Call handleChatModelStart
+    for (const callback of callbacks) {
+      if (callback.handleChatModelStart) {
+        await callback.handleChatModelStart(
+          serialized,
+          messages,
+          runId,
+          undefined,
+          undefined,
+          { invocation_params: invocationParams },
+          { ls_model_name: this._model, ls_provider: 'anthropic' },
+        );
+      }
+    }
+
+    // Simulate processing time
+    await new Promise(resolve => setTimeout(resolve, 10));
+
+    // Create mock result
+    const result = {
+      generations: [
+        [
+          {
+            text: 'Mock response from Anthropic!',
+            generationInfo: {
+              finish_reason: 'stop',
+            },
+          },
+        ],
+      ],
+      llmOutput: {
+        tokenUsage: {
+          promptTokens: 10,
+          completionTokens: 15,
+          totalTokens: 25,
+        },
+        model_name: this._model,
+        id: 'msg_mock123',
+      },
+    };
+
+    // Call handleLLMEnd
+    for (const callback of callbacks) {
+      if (callback.handleLLMEnd) {
+        await callback.handleLLMEnd(result, runId);
+      }
+    }
+
+    return result;
+  }
+}
diff --git a/dev-packages/browser-integration-tests/suites/tracing/ai-providers/langchain/subject.js b/dev-packages/browser-integration-tests/suites/tracing/ai-providers/langchain/subject.js
new file mode 100644
index 000000000000..3df04acd505b
--- /dev/null
+++ b/dev-packages/browser-integration-tests/suites/tracing/ai-providers/langchain/subject.js
@@ -0,0 +1,22 @@
+import { createLangChainCallbackHandler } from '@sentry/browser';
+import { MockChatAnthropic } from './mocks.js';
+
+const callbackHandler = createLangChainCallbackHandler({
+  recordInputs: false,
+  recordOutputs: false,
+});
+
+const chatModel = new MockChatAnthropic({
+  model: 'claude-3-haiku-20240307',
+  temperature: 0.7,
+  maxTokens: 100,
+});
+
+// Test that manual instrumentation doesn't crash the browser
+// The instrumentation automatically creates spans
+// We can provide callbacks in the config object:https://docs.langchain.com/oss/python/langchain/models#invocation-config
+const response = await chatModel.invoke('What is the capital of France?', {
+  callbacks: [callbackHandler],
+});
+
+console.log('Received response', response);
diff --git a/dev-packages/browser-integration-tests/suites/tracing/ai-providers/langchain/test.ts b/dev-packages/browser-integration-tests/suites/tracing/ai-providers/langchain/test.ts
new file mode 100644
index 000000000000..9cc1cc9ff98b
--- /dev/null
+++ b/dev-packages/browser-integration-tests/suites/tracing/ai-providers/langchain/test.ts
@@ -0,0 +1,37 @@
+import { expect } from '@playwright/test';
+import { sentryTest } from '../../../../utils/fixtures';
+import { envelopeRequestParser, waitForTransactionRequest } from '../../../../utils/helpers';
+
+// These tests are not exhaustive because the instrumentation is
+// already tested in the node integration tests and we merely
+// want to test that the instrumentation does not crash in the browser
+// and that gen_ai transactions are sent.
+
+sentryTest('manual LangChain instrumentation sends gen_ai transactions', async ({ getLocalTestUrl, page }) => {
+  const transactionPromise = waitForTransactionRequest(page, event => {
+    return !!event.transaction?.includes('claude-3-haiku-20240307');
+  });
+
+  const url = await getLocalTestUrl({ testDir: __dirname });
+  await page.goto(url);
+
+  const req = await transactionPromise;
+
+  const eventData = envelopeRequestParser(req);
+
+  // Verify it's a gen_ai transaction
+  expect(eventData.transaction).toBe('chat claude-3-haiku-20240307');
+  expect(eventData.contexts?.trace?.op).toBe('gen_ai.chat');
+  expect(eventData.contexts?.trace?.origin).toBe('auto.ai.langchain');
+  expect(eventData.contexts?.trace?.data).toMatchObject({
+    'gen_ai.operation.name': 'chat',
+    '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.usage.total_tokens': 25,
+  });
+});
diff --git a/dev-packages/browser-integration-tests/utils/generatePlugin.ts b/dev-packages/browser-integration-tests/utils/generatePlugin.ts
index 548dfb2a6150..b1b1df410ca3 100644
--- a/dev-packages/browser-integration-tests/utils/generatePlugin.ts
+++ b/dev-packages/browser-integration-tests/utils/generatePlugin.ts
@@ -41,6 +41,7 @@ const IMPORTED_INTEGRATION_CDN_BUNDLE_PATHS: Record<string, string> = {
   instrumentOpenAiClient: 'instrumentopenaiclient',
   instrumentGoogleGenAIClient: 'instrumentgooglegenaiclient',
   instrumentLangGraph: 'instrumentlanggraph',
+  createLangChainCallbackHandler: 'createlangchaincallbackhandler',
   // technically, this is not an integration, but let's add it anyway for simplicity
   makeMultiplexedTransport: 'multiplexedtransport',
 };
diff --git a/packages/browser/rollup.bundle.config.mjs b/packages/browser/rollup.bundle.config.mjs
index 13bdee685821..57f1bd80b748 100644
--- a/packages/browser/rollup.bundle.config.mjs
+++ b/packages/browser/rollup.bundle.config.mjs
@@ -17,6 +17,7 @@ const reexportedPluggableIntegrationFiles = [
   'instrumentopenaiclient',
   'instrumentgooglegenaiclient',
   'instrumentlanggraph',
+  'createlangchaincallbackhandler',
 ];
 
 browserPluggableIntegrationFiles.forEach(integrationName => {
diff --git a/packages/browser/src/index.ts b/packages/browser/src/index.ts
index a58714f312d7..149068892f54 100644
--- a/packages/browser/src/index.ts
+++ b/packages/browser/src/index.ts
@@ -67,6 +67,7 @@ export {
   instrumentOpenAiClient,
   instrumentGoogleGenAIClient,
   instrumentLangGraph,
+  createLangChainCallbackHandler,
   logger,
 } from '@sentry/core';
 export type { Span, FeatureFlagsIntegration } from '@sentry/core';
diff --git a/packages/browser/src/integrations-bundle/index.createlangchaincallbackhandler.ts b/packages/browser/src/integrations-bundle/index.createlangchaincallbackhandler.ts
new file mode 100644
index 000000000000..8a64eda45579
--- /dev/null
+++ b/packages/browser/src/integrations-bundle/index.createlangchaincallbackhandler.ts
@@ -0,0 +1 @@
+export { createLangChainCallbackHandler } from '@sentry/core';
diff --git a/packages/browser/src/utils/lazyLoadIntegration.ts b/packages/browser/src/utils/lazyLoadIntegration.ts
index 8eeb6b95b66b..8a6688fe5953 100644
--- a/packages/browser/src/utils/lazyLoadIntegration.ts
+++ b/packages/browser/src/utils/lazyLoadIntegration.ts
@@ -25,6 +25,7 @@ const LazyLoadableIntegrations = {
   instrumentOpenAiClient: 'instrumentopenaiclient',
   instrumentGoogleGenAIClient: 'instrumentgooglegenaiclient',
   instrumentLangGraph: 'instrumentlanggraph',
+  createLangChainCallbackHandler: 'createlangchaincallbackhandler',
 } as const;
 
 const WindowWithMaybeIntegration = WINDOW as {

From 63c4151651f2b1235a7d8b7a3aca5912490d114f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Nov 2025 11:29:51 +0000
Subject: [PATCH 139/186] ci(deps): bump actions/checkout from 5 to 6 (#18268)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to
6.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/actions/checkout/releases">actions/checkout's
releases</a>.</em></p>
<blockquote>
<h2>v6.0.0</h2>
<h2>What's Changed</h2>
<ul>
<li>Update README to include Node.js 24 support details and requirements
by <a href="https://github.com/salmanmkc"><code>@​salmanmkc</code></a>
in <a
href="https://github.com/actions/checkout/pull/2248">actions/checkout#2248</a></li>
<li>Persist creds to a separate file by <a
href="https://github.com/ericsciple"><code>@​ericsciple</code></a> in <a
href="https://github.com/actions/checkout/pull/2286">actions/checkout#2286</a></li>
<li>v6-beta by <a
href="https://github.com/ericsciple"><code>@​ericsciple</code></a> in <a
href="https://github.com/actions/checkout/pull/2298">actions/checkout#2298</a></li>
<li>update readme/changelog for v6 by <a
href="https://github.com/ericsciple"><code>@​ericsciple</code></a> in <a
href="https://github.com/actions/checkout/pull/2311">actions/checkout#2311</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/actions/checkout/compare/v5.0.0...v6.0.0">https://github.com/actions/checkout/compare/v5.0.0...v6.0.0</a></p>
<h2>v6-beta</h2>
<h2>What's Changed</h2>
<p>Updated persist-credentials to store the credentials under
<code>$RUNNER_TEMP</code> instead of directly in the local git
config.</p>
<p>This requires a minimum Actions Runner version of <a
href="https://github.com/actions/runner/releases/tag/v2.329.0">v2.329.0</a>
to access the persisted credentials for <a
href="https://docs.github.com/en/actions/tutorials/use-containerized-services/create-a-docker-container-action">Docker
container action</a> scenarios.</p>
<h2>v5.0.1</h2>
<h2>What's Changed</h2>
<ul>
<li>Port v6 cleanup to v5 by <a
href="https://github.com/ericsciple"><code>@​ericsciple</code></a> in <a
href="https://github.com/actions/checkout/pull/2301">actions/checkout#2301</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/actions/checkout/compare/v5...v5.0.1">https://github.com/actions/checkout/compare/v5...v5.0.1</a></p>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/actions/checkout/blob/main/CHANGELOG.md">actions/checkout's
changelog</a>.</em></p>
<blockquote>
<h1>Changelog</h1>
<h2>V6.0.0</h2>
<ul>
<li>Persist creds to a separate file by <a
href="https://github.com/ericsciple"><code>@​ericsciple</code></a> in <a
href="https://github.com/actions/checkout/pull/2286">actions/checkout#2286</a></li>
<li>Update README to include Node.js 24 support details and requirements
by <a href="https://github.com/salmanmkc"><code>@​salmanmkc</code></a>
in <a
href="https://github.com/actions/checkout/pull/2248">actions/checkout#2248</a></li>
</ul>
<h2>V5.0.1</h2>
<ul>
<li>Port v6 cleanup to v5 by <a
href="https://github.com/ericsciple"><code>@​ericsciple</code></a> in <a
href="https://github.com/actions/checkout/pull/2301">actions/checkout#2301</a></li>
</ul>
<h2>V5.0.0</h2>
<ul>
<li>Update actions checkout to use node 24 by <a
href="https://github.com/salmanmkc"><code>@​salmanmkc</code></a> in <a
href="https://github.com/actions/checkout/pull/2226">actions/checkout#2226</a></li>
</ul>
<h2>V4.3.1</h2>
<ul>
<li>Port v6 cleanup to v4 by <a
href="https://github.com/ericsciple"><code>@​ericsciple</code></a> in <a
href="https://github.com/actions/checkout/pull/2305">actions/checkout#2305</a></li>
</ul>
<h2>V4.3.0</h2>
<ul>
<li>docs: update README.md by <a
href="https://github.com/motss"><code>@​motss</code></a> in <a
href="https://github.com/actions/checkout/pull/1971">actions/checkout#1971</a></li>
<li>Add internal repos for checking out multiple repositories by <a
href="https://github.com/mouismail"><code>@​mouismail</code></a> in <a
href="https://github.com/actions/checkout/pull/1977">actions/checkout#1977</a></li>
<li>Documentation update - add recommended permissions to Readme by <a
href="https://github.com/benwells"><code>@​benwells</code></a> in <a
href="https://github.com/actions/checkout/pull/2043">actions/checkout#2043</a></li>
<li>Adjust positioning of user email note and permissions heading by <a
href="https://github.com/joshmgross"><code>@​joshmgross</code></a> in <a
href="https://github.com/actions/checkout/pull/2044">actions/checkout#2044</a></li>
<li>Update README.md by <a
href="https://github.com/nebuk89"><code>@​nebuk89</code></a> in <a
href="https://github.com/actions/checkout/pull/2194">actions/checkout#2194</a></li>
<li>Update CODEOWNERS for actions by <a
href="https://github.com/TingluoHuang"><code>@​TingluoHuang</code></a>
in <a
href="https://github.com/actions/checkout/pull/2224">actions/checkout#2224</a></li>
<li>Update package dependencies by <a
href="https://github.com/salmanmkc"><code>@​salmanmkc</code></a> in <a
href="https://github.com/actions/checkout/pull/2236">actions/checkout#2236</a></li>
</ul>
<h2>v4.2.2</h2>
<ul>
<li><code>url-helper.ts</code> now leverages well-known environment
variables by <a href="https://github.com/jww3"><code>@​jww3</code></a>
in <a
href="https://github.com/actions/checkout/pull/1941">actions/checkout#1941</a></li>
<li>Expand unit test coverage for <code>isGhes</code> by <a
href="https://github.com/jww3"><code>@​jww3</code></a> in <a
href="https://github.com/actions/checkout/pull/1946">actions/checkout#1946</a></li>
</ul>
<h2>v4.2.1</h2>
<ul>
<li>Check out other refs/* by commit if provided, fall back to ref by <a
href="https://github.com/orhantoy"><code>@​orhantoy</code></a> in <a
href="https://github.com/actions/checkout/pull/1924">actions/checkout#1924</a></li>
</ul>
<h2>v4.2.0</h2>
<ul>
<li>Add Ref and Commit outputs by <a
href="https://github.com/lucacome"><code>@​lucacome</code></a> in <a
href="https://github.com/actions/checkout/pull/1180">actions/checkout#1180</a></li>
<li>Dependency updates by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a>- <a
href="https://github.com/actions/checkout/pull/1777">actions/checkout#1777</a>,
<a
href="https://github.com/actions/checkout/pull/1872">actions/checkout#1872</a></li>
</ul>
<h2>v4.1.7</h2>
<ul>
<li>Bump the minor-npm-dependencies group across 1 directory with 4
updates by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://github.com/actions/checkout/pull/1739">actions/checkout#1739</a></li>
<li>Bump actions/checkout from 3 to 4 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://github.com/actions/checkout/pull/1697">actions/checkout#1697</a></li>
<li>Check out other refs/* by commit by <a
href="https://github.com/orhantoy"><code>@​orhantoy</code></a> in <a
href="https://github.com/actions/checkout/pull/1774">actions/checkout#1774</a></li>
<li>Pin actions/checkout's own workflows to a known, good, stable
version. by <a href="https://github.com/jww3"><code>@​jww3</code></a> in
<a
href="https://github.com/actions/checkout/pull/1776">actions/checkout#1776</a></li>
</ul>
<h2>v4.1.6</h2>
<ul>
<li>Check platform to set archive extension appropriately by <a
href="https://github.com/cory-miller"><code>@​cory-miller</code></a> in
<a
href="https://github.com/actions/checkout/pull/1732">actions/checkout#1732</a></li>
</ul>
<h2>v4.1.5</h2>
<ul>
<li>Update NPM dependencies by <a
href="https://github.com/cory-miller"><code>@​cory-miller</code></a> in
<a
href="https://github.com/actions/checkout/pull/1703">actions/checkout#1703</a></li>
<li>Bump github/codeql-action from 2 to 3 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://github.com/actions/checkout/pull/1694">actions/checkout#1694</a></li>
<li>Bump actions/setup-node from 1 to 4 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://github.com/actions/checkout/pull/1696">actions/checkout#1696</a></li>
<li>Bump actions/upload-artifact from 2 to 4 by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a> in <a
href="https://github.com/actions/checkout/pull/1695">actions/checkout#1695</a></li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/actions/checkout/commit/1af3b93b6815bc44a9784bd300feb67ff0d1eeb3"><code>1af3b93</code></a>
update readme/changelog for v6 (<a
href="https://github.com/actions/checkout/issues/2311">#2311</a>)</li>
<li><a
href="https://github.com/actions/checkout/commit/71cf2267d89c5cb81562390fa70a37fa40b1305e"><code>71cf226</code></a>
v6-beta (<a
href="https://github.com/actions/checkout/issues/2298">#2298</a>)</li>
<li><a
href="https://github.com/actions/checkout/commit/069c6959146423d11cd0184e6accf28f9d45f06e"><code>069c695</code></a>
Persist creds to a separate file (<a
href="https://github.com/actions/checkout/issues/2286">#2286</a>)</li>
<li><a
href="https://github.com/actions/checkout/commit/ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493"><code>ff7abcd</code></a>
Update README to include Node.js 24 support details and requirements (<a
href="https://github.com/actions/checkout/issues/2248">#2248</a>)</li>
<li>See full diff in <a
href="https://github.com/actions/checkout/compare/v5...v6">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=actions/checkout&package-manager=github_actions&previous-version=5&new-version=6)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/auto-release.yml          |  2 +-
 .github/workflows/build.yml                 | 50 ++++++++++-----------
 .github/workflows/canary.yml                |  4 +-
 .github/workflows/cleanup-pr-caches.yml     |  2 +-
 .github/workflows/clear-cache.yml           |  2 +-
 .github/workflows/codeql-analysis.yml       |  2 +-
 .github/workflows/external-contributors.yml |  2 +-
 .github/workflows/flaky-test-detector.yml   |  2 +-
 .github/workflows/gitflow-sync-develop.yml  |  2 +-
 .github/workflows/release.yml               |  2 +-
 10 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/.github/workflows/auto-release.yml b/.github/workflows/auto-release.yml
index cfaf6db8abef..f693c62d765d 100644
--- a/.github/workflows/auto-release.yml
+++ b/.github/workflows/auto-release.yml
@@ -20,7 +20,7 @@ jobs:
           app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
           private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}
 
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           token: ${{ steps.token.outputs.token }}
           fetch-depth: 0
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7c5d801c5f6a..5575f81c9e4a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -71,7 +71,7 @@ jobs:
       pull-requests: read
     steps:
       - name: Check out current commit
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ env.HEAD_COMMIT }}
           # We need to check out not only the fake merge commit between the PR and the base branch which GH creates, but
@@ -131,13 +131,13 @@ jobs:
       (needs.job_get_metadata.outputs.is_gitflow_sync == 'false' && needs.job_get_metadata.outputs.has_gitflow_label == 'false')
     steps:
       - name: Check out base commit (${{ github.event.pull_request.base.sha }})
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         if: github.event_name == 'pull_request'
         with:
           ref: ${{ github.event.pull_request.base.sha }}
 
       - name: 'Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})'
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ env.HEAD_COMMIT }}
 
@@ -238,7 +238,7 @@ jobs:
       needs.job_get_metadata.outputs.is_release == 'true'
     steps:
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
@@ -267,7 +267,7 @@ jobs:
       needs.job_get_metadata.outputs.is_base_branch == 'true' || needs.job_get_metadata.outputs.is_release == 'true'
     steps:
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
@@ -296,7 +296,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
@@ -325,7 +325,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ env.HEAD_COMMIT }}
 
@@ -348,7 +348,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
@@ -370,7 +370,7 @@ jobs:
     if: needs.job_get_metadata.outputs.is_release == 'true'
     steps:
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
@@ -405,13 +405,13 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Check out base commit (${{ github.event.pull_request.base.sha }})
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         if: github.event_name == 'pull_request'
         with:
           ref: ${{ github.event.pull_request.base.sha }}
 
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
@@ -452,7 +452,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
@@ -477,7 +477,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
@@ -509,12 +509,12 @@ jobs:
         node: [18, 20, 22, 24]
     steps:
       - name: Check out base commit (${{ github.event.pull_request.base.sha }})
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         if: github.event_name == 'pull_request'
         with:
           ref: ${{ github.event.pull_request.base.sha }}
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
@@ -603,7 +603,7 @@ jobs:
 
     steps:
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
@@ -667,7 +667,7 @@ jobs:
 
     steps:
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
@@ -715,7 +715,7 @@ jobs:
     timeout-minutes: 5
     steps:
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
@@ -753,7 +753,7 @@ jobs:
             typescript: '3.8'
     steps:
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
@@ -789,7 +789,7 @@ jobs:
     timeout-minutes: 15
     steps:
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
@@ -817,7 +817,7 @@ jobs:
         node: [18, 20, 22, 24]
     steps:
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
@@ -864,12 +864,12 @@ jobs:
       matrix-optional: ${{ steps.matrix-optional.outputs.matrix }}
     steps:
       - name: Check out base commit (${{ github.event.pull_request.base.sha }})
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         if: github.event_name == 'pull_request'
         with:
           ref: ${{ github.event.pull_request.base.sha }}
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
@@ -934,7 +934,7 @@ jobs:
       matrix: ${{ fromJson(needs.job_e2e_prepare.outputs.matrix) }}
     steps:
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - uses: pnpm/action-setup@v4
@@ -1064,7 +1064,7 @@ jobs:
 
     steps:
       - name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - uses: pnpm/action-setup@v4
diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml
index 57290080c8de..1e71125ddad2 100644
--- a/.github/workflows/canary.yml
+++ b/.github/workflows/canary.yml
@@ -31,7 +31,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - name: Check out current commit
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - name: Set up Node
@@ -117,7 +117,7 @@ jobs:
 
     steps:
       - name: Check out current commit
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ env.HEAD_COMMIT }}
       - uses: pnpm/action-setup@v4
diff --git a/.github/workflows/cleanup-pr-caches.yml b/.github/workflows/cleanup-pr-caches.yml
index 2c9bba513605..eb65d9a642c1 100644
--- a/.github/workflows/cleanup-pr-caches.yml
+++ b/.github/workflows/cleanup-pr-caches.yml
@@ -14,7 +14,7 @@ jobs:
       contents: read
     steps:
       - name: Check out code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Cleanup
         run: |
diff --git a/.github/workflows/clear-cache.yml b/.github/workflows/clear-cache.yml
index 0f5f2241b34a..3c76486cdbe2 100644
--- a/.github/workflows/clear-cache.yml
+++ b/.github/workflows/clear-cache.yml
@@ -23,7 +23,7 @@ jobs:
     name: Delete all caches
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
 
       - name: Set up Node
         uses: actions/setup-node@v6
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 6d6b67201d5e..00e6203b6b55 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -46,7 +46,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
diff --git a/.github/workflows/external-contributors.yml b/.github/workflows/external-contributors.yml
index c085f9958452..9a0f85cdea7e 100644
--- a/.github/workflows/external-contributors.yml
+++ b/.github/workflows/external-contributors.yml
@@ -20,7 +20,7 @@ jobs:
       && github.event.pull_request.author_association != 'OWNER'
       && endsWith(github.event.pull_request.user.login, '[bot]') == false
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set up Node
         uses: actions/setup-node@v6
         with:
diff --git a/.github/workflows/flaky-test-detector.yml b/.github/workflows/flaky-test-detector.yml
index a6ed22e04f6a..bb3169ecb410 100644
--- a/.github/workflows/flaky-test-detector.yml
+++ b/.github/workflows/flaky-test-detector.yml
@@ -30,7 +30,7 @@ jobs:
     if: ${{ github.base_ref != 'master' && github.ref != 'refs/heads/master' }}
     steps:
       - name: Check out current branch
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Set up Node
         uses: actions/setup-node@v6
         with:
diff --git a/.github/workflows/gitflow-sync-develop.yml b/.github/workflows/gitflow-sync-develop.yml
index 96c69d952264..ff649d6ee204 100644
--- a/.github/workflows/gitflow-sync-develop.yml
+++ b/.github/workflows/gitflow-sync-develop.yml
@@ -23,7 +23,7 @@ jobs:
       contents: write
     steps:
       - name: git checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       # https://github.com/marketplace/actions/github-pull-request-action
       - name: Create Pull Request
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a2cb3fcd9600..0ff10040dc97 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -23,7 +23,7 @@ jobs:
         with:
           app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
           private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           token: ${{ steps.token.outputs.token }}
           fetch-depth: 0

From 30dd61079375b60abcf1b010fc7816218209c287 Mon Sep 17 00:00:00 2001
From: Onur Temizkan <onur@narval.co.uk>
Date: Fri, 28 Nov 2025 15:09:18 +0000
Subject: [PATCH 140/186] fix(react-router): Use underscores in trace origin
 values (#18351)

Resolves: https://github.com/getsentry/sentry-javascript/issues/18350

Fixes server validation errors for `contexts.trace.origin` values in the
React Router SDK.

---------

Co-authored-by: Lukas Stracke <lukas.stracke@sentry.io>
---
 .../performance/navigation.client.test.ts     |  8 +++----
 .../tests/performance/pageload.client.test.ts | 12 +++++-----
 .../performance/performance.server.test.ts    | 24 +++++++++----------
 .../performance/navigation.client.test.ts     |  8 +++----
 .../tests/performance/pageload.client.test.ts | 12 +++++-----
 .../performance/performance.server.test.ts    | 24 +++++++++----------
 .../performance/navigation.client.test.ts     |  4 ++--
 .../tests/performance/pageload.client.test.ts |  8 +++----
 .../performance/navigation.client.test.ts     |  4 ++--
 .../tests/performance/pageload.client.test.ts |  8 +++----
 .../performance/navigation.client.test.ts     |  8 +++----
 .../tests/performance/pageload.client.test.ts | 12 +++++-----
 .../performance/performance.server.test.ts    | 16 ++++++-------
 .../react-router/src/client/hydratedRouter.ts |  6 ++---
 .../src/server/instrumentation/reactRouter.ts |  4 ++--
 .../src/server/wrapSentryHandleRequest.ts     |  2 +-
 .../src/server/wrapServerAction.ts            |  4 ++--
 .../src/server/wrapServerLoader.ts            |  4 ++--
 .../server/wrapSentryHandleRequest.test.ts    |  2 +-
 .../test/server/wrapServerAction.test.ts      |  4 ++--
 .../test/server/wrapServerLoader.test.ts      |  4 ++--
 21 files changed, 89 insertions(+), 89 deletions(-)

diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-framework-custom/tests/performance/navigation.client.test.ts b/dev-packages/e2e-tests/test-applications/react-router-7-framework-custom/tests/performance/navigation.client.test.ts
index 24e27e89539e..9e9891bd9306 100644
--- a/dev-packages/e2e-tests/test-applications/react-router-7-framework-custom/tests/performance/navigation.client.test.ts
+++ b/dev-packages/e2e-tests/test-applications/react-router-7-framework-custom/tests/performance/navigation.client.test.ts
@@ -20,12 +20,12 @@ test.describe('client - navigation performance', () => {
           span_id: expect.any(String),
           trace_id: expect.any(String),
           data: {
-            'sentry.origin': 'auto.navigation.react-router',
+            'sentry.origin': 'auto.navigation.react_router',
             'sentry.op': 'navigation',
             'sentry.source': 'route',
           },
           op: 'navigation',
-          origin: 'auto.navigation.react-router',
+          origin: 'auto.navigation.react_router',
         },
       },
       spans: expect.any(Array),
@@ -71,12 +71,12 @@ test.describe('client - navigation performance', () => {
           span_id: expect.any(String),
           trace_id: expect.any(String),
           data: {
-            'sentry.origin': 'auto.navigation.react-router',
+            'sentry.origin': 'auto.navigation.react_router',
             'sentry.op': 'navigation',
             'sentry.source': 'route',
           },
           op: 'navigation',
-          origin: 'auto.navigation.react-router',
+          origin: 'auto.navigation.react_router',
         },
       },
       spans: expect.any(Array),
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-framework-custom/tests/performance/pageload.client.test.ts b/dev-packages/e2e-tests/test-applications/react-router-7-framework-custom/tests/performance/pageload.client.test.ts
index 465d000dcd31..b374c0ce4642 100644
--- a/dev-packages/e2e-tests/test-applications/react-router-7-framework-custom/tests/performance/pageload.client.test.ts
+++ b/dev-packages/e2e-tests/test-applications/react-router-7-framework-custom/tests/performance/pageload.client.test.ts
@@ -18,12 +18,12 @@ test.describe('client - pageload performance', () => {
           span_id: expect.any(String),
           trace_id: expect.any(String),
           data: {
-            'sentry.origin': 'auto.pageload.react-router',
+            'sentry.origin': 'auto.pageload.react_router',
             'sentry.op': 'pageload',
             'sentry.source': 'route',
           },
           op: 'pageload',
-          origin: 'auto.pageload.react-router',
+          origin: 'auto.pageload.react_router',
         },
       },
       spans: expect.any(Array),
@@ -68,12 +68,12 @@ test.describe('client - pageload performance', () => {
           span_id: expect.any(String),
           trace_id: expect.any(String),
           data: {
-            'sentry.origin': 'auto.pageload.react-router',
+            'sentry.origin': 'auto.pageload.react_router',
             'sentry.op': 'pageload',
             'sentry.source': 'route',
           },
           op: 'pageload',
-          origin: 'auto.pageload.react-router',
+          origin: 'auto.pageload.react_router',
         },
       },
       spans: expect.any(Array),
@@ -119,12 +119,12 @@ test.describe('client - pageload performance', () => {
           span_id: expect.any(String),
           trace_id: expect.any(String),
           data: {
-            'sentry.origin': 'auto.pageload.react-router',
+            'sentry.origin': 'auto.pageload.react_router',
             'sentry.op': 'pageload',
             'sentry.source': 'route',
           },
           op: 'pageload',
-          origin: 'auto.pageload.react-router',
+          origin: 'auto.pageload.react_router',
         },
       },
     });
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-framework-custom/tests/performance/performance.server.test.ts b/dev-packages/e2e-tests/test-applications/react-router-7-framework-custom/tests/performance/performance.server.test.ts
index a53b85228f00..5244ec499d33 100644
--- a/dev-packages/e2e-tests/test-applications/react-router-7-framework-custom/tests/performance/performance.server.test.ts
+++ b/dev-packages/e2e-tests/test-applications/react-router-7-framework-custom/tests/performance/performance.server.test.ts
@@ -19,11 +19,11 @@ test.describe('server - performance', () => {
           trace_id: expect.any(String),
           data: {
             'sentry.op': 'http.server',
-            'sentry.origin': 'auto.http.react-router.request-handler',
+            'sentry.origin': 'auto.http.react_router.request_handler',
             'sentry.source': 'route',
           },
           op: 'http.server',
-          origin: 'auto.http.react-router.request-handler',
+          origin: 'auto.http.react_router.request_handler',
         },
       },
       spans: expect.any(Array),
@@ -70,11 +70,11 @@ test.describe('server - performance', () => {
           trace_id: expect.any(String),
           data: {
             'sentry.op': 'http.server',
-            'sentry.origin': 'auto.http.react-router.request-handler',
+            'sentry.origin': 'auto.http.react_router.request_handler',
             'sentry.source': 'route',
           },
           op: 'http.server',
-          origin: 'auto.http.react-router.request-handler',
+          origin: 'auto.http.react_router.request_handler',
         },
       },
       spans: expect.any(Array),
@@ -122,7 +122,7 @@ test.describe('server - performance', () => {
             span_id: expect.any(String),
             trace_id: expect.any(String),
             op: 'http.server',
-            origin: 'auto.http.react-router.loader',
+            origin: 'auto.http.react_router.loader',
             parent_span_id: expect.any(String),
             status: 'ok',
             data: expect.objectContaining({
@@ -133,7 +133,7 @@ test.describe('server - performance', () => {
               'http.target': '/performance/server-loader.data',
               'http.url': 'http://localhost:3030/performance/server-loader.data',
               'sentry.op': 'http.server',
-              'sentry.origin': 'auto.http.react-router.loader',
+              'sentry.origin': 'auto.http.react_router.loader',
               'sentry.source': 'url',
               url: 'http://localhost:3030/performance/server-loader.data',
             }),
@@ -152,7 +152,7 @@ test.describe('server - performance', () => {
       span_id: expect.any(String),
       trace_id: expect.any(String),
       data: {
-        'sentry.origin': 'auto.http.react-router.loader',
+        'sentry.origin': 'auto.http.react_router.loader',
         'sentry.op': 'function.react-router.loader',
       },
       description: 'Executing Server Loader',
@@ -161,7 +161,7 @@ test.describe('server - performance', () => {
       timestamp: expect.any(Number),
       status: 'ok',
       op: 'function.react-router.loader',
-      origin: 'auto.http.react-router.loader',
+      origin: 'auto.http.react_router.loader',
     });
   });
 
@@ -182,7 +182,7 @@ test.describe('server - performance', () => {
             span_id: expect.any(String),
             trace_id: expect.any(String),
             op: 'http.server',
-            origin: 'auto.http.react-router.action',
+            origin: 'auto.http.react_router.action',
             parent_span_id: expect.any(String),
             status: 'ok',
             data: expect.objectContaining({
@@ -193,7 +193,7 @@ test.describe('server - performance', () => {
               'http.target': '/performance/server-action.data',
               'http.url': 'http://localhost:3030/performance/server-action.data',
               'sentry.op': 'http.server',
-              'sentry.origin': 'auto.http.react-router.action',
+              'sentry.origin': 'auto.http.react_router.action',
               'sentry.source': 'url',
               url: 'http://localhost:3030/performance/server-action.data',
             }),
@@ -212,7 +212,7 @@ test.describe('server - performance', () => {
       span_id: expect.any(String),
       trace_id: expect.any(String),
       data: {
-        'sentry.origin': 'auto.http.react-router.action',
+        'sentry.origin': 'auto.http.react_router.action',
         'sentry.op': 'function.react-router.action',
       },
       description: 'Executing Server Action',
@@ -221,7 +221,7 @@ test.describe('server - performance', () => {
       timestamp: expect.any(Number),
       status: 'ok',
       op: 'function.react-router.action',
-      origin: 'auto.http.react-router.action',
+      origin: 'auto.http.react_router.action',
     });
   });
 });
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-framework-node-20-18/tests/performance/navigation.client.test.ts b/dev-packages/e2e-tests/test-applications/react-router-7-framework-node-20-18/tests/performance/navigation.client.test.ts
index 24e27e89539e..9e9891bd9306 100644
--- a/dev-packages/e2e-tests/test-applications/react-router-7-framework-node-20-18/tests/performance/navigation.client.test.ts
+++ b/dev-packages/e2e-tests/test-applications/react-router-7-framework-node-20-18/tests/performance/navigation.client.test.ts
@@ -20,12 +20,12 @@ test.describe('client - navigation performance', () => {
           span_id: expect.any(String),
           trace_id: expect.any(String),
           data: {
-            'sentry.origin': 'auto.navigation.react-router',
+            'sentry.origin': 'auto.navigation.react_router',
             'sentry.op': 'navigation',
             'sentry.source': 'route',
           },
           op: 'navigation',
-          origin: 'auto.navigation.react-router',
+          origin: 'auto.navigation.react_router',
         },
       },
       spans: expect.any(Array),
@@ -71,12 +71,12 @@ test.describe('client - navigation performance', () => {
           span_id: expect.any(String),
           trace_id: expect.any(String),
           data: {
-            'sentry.origin': 'auto.navigation.react-router',
+            'sentry.origin': 'auto.navigation.react_router',
             'sentry.op': 'navigation',
             'sentry.source': 'route',
           },
           op: 'navigation',
-          origin: 'auto.navigation.react-router',
+          origin: 'auto.navigation.react_router',
         },
       },
       spans: expect.any(Array),
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-framework-node-20-18/tests/performance/pageload.client.test.ts b/dev-packages/e2e-tests/test-applications/react-router-7-framework-node-20-18/tests/performance/pageload.client.test.ts
index 465d000dcd31..b374c0ce4642 100644
--- a/dev-packages/e2e-tests/test-applications/react-router-7-framework-node-20-18/tests/performance/pageload.client.test.ts
+++ b/dev-packages/e2e-tests/test-applications/react-router-7-framework-node-20-18/tests/performance/pageload.client.test.ts
@@ -18,12 +18,12 @@ test.describe('client - pageload performance', () => {
           span_id: expect.any(String),
           trace_id: expect.any(String),
           data: {
-            'sentry.origin': 'auto.pageload.react-router',
+            'sentry.origin': 'auto.pageload.react_router',
             'sentry.op': 'pageload',
             'sentry.source': 'route',
           },
           op: 'pageload',
-          origin: 'auto.pageload.react-router',
+          origin: 'auto.pageload.react_router',
         },
       },
       spans: expect.any(Array),
@@ -68,12 +68,12 @@ test.describe('client - pageload performance', () => {
           span_id: expect.any(String),
           trace_id: expect.any(String),
           data: {
-            'sentry.origin': 'auto.pageload.react-router',
+            'sentry.origin': 'auto.pageload.react_router',
             'sentry.op': 'pageload',
             'sentry.source': 'route',
           },
           op: 'pageload',
-          origin: 'auto.pageload.react-router',
+          origin: 'auto.pageload.react_router',
         },
       },
       spans: expect.any(Array),
@@ -119,12 +119,12 @@ test.describe('client - pageload performance', () => {
           span_id: expect.any(String),
           trace_id: expect.any(String),
           data: {
-            'sentry.origin': 'auto.pageload.react-router',
+            'sentry.origin': 'auto.pageload.react_router',
             'sentry.op': 'pageload',
             'sentry.source': 'route',
           },
           op: 'pageload',
-          origin: 'auto.pageload.react-router',
+          origin: 'auto.pageload.react_router',
         },
       },
     });
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-framework-node-20-18/tests/performance/performance.server.test.ts b/dev-packages/e2e-tests/test-applications/react-router-7-framework-node-20-18/tests/performance/performance.server.test.ts
index dd55a2ed6625..6058403bb81e 100644
--- a/dev-packages/e2e-tests/test-applications/react-router-7-framework-node-20-18/tests/performance/performance.server.test.ts
+++ b/dev-packages/e2e-tests/test-applications/react-router-7-framework-node-20-18/tests/performance/performance.server.test.ts
@@ -19,11 +19,11 @@ test.describe('server - performance', () => {
           trace_id: expect.any(String),
           data: {
             'sentry.op': 'http.server',
-            'sentry.origin': 'auto.http.react-router.request-handler',
+            'sentry.origin': 'auto.http.react_router.request_handler',
             'sentry.source': 'route',
           },
           op: 'http.server',
-          origin: 'auto.http.react-router.request-handler',
+          origin: 'auto.http.react_router.request_handler',
         },
       },
       spans: expect.any(Array),
@@ -70,11 +70,11 @@ test.describe('server - performance', () => {
           trace_id: expect.any(String),
           data: {
             'sentry.op': 'http.server',
-            'sentry.origin': 'auto.http.react-router.request-handler',
+            'sentry.origin': 'auto.http.react_router.request_handler',
             'sentry.source': 'route',
           },
           op: 'http.server',
-          origin: 'auto.http.react-router.request-handler',
+          origin: 'auto.http.react_router.request_handler',
         },
       },
       spans: expect.any(Array),
@@ -122,7 +122,7 @@ test.describe('server - performance', () => {
             span_id: expect.any(String),
             trace_id: expect.any(String),
             op: 'http.server',
-            origin: 'auto.http.react-router.server',
+            origin: 'auto.http.react_router.server',
             parent_span_id: expect.any(String),
             status: 'ok',
             data: expect.objectContaining({
@@ -133,7 +133,7 @@ test.describe('server - performance', () => {
               'http.target': '/performance/server-loader.data',
               'http.url': 'http://localhost:3030/performance/server-loader.data',
               'sentry.op': 'http.server',
-              'sentry.origin': 'auto.http.react-router.server',
+              'sentry.origin': 'auto.http.react_router.server',
               'sentry.source': 'url',
               url: 'http://localhost:3030/performance/server-loader.data',
             }),
@@ -154,11 +154,11 @@ test.describe('server - performance', () => {
       trace_id: expect.any(String),
       data: {
         'sentry.op': 'function.react-router.loader',
-        'sentry.origin': 'auto.http.react-router.server',
+        'sentry.origin': 'auto.http.react_router.server',
       },
       description: 'Executing Server Loader',
       op: 'function.react-router.loader',
-      origin: 'auto.http.react-router.server',
+      origin: 'auto.http.react_router.server',
       parent_span_id: expect.any(String),
       start_timestamp: expect.any(Number),
       status: 'ok',
@@ -183,7 +183,7 @@ test.describe('server - performance', () => {
             span_id: expect.any(String),
             trace_id: expect.any(String),
             op: 'http.server',
-            origin: 'auto.http.react-router.server',
+            origin: 'auto.http.react_router.server',
             parent_span_id: expect.any(String),
             status: 'ok',
             data: expect.objectContaining({
@@ -194,7 +194,7 @@ test.describe('server - performance', () => {
               'http.target': '/performance/server-action.data',
               'http.url': 'http://localhost:3030/performance/server-action.data',
               'sentry.op': 'http.server',
-              'sentry.origin': 'auto.http.react-router.server',
+              'sentry.origin': 'auto.http.react_router.server',
               'sentry.source': 'url',
               url: 'http://localhost:3030/performance/server-action.data',
             }),
@@ -214,11 +214,11 @@ test.describe('server - performance', () => {
       trace_id: expect.any(String),
       data: {
         'sentry.op': 'function.react-router.action',
-        'sentry.origin': 'auto.http.react-router.server',
+        'sentry.origin': 'auto.http.react_router.server',
       },
       description: 'Executing Server Action',
       op: 'function.react-router.action',
-      origin: 'auto.http.react-router.server',
+      origin: 'auto.http.react_router.server',
       parent_span_id: expect.any(String),
       start_timestamp: expect.any(Number),
       status: 'ok',
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa-node-20-18/tests/performance/navigation.client.test.ts b/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa-node-20-18/tests/performance/navigation.client.test.ts
index d2257de0cdfa..c30be5a32564 100644
--- a/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa-node-20-18/tests/performance/navigation.client.test.ts
+++ b/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa-node-20-18/tests/performance/navigation.client.test.ts
@@ -20,12 +20,12 @@ test.describe('client - navigation performance', () => {
           span_id: expect.any(String),
           trace_id: expect.any(String),
           data: {
-            'sentry.origin': 'auto.navigation.react-router',
+            'sentry.origin': 'auto.navigation.react_router',
             'sentry.op': 'navigation',
             'sentry.source': 'route',
           },
           op: 'navigation',
-          origin: 'auto.navigation.react-router',
+          origin: 'auto.navigation.react_router',
         },
       },
       spans: expect.any(Array),
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa-node-20-18/tests/performance/pageload.client.test.ts b/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa-node-20-18/tests/performance/pageload.client.test.ts
index 1118bde2669c..224a466ece66 100644
--- a/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa-node-20-18/tests/performance/pageload.client.test.ts
+++ b/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa-node-20-18/tests/performance/pageload.client.test.ts
@@ -18,12 +18,12 @@ test.describe('client - pageload performance', () => {
           span_id: expect.any(String),
           trace_id: expect.any(String),
           data: {
-            'sentry.origin': 'auto.pageload.react-router',
+            'sentry.origin': 'auto.pageload.react_router',
             'sentry.op': 'pageload',
             'sentry.source': 'route',
           },
           op: 'pageload',
-          origin: 'auto.pageload.react-router',
+          origin: 'auto.pageload.react_router',
         },
       },
       spans: expect.any(Array),
@@ -68,12 +68,12 @@ test.describe('client - pageload performance', () => {
           span_id: expect.any(String),
           trace_id: expect.any(String),
           data: {
-            'sentry.origin': 'auto.pageload.react-router',
+            'sentry.origin': 'auto.pageload.react_router',
             'sentry.op': 'pageload',
             'sentry.source': 'route',
           },
           op: 'pageload',
-          origin: 'auto.pageload.react-router',
+          origin: 'auto.pageload.react_router',
         },
       },
       spans: expect.any(Array),
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa/tests/performance/navigation.client.test.ts b/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa/tests/performance/navigation.client.test.ts
index d2257de0cdfa..c30be5a32564 100644
--- a/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa/tests/performance/navigation.client.test.ts
+++ b/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa/tests/performance/navigation.client.test.ts
@@ -20,12 +20,12 @@ test.describe('client - navigation performance', () => {
           span_id: expect.any(String),
           trace_id: expect.any(String),
           data: {
-            'sentry.origin': 'auto.navigation.react-router',
+            'sentry.origin': 'auto.navigation.react_router',
             'sentry.op': 'navigation',
             'sentry.source': 'route',
           },
           op: 'navigation',
-          origin: 'auto.navigation.react-router',
+          origin: 'auto.navigation.react_router',
         },
       },
       spans: expect.any(Array),
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa/tests/performance/pageload.client.test.ts b/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa/tests/performance/pageload.client.test.ts
index 1118bde2669c..224a466ece66 100644
--- a/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa/tests/performance/pageload.client.test.ts
+++ b/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa/tests/performance/pageload.client.test.ts
@@ -18,12 +18,12 @@ test.describe('client - pageload performance', () => {
           span_id: expect.any(String),
           trace_id: expect.any(String),
           data: {
-            'sentry.origin': 'auto.pageload.react-router',
+            'sentry.origin': 'auto.pageload.react_router',
             'sentry.op': 'pageload',
             'sentry.source': 'route',
           },
           op: 'pageload',
-          origin: 'auto.pageload.react-router',
+          origin: 'auto.pageload.react_router',
         },
       },
       spans: expect.any(Array),
@@ -68,12 +68,12 @@ test.describe('client - pageload performance', () => {
           span_id: expect.any(String),
           trace_id: expect.any(String),
           data: {
-            'sentry.origin': 'auto.pageload.react-router',
+            'sentry.origin': 'auto.pageload.react_router',
             'sentry.op': 'pageload',
             'sentry.source': 'route',
           },
           op: 'pageload',
-          origin: 'auto.pageload.react-router',
+          origin: 'auto.pageload.react_router',
         },
       },
       spans: expect.any(Array),
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-framework/tests/performance/navigation.client.test.ts b/dev-packages/e2e-tests/test-applications/react-router-7-framework/tests/performance/navigation.client.test.ts
index 24e27e89539e..9e9891bd9306 100644
--- a/dev-packages/e2e-tests/test-applications/react-router-7-framework/tests/performance/navigation.client.test.ts
+++ b/dev-packages/e2e-tests/test-applications/react-router-7-framework/tests/performance/navigation.client.test.ts
@@ -20,12 +20,12 @@ test.describe('client - navigation performance', () => {
           span_id: expect.any(String),
           trace_id: expect.any(String),
           data: {
-            'sentry.origin': 'auto.navigation.react-router',
+            'sentry.origin': 'auto.navigation.react_router',
             'sentry.op': 'navigation',
             'sentry.source': 'route',
           },
           op: 'navigation',
-          origin: 'auto.navigation.react-router',
+          origin: 'auto.navigation.react_router',
         },
       },
       spans: expect.any(Array),
@@ -71,12 +71,12 @@ test.describe('client - navigation performance', () => {
           span_id: expect.any(String),
           trace_id: expect.any(String),
           data: {
-            'sentry.origin': 'auto.navigation.react-router',
+            'sentry.origin': 'auto.navigation.react_router',
             'sentry.op': 'navigation',
             'sentry.source': 'route',
           },
           op: 'navigation',
-          origin: 'auto.navigation.react-router',
+          origin: 'auto.navigation.react_router',
         },
       },
       spans: expect.any(Array),
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-framework/tests/performance/pageload.client.test.ts b/dev-packages/e2e-tests/test-applications/react-router-7-framework/tests/performance/pageload.client.test.ts
index 465d000dcd31..b374c0ce4642 100644
--- a/dev-packages/e2e-tests/test-applications/react-router-7-framework/tests/performance/pageload.client.test.ts
+++ b/dev-packages/e2e-tests/test-applications/react-router-7-framework/tests/performance/pageload.client.test.ts
@@ -18,12 +18,12 @@ test.describe('client - pageload performance', () => {
           span_id: expect.any(String),
           trace_id: expect.any(String),
           data: {
-            'sentry.origin': 'auto.pageload.react-router',
+            'sentry.origin': 'auto.pageload.react_router',
             'sentry.op': 'pageload',
             'sentry.source': 'route',
           },
           op: 'pageload',
-          origin: 'auto.pageload.react-router',
+          origin: 'auto.pageload.react_router',
         },
       },
       spans: expect.any(Array),
@@ -68,12 +68,12 @@ test.describe('client - pageload performance', () => {
           span_id: expect.any(String),
           trace_id: expect.any(String),
           data: {
-            'sentry.origin': 'auto.pageload.react-router',
+            'sentry.origin': 'auto.pageload.react_router',
             'sentry.op': 'pageload',
             'sentry.source': 'route',
           },
           op: 'pageload',
-          origin: 'auto.pageload.react-router',
+          origin: 'auto.pageload.react_router',
         },
       },
       spans: expect.any(Array),
@@ -119,12 +119,12 @@ test.describe('client - pageload performance', () => {
           span_id: expect.any(String),
           trace_id: expect.any(String),
           data: {
-            'sentry.origin': 'auto.pageload.react-router',
+            'sentry.origin': 'auto.pageload.react_router',
             'sentry.op': 'pageload',
             'sentry.source': 'route',
           },
           op: 'pageload',
-          origin: 'auto.pageload.react-router',
+          origin: 'auto.pageload.react_router',
         },
       },
     });
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-framework/tests/performance/performance.server.test.ts b/dev-packages/e2e-tests/test-applications/react-router-7-framework/tests/performance/performance.server.test.ts
index f3f5e26a6154..bc7b44591f30 100644
--- a/dev-packages/e2e-tests/test-applications/react-router-7-framework/tests/performance/performance.server.test.ts
+++ b/dev-packages/e2e-tests/test-applications/react-router-7-framework/tests/performance/performance.server.test.ts
@@ -19,11 +19,11 @@ test.describe('server - performance', () => {
           trace_id: expect.any(String),
           data: {
             'sentry.op': 'http.server',
-            'sentry.origin': 'auto.http.react-router.request-handler',
+            'sentry.origin': 'auto.http.react_router.request_handler',
             'sentry.source': 'route',
           },
           op: 'http.server',
-          origin: 'auto.http.react-router.request-handler',
+          origin: 'auto.http.react_router.request_handler',
         },
       },
       spans: expect.any(Array),
@@ -70,11 +70,11 @@ test.describe('server - performance', () => {
           trace_id: expect.any(String),
           data: {
             'sentry.op': 'http.server',
-            'sentry.origin': 'auto.http.react-router.request-handler',
+            'sentry.origin': 'auto.http.react_router.request_handler',
             'sentry.source': 'route',
           },
           op: 'http.server',
-          origin: 'auto.http.react-router.request-handler',
+          origin: 'auto.http.react_router.request_handler',
         },
       },
       spans: expect.any(Array),
@@ -121,7 +121,7 @@ test.describe('server - performance', () => {
       span_id: expect.any(String),
       trace_id: expect.any(String),
       data: {
-        'sentry.origin': 'auto.http.react-router',
+        'sentry.origin': 'auto.http.react_router',
         'sentry.op': 'function.react-router.loader',
       },
       description: 'Executing Server Loader',
@@ -130,7 +130,7 @@ test.describe('server - performance', () => {
       timestamp: expect.any(Number),
       status: 'ok',
       op: 'function.react-router.loader',
-      origin: 'auto.http.react-router',
+      origin: 'auto.http.react_router',
     });
   });
 
@@ -149,7 +149,7 @@ test.describe('server - performance', () => {
       span_id: expect.any(String),
       trace_id: expect.any(String),
       data: {
-        'sentry.origin': 'auto.http.react-router',
+        'sentry.origin': 'auto.http.react_router',
         'sentry.op': 'function.react-router.action',
       },
       description: 'Executing Server Action',
@@ -158,7 +158,7 @@ test.describe('server - performance', () => {
       timestamp: expect.any(Number),
       status: 'ok',
       op: 'function.react-router.action',
-      origin: 'auto.http.react-router',
+      origin: 'auto.http.react_router',
     });
   });
 });
diff --git a/packages/react-router/src/client/hydratedRouter.ts b/packages/react-router/src/client/hydratedRouter.ts
index 7cb53d87487b..14cdf07a33c9 100644
--- a/packages/react-router/src/client/hydratedRouter.ts
+++ b/packages/react-router/src/client/hydratedRouter.ts
@@ -48,7 +48,7 @@ export function instrumentHydratedRouter(): void {
           pageloadSpan.updateName(parameterizePageloadRoute);
           pageloadSpan.setAttributes({
             [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
-            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.react-router',
+            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.react_router',
           });
         }
 
@@ -84,7 +84,7 @@ export function instrumentHydratedRouter(): void {
           navigationSpan.updateName(parameterizedNavRoute);
           navigationSpan.setAttributes({
             [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
-            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.react-router',
+            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.react_router',
           });
         }
       });
@@ -125,7 +125,7 @@ function maybeCreateNavigationTransaction(name: string, source: 'url' | 'route')
     attributes: {
       [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: source,
       [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation',
-      [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.react-router',
+      [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.react_router',
     },
   });
 }
diff --git a/packages/react-router/src/server/instrumentation/reactRouter.ts b/packages/react-router/src/server/instrumentation/reactRouter.ts
index 5b7b001e4de5..708b9857015b 100644
--- a/packages/react-router/src/server/instrumentation/reactRouter.ts
+++ b/packages/react-router/src/server/instrumentation/reactRouter.ts
@@ -93,14 +93,14 @@ export class ReactRouterInstrumentation extends InstrumentationBase<Instrumentat
               updateSpanName(rootSpan, `${request.method} ${target}`);
               rootSpan.setAttributes({
                 [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
-                [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react-router.server',
+                [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.server',
               });
 
               return startSpan(
                 {
                   name: getSpanName(url.pathname, request.method),
                   attributes: {
-                    [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react-router.server',
+                    [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.server',
                     [SEMANTIC_ATTRIBUTE_SENTRY_OP]: getOpName(url.pathname, request.method),
                   },
                 },
diff --git a/packages/react-router/src/server/wrapSentryHandleRequest.ts b/packages/react-router/src/server/wrapSentryHandleRequest.ts
index 308b5c07a32b..2e788637988f 100644
--- a/packages/react-router/src/server/wrapSentryHandleRequest.ts
+++ b/packages/react-router/src/server/wrapSentryHandleRequest.ts
@@ -80,7 +80,7 @@ export function wrapSentryHandleRequest(
       rootSpan.setAttributes({
         [ATTR_HTTP_ROUTE]: routeName,
         [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
-        [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react-router.request-handler',
+        [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.request_handler',
       });
     }
 
diff --git a/packages/react-router/src/server/wrapServerAction.ts b/packages/react-router/src/server/wrapServerAction.ts
index 9cb0a7ddd067..e816c3c63886 100644
--- a/packages/react-router/src/server/wrapServerAction.ts
+++ b/packages/react-router/src/server/wrapServerAction.ts
@@ -54,7 +54,7 @@ export function wrapServerAction<T>(options: SpanOptions = {}, actionFn: (args:
           updateSpanName(root, `${args.request.method} ${target}`);
           root.setAttributes({
             [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
-            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react-router.action',
+            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.action',
           });
         }
       }
@@ -66,7 +66,7 @@ export function wrapServerAction<T>(options: SpanOptions = {}, actionFn: (args:
           name,
           ...options,
           attributes: {
-            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react-router.action',
+            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.action',
             [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.react-router.action',
             ...options.attributes,
           },
diff --git a/packages/react-router/src/server/wrapServerLoader.ts b/packages/react-router/src/server/wrapServerLoader.ts
index 981b2085d4b7..7e5083d4d5c8 100644
--- a/packages/react-router/src/server/wrapServerLoader.ts
+++ b/packages/react-router/src/server/wrapServerLoader.ts
@@ -55,7 +55,7 @@ export function wrapServerLoader<T>(options: SpanOptions = {}, loaderFn: (args:
           updateSpanName(root, `${args.request.method} ${target}`);
           root.setAttributes({
             [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
-            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react-router.loader',
+            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.loader',
           });
         }
       }
@@ -66,7 +66,7 @@ export function wrapServerLoader<T>(options: SpanOptions = {}, loaderFn: (args:
           name,
           ...options,
           attributes: {
-            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react-router.loader',
+            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.loader',
             [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.react-router.loader',
             ...options.attributes,
           },
diff --git a/packages/react-router/test/server/wrapSentryHandleRequest.test.ts b/packages/react-router/test/server/wrapSentryHandleRequest.test.ts
index e76a7f6c1dae..45b4ca1062df 100644
--- a/packages/react-router/test/server/wrapSentryHandleRequest.test.ts
+++ b/packages/react-router/test/server/wrapSentryHandleRequest.test.ts
@@ -78,7 +78,7 @@ describe('wrapSentryHandleRequest', () => {
     expect(mockRootSpan.setAttributes).toHaveBeenCalledWith({
       [ATTR_HTTP_ROUTE]: '/some-path',
       [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
-      [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react-router.request-handler',
+      [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.request_handler',
     });
     expect(mockRpcMetadata.route).toBe('/some-path');
   });
diff --git a/packages/react-router/test/server/wrapServerAction.test.ts b/packages/react-router/test/server/wrapServerAction.test.ts
index 5b707eb33547..5eb92ef53b3b 100644
--- a/packages/react-router/test/server/wrapServerAction.test.ts
+++ b/packages/react-router/test/server/wrapServerAction.test.ts
@@ -30,7 +30,7 @@ describe('wrapServerAction', () => {
       {
         name: 'Executing Server Action',
         attributes: {
-          [core.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react-router.action',
+          [core.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.action',
           [core.SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.react-router.action',
         },
       },
@@ -60,7 +60,7 @@ describe('wrapServerAction', () => {
       {
         name: 'Custom Action',
         attributes: {
-          [core.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react-router.action',
+          [core.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.action',
           [core.SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.react-router.action',
           'sentry.custom': 'value',
         },
diff --git a/packages/react-router/test/server/wrapServerLoader.test.ts b/packages/react-router/test/server/wrapServerLoader.test.ts
index 0838643ff7de..b375d9b4da51 100644
--- a/packages/react-router/test/server/wrapServerLoader.test.ts
+++ b/packages/react-router/test/server/wrapServerLoader.test.ts
@@ -30,7 +30,7 @@ describe('wrapServerLoader', () => {
       {
         name: 'Executing Server Loader',
         attributes: {
-          [core.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react-router.loader',
+          [core.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.loader',
           [core.SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.react-router.loader',
         },
       },
@@ -60,7 +60,7 @@ describe('wrapServerLoader', () => {
       {
         name: 'Custom Loader',
         attributes: {
-          [core.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react-router.loader',
+          [core.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.loader',
           [core.SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.react-router.loader',
           'sentry.custom': 'value',
         },

From 5c51fdb48bd38dbd35fae0352b5b4ac91cedc2e2 Mon Sep 17 00:00:00 2001
From: Daniel Walsh <walshydev@gmail.com>
Date: Fri, 28 Nov 2025 19:13:26 +0000
Subject: [PATCH 141/186] feat(cloudflare): Allow specifying a custom fetch in
 Cloudflare transport options (#18335)

Adds a new transport option to the Cloudflare provider, this allows
specifying a custom fetch implementation. This allows for [Workers
VPC](https://developers.cloudflare.com/workers-vpc/) to send into an
internal Sentry.

Example usage:
```js
export default Sentry.withSentry(
  (env: Env) => ({
    dsn: env.SENTRY_DSN,
    release: env.VERSION_METADATA.tag ?? env.VERSION_METADATA.id,
    transportOptions: {
      fetch: env.SENTRY_VPC_BRIDGE.fetch.bind(env.SENTRY_VPC_BRIDGE),
    },
  }),
  {
    async fetch(req, env) {
      return new Response("ok");
    },
};
```

---

Before submitting a pull request, please take a look at our

[Contributing](https://github.com/getsentry/sentry-javascript/blob/master/CONTRIBUTING.md)
guidelines and verify:

- [x] If you've added code that should be tested, please add tests.
- [x] Ensure your code lints and the test suite passes (`yarn lint`) &
(`yarn test`).
---
 packages/cloudflare/src/transport.ts       |  4 +++-
 packages/cloudflare/test/transport.test.ts | 16 ++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/packages/cloudflare/src/transport.ts b/packages/cloudflare/src/transport.ts
index eee54bd7a790..8881e2dd6567 100644
--- a/packages/cloudflare/src/transport.ts
+++ b/packages/cloudflare/src/transport.ts
@@ -2,6 +2,8 @@ import type { BaseTransportOptions, Transport, TransportMakeRequestResponse, Tra
 import { createTransport, SENTRY_BUFFER_FULL_ERROR, suppressTracing } from '@sentry/core';
 
 export interface CloudflareTransportOptions extends BaseTransportOptions {
+  /** Custom fetch function to use. This allows usage of things like Workers VPC */
+  fetch?: typeof fetch;
   /** Fetch API init parameters. */
   fetchOptions?: RequestInit;
 }
@@ -87,7 +89,7 @@ export function makeCloudflareTransport(options: CloudflareTransportOptions): Tr
     };
 
     return suppressTracing(() => {
-      return fetch(options.url, requestOptions).then(response => {
+      return (options.fetch ?? fetch)(options.url, requestOptions).then(response => {
         return {
           statusCode: response.status,
           headers: {
diff --git a/packages/cloudflare/test/transport.test.ts b/packages/cloudflare/test/transport.test.ts
index 5de33cc7cb80..71b231f542af 100644
--- a/packages/cloudflare/test/transport.test.ts
+++ b/packages/cloudflare/test/transport.test.ts
@@ -161,4 +161,20 @@ describe('IsolatedPromiseBuffer', () => {
     expect(task1).toHaveBeenCalled();
     expect(task2).toHaveBeenCalled();
   });
+
+  it('should allow for a custom fetch function to be passed in', async () => {
+    const customFetch = vi.fn(async () => {
+      return {
+        headers: new Headers(),
+        status: 200,
+        text: () => Promise.resolve({}),
+      } as unknown as Response;
+    });
+
+    const transport = makeCloudflareTransport({ ...DEFAULT_EDGE_TRANSPORT_OPTIONS, fetch: customFetch });
+
+    await transport.send(ERROR_ENVELOPE);
+    await transport.flush();
+    expect(customFetch).toHaveBeenCalledTimes(1);
+  });
 });

From 2f8a03958402bb614e4dd3c881843c2a7a4a9e12 Mon Sep 17 00:00:00 2001
From: Rola Abuhasna <rola.abuhasna@sentry.io>
Date: Mon, 1 Dec 2025 11:25:29 +0100
Subject: [PATCH 142/186] fix(cloudflare): Keep http root span alive until
 streaming responses are consumed (#18087)

Fixes:
https://linear.app/getsentry/issue/JS-1103/spans-are-not-flushed-to-dashboard-when-using-streamtext-with-vercel

The Cloudflare request wrapper was ending the root HTTP span immediately
when the handler returned a streaming Response (e.g.
`result.toTextStreamResponse()`). Since Vercel AI child spans only
finish after the stream is consumed by the client, they were filtered
out by Sentry's `isFullFinishedSpan` check, resulting in transactions
with 0 spans.

--------------

This PR implements a streaming response detection and handles this from
within the http handler:

1. Created `classifyResponseStreaming()` helper
- Detects streaming vs non streaming, via Content-Type (SSE),
Content-Length

2. Updated request wrapper
- Changed from `startSpan()` to `startSpanManual()` for manual span
control
   - Monitors streaming response consumption in background
   - Ends root span only after stream fully consumed by client
---
 packages/cloudflare/src/request.ts            | 87 ++++++++++++++-----
 packages/cloudflare/src/utils/streaming.ts    | 41 +++++++++
 .../cloudflare/test/durableobject.test.ts     | 34 ++++++--
 packages/cloudflare/test/handler.test.ts      |  6 +-
 packages/cloudflare/test/pages-plugin.test.ts |  4 +-
 packages/cloudflare/test/request.test.ts      | 50 +++++++++--
 6 files changed, 189 insertions(+), 33 deletions(-)
 create mode 100644 packages/cloudflare/src/utils/streaming.ts

diff --git a/packages/cloudflare/src/request.ts b/packages/cloudflare/src/request.ts
index bd79cd65fc59..20706e8b9146 100644
--- a/packages/cloudflare/src/request.ts
+++ b/packages/cloudflare/src/request.ts
@@ -8,13 +8,14 @@ import {
   parseStringToURLObject,
   SEMANTIC_ATTRIBUTE_SENTRY_OP,
   setHttpStatus,
-  startSpan,
+  startSpanManual,
   winterCGHeadersToDict,
   withIsolationScope,
 } from '@sentry/core';
 import type { CloudflareOptions } from './client';
 import { addCloudResourceContext, addCultureContext, addRequest } from './scope-utils';
 import { init } from './sdk';
+import { classifyResponseStreaming } from './utils/streaming';
 
 interface RequestHandlerWrapperOptions {
   options: CloudflareOptions;
@@ -97,30 +98,76 @@ export function wrapRequestHandler(
         // Note: This span will not have a duration unless I/O happens in the handler. This is
         // because of how the cloudflare workers runtime works.
         // See: https://developers.cloudflare.com/workers/runtime-apis/performance/
-        return startSpan(
-          {
-            name,
-            attributes,
-          },
-          async span => {
+
+        // Use startSpanManual to control when span ends (needed for streaming responses)
+        return startSpanManual({ name, attributes }, async span => {
+          let res: Response;
+
+          try {
+            res = await handler();
+            setHttpStatus(span, res.status);
+
+            // After the handler runs, the span name might have been updated by nested instrumentation
+            // (e.g., Remix parameterizing routes). The span should already have the correct name
+            // from that instrumentation, so we don't need to do anything here.
+          } catch (e) {
+            span.end();
+            if (captureErrors) {
+              captureException(e, { mechanism: { handled: false, type: 'auto.http.cloudflare' } });
+            }
+            waitUntil?.(flush(2000));
+            throw e;
+          }
+
+          // Classify response to detect actual streaming
+          const classification = classifyResponseStreaming(res);
+
+          if (classification.isStreaming && res.body) {
+            // Streaming response detected - monitor consumption to keep span alive
             try {
-              const res = await handler();
-              setHttpStatus(span, res.status);
+              const [clientStream, monitorStream] = res.body.tee();
 
-              // After the handler runs, the span name might have been updated by nested instrumentation
-              // (e.g., Remix parameterizing routes). The span should already have the correct name
-              // from that instrumentation, so we don't need to do anything here.
-              return res;
+              // Monitor stream consumption and end span when complete
+              const streamMonitor = (async () => {
+                const reader = monitorStream.getReader();
+
+                try {
+                  let done = false;
+                  while (!done) {
+                    const result = await reader.read();
+                    done = result.done;
+                  }
+                } catch {
+                  // Stream error or cancellation - will end span in finally
+                } finally {
+                  reader.releaseLock();
+                  span.end();
+                  waitUntil?.(flush(2000));
+                }
+              })();
+
+              // Keep worker alive until stream monitoring completes (otherwise span won't end)
+              waitUntil?.(streamMonitor);
+
+              // Return response with client stream
+              return new Response(clientStream, {
+                status: res.status,
+                statusText: res.statusText,
+                headers: res.headers,
+              });
             } catch (e) {
-              if (captureErrors) {
-                captureException(e, { mechanism: { handled: false, type: 'auto.http.cloudflare' } });
-              }
-              throw e;
-            } finally {
+              // tee() failed (e.g stream already locked) - fall back to non-streaming handling
+              span.end();
               waitUntil?.(flush(2000));
+              return res;
             }
-          },
-        );
+          }
+
+          // Non-streaming response - end span immediately and return original
+          span.end();
+          waitUntil?.(flush(2000));
+          return res;
+        });
       },
     );
   });
diff --git a/packages/cloudflare/src/utils/streaming.ts b/packages/cloudflare/src/utils/streaming.ts
new file mode 100644
index 000000000000..fee67cbb9f2a
--- /dev/null
+++ b/packages/cloudflare/src/utils/streaming.ts
@@ -0,0 +1,41 @@
+export type StreamingGuess = {
+  isStreaming: boolean;
+};
+
+/**
+ * Classifies a Response as streaming or non-streaming.
+ *
+ * Heuristics:
+ * - No body → not streaming
+ * - Known streaming Content-Types → streaming (SSE, NDJSON, JSON streaming)
+ * - text/plain without Content-Length → streaming (some AI APIs)
+ * - Otherwise → not streaming (conservative default, including HTML/SSR)
+ *
+ * We avoid probing the stream to prevent blocking on transform streams (like injectTraceMetaTags)
+ * or SSR streams that may not have data ready immediately.
+ */
+export function classifyResponseStreaming(res: Response): StreamingGuess {
+  if (!res.body) {
+    return { isStreaming: false };
+  }
+
+  const contentType = res.headers.get('content-type') ?? '';
+  const contentLength = res.headers.get('content-length');
+
+  // Streaming: Known streaming content types
+  // - text/event-stream: Server-Sent Events (Vercel AI SDK, real-time APIs)
+  // - application/x-ndjson, application/ndjson: Newline-delimited JSON
+  // - application/stream+json: JSON streaming
+  // - text/plain (without Content-Length): Some AI APIs use this for streaming text
+  if (
+    /^text\/event-stream\b/i.test(contentType) ||
+    /^application\/(x-)?ndjson\b/i.test(contentType) ||
+    /^application\/stream\+json\b/i.test(contentType) ||
+    (/^text\/plain\b/i.test(contentType) && !contentLength)
+  ) {
+    return { isStreaming: true };
+  }
+
+  // Default: treat as non-streaming
+  return { isStreaming: false };
+}
diff --git a/packages/cloudflare/test/durableobject.test.ts b/packages/cloudflare/test/durableobject.test.ts
index 4d9e2a20fe97..d665abf95c86 100644
--- a/packages/cloudflare/test/durableobject.test.ts
+++ b/packages/cloudflare/test/durableobject.test.ts
@@ -116,11 +116,18 @@ describe('instrumentDurableObjectWithSentry', () => {
   });
 
   it('flush performs after all waitUntil promises are finished', async () => {
+    // Spy on Client.prototype.flush and mock it to resolve immediately to avoid timeout issues with fake timers
+    const flush = vi.spyOn(SentryCore.Client.prototype, 'flush').mockResolvedValue(true);
     vi.useFakeTimers();
     onTestFinished(() => {
       vi.useRealTimers();
     });
-    const flush = vi.spyOn(SentryCore.Client.prototype, 'flush');
+
+    // Measure delta instead of absolute call count to avoid interference from parallel tests.
+    // Since we spy on the prototype, other tests running in parallel may also call flush.
+    // By measuring before/after, we only verify that THIS test triggered exactly one flush call.
+    const before = flush.mock.calls.length;
+
     const waitUntil = vi.fn();
     const testClass = vi.fn(context => ({
       fetch: () => {
@@ -133,12 +140,29 @@ describe('instrumentDurableObjectWithSentry', () => {
       waitUntil,
     } as unknown as ExecutionContext;
     const dObject: any = Reflect.construct(instrumented, [context, {} as any]);
-    expect(() => dObject.fetch(new Request('https://example.com'))).not.toThrow();
-    expect(flush).not.toBeCalled();
-    expect(waitUntil).toHaveBeenCalledOnce();
+
+    // Call fetch (don't await yet)
+    const responsePromise = dObject.fetch(new Request('https://example.com'));
+
+    // Advance past classification timeout and get response
+    vi.advanceTimersByTime(30);
+    const response = await responsePromise;
+
+    // Consume response (triggers span end for buffered responses)
+    await response.text();
+
+    // The flush should now be queued in waitUntil
+    expect(waitUntil).toHaveBeenCalled();
+
+    // Advance to trigger the setTimeout in the handler's waitUntil
     vi.advanceTimersToNextTimer();
     await Promise.all(waitUntil.mock.calls.map(([p]) => p));
-    expect(flush).toBeCalled();
+
+    const after = flush.mock.calls.length;
+    const delta = after - before;
+
+    // Verify that exactly one flush call was made during this test
+    expect(delta).toBe(1);
   });
 
   describe('instrumentPrototypeMethods option', () => {
diff --git a/packages/cloudflare/test/handler.test.ts b/packages/cloudflare/test/handler.test.ts
index 7768689ffc48..15fa3effcd7f 100644
--- a/packages/cloudflare/test/handler.test.ts
+++ b/packages/cloudflare/test/handler.test.ts
@@ -72,7 +72,11 @@ describe('withSentry', () => {
         createMockExecutionContext(),
       );
 
-      expect(result).toBe(response);
+      // Response may be wrapped for streaming detection, verify content
+      expect(result?.status).toBe(response.status);
+      if (result) {
+        expect(await result.text()).toBe('test');
+      }
     });
 
     test('merges options from env and callback', async () => {
diff --git a/packages/cloudflare/test/pages-plugin.test.ts b/packages/cloudflare/test/pages-plugin.test.ts
index 5cfbd1f4bb5e..7f70ac7de098 100644
--- a/packages/cloudflare/test/pages-plugin.test.ts
+++ b/packages/cloudflare/test/pages-plugin.test.ts
@@ -52,6 +52,8 @@ describe('sentryPagesPlugin', () => {
       pluginArgs: MOCK_OPTIONS,
     });
 
-    expect(result).toBe(response);
+    // Response may be wrapped for streaming detection, verify content
+    expect(result.status).toBe(response.status);
+    expect(await result.text()).toBe('test');
   });
 });
diff --git a/packages/cloudflare/test/request.test.ts b/packages/cloudflare/test/request.test.ts
index d6d0de5824a1..94b5d89e4ae0 100644
--- a/packages/cloudflare/test/request.test.ts
+++ b/packages/cloudflare/test/request.test.ts
@@ -33,7 +33,9 @@ describe('withSentry', () => {
       { options: MOCK_OPTIONS, request: new Request('https://example.com'), context: createMockExecutionContext() },
       () => response,
     );
-    expect(result).toBe(response);
+    // Response may be wrapped for streaming detection, verify content matches
+    expect(result.status).toBe(response.status);
+    expect(await result.text()).toBe('test');
   });
 
   test('flushes the event after the handler is done using the cloudflare context.waitUntil', async () => {
@@ -48,6 +50,25 @@ describe('withSentry', () => {
     expect(waitUntilSpy).toHaveBeenLastCalledWith(expect.any(Promise));
   });
 
+  test('handles streaming responses correctly', async () => {
+    const stream = new ReadableStream({
+      start(controller) {
+        controller.enqueue(new TextEncoder().encode('chunk1'));
+        controller.enqueue(new TextEncoder().encode('chunk2'));
+        controller.close();
+      },
+    });
+    const streamingResponse = new Response(stream);
+
+    const result = await wrapRequestHandler(
+      { options: MOCK_OPTIONS, request: new Request('https://example.com'), context: createMockExecutionContext() },
+      () => streamingResponse,
+    );
+
+    const text = await result.text();
+    expect(text).toBe('chunk1chunk2');
+  });
+
   test("doesn't error if context is undefined", () => {
     expect(() =>
       wrapRequestHandler(
@@ -69,11 +90,18 @@ describe('withSentry', () => {
   });
 
   test('flush must be called when all waitUntil are done', async () => {
-    const flush = vi.spyOn(SentryCore.Client.prototype, 'flush');
+    // Spy on Client.prototype.flush and mock it to resolve immediately to avoid timeout issues with fake timers
+    const flushSpy = vi.spyOn(SentryCore.Client.prototype, 'flush').mockResolvedValue(true);
     vi.useFakeTimers();
     onTestFinished(() => {
       vi.useRealTimers();
     });
+
+    // Measure delta instead of absolute call count to avoid interference from parallel tests.
+    // Since we spy on the prototype, other tests running in parallel may also call flush.
+    // By measuring before/after, we only verify that THIS test triggered exactly one flush call.
+    const before = flushSpy.mock.calls.length;
+
     const waits: Promise<unknown>[] = [];
     const waitUntil = vi.fn(promise => waits.push(promise));
 
@@ -83,13 +111,20 @@ describe('withSentry', () => {
 
     await wrapRequestHandler({ options: MOCK_OPTIONS, request: new Request('https://example.com'), context }, () => {
       addDelayedWaitUntil(context);
-      return new Response('test');
+      const response = new Response('test');
+      // Add Content-Length to skip probing
+      response.headers.set('content-length', '4');
+      return response;
     });
-    expect(flush).not.toBeCalled();
     expect(waitUntil).toBeCalled();
-    vi.advanceTimersToNextTimerAsync().then(() => vi.runAllTimers());
+    vi.advanceTimersToNextTimer().runAllTimers();
     await Promise.all(waits);
-    expect(flush).toHaveBeenCalledOnce();
+
+    const after = flushSpy.mock.calls.length;
+    const delta = after - before;
+
+    // Verify that exactly one flush call was made during this test
+    expect(delta).toBe(1);
   });
 
   describe('scope instrumentation', () => {
@@ -303,6 +338,9 @@ describe('withSentry', () => {
         },
       );
 
+      // Wait for async span end and transaction capture
+      await new Promise(resolve => setTimeout(resolve, 50));
+
       expect(sentryEvent.transaction).toEqual('GET /');
       expect(sentryEvent.spans).toHaveLength(0);
       expect(sentryEvent.contexts?.trace).toEqual({

From db32055f0b075c83aec8a614dd86fb511d383f40 Mon Sep 17 00:00:00 2001
From: Andrei <168741329+andreiborza@users.noreply.github.com>
Date: Mon, 1 Dec 2025 17:48:21 +0100
Subject: [PATCH 143/186] fix(opentelemetry): Ensure Sentry spans don't leak
 when tracing is disabled (#18337)

Currently, when using Sentry alongside a custom OpenTelemetry setup, any
spans started via our Sentry.startSpanX apis leak into the OpenTelemetry
setup even if tracing is disabled.

This fix suppresses tracing for span creation via our startSpanX apis
but ensures tracing is not suppressed within the callback so that for
example custom OTel spans created within Sentry.startSpanX calls are not
suppresed.

I update the `node-otel-without-tracing` e2e tests to reflect that no
Sentry spans leak into the OTLP endpoint, as well as trying this out
locally with an express app and Jaeger.

**Before** the fix, Sentry span leaks:
<img width="2608" height="1578" alt="Screenshot 2025-11-24 at 20 35 21"
src="https://github.com/user-attachments/assets/45284aac-b9c1-423d-b199-c1c9273d1980"
/>
<img width="2608" height="1578" alt="Screenshot 2025-11-24 at 20 34 53"
src="https://github.com/user-attachments/assets/ff1929e6-a195-4e4e-a45b-5bddf49a1c25"
/>
<hr>

**After** the fix, no Sentry span leakage
<img width="2608" height="1578" alt="Screenshot 2025-11-24 at 20 28 22"
src="https://github.com/user-attachments/assets/e6584c01-30ef-40f2-87bf-33ac1d81e302"
/>
<img width="2608" height="1578" alt="Screenshot 2025-11-24 at 20 28 32"
src="https://github.com/user-attachments/assets/4388bb01-9f7b-48ab-8bb4-c7129075c89c"
/>

Closes: #17826
---
 .../node-otel-without-tracing/package.json    |   1 +
 .../node-otel-without-tracing/src/app.ts      |  28 +++++
 .../src/instrument.ts                         |   1 +
 .../tests/logs.test.ts                        |  42 ++++++++
 .../tests/transactions.test.ts                | 102 +++++++++++-------
 .../suites/pino/instrument-auto-off.mjs       |   1 +
 .../suites/pino/instrument.mjs                |   1 +
 .../suites/pino/test.ts                       |   4 +
 packages/opentelemetry/src/trace.ts           | 101 ++++++++++-------
 packages/opentelemetry/test/trace.test.ts     |  49 +++++++++
 10 files changed, 248 insertions(+), 82 deletions(-)
 create mode 100644 dev-packages/e2e-tests/test-applications/node-otel-without-tracing/tests/logs.test.ts

diff --git a/dev-packages/e2e-tests/test-applications/node-otel-without-tracing/package.json b/dev-packages/e2e-tests/test-applications/node-otel-without-tracing/package.json
index fc153ddceeb8..736fdb9dfc33 100644
--- a/dev-packages/e2e-tests/test-applications/node-otel-without-tracing/package.json
+++ b/dev-packages/e2e-tests/test-applications/node-otel-without-tracing/package.json
@@ -11,6 +11,7 @@
     "test:assert": "pnpm test"
   },
   "dependencies": {
+    "@opentelemetry/api": "1.9.0",
     "@opentelemetry/sdk-trace-node": "2.2.0",
     "@opentelemetry/exporter-trace-otlp-http": "0.208.0",
     "@opentelemetry/instrumentation-undici": "0.13.2",
diff --git a/dev-packages/e2e-tests/test-applications/node-otel-without-tracing/src/app.ts b/dev-packages/e2e-tests/test-applications/node-otel-without-tracing/src/app.ts
index 383eaf1b4484..fff4754ed672 100644
--- a/dev-packages/e2e-tests/test-applications/node-otel-without-tracing/src/app.ts
+++ b/dev-packages/e2e-tests/test-applications/node-otel-without-tracing/src/app.ts
@@ -2,6 +2,7 @@ import './instrument';
 
 // Other imports below
 import * as Sentry from '@sentry/node';
+import { trace, type Span } from '@opentelemetry/api';
 import express from 'express';
 
 const app = express();
@@ -29,6 +30,23 @@ app.get('/test-transaction', function (req, res) {
   });
 });
 
+app.get('/test-only-if-parent', function (req, res) {
+  // Remove the HTTP span from the context to simulate no parent span
+  Sentry.withActiveSpan(null, () => {
+    // This should NOT create a span because onlyIfParent is true and there's no parent
+    Sentry.startSpan({ name: 'test-only-if-parent', onlyIfParent: true }, () => {
+      // This custom OTel span SHOULD be created and exported
+      // This tests that custom OTel spans aren't suppressed when onlyIfParent triggers
+      const customTracer = trace.getTracer('custom-tracer');
+      customTracer.startActiveSpan('custom-span-with-only-if-parent', (span: Span) => {
+        span.end();
+      });
+    });
+
+    res.send({});
+  });
+});
+
 app.get('/test-error', async function (req, res) {
   const exceptionId = Sentry.captureException(new Error('This is an error'));
 
@@ -44,6 +62,16 @@ app.get('/test-exception/:id', function (req, _res) {
   throw new Error(`This is an exception with id ${id}`);
 });
 
+app.get('/test-logs/:id', function (req, res) {
+  const id = req.params.id;
+
+  Sentry.startSpan({ name: `log-operation-${id}` }, () => {
+    Sentry.logger.info(`test-log-${id}`, { requestId: id });
+  });
+
+  res.send({ ok: true, id });
+});
+
 Sentry.setupExpressErrorHandler(app);
 
 app.use(function onError(err: unknown, req: any, res: any, next: any) {
diff --git a/dev-packages/e2e-tests/test-applications/node-otel-without-tracing/src/instrument.ts b/dev-packages/e2e-tests/test-applications/node-otel-without-tracing/src/instrument.ts
index b833af11ef83..96d2472be497 100644
--- a/dev-packages/e2e-tests/test-applications/node-otel-without-tracing/src/instrument.ts
+++ b/dev-packages/e2e-tests/test-applications/node-otel-without-tracing/src/instrument.ts
@@ -17,6 +17,7 @@ Sentry.init({
   // Tracing is completely disabled
   // Custom OTEL setup
   skipOpenTelemetrySetup: true,
+  enableLogs: true,
 });
 
 // Create and configure NodeTracerProvider
diff --git a/dev-packages/e2e-tests/test-applications/node-otel-without-tracing/tests/logs.test.ts b/dev-packages/e2e-tests/test-applications/node-otel-without-tracing/tests/logs.test.ts
new file mode 100644
index 000000000000..f9fa51e9d3dc
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/node-otel-without-tracing/tests/logs.test.ts
@@ -0,0 +1,42 @@
+import { expect, test } from '@playwright/test';
+import { waitForEnvelopeItem } from '@sentry-internal/test-utils';
+
+test('Logs from different requests have different trace IDs', async ({ baseURL }) => {
+  const logEnvelopePromise1 = waitForEnvelopeItem('node-otel-without-tracing', async envelopeItem => {
+    const [itemHeader, itemPayload] = envelopeItem;
+    if (itemHeader.type === 'log') {
+      const logItems = itemPayload as { items: Array<{ body: string; trace_id?: string }> };
+      return logItems.items.some(item => item.body === 'test-log-1');
+    }
+    return false;
+  });
+
+  const logEnvelopePromise2 = waitForEnvelopeItem('node-otel-without-tracing', async envelopeItem => {
+    const [itemHeader, itemPayload] = envelopeItem;
+    if (itemHeader.type === 'log') {
+      const logItems = itemPayload as { items: Array<{ body: string; trace_id?: string }> };
+      return logItems.items.some(item => item.body === 'test-log-2');
+    }
+    return false;
+  });
+
+  // Make two requests to different routes (each Express route is an isolation scope)
+  await fetch(`${baseURL}/test-logs/1`);
+  await fetch(`${baseURL}/test-logs/2`);
+
+  const logEnvelope1 = await logEnvelopePromise1;
+  const logEnvelope2 = await logEnvelopePromise2;
+
+  const logPayload1 = logEnvelope1[1] as { items: Array<{ body: string; trace_id?: string }> };
+  const logPayload2 = logEnvelope2[1] as { items: Array<{ body: string; trace_id?: string }> };
+
+  const log1 = logPayload1.items.find(item => item.body === 'test-log-1');
+  const log2 = logPayload2.items.find(item => item.body === 'test-log-2');
+
+  const traceId1 = log1?.trace_id;
+  const traceId2 = log2?.trace_id;
+
+  expect(traceId1).toMatch(/[a-f0-9]{32}/);
+  expect(traceId2).toMatch(/[a-f0-9]{32}/);
+  expect(traceId1).not.toBe(traceId2);
+});
diff --git a/dev-packages/e2e-tests/test-applications/node-otel-without-tracing/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/node-otel-without-tracing/tests/transactions.test.ts
index 26c9d7de5496..00ba1a079b78 100644
--- a/dev-packages/e2e-tests/test-applications/node-otel-without-tracing/tests/transactions.test.ts
+++ b/dev-packages/e2e-tests/test-applications/node-otel-without-tracing/tests/transactions.test.ts
@@ -34,10 +34,10 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
   const scopeSpans = json.resourceSpans?.[0]?.scopeSpans;
   expect(scopeSpans).toBeDefined();
 
-  // Http server span & undici client spans are emitted,
-  // as well as the spans emitted via `Sentry.startSpan()`
-  // But our default node-fetch spans are not emitted
-  expect(scopeSpans.length).toEqual(3);
+  // Http server span & undici client spans are emitted.
+  // Sentry.startSpan() spans are NOT emitted (non-recording when tracing is disabled).
+  // Our default node-fetch spans are also not emitted.
+  expect(scopeSpans.length).toEqual(2);
 
   const httpScopes = scopeSpans?.filter(scopeSpan => scopeSpan.scope.name === '@opentelemetry/instrumentation-http');
   const undiciScopes = scopeSpans?.filter(
@@ -47,43 +47,8 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
 
   expect(httpScopes.length).toBe(1);
 
-  expect(startSpanScopes.length).toBe(1);
-  expect(startSpanScopes[0].spans.length).toBe(2);
-  expect(startSpanScopes[0].spans).toEqual([
-    {
-      traceId: expect.any(String),
-      spanId: expect.any(String),
-      parentSpanId: expect.any(String),
-      name: 'test-span',
-      kind: 1,
-      startTimeUnixNano: expect.any(String),
-      endTimeUnixNano: expect.any(String),
-      attributes: [],
-      droppedAttributesCount: 0,
-      events: [],
-      droppedEventsCount: 0,
-      status: { code: 0 },
-      links: [],
-      droppedLinksCount: 0,
-      flags: expect.any(Number),
-    },
-    {
-      traceId: expect.any(String),
-      spanId: expect.any(String),
-      name: 'test-transaction',
-      kind: 1,
-      startTimeUnixNano: expect.any(String),
-      endTimeUnixNano: expect.any(String),
-      attributes: [{ key: 'sentry.op', value: { stringValue: 'e2e-test' } }],
-      droppedAttributesCount: 0,
-      events: [],
-      droppedEventsCount: 0,
-      status: { code: 0 },
-      links: [],
-      droppedLinksCount: 0,
-      flags: expect.any(Number),
-    },
-  ]);
+  // Sentry spans should not be exported when tracing is disabled
+  expect(startSpanScopes.length).toBe(0);
 
   // Undici spans are emitted correctly
   expect(undiciScopes.length).toBe(1);
@@ -164,3 +129,58 @@ test('Sends an API route transaction to OTLP', async ({ baseURL }) => {
     },
   ]);
 });
+
+test('Custom OTel spans work with onlyIfParent when no parent exists', async ({ baseURL }) => {
+  waitForTransaction('node-otel-without-tracing', transactionEvent => {
+    throw new Error('THIS SHOULD NEVER HAPPEN!');
+  });
+
+  // Ensure we send data to the OTLP endpoint
+  const otelPromise = waitForPlainRequest('node-otel-without-tracing-otel', data => {
+    const json = JSON.parse(data) as any;
+
+    const scopeSpans = json.resourceSpans?.[0]?.scopeSpans;
+
+    // Look for the custom span from our custom-tracer
+    const customScope = scopeSpans?.find(scopeSpan => scopeSpan.scope.name === 'custom-tracer');
+
+    return customScope && customScope.spans.some(span => span.name === 'custom-span-with-only-if-parent');
+  });
+
+  fetch(`${baseURL}/test-only-if-parent`);
+
+  const otelData = await otelPromise;
+
+  expect(otelData).toBeDefined();
+
+  const json = JSON.parse(otelData);
+  expect(json.resourceSpans.length).toBe(1);
+
+  const scopeSpans = json.resourceSpans?.[0]?.scopeSpans;
+  expect(scopeSpans).toBeDefined();
+
+  // Should have HTTP instrumentation span but NO Sentry span
+  const httpScopes = scopeSpans?.filter(scopeSpan => scopeSpan.scope.name === '@opentelemetry/instrumentation-http');
+  const sentryScopes = scopeSpans?.filter(scopeSpan => scopeSpan.scope.name === '@sentry/node');
+  const customScopes = scopeSpans?.filter(scopeSpan => scopeSpan.scope.name === 'custom-tracer');
+
+  // HTTP span exists (from the incoming request)
+  expect(httpScopes.length).toBe(1);
+
+  // Sentry span should NOT exist (onlyIfParent + no parent = suppressed)
+  expect(sentryScopes.length).toBe(0);
+
+  // Custom OTel span SHOULD exist (this is what we're testing - the fix ensures this works)
+  expect(customScopes.length).toBe(1);
+  expect(customScopes[0].spans.length).toBe(1);
+  expect(customScopes[0].spans[0]).toMatchObject({
+    name: 'custom-span-with-only-if-parent',
+    kind: 1,
+    status: { code: 0 },
+  });
+
+  // Verify the custom span is recording (not suppressed)
+  const customSpan = customScopes[0].spans[0];
+  expect(customSpan.spanId).not.toBe('0000000000000000');
+  expect(customSpan.traceId).not.toBe('00000000000000000000000000000000');
+});
diff --git a/dev-packages/node-integration-tests/suites/pino/instrument-auto-off.mjs b/dev-packages/node-integration-tests/suites/pino/instrument-auto-off.mjs
index d2a0408eebcd..1e72e58fb043 100644
--- a/dev-packages/node-integration-tests/suites/pino/instrument-auto-off.mjs
+++ b/dev-packages/node-integration-tests/suites/pino/instrument-auto-off.mjs
@@ -3,6 +3,7 @@ import * as Sentry from '@sentry/node';
 Sentry.init({
   dsn: process.env.SENTRY_DSN,
   release: '1.0',
+  tracesSampleRate: 1.0,
   enableLogs: true,
   integrations: [Sentry.pinoIntegration({ autoInstrument: false })],
 });
diff --git a/dev-packages/node-integration-tests/suites/pino/instrument.mjs b/dev-packages/node-integration-tests/suites/pino/instrument.mjs
index 2c09097de1f4..74d9f0e95119 100644
--- a/dev-packages/node-integration-tests/suites/pino/instrument.mjs
+++ b/dev-packages/node-integration-tests/suites/pino/instrument.mjs
@@ -3,6 +3,7 @@ import * as Sentry from '@sentry/node';
 Sentry.init({
   dsn: process.env.SENTRY_DSN,
   release: '1.0',
+  tracesSampleRate: 1.0,
   enableLogs: true,
   integrations: [Sentry.pinoIntegration({ error: { levels: ['error', 'fatal'] } })],
 });
diff --git a/dev-packages/node-integration-tests/suites/pino/test.ts b/dev-packages/node-integration-tests/suites/pino/test.ts
index a2ec57b57e56..21cd30bdef60 100644
--- a/dev-packages/node-integration-tests/suites/pino/test.ts
+++ b/dev-packages/node-integration-tests/suites/pino/test.ts
@@ -11,6 +11,7 @@ conditionalTest({ min: 20 })('Pino integration', () => {
       .withMockSentryServer()
       .withInstrument(instrumentPath)
       .ignore('event')
+      .ignore('transaction')
       .expect({
         log: log => {
           const traceId1 = log.items?.[0]?.trace_id;
@@ -28,6 +29,7 @@ conditionalTest({ min: 20 })('Pino integration', () => {
     await createRunner(__dirname, 'scenario.mjs')
       .withMockSentryServer()
       .withInstrument(instrumentPath)
+      .ignore('transaction')
       .expect({
         event: {
           exception: {
@@ -105,6 +107,7 @@ conditionalTest({ min: 20 })('Pino integration', () => {
     await createRunner(__dirname, 'scenario-next.mjs')
       .withMockSentryServer()
       .withInstrument(instrumentPath)
+      .ignore('transaction')
       .expect({
         event: {
           exception: {
@@ -182,6 +185,7 @@ conditionalTest({ min: 20 })('Pino integration', () => {
     await createRunner(__dirname, 'scenario-track.mjs')
       .withMockSentryServer()
       .withInstrument(instrumentPath)
+      .ignore('transaction')
       .expect({
         log: {
           items: [
diff --git a/packages/opentelemetry/src/trace.ts b/packages/opentelemetry/src/trace.ts
index c30377fe7763..a640841cd3d4 100644
--- a/packages/opentelemetry/src/trace.ts
+++ b/packages/opentelemetry/src/trace.ts
@@ -1,6 +1,6 @@
 import type { Context, Span, SpanContext, SpanOptions, Tracer } from '@opentelemetry/api';
 import { context, SpanStatusCode, trace, TraceFlags } from '@opentelemetry/api';
-import { suppressTracing } from '@opentelemetry/core';
+import { isTracingSuppressed, suppressTracing } from '@opentelemetry/core';
 import type {
   Client,
   continueTrace as baseContinueTrace,
@@ -17,6 +17,7 @@ import {
   getRootSpan,
   getTraceContextFromScope,
   handleCallbackErrors,
+  hasSpansEnabled,
   SDK_VERSION,
   SEMANTIC_ATTRIBUTE_SENTRY_OP,
   spanToJSON,
@@ -29,16 +30,12 @@ import { getSamplingDecision } from './utils/getSamplingDecision';
 import { makeTraceState } from './utils/makeTraceState';
 
 /**
- * Wraps a function with a transaction/span and finishes the span after the function is done.
- * The created span is the active span and will be used as parent by other spans created inside the function
- * and can be accessed via `Sentry.getActiveSpan()`, as long as the function is executed while the scope is active.
- *
- * If you want to create a span that is not set as active, use {@link startInactiveSpan}.
- *
- * You'll always get a span passed to the callback,
- * it may just be a non-recording span if the span is not sampled or if tracing is disabled.
+ * Internal helper for starting spans and manual spans. See {@link startSpan} and {@link startSpanManual} for the public APIs.
+ * @param options - The span context options
+ * @param callback - The callback to execute with the span
+ * @param autoEnd - Whether to automatically end the span after the callback completes
  */
-export function startSpan<T>(options: OpenTelemetrySpanContext, callback: (span: Span) => T): T {
+function _startSpan<T>(options: OpenTelemetrySpanContext, callback: (span: Span) => T, autoEnd: boolean): T {
   const tracer = getTracer();
 
   const { name, parentSpan: customParentSpan } = options;
@@ -53,6 +50,37 @@ export function startSpan<T>(options: OpenTelemetrySpanContext, callback: (span:
 
     const spanOptions = getSpanOptions(options);
 
+    // If spans are not enabled, ensure we suppress tracing for the span creation
+    // but preserve the original context for the callback execution
+    // This ensures that we don't create spans when tracing is disabled which
+    // would otherwise be a problem for users that don't enable tracing but use
+    // custom OpenTelemetry setups.
+    if (!hasSpansEnabled()) {
+      const suppressedCtx = isTracingSuppressed(ctx) ? ctx : suppressTracing(ctx);
+
+      return context.with(suppressedCtx, () => {
+        return tracer.startActiveSpan(name, spanOptions, suppressedCtx, span => {
+          // Restore the original unsuppressed context for the callback execution
+          // so that custom OpenTelemetry spans maintain the correct context.
+          // We use activeCtx (not ctx) because ctx may be suppressed when onlyIfParent is true
+          // and no parent span exists. Using activeCtx ensures custom OTel spans are never
+          // inadvertently suppressed.
+          return context.with(activeCtx, () => {
+            return handleCallbackErrors(
+              () => callback(span),
+              () => {
+                // Only set the span status to ERROR when there wasn't any status set before, in order to avoid stomping useful span statuses
+                if (spanToJSON(span).status === undefined) {
+                  span.setStatus({ code: SpanStatusCode.ERROR });
+                }
+              },
+              autoEnd ? () => span.end() : undefined,
+            );
+          });
+        });
+      });
+    }
+
     return tracer.startActiveSpan(name, spanOptions, ctx, span => {
       return handleCallbackErrors(
         () => callback(span),
@@ -62,15 +90,29 @@ export function startSpan<T>(options: OpenTelemetrySpanContext, callback: (span:
             span.setStatus({ code: SpanStatusCode.ERROR });
           }
         },
-        () => span.end(),
+        autoEnd ? () => span.end() : undefined,
       );
     });
   });
 }
 
+/**
+ * Wraps a function with a transaction/span and finishes the span after the function is done.
+ * The created span is the active span and will be used as parent by other spans created inside the function
+ * and can be accessed via `Sentry.getActiveSpan()`, as long as the function is executed while the scope is active.
+ *
+ * If you want to create a span that is not set as active, use {@link startInactiveSpan}.
+ *
+ * You'll always get a span passed to the callback,
+ * it may just be a non-recording span if the span is not sampled or if tracing is disabled.
+ */
+export function startSpan<T>(options: OpenTelemetrySpanContext, callback: (span: Span) => T): T {
+  return _startSpan(options, callback, true);
+}
+
 /**
  * Similar to `Sentry.startSpan`. Wraps a function with a span, but does not finish the span
- * after the function is done automatically. You'll have to call `span.end()` manually.
+ * after the function is done automatically. You'll have to call `span.end()` or the `finish` function passed to the callback manually.
  *
  * The created span is the active span and will be used as parent by other spans created inside the function
  * and can be accessed via `Sentry.getActiveSpan()`, as long as the function is executed while the scope is active.
@@ -82,32 +124,7 @@ export function startSpanManual<T>(
   options: OpenTelemetrySpanContext,
   callback: (span: Span, finish: () => void) => T,
 ): T {
-  const tracer = getTracer();
-
-  const { name, parentSpan: customParentSpan } = options;
-
-  // If `options.parentSpan` is defined, we want to wrap the callback in `withActiveSpan`
-  const wrapper = getActiveSpanWrapper<T>(customParentSpan);
-
-  return wrapper(() => {
-    const activeCtx = getContext(options.scope, options.forceTransaction);
-    const shouldSkipSpan = options.onlyIfParent && !trace.getSpan(activeCtx);
-    const ctx = shouldSkipSpan ? suppressTracing(activeCtx) : activeCtx;
-
-    const spanOptions = getSpanOptions(options);
-
-    return tracer.startActiveSpan(name, spanOptions, ctx, span => {
-      return handleCallbackErrors(
-        () => callback(span, () => span.end()),
-        () => {
-          // Only set the span status to ERROR when there wasn't any status set before, in order to avoid stomping useful span statuses
-          if (spanToJSON(span).status === undefined) {
-            span.setStatus({ code: SpanStatusCode.ERROR });
-          }
-        },
-      );
-    });
-  });
+  return _startSpan(options, span => callback(span, () => span.end()), false);
 }
 
 /**
@@ -130,13 +147,15 @@ export function startInactiveSpan(options: OpenTelemetrySpanContext): Span {
   return wrapper(() => {
     const activeCtx = getContext(options.scope, options.forceTransaction);
     const shouldSkipSpan = options.onlyIfParent && !trace.getSpan(activeCtx);
-    const ctx = shouldSkipSpan ? suppressTracing(activeCtx) : activeCtx;
+    let ctx = shouldSkipSpan ? suppressTracing(activeCtx) : activeCtx;
 
     const spanOptions = getSpanOptions(options);
 
-    const span = tracer.startSpan(name, spanOptions, ctx);
+    if (!hasSpansEnabled()) {
+      ctx = isTracingSuppressed(ctx) ? ctx : suppressTracing(ctx);
+    }
 
-    return span;
+    return tracer.startSpan(name, spanOptions, ctx);
   });
 }
 
diff --git a/packages/opentelemetry/test/trace.test.ts b/packages/opentelemetry/test/trace.test.ts
index 173bd6359a5f..1bb1f2634839 100644
--- a/packages/opentelemetry/test/trace.test.ts
+++ b/packages/opentelemetry/test/trace.test.ts
@@ -1388,6 +1388,55 @@ describe('trace (tracing disabled)', () => {
   });
 });
 
+describe('trace (spans disabled)', () => {
+  beforeEach(() => {
+    // Initialize SDK without any tracing configuration (no tracesSampleRate or tracesSampler)
+    mockSdkInit({ tracesSampleRate: undefined, tracesSampler: undefined });
+  });
+
+  afterEach(async () => {
+    await cleanupOtel();
+  });
+
+  it('startSpan creates non-recording spans when hasSpansEnabled() === false', () => {
+    const val = startSpan({ name: 'outer' }, outerSpan => {
+      expect(outerSpan).toBeDefined();
+      expect(outerSpan.isRecording()).toBe(false);
+
+      // Nested spans should also be non-recording
+      return startSpan({ name: 'inner' }, innerSpan => {
+        expect(innerSpan).toBeDefined();
+        expect(innerSpan.isRecording()).toBe(false);
+        return 'test value';
+      });
+    });
+
+    expect(val).toEqual('test value');
+  });
+
+  it('startSpanManual creates non-recording spans when hasSpansEnabled() === false', () => {
+    const val = startSpanManual({ name: 'outer' }, outerSpan => {
+      expect(outerSpan).toBeDefined();
+      expect(outerSpan.isRecording()).toBe(false);
+
+      return startSpanManual({ name: 'inner' }, innerSpan => {
+        expect(innerSpan).toBeDefined();
+        expect(innerSpan.isRecording()).toBe(false);
+        return 'test value';
+      });
+    });
+
+    expect(val).toEqual('test value');
+  });
+
+  it('startInactiveSpan returns non-recording spans when hasSpansEnabled() === false', () => {
+    const span = startInactiveSpan({ name: 'test' });
+
+    expect(span).toBeDefined();
+    expect(span.isRecording()).toBe(false);
+  });
+});
+
 describe('trace (sampling)', () => {
   afterEach(async () => {
     await cleanupOtel();

From cabb611d3af74a4cb5f9ef3f562d0564cc652e77 Mon Sep 17 00:00:00 2001
From: Andrei <168741329+andreiborza@users.noreply.github.com>
Date: Mon, 1 Dec 2025 22:02:59 +0100
Subject: [PATCH 144/186] chore(ci): Add action to track all PRs as issues
 (#18363)

This workflow checks PR descriptions (like this one) to see if it can
find an associated GitHub or Linear issue ID. If nothing is found, the
workflow will create a new GitHub Issue which will then be referenced in
this PR. As all other GitHub issues, this newly created one will then be
synced to Linear as well.

This will increase visibility of (community) PRs in external tools like
Linear.

Based on: https://github.com/getsentry/sentry-cocoa/pull/6064 by
@stephanie-anderson

Closes #18364
---
 .../create-issue-for-unreferenced-prs.yml     | 115 ++++++++++++++++++
 1 file changed, 115 insertions(+)
 create mode 100644 .github/workflows/create-issue-for-unreferenced-prs.yml

diff --git a/.github/workflows/create-issue-for-unreferenced-prs.yml b/.github/workflows/create-issue-for-unreferenced-prs.yml
new file mode 100644
index 000000000000..1fa5d659fbb4
--- /dev/null
+++ b/.github/workflows/create-issue-for-unreferenced-prs.yml
@@ -0,0 +1,115 @@
+# This GitHub Action workflow checks if a new or updated pull request
+# references a GitHub issue in its title or body. If no reference is found,
+# it automatically creates a new issue. This helps ensure all work is
+# tracked, especially when syncing with tools like Linear.
+
+name: Create issue for unreferenced PR
+
+# This action triggers on pull request events
+on:
+  pull_request:
+    types: [opened, edited, reopened, synchronize, ready_for_review]
+
+# Cancel in progress workflows on pull_requests.
+# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  check_for_issue_reference:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check PR Body and Title for Issue Reference
+        uses: actions/github-script@v8
+        with:
+          script: |
+            const pr = context.payload.pull_request;
+            if (!pr) {
+              core.setFailed('Could not get PR from context.');
+              return;
+            }
+
+            // Don't create an issue for draft PRs
+            if (pr.draft) {
+              console.log(`PR #${pr.number} is a draft, skipping issue creation.`);
+              return;
+            }
+
+            // Check if the PR is already approved
+            const reviewsResponse = await github.rest.pulls.listReviews({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: pr.number,
+            });
+
+            if (reviewsResponse.data.some(review => review.state === 'APPROVED')) {
+              console.log(`PR #${pr.number} is already approved, skipping issue creation.`);
+              return;
+            }
+
+            const prBody = pr.body || '';
+            const prTitle = pr.title || '';
+            const prAuthor = pr.user.login;
+            const prUrl = pr.html_url;
+            const prNumber = pr.number;
+
+            // Regex for GitHub issue references (e.g., #123, fixes #456)
+            const issueRegexGitHub = /(?:(?:close|closes|closed|fix|fixes|fixed|resolve|resolves|resolved):?\s*)?#\d+/i;
+
+            // Regex for Linear issue references (e.g., ENG-123, resolves ENG-456)
+            const issueRegexLinear = /(?:(?:close|closes|closed|fix|fixes|fixed|resolve|resolves|resolved):?\s*)?[A-Z]+-\d+/i;
+
+            const contentToCheck = `${prTitle} ${prBody}`;
+            const hasIssueReference = issueRegexGitHub.test(contentToCheck) || issueRegexLinear.test(contentToCheck);
+
+            if (hasIssueReference) {
+              console.log(`PR #${prNumber} contains a valid issue reference.`);
+              return;
+            }
+
+            // Check if there's already an issue created by this automation for this PR
+            // Search for issues that mention this PR and were created by github-actions bot
+            const existingIssuesResponse = await github.rest.search.issuesAndPullRequests({
+              q: `repo:${context.repo.owner}/${context.repo.repo} is:issue is:open author:app/github-actions "${prUrl}" in:title in:body`,
+            });
+
+            if (existingIssuesResponse.data.total_count > 0) {
+              const existingIssue = existingIssuesResponse.data.items[0];
+              console.log(`An issue (#${existingIssue.number}) already exists for PR #${prNumber}, skipping creation.`);
+              return;
+            }
+
+            core.warning(`PR #${prNumber} does not have an issue reference. Creating a new issue so it can be tracked in Linear.`);
+
+            // Construct the title and body for the new issue
+            const issueTitle = `${prTitle}`;
+            const issueBody = `> [!NOTE]
+            > The pull request "[${prTitle}](${prUrl})" was created by @${prAuthor} but did not reference an issue. Therefore this issue was created for better visibility in external tools like Linear.
+
+            ${prBody}
+            `;
+
+            // Create the issue using the GitHub API
+            const newIssue = await github.rest.issues.create({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              title: issueTitle,
+              body: issueBody,
+              assignees: [prAuthor]
+            });
+
+            const issueID = newIssue.data.number;
+            console.log(`Created issue #${issueID}.`);
+
+            // Update the PR body to reference the new issue
+            const updatedPrBody = `${prBody}\n\nCloses #${issueID}`;
+
+            await github.rest.pulls.update({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: prNumber,
+              body: updatedPrBody
+            });
+
+            console.log(`Updated PR #${prNumber} to reference newly created issue #${issueID}.`);

From 05f78b487fd634879686badfd967866f07b4d30c Mon Sep 17 00:00:00 2001
From: Max Kosty Maleyev <kosty.maleyev@sentry.io>
Date: Tue, 2 Dec 2025 02:09:14 -0800
Subject: [PATCH 145/186] feat(core): Make `matcher` parameter optional in
 `makeMultiplexedTransport` (#10798)

Hoping to reduce complexity for setting up micro-frontends routing.

Also: I suppose we could just make Matcher argument optional instead of
exporting a separate function... that may be a cleaner design

---------

Co-authored-by: Luca Forstner <luca.forstner@sentry.io>
Co-authored-by: Andrei Borza <andrei.borza@sentry.io>
---
 CHANGELOG.md                                  | 61 ++++++++++++++
 packages/browser/src/index.ts                 |  1 +
 packages/core/src/index.ts                    |  2 +-
 packages/core/src/transports/multiplexed.ts   | 28 ++++++-
 .../test/lib/transports/multiplexed.test.ts   | 81 ++++++++++++++++++-
 5 files changed, 169 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eeb05346b9d5..551223c6cc62 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,67 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+### Important Changes
+
+- **feat(core): Make `matcher` parameter optional in `makeMultiplexedTransport` ([#10798](https://github.com/getsentry/sentry-javascript/pull/10798))** .
+
+The `matcher` parameter in `makeMultiplexedTransport` is now optional with a sensible default. This makes it much easier to use the multiplexed transport for sending events to multiple DSNs based on runtime configuration.
+
+**Before:**
+
+```javascript
+import { makeFetchTransport, makeMultiplexedTransport } from '@sentry/browser';
+
+const EXTRA_KEY = 'ROUTE_TO';
+
+const transport = makeMultiplexedTransport(makeFetchTransport, args => {
+  const event = args.getEvent();
+  if (event?.extra?.[EXTRA_KEY] && Array.isArray(event.extra[EXTRA_KEY])) {
+    return event.extra[EXTRA_KEY];
+  }
+  return [];
+});
+
+Sentry.init({
+  transport,
+  // ... other options
+});
+
+// Capture events with routing info
+Sentry.captureException(error, {
+  extra: {
+    [EXTRA_KEY]: [
+      { dsn: 'https://key1@sentry.io/project1', release: 'v1.0.0' },
+      { dsn: 'https://key2@sentry.io/project2' },
+    ],
+  },
+});
+```
+
+**After:**
+
+```javascript
+import { makeFetchTransport, makeMultiplexedTransport, MULTIPLEXED_TRANSPORT_EXTRA_KEY } from '@sentry/browser';
+
+// Just pass the transport generator - the default matcher handles the rest!
+Sentry.init({
+  transport: makeMultiplexedTransport(makeFetchTransport),
+  // ... other options
+});
+
+// Capture events with routing info using the exported constant
+Sentry.captureException(error, {
+  extra: {
+    [MULTIPLEXED_TRANSPORT_EXTRA_KEY]: [
+      { dsn: 'https://key1@sentry.io/project1', release: 'v1.0.0' },
+      { dsn: 'https://key2@sentry.io/project2' },
+    ],
+  },
+});
+```
+
+The default matcher looks for routing information in `event.extra[MULTIPLEXED_TRANSPORT_EXTRA_KEY]`. You can still provide a custom matcher function for advanced use cases.
+
 - **feat(nextjs): Support cacheComponents on turbopack ([#18304](https://github.com/getsentry/sentry-javascript/pull/18304))**
 
 This release adds support for `cacheComponents` on turbopack builds. We are working on adding support for this feature in webpack builds as well.
diff --git a/packages/browser/src/index.ts b/packages/browser/src/index.ts
index 149068892f54..6e7c54198edc 100644
--- a/packages/browser/src/index.ts
+++ b/packages/browser/src/index.ts
@@ -57,6 +57,7 @@ export {
   getSpanStatusFromHttpCode,
   setHttpStatus,
   makeMultiplexedTransport,
+  MULTIPLEXED_TRANSPORT_EXTRA_KEY,
   moduleMetadataIntegration,
   supabaseIntegration,
   instrumentSupabaseClient,
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index 014a411d0265..387ba0aba4a2 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -54,7 +54,7 @@ export { ServerRuntimeClient } from './server-runtime-client';
 export { initAndBind, setCurrentClient } from './sdk';
 export { createTransport } from './transports/base';
 export { makeOfflineTransport } from './transports/offline';
-export { makeMultiplexedTransport } from './transports/multiplexed';
+export { makeMultiplexedTransport, MULTIPLEXED_TRANSPORT_EXTRA_KEY } from './transports/multiplexed';
 export { getIntegrationsToSetup, addIntegration, defineIntegration, installedIntegrations } from './integration';
 export {
   _INTERNAL_skipAiProviderWrapping,
diff --git a/packages/core/src/transports/multiplexed.ts b/packages/core/src/transports/multiplexed.ts
index 1b6d53ab0ae8..41426b4a5d5a 100644
--- a/packages/core/src/transports/multiplexed.ts
+++ b/packages/core/src/transports/multiplexed.ts
@@ -21,6 +21,12 @@ interface MatchParam {
 type RouteTo = { dsn: string; release: string };
 type Matcher = (param: MatchParam) => (string | RouteTo)[];
 
+/**
+ * Key used in event.extra to provide routing information for the multiplexed transport.
+ * Should contain an array of `{ dsn: string, release?: string }` objects.
+ */
+export const MULTIPLEXED_TRANSPORT_EXTRA_KEY = 'MULTIPLEXED_TRANSPORT_EXTRA_KEY';
+
 /**
  * Gets an event from an envelope.
  *
@@ -79,15 +85,33 @@ function overrideDsn(envelope: Envelope, dsn: string): Envelope {
 
 /**
  * Creates a transport that can send events to different DSNs depending on the envelope contents.
+ *
+ * If no matcher is provided, the transport will look for routing information in
+ * `event.extra[MULTIPLEXED_TRANSPORT_EXTRA_KEY]`, which should contain
+ * an array of `{ dsn: string, release?: string }` objects.
  */
 export function makeMultiplexedTransport<TO extends BaseTransportOptions>(
   createTransport: (options: TO) => Transport,
-  matcher: Matcher,
+  matcher?: Matcher,
 ): (options: TO) => Transport {
   return options => {
     const fallbackTransport = createTransport(options);
     const otherTransports: Map<string, Transport> = new Map();
 
+    // Use provided matcher or default to simple multiplexed transport behavior
+    const actualMatcher: Matcher =
+      matcher ||
+      (args => {
+        const event = args.getEvent();
+        if (
+          event?.extra?.[MULTIPLEXED_TRANSPORT_EXTRA_KEY] &&
+          Array.isArray(event.extra[MULTIPLEXED_TRANSPORT_EXTRA_KEY])
+        ) {
+          return event.extra[MULTIPLEXED_TRANSPORT_EXTRA_KEY];
+        }
+        return [];
+      });
+
     function getTransport(dsn: string, release: string | undefined): [string, Transport] | undefined {
       // We create a transport for every unique dsn/release combination as there may be code from multiple releases in
       // use at the same time
@@ -118,7 +142,7 @@ export function makeMultiplexedTransport<TO extends BaseTransportOptions>(
         return eventFromEnvelope(envelope, eventTypes);
       }
 
-      const transports = matcher({ envelope, getEvent })
+      const transports = actualMatcher({ envelope, getEvent })
         .map(result => {
           if (typeof result === 'string') {
             return getTransport(result, undefined);
diff --git a/packages/core/test/lib/transports/multiplexed.test.ts b/packages/core/test/lib/transports/multiplexed.test.ts
index f937f7e55ec4..105d54b17eea 100644
--- a/packages/core/test/lib/transports/multiplexed.test.ts
+++ b/packages/core/test/lib/transports/multiplexed.test.ts
@@ -8,7 +8,7 @@ import {
   makeMultiplexedTransport,
   parseEnvelope,
 } from '../../../src';
-import { eventFromEnvelope } from '../../../src/transports/multiplexed';
+import { eventFromEnvelope, MULTIPLEXED_TRANSPORT_EXTRA_KEY } from '../../../src/transports/multiplexed';
 import type { ClientReport } from '../../../src/types-hoist/clientreport';
 import type { Envelope, EventEnvelope, EventItem } from '../../../src/types-hoist/envelope';
 import type { TransactionEvent } from '../../../src/types-hoist/event';
@@ -242,3 +242,82 @@ describe('makeMultiplexedTransport', () => {
     await transport.send(TRANSACTION_ENVELOPE);
   });
 });
+
+describe('makeMultiplexedTransport() with default matcher', () => {
+  it('sends events to targets provided in event.extra[MULTIPLEXED_TRANSPORT_EXTRA_KEY]', async () => {
+    expect.assertions(2);
+
+    const makeTransport = makeMultiplexedTransport(
+      createTestTransport(
+        url => {
+          expect(url).toBe(DSN1_URL);
+        },
+        url => {
+          expect(url).toBe(DSN2_URL);
+        },
+      ),
+    );
+
+    const envelope = createEnvelope<EventEnvelope>({ event_id: 'aa3ff046696b4bc6b609ce6d28fde9e2', sent_at: '123' }, [
+      [
+        { type: 'event' },
+        {
+          event_id: 'aa3ff046696b4bc6b609ce6d28fde9e2',
+          extra: {
+            [MULTIPLEXED_TRANSPORT_EXTRA_KEY]: [DSN1, DSN2],
+          },
+        },
+      ] as EventItem,
+    ]);
+
+    const transport = makeTransport({ url: DSN1_URL, ...transportOptions });
+    await transport.send(envelope);
+  });
+
+  it('sends events to default DSN if event.extra[MULTIPLEXED_TRANSPORT_EXTRA_KEY] is not set', async () => {
+    expect.assertions(1);
+
+    const makeTransport = makeMultiplexedTransport(
+      createTestTransport(url => {
+        expect(url).toBe(DSN1_URL);
+      }),
+    );
+
+    const envelope = createEnvelope<EventEnvelope>({ event_id: 'aa3ff046696b4bc6b609ce6d28fde9e2', sent_at: '123' }, [
+      [
+        { type: 'event' },
+        {
+          event_id: 'aa3ff046696b4bc6b609ce6d28fde9e2',
+        },
+      ] as EventItem,
+    ]);
+
+    const transport = makeTransport({ url: DSN1_URL, ...transportOptions });
+    await transport.send(envelope);
+  });
+
+  it('sends events to default DSN if event.extra[MULTIPLEXED_TRANSPORT_EXTRA_KEY] is an empty array', async () => {
+    expect.assertions(1);
+
+    const makeTransport = makeMultiplexedTransport(
+      createTestTransport(url => {
+        expect(url).toBe(DSN1_URL);
+      }),
+    );
+
+    const envelope = createEnvelope<EventEnvelope>({ event_id: 'aa3ff046696b4bc6b609ce6d28fde9e2', sent_at: '123' }, [
+      [
+        { type: 'event' },
+        {
+          event_id: 'aa3ff046696b4bc6b609ce6d28fde9e2',
+          extra: {
+            [MULTIPLEXED_TRANSPORT_EXTRA_KEY]: [],
+          },
+        },
+      ] as EventItem,
+    ]);
+
+    const transport = makeTransport({ url: DSN1_URL, ...transportOptions });
+    await transport.send(envelope);
+  });
+});

From 81f942447bc0d122fc25010f0f1f98b182427768 Mon Sep 17 00:00:00 2001
From: Nicolas Hrubec <nico.hrubec@sentry.io>
Date: Tue, 2 Dec 2025 11:46:17 +0100
Subject: [PATCH 146/186] chore(tanstackstart-react): Export custom inits from
 tanstackstart-react (#18369)

Export custom inits to send correct metadata with data sent from the
SDK.

Closes #18366
---
 .../tanstackstart-react/src/client/index.ts   |  2 +
 .../tanstackstart-react/src/client/sdk.ts     | 20 +++++++++
 .../tanstackstart-react/src/server/index.ts   |  2 +
 .../tanstackstart-react/src/server/sdk.ts     | 17 +++++++
 .../test/client/sdk.test.ts                   | 45 +++++++++++++++++++
 .../test/server/sdk.test.ts                   | 42 +++++++++++++++++
 .../tanstackstart-react/test/temp.test.ts     |  7 ---
 7 files changed, 128 insertions(+), 7 deletions(-)
 create mode 100644 packages/tanstackstart-react/src/client/sdk.ts
 create mode 100644 packages/tanstackstart-react/src/server/sdk.ts
 create mode 100644 packages/tanstackstart-react/test/client/sdk.test.ts
 create mode 100644 packages/tanstackstart-react/test/server/sdk.test.ts
 delete mode 100644 packages/tanstackstart-react/test/temp.test.ts

diff --git a/packages/tanstackstart-react/src/client/index.ts b/packages/tanstackstart-react/src/client/index.ts
index c45aad673ad0..7c603d040693 100644
--- a/packages/tanstackstart-react/src/client/index.ts
+++ b/packages/tanstackstart-react/src/client/index.ts
@@ -1 +1,3 @@
 export * from '@sentry/react';
+
+export { init } from './sdk';
diff --git a/packages/tanstackstart-react/src/client/sdk.ts b/packages/tanstackstart-react/src/client/sdk.ts
new file mode 100644
index 000000000000..b0ee3b53053f
--- /dev/null
+++ b/packages/tanstackstart-react/src/client/sdk.ts
@@ -0,0 +1,20 @@
+import type { Client } from '@sentry/core';
+import { applySdkMetadata } from '@sentry/core';
+import type { BrowserOptions as ReactBrowserOptions } from '@sentry/react';
+import { getDefaultIntegrations as getReactDefaultIntegrations, init as initReactSDK } from '@sentry/react';
+
+/**
+ * Initializes the TanStack Start React SDK
+ *
+ * @param options Configuration options for the SDK.
+ */
+export function init(options: ReactBrowserOptions): Client | undefined {
+  const sentryOptions: ReactBrowserOptions = {
+    defaultIntegrations: [...getReactDefaultIntegrations(options)],
+    ...options,
+  };
+
+  applySdkMetadata(sentryOptions, 'tanstackstart-react', ['tanstackstart-react', 'react']);
+
+  return initReactSDK(sentryOptions);
+}
diff --git a/packages/tanstackstart-react/src/server/index.ts b/packages/tanstackstart-react/src/server/index.ts
index c79572a7f318..f377305d429f 100644
--- a/packages/tanstackstart-react/src/server/index.ts
+++ b/packages/tanstackstart-react/src/server/index.ts
@@ -1,5 +1,7 @@
 export * from '@sentry/node';
 
+export { init } from './sdk';
+
 /**
  * A passthrough error boundary for the server that doesn't depend on any react. Error boundaries don't catch SSR errors
  * so they should simply be a passthrough.
diff --git a/packages/tanstackstart-react/src/server/sdk.ts b/packages/tanstackstart-react/src/server/sdk.ts
new file mode 100644
index 000000000000..1bf2b5e65be2
--- /dev/null
+++ b/packages/tanstackstart-react/src/server/sdk.ts
@@ -0,0 +1,17 @@
+import { applySdkMetadata } from '@sentry/core';
+import type { NodeClient, NodeOptions } from '@sentry/node';
+import { getDefaultIntegrations as getDefaultNodeIntegrations, init as initNodeSdk } from '@sentry/node';
+
+/**
+ * Initializes the server side of the TanStack Start React SDK
+ */
+export function init(options: NodeOptions): NodeClient | undefined {
+  const sentryOptions: NodeOptions = {
+    defaultIntegrations: [...getDefaultNodeIntegrations(options)],
+    ...options,
+  };
+
+  applySdkMetadata(sentryOptions, 'tanstackstart-react', ['tanstackstart-react', 'node']);
+
+  return initNodeSdk(sentryOptions);
+}
diff --git a/packages/tanstackstart-react/test/client/sdk.test.ts b/packages/tanstackstart-react/test/client/sdk.test.ts
new file mode 100644
index 000000000000..4cba4a199ef5
--- /dev/null
+++ b/packages/tanstackstart-react/test/client/sdk.test.ts
@@ -0,0 +1,45 @@
+import * as SentryReact from '@sentry/react';
+import { SDK_VERSION } from '@sentry/react';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { init } from '../../src/client';
+
+const reactInit = vi.spyOn(SentryReact, 'init');
+
+describe('TanStack Start React Client SDK', () => {
+  describe('init', () => {
+    beforeEach(() => {
+      vi.clearAllMocks();
+    });
+
+    it('Adds TanStack Start React client metadata to the SDK options', () => {
+      expect(reactInit).not.toHaveBeenCalled();
+
+      init({
+        dsn: 'https://public@dsn.ingest.sentry.io/1337',
+      });
+
+      const expectedMetadata = {
+        _metadata: {
+          sdk: {
+            name: 'sentry.javascript.tanstackstart-react',
+            version: SDK_VERSION,
+            packages: [
+              { name: 'npm:@sentry/tanstackstart-react', version: SDK_VERSION },
+              { name: 'npm:@sentry/react', version: SDK_VERSION },
+            ],
+            settings: {
+              infer_ip: 'never',
+            },
+          },
+        },
+      };
+
+      expect(reactInit).toHaveBeenCalledTimes(1);
+      expect(reactInit).toHaveBeenLastCalledWith(expect.objectContaining(expectedMetadata));
+    });
+
+    it('returns client from init', () => {
+      expect(init({})).not.toBeUndefined();
+    });
+  });
+});
diff --git a/packages/tanstackstart-react/test/server/sdk.test.ts b/packages/tanstackstart-react/test/server/sdk.test.ts
new file mode 100644
index 000000000000..f95d970ce8cc
--- /dev/null
+++ b/packages/tanstackstart-react/test/server/sdk.test.ts
@@ -0,0 +1,42 @@
+import * as SentryNode from '@sentry/node';
+import { SDK_VERSION } from '@sentry/node';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { init } from '../../src/server';
+
+const nodeInit = vi.spyOn(SentryNode, 'init');
+
+describe('TanStack Start React Server SDK', () => {
+  describe('init', () => {
+    beforeEach(() => {
+      vi.clearAllMocks();
+    });
+
+    it('Adds TanStack Start React server metadata to the SDK options', () => {
+      expect(nodeInit).not.toHaveBeenCalled();
+
+      init({
+        dsn: 'https://public@dsn.ingest.sentry.io/1337',
+      });
+
+      const expectedMetadata = {
+        _metadata: {
+          sdk: {
+            name: 'sentry.javascript.tanstackstart-react',
+            version: SDK_VERSION,
+            packages: [
+              { name: 'npm:@sentry/tanstackstart-react', version: SDK_VERSION },
+              { name: 'npm:@sentry/node', version: SDK_VERSION },
+            ],
+          },
+        },
+      };
+
+      expect(nodeInit).toHaveBeenCalledTimes(1);
+      expect(nodeInit).toHaveBeenLastCalledWith(expect.objectContaining(expectedMetadata));
+    });
+
+    it('returns client from init', () => {
+      expect(init({})).not.toBeUndefined();
+    });
+  });
+});
diff --git a/packages/tanstackstart-react/test/temp.test.ts b/packages/tanstackstart-react/test/temp.test.ts
deleted file mode 100644
index dc8614cad037..000000000000
--- a/packages/tanstackstart-react/test/temp.test.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { describe, expect, it } from 'vitest';
-
-describe('Basic test suite', () => {
-  it('should pass', () => {
-    expect(true).toBe(true);
-  });
-});

From 775ad190a6d044e13e3976bceeddcfa1d2dfdbb3 Mon Sep 17 00:00:00 2001
From: Neha Prasad <neh6a683@gmail.com>
Date: Tue, 2 Dec 2025 16:21:40 +0530
Subject: [PATCH 147/186] feat(core): Add `isolateTrace` option to
 Sentry.withMonitor() (#18079)

Currently `withMonitor()` reuses the same trace for all cron executions,
making it impossible to distinguish between different runs in Sentry.

This patch adds an optional `isolateTrace: boolean` to `MonitorConfig`
that creates a separate trace for each monitor execution when enabled.

---------

Co-authored-by: Lukas Stracke <lukas.stracke@sentry.io>
---
 .../suites/public-api/withMonitor/scenario.ts | 43 +++++++++++
 .../suites/public-api/withMonitor/test.ts     | 54 +++++++++++++
 packages/core/src/exports.ts                  | 19 +++--
 packages/core/src/types-hoist/checkin.ts      |  5 ++
 packages/core/test/lib/client.test.ts         | 77 +++++++++++++++++++
 5 files changed, 190 insertions(+), 8 deletions(-)
 create mode 100644 dev-packages/node-integration-tests/suites/public-api/withMonitor/scenario.ts
 create mode 100644 dev-packages/node-integration-tests/suites/public-api/withMonitor/test.ts

diff --git a/dev-packages/node-integration-tests/suites/public-api/withMonitor/scenario.ts b/dev-packages/node-integration-tests/suites/public-api/withMonitor/scenario.ts
new file mode 100644
index 000000000000..42a1da41a195
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/public-api/withMonitor/scenario.ts
@@ -0,0 +1,43 @@
+import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  release: '1.0',
+  transport: loggingTransport,
+});
+
+// eslint-disable-next-line @typescript-eslint/no-floating-promises
+Sentry.withMonitor(
+  'cron-job-1',
+  async () => {
+    await new Promise<void>(resolve => {
+      setTimeout(() => {
+        resolve();
+      }, 100);
+    });
+  },
+  {
+    schedule: { type: 'crontab', value: '* * * * *' },
+  },
+);
+
+// eslint-disable-next-line @typescript-eslint/no-floating-promises
+Sentry.withMonitor(
+  'cron-job-2',
+  async () => {
+    await new Promise<void>(resolve => {
+      setTimeout(() => {
+        resolve();
+      }, 100);
+    });
+  },
+  {
+    schedule: { type: 'crontab', value: '* * * * *' },
+    isolateTrace: true,
+  },
+);
+
+setTimeout(() => {
+  process.exit();
+}, 500);
diff --git a/dev-packages/node-integration-tests/suites/public-api/withMonitor/test.ts b/dev-packages/node-integration-tests/suites/public-api/withMonitor/test.ts
new file mode 100644
index 000000000000..e5483682ddfe
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/public-api/withMonitor/test.ts
@@ -0,0 +1,54 @@
+import type { SerializedCheckIn } from '@sentry/core';
+import { afterAll, describe, expect, test } from 'vitest';
+import { cleanupChildProcesses, createRunner } from '../../../utils/runner';
+
+describe('withMonitor isolateTrace', () => {
+  afterAll(() => {
+    cleanupChildProcesses();
+  });
+
+  test('creates distinct traces when isolateTrace is enabled', async () => {
+    const checkIns: SerializedCheckIn[] = [];
+
+    await createRunner(__dirname, 'scenario.ts')
+      .expect({
+        check_in: checkIn => {
+          checkIns.push(checkIn);
+        },
+      })
+      .expect({
+        check_in: checkIn => {
+          checkIns.push(checkIn);
+        },
+      })
+      .expect({
+        check_in: checkIn => {
+          checkIns.push(checkIn);
+        },
+      })
+      .expect({
+        check_in: checkIn => {
+          checkIns.push(checkIn);
+        },
+      })
+      .start()
+      .completed();
+
+    const checkIn1InProgress = checkIns.find(c => c.monitor_slug === 'cron-job-1' && c.status === 'in_progress');
+    const checkIn1Ok = checkIns.find(c => c.monitor_slug === 'cron-job-1' && c.status === 'ok');
+
+    const checkIn2InProgress = checkIns.find(c => c.monitor_slug === 'cron-job-2' && c.status === 'in_progress');
+    const checkIn2Ok = checkIns.find(c => c.monitor_slug === 'cron-job-2' && c.status === 'ok');
+
+    expect(checkIn1InProgress?.contexts?.trace?.trace_id).toMatch(/[a-f\d]{32}/);
+    expect(checkIn1Ok?.contexts?.trace?.trace_id).toMatch(/[a-f\d]{32}/);
+    expect(checkIn2InProgress?.contexts?.trace?.trace_id).toMatch(/[a-f\d]{32}/);
+    expect(checkIn2Ok?.contexts?.trace?.trace_id).toMatch(/[a-f\d]{32}/);
+
+    expect(checkIn1InProgress!.contexts?.trace?.trace_id).not.toBe(checkIn2InProgress!.contexts?.trace?.trace_id);
+    expect(checkIn1Ok!.contexts?.trace?.span_id).not.toBe(checkIn2Ok!.contexts?.trace?.span_id);
+
+    expect(checkIn1Ok!.contexts?.trace?.trace_id).toBe(checkIn1InProgress!.contexts?.trace?.trace_id);
+    expect(checkIn2Ok!.contexts?.trace?.trace_id).toBe(checkIn2InProgress!.contexts?.trace?.trace_id);
+  });
+});
diff --git a/packages/core/src/exports.ts b/packages/core/src/exports.ts
index e3f658c88f2a..a59e521febc7 100644
--- a/packages/core/src/exports.ts
+++ b/packages/core/src/exports.ts
@@ -2,6 +2,7 @@ import { getClient, getCurrentScope, getIsolationScope, withIsolationScope } fro
 import { DEBUG_BUILD } from './debug-build';
 import type { CaptureContext } from './scope';
 import { closeSession, makeSession, updateSession } from './session';
+import { startNewTrace } from './tracing/trace';
 import type { CheckIn, FinishedCheckIn, MonitorConfig } from './types-hoist/checkin';
 import type { Event, EventHint } from './types-hoist/event';
 import type { EventProcessor } from './types-hoist/eventprocessor';
@@ -159,14 +160,14 @@ export function withMonitor<T>(
   callback: () => T,
   upsertMonitorConfig?: MonitorConfig,
 ): T {
-  const checkInId = captureCheckIn({ monitorSlug, status: 'in_progress' }, upsertMonitorConfig);
-  const now = timestampInSeconds();
+  function runCallback(): T {
+    const checkInId = captureCheckIn({ monitorSlug, status: 'in_progress' }, upsertMonitorConfig);
+    const now = timestampInSeconds();
 
-  function finishCheckIn(status: FinishedCheckIn['status']): void {
-    captureCheckIn({ monitorSlug, status, checkInId, duration: timestampInSeconds() - now });
-  }
-
-  return withIsolationScope(() => {
+    function finishCheckIn(status: FinishedCheckIn['status']): void {
+      captureCheckIn({ monitorSlug, status, checkInId, duration: timestampInSeconds() - now });
+    }
+    // Default behavior without isolateTrace
     let maybePromiseResult: T;
     try {
       maybePromiseResult = callback();
@@ -190,7 +191,9 @@ export function withMonitor<T>(
     finishCheckIn('ok');
 
     return maybePromiseResult;
-  });
+  }
+
+  return withIsolationScope(() => (upsertMonitorConfig?.isolateTrace ? startNewTrace(runCallback) : runCallback()));
 }
 
 /**
diff --git a/packages/core/src/types-hoist/checkin.ts b/packages/core/src/types-hoist/checkin.ts
index 9d200811183a..6d25998099ad 100644
--- a/packages/core/src/types-hoist/checkin.ts
+++ b/packages/core/src/types-hoist/checkin.ts
@@ -105,4 +105,9 @@ export interface MonitorConfig {
   failureIssueThreshold?: SerializedMonitorConfig['failure_issue_threshold'];
   /** How many consecutive OK check-ins it takes to resolve an issue. */
   recoveryThreshold?: SerializedMonitorConfig['recovery_threshold'];
+  /**
+   * If set to true, creates a new trace for the monitor callback instead of continuing the current trace.
+   * This allows distinguishing between different cron job executions.
+   */
+  isolateTrace?: boolean;
 }
diff --git a/packages/core/test/lib/client.test.ts b/packages/core/test/lib/client.test.ts
index a59a8bbb8780..0945af5f019f 100644
--- a/packages/core/test/lib/client.test.ts
+++ b/packages/core/test/lib/client.test.ts
@@ -15,6 +15,7 @@ import {
 import * as integrationModule from '../../src/integration';
 import { _INTERNAL_captureLog } from '../../src/logs/internal';
 import { _INTERNAL_captureMetric } from '../../src/metrics/internal';
+import * as traceModule from '../../src/tracing/trace';
 import { DEFAULT_TRANSPORT_BUFFER_SIZE } from '../../src/transports/base';
 import type { Envelope } from '../../src/types-hoist/envelope';
 import type { ErrorEvent, Event, TransactionEvent } from '../../src/types-hoist/event';
@@ -2732,6 +2733,82 @@ describe('Client', () => {
       const promise = await withMonitor('test-monitor', callback);
       await expect(promise).rejects.toThrowError(error);
     });
+
+    describe('isolateTrace', () => {
+      const startNewTraceSpy = vi.spyOn(traceModule, 'startNewTrace').mockImplementation(cb => cb());
+
+      beforeEach(() => {
+        startNewTraceSpy.mockClear();
+      });
+
+      it('starts a new trace when isolateTrace is true (sync)', () => {
+        const result = 'foo';
+        const callback = vi.fn().mockReturnValue(result);
+
+        const returnedResult = withMonitor('test-monitor', callback, {
+          schedule: { type: 'crontab', value: '* * * * *' },
+          isolateTrace: true,
+        });
+
+        expect(returnedResult).toBe(result);
+        expect(callback).toHaveBeenCalledTimes(1);
+        expect(startNewTraceSpy).toHaveBeenCalledTimes(1);
+      });
+
+      it('starts a new trace when isolateTrace is true (async)', async () => {
+        const result = 'foo';
+        const callback = vi.fn().mockResolvedValue(result);
+
+        const promise = withMonitor('test-monitor', callback, {
+          schedule: { type: 'crontab', value: '* * * * *' },
+          isolateTrace: true,
+        });
+        await expect(promise).resolves.toEqual(result);
+        expect(callback).toHaveBeenCalledTimes(1);
+        expect(startNewTraceSpy).toHaveBeenCalledTimes(1);
+      });
+
+      it("doesn't start a new trace when isolateTrace is false (sync)", () => {
+        const result = 'foo';
+        const callback = vi.fn().mockReturnValue(result);
+
+        const returnedResult = withMonitor('test-monitor', callback, {
+          schedule: { type: 'crontab', value: '* * * * *' },
+          isolateTrace: false,
+        });
+
+        expect(returnedResult).toBe(result);
+        expect(callback).toHaveBeenCalledTimes(1);
+        expect(startNewTraceSpy).not.toHaveBeenCalled();
+      });
+
+      it("doesn't start a new trace when isolateTrace is false (async)", async () => {
+        const result = 'foo';
+        const callback = vi.fn().mockResolvedValue(result);
+
+        const promise = withMonitor('test-monitor', callback, {
+          schedule: { type: 'crontab', value: '* * * * *' },
+          isolateTrace: false,
+        });
+
+        await expect(promise).resolves.toEqual(result);
+        expect(callback).toHaveBeenCalledTimes(1);
+        expect(startNewTraceSpy).not.toHaveBeenCalled();
+      });
+
+      it("doesn't start a new trace by default", () => {
+        const result = 'foo';
+        const callback = vi.fn().mockReturnValue(result);
+
+        const returnedResult = withMonitor('test-monitor', callback, {
+          schedule: { type: 'crontab', value: '* * * * *' },
+        });
+
+        expect(returnedResult).toBe(result);
+        expect(callback).toHaveBeenCalledTimes(1);
+        expect(startNewTraceSpy).not.toHaveBeenCalled();
+      });
+    });
   });
 
   describe('enableLogs', () => {

From a1cc67548ff347fb7226a2143babe227dc8651fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Peer=20St=C3=B6cklmair?= <jan.peer@sentry.io>
Date: Tue, 2 Dec 2025 10:55:45 +0000
Subject: [PATCH 148/186] chore: Allow URLs as issue (#18372)

It seems that the full URL of the issue was not checked against. This
now also allows full issue URLs (but only if they are in the `getsentry`
org). This came up in #18369
---
 .github/workflows/create-issue-for-unreferenced-prs.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/create-issue-for-unreferenced-prs.yml b/.github/workflows/create-issue-for-unreferenced-prs.yml
index 1fa5d659fbb4..725a2f8244b0 100644
--- a/.github/workflows/create-issue-for-unreferenced-prs.yml
+++ b/.github/workflows/create-issue-for-unreferenced-prs.yml
@@ -55,7 +55,8 @@ jobs:
             const prNumber = pr.number;
 
             // Regex for GitHub issue references (e.g., #123, fixes #456)
-            const issueRegexGitHub = /(?:(?:close|closes|closed|fix|fixes|fixed|resolve|resolves|resolved):?\s*)?#\d+/i;
+            // https://regex101.com/r/eDiGrQ/1
+            const issueRegexGitHub = /(?:(?:close|closes|closed|fix|fixes|fixed|resolve|resolves|resolved):?\s*)?(#\d+|https:\/\/github\.com\/getsentry\/[\w-]+\/issues\/\d+)/i;
 
             // Regex for Linear issue references (e.g., ENG-123, resolves ENG-456)
             const issueRegexLinear = /(?:(?:close|closes|closed|fix|fixes|fixed|resolve|resolves|resolved):?\s*)?[A-Z]+-\d+/i;

From 9f0e206db0ad7ccac6daa23e82490f354ed5dd26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Peer=20St=C3=B6cklmair?= <jan.peer@sentry.io>
Date: Tue, 2 Dec 2025 11:14:21 +0000
Subject: [PATCH 149/186] fix(cloudflare): Wait for async events to finish
 (#18334)

(closes #18360)

## Problem

In https://github.com/getsentry/sentry-mcp/pull/652 we had to manually
wait for the flush to ensure that async operations completed before the
response was sent.

This was caused by the MCP server streaming data after the actual
request has been finished. When using the Cloudflare SDK with MCP
servers (or other streaming APIs), spans created during the streaming
phase were not being flushed properly because the `flush()` method would
complete before these async spans finished.

## Solution

During the request, when a span is created for the streaming call, we
now register listeners on the CloudflareClient for `spanStart` and
`spanEnd` events. The client tracks all pending spans and waits for them
to complete before flushing.

Specifically:
- Added `_pendingSpans` Set to track active span IDs
- Created a promise-based mechanism (`_spanCompletionPromise`) to wait
for all spans to complete
- Modified the `flush()` method to wait for pending spans before calling
`super.flush()`
- Added a timeout (default 5 seconds) to prevent indefinite waiting

## Test

Added a comprehensive E2E test application (`cloudflare-mcp`) that:
- Sets up a Cloudflare Worker with an MCP server
- Registers a tool that creates spans during execution
- Verifies that both the HTTP request span and the MCP tool call span
are properly sent to Sentry
- Validates span relationships (parent/child) and trace IDs

The test confirms that spans are now flushed correctly without manual
intervention.
---
 .../cloudflare-mcp/.gitignore                 |   1 +
 .../test-applications/cloudflare-mcp/.npmrc   |   2 +
 .../cloudflare-mcp/package.json               |  41 +++++++
 .../cloudflare-mcp/playwright.config.ts       |  22 ++++
 .../cloudflare-mcp/src/env.d.ts               |   7 ++
 .../cloudflare-mcp/src/index.ts               |  83 +++++++++++++
 .../cloudflare-mcp/start-event-proxy.mjs      |   6 +
 .../cloudflare-mcp/tests/index.test.ts        | 110 ++++++++++++++++++
 .../cloudflare-mcp/tests/tsconfig.json        |   8 ++
 .../cloudflare-mcp/tsconfig.json              |  43 +++++++
 .../cloudflare-mcp/vitest.config.mts          |  11 ++
 .../cloudflare-mcp/wrangler.toml              |  98 ++++++++++++++++
 packages/cloudflare/src/client.ts             |  63 +++++++++-
 13 files changed, 494 insertions(+), 1 deletion(-)
 create mode 100644 dev-packages/e2e-tests/test-applications/cloudflare-mcp/.gitignore
 create mode 100644 dev-packages/e2e-tests/test-applications/cloudflare-mcp/.npmrc
 create mode 100644 dev-packages/e2e-tests/test-applications/cloudflare-mcp/package.json
 create mode 100644 dev-packages/e2e-tests/test-applications/cloudflare-mcp/playwright.config.ts
 create mode 100644 dev-packages/e2e-tests/test-applications/cloudflare-mcp/src/env.d.ts
 create mode 100644 dev-packages/e2e-tests/test-applications/cloudflare-mcp/src/index.ts
 create mode 100644 dev-packages/e2e-tests/test-applications/cloudflare-mcp/start-event-proxy.mjs
 create mode 100644 dev-packages/e2e-tests/test-applications/cloudflare-mcp/tests/index.test.ts
 create mode 100644 dev-packages/e2e-tests/test-applications/cloudflare-mcp/tests/tsconfig.json
 create mode 100644 dev-packages/e2e-tests/test-applications/cloudflare-mcp/tsconfig.json
 create mode 100644 dev-packages/e2e-tests/test-applications/cloudflare-mcp/vitest.config.mts
 create mode 100644 dev-packages/e2e-tests/test-applications/cloudflare-mcp/wrangler.toml

diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-mcp/.gitignore b/dev-packages/e2e-tests/test-applications/cloudflare-mcp/.gitignore
new file mode 100644
index 000000000000..e71378008bf1
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-mcp/.gitignore
@@ -0,0 +1 @@
+.wrangler
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-mcp/.npmrc b/dev-packages/e2e-tests/test-applications/cloudflare-mcp/.npmrc
new file mode 100644
index 000000000000..070f80f05092
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-mcp/.npmrc
@@ -0,0 +1,2 @@
+@sentry:registry=http://127.0.0.1:4873
+@sentry-internal:registry=http://127.0.0.1:4873
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-mcp/package.json b/dev-packages/e2e-tests/test-applications/cloudflare-mcp/package.json
new file mode 100644
index 000000000000..686e747422fa
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-mcp/package.json
@@ -0,0 +1,41 @@
+{
+  "name": "cloudflare-mcp",
+  "version": "0.0.0",
+  "private": true,
+  "scripts": {
+    "deploy": "wrangler deploy",
+    "dev": "wrangler dev --var \"E2E_TEST_DSN:$E2E_TEST_DSN\" --log-level=$(test $CI && echo 'none' || echo 'log')",
+    "build": "wrangler deploy --dry-run",
+    "test": "vitest --run",
+    "typecheck": "tsc --noEmit",
+    "cf-typegen": "wrangler types",
+    "test:build": "pnpm install && pnpm build",
+    "test:assert": "pnpm typecheck && pnpm test:dev && pnpm test:prod",
+    "test:prod": "TEST_ENV=production playwright test",
+    "test:dev": "TEST_ENV=development playwright test"
+  },
+  "dependencies": {
+    "@modelcontextprotocol/sdk": "^1.22.0",
+    "@sentry/cloudflare": "latest || *",
+    "agents": "^0.2.23",
+    "zod": "^3.25.76"
+  },
+  "devDependencies": {
+    "@cloudflare/vitest-pool-workers": "^0.8.19",
+    "@cloudflare/workers-types": "^4.20240725.0",
+    "@playwright/test": "~1.50.0",
+    "@sentry-internal/test-utils": "link:../../../test-utils",
+    "typescript": "^5.5.2",
+    "vitest": "~3.2.0",
+    "wrangler": "^4.23.0",
+    "ws": "^8.18.3"
+  },
+  "volta": {
+    "extends": "../../package.json"
+  },
+  "pnpm": {
+    "overrides": {
+      "strip-literal": "~2.0.0"
+    }
+  }
+}
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-mcp/playwright.config.ts b/dev-packages/e2e-tests/test-applications/cloudflare-mcp/playwright.config.ts
new file mode 100644
index 000000000000..73abbd951b90
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-mcp/playwright.config.ts
@@ -0,0 +1,22 @@
+import { getPlaywrightConfig } from '@sentry-internal/test-utils';
+const testEnv = process.env.TEST_ENV;
+
+if (!testEnv) {
+  throw new Error('No test env defined');
+}
+
+const APP_PORT = 38787;
+
+const config = getPlaywrightConfig(
+  {
+    startCommand: `pnpm dev --port ${APP_PORT}`,
+    port: APP_PORT,
+  },
+  {
+    // This comes with the risk of tests leaking into each other but the tests run quite slow so we should parallelize
+    workers: '100%',
+    retries: 0,
+  },
+);
+
+export default config;
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-mcp/src/env.d.ts b/dev-packages/e2e-tests/test-applications/cloudflare-mcp/src/env.d.ts
new file mode 100644
index 000000000000..1701ed9f621a
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-mcp/src/env.d.ts
@@ -0,0 +1,7 @@
+// Generated by Wrangler on Mon Jul 29 2024 21:44:31 GMT-0400 (Eastern Daylight Time)
+// by running `wrangler types`
+
+interface Env {
+  E2E_TEST_DSN: '';
+  MY_DURABLE_OBJECT: DurableObjectNamespace;
+}
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-mcp/src/index.ts b/dev-packages/e2e-tests/test-applications/cloudflare-mcp/src/index.ts
new file mode 100644
index 000000000000..5528ccffd3de
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-mcp/src/index.ts
@@ -0,0 +1,83 @@
+/**
+ * Welcome to Cloudflare Workers! This is your first worker.
+ *
+ * - Run `npm run dev` in your terminal to start a development server
+ * - Open a browser tab at http://localhost:8787/ to see your worker in action
+ * - Run `npm run deploy` to publish your worker
+ *
+ * Bind resources to your worker in `wrangler.toml`. After adding bindings, a type definition for the
+ * `Env` object can be regenerated with `npm run cf-typegen`.
+ *
+ * Learn more at https://developers.cloudflare.com/workers/
+ */
+import * as Sentry from '@sentry/cloudflare';
+import { createMcpHandler } from 'agents/mcp';
+import * as z from 'zod';
+import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+
+export default Sentry.withSentry(
+  (env: Env) => ({
+    dsn: env.E2E_TEST_DSN,
+    environment: 'qa', // dynamic sampling bias to keep transactions
+    tunnel: `http://localhost:3031/`, // proxy server
+    tracesSampleRate: 1.0,
+    sendDefaultPii: true,
+    debug: true,
+    transportOptions: {
+      // We are doing a lot of events at once in this test
+      bufferSize: 1000,
+    },
+  }),
+  {
+    async fetch(request, env, ctx) {
+      const server = new McpServer({
+        name: 'cloudflare-mcp',
+        version: '1.0.0',
+      });
+
+      const span = Sentry.getActiveSpan();
+
+      if (span) {
+        span.setAttribute('mcp.server.extra', ' /|\ ^._.^ /|\ ');
+      }
+
+      server.registerTool(
+        'my-tool',
+        {
+          title: 'My Tool',
+          description: 'My Tool Description',
+          inputSchema: {
+            message: z.string(),
+          },
+        },
+        async ({ message }) => {
+          const span = Sentry.getActiveSpan();
+
+          // simulate a long running tool
+          await new Promise(resolve => setTimeout(resolve, 500));
+
+          if (span) {
+            span.setAttribute('mcp.tool.name', 'my-tool');
+            span.setAttribute('mcp.tool.extra', 'ƸӜƷ');
+            span.setAttribute('mcp.tool.input', JSON.stringify({ message }));
+          }
+
+          return {
+            content: [
+              {
+                type: 'text' as const,
+                text: `Tool my-tool: ${message}`,
+              },
+            ],
+          };
+        },
+      );
+
+      const handler = createMcpHandler(Sentry.wrapMcpServerWithSentry(server), {
+        route: '/mcp',
+      });
+
+      return handler(request, env, ctx);
+    },
+  } satisfies ExportedHandler<Env>,
+);
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-mcp/start-event-proxy.mjs b/dev-packages/e2e-tests/test-applications/cloudflare-mcp/start-event-proxy.mjs
new file mode 100644
index 000000000000..da5101c5275f
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-mcp/start-event-proxy.mjs
@@ -0,0 +1,6 @@
+import { startEventProxyServer } from '@sentry-internal/test-utils';
+
+startEventProxyServer({
+  port: 3031,
+  proxyServerName: 'cloudflare-mcp',
+});
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-mcp/tests/index.test.ts b/dev-packages/e2e-tests/test-applications/cloudflare-mcp/tests/index.test.ts
new file mode 100644
index 000000000000..8ce8b693499e
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-mcp/tests/index.test.ts
@@ -0,0 +1,110 @@
+import { expect, test } from '@playwright/test';
+import { waitForRequest } from '@sentry-internal/test-utils';
+
+test('sends spans for MCP tool calls', async ({ baseURL }) => {
+  const spanRequestWaiter = waitForRequest('cloudflare-mcp', event => {
+    const transaction = event.envelope[1][0][1];
+    return typeof transaction !== 'string' && 'transaction' in transaction && transaction.transaction === 'POST /mcp';
+  });
+
+  const spanMcpWaiter = waitForRequest('cloudflare-mcp', event => {
+    const transaction = event.envelope[1][0][1];
+    return (
+      typeof transaction !== 'string' &&
+      'transaction' in transaction &&
+      transaction.transaction === 'tools/call my-tool'
+    );
+  });
+
+  const response = await fetch(`${baseURL}/mcp`, {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      Accept: 'application/json, text/event-stream',
+    },
+    body: JSON.stringify({
+      jsonrpc: '2.0',
+      id: 1,
+      method: 'tools/call',
+      params: {
+        name: 'my-tool',
+        arguments: {
+          message: 'ʕっ•ᴥ•ʔっ',
+        },
+      },
+    }),
+  });
+
+  expect(response.status).toBe(200);
+
+  const requestData = await spanRequestWaiter;
+  const mcpData = await spanMcpWaiter;
+
+  const requestEvent = requestData.envelope[1][0][1];
+  const mcpEvent = mcpData.envelope[1][0][1];
+
+  // Check that the events have contexts
+  // this is for TypeScript type safety
+  if (
+    typeof mcpEvent === 'string' ||
+    !('contexts' in mcpEvent) ||
+    typeof requestEvent === 'string' ||
+    !('contexts' in requestEvent)
+  ) {
+    throw new Error("Events don't have contexts");
+  }
+
+  expect(mcpEvent.contexts?.trace?.trace_id).toBe((mcpData.envelope[0].trace as any).trace_id);
+  expect(requestData.envelope[0].event_id).not.toBe(mcpData.envelope[0].event_id);
+
+  expect(requestEvent.contexts?.trace).toEqual({
+    span_id: expect.any(String),
+    trace_id: expect.any(String),
+    data: expect.objectContaining({
+      'sentry.origin': 'auto.http.cloudflare',
+      'sentry.op': 'http.server',
+      'sentry.source': 'url',
+      'sentry.sample_rate': 1,
+      'http.request.method': 'POST',
+      'url.path': '/mcp',
+      'url.full': 'http://localhost:38787/mcp',
+      'url.port': '38787',
+      'url.scheme': 'http:',
+      'server.address': 'localhost',
+      'http.request.body.size': 120,
+      'user_agent.original': 'node',
+      'http.request.header.content_type': 'application/json',
+      'network.protocol.name': 'HTTP/1.1',
+      'mcp.server.extra': ' /|\ ^._.^ /|\ ',
+      'http.response.status_code': 200,
+    }),
+    op: 'http.server',
+    status: 'ok',
+    origin: 'auto.http.cloudflare',
+  });
+
+  expect(mcpEvent.contexts?.trace).toEqual({
+    trace_id: expect.any(String),
+    parent_span_id: requestEvent.contexts?.trace?.span_id,
+    span_id: expect.any(String),
+    op: 'mcp.server',
+    origin: 'auto.function.mcp_server',
+    data: {
+      'sentry.origin': 'auto.function.mcp_server',
+      'sentry.op': 'mcp.server',
+      'sentry.source': 'route',
+      'mcp.transport': 'WorkerTransport',
+      'network.transport': 'unknown',
+      'network.protocol.version': '2.0',
+      'mcp.method.name': 'tools/call',
+      'mcp.request.id': '1',
+      'mcp.tool.name': 'my-tool',
+      'mcp.request.argument.message': '"ʕっ•ᴥ•ʔっ"',
+      'mcp.tool.extra': 'ƸӜƷ',
+      'mcp.tool.input': '{"message":"ʕっ•ᴥ•ʔっ"}',
+      'mcp.tool.result.content_count': 1,
+      'mcp.tool.result.content_type': 'text',
+      'mcp.tool.result.content': 'Tool my-tool: ʕっ•ᴥ•ʔっ',
+    },
+  });
+});
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-mcp/tests/tsconfig.json b/dev-packages/e2e-tests/test-applications/cloudflare-mcp/tests/tsconfig.json
new file mode 100644
index 000000000000..9a3b10f6cdc8
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-mcp/tests/tsconfig.json
@@ -0,0 +1,8 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "types": ["@cloudflare/vitest-pool-workers"]
+  },
+  "include": ["./**/*.ts", "../worker-configuration.d.ts"],
+  "exclude": []
+}
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-mcp/tsconfig.json b/dev-packages/e2e-tests/test-applications/cloudflare-mcp/tsconfig.json
new file mode 100644
index 000000000000..87d4bbd5fab8
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-mcp/tsconfig.json
@@ -0,0 +1,43 @@
+{
+  "compilerOptions": {
+    /* Visit https://aka.ms/tsconfig.json to read more about this file */
+
+    /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
+    "target": "es2021",
+    /* Specify a set of bundled library declaration files that describe the target runtime environment. */
+    "lib": ["es2021"],
+    /* Specify what JSX code is generated. */
+    "jsx": "react-jsx",
+
+    /* Specify what module code is generated. */
+    "module": "es2022",
+    /* Specify how TypeScript looks up a file from a given module specifier. */
+    "moduleResolution": "Bundler",
+    /* Enable importing .json files */
+    "resolveJsonModule": true,
+
+    /* Allow JavaScript files to be a part of your program. Use the `checkJS` option to get errors from these files. */
+    "allowJs": true,
+    /* Enable error reporting in type-checked JavaScript files. */
+    "checkJs": false,
+
+    /* Disable emitting files from a compilation. */
+    "noEmit": true,
+
+    /* Ensure that each file can be safely transpiled without relying on other imports. */
+    "isolatedModules": true,
+    /* Allow 'import x from y' when a module doesn't have a default export. */
+    "allowSyntheticDefaultImports": true,
+    /* Ensure that casing is correct in imports. */
+    "forceConsistentCasingInFileNames": true,
+
+    /* Enable all strict type-checking options. */
+    "strict": true,
+
+    /* Skip type checking all .d.ts files. */
+    "skipLibCheck": true,
+    "types": ["@cloudflare/workers-types/experimental"]
+  },
+  "exclude": ["test"],
+  "include": ["src/**/*.ts"]
+}
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-mcp/vitest.config.mts b/dev-packages/e2e-tests/test-applications/cloudflare-mcp/vitest.config.mts
new file mode 100644
index 000000000000..931e5113e0c2
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-mcp/vitest.config.mts
@@ -0,0 +1,11 @@
+import { defineWorkersConfig } from '@cloudflare/vitest-pool-workers/config';
+
+export default defineWorkersConfig({
+  test: {
+    poolOptions: {
+      workers: {
+        wrangler: { configPath: './wrangler.toml' },
+      },
+    },
+  },
+});
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-mcp/wrangler.toml b/dev-packages/e2e-tests/test-applications/cloudflare-mcp/wrangler.toml
new file mode 100644
index 000000000000..69c10ce7cf01
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-mcp/wrangler.toml
@@ -0,0 +1,98 @@
+#:schema node_modules/wrangler/config-schema.json
+name = "cloudflare-mcp"
+main = "src/index.ts"
+compatibility_date = "2025-03-21"
+compatibility_flags = ["nodejs_compat"]
+
+# [vars]
+# E2E_TEST_DSN = ""
+
+# Automatically place your workloads in an optimal location to minimize latency.
+# If you are running back-end logic in a Worker, running it closer to your back-end infrastructure
+# rather than the end user may result in better performance.
+# Docs: https://developers.cloudflare.com/workers/configuration/smart-placement/#smart-placement
+# [placement]
+# mode = "smart"
+
+# Variable bindings. These are arbitrary, plaintext strings (similar to environment variables)
+# Docs:
+# - https://developers.cloudflare.com/workers/wrangler/configuration/#environment-variables
+# Note: Use secrets to store sensitive data.
+# - https://developers.cloudflare.com/workers/configuration/secrets/
+# [vars]
+# MY_VARIABLE = "production_value"
+
+# Bind the Workers AI model catalog. Run machine learning models, powered by serverless GPUs, on Cloudflare’s global network
+# Docs: https://developers.cloudflare.com/workers/wrangler/configuration/#workers-ai
+# [ai]
+# binding = "AI"
+
+# Bind an Analytics Engine dataset. Use Analytics Engine to write analytics within your Pages Function.
+# Docs: https://developers.cloudflare.com/workers/wrangler/configuration/#analytics-engine-datasets
+# [[analytics_engine_datasets]]
+# binding = "MY_DATASET"
+
+# Bind a headless browser instance running on Cloudflare's global network.
+# Docs: https://developers.cloudflare.com/workers/wrangler/configuration/#browser-rendering
+# [browser]
+# binding = "MY_BROWSER"
+
+# Bind a D1 database. D1 is Cloudflare’s native serverless SQL database.
+# Docs: https://developers.cloudflare.com/workers/wrangler/configuration/#d1-databases
+# [[d1_databases]]
+# binding = "MY_DB"
+# database_name = "my-database"
+# database_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+
+# Bind a dispatch namespace. Use Workers for Platforms to deploy serverless functions programmatically on behalf of your customers.
+# Docs: https://developers.cloudflare.com/workers/wrangler/configuration/#dispatch-namespace-bindings-workers-for-platforms
+# [[dispatch_namespaces]]
+# binding = "MY_DISPATCHER"
+# namespace = "my-namespace"
+
+# Bind a Hyperdrive configuration. Use to accelerate access to your existing databases from Cloudflare Workers.
+# Docs: https://developers.cloudflare.com/workers/wrangler/configuration/#hyperdrive
+# [[hyperdrive]]
+# binding = "MY_HYPERDRIVE"
+# id = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+
+# Bind a KV Namespace. Use KV as persistent storage for small key-value pairs.
+# Docs: https://developers.cloudflare.com/workers/wrangler/configuration/#kv-namespaces
+# [[kv_namespaces]]
+# binding = "MY_KV_NAMESPACE"
+# id = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+
+# Bind an mTLS certificate. Use to present a client certificate when communicating with another service.
+# Docs: https://developers.cloudflare.com/workers/wrangler/configuration/#mtls-certificates
+# [[mtls_certificates]]
+# binding = "MY_CERTIFICATE"
+# certificate_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+
+# Bind a Queue producer. Use this binding to schedule an arbitrary task that may be processed later by a Queue consumer.
+# Docs: https://developers.cloudflare.com/workers/wrangler/configuration/#queues
+# [[queues.producers]]
+# binding = "MY_QUEUE"
+# queue = "my-queue"
+
+# Bind a Queue consumer. Queue Consumers can retrieve tasks scheduled by Producers to act on them.
+# Docs: https://developers.cloudflare.com/workers/wrangler/configuration/#queues
+# [[queues.consumers]]
+# queue = "my-queue"
+
+# Bind an R2 Bucket. Use R2 to store arbitrarily large blobs of data, such as files.
+# Docs: https://developers.cloudflare.com/workers/wrangler/configuration/#r2-buckets
+# [[r2_buckets]]
+# binding = "MY_BUCKET"
+# bucket_name = "my-bucket"
+
+# Bind another Worker service. Use this binding to call another Worker without network overhead.
+# Docs: https://developers.cloudflare.com/workers/wrangler/configuration/#service-bindings
+# [[services]]
+# binding = "MY_SERVICE"
+# service = "my-service"
+
+# Bind a Vectorize index. Use to store and query vector embeddings for semantic search, classification and other vector search use-cases.
+# Docs: https://developers.cloudflare.com/workers/wrangler/configuration/#vectorize-indexes
+# [[vectorize]]
+# binding = "MY_INDEX"
+# index_name = "my-index"
diff --git a/packages/cloudflare/src/client.ts b/packages/cloudflare/src/client.ts
index 2de5147d3d5a..3332f71dab90 100644
--- a/packages/cloudflare/src/client.ts
+++ b/packages/cloudflare/src/client.ts
@@ -1,5 +1,6 @@
 import type { ClientOptions, Options, ServerRuntimeClientOptions } from '@sentry/core';
-import { applySdkMetadata, ServerRuntimeClient } from '@sentry/core';
+import { applySdkMetadata, debug, ServerRuntimeClient } from '@sentry/core';
+import { DEBUG_BUILD } from './debug-build';
 import type { makeFlushLock } from './flush';
 import type { CloudflareTransportOptions } from './transport';
 
@@ -11,6 +12,9 @@ import type { CloudflareTransportOptions } from './transport';
  */
 export class CloudflareClient extends ServerRuntimeClient {
   private readonly _flushLock: ReturnType<typeof makeFlushLock> | void;
+  private _pendingSpans: Set<string> = new Set();
+  private _spanCompletionPromise: Promise<void> | null = null;
+  private _resolveSpanCompletion: (() => void) | null = null;
 
   /**
    * Creates a new Cloudflare SDK instance.
@@ -31,12 +35,40 @@ export class CloudflareClient extends ServerRuntimeClient {
 
     super(clientOptions);
     this._flushLock = flushLock;
+
+    // Track span lifecycle to know when to flush
+    this.on('spanStart', span => {
+      const spanId = span.spanContext().spanId;
+      DEBUG_BUILD && debug.log('[CloudflareClient] Span started:', spanId);
+      this._pendingSpans.add(spanId);
+
+      if (!this._spanCompletionPromise) {
+        this._spanCompletionPromise = new Promise(resolve => {
+          this._resolveSpanCompletion = resolve;
+        });
+      }
+    });
+
+    this.on('spanEnd', span => {
+      const spanId = span.spanContext().spanId;
+      DEBUG_BUILD && debug.log('[CloudflareClient] Span ended:', spanId);
+      this._pendingSpans.delete(spanId);
+
+      // If no more pending spans, resolve the completion promise
+      if (this._pendingSpans.size === 0 && this._resolveSpanCompletion) {
+        DEBUG_BUILD && debug.log('[CloudflareClient] All spans completed, resolving promise');
+        this._resolveSpanCompletion();
+        this._resetSpanCompletionPromise();
+      }
+    });
   }
 
   /**
    * Flushes pending operations and ensures all data is processed.
    * If a timeout is provided, the operation will be completed within the specified time limit.
    *
+   * It will wait for all pending spans to complete before flushing.
+   *
    * @param {number} [timeout] - Optional timeout in milliseconds to force the completion of the flush operation.
    * @return {Promise<boolean>} A promise that resolves to a boolean indicating whether the flush operation was successful.
    */
@@ -44,8 +76,37 @@ export class CloudflareClient extends ServerRuntimeClient {
     if (this._flushLock) {
       await this._flushLock.finalize();
     }
+
+    if (this._pendingSpans.size > 0 && this._spanCompletionPromise) {
+      DEBUG_BUILD &&
+        debug.log('[CloudflareClient] Waiting for', this._pendingSpans.size, 'pending spans to complete...');
+
+      const timeoutMs = timeout ?? 5000;
+      const spanCompletionRace = Promise.race([
+        this._spanCompletionPromise,
+        new Promise(resolve =>
+          setTimeout(() => {
+            DEBUG_BUILD &&
+              debug.log('[CloudflareClient] Span completion timeout after', timeoutMs, 'ms, flushing anyway');
+            resolve(undefined);
+          }, timeoutMs),
+        ),
+      ]);
+
+      await spanCompletionRace;
+    }
+
     return super.flush(timeout);
   }
+
+  /**
+   * Resets the span completion promise and resolve function.
+   */
+  private _resetSpanCompletionPromise(): void {
+    this._pendingSpans.clear();
+    this._spanCompletionPromise = null;
+    this._resolveSpanCompletion = null;
+  }
 }
 
 interface BaseCloudflareOptions {

From 839b13744f11111fe42e90ee91b59ac9d4b62867 Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Tue, 2 Dec 2025 12:18:41 +0100
Subject: [PATCH 150/186] chore(github): Adjust `BUGBOT.md` rules to flag
 invalid op and origin values during review (#18352)

based on the invalid origin values reported in
https://github.com/getsentry/sentry-javascript/issues/18350 (and a bunch
more invalid values in other SDKs) let's make bugbot a bit smarter to
flag stuff like this in the future
---
 .cursor/BUGBOT.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.cursor/BUGBOT.md b/.cursor/BUGBOT.md
index d70f36ff6c94..891b91d50f90 100644
--- a/.cursor/BUGBOT.md
+++ b/.cursor/BUGBOT.md
@@ -32,7 +32,11 @@ Do not flag the issues below if they appear in tests.
 
 - When calling any `startSpan` API (`startInactiveSpan`, `startSpanManual`, etc), always ensure that the following span attributes are set:
   - `SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN` (`'sentry.origin'`) with a proper span origin
+    - a proper origin must only contain [a-z], [A-Z], [0-9], `_` and `.` characters.
+    - flag any non-conforming origin values as invalid and link to the trace origin specification (https://develop.sentry.dev/sdk/telemetry/traces/trace-origin/)
   - `SEMANTIC_ATTRIBUTE_SENTRY_OP` (`'sentry.op'`) with a proper span op
+    - Span ops should be lower case only, and use snake_case. The `.` character is used to delimit op parts.
+    - flag any non-conforming origin values as invalid and link to the span op specification (https://develop.sentry.dev/sdk/telemetry/traces/span-operations/)
 - When calling `captureException`, always make sure that the `mechanism` is set:
   - `handled`: must be set to `true` or `false`
   - `type`: must be set to a proper origin (i.e. identify the integration and part in the integration that caught the exception).

From 1586c5d189d568becc9aefa05b55829da925c2f1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Dec 2025 12:22:42 +0100
Subject: [PATCH 151/186] ci(deps): bump peter-evans/create-pull-request from
 7.0.8 to 7.0.9 (#18361)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps
[peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request)
from 7.0.8 to 7.0.9.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/peter-evans/create-pull-request/releases">peter-evans/create-pull-request's
releases</a>.</em></p>
<blockquote>
<h2>Create Pull Request v7.0.9</h2>
<p>⚙️ Fixes an <a
href="https://github.com/peter-evans/create-pull-request/issues/4228">incompatibility</a>
with the recently released <code>actions/checkout@v6</code>.</p>
<h2>What's Changed</h2>
<ul>
<li>~70 dependency updates by <a
href="https://github.com/dependabot"><code>@​dependabot</code></a></li>
<li>docs: fix workaround description about <code>ready_for_review</code>
by <a href="https://github.com/ybiquitous"><code>@​ybiquitous</code></a>
in <a
href="https://github.com/peter-evans/create-pull-request/pull/3939">peter-evans/create-pull-request#3939</a></li>
<li>Docs: <code>add-paths</code> default behavior by <a
href="https://github.com/joeflack4"><code>@​joeflack4</code></a> in <a
href="https://github.com/peter-evans/create-pull-request/pull/3928">peter-evans/create-pull-request#3928</a></li>
<li>docs: update to create-github-app-token v2 by <a
href="https://github.com/Goooler"><code>@​Goooler</code></a> in <a
href="https://github.com/peter-evans/create-pull-request/pull/4063">peter-evans/create-pull-request#4063</a></li>
<li>Fix compatibility with actions/checkout@v6 by <a
href="https://github.com/ericsciple"><code>@​ericsciple</code></a> in <a
href="https://github.com/peter-evans/create-pull-request/pull/4230">peter-evans/create-pull-request#4230</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/joeflack4"><code>@​joeflack4</code></a>
made their first contribution in <a
href="https://github.com/peter-evans/create-pull-request/pull/3928">peter-evans/create-pull-request#3928</a></li>
<li><a href="https://github.com/Goooler"><code>@​Goooler</code></a> made
their first contribution in <a
href="https://github.com/peter-evans/create-pull-request/pull/4063">peter-evans/create-pull-request#4063</a></li>
<li><a
href="https://github.com/ericsciple"><code>@​ericsciple</code></a> made
their first contribution in <a
href="https://github.com/peter-evans/create-pull-request/pull/4230">peter-evans/create-pull-request#4230</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/peter-evans/create-pull-request/compare/v7.0.8...v7.0.9">https://github.com/peter-evans/create-pull-request/compare/v7.0.8...v7.0.9</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/peter-evans/create-pull-request/commit/84ae59a2cdc2258d6fa0732dd66352dddae2a412"><code>84ae59a</code></a>
fix: compatibility with actions/checkout@v6 (<a
href="https://github.com/peter-evans/create-pull-request/issues/4230">#4230</a>)</li>
<li><a
href="https://github.com/peter-evans/create-pull-request/commit/b4733b9419fd47bbfa1807b15627e17cd70b5b22"><code>b4733b9</code></a>
build(deps-dev): bump js-yaml from 4.1.0 to 4.1.1 (<a
href="https://github.com/peter-evans/create-pull-request/issues/4222">#4222</a>)</li>
<li><a
href="https://github.com/peter-evans/create-pull-request/commit/0edc001d28a2959cd7a6b505629f1d82f0a6e67d"><code>0edc001</code></a>
build(deps-dev): bump the npm group with 2 updates (<a
href="https://github.com/peter-evans/create-pull-request/issues/4201">#4201</a>)</li>
<li><a
href="https://github.com/peter-evans/create-pull-request/commit/430aea0fb112656c3ac187e7a22b3604508ba3a7"><code>430aea0</code></a>
build(deps): bump the github-actions group with 3 updates (<a
href="https://github.com/peter-evans/create-pull-request/issues/4200">#4200</a>)</li>
<li><a
href="https://github.com/peter-evans/create-pull-request/commit/46cdba753c74545733b821043d64bd6925fc4da9"><code>46cdba7</code></a>
build(deps-dev): bump the npm group with 3 updates (<a
href="https://github.com/peter-evans/create-pull-request/issues/4185">#4185</a>)</li>
<li><a
href="https://github.com/peter-evans/create-pull-request/commit/b937339b17ca3e45ec14ebcafb879873b1ee8564"><code>b937339</code></a>
build(deps): bump the github-actions group with 2 updates (<a
href="https://github.com/peter-evans/create-pull-request/issues/4184">#4184</a>)</li>
<li><a
href="https://github.com/peter-evans/create-pull-request/commit/e9af275c3778a67411fcac2d613e8d4e9be452fd"><code>e9af275</code></a>
ci: update dependabot config</li>
<li><a
href="https://github.com/peter-evans/create-pull-request/commit/d3e081a03ae8d69301ed924bae10d70ea4af94d9"><code>d3e081a</code></a>
build(deps-dev): bump <code>@​types/node</code> from 18.19.127 to
18.19.128 (<a
href="https://github.com/peter-evans/create-pull-request/issues/4178">#4178</a>)</li>
<li><a
href="https://github.com/peter-evans/create-pull-request/commit/9ec683ee07f9121fdf529b923931dd78d977a5c9"><code>9ec683e</code></a>
build(deps-dev): bump <code>@​types/node</code> from 18.19.125 to
18.19.127 (<a
href="https://github.com/peter-evans/create-pull-request/issues/4165">#4165</a>)</li>
<li><a
href="https://github.com/peter-evans/create-pull-request/commit/65d8d10bf76513796c0f69457c2567b5da3b9626"><code>65d8d10</code></a>
build(deps-dev): bump ts-jest from 29.4.2 to 29.4.4 (<a
href="https://github.com/peter-evans/create-pull-request/issues/4163">#4163</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/peter-evans/create-pull-request/compare/271a8d0340265f705b14b6d32b9829c1cb33d45e...84ae59a2cdc2258d6fa0732dd66352dddae2a412">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=peter-evans/create-pull-request&package-manager=github_actions&previous-version=7.0.8&new-version=7.0.9)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/external-contributors.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/external-contributors.yml b/.github/workflows/external-contributors.yml
index 9a0f85cdea7e..1566299d67e9 100644
--- a/.github/workflows/external-contributors.yml
+++ b/.github/workflows/external-contributors.yml
@@ -36,7 +36,7 @@ jobs:
           author_association: ${{ github.event.pull_request.author_association }}
 
       - name: Create PR with changes
-        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e
+        uses: peter-evans/create-pull-request@84ae59a2cdc2258d6fa0732dd66352dddae2a412
         with:
           # This token is scoped to Daniel Griesser
           # If we used the default GITHUB_TOKEN, the resulting PR would not trigger CI :(

From ae482c9a61616fe2d7edb38b153db1235cd86f2f Mon Sep 17 00:00:00 2001
From: Andrei Borza <andrei.borza@sentry.io>
Date: Tue, 2 Dec 2025 14:39:58 +0100
Subject: [PATCH 152/186] meta(changelog): Update changelog for 10.28.0

---
 CHANGELOG.md | 38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 551223c6cc62..e6f4d130cbd3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,9 +4,11 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 10.28.0
+
 ### Important Changes
 
-- **feat(core): Make `matcher` parameter optional in `makeMultiplexedTransport` ([#10798](https://github.com/getsentry/sentry-javascript/pull/10798))** .
+- **feat(core): Make `matcher` parameter optional in `makeMultiplexedTransport` ([#10798](https://github.com/getsentry/sentry-javascript/pull/10798))**
 
 The `matcher` parameter in `makeMultiplexedTransport` is now optional with a sensible default. This makes it much easier to use the multiplexed transport for sending events to multiple DSNs based on runtime configuration.
 
@@ -69,6 +71,40 @@ The default matcher looks for routing information in `event.extra[MULTIPLEXED_TR
 
 This release adds support for `cacheComponents` on turbopack builds. We are working on adding support for this feature in webpack builds as well.
 
+### Other Changes
+
+- feat: Publish AWS Lambda Layer for Node 24 ([#18327](https://github.com/getsentry/sentry-javascript/pull/18327))
+- feat(browser): Expose langchain instrumentation ([#18342](https://github.com/getsentry/sentry-javascript/pull/18342))
+- feat(browser): Expose langgraph instrumentation ([#18345](https://github.com/getsentry/sentry-javascript/pull/18345))
+- feat(cloudflare): Allow specifying a custom fetch in Cloudflare transport options ([#18335](https://github.com/getsentry/sentry-javascript/pull/18335))
+- feat(core): Add `isolateTrace` option to `Sentry.withMonitor()` ([#18079](https://github.com/getsentry/sentry-javascript/pull/18079))
+- feat(deps): bump @sentry/webpack-plugin from 4.3.0 to 4.6.1 ([#18272](https://github.com/getsentry/sentry-javascript/pull/18272))
+- feat(nextjs): Add cloudflare `waitUntil` detection ([#18336](https://github.com/getsentry/sentry-javascript/pull/18336))
+- feat(node): Add LangChain v1 support ([#18306](https://github.com/getsentry/sentry-javascript/pull/18306))
+- feat(remix): Add parameterized transaction naming for routes ([#17951](https://github.com/getsentry/sentry-javascript/pull/17951))
+- fix(cloudflare): Keep http root span alive until streaming responses are consumed ([#18087](https://github.com/getsentry/sentry-javascript/pull/18087))
+- fix(cloudflare): Wait for async events to finish ([#18334](https://github.com/getsentry/sentry-javascript/pull/18334))
+- fix(core): `continueTrace` doesn't propagate given trace ID if active span exists ([#18328](https://github.com/getsentry/sentry-javascript/pull/18328))
+- fix(node-core): Handle custom scope in log messages without parameters ([#18322](https://github.com/getsentry/sentry-javascript/pull/18322))
+- fix(opentelemetry): Ensure Sentry spans don't leak when tracing is disabled ([#18337](https://github.com/getsentry/sentry-javascript/pull/18337))
+- fix(react-router): Use underscores in trace origin values ([#18351](https://github.com/getsentry/sentry-javascript/pull/18351))
+
+<details>
+  <summary><strong>Internal Changes</strong></summary>
+
+- chore: Allow URLs as issue ([#18372](https://github.com/getsentry/sentry-javascript/pull/18372))
+- chore(changelog): Add entry for [#18304](https://github.com/getsentry/sentry-javascript/pull/18304) ([#18329](https://github.com/getsentry/sentry-javascript/pull/18329))
+- chore(ci): Add action to track all PRs as issues ([#18363](https://github.com/getsentry/sentry-javascript/pull/18363))
+- chore(github): Adjust `BUGBOT.md` rules to flag invalid op and origin values during review ([#18352](https://github.com/getsentry/sentry-javascript/pull/18352))
+- chore(tanstackstart-react): Export custom inits from tanstackstart-react ([#18369](https://github.com/getsentry/sentry-javascript/pull/18369))
+- chore(tanstackstart-react)!: Remove empty placeholder implementations ([#18338](https://github.com/getsentry/sentry-javascript/pull/18338))
+- ci: Add action to create issue on gitflow merge conflicts ([#18319](https://github.com/getsentry/sentry-javascript/pull/18319))
+- ci(deps): bump actions/checkout from 5 to 6 ([#18268](https://github.com/getsentry/sentry-javascript/pull/18268))
+- ci(deps): bump peter-evans/create-pull-request from 7.0.8 to 7.0.9 ([#18361](https://github.com/getsentry/sentry-javascript/pull/18361))
+- test(cloudflare): Add typechecks for cloudflare-worker e2e test ([#18321](https://github.com/getsentry/sentry-javascript/pull/18321))
+
+</details>
+
 ## 10.27.0
 
 ### Important Changes

From 301edd829a1823d6c1554814da08f6607a0f91ee Mon Sep 17 00:00:00 2001
From: Andrei Borza <andrei.borza@sentry.io>
Date: Tue, 2 Dec 2025 14:44:19 +0100
Subject: [PATCH 153/186] meta(changelog): Update changelog for 10.28.0

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6f4d130cbd3..9f745ef5afe5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -88,6 +88,8 @@ This release adds support for `cacheComponents` on turbopack builds. We are work
 - fix(node-core): Handle custom scope in log messages without parameters ([#18322](https://github.com/getsentry/sentry-javascript/pull/18322))
 - fix(opentelemetry): Ensure Sentry spans don't leak when tracing is disabled ([#18337](https://github.com/getsentry/sentry-javascript/pull/18337))
 - fix(react-router): Use underscores in trace origin values ([#18351](https://github.com/getsentry/sentry-javascript/pull/18351))
+- chore(tanstackstart-react): Export custom inits from tanstackstart-react ([#18369](https://github.com/getsentry/sentry-javascript/pull/18369))
+- chore(tanstackstart-react)!: Remove empty placeholder implementations ([#18338](https://github.com/getsentry/sentry-javascript/pull/18338))
 
 <details>
   <summary><strong>Internal Changes</strong></summary>
@@ -96,8 +98,6 @@ This release adds support for `cacheComponents` on turbopack builds. We are work
 - chore(changelog): Add entry for [#18304](https://github.com/getsentry/sentry-javascript/pull/18304) ([#18329](https://github.com/getsentry/sentry-javascript/pull/18329))
 - chore(ci): Add action to track all PRs as issues ([#18363](https://github.com/getsentry/sentry-javascript/pull/18363))
 - chore(github): Adjust `BUGBOT.md` rules to flag invalid op and origin values during review ([#18352](https://github.com/getsentry/sentry-javascript/pull/18352))
-- chore(tanstackstart-react): Export custom inits from tanstackstart-react ([#18369](https://github.com/getsentry/sentry-javascript/pull/18369))
-- chore(tanstackstart-react)!: Remove empty placeholder implementations ([#18338](https://github.com/getsentry/sentry-javascript/pull/18338))
 - ci: Add action to create issue on gitflow merge conflicts ([#18319](https://github.com/getsentry/sentry-javascript/pull/18319))
 - ci(deps): bump actions/checkout from 5 to 6 ([#18268](https://github.com/getsentry/sentry-javascript/pull/18268))
 - ci(deps): bump peter-evans/create-pull-request from 7.0.8 to 7.0.9 ([#18361](https://github.com/getsentry/sentry-javascript/pull/18361))

From 7496a15b352056464a5d621228cd8a0a160624a8 Mon Sep 17 00:00:00 2001
From: getsentry-bot <bot@sentry.io>
Date: Tue, 2 Dec 2025 14:34:35 +0000
Subject: [PATCH 154/186] release: 10.28.0

---
 .../browser-integration-tests/package.json         |  4 ++--
 .../bundle-analyzer-scenarios/package.json         |  2 +-
 dev-packages/bundler-tests/package.json            |  4 ++--
 dev-packages/clear-cache-gh-action/package.json    |  2 +-
 .../cloudflare-integration-tests/package.json      |  6 +++---
 dev-packages/e2e-tests/package.json                |  2 +-
 .../external-contributor-gh-action/package.json    |  2 +-
 .../node-core-integration-tests/package.json       |  6 +++---
 dev-packages/node-integration-tests/package.json   | 10 +++++-----
 dev-packages/node-overhead-gh-action/package.json  |  4 ++--
 dev-packages/rollup-utils/package.json             |  2 +-
 dev-packages/size-limit-gh-action/package.json     |  2 +-
 dev-packages/test-utils/package.json               |  4 ++--
 lerna.json                                         |  2 +-
 packages/angular/package.json                      |  6 +++---
 packages/astro/package.json                        |  8 ++++----
 packages/aws-serverless/package.json               |  8 ++++----
 packages/browser-utils/package.json                |  4 ++--
 packages/browser/package.json                      | 14 +++++++-------
 packages/bun/package.json                          |  6 +++---
 packages/cloudflare/package.json                   |  4 ++--
 packages/core/package.json                         |  2 +-
 packages/deno/package.json                         |  4 ++--
 packages/ember/package.json                        |  6 +++---
 packages/eslint-config-sdk/package.json            |  6 +++---
 packages/eslint-plugin-sdk/package.json            |  2 +-
 packages/feedback/package.json                     |  4 ++--
 packages/gatsby/package.json                       |  6 +++---
 packages/google-cloud-serverless/package.json      |  6 +++---
 packages/integration-shims/package.json            |  4 ++--
 packages/nestjs/package.json                       |  6 +++---
 packages/nextjs/package.json                       | 14 +++++++-------
 packages/node-core/package.json                    |  6 +++---
 packages/node-native/package.json                  |  6 +++---
 packages/node/package.json                         |  8 ++++----
 packages/nuxt/package.json                         | 12 ++++++------
 packages/opentelemetry/package.json                |  4 ++--
 packages/profiling-node/package.json               |  6 +++---
 packages/react-router/package.json                 | 10 +++++-----
 packages/react/package.json                        |  6 +++---
 packages/remix/package.json                        |  8 ++++----
 packages/replay-canvas/package.json                |  6 +++---
 packages/replay-internal/package.json              |  8 ++++----
 packages/replay-worker/package.json                |  2 +-
 packages/solid/package.json                        |  6 +++---
 packages/solidstart/package.json                   |  8 ++++----
 packages/svelte/package.json                       |  6 +++---
 packages/sveltekit/package.json                    | 10 +++++-----
 packages/tanstackstart-react/package.json          | 10 +++++-----
 packages/tanstackstart/package.json                |  2 +-
 packages/types/package.json                        |  4 ++--
 packages/typescript/package.json                   |  2 +-
 packages/vercel-edge/package.json                  |  6 +++---
 packages/vue/package.json                          |  6 +++---
 packages/wasm/package.json                         |  6 +++---
 55 files changed, 155 insertions(+), 155 deletions(-)

diff --git a/dev-packages/browser-integration-tests/package.json b/dev-packages/browser-integration-tests/package.json
index e5ff62a58084..87a8ec7aa805 100644
--- a/dev-packages/browser-integration-tests/package.json
+++ b/dev-packages/browser-integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/browser-integration-tests",
-  "version": "10.27.0",
+  "version": "10.28.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": "10.27.0",
+    "@sentry/browser": "10.28.0",
     "@supabase/supabase-js": "2.49.3",
     "axios": "^1.12.2",
     "babel-loader": "^8.2.2",
diff --git a/dev-packages/bundle-analyzer-scenarios/package.json b/dev-packages/bundle-analyzer-scenarios/package.json
index 518da1c1e8af..b8a4892949b0 100644
--- a/dev-packages/bundle-analyzer-scenarios/package.json
+++ b/dev-packages/bundle-analyzer-scenarios/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/bundle-analyzer-scenarios",
-  "version": "10.27.0",
+  "version": "10.28.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",
diff --git a/dev-packages/bundler-tests/package.json b/dev-packages/bundler-tests/package.json
index b2a307291c90..288c9907bcc7 100644
--- a/dev-packages/bundler-tests/package.json
+++ b/dev-packages/bundler-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/bundler-tests",
-  "version": "10.27.0",
+  "version": "10.28.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.27.0",
+    "@sentry/browser": "10.28.0",
     "rollup": "^4.0.0",
     "vite": "^5.0.0",
     "vitest": "^3.2.4",
diff --git a/dev-packages/clear-cache-gh-action/package.json b/dev-packages/clear-cache-gh-action/package.json
index 9592fba2a84d..de29981194c2 100644
--- a/dev-packages/clear-cache-gh-action/package.json
+++ b/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.27.0",
+  "version": "10.28.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
diff --git a/dev-packages/cloudflare-integration-tests/package.json b/dev-packages/cloudflare-integration-tests/package.json
index 89c3abb7d5e8..2bfed522960f 100644
--- a/dev-packages/cloudflare-integration-tests/package.json
+++ b/dev-packages/cloudflare-integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/cloudflare-integration-tests",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
@@ -14,11 +14,11 @@
   },
   "dependencies": {
     "@langchain/langgraph": "^1.0.1",
-    "@sentry/cloudflare": "10.27.0"
+    "@sentry/cloudflare": "10.28.0"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20250922.0",
-    "@sentry-internal/test-utils": "10.27.0",
+    "@sentry-internal/test-utils": "10.28.0",
     "eslint-plugin-regexp": "^1.15.0",
     "vitest": "^3.2.4",
     "wrangler": "4.22.0"
diff --git a/dev-packages/e2e-tests/package.json b/dev-packages/e2e-tests/package.json
index be48359c7045..c2c9e01d0714 100644
--- a/dev-packages/e2e-tests/package.json
+++ b/dev-packages/e2e-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/e2e-tests",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "license": "MIT",
   "private": true,
   "scripts": {
diff --git a/dev-packages/external-contributor-gh-action/package.json b/dev-packages/external-contributor-gh-action/package.json
index 8c839a63b4aa..178953f83ede 100644
--- a/dev-packages/external-contributor-gh-action/package.json
+++ b/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": "10.27.0",
+  "version": "10.28.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
diff --git a/dev-packages/node-core-integration-tests/package.json b/dev-packages/node-core-integration-tests/package.json
index a5be477c7334..90b8e3cfc12e 100644
--- a/dev-packages/node-core-integration-tests/package.json
+++ b/dev-packages/node-core-integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/node-core-integration-tests",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
@@ -34,8 +34,8 @@
     "@opentelemetry/resources": "^2.2.0",
     "@opentelemetry/sdk-trace-base": "^2.2.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry/core": "10.27.0",
-    "@sentry/node-core": "10.27.0",
+    "@sentry/core": "10.28.0",
+    "@sentry/node-core": "10.28.0",
     "body-parser": "^1.20.3",
     "cors": "^2.8.5",
     "cron": "^3.1.6",
diff --git a/dev-packages/node-integration-tests/package.json b/dev-packages/node-integration-tests/package.json
index 8a81e262d33f..c599419ebdee 100644
--- a/dev-packages/node-integration-tests/package.json
+++ b/dev-packages/node-integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/node-integration-tests",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
@@ -36,9 +36,9 @@
     "@nestjs/core": "^11",
     "@nestjs/platform-express": "^11",
     "@prisma/client": "6.15.0",
-    "@sentry/aws-serverless": "10.27.0",
-    "@sentry/core": "10.27.0",
-    "@sentry/node": "10.27.0",
+    "@sentry/aws-serverless": "10.28.0",
+    "@sentry/core": "10.28.0",
+    "@sentry/node": "10.28.0",
     "@types/mongodb": "^3.6.20",
     "@types/mysql": "^2.15.21",
     "@types/pg": "^8.6.5",
@@ -83,7 +83,7 @@
     "yargs": "^16.2.0"
   },
   "devDependencies": {
-    "@sentry-internal/test-utils": "10.27.0",
+    "@sentry-internal/test-utils": "10.28.0",
     "@types/amqplib": "^0.10.5",
     "@types/node-cron": "^3.0.11",
     "@types/node-schedule": "^2.1.7",
diff --git a/dev-packages/node-overhead-gh-action/package.json b/dev-packages/node-overhead-gh-action/package.json
index d044b8047bcc..bc855cf340bc 100644
--- a/dev-packages/node-overhead-gh-action/package.json
+++ b/dev-packages/node-overhead-gh-action/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/node-overhead-gh-action",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
@@ -23,7 +23,7 @@
     "fix": "eslint . --format stylish --fix"
   },
   "dependencies": {
-    "@sentry/node": "10.27.0",
+    "@sentry/node": "10.28.0",
     "express": "^4.21.1",
     "mysql2": "^3.14.4"
   },
diff --git a/dev-packages/rollup-utils/package.json b/dev-packages/rollup-utils/package.json
index 3c8e3a029d28..5399916e9cb2 100644
--- a/dev-packages/rollup-utils/package.json
+++ b/dev-packages/rollup-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/rollup-utils",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Rollup utilities used at Sentry for the Sentry JavaScript SDK",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/rollup-utils",
diff --git a/dev-packages/size-limit-gh-action/package.json b/dev-packages/size-limit-gh-action/package.json
index 59d885937a9f..f624959ffbd4 100644
--- a/dev-packages/size-limit-gh-action/package.json
+++ b/dev-packages/size-limit-gh-action/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@sentry-internal/size-limit-gh-action",
   "description": "An internal Github Action to compare the current size of a PR against the one on develop.",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
diff --git a/dev-packages/test-utils/package.json b/dev-packages/test-utils/package.json
index 3df8bcc441ea..801fc8d73d0a 100644
--- a/dev-packages/test-utils/package.json
+++ b/dev-packages/test-utils/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "10.27.0",
+  "version": "10.28.0",
   "name": "@sentry-internal/test-utils",
   "author": "Sentry",
   "license": "MIT",
@@ -48,7 +48,7 @@
   },
   "devDependencies": {
     "@playwright/test": "~1.53.2",
-    "@sentry/core": "10.27.0",
+    "@sentry/core": "10.28.0",
     "eslint-plugin-regexp": "^1.15.0"
   },
   "volta": {
diff --git a/lerna.json b/lerna.json
index 9ad4c26bf2a7..593e71d979e2 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "npmClient": "yarn"
 }
diff --git a/packages/angular/package.json b/packages/angular/package.json
index 72d29ca6b272..9e02da81a211 100644
--- a/packages/angular/package.json
+++ b/packages/angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/angular",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for Angular",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/angular",
@@ -21,8 +21,8 @@
     "rxjs": "^6.5.5 || ^7.x"
   },
   "dependencies": {
-    "@sentry/browser": "10.27.0",
-    "@sentry/core": "10.27.0",
+    "@sentry/browser": "10.28.0",
+    "@sentry/core": "10.28.0",
     "tslib": "^2.4.1"
   },
   "devDependencies": {
diff --git a/packages/astro/package.json b/packages/astro/package.json
index 99d5eabae3e9..08d950c8e9b6 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/astro",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for Astro",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/astro",
@@ -56,9 +56,9 @@
     "astro": ">=3.x || >=4.0.0-beta || >=5.x"
   },
   "dependencies": {
-    "@sentry/browser": "10.27.0",
-    "@sentry/core": "10.27.0",
-    "@sentry/node": "10.27.0",
+    "@sentry/browser": "10.28.0",
+    "@sentry/core": "10.28.0",
+    "@sentry/node": "10.28.0",
     "@sentry/vite-plugin": "^4.1.0"
   },
   "devDependencies": {
diff --git a/packages/aws-serverless/package.json b/packages/aws-serverless/package.json
index 2aaaa292cd93..86e20d12f519 100644
--- a/packages/aws-serverless/package.json
+++ b/packages/aws-serverless/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/aws-serverless",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for AWS Lambda and AWS Serverless Environments",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/aws-serverless",
@@ -69,9 +69,9 @@
     "@opentelemetry/instrumentation": "^0.208.0",
     "@opentelemetry/instrumentation-aws-sdk": "0.64.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry/core": "10.27.0",
-    "@sentry/node": "10.27.0",
-    "@sentry/node-core": "10.27.0",
+    "@sentry/core": "10.28.0",
+    "@sentry/node": "10.28.0",
+    "@sentry/node-core": "10.28.0",
     "@types/aws-lambda": "^8.10.62"
   },
   "devDependencies": {
diff --git a/packages/browser-utils/package.json b/packages/browser-utils/package.json
index 37ac4a317bc8..d52f4e1ad9cc 100644
--- a/packages/browser-utils/package.json
+++ b/packages/browser-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/browser-utils",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Browser Utilities for all Sentry JavaScript SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/browser-utils",
@@ -39,7 +39,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.27.0"
+    "@sentry/core": "10.28.0"
   },
   "scripts": {
     "build": "run-p build:transpile build:types",
diff --git a/packages/browser/package.json b/packages/browser/package.json
index 2ecab4e6119e..e2be003f4601 100644
--- a/packages/browser/package.json
+++ b/packages/browser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/browser",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for browsers",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/browser",
@@ -44,14 +44,14 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry-internal/browser-utils": "10.27.0",
-    "@sentry-internal/feedback": "10.27.0",
-    "@sentry-internal/replay": "10.27.0",
-    "@sentry-internal/replay-canvas": "10.27.0",
-    "@sentry/core": "10.27.0"
+    "@sentry-internal/browser-utils": "10.28.0",
+    "@sentry-internal/feedback": "10.28.0",
+    "@sentry-internal/replay": "10.28.0",
+    "@sentry-internal/replay-canvas": "10.28.0",
+    "@sentry/core": "10.28.0"
   },
   "devDependencies": {
-    "@sentry-internal/integration-shims": "10.27.0",
+    "@sentry-internal/integration-shims": "10.28.0",
     "fake-indexeddb": "^6.2.4"
   },
   "scripts": {
diff --git a/packages/bun/package.json b/packages/bun/package.json
index f1464af7a732..1c0cb9a44bdd 100644
--- a/packages/bun/package.json
+++ b/packages/bun/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/bun",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for bun",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/bun",
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.27.0",
-    "@sentry/node": "10.27.0"
+    "@sentry/core": "10.28.0",
+    "@sentry/node": "10.28.0"
   },
   "devDependencies": {
     "bun-types": "^1.2.9"
diff --git a/packages/cloudflare/package.json b/packages/cloudflare/package.json
index 163afddca271..8896f95d6e9c 100644
--- a/packages/cloudflare/package.json
+++ b/packages/cloudflare/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/cloudflare",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for Cloudflare Workers and Pages",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/cloudflare",
@@ -50,7 +50,7 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@sentry/core": "10.27.0"
+    "@sentry/core": "10.28.0"
   },
   "peerDependencies": {
     "@cloudflare/workers-types": "^4.x"
diff --git a/packages/core/package.json b/packages/core/package.json
index 76ac4bc3e96f..175d193ea435 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/core",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Base implementation for all Sentry JavaScript SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/core",
diff --git a/packages/deno/package.json b/packages/deno/package.json
index cc40ededd6e7..6e724e196f30 100644
--- a/packages/deno/package.json
+++ b/packages/deno/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/deno",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for Deno",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/deno",
@@ -25,7 +25,7 @@
   ],
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@sentry/core": "10.27.0"
+    "@sentry/core": "10.28.0"
   },
   "scripts": {
     "deno-types": "node ./scripts/download-deno-types.mjs",
diff --git a/packages/ember/package.json b/packages/ember/package.json
index a2307bb11013..a2c165375056 100644
--- a/packages/ember/package.json
+++ b/packages/ember/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/ember",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for Ember.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/ember",
@@ -32,8 +32,8 @@
   "dependencies": {
     "@babel/core": "^7.27.7",
     "@embroider/macros": "^1.16.0",
-    "@sentry/browser": "10.27.0",
-    "@sentry/core": "10.27.0",
+    "@sentry/browser": "10.28.0",
+    "@sentry/core": "10.28.0",
     "ember-auto-import": "^2.7.2",
     "ember-cli-babel": "^8.2.0",
     "ember-cli-htmlbars": "^6.1.1",
diff --git a/packages/eslint-config-sdk/package.json b/packages/eslint-config-sdk/package.json
index 8982ce90c026..91d0bc255e3f 100644
--- a/packages/eslint-config-sdk/package.json
+++ b/packages/eslint-config-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/eslint-config-sdk",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK eslint config",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-config-sdk",
@@ -22,8 +22,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry-internal/eslint-plugin-sdk": "10.27.0",
-    "@sentry-internal/typescript": "10.27.0",
+    "@sentry-internal/eslint-plugin-sdk": "10.28.0",
+    "@sentry-internal/typescript": "10.28.0",
     "@typescript-eslint/eslint-plugin": "^5.48.0",
     "@typescript-eslint/parser": "^5.48.0",
     "eslint-config-prettier": "^6.11.0",
diff --git a/packages/eslint-plugin-sdk/package.json b/packages/eslint-plugin-sdk/package.json
index 2ee8a4be4925..78e414fe59bd 100644
--- a/packages/eslint-plugin-sdk/package.json
+++ b/packages/eslint-plugin-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/eslint-plugin-sdk",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK eslint plugin",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-plugin-sdk",
diff --git a/packages/feedback/package.json b/packages/feedback/package.json
index b2b17bad3033..9f3d504683e0 100644
--- a/packages/feedback/package.json
+++ b/packages/feedback/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/feedback",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Sentry SDK integration for user feedback",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/feedback",
@@ -39,7 +39,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.27.0"
+    "@sentry/core": "10.28.0"
   },
   "devDependencies": {
     "preact": "^10.19.4"
diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json
index 8f5059ac9792..aa636d7bd036 100644
--- a/packages/gatsby/package.json
+++ b/packages/gatsby/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/gatsby",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for Gatsby.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/gatsby",
@@ -45,8 +45,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.27.0",
-    "@sentry/react": "10.27.0",
+    "@sentry/core": "10.28.0",
+    "@sentry/react": "10.28.0",
     "@sentry/webpack-plugin": "^4.6.1"
   },
   "peerDependencies": {
diff --git a/packages/google-cloud-serverless/package.json b/packages/google-cloud-serverless/package.json
index 3495aff8de55..b92bcb9a2bca 100644
--- a/packages/google-cloud-serverless/package.json
+++ b/packages/google-cloud-serverless/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/google-cloud-serverless",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for Google Cloud Functions",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/google-cloud-serverless",
@@ -48,8 +48,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.27.0",
-    "@sentry/node": "10.27.0",
+    "@sentry/core": "10.28.0",
+    "@sentry/node": "10.28.0",
     "@types/express": "^4.17.14"
   },
   "devDependencies": {
diff --git a/packages/integration-shims/package.json b/packages/integration-shims/package.json
index 437b12de6c33..fa4673867071 100644
--- a/packages/integration-shims/package.json
+++ b/packages/integration-shims/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/integration-shims",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Shims for integrations in Sentry SDK.",
   "main": "build/cjs/index.js",
   "module": "build/esm/index.js",
@@ -56,7 +56,7 @@
     "url": "https://github.com/getsentry/sentry-javascript/issues"
   },
   "dependencies": {
-    "@sentry/core": "10.27.0"
+    "@sentry/core": "10.28.0"
   },
   "engines": {
     "node": ">=18"
diff --git a/packages/nestjs/package.json b/packages/nestjs/package.json
index 2b4e04b097b9..1a340ef103da 100644
--- a/packages/nestjs/package.json
+++ b/packages/nestjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/nestjs",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for NestJS",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/nestjs",
@@ -49,8 +49,8 @@
     "@opentelemetry/instrumentation": "^0.208.0",
     "@opentelemetry/instrumentation-nestjs-core": "0.55.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry/core": "10.27.0",
-    "@sentry/node": "10.27.0"
+    "@sentry/core": "10.28.0",
+    "@sentry/node": "10.28.0"
   },
   "devDependencies": {
     "@nestjs/common": "^10.0.0",
diff --git a/packages/nextjs/package.json b/packages/nextjs/package.json
index 710a7dd33623..1f628c76ef76 100644
--- a/packages/nextjs/package.json
+++ b/packages/nextjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/nextjs",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for Next.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/nextjs",
@@ -79,13 +79,13 @@
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
     "@rollup/plugin-commonjs": "28.0.1",
-    "@sentry-internal/browser-utils": "10.27.0",
+    "@sentry-internal/browser-utils": "10.28.0",
     "@sentry/bundler-plugin-core": "^4.6.1",
-    "@sentry/core": "10.27.0",
-    "@sentry/node": "10.27.0",
-    "@sentry/opentelemetry": "10.27.0",
-    "@sentry/react": "10.27.0",
-    "@sentry/vercel-edge": "10.27.0",
+    "@sentry/core": "10.28.0",
+    "@sentry/node": "10.28.0",
+    "@sentry/opentelemetry": "10.28.0",
+    "@sentry/react": "10.28.0",
+    "@sentry/vercel-edge": "10.28.0",
     "@sentry/webpack-plugin": "^4.6.1",
     "resolve": "1.22.8",
     "rollup": "^4.35.0",
diff --git a/packages/node-core/package.json b/packages/node-core/package.json
index 57100fc16cf3..ffb34c67db78 100644
--- a/packages/node-core/package.json
+++ b/packages/node-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/node-core",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Sentry Node-Core SDK",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/node-core",
@@ -67,8 +67,8 @@
   },
   "dependencies": {
     "@apm-js-collab/tracing-hooks": "^0.3.1",
-    "@sentry/core": "10.27.0",
-    "@sentry/opentelemetry": "10.27.0",
+    "@sentry/core": "10.28.0",
+    "@sentry/opentelemetry": "10.28.0",
     "import-in-the-middle": "^2"
   },
   "devDependencies": {
diff --git a/packages/node-native/package.json b/packages/node-native/package.json
index e193f26ae795..c49047205f8c 100644
--- a/packages/node-native/package.json
+++ b/packages/node-native/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/node-native",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Native Tools for the Official Sentry Node.js SDK",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/node-native",
@@ -64,8 +64,8 @@
   },
   "dependencies": {
     "@sentry-internal/node-native-stacktrace": "^0.2.2",
-    "@sentry/core": "10.27.0",
-    "@sentry/node": "10.27.0"
+    "@sentry/core": "10.28.0",
+    "@sentry/node": "10.28.0"
   },
   "devDependencies": {
     "@types/node": "^18.19.1"
diff --git a/packages/node/package.json b/packages/node/package.json
index 95e0610c9828..40457a79fda9 100644
--- a/packages/node/package.json
+++ b/packages/node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/node",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Sentry Node SDK using OpenTelemetry for performance instrumentation",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/node",
@@ -95,9 +95,9 @@
     "@opentelemetry/sdk-trace-base": "^2.2.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
     "@prisma/instrumentation": "6.19.0",
-    "@sentry/core": "10.27.0",
-    "@sentry/node-core": "10.27.0",
-    "@sentry/opentelemetry": "10.27.0",
+    "@sentry/core": "10.28.0",
+    "@sentry/node-core": "10.28.0",
+    "@sentry/opentelemetry": "10.28.0",
     "import-in-the-middle": "^2",
     "minimatch": "^9.0.0"
   },
diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json
index 0ce5df7bb8d5..b2bafe25f57a 100644
--- a/packages/nuxt/package.json
+++ b/packages/nuxt/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/nuxt",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for Nuxt",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/nuxt",
@@ -49,13 +49,13 @@
   },
   "dependencies": {
     "@nuxt/kit": "^3.13.2",
-    "@sentry/browser": "10.27.0",
-    "@sentry/cloudflare": "10.27.0",
-    "@sentry/core": "10.27.0",
-    "@sentry/node": "10.27.0",
+    "@sentry/browser": "10.28.0",
+    "@sentry/cloudflare": "10.28.0",
+    "@sentry/core": "10.28.0",
+    "@sentry/node": "10.28.0",
     "@sentry/rollup-plugin": "^4.3.0",
     "@sentry/vite-plugin": "^4.3.0",
-    "@sentry/vue": "10.27.0"
+    "@sentry/vue": "10.28.0"
   },
   "devDependencies": {
     "@nuxt/module-builder": "^0.8.4",
diff --git a/packages/opentelemetry/package.json b/packages/opentelemetry/package.json
index 4a21c884155f..7f0292aff52a 100644
--- a/packages/opentelemetry/package.json
+++ b/packages/opentelemetry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/opentelemetry",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry utilities for OpenTelemetry",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/opentelemetry",
@@ -39,7 +39,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.27.0"
+    "@sentry/core": "10.28.0"
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.9.0",
diff --git a/packages/profiling-node/package.json b/packages/profiling-node/package.json
index f1082191997e..cf5862af68dc 100644
--- a/packages/profiling-node/package.json
+++ b/packages/profiling-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/profiling-node",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for Node.js Profiling",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/profiling-node",
@@ -63,8 +63,8 @@
   },
   "dependencies": {
     "@sentry-internal/node-cpu-profiler": "^2.2.0",
-    "@sentry/core": "10.27.0",
-    "@sentry/node": "10.27.0"
+    "@sentry/core": "10.28.0",
+    "@sentry/node": "10.28.0"
   },
   "devDependencies": {
     "@types/node": "^18.19.1"
diff --git a/packages/react-router/package.json b/packages/react-router/package.json
index fe662890fa7a..2b314384977e 100644
--- a/packages/react-router/package.json
+++ b/packages/react-router/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/react-router",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for React Router (Framework)",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/react-router",
@@ -49,11 +49,11 @@
     "@opentelemetry/core": "^2.2.0",
     "@opentelemetry/instrumentation": "^0.208.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry/browser": "10.27.0",
+    "@sentry/browser": "10.28.0",
     "@sentry/cli": "^2.58.2",
-    "@sentry/core": "10.27.0",
-    "@sentry/node": "10.27.0",
-    "@sentry/react": "10.27.0",
+    "@sentry/core": "10.28.0",
+    "@sentry/node": "10.28.0",
+    "@sentry/react": "10.28.0",
     "@sentry/vite-plugin": "^4.1.0",
     "glob": "11.1.0"
   },
diff --git a/packages/react/package.json b/packages/react/package.json
index 06d56f58b6f5..50ce70cd71b0 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/react",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for React.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/react",
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "10.27.0",
-    "@sentry/core": "10.27.0",
+    "@sentry/browser": "10.28.0",
+    "@sentry/core": "10.28.0",
     "hoist-non-react-statics": "^3.3.2"
   },
   "peerDependencies": {
diff --git a/packages/remix/package.json b/packages/remix/package.json
index 7230064df963..fd3017d1e097 100644
--- a/packages/remix/package.json
+++ b/packages/remix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/remix",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for Remix",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/remix",
@@ -69,9 +69,9 @@
     "@opentelemetry/semantic-conventions": "^1.37.0",
     "@remix-run/router": "1.x",
     "@sentry/cli": "^2.58.2",
-    "@sentry/core": "10.27.0",
-    "@sentry/node": "10.27.0",
-    "@sentry/react": "10.27.0",
+    "@sentry/core": "10.28.0",
+    "@sentry/node": "10.28.0",
+    "@sentry/react": "10.28.0",
     "glob": "^10.3.4",
     "yargs": "^17.6.0"
   },
diff --git a/packages/replay-canvas/package.json b/packages/replay-canvas/package.json
index f66b691a42fa..4e6ea9414278 100644
--- a/packages/replay-canvas/package.json
+++ b/packages/replay-canvas/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/replay-canvas",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Replay canvas integration",
   "main": "build/npm/cjs/index.js",
   "module": "build/npm/esm/index.js",
@@ -69,8 +69,8 @@
     "@sentry-internal/rrweb": "2.40.0"
   },
   "dependencies": {
-    "@sentry-internal/replay": "10.27.0",
-    "@sentry/core": "10.27.0"
+    "@sentry-internal/replay": "10.28.0",
+    "@sentry/core": "10.28.0"
   },
   "engines": {
     "node": ">=18"
diff --git a/packages/replay-internal/package.json b/packages/replay-internal/package.json
index 1cccb4c2ef50..b570677771be 100644
--- a/packages/replay-internal/package.json
+++ b/packages/replay-internal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/replay",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "User replays for Sentry",
   "main": "build/npm/cjs/index.js",
   "module": "build/npm/esm/index.js",
@@ -81,7 +81,7 @@
   "homepage": "https://docs.sentry.io/platforms/javascript/session-replay/",
   "devDependencies": {
     "@babel/core": "^7.27.7",
-    "@sentry-internal/replay-worker": "10.27.0",
+    "@sentry-internal/replay-worker": "10.28.0",
     "@sentry-internal/rrweb": "2.40.0",
     "@sentry-internal/rrweb-snapshot": "2.40.0",
     "fflate": "0.8.2",
@@ -89,8 +89,8 @@
     "jsdom-worker": "^0.3.0"
   },
   "dependencies": {
-    "@sentry-internal/browser-utils": "10.27.0",
-    "@sentry/core": "10.27.0"
+    "@sentry-internal/browser-utils": "10.28.0",
+    "@sentry/core": "10.28.0"
   },
   "engines": {
     "node": ">=18"
diff --git a/packages/replay-worker/package.json b/packages/replay-worker/package.json
index cdd3dd4059b1..5ac394fe7791 100644
--- a/packages/replay-worker/package.json
+++ b/packages/replay-worker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/replay-worker",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Worker for @sentry-internal/replay",
   "main": "build/esm/index.js",
   "module": "build/esm/index.js",
diff --git a/packages/solid/package.json b/packages/solid/package.json
index 9d6138147612..299c1cef8d49 100644
--- a/packages/solid/package.json
+++ b/packages/solid/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/solid",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for Solid",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/solid",
@@ -54,8 +54,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "10.27.0",
-    "@sentry/core": "10.27.0"
+    "@sentry/browser": "10.28.0",
+    "@sentry/core": "10.28.0"
   },
   "peerDependencies": {
     "@solidjs/router": "^0.13.4",
diff --git a/packages/solidstart/package.json b/packages/solidstart/package.json
index 1069905423fa..0be41812d1a7 100644
--- a/packages/solidstart/package.json
+++ b/packages/solidstart/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/solidstart",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for Solid Start",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/solidstart",
@@ -66,9 +66,9 @@
     }
   },
   "dependencies": {
-    "@sentry/core": "10.27.0",
-    "@sentry/node": "10.27.0",
-    "@sentry/solid": "10.27.0",
+    "@sentry/core": "10.28.0",
+    "@sentry/node": "10.28.0",
+    "@sentry/solid": "10.28.0",
     "@sentry/vite-plugin": "^4.1.0"
   },
   "devDependencies": {
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 83af1efee4a5..da82fb63d1ea 100644
--- a/packages/svelte/package.json
+++ b/packages/svelte/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/svelte",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for Svelte",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/svelte",
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "10.27.0",
-    "@sentry/core": "10.27.0",
+    "@sentry/browser": "10.28.0",
+    "@sentry/core": "10.28.0",
     "magic-string": "^0.30.0"
   },
   "peerDependencies": {
diff --git a/packages/sveltekit/package.json b/packages/sveltekit/package.json
index a39ef877222e..1a10c32d9c13 100644
--- a/packages/sveltekit/package.json
+++ b/packages/sveltekit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/sveltekit",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for SvelteKit",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/sveltekit",
@@ -48,10 +48,10 @@
   },
   "dependencies": {
     "@babel/parser": "7.26.9",
-    "@sentry/cloudflare": "10.27.0",
-    "@sentry/core": "10.27.0",
-    "@sentry/node": "10.27.0",
-    "@sentry/svelte": "10.27.0",
+    "@sentry/cloudflare": "10.28.0",
+    "@sentry/core": "10.28.0",
+    "@sentry/node": "10.28.0",
+    "@sentry/svelte": "10.28.0",
     "@sentry/vite-plugin": "^4.1.0",
     "magic-string": "0.30.7",
     "recast": "0.23.11",
diff --git a/packages/tanstackstart-react/package.json b/packages/tanstackstart-react/package.json
index dac0c980b1f5..230ad3657d81 100644
--- a/packages/tanstackstart-react/package.json
+++ b/packages/tanstackstart-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/tanstackstart-react",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for TanStack Start React",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/tanstackstart-react",
@@ -52,10 +52,10 @@
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry-internal/browser-utils": "10.27.0",
-    "@sentry/core": "10.27.0",
-    "@sentry/node": "10.27.0",
-    "@sentry/react": "10.27.0"
+    "@sentry-internal/browser-utils": "10.28.0",
+    "@sentry/core": "10.28.0",
+    "@sentry/node": "10.28.0",
+    "@sentry/react": "10.28.0"
   },
   "scripts": {
     "build": "run-p build:transpile build:types",
diff --git a/packages/tanstackstart/package.json b/packages/tanstackstart/package.json
index 6a99cfefdb99..314c496baf16 100644
--- a/packages/tanstackstart/package.json
+++ b/packages/tanstackstart/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/tanstackstart",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Utilities for the Sentry TanStack Start SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/tanstackstart",
diff --git a/packages/types/package.json b/packages/types/package.json
index 70cd501b4eb6..671dd8732658 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/types",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Types for all Sentry JavaScript SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/types",
@@ -57,7 +57,7 @@
     "yalc:publish": "yalc publish --push --sig"
   },
   "dependencies": {
-    "@sentry/core": "10.27.0"
+    "@sentry/core": "10.28.0"
   },
   "volta": {
     "extends": "../../package.json"
diff --git a/packages/typescript/package.json b/packages/typescript/package.json
index f1d5c80f4954..ba1f5a3d5d9a 100644
--- a/packages/typescript/package.json
+++ b/packages/typescript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/typescript",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Typescript configuration used at Sentry",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/typescript",
diff --git a/packages/vercel-edge/package.json b/packages/vercel-edge/package.json
index 90d61f964f34..f8e1f076cc17 100644
--- a/packages/vercel-edge/package.json
+++ b/packages/vercel-edge/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/vercel-edge",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for the Vercel Edge Runtime",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/vercel-edge",
@@ -41,14 +41,14 @@
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/resources": "^2.2.0",
-    "@sentry/core": "10.27.0"
+    "@sentry/core": "10.28.0"
   },
   "devDependencies": {
     "@edge-runtime/types": "3.0.1",
     "@opentelemetry/core": "^2.2.0",
     "@opentelemetry/sdk-trace-base": "^2.2.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry/opentelemetry": "10.27.0"
+    "@sentry/opentelemetry": "10.28.0"
   },
   "scripts": {
     "build": "run-p build:transpile build:types",
diff --git a/packages/vue/package.json b/packages/vue/package.json
index 6cb37663ebbf..643a9ca30e5e 100644
--- a/packages/vue/package.json
+++ b/packages/vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/vue",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for Vue.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/vue",
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "10.27.0",
-    "@sentry/core": "10.27.0"
+    "@sentry/browser": "10.28.0",
+    "@sentry/core": "10.28.0"
   },
   "peerDependencies": {
     "pinia": "2.x || 3.x",
diff --git a/packages/wasm/package.json b/packages/wasm/package.json
index a864eca972f7..1996c8e6e1c8 100644
--- a/packages/wasm/package.json
+++ b/packages/wasm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/wasm",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Support for WASM.",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/wasm",
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "10.27.0",
-    "@sentry/core": "10.27.0"
+    "@sentry/browser": "10.28.0",
+    "@sentry/core": "10.28.0"
   },
   "scripts": {
     "build": "run-p build:transpile build:bundle build:types",

From edc56438e627487876e233395a49fc777124f4c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Peer=20St=C3=B6cklmair?= <jan.peer@sentry.io>
Date: Tue, 2 Dec 2025 15:07:30 +0000
Subject: [PATCH 155/186] chore: Ignore dependabot, prepare-release and Gitflow
 for PR references (#18380)

We don't need to add tickets for our internal releases such as
https://github.com/getsentry/sentry-javascript/pull/18378, [Gitflow
automations](https://github.com/getsentry/sentry-javascript/pull/18255)
or [contributor
updates](https://github.com/getsentry/sentry-javascript/pull/15156)
---
 .github/workflows/create-issue-for-unreferenced-prs.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/create-issue-for-unreferenced-prs.yml b/.github/workflows/create-issue-for-unreferenced-prs.yml
index 725a2f8244b0..a0eee060f282 100644
--- a/.github/workflows/create-issue-for-unreferenced-prs.yml
+++ b/.github/workflows/create-issue-for-unreferenced-prs.yml
@@ -19,6 +19,11 @@ concurrency:
 jobs:
   check_for_issue_reference:
     runs-on: ubuntu-latest
+    if: |
+      !contains(github.event.pull_request.labels.*.name, 'Dev: Gitflow')
+      && !startsWith(github.event.pull_request.head.ref, 'external-contributor/')
+      && !startsWith(github.event.pull_request.head.ref, 'prepare-release/')
+      && !startsWith(github.event.pull_request.head.ref, 'dependabot/')
     steps:
       - name: Check PR Body and Title for Issue Reference
         uses: actions/github-script@v8

From f271bbb45f436dc063080218718a8c32728e7297 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Peer=20St=C3=B6cklmair?= <jan.peer@sentry.io>
Date: Tue, 2 Dec 2025 16:03:25 +0000
Subject: [PATCH 156/186] feat: update eslint to v8 (#18264)

This upgrades our internal eslint config to use v8. Theoretically this
is considered a breaking change. Since this is an internal
`@sentry-internal/*` package, we can release this in a non-breaking
fashion

With v8 couple of changes came. Some of them are affecting us, which
required file changes:

-
[simple-import-sort/import](https://www.npmjs.com/package/eslint-plugin-simple-import-sort)
got couple of fixes
- "Unused eslint-disable directive": Unused "eslint-disable" comments
are now detected and marked as error
- [import/export](https://www.npmjs.com/package/eslint-plugin-import)
got a false positive, which affects most of our index barrel files (I
didn't want to disable it entirely, so I added a global disable in each
affected barrel file)
- tracked here:
https://github.com/import-js/eslint-plugin-import/issues/703


## Merge checks

- [ ] Rebased before merge to get the latest changes updated with the
new version
---
 .../utils/replayHelpers.ts                    |    1 -
 .../tracing/sample-rand-propagation/server.js |    2 +-
 .../no-tracing-enabled/server.js              |    2 +-
 .../tracesSampleRate-0/server.js              |    2 +-
 .../tracesSampleRate/server.js                |    2 +-
 .../server.js                                 |    1 -
 .../local-variables-out-of-app-default.js     |    2 -
 .../local-variables-out-of-app.js             |    2 -
 .../apollo-graphql/scenario-mutation.js       |    1 -
 .../tracing/apollo-graphql/scenario-query.js  |    1 -
 .../scenario-invalid-root-span.js             |    1 -
 .../scenario-multiple-operations-many.js      |    1 -
 .../scenario-multiple-operations.js           |    1 -
 .../scenario-mutation.js                      |    1 -
 .../scenario-no-operation-name.js             |    1 -
 .../scenario-query.js                         |    1 -
 .../suites/tracing/mongodb/scenario.js        |    1 -
 .../suites/tracing/mongoose/scenario.js       |    1 -
 .../tracing/postgres/scenario-native.js       |    1 -
 .../suites/tracing/postgres/scenario.js       |    1 -
 .../suites/tracing/postgresjs/scenario.js     |    1 -
 .../tracing/redis-cache/scenario-ioredis.js   |    1 -
 .../tracing/redis-cache/scenario-redis-4.js   |    1 -
 .../suites/tracing/redis/scenario-ioredis.js  |    1 -
 .../tracing/sample-rand-propagation/server.js |    2 +-
 .../no-tracing-enabled/server.js              |    2 +-
 .../tracesSampleRate-0/server.js              |    2 +-
 .../tracesSampleRate/server.js                |    2 +-
 .../tracesSampler/server.js                   |    2 +-
 package.json                                  |    2 +-
 packages/angular/src/index.ts                 |    3 +
 packages/astro/src/index.client.ts            |    3 +
 packages/astro/src/index.types.ts             |    2 +
 .../instrumentation.ts                        |    3 -
 packages/aws-serverless/test/sdk.test.ts      |    1 -
 packages/aws-serverless/test/utils.test.ts    |    1 -
 .../src/metrics/browserMetrics.ts             |    2 +-
 packages/browser/src/profiling/UIProfiler.ts  |    3 +-
 packages/browser/src/tracing/linkedTraces.ts  |    3 +-
 .../browser/test/profiling/UIProfiler.test.ts |    4 +-
 packages/cloudflare/src/durableobject.ts      |    2 +-
 .../test/copy-execution-context.test.ts       |    2 +-
 packages/core/src/client.ts                   |    8 +-
 packages/core/src/tracing/openai/streaming.ts |   12 +-
 packages/core/src/transports/base.ts          |    4 +-
 .../lib/integrations/captureconsole.test.ts   |    2 +-
 packages/core/test/lib/sdk.test.ts            |    2 +-
 packages/core/test/lib/tracing/utils.test.ts  |    7 +-
 packages/core/test/lib/trpc.test.ts           |    2 +-
 .../core/test/lib/utils/featureFlags.test.ts  |    2 +-
 packages/core/test/mocks/client.ts            |    1 -
 packages/deno/test/normalize.ts               |    2 +-
 packages/ember/addon/index.ts                 |    3 +
 packages/eslint-config-sdk/package.json       |   16 +-
 packages/gatsby/src/index.ts                  |    3 +
 .../test/gcpfunction/cloud_event.test.ts      |    1 -
 .../test/gcpfunction/events.test.ts           |    1 -
 .../test/gcpfunction/http.test.ts             |    3 +-
 .../integrations/google-cloud-http.test.ts    |    1 -
 .../google-cloud-serverless/test/sdk.test.ts  |    1 -
 packages/nestjs/src/index.ts                  |    3 +
 packages/nextjs/src/client/index.ts           |    3 +
 .../utils/dropMiddlewareTunnelRequests.ts     |    2 +-
 packages/nextjs/src/config/webpack.ts         |    5 +-
 packages/nextjs/src/edge/index.ts             |    5 +-
 packages/nextjs/src/index.types.ts            |    2 +
 packages/nextjs/src/server/index.ts           |    3 +
 packages/nextjs/test/config/mocks.ts          |    2 -
 .../node-core/src/integrations/anr/index.ts   |   10 +
 packages/node-core/src/logs/exports.ts        |    2 +-
 packages/node-core/test/cron.test.ts          |    2 +-
 .../node-core/test/helpers/mockSdkInit.ts     |    2 +-
 .../test/integrations/context.test.ts         |    1 -
 .../test/integrations/contextlines.test.ts    |    1 -
 .../test/integrations/spotlight.test.ts       |    1 -
 packages/node-core/test/sdk/init.test.ts      |    2 +-
 .../node-core/test/transports/http.test.ts    |    4 +-
 .../node-core/test/transports/https.test.ts   |    3 +-
 packages/node/src/integrations/http.ts        |    3 +-
 .../node/src/integrations/tracing/amqplib.ts  |    2 +-
 .../tracing/anthropic-ai/instrumentation.ts   |    2 +-
 .../tracing/fastify/fastify-otel/index.js     |    1 +
 .../src/integrations/tracing/fastify/index.ts |    1 -
 .../integrations/tracing/fastify/v3/utils.ts  |    3 +-
 .../integrations/tracing/firebase/firebase.ts |    2 +-
 .../firebase/otel/firebaseInstrumentation.ts  |    2 +-
 .../firebase/otel/patches/firestore.ts        |    2 -
 .../tracing/google-genai/instrumentation.ts   |    3 +-
 .../src/integrations/tracing/hapi/index.ts    |    1 -
 .../tracing/langchain/instrumentation.ts      |    2 +-
 .../tracing/langgraph/instrumentation.ts      |    4 +-
 .../tracing/openai/instrumentation.ts         |    2 +-
 .../integrations/tracing/vercelai/index.ts    |    2 +-
 packages/node/src/sdk/initOtel.ts             |    2 +-
 packages/node/test/cron.test.ts               |    2 +-
 packages/node/test/helpers/mockSdkInit.ts     |    2 +-
 .../test/integrations/tracing/graphql.test.ts |    2 +-
 .../test/integrations/tracing/koa.test.ts     |    2 +-
 .../test/integrations/tracing/mongo.test.ts   |    2 +-
 packages/node/test/sdk/init.test.ts           |    2 +-
 packages/nuxt/src/client/index.ts             |    3 +
 packages/nuxt/src/index.types.ts              |    2 +
 .../runtime/hooks/wrapMiddlewareHandler.ts    |    2 +-
 .../src/runtime/plugins/database.server.ts    |    5 +-
 .../nuxt/src/runtime/plugins/sentry.server.ts |    1 -
 .../src/runtime/plugins/storage.server.ts     |    5 +-
 packages/nuxt/src/server/index.ts             |    3 +
 packages/nuxt/src/server/sdk.ts               |    2 +-
 packages/nuxt/src/vite/sourceMaps.ts          |    4 +-
 .../nuxt/test/runtime/plugins/server.test.ts  |    2 +-
 packages/nuxt/test/runtime/utils.test.ts      |    2 +-
 packages/opentelemetry/test/helpers/isSpan.ts |    4 +-
 packages/profiling-node/src/integration.ts    |    2 +-
 .../profiling-node/src/spanProfileUtils.ts    |    2 +-
 .../test/integration.worker.test.ts           |    3 +-
 packages/react-router/src/client/index.ts     |    3 +
 packages/react-router/src/index.types.ts      |    2 +
 packages/react-router/src/server/index.ts     |    3 +
 ...lowQualityTransactionsFilterIntegration.ts |    2 +-
 packages/react-router/src/vite/plugin.ts      |    3 +-
 packages/react/package.json                   |    2 +-
 packages/react/src/index.ts                   |    3 +
 packages/remix/src/client/index.ts            |    3 +
 packages/remix/src/client/sdk.ts              |    1 -
 packages/remix/src/cloudflare/index.ts        |    3 +
 packages/remix/src/index.types.ts             |    2 +
 packages/remix/src/server/index.ts            |    4 +
 packages/remix/src/vendor/instrumentation.ts  |    1 -
 packages/remix/test/index.client.test.ts      |    2 +-
 packages/remix/test/index.server.test.ts      |    2 +-
 packages/replay-worker/.eslintrc.js           |    1 +
 packages/solid/src/index.ts                   |    3 +
 packages/solidstart/src/client/index.ts       |    3 +
 packages/solidstart/src/index.types.ts        |    2 +
 packages/solidstart/src/server/index.ts       |    3 +
 packages/solidstart/src/server/solidrouter.ts |    2 -
 packages/solidstart/src/solidrouter.client.ts |    3 +
 packages/solidstart/src/solidrouter.ts        |    2 +
 packages/svelte/src/index.ts                  |    3 +
 packages/sveltekit/src/client/index.ts        |    3 +
 packages/sveltekit/src/index.types.ts         |    2 +
 .../integrations/svelteKitSpans.ts            |    4 +-
 packages/sveltekit/src/server/index.ts        |    1 +
 .../sveltekit/src/vite/injectGlobalValues.ts  |    2 +-
 .../test/server-common/serverRoute.test.ts    |    4 +-
 .../tanstackstart-react/src/client/index.ts   |    3 +
 .../tanstackstart-react/src/index.client.ts   |    4 +-
 .../tanstackstart-react/src/index.types.ts    |    2 +
 .../tanstackstart-react/src/server/index.ts   |    3 +
 packages/tanstackstart/src/index.client.ts    |    2 +
 packages/tanstackstart/src/index.server.ts    |    2 +
 packages/tanstackstart/src/index.types.ts     |    2 +
 packages/vue/src/index.ts                     |    3 +
 yarn.lock                                     | 1543 ++++++++++-------
 154 files changed, 1100 insertions(+), 821 deletions(-)

diff --git a/dev-packages/browser-integration-tests/utils/replayHelpers.ts b/dev-packages/browser-integration-tests/utils/replayHelpers.ts
index 72e98cb3e9d1..36af7740047e 100644
--- a/dev-packages/browser-integration-tests/utils/replayHelpers.ts
+++ b/dev-packages/browser-integration-tests/utils/replayHelpers.ts
@@ -115,7 +115,6 @@ export function collectReplayRequests(
   const replayEvents: ReplayEvent[] = [];
   const replayRecordingSnapshots: RecordingSnapshot[] = [];
 
-  // eslint-disable-next-line @typescript-eslint/no-floating-promises
   const promise = page.waitForResponse(res => {
     const req = res.request();
 
diff --git a/dev-packages/node-core-integration-tests/suites/tracing/sample-rand-propagation/server.js b/dev-packages/node-core-integration-tests/suites/tracing/sample-rand-propagation/server.js
index 81cc0fc8829c..1c7443517d2c 100644
--- a/dev-packages/node-core-integration-tests/suites/tracing/sample-rand-propagation/server.js
+++ b/dev-packages/node-core-integration-tests/suites/tracing/sample-rand-propagation/server.js
@@ -24,7 +24,7 @@ app.use(cors());
 
 app.get('/check', (req, res) => {
   const appPort = getPortAppIsRunningOn(app);
-  // eslint-disable-next-line no-undef
+
   fetch(`http://localhost:${appPort}/bounce`)
     .then(r => r.json())
     .then(bounceRes => {
diff --git a/dev-packages/node-core-integration-tests/suites/tracing/sample-rate-propagation/no-tracing-enabled/server.js b/dev-packages/node-core-integration-tests/suites/tracing/sample-rate-propagation/no-tracing-enabled/server.js
index 42121915d601..a16f454cb54c 100644
--- a/dev-packages/node-core-integration-tests/suites/tracing/sample-rate-propagation/no-tracing-enabled/server.js
+++ b/dev-packages/node-core-integration-tests/suites/tracing/sample-rate-propagation/no-tracing-enabled/server.js
@@ -23,7 +23,7 @@ app.use(cors());
 
 app.get('/check', (req, res) => {
   const appPort = getPortAppIsRunningOn(app);
-  // eslint-disable-next-line no-undef
+
   fetch(`http://localhost:${appPort}/bounce`)
     .then(r => r.json())
     .then(bounceRes => {
diff --git a/dev-packages/node-core-integration-tests/suites/tracing/sample-rate-propagation/tracesSampleRate-0/server.js b/dev-packages/node-core-integration-tests/suites/tracing/sample-rate-propagation/tracesSampleRate-0/server.js
index 6c7042813246..a756fe917fbf 100644
--- a/dev-packages/node-core-integration-tests/suites/tracing/sample-rate-propagation/tracesSampleRate-0/server.js
+++ b/dev-packages/node-core-integration-tests/suites/tracing/sample-rate-propagation/tracesSampleRate-0/server.js
@@ -24,7 +24,7 @@ app.use(cors());
 
 app.get('/check', (req, res) => {
   const appPort = getPortAppIsRunningOn(app);
-  // eslint-disable-next-line no-undef
+
   fetch(`http://localhost:${appPort}/bounce`)
     .then(r => r.json())
     .then(bounceRes => {
diff --git a/dev-packages/node-core-integration-tests/suites/tracing/sample-rate-propagation/tracesSampleRate/server.js b/dev-packages/node-core-integration-tests/suites/tracing/sample-rate-propagation/tracesSampleRate/server.js
index a0ffeb98867a..86c65f0bc7f8 100644
--- a/dev-packages/node-core-integration-tests/suites/tracing/sample-rate-propagation/tracesSampleRate/server.js
+++ b/dev-packages/node-core-integration-tests/suites/tracing/sample-rate-propagation/tracesSampleRate/server.js
@@ -24,7 +24,7 @@ app.use(cors());
 
 app.get('/check', (req, res) => {
   const appPort = getPortAppIsRunningOn(app);
-  // eslint-disable-next-line no-undef
+
   fetch(`http://localhost:${appPort}/bounce`)
     .then(r => r.json())
     .then(bounceRes => {
diff --git a/dev-packages/node-core-integration-tests/suites/tracing/sample-rate-propagation/tracesSampler-with-otel-http-instrumentation/server.js b/dev-packages/node-core-integration-tests/suites/tracing/sample-rate-propagation/tracesSampler-with-otel-http-instrumentation/server.js
index a4595dd8f3c8..14b66e727c65 100644
--- a/dev-packages/node-core-integration-tests/suites/tracing/sample-rate-propagation/tracesSampler-with-otel-http-instrumentation/server.js
+++ b/dev-packages/node-core-integration-tests/suites/tracing/sample-rate-propagation/tracesSampler-with-otel-http-instrumentation/server.js
@@ -30,7 +30,6 @@ app.get('/check', (req, res) => {
   Sentry.startSpan({ name: 'check-endpoint' }, async () => {
     const appPort = getPortAppIsRunningOn(app);
     try {
-      // eslint-disable-next-line no-undef
       const response = await fetch(`http://localhost:${appPort}/bounce`);
       const bounceRes = await response.json();
       // eslint-disable-next-line no-console
diff --git a/dev-packages/node-integration-tests/suites/public-api/LocalVariables/local-variables-out-of-app-default.js b/dev-packages/node-integration-tests/suites/public-api/LocalVariables/local-variables-out-of-app-default.js
index 9a53436867d9..76ee6f6e57a0 100644
--- a/dev-packages/node-integration-tests/suites/public-api/LocalVariables/local-variables-out-of-app-default.js
+++ b/dev-packages/node-integration-tests/suites/public-api/LocalVariables/local-variables-out-of-app-default.js
@@ -1,5 +1,3 @@
-/* eslint-disable no-unused-vars */
-
 const Sentry = require('@sentry/node');
 const { loggingTransport } = require('@sentry-internal/node-integration-tests');
 
diff --git a/dev-packages/node-integration-tests/suites/public-api/LocalVariables/local-variables-out-of-app.js b/dev-packages/node-integration-tests/suites/public-api/LocalVariables/local-variables-out-of-app.js
index 9bbe40004fc7..eb0958fdd151 100644
--- a/dev-packages/node-integration-tests/suites/public-api/LocalVariables/local-variables-out-of-app.js
+++ b/dev-packages/node-integration-tests/suites/public-api/LocalVariables/local-variables-out-of-app.js
@@ -1,5 +1,3 @@
-/* eslint-disable no-unused-vars */
-
 const Sentry = require('@sentry/node');
 const { loggingTransport } = require('@sentry-internal/node-integration-tests');
 
diff --git a/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/scenario-mutation.js b/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/scenario-mutation.js
index d0f0172923ef..b7b14e7e1215 100644
--- a/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/scenario-mutation.js
+++ b/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/scenario-mutation.js
@@ -39,5 +39,4 @@ async function run() {
   );
 }
 
-// eslint-disable-next-line @typescript-eslint/no-floating-promises
 run();
diff --git a/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/scenario-query.js b/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/scenario-query.js
index b9a05c4b1c3c..0c3197b820e3 100644
--- a/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/scenario-query.js
+++ b/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/scenario-query.js
@@ -33,5 +33,4 @@ async function run() {
   );
 }
 
-// eslint-disable-next-line @typescript-eslint/no-floating-promises
 run();
diff --git a/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/useOperationNameForRootSpan/scenario-invalid-root-span.js b/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/useOperationNameForRootSpan/scenario-invalid-root-span.js
index 840a5551b98a..4d751d81115e 100644
--- a/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/useOperationNameForRootSpan/scenario-invalid-root-span.js
+++ b/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/useOperationNameForRootSpan/scenario-invalid-root-span.js
@@ -30,5 +30,4 @@ async function run() {
   });
 }
 
-// eslint-disable-next-line @typescript-eslint/no-floating-promises
 run();
diff --git a/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/useOperationNameForRootSpan/scenario-multiple-operations-many.js b/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/useOperationNameForRootSpan/scenario-multiple-operations-many.js
index 992ff5337b46..be01fa002d09 100644
--- a/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/useOperationNameForRootSpan/scenario-multiple-operations-many.js
+++ b/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/useOperationNameForRootSpan/scenario-multiple-operations-many.js
@@ -39,5 +39,4 @@ async function run() {
   );
 }
 
-// eslint-disable-next-line @typescript-eslint/no-floating-promises
 run();
diff --git a/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/useOperationNameForRootSpan/scenario-multiple-operations.js b/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/useOperationNameForRootSpan/scenario-multiple-operations.js
index d9eeca63ae10..d73f57670b7f 100644
--- a/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/useOperationNameForRootSpan/scenario-multiple-operations.js
+++ b/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/useOperationNameForRootSpan/scenario-multiple-operations.js
@@ -41,5 +41,4 @@ async function run() {
   );
 }
 
-// eslint-disable-next-line @typescript-eslint/no-floating-promises
 run();
diff --git a/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/useOperationNameForRootSpan/scenario-mutation.js b/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/useOperationNameForRootSpan/scenario-mutation.js
index cf92164fc0d7..feca6775865a 100644
--- a/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/useOperationNameForRootSpan/scenario-mutation.js
+++ b/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/useOperationNameForRootSpan/scenario-mutation.js
@@ -43,5 +43,4 @@ async function run() {
   );
 }
 
-// eslint-disable-next-line @typescript-eslint/no-floating-promises
 run();
diff --git a/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/useOperationNameForRootSpan/scenario-no-operation-name.js b/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/useOperationNameForRootSpan/scenario-no-operation-name.js
index 14879bc0e79d..2525207ee3b3 100644
--- a/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/useOperationNameForRootSpan/scenario-no-operation-name.js
+++ b/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/useOperationNameForRootSpan/scenario-no-operation-name.js
@@ -37,5 +37,4 @@ async function run() {
   );
 }
 
-// eslint-disable-next-line @typescript-eslint/no-floating-promises
 run();
diff --git a/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/useOperationNameForRootSpan/scenario-query.js b/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/useOperationNameForRootSpan/scenario-query.js
index 4dc3357ab17f..a5c6512ffe3d 100644
--- a/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/useOperationNameForRootSpan/scenario-query.js
+++ b/dev-packages/node-integration-tests/suites/tracing/apollo-graphql/useOperationNameForRootSpan/scenario-query.js
@@ -37,5 +37,4 @@ async function run() {
   );
 }
 
-// eslint-disable-next-line @typescript-eslint/no-floating-promises
 run();
diff --git a/dev-packages/node-integration-tests/suites/tracing/mongodb/scenario.js b/dev-packages/node-integration-tests/suites/tracing/mongodb/scenario.js
index 7da8a0b800fc..42480988a790 100644
--- a/dev-packages/node-integration-tests/suites/tracing/mongodb/scenario.js
+++ b/dev-packages/node-integration-tests/suites/tracing/mongodb/scenario.js
@@ -44,5 +44,4 @@ async function run() {
   );
 }
 
-// eslint-disable-next-line @typescript-eslint/no-floating-promises
 run();
diff --git a/dev-packages/node-integration-tests/suites/tracing/mongoose/scenario.js b/dev-packages/node-integration-tests/suites/tracing/mongoose/scenario.js
index 99c04cde2667..9333ea48798e 100644
--- a/dev-packages/node-integration-tests/suites/tracing/mongoose/scenario.js
+++ b/dev-packages/node-integration-tests/suites/tracing/mongoose/scenario.js
@@ -45,5 +45,4 @@ async function run() {
   );
 }
 
-// eslint-disable-next-line @typescript-eslint/no-floating-promises
 run();
diff --git a/dev-packages/node-integration-tests/suites/tracing/postgres/scenario-native.js b/dev-packages/node-integration-tests/suites/tracing/postgres/scenario-native.js
index 6c68f4b64562..6e7b5c60e48b 100644
--- a/dev-packages/node-integration-tests/suites/tracing/postgres/scenario-native.js
+++ b/dev-packages/node-integration-tests/suites/tracing/postgres/scenario-native.js
@@ -44,5 +44,4 @@ async function run() {
   );
 }
 
-// eslint-disable-next-line @typescript-eslint/no-floating-promises
 run();
diff --git a/dev-packages/node-integration-tests/suites/tracing/postgres/scenario.js b/dev-packages/node-integration-tests/suites/tracing/postgres/scenario.js
index 4f4e2d56b39b..9d12dda3159a 100644
--- a/dev-packages/node-integration-tests/suites/tracing/postgres/scenario.js
+++ b/dev-packages/node-integration-tests/suites/tracing/postgres/scenario.js
@@ -42,5 +42,4 @@ async function run() {
   );
 }
 
-// eslint-disable-next-line @typescript-eslint/no-floating-promises
 run();
diff --git a/dev-packages/node-integration-tests/suites/tracing/postgresjs/scenario.js b/dev-packages/node-integration-tests/suites/tracing/postgresjs/scenario.js
index e7cb92aabf27..f1010281f904 100644
--- a/dev-packages/node-integration-tests/suites/tracing/postgresjs/scenario.js
+++ b/dev-packages/node-integration-tests/suites/tracing/postgresjs/scenario.js
@@ -58,5 +58,4 @@ async function run() {
   );
 }
 
-// eslint-disable-next-line @typescript-eslint/no-floating-promises
 run();
diff --git a/dev-packages/node-integration-tests/suites/tracing/redis-cache/scenario-ioredis.js b/dev-packages/node-integration-tests/suites/tracing/redis-cache/scenario-ioredis.js
index 0f86c6f852a8..4571205ee339 100644
--- a/dev-packages/node-integration-tests/suites/tracing/redis-cache/scenario-ioredis.js
+++ b/dev-packages/node-integration-tests/suites/tracing/redis-cache/scenario-ioredis.js
@@ -42,5 +42,4 @@ async function run() {
   );
 }
 
-// eslint-disable-next-line @typescript-eslint/no-floating-promises
 run();
diff --git a/dev-packages/node-integration-tests/suites/tracing/redis-cache/scenario-redis-4.js b/dev-packages/node-integration-tests/suites/tracing/redis-cache/scenario-redis-4.js
index 31156674a654..55beaa7cf4e8 100644
--- a/dev-packages/node-integration-tests/suites/tracing/redis-cache/scenario-redis-4.js
+++ b/dev-packages/node-integration-tests/suites/tracing/redis-cache/scenario-redis-4.js
@@ -42,5 +42,4 @@ async function run() {
   );
 }
 
-// eslint-disable-next-line @typescript-eslint/no-floating-promises
 run();
diff --git a/dev-packages/node-integration-tests/suites/tracing/redis/scenario-ioredis.js b/dev-packages/node-integration-tests/suites/tracing/redis/scenario-ioredis.js
index 4c325c3a6c21..effedc297fa9 100644
--- a/dev-packages/node-integration-tests/suites/tracing/redis/scenario-ioredis.js
+++ b/dev-packages/node-integration-tests/suites/tracing/redis/scenario-ioredis.js
@@ -33,5 +33,4 @@ async function run() {
   );
 }
 
-// eslint-disable-next-line @typescript-eslint/no-floating-promises
 run();
diff --git a/dev-packages/node-integration-tests/suites/tracing/sample-rand-propagation/server.js b/dev-packages/node-integration-tests/suites/tracing/sample-rand-propagation/server.js
index d7b54cb25c4f..4420525e85c9 100644
--- a/dev-packages/node-integration-tests/suites/tracing/sample-rand-propagation/server.js
+++ b/dev-packages/node-integration-tests/suites/tracing/sample-rand-propagation/server.js
@@ -21,7 +21,7 @@ app.use(cors());
 
 app.get('/check', (req, res) => {
   const appPort = getPortAppIsRunningOn(app);
-  // eslint-disable-next-line no-undef
+
   fetch(`http://localhost:${appPort}/bounce`)
     .then(r => r.json())
     .then(bounceRes => {
diff --git a/dev-packages/node-integration-tests/suites/tracing/sample-rate-propagation/no-tracing-enabled/server.js b/dev-packages/node-integration-tests/suites/tracing/sample-rate-propagation/no-tracing-enabled/server.js
index dbc6b9009c49..403f69f87916 100644
--- a/dev-packages/node-integration-tests/suites/tracing/sample-rate-propagation/no-tracing-enabled/server.js
+++ b/dev-packages/node-integration-tests/suites/tracing/sample-rate-propagation/no-tracing-enabled/server.js
@@ -20,7 +20,7 @@ app.use(cors());
 
 app.get('/check', (req, res) => {
   const appPort = getPortAppIsRunningOn(app);
-  // eslint-disable-next-line no-undef
+
   fetch(`http://localhost:${appPort}/bounce`)
     .then(r => r.json())
     .then(bounceRes => {
diff --git a/dev-packages/node-integration-tests/suites/tracing/sample-rate-propagation/tracesSampleRate-0/server.js b/dev-packages/node-integration-tests/suites/tracing/sample-rate-propagation/tracesSampleRate-0/server.js
index dc2f49b081cf..33d9ae5180a4 100644
--- a/dev-packages/node-integration-tests/suites/tracing/sample-rate-propagation/tracesSampleRate-0/server.js
+++ b/dev-packages/node-integration-tests/suites/tracing/sample-rate-propagation/tracesSampleRate-0/server.js
@@ -21,7 +21,7 @@ app.use(cors());
 
 app.get('/check', (req, res) => {
   const appPort = getPortAppIsRunningOn(app);
-  // eslint-disable-next-line no-undef
+
   fetch(`http://localhost:${appPort}/bounce`)
     .then(r => r.json())
     .then(bounceRes => {
diff --git a/dev-packages/node-integration-tests/suites/tracing/sample-rate-propagation/tracesSampleRate/server.js b/dev-packages/node-integration-tests/suites/tracing/sample-rate-propagation/tracesSampleRate/server.js
index 512681043d4d..53729491f064 100644
--- a/dev-packages/node-integration-tests/suites/tracing/sample-rate-propagation/tracesSampleRate/server.js
+++ b/dev-packages/node-integration-tests/suites/tracing/sample-rate-propagation/tracesSampleRate/server.js
@@ -21,7 +21,7 @@ app.use(cors());
 
 app.get('/check', (req, res) => {
   const appPort = getPortAppIsRunningOn(app);
-  // eslint-disable-next-line no-undef
+
   fetch(`http://localhost:${appPort}/bounce`)
     .then(r => r.json())
     .then(bounceRes => {
diff --git a/dev-packages/node-integration-tests/suites/tracing/sample-rate-propagation/tracesSampler/server.js b/dev-packages/node-integration-tests/suites/tracing/sample-rate-propagation/tracesSampler/server.js
index 5f616438fe90..7ae183817f43 100644
--- a/dev-packages/node-integration-tests/suites/tracing/sample-rate-propagation/tracesSampler/server.js
+++ b/dev-packages/node-integration-tests/suites/tracing/sample-rate-propagation/tracesSampler/server.js
@@ -23,7 +23,7 @@ app.use(cors());
 
 app.get('/check', (req, res) => {
   const appPort = getPortAppIsRunningOn(app);
-  // eslint-disable-next-line no-undef
+
   fetch(`http://localhost:${appPort}/bounce`)
     .then(r => r.json())
     .then(bounceRes => {
diff --git a/package.json b/package.json
index 298e17031240..b0f32aa93a50 100644
--- a/package.json
+++ b/package.json
@@ -121,7 +121,7 @@
     "deepmerge": "^4.2.2",
     "downlevel-dts": "~0.11.0",
     "es-check": "^7.2.1",
-    "eslint": "7.32.0",
+    "eslint": "8.57.0",
     "jsdom": "^21.1.2",
     "lerna": "7.1.1",
     "madge": "8.0.0",
diff --git a/packages/angular/src/index.ts b/packages/angular/src/index.ts
index f0911eb9a440..12a0afb463bd 100644
--- a/packages/angular/src/index.ts
+++ b/packages/angular/src/index.ts
@@ -1,3 +1,6 @@
+// import/export got a false positive, and affects most of our index barrel files
+// can be removed once following issue is fixed: https://github.com/import-js/eslint-plugin-import/issues/703
+/* eslint-disable import/export */
 export type { ErrorHandlerOptions } from './errorhandler';
 
 export * from '@sentry/browser';
diff --git a/packages/astro/src/index.client.ts b/packages/astro/src/index.client.ts
index 55a6c8d3915b..959ecfaa4d5d 100644
--- a/packages/astro/src/index.client.ts
+++ b/packages/astro/src/index.client.ts
@@ -1,3 +1,6 @@
+// import/export got a false positive, and affects most of our index barrel files
+// can be removed once following issue is fixed: https://github.com/import-js/eslint-plugin-import/issues/703
+/* eslint-disable import/export */
 export * from '@sentry/browser';
 
 // Override the browserTracingIntegration with the custom Astro version
diff --git a/packages/astro/src/index.types.ts b/packages/astro/src/index.types.ts
index b09a1cfa09d5..2e51ab1b0f1e 100644
--- a/packages/astro/src/index.types.ts
+++ b/packages/astro/src/index.types.ts
@@ -1,3 +1,5 @@
+// import/export got a false positive, and affects most of our index barrel files
+// can be removed once following issue is fixed: https://github.com/import-js/eslint-plugin-import/issues/703
 /* eslint-disable import/export */
 
 // We export everything from both the client part of the SDK and from the server part.
diff --git a/packages/aws-serverless/src/integration/instrumentation-aws-lambda/instrumentation.ts b/packages/aws-serverless/src/integration/instrumentation-aws-lambda/instrumentation.ts
index 1991fdc5dac4..a3809408cfe6 100644
--- a/packages/aws-serverless/src/integration/instrumentation-aws-lambda/instrumentation.ts
+++ b/packages/aws-serverless/src/integration/instrumentation-aws-lambda/instrumentation.ts
@@ -298,7 +298,6 @@ export class AwsLambdaInstrumentation extends InstrumentationBase<AwsLambdaInstr
     return function patchedHandler(
       this: never,
       // The event can be a user type, it truly is any.
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       event: any,
       context: Context,
       callback: Callback,
@@ -414,7 +413,6 @@ export class AwsLambdaInstrumentation extends InstrumentationBase<AwsLambdaInstr
   private _traceForceFlush(tracerProvider: TracerProvider) {
     if (!tracerProvider) return undefined;
 
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     let currentProvider: any = tracerProvider;
 
     if (typeof currentProvider.getDelegate === 'function') {
@@ -442,7 +440,6 @@ export class AwsLambdaInstrumentation extends InstrumentationBase<AwsLambdaInstr
   private _metricForceFlush(meterProvider: MeterProvider) {
     if (!meterProvider) return undefined;
 
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const currentProvider: any = meterProvider;
 
     if (typeof currentProvider.forceFlush === 'function') {
diff --git a/packages/aws-serverless/test/sdk.test.ts b/packages/aws-serverless/test/sdk.test.ts
index a3aef6a10b5d..7e29e75e9414 100644
--- a/packages/aws-serverless/test/sdk.test.ts
+++ b/packages/aws-serverless/test/sdk.test.ts
@@ -18,7 +18,6 @@ const mockScope = {
 };
 
 vi.mock('@sentry/node', async () => {
-  // eslint-disable-next-line @typescript-eslint/consistent-type-imports
   const original = await vi.importActual('@sentry/node');
   return {
     ...original,
diff --git a/packages/aws-serverless/test/utils.test.ts b/packages/aws-serverless/test/utils.test.ts
index 2f3516ce8e35..e77171454a6a 100644
--- a/packages/aws-serverless/test/utils.test.ts
+++ b/packages/aws-serverless/test/utils.test.ts
@@ -3,7 +3,6 @@ import { eventContextExtractor, getAwsTraceData } from '../src/utils';
 
 const mockExtractContext = vi.fn();
 vi.mock('@opentelemetry/api', async () => {
-  // eslint-disable-next-line @typescript-eslint/consistent-type-imports
   const actualApi = await vi.importActual('@opentelemetry/api');
   return {
     ...actualApi,
diff --git a/packages/browser-utils/src/metrics/browserMetrics.ts b/packages/browser-utils/src/metrics/browserMetrics.ts
index ec7213ae4ff6..3c3dee074cb5 100644
--- a/packages/browser-utils/src/metrics/browserMetrics.ts
+++ b/packages/browser-utils/src/metrics/browserMetrics.ts
@@ -15,11 +15,11 @@ import {
 import { WINDOW } from '../types';
 import { trackClsAsStandaloneSpan } from './cls';
 import {
-  type PerformanceLongAnimationFrameTiming,
   addClsInstrumentationHandler,
   addLcpInstrumentationHandler,
   addPerformanceInstrumentationHandler,
   addTtfbInstrumentationHandler,
+  type PerformanceLongAnimationFrameTiming,
 } from './instrument';
 import { trackLcpAsStandaloneSpan } from './lcp';
 import { resourceTimingToSpanAttributes } from './resourceTiming';
diff --git a/packages/browser/src/profiling/UIProfiler.ts b/packages/browser/src/profiling/UIProfiler.ts
index fb059b836986..fc735e871e29 100644
--- a/packages/browser/src/profiling/UIProfiler.ts
+++ b/packages/browser/src/profiling/UIProfiler.ts
@@ -1,6 +1,5 @@
-import type { Client, ContinuousProfiler, ProfileChunk, Span } from '@sentry/core';
+import type { Client, ContinuousProfiler, ProfileChunk, ProfileChunkEnvelope, Span } from '@sentry/core';
 import {
-  type ProfileChunkEnvelope,
   createEnvelope,
   debug,
   dsnToString,
diff --git a/packages/browser/src/tracing/linkedTraces.ts b/packages/browser/src/tracing/linkedTraces.ts
index 330e193f80ef..3a67e1cf61ac 100644
--- a/packages/browser/src/tracing/linkedTraces.ts
+++ b/packages/browser/src/tracing/linkedTraces.ts
@@ -1,6 +1,5 @@
-import type { Client, PropagationContext, Span } from '@sentry/core';
+import type { Client, PropagationContext, Span, SpanContextData } from '@sentry/core';
 import {
-  type SpanContextData,
   debug,
   getCurrentScope,
   getRootSpan,
diff --git a/packages/browser/test/profiling/UIProfiler.test.ts b/packages/browser/test/profiling/UIProfiler.test.ts
index 6872e1e1beff..7fd583f513d8 100644
--- a/packages/browser/test/profiling/UIProfiler.test.ts
+++ b/packages/browser/test/profiling/UIProfiler.test.ts
@@ -3,8 +3,8 @@
  */
 
 import * as Sentry from '@sentry/browser';
-import { type Span, debug } from '@sentry/core';
-import { type Mock, afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { debug, type Span } from '@sentry/core';
+import { afterEach, beforeEach, describe, expect, it, type Mock, vi } from 'vitest';
 import type { BrowserOptions } from '../../src/index';
 
 function getBaseOptionsForTraceLifecycle(sendMock: Mock<any>, enableTracing = true): BrowserOptions {
diff --git a/packages/cloudflare/src/durableobject.ts b/packages/cloudflare/src/durableobject.ts
index 64467aad9d8f..db1da6a5d172 100644
--- a/packages/cloudflare/src/durableobject.ts
+++ b/packages/cloudflare/src/durableobject.ts
@@ -1,10 +1,10 @@
 /* eslint-disable @typescript-eslint/unbound-method */
 import {
-  type Scope,
   captureException,
   flush,
   getClient,
   isThenable,
+  type Scope,
   SEMANTIC_ATTRIBUTE_SENTRY_OP,
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   startSpan,
diff --git a/packages/cloudflare/test/copy-execution-context.test.ts b/packages/cloudflare/test/copy-execution-context.test.ts
index 3ee71a10b695..670d67f2f490 100644
--- a/packages/cloudflare/test/copy-execution-context.test.ts
+++ b/packages/cloudflare/test/copy-execution-context.test.ts
@@ -1,4 +1,4 @@
-import { type Mocked, describe, expect, it, vi } from 'vitest';
+import { describe, expect, it, type Mocked, vi } from 'vitest';
 import { copyExecutionContext } from '../src/utils/copyExecutionContext';
 
 describe('Copy of the execution context', () => {
diff --git a/packages/core/src/client.ts b/packages/core/src/client.ts
index 805d8e596528..aad363905a68 100644
--- a/packages/core/src/client.ts
+++ b/packages/core/src/client.ts
@@ -44,7 +44,7 @@ import { merge } from './utils/merge';
 import { checkOrSetAlreadyCaught, uuid4 } from './utils/misc';
 import { parseSampleRate } from './utils/parseSampleRate';
 import { prepareEvent } from './utils/prepareEvent';
-import { type PromiseBuffer, makePromiseBuffer, SENTRY_BUFFER_FULL_ERROR } from './utils/promisebuffer';
+import { makePromiseBuffer, type PromiseBuffer, SENTRY_BUFFER_FULL_ERROR } from './utils/promisebuffer';
 import { reparentChildSpans, shouldIgnoreSpan } from './utils/should-ignore-span';
 import { showSpanDropWarning } from './utils/spanUtils';
 import { rejectedSyncPromise } from './utils/syncpromise';
@@ -884,13 +884,13 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
    */
   public emit(hook: 'idleSpanEnableAutoFinish', span: Span): void;
 
-  /*
+  /**
    * Fire a hook event for envelope creation and sending. Expects to be given an envelope as the
    * second argument.
    */
   public emit(hook: 'beforeEnvelope', envelope: Envelope): void;
 
-  /*
+  /**
    * Fire a hook indicating that stack frame metadata should be applied to the event passed to the hook.
    */
   public emit(hook: 'applyFrameMetadata', event: Event): void;
@@ -920,7 +920,7 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
    */
   public emit(hook: 'postprocessEvent', event: Event, hint?: EventHint): void;
 
-  /*
+  /**
    * Fire a hook event after sending an event. Expects to be given an Event as the
    * second argument.
    */
diff --git a/packages/core/src/tracing/openai/streaming.ts b/packages/core/src/tracing/openai/streaming.ts
index 0111904ffeae..3a5634df34dd 100644
--- a/packages/core/src/tracing/openai/streaming.ts
+++ b/packages/core/src/tracing/openai/streaming.ts
@@ -8,12 +8,12 @@ import {
   GEN_AI_RESPONSE_TOOL_CALLS_ATTRIBUTE,
 } from '../ai/gen-ai-attributes';
 import { RESPONSE_EVENT_TYPES } from './constants';
-import type { OpenAIResponseObject } from './types';
-import {
-  type ChatCompletionChunk,
-  type ChatCompletionToolCall,
-  type ResponseFunctionCall,
-  type ResponseStreamingEvent,
+import type {
+  ChatCompletionChunk,
+  ChatCompletionToolCall,
+  OpenAIResponseObject,
+  ResponseFunctionCall,
+  ResponseStreamingEvent,
 } from './types';
 import {
   isChatCompletionChunk,
diff --git a/packages/core/src/transports/base.ts b/packages/core/src/transports/base.ts
index 822020070b86..d85d9305bbe9 100644
--- a/packages/core/src/transports/base.ts
+++ b/packages/core/src/transports/base.ts
@@ -14,8 +14,8 @@ import {
   forEachEnvelopeItem,
   serializeEnvelope,
 } from '../utils/envelope';
-import { type PromiseBuffer, makePromiseBuffer, SENTRY_BUFFER_FULL_ERROR } from '../utils/promisebuffer';
-import { type RateLimits, isRateLimited, updateRateLimits } from '../utils/ratelimit';
+import { makePromiseBuffer, type PromiseBuffer, SENTRY_BUFFER_FULL_ERROR } from '../utils/promisebuffer';
+import { isRateLimited, type RateLimits, updateRateLimits } from '../utils/ratelimit';
 
 export const DEFAULT_TRANSPORT_BUFFER_SIZE = 64;
 
diff --git a/packages/core/test/lib/integrations/captureconsole.test.ts b/packages/core/test/lib/integrations/captureconsole.test.ts
index a7e14f6536c3..05276271e13c 100644
--- a/packages/core/test/lib/integrations/captureconsole.test.ts
+++ b/packages/core/test/lib/integrations/captureconsole.test.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/unbound-method */
 
-import { type Mock, afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { afterEach, beforeEach, describe, expect, it, type Mock, vi } from 'vitest';
 import type { Client } from '../../../src';
 import * as CurrentScopes from '../../../src/currentScopes';
 import * as SentryCore from '../../../src/exports';
diff --git a/packages/core/test/lib/sdk.test.ts b/packages/core/test/lib/sdk.test.ts
index 4aac159d7817..27bfa29e6a53 100644
--- a/packages/core/test/lib/sdk.test.ts
+++ b/packages/core/test/lib/sdk.test.ts
@@ -1,4 +1,4 @@
-import { type Mock, beforeEach, describe, expect, it, test, vi } from 'vitest';
+import { beforeEach, describe, expect, it, type Mock, test, vi } from 'vitest';
 import type { Client } from '../../src/client';
 import { getCurrentScope } from '../../src/currentScopes';
 import { captureCheckIn } from '../../src/exports';
diff --git a/packages/core/test/lib/tracing/utils.test.ts b/packages/core/test/lib/tracing/utils.test.ts
index 63aba8c35529..5fe44f4199ea 100644
--- a/packages/core/test/lib/tracing/utils.test.ts
+++ b/packages/core/test/lib/tracing/utils.test.ts
@@ -52,7 +52,6 @@ describe('tracing utils', () => {
       setCapturedScopesOnSpan(span, scope, isolationScope);
 
       // Check that only isolation scope is wrapped with WeakRef
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       const spanWithScopes = span as any;
       expect(spanWithScopes._sentryScope).toBe(scope); // Regular scope stored directly
       expect(spanWithScopes._sentryIsolationScope).toBeInstanceOf(WeakRef); // Isolation scope wrapped
@@ -66,7 +65,7 @@ describe('tracing utils', () => {
     it('falls back to direct storage when WeakRef is not available', () => {
       // Temporarily disable WeakRef
       const originalWeakRef = globalThis.WeakRef;
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
       (globalThis as any).WeakRef = undefined;
 
       try {
@@ -77,7 +76,6 @@ describe('tracing utils', () => {
         setCapturedScopesOnSpan(span, scope, isolationScope);
 
         // Check that both scopes are stored directly when WeakRef is not available
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const spanWithScopes = span as any;
         expect(spanWithScopes._sentryScope).toBe(scope); // Regular scope always stored directly
         expect(spanWithScopes._sentryIsolationScope).toBe(isolationScope); // Isolation scope falls back to direct storage
@@ -94,7 +92,6 @@ describe('tracing utils', () => {
         expect(retrieved.isolationScope).toBe(isolationScope);
       } finally {
         // Restore WeakRef
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         (globalThis as any).WeakRef = originalWeakRef;
       }
     });
@@ -108,7 +105,6 @@ describe('tracing utils', () => {
 
       // Mock WeakRef.deref to return undefined for isolation scope (simulating garbage collection)
       // Regular scope is stored directly, so it should always be available
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       const spanWithScopes = span as any;
       const mockIsolationScopeWeakRef = {
         deref: vi.fn().mockReturnValue(undefined),
@@ -129,7 +125,6 @@ describe('tracing utils', () => {
       const scope = new Scope();
 
       // Set up a regular scope (stored directly) and a corrupted isolation scope WeakRef
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       const spanWithScopes = span as any;
       spanWithScopes._sentryScope = scope; // Regular scope stored directly
       spanWithScopes._sentryIsolationScope = {
diff --git a/packages/core/test/lib/trpc.test.ts b/packages/core/test/lib/trpc.test.ts
index f67d1e53bdfd..e03614e96a83 100644
--- a/packages/core/test/lib/trpc.test.ts
+++ b/packages/core/test/lib/trpc.test.ts
@@ -1,5 +1,5 @@
 import { beforeEach, describe, expect, test, vi } from 'vitest';
-import { type Client, type Span, setCurrentClient, trpcMiddleware } from '../../src';
+import { type Client, setCurrentClient, type Span, trpcMiddleware } from '../../src';
 import * as currentScopes from '../../src/currentScopes';
 import * as exports from '../../src/exports';
 import * as tracing from '../../src/tracing';
diff --git a/packages/core/test/lib/utils/featureFlags.test.ts b/packages/core/test/lib/utils/featureFlags.test.ts
index 9775ff7ccb0b..7813452ad419 100644
--- a/packages/core/test/lib/utils/featureFlags.test.ts
+++ b/packages/core/test/lib/utils/featureFlags.test.ts
@@ -2,9 +2,9 @@ import { afterEach, describe, expect, it, vi } from 'vitest';
 import { getCurrentScope } from '../../../src/currentScopes';
 import { debug } from '../../../src/utils/debug-logger';
 import {
-  type FeatureFlag,
   _INTERNAL_insertFlagToScope,
   _INTERNAL_insertToFlagBuffer,
+  type FeatureFlag,
 } from '../../../src/utils/featureFlags';
 
 describe('flags', () => {
diff --git a/packages/core/test/mocks/client.ts b/packages/core/test/mocks/client.ts
index 2b7162a112b5..d7a130bb8b63 100644
--- a/packages/core/test/mocks/client.ts
+++ b/packages/core/test/mocks/client.ts
@@ -52,7 +52,6 @@ export class TestClient extends Client<TestClientOptions> {
           {
             type: exception.name,
             value: exception.message,
-            /* eslint-enable @typescript-eslint/no-unsafe-member-access */
           },
         ],
       },
diff --git a/packages/deno/test/normalize.ts b/packages/deno/test/normalize.ts
index 3edc273b75cd..d6cddaa82c98 100644
--- a/packages/deno/test/normalize.ts
+++ b/packages/deno/test/normalize.ts
@@ -72,7 +72,7 @@ function normalizeEvent(event: Event): Event {
   }
 
   if (event?.sdk?.packages) {
-    for (const pkg of event?.sdk?.packages) {
+    for (const pkg of event.sdk.packages) {
       if (pkg.version) {
         pkg.version = '{{version}}';
       }
diff --git a/packages/ember/addon/index.ts b/packages/ember/addon/index.ts
index bebd89cb09c3..2ee9a9e3728e 100644
--- a/packages/ember/addon/index.ts
+++ b/packages/ember/addon/index.ts
@@ -1,3 +1,6 @@
+// import/export got a false positive, and affects most of our index barrel files
+// can be removed once following issue is fixed: https://github.com/import-js/eslint-plugin-import/issues/703
+/* eslint-disable import/export */
 import { assert } from '@ember/debug';
 import type Route from '@ember/routing/route';
 import { getOwnConfig } from '@embroider/macros';
diff --git a/packages/eslint-config-sdk/package.json b/packages/eslint-config-sdk/package.json
index 8982ce90c026..cbc53bff0eac 100644
--- a/packages/eslint-config-sdk/package.json
+++ b/packages/eslint-config-sdk/package.json
@@ -24,19 +24,19 @@
   "dependencies": {
     "@sentry-internal/eslint-plugin-sdk": "10.27.0",
     "@sentry-internal/typescript": "10.27.0",
-    "@typescript-eslint/eslint-plugin": "^5.48.0",
-    "@typescript-eslint/parser": "^5.48.0",
-    "eslint-config-prettier": "^6.11.0",
-    "eslint-plugin-deprecation": "^1.5.0",
-    "eslint-plugin-import": "^2.22.0",
-    "eslint-plugin-jsdoc": "^30.0.3",
-    "eslint-plugin-simple-import-sort": "^6.0.0"
+    "@typescript-eslint/eslint-plugin": "^5.62.0",
+    "@typescript-eslint/parser": "^5.62.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-deprecation": "^3.0.0",
+    "eslint-plugin-import": "^2.32.0",
+    "eslint-plugin-jsdoc": "^50.6.1",
+    "eslint-plugin-simple-import-sort": "^12.1.1"
   },
   "peerDependencies": {
     "eslint": ">=5"
   },
   "devDependencies": {
-    "eslint": "7.32.0"
+    "eslint": "8.57.0"
   },
   "scripts": {
     "clean": "yarn rimraf sentry-internal-eslint-config-sdk-*.tgz",
diff --git a/packages/gatsby/src/index.ts b/packages/gatsby/src/index.ts
index 7c603d040693..2299b46b7d64 100644
--- a/packages/gatsby/src/index.ts
+++ b/packages/gatsby/src/index.ts
@@ -1,3 +1,6 @@
+// import/export got a false positive, and affects most of our index barrel files
+// can be removed once following issue is fixed: https://github.com/import-js/eslint-plugin-import/issues/703
+/* eslint-disable import/export */
 export * from '@sentry/react';
 
 export { init } from './sdk';
diff --git a/packages/google-cloud-serverless/test/gcpfunction/cloud_event.test.ts b/packages/google-cloud-serverless/test/gcpfunction/cloud_event.test.ts
index 8e7d80ee95b0..e0dd8685b41d 100644
--- a/packages/google-cloud-serverless/test/gcpfunction/cloud_event.test.ts
+++ b/packages/google-cloud-serverless/test/gcpfunction/cloud_event.test.ts
@@ -16,7 +16,6 @@ const mockSpan = {
 };
 
 vi.mock('@sentry/node', async () => {
-  // eslint-disable-next-line @typescript-eslint/consistent-type-imports
   const original = await vi.importActual('@sentry/node');
   return {
     ...original,
diff --git a/packages/google-cloud-serverless/test/gcpfunction/events.test.ts b/packages/google-cloud-serverless/test/gcpfunction/events.test.ts
index 0dc7198ccdcf..0c565a55ba2a 100644
--- a/packages/google-cloud-serverless/test/gcpfunction/events.test.ts
+++ b/packages/google-cloud-serverless/test/gcpfunction/events.test.ts
@@ -17,7 +17,6 @@ const mockSpan = {
 };
 
 vi.mock('@sentry/node', async () => {
-  // eslint-disable-next-line @typescript-eslint/consistent-type-imports
   const original = await vi.importActual('@sentry/node');
   return {
     ...original,
diff --git a/packages/google-cloud-serverless/test/gcpfunction/http.test.ts b/packages/google-cloud-serverless/test/gcpfunction/http.test.ts
index ce327c79cd54..56781f6a8190 100644
--- a/packages/google-cloud-serverless/test/gcpfunction/http.test.ts
+++ b/packages/google-cloud-serverless/test/gcpfunction/http.test.ts
@@ -1,6 +1,6 @@
 import type { Integration } from '@sentry/core';
 import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
-import { type MockInstance, beforeEach, describe, expect, test, vi } from 'vitest';
+import { beforeEach, describe, expect, type MockInstance, test, vi } from 'vitest';
 import type { HttpFunction, Request, Response } from '../../src/gcpfunction/general';
 import { wrapHttpFunction } from '../../src/gcpfunction/http';
 import { init } from '../../src/sdk';
@@ -19,7 +19,6 @@ const mockSpan = {
 };
 
 vi.mock('@sentry/node', async () => {
-  // eslint-disable-next-line @typescript-eslint/consistent-type-imports
   const original = await vi.importActual('@sentry/node');
   return {
     ...original,
diff --git a/packages/google-cloud-serverless/test/integrations/google-cloud-http.test.ts b/packages/google-cloud-serverless/test/integrations/google-cloud-http.test.ts
index ce9ccee0a4ea..f569a6980158 100644
--- a/packages/google-cloud-serverless/test/integrations/google-cloud-http.test.ts
+++ b/packages/google-cloud-serverless/test/integrations/google-cloud-http.test.ts
@@ -13,7 +13,6 @@ const mockSpanEnd = vi.fn();
 const mockStartInactiveSpan = vi.fn(spanArgs => ({ ...spanArgs }));
 
 vi.mock('@sentry/node', async () => {
-  // eslint-disable-next-line @typescript-eslint/consistent-type-imports
   const original = await vi.importActual('@sentry/node');
   return {
     ...original,
diff --git a/packages/google-cloud-serverless/test/sdk.test.ts b/packages/google-cloud-serverless/test/sdk.test.ts
index a98cd8af47e6..5b41bc4abb21 100644
--- a/packages/google-cloud-serverless/test/sdk.test.ts
+++ b/packages/google-cloud-serverless/test/sdk.test.ts
@@ -4,7 +4,6 @@ import { init } from '../src/sdk';
 const mockInit = vi.fn();
 
 vi.mock('@sentry/node', async () => {
-  // eslint-disable-next-line @typescript-eslint/consistent-type-imports
   const original = await vi.importActual('@sentry/node');
   return {
     ...original,
diff --git a/packages/nestjs/src/index.ts b/packages/nestjs/src/index.ts
index f22ce71ea89d..b96fb4c5390a 100644
--- a/packages/nestjs/src/index.ts
+++ b/packages/nestjs/src/index.ts
@@ -1,3 +1,6 @@
+// import/export got a false positive, and affects most of our index barrel files
+// can be removed once following issue is fixed: https://github.com/import-js/eslint-plugin-import/issues/703
+/* eslint-disable import/export */
 export * from '@sentry/node';
 
 export { nestIntegration } from './integrations/nest';
diff --git a/packages/nextjs/src/client/index.ts b/packages/nextjs/src/client/index.ts
index 9cc8d3b10bfe..07d1ee5c4e84 100644
--- a/packages/nextjs/src/client/index.ts
+++ b/packages/nextjs/src/client/index.ts
@@ -1,3 +1,6 @@
+// import/export got a false positive, and affects most of our index barrel files
+// can be removed once following issue is fixed: https://github.com/import-js/eslint-plugin-import/issues/703
+/* eslint-disable import/export */
 import type { Client, EventProcessor, Integration } from '@sentry/core';
 import { addEventProcessor, applySdkMetadata, consoleSandbox, getGlobalScope, GLOBAL_OBJ } from '@sentry/core';
 import type { BrowserOptions } from '@sentry/react';
diff --git a/packages/nextjs/src/common/utils/dropMiddlewareTunnelRequests.ts b/packages/nextjs/src/common/utils/dropMiddlewareTunnelRequests.ts
index 6f8b4eb96603..e8cde6e94baf 100644
--- a/packages/nextjs/src/common/utils/dropMiddlewareTunnelRequests.ts
+++ b/packages/nextjs/src/common/utils/dropMiddlewareTunnelRequests.ts
@@ -1,5 +1,5 @@
 import { SEMATTRS_HTTP_TARGET } from '@opentelemetry/semantic-conventions';
-import { type Span, type SpanAttributes, GLOBAL_OBJ, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
+import { GLOBAL_OBJ, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, type Span, type SpanAttributes } from '@sentry/core';
 import { isSentryRequestSpan } from '@sentry/opentelemetry';
 import { ATTR_NEXT_SPAN_TYPE } from '../nextSpanAttributes';
 import { TRANSACTION_ATTR_SHOULD_DROP_TRANSACTION } from '../span-attributes-with-logic-attached';
diff --git a/packages/nextjs/src/config/webpack.ts b/packages/nextjs/src/config/webpack.ts
index df32c31f392e..3b4eae22898f 100644
--- a/packages/nextjs/src/config/webpack.ts
+++ b/packages/nextjs/src/config/webpack.ts
@@ -326,10 +326,7 @@ export function constructWebpackConfigFunction({
     if (appDirPath) {
       const hasGlobalErrorFile = pageExtensions
         .map(extension => `global-error.${extension}`)
-        .some(
-          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-          globalErrorFile => fs.existsSync(path.join(appDirPath, globalErrorFile)),
-        );
+        .some(globalErrorFile => fs.existsSync(path.join(appDirPath, globalErrorFile)));
 
       if (
         !hasGlobalErrorFile &&
diff --git a/packages/nextjs/src/edge/index.ts b/packages/nextjs/src/edge/index.ts
index cefec05dcfe5..27d42f616727 100644
--- a/packages/nextjs/src/edge/index.ts
+++ b/packages/nextjs/src/edge/index.ts
@@ -1,7 +1,10 @@
+// import/export got a false positive, and affects most of our index barrel files
+// can be removed once following issue is fixed: https://github.com/import-js/eslint-plugin-import/issues/703
+/* eslint-disable import/export */
 import { context } from '@opentelemetry/api';
 import {
-  type EventProcessor,
   applySdkMetadata,
+  type EventProcessor,
   getCapturedScopesOnSpan,
   getCurrentScope,
   getGlobalScope,
diff --git a/packages/nextjs/src/index.types.ts b/packages/nextjs/src/index.types.ts
index d982ebbc7559..7c92fecd7834 100644
--- a/packages/nextjs/src/index.types.ts
+++ b/packages/nextjs/src/index.types.ts
@@ -1,4 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
+// import/export got a false positive, and affects most of our index barrel files
+// can be removed once following issue is fixed: https://github.com/import-js/eslint-plugin-import/issues/703
 /* eslint-disable import/export */
 
 // We export everything from both the client part of the SDK and from the server part. Some of the exports collide,
diff --git a/packages/nextjs/src/server/index.ts b/packages/nextjs/src/server/index.ts
index ca387d752a1d..bc5372274ad6 100644
--- a/packages/nextjs/src/server/index.ts
+++ b/packages/nextjs/src/server/index.ts
@@ -1,3 +1,6 @@
+// import/export got a false positive, and affects most of our index barrel files
+// can be removed once following issue is fixed: https://github.com/import-js/eslint-plugin-import/issues/703
+/* eslint-disable import/export */
 import { context } from '@opentelemetry/api';
 import {
   ATTR_HTTP_REQUEST_METHOD,
diff --git a/packages/nextjs/test/config/mocks.ts b/packages/nextjs/test/config/mocks.ts
index 0e9c48146585..e4b2520aebe1 100644
--- a/packages/nextjs/test/config/mocks.ts
+++ b/packages/nextjs/test/config/mocks.ts
@@ -15,7 +15,6 @@ vi.mock('os');
 // built-in, though, which jest itself uses, otherwise let it do the normal thing. Storing the real version of the
 // function also lets us restore the original when we do want to test
 // `getUserConfigFile()`.
-// eslint-disable-next-line @typescript-eslint/consistent-type-imports
 const fsReal = await vi.importActual('fs');
 export const realExistsSync = fsReal.existsSync;
 export const mockExistsSync = (path: fs.PathLike): ReturnType<typeof realExistsSync> => {
@@ -36,7 +35,6 @@ export const exitsSync = vi.spyOn(fs, 'existsSync').mockImplementation(mockExist
 
 // Make it so that all temporary folders, either created directly by tests or by the code they're testing, will go into
 // one spot that we know about, which we can then clean up when we're done
-// eslint-disable-next-line @typescript-eslint/consistent-type-imports
 const osReal = await vi.importActual('os');
 const realTmpdir = osReal.tmpdir;
 
diff --git a/packages/node-core/src/integrations/anr/index.ts b/packages/node-core/src/integrations/anr/index.ts
index 0d8c4f14a53d..e33c92a1eb3b 100644
--- a/packages/node-core/src/integrations/anr/index.ts
+++ b/packages/node-core/src/integrations/anr/index.ts
@@ -265,7 +265,17 @@ async function _startWorker(
   };
 }
 
+/**
+ * @see {@link disableBlockDetectionForCallback}
+ *
+ * @deprecated The ANR integration has been deprecated. Use `eventLoopBlockIntegration` from `@sentry/node-native` instead.
+ */
 export function disableAnrDetectionForCallback<T>(callback: () => T): T;
+/**
+ * @see {@link disableBlockDetectionForCallback}
+ *
+ * @deprecated The ANR integration has been deprecated. Use `eventLoopBlockIntegration` from `@sentry/node-native` instead.
+ */
 export function disableAnrDetectionForCallback<T>(callback: () => Promise<T>): Promise<T>;
 /**
  * Temporarily disables ANR detection for the duration of a callback function.
diff --git a/packages/node-core/src/logs/exports.ts b/packages/node-core/src/logs/exports.ts
index 665d4d78d9ad..a4a6ee2fef69 100644
--- a/packages/node-core/src/logs/exports.ts
+++ b/packages/node-core/src/logs/exports.ts
@@ -1,4 +1,4 @@
-import { type CaptureLogArgs, captureLog } from './capture';
+import { captureLog, type CaptureLogArgs } from './capture';
 
 /**
  * @summary Capture a log with the `trace` level. Requires the `enableLogs` option to be enabled.
diff --git a/packages/node-core/test/cron.test.ts b/packages/node-core/test/cron.test.ts
index efa146b90f20..bf1e83d315e5 100644
--- a/packages/node-core/test/cron.test.ts
+++ b/packages/node-core/test/cron.test.ts
@@ -1,5 +1,5 @@
 import * as SentryCore from '@sentry/core';
-import { type MockInstance, afterEach, beforeEach, describe, expect, test, vi } from 'vitest';
+import { afterEach, beforeEach, describe, expect, type MockInstance, test, vi } from 'vitest';
 import { cron } from '../src';
 import type { CronJob, CronJobParams } from '../src/cron/cron';
 import type { NodeCron, NodeCronOptions } from '../src/cron/node-cron';
diff --git a/packages/node-core/test/helpers/mockSdkInit.ts b/packages/node-core/test/helpers/mockSdkInit.ts
index 8d4cb28bfd66..556a33091d8e 100644
--- a/packages/node-core/test/helpers/mockSdkInit.ts
+++ b/packages/node-core/test/helpers/mockSdkInit.ts
@@ -1,6 +1,6 @@
 import { context, propagation, ProxyTracerProvider, trace } from '@opentelemetry/api';
 import { defaultResource, resourceFromAttributes } from '@opentelemetry/resources';
-import { type SpanProcessor, BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
+import { BasicTracerProvider, type SpanProcessor } from '@opentelemetry/sdk-trace-base';
 import {
   ATTR_SERVICE_NAME,
   ATTR_SERVICE_VERSION,
diff --git a/packages/node-core/test/integrations/context.test.ts b/packages/node-core/test/integrations/context.test.ts
index c6ca3ad6a4da..b8c3f8e3d49b 100644
--- a/packages/node-core/test/integrations/context.test.ts
+++ b/packages/node-core/test/integrations/context.test.ts
@@ -4,7 +4,6 @@ import { getAppContext, getDeviceContext } from '../../src/integrations/context'
 import { conditionalTest } from '../helpers/conditional';
 
 vi.mock('node:os', async () => {
-  // eslint-disable-next-line @typescript-eslint/consistent-type-imports
   const original = await vi.importActual('node:os');
   return {
     ...original,
diff --git a/packages/node-core/test/integrations/contextlines.test.ts b/packages/node-core/test/integrations/contextlines.test.ts
index 332cd9b2e51e..ccb963723d39 100644
--- a/packages/node-core/test/integrations/contextlines.test.ts
+++ b/packages/node-core/test/integrations/contextlines.test.ts
@@ -12,7 +12,6 @@ import { defaultStackParser } from '../../src/sdk/api';
 import { getError } from '../helpers/error';
 
 vi.mock('node:fs', async () => {
-  // eslint-disable-next-line @typescript-eslint/consistent-type-imports
   const original = await vi.importActual('node:fs');
   return {
     ...original,
diff --git a/packages/node-core/test/integrations/spotlight.test.ts b/packages/node-core/test/integrations/spotlight.test.ts
index 6d8e6b0bcfc2..1e257e887da5 100644
--- a/packages/node-core/test/integrations/spotlight.test.ts
+++ b/packages/node-core/test/integrations/spotlight.test.ts
@@ -7,7 +7,6 @@ import { NodeClient } from '../../src/sdk/client';
 import { getDefaultNodeClientOptions } from '../helpers/getDefaultNodeClientOptions';
 
 vi.mock('node:http', async () => {
-  // eslint-disable-next-line @typescript-eslint/consistent-type-imports
   const original = await vi.importActual('node:http');
   return {
     ...original,
diff --git a/packages/node-core/test/sdk/init.test.ts b/packages/node-core/test/sdk/init.test.ts
index 1332b89abcd6..d5f150f03a59 100644
--- a/packages/node-core/test/sdk/init.test.ts
+++ b/packages/node-core/test/sdk/init.test.ts
@@ -1,7 +1,7 @@
 import type { Integration } from '@sentry/core';
 import { debug, SDK_VERSION } from '@sentry/core';
 import * as SentryOpentelemetry from '@sentry/opentelemetry';
-import { type Mock, afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { afterEach, beforeEach, describe, expect, it, type Mock, vi } from 'vitest';
 import { getClient } from '../../src/';
 import { init, validateOpenTelemetrySetup } from '../../src/sdk';
 import { NodeClient } from '../../src/sdk/client';
diff --git a/packages/node-core/test/transports/http.test.ts b/packages/node-core/test/transports/http.test.ts
index e33bcb542bbd..ab766739c59c 100644
--- a/packages/node-core/test/transports/http.test.ts
+++ b/packages/node-core/test/transports/http.test.ts
@@ -7,13 +7,12 @@ import {
   serializeEnvelope,
 } from '@sentry/core';
 import * as http from 'http';
-import { type Mock, afterEach, describe, expect, it, vi } from 'vitest';
+import { afterEach, describe, expect, it, type Mock, vi } from 'vitest';
 import { createGunzip } from 'zlib';
 import * as httpProxyAgent from '../../src/proxy';
 import { makeNodeTransport } from '../../src/transports';
 
 vi.mock('@sentry/core', async () => {
-  // eslint-disable-next-line @typescript-eslint/consistent-type-imports
   const actualCore = await vi.importActual('@sentry/core');
   return {
     ...actualCore,
@@ -22,7 +21,6 @@ vi.mock('@sentry/core', async () => {
 });
 
 vi.mock('node:http', async () => {
-  // eslint-disable-next-line @typescript-eslint/consistent-type-imports
   const original = await vi.importActual('node:http');
   return {
     ...original,
diff --git a/packages/node-core/test/transports/https.test.ts b/packages/node-core/test/transports/https.test.ts
index ec9fc0aa8204..95e807c4e1eb 100644
--- a/packages/node-core/test/transports/https.test.ts
+++ b/packages/node-core/test/transports/https.test.ts
@@ -2,14 +2,13 @@ import type { EventEnvelope, EventItem } from '@sentry/core';
 import { createEnvelope, createTransport, serializeEnvelope } from '@sentry/core';
 import * as http from 'http';
 import * as https from 'https';
-import { type Mock, afterEach, describe, expect, it, vi } from 'vitest';
+import { afterEach, describe, expect, it, type Mock, vi } from 'vitest';
 import * as httpProxyAgent from '../../src/proxy';
 import { makeNodeTransport } from '../../src/transports';
 import type { HTTPModule, HTTPModuleRequestIncomingMessage } from '../../src/transports/http-module';
 import testServerCerts from './test-server-certs';
 
 vi.mock('@sentry/core', async () => {
-  // eslint-disable-next-line @typescript-eslint/consistent-type-imports
   const actualCore = await vi.importActual('@sentry/core');
   return {
     ...actualCore,
diff --git a/packages/node/src/integrations/http.ts b/packages/node/src/integrations/http.ts
index 3160898e0827..e6c48a6bd550 100644
--- a/packages/node/src/integrations/http.ts
+++ b/packages/node/src/integrations/http.ts
@@ -4,9 +4,8 @@ import type { HttpInstrumentationConfig } from '@opentelemetry/instrumentation-h
 import { HttpInstrumentation } from '@opentelemetry/instrumentation-http';
 import type { Span } from '@sentry/core';
 import { defineIntegration, getClient, hasSpansEnabled } from '@sentry/core';
-import type { HTTPModuleRequestIncomingMessage, NodeClient } from '@sentry/node-core';
+import type { HTTPModuleRequestIncomingMessage, NodeClient, SentryHttpInstrumentationOptions } from '@sentry/node-core';
 import {
-  type SentryHttpInstrumentationOptions,
   addOriginToSpan,
   generateInstrumentOnce,
   getRequestUrl,
diff --git a/packages/node/src/integrations/tracing/amqplib.ts b/packages/node/src/integrations/tracing/amqplib.ts
index bbbdb0b4ae71..7b4ac259add5 100644
--- a/packages/node/src/integrations/tracing/amqplib.ts
+++ b/packages/node/src/integrations/tracing/amqplib.ts
@@ -1,5 +1,5 @@
 import type { Span } from '@opentelemetry/api';
-import { type AmqplibInstrumentationConfig, AmqplibInstrumentation } from '@opentelemetry/instrumentation-amqplib';
+import { AmqplibInstrumentation, type AmqplibInstrumentationConfig } from '@opentelemetry/instrumentation-amqplib';
 import type { IntegrationFn } from '@sentry/core';
 import { defineIntegration } from '@sentry/core';
 import { addOriginToSpan, generateInstrumentOnce } from '@sentry/node-core';
diff --git a/packages/node/src/integrations/tracing/anthropic-ai/instrumentation.ts b/packages/node/src/integrations/tracing/anthropic-ai/instrumentation.ts
index 09cfd7e33713..4fc96aa5ea92 100644
--- a/packages/node/src/integrations/tracing/anthropic-ai/instrumentation.ts
+++ b/packages/node/src/integrations/tracing/anthropic-ai/instrumentation.ts
@@ -1,7 +1,7 @@
 import {
+  InstrumentationBase,
   type InstrumentationConfig,
   type InstrumentationModuleDefinition,
-  InstrumentationBase,
   InstrumentationNodeModuleDefinition,
 } from '@opentelemetry/instrumentation';
 import type { AnthropicAiClient, AnthropicAiOptions } from '@sentry/core';
diff --git a/packages/node/src/integrations/tracing/fastify/fastify-otel/index.js b/packages/node/src/integrations/tracing/fastify/fastify-otel/index.js
index 8cbc4234b06b..a3021cba20e0 100644
--- a/packages/node/src/integrations/tracing/fastify/fastify-otel/index.js
+++ b/packages/node/src/integrations/tracing/fastify/fastify-otel/index.js
@@ -33,6 +33,7 @@ SOFTWARE.
 /* eslint-disable jsdoc/require-jsdoc */
 /* eslint-disable max-lines */
 /* eslint-disable no-param-reassign */
+/* eslint-disable import/named */
 import dc from 'node:diagnostics_channel';
 import { context, diag, propagation, SpanStatusCode, trace } from '@opentelemetry/api';
 import { getRPCMetadata, RPCType } from '@opentelemetry/core';
diff --git a/packages/node/src/integrations/tracing/fastify/index.ts b/packages/node/src/integrations/tracing/fastify/index.ts
index 0ad069ea1f4e..c777fa20136d 100644
--- a/packages/node/src/integrations/tracing/fastify/index.ts
+++ b/packages/node/src/integrations/tracing/fastify/index.ts
@@ -262,7 +262,6 @@ export function setupFastifyErrorHandler(fastify: FastifyInstance, options?: Par
     },
   );
 
-  // eslint-disable-next-line @typescript-eslint/no-floating-promises
   fastify.register(plugin);
 }
 
diff --git a/packages/node/src/integrations/tracing/fastify/v3/utils.ts b/packages/node/src/integrations/tracing/fastify/v3/utils.ts
index 0e30c5f0bd07..41f4a706b038 100644
--- a/packages/node/src/integrations/tracing/fastify/v3/utils.ts
+++ b/packages/node/src/integrations/tracing/fastify/v3/utils.ts
@@ -19,7 +19,7 @@
  * limitations under the License.
  */
 
-import { type Attributes, type Span, type Tracer, SpanStatusCode } from '@opentelemetry/api';
+import { type Attributes, type Span, SpanStatusCode, type Tracer } from '@opentelemetry/api';
 import { spanRequestSymbol } from './constants';
 import type { PluginFastifyReply } from './internal-types';
 
@@ -41,7 +41,6 @@ export function startSpan(
   const spans: Span[] = reply[spanRequestSymbol] || [];
   spans.push(span);
 
-  // eslint-disable-next-line @typescript-eslint/no-floating-promises
   Object.defineProperty(reply, spanRequestSymbol, {
     enumerable: false,
     configurable: true,
diff --git a/packages/node/src/integrations/tracing/firebase/firebase.ts b/packages/node/src/integrations/tracing/firebase/firebase.ts
index ceb521d54fa3..13eb65c42568 100644
--- a/packages/node/src/integrations/tracing/firebase/firebase.ts
+++ b/packages/node/src/integrations/tracing/firebase/firebase.ts
@@ -1,7 +1,7 @@
 import type { IntegrationFn } from '@sentry/core';
 import { captureException, defineIntegration, flush, SEMANTIC_ATTRIBUTE_SENTRY_OP } from '@sentry/core';
 import { addOriginToSpan, generateInstrumentOnce } from '@sentry/node-core';
-import { type FirebaseInstrumentationConfig, FirebaseInstrumentation } from './otel';
+import { FirebaseInstrumentation, type FirebaseInstrumentationConfig } from './otel';
 
 const INTEGRATION_NAME = 'Firebase';
 
diff --git a/packages/node/src/integrations/tracing/firebase/otel/firebaseInstrumentation.ts b/packages/node/src/integrations/tracing/firebase/otel/firebaseInstrumentation.ts
index 724005e6f9ed..bd55dc708315 100644
--- a/packages/node/src/integrations/tracing/firebase/otel/firebaseInstrumentation.ts
+++ b/packages/node/src/integrations/tracing/firebase/otel/firebaseInstrumentation.ts
@@ -1,4 +1,4 @@
-import { type InstrumentationNodeModuleDefinition, InstrumentationBase } from '@opentelemetry/instrumentation';
+import { InstrumentationBase, type InstrumentationNodeModuleDefinition } from '@opentelemetry/instrumentation';
 import { SDK_VERSION } from '@sentry/core';
 import { patchFirestore } from './patches/firestore';
 import { patchFunctions } from './patches/functions';
diff --git a/packages/node/src/integrations/tracing/firebase/otel/patches/firestore.ts b/packages/node/src/integrations/tracing/firebase/otel/patches/firestore.ts
index cc28aded8e8c..43cf61917e21 100644
--- a/packages/node/src/integrations/tracing/firebase/otel/patches/firestore.ts
+++ b/packages/node/src/integrations/tracing/firebase/otel/patches/firestore.ts
@@ -55,7 +55,6 @@ export function patchFirestore(
   unwrap: ShimmerUnwrap,
   config: FirebaseInstrumentationConfig,
 ): InstrumentationNodeModuleDefinition {
-  // eslint-disable-next-line @typescript-eslint/no-empty-function
   const defaultFirestoreSpanCreationHook: FirestoreSpanCreationHook = () => {};
 
   let firestoreSpanCreationHook: FirestoreSpanCreationHook = defaultFirestoreSpanCreationHook;
@@ -131,7 +130,6 @@ function unwrapMethods(
   for (const method of ['addDoc', 'getDocs', 'setDoc', 'deleteDoc']) {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
     if (isWrapped(moduleExports[method])) {
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
       unwrap(moduleExports, method);
     }
   }
diff --git a/packages/node/src/integrations/tracing/google-genai/instrumentation.ts b/packages/node/src/integrations/tracing/google-genai/instrumentation.ts
index 194e5bf2df70..af434a06503a 100644
--- a/packages/node/src/integrations/tracing/google-genai/instrumentation.ts
+++ b/packages/node/src/integrations/tracing/google-genai/instrumentation.ts
@@ -1,6 +1,5 @@
-import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
+import type { InstrumentationConfig, InstrumentationModuleDefinition } from '@opentelemetry/instrumentation';
 import {
-  type InstrumentationModuleDefinition,
   InstrumentationBase,
   InstrumentationNodeModuleDefinition,
   InstrumentationNodeModuleFile,
diff --git a/packages/node/src/integrations/tracing/hapi/index.ts b/packages/node/src/integrations/tracing/hapi/index.ts
index a8a64c0b0714..876f130c65b4 100644
--- a/packages/node/src/integrations/tracing/hapi/index.ts
+++ b/packages/node/src/integrations/tracing/hapi/index.ts
@@ -119,7 +119,6 @@ export async function setupHapiErrorHandler(server: Server): Promise<void> {
     });
   }
 
-  // eslint-disable-next-line @typescript-eslint/unbound-method
   ensureIsWrapped(server.register, 'hapi');
 }
 
diff --git a/packages/node/src/integrations/tracing/langchain/instrumentation.ts b/packages/node/src/integrations/tracing/langchain/instrumentation.ts
index 8d5c42111f3d..efa487ddce4f 100644
--- a/packages/node/src/integrations/tracing/langchain/instrumentation.ts
+++ b/packages/node/src/integrations/tracing/langchain/instrumentation.ts
@@ -1,7 +1,7 @@
 import {
+  InstrumentationBase,
   type InstrumentationConfig,
   type InstrumentationModuleDefinition,
-  InstrumentationBase,
   InstrumentationNodeModuleDefinition,
   InstrumentationNodeModuleFile,
 } from '@opentelemetry/instrumentation';
diff --git a/packages/node/src/integrations/tracing/langgraph/instrumentation.ts b/packages/node/src/integrations/tracing/langgraph/instrumentation.ts
index ca1406e3e493..d275e1b9d39b 100644
--- a/packages/node/src/integrations/tracing/langgraph/instrumentation.ts
+++ b/packages/node/src/integrations/tracing/langgraph/instrumentation.ts
@@ -1,7 +1,7 @@
 import {
+  InstrumentationBase,
   type InstrumentationConfig,
   type InstrumentationModuleDefinition,
-  InstrumentationBase,
   InstrumentationNodeModuleDefinition,
   InstrumentationNodeModuleFile,
 } from '@opentelemetry/instrumentation';
@@ -63,9 +63,7 @@ export class SentryLangGraphInstrumentation extends InstrumentationBase<LangGrap
     const defaultPii = Boolean(client?.getOptions().sendDefaultPii);
 
     const config = this.getConfig();
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
     const recordInputs = config.recordInputs ?? defaultPii;
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
     const recordOutputs = config.recordOutputs ?? defaultPii;
 
     const options: LangGraphOptions = {
diff --git a/packages/node/src/integrations/tracing/openai/instrumentation.ts b/packages/node/src/integrations/tracing/openai/instrumentation.ts
index b1a577f9a5f4..77250b3b6515 100644
--- a/packages/node/src/integrations/tracing/openai/instrumentation.ts
+++ b/packages/node/src/integrations/tracing/openai/instrumentation.ts
@@ -1,7 +1,7 @@
 import {
+  InstrumentationBase,
   type InstrumentationConfig,
   type InstrumentationModuleDefinition,
-  InstrumentationBase,
   InstrumentationNodeModuleDefinition,
 } from '@opentelemetry/instrumentation';
 import type { Integration, OpenAiClient, OpenAiOptions } from '@sentry/core';
diff --git a/packages/node/src/integrations/tracing/vercelai/index.ts b/packages/node/src/integrations/tracing/vercelai/index.ts
index 5588384e22c4..a0b3f3126d01 100644
--- a/packages/node/src/integrations/tracing/vercelai/index.ts
+++ b/packages/node/src/integrations/tracing/vercelai/index.ts
@@ -1,6 +1,6 @@
 import type { Client, IntegrationFn } from '@sentry/core';
 import { addVercelAiProcessors, defineIntegration } from '@sentry/core';
-import { type modulesIntegration, generateInstrumentOnce } from '@sentry/node-core';
+import { generateInstrumentOnce, type modulesIntegration } from '@sentry/node-core';
 import { INTEGRATION_NAME } from './constants';
 import { SentryVercelAiInstrumentation } from './instrumentation';
 import type { VercelAiOptions } from './types';
diff --git a/packages/node/src/sdk/initOtel.ts b/packages/node/src/sdk/initOtel.ts
index 67de29821537..9eec5d752371 100644
--- a/packages/node/src/sdk/initOtel.ts
+++ b/packages/node/src/sdk/initOtel.ts
@@ -9,8 +9,8 @@ import {
 } from '@opentelemetry/semantic-conventions';
 import { debug as coreDebug, SDK_VERSION } from '@sentry/core';
 import {
-  type NodeClient,
   initializeEsmLoader,
+  type NodeClient,
   SentryContextManager,
   setupOpenTelemetryLogger,
 } from '@sentry/node-core';
diff --git a/packages/node/test/cron.test.ts b/packages/node/test/cron.test.ts
index efa146b90f20..bf1e83d315e5 100644
--- a/packages/node/test/cron.test.ts
+++ b/packages/node/test/cron.test.ts
@@ -1,5 +1,5 @@
 import * as SentryCore from '@sentry/core';
-import { type MockInstance, afterEach, beforeEach, describe, expect, test, vi } from 'vitest';
+import { afterEach, beforeEach, describe, expect, type MockInstance, test, vi } from 'vitest';
 import { cron } from '../src';
 import type { CronJob, CronJobParams } from '../src/cron/cron';
 import type { NodeCron, NodeCronOptions } from '../src/cron/node-cron';
diff --git a/packages/node/test/helpers/mockSdkInit.ts b/packages/node/test/helpers/mockSdkInit.ts
index 8f8be9e8af68..9163943bbeb5 100644
--- a/packages/node/test/helpers/mockSdkInit.ts
+++ b/packages/node/test/helpers/mockSdkInit.ts
@@ -1,5 +1,5 @@
 import { context, propagation, ProxyTracerProvider, trace } from '@opentelemetry/api';
-import { type SpanProcessor, BasicTracerProvider } from '@opentelemetry/sdk-trace-base';
+import { BasicTracerProvider, type SpanProcessor } from '@opentelemetry/sdk-trace-base';
 import { getClient, getCurrentScope, getGlobalScope, getIsolationScope } from '@sentry/core';
 import { SentrySpanProcessor } from '@sentry/opentelemetry';
 import type { NodeClient } from '../../src';
diff --git a/packages/node/test/integrations/tracing/graphql.test.ts b/packages/node/test/integrations/tracing/graphql.test.ts
index 925aed91b4ac..e8e8ce3e6e0b 100644
--- a/packages/node/test/integrations/tracing/graphql.test.ts
+++ b/packages/node/test/integrations/tracing/graphql.test.ts
@@ -1,6 +1,6 @@
 import { GraphQLInstrumentation } from '@opentelemetry/instrumentation-graphql';
 import { INSTRUMENTED } from '@sentry/node-core';
-import { type MockInstance, beforeEach, describe, expect, it, vi } from 'vitest';
+import { beforeEach, describe, expect, it, type MockInstance, vi } from 'vitest';
 import { graphqlIntegration, instrumentGraphql } from '../../../src/integrations/tracing/graphql';
 
 vi.mock('@opentelemetry/instrumentation-graphql');
diff --git a/packages/node/test/integrations/tracing/koa.test.ts b/packages/node/test/integrations/tracing/koa.test.ts
index 39fe81caef90..74d10c344d95 100644
--- a/packages/node/test/integrations/tracing/koa.test.ts
+++ b/packages/node/test/integrations/tracing/koa.test.ts
@@ -1,6 +1,6 @@
 import { KoaInstrumentation } from '@opentelemetry/instrumentation-koa';
 import { INSTRUMENTED } from '@sentry/node-core';
-import { type MockInstance, beforeEach, describe, expect, it, vi } from 'vitest';
+import { beforeEach, describe, expect, it, type MockInstance, vi } from 'vitest';
 import { instrumentKoa, koaIntegration } from '../../../src/integrations/tracing/koa';
 
 vi.mock('@opentelemetry/instrumentation-koa');
diff --git a/packages/node/test/integrations/tracing/mongo.test.ts b/packages/node/test/integrations/tracing/mongo.test.ts
index 7710a4ad8721..34f97a84382f 100644
--- a/packages/node/test/integrations/tracing/mongo.test.ts
+++ b/packages/node/test/integrations/tracing/mongo.test.ts
@@ -1,6 +1,6 @@
 import { MongoDBInstrumentation } from '@opentelemetry/instrumentation-mongodb';
 import { INSTRUMENTED } from '@sentry/node-core';
-import { type MockInstance, beforeEach, describe, expect, it, vi } from 'vitest';
+import { beforeEach, describe, expect, it, type MockInstance, vi } from 'vitest';
 import {
   _defaultDbStatementSerializer,
   instrumentMongo,
diff --git a/packages/node/test/sdk/init.test.ts b/packages/node/test/sdk/init.test.ts
index da6680fc622f..a6a76a4439bd 100644
--- a/packages/node/test/sdk/init.test.ts
+++ b/packages/node/test/sdk/init.test.ts
@@ -1,7 +1,7 @@
 import type { Integration } from '@sentry/core';
 import { debug, SDK_VERSION } from '@sentry/core';
 import * as SentryOpentelemetry from '@sentry/opentelemetry';
-import { type Mock, type MockInstance, afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { afterEach, beforeEach, describe, expect, it, type Mock, type MockInstance, vi } from 'vitest';
 import { getClient, NodeClient, validateOpenTelemetrySetup } from '../../src/';
 import * as auto from '../../src/integrations/tracing';
 import { init } from '../../src/sdk';
diff --git a/packages/nuxt/src/client/index.ts b/packages/nuxt/src/client/index.ts
index d476348ed937..de46a448058a 100644
--- a/packages/nuxt/src/client/index.ts
+++ b/packages/nuxt/src/client/index.ts
@@ -1,3 +1,6 @@
+// import/export got a false positive, and affects most of our index barrel files
+// can be removed once following issue is fixed: https://github.com/import-js/eslint-plugin-import/issues/703
+/* eslint-disable import/export */
 export * from '@sentry/vue';
 
 export { init } from './sdk';
diff --git a/packages/nuxt/src/index.types.ts b/packages/nuxt/src/index.types.ts
index 7abb16d197e3..7109e7ad9c78 100644
--- a/packages/nuxt/src/index.types.ts
+++ b/packages/nuxt/src/index.types.ts
@@ -1,3 +1,5 @@
+// import/export got a false positive, and affects most of our index barrel files
+// can be removed once following issue is fixed: https://github.com/import-js/eslint-plugin-import/issues/703
 /* eslint-disable import/export */
 
 import type { Client, Integration, Options, StackParser } from '@sentry/core';
diff --git a/packages/nuxt/src/runtime/hooks/wrapMiddlewareHandler.ts b/packages/nuxt/src/runtime/hooks/wrapMiddlewareHandler.ts
index 4b41d6e8ab82..84d80a7c6f80 100644
--- a/packages/nuxt/src/runtime/hooks/wrapMiddlewareHandler.ts
+++ b/packages/nuxt/src/runtime/hooks/wrapMiddlewareHandler.ts
@@ -1,5 +1,4 @@
 import {
-  type SpanAttributes,
   captureException,
   debug,
   flushIfServerless,
@@ -9,6 +8,7 @@ import {
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
   SPAN_STATUS_ERROR,
   SPAN_STATUS_OK,
+  type SpanAttributes,
   startSpan,
 } from '@sentry/core';
 import type {
diff --git a/packages/nuxt/src/runtime/plugins/database.server.ts b/packages/nuxt/src/runtime/plugins/database.server.ts
index 9cdff58d336e..2226bf58ca3a 100644
--- a/packages/nuxt/src/runtime/plugins/database.server.ts
+++ b/packages/nuxt/src/runtime/plugins/database.server.ts
@@ -1,17 +1,16 @@
 import {
-  type Span,
-  type StartSpanOptions,
   addBreadcrumb,
   captureException,
   debug,
   flushIfServerless,
   SEMANTIC_ATTRIBUTE_SENTRY_OP,
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
+  type Span,
   SPAN_STATUS_ERROR,
   startSpan,
+  type StartSpanOptions,
 } from '@sentry/core';
 import type { Database, PreparedStatement } from 'db0';
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { defineNitroPlugin, useDatabase } from 'nitropack/runtime';
 import type { DatabaseConnectionConfig as DatabaseConfig } from 'nitropack/types';
 // @ts-expect-error - This is a virtual module
diff --git a/packages/nuxt/src/runtime/plugins/sentry.server.ts b/packages/nuxt/src/runtime/plugins/sentry.server.ts
index b529eafc4ee0..9514e4d06a15 100644
--- a/packages/nuxt/src/runtime/plugins/sentry.server.ts
+++ b/packages/nuxt/src/runtime/plugins/sentry.server.ts
@@ -6,7 +6,6 @@ import {
   withIsolationScope,
 } from '@sentry/core';
 import type { EventHandler, H3Event } from 'h3';
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { defineNitroPlugin } from 'nitropack/runtime';
 import type { NuxtRenderHTMLContext } from 'nuxt/app';
 import { sentryCaptureErrorHook } from '../hooks/captureErrorHook';
diff --git a/packages/nuxt/src/runtime/plugins/storage.server.ts b/packages/nuxt/src/runtime/plugins/storage.server.ts
index 710424d6995e..d73f71de4f51 100644
--- a/packages/nuxt/src/runtime/plugins/storage.server.ts
+++ b/packages/nuxt/src/runtime/plugins/storage.server.ts
@@ -1,6 +1,4 @@
 import {
-  type SpanAttributes,
-  type StartSpanOptions,
   captureException,
   debug,
   flushIfServerless,
@@ -10,9 +8,10 @@ import {
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   SPAN_STATUS_ERROR,
   SPAN_STATUS_OK,
+  type SpanAttributes,
   startSpan,
+  type StartSpanOptions,
 } from '@sentry/core';
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { defineNitroPlugin, useStorage } from 'nitropack/runtime';
 import type { CacheEntry, ResponseCacheEntry } from 'nitropack/types';
 import type { Driver, Storage } from 'unstorage';
diff --git a/packages/nuxt/src/server/index.ts b/packages/nuxt/src/server/index.ts
index 6ac8d97b4241..2337ef2fbc22 100644
--- a/packages/nuxt/src/server/index.ts
+++ b/packages/nuxt/src/server/index.ts
@@ -1,3 +1,6 @@
+// import/export got a false positive, and affects most of our index barrel files
+// can be removed once following issue is fixed: https://github.com/import-js/eslint-plugin-import/issues/703
+/* eslint-disable import/export */
 export * from '@sentry/node';
 
 export { init } from './sdk';
diff --git a/packages/nuxt/src/server/sdk.ts b/packages/nuxt/src/server/sdk.ts
index edbd26b3d707..2b492b1249ac 100644
--- a/packages/nuxt/src/server/sdk.ts
+++ b/packages/nuxt/src/server/sdk.ts
@@ -2,10 +2,10 @@ import * as path from 'node:path';
 import type { Client, Event, EventProcessor, Integration } from '@sentry/core';
 import { applySdkMetadata, debug, flush, getGlobalScope, vercelWaitUntil } from '@sentry/core';
 import {
-  type NodeOptions,
   getDefaultIntegrations as getDefaultNodeIntegrations,
   httpIntegration,
   init as initNode,
+  type NodeOptions,
 } from '@sentry/node';
 import { DEBUG_BUILD } from '../common/debug-build';
 import type { SentryNuxtServerOptions } from '../common/types';
diff --git a/packages/nuxt/src/vite/sourceMaps.ts b/packages/nuxt/src/vite/sourceMaps.ts
index 481a5910e024..dff4f74df2f7 100644
--- a/packages/nuxt/src/vite/sourceMaps.ts
+++ b/packages/nuxt/src/vite/sourceMaps.ts
@@ -1,6 +1,6 @@
 import type { Nuxt } from '@nuxt/schema';
-import { type SentryRollupPluginOptions, sentryRollupPlugin } from '@sentry/rollup-plugin';
-import { type SentryVitePluginOptions, sentryVitePlugin } from '@sentry/vite-plugin';
+import { sentryRollupPlugin, type SentryRollupPluginOptions } from '@sentry/rollup-plugin';
+import { sentryVitePlugin, type SentryVitePluginOptions } from '@sentry/vite-plugin';
 import type { NitroConfig } from 'nitropack';
 import type { SentryNuxtModuleOptions } from '../common/types';
 
diff --git a/packages/nuxt/test/runtime/plugins/server.test.ts b/packages/nuxt/test/runtime/plugins/server.test.ts
index 2190e4ed5ef3..b1ba9417c1ba 100644
--- a/packages/nuxt/test/runtime/plugins/server.test.ts
+++ b/packages/nuxt/test/runtime/plugins/server.test.ts
@@ -1,5 +1,5 @@
 import { getTraceMetaTags } from '@sentry/core';
-import { type Mock, afterEach, describe, expect, it, vi } from 'vitest';
+import { afterEach, describe, expect, it, type Mock, vi } from 'vitest';
 import { addSentryTracingMetaTags } from '../../../src/runtime/utils';
 
 vi.mock(import('@sentry/core'), async importOriginal => {
diff --git a/packages/nuxt/test/runtime/utils.test.ts b/packages/nuxt/test/runtime/utils.test.ts
index 70226ee12c86..fe1ebd94fdf3 100644
--- a/packages/nuxt/test/runtime/utils.test.ts
+++ b/packages/nuxt/test/runtime/utils.test.ts
@@ -1,5 +1,5 @@
 import { captureException, getClient } from '@sentry/core';
-import { type Mock, afterEach, beforeEach, describe, expect, it, test, vi } from 'vitest';
+import { afterEach, beforeEach, describe, expect, it, type Mock, test, vi } from 'vitest';
 import type { ComponentPublicInstance } from 'vue';
 import { extractErrorContext, reportNuxtError } from '../../src/runtime/utils';
 
diff --git a/packages/opentelemetry/test/helpers/isSpan.ts b/packages/opentelemetry/test/helpers/isSpan.ts
index a0ba28173b9e..239012323cda 100644
--- a/packages/opentelemetry/test/helpers/isSpan.ts
+++ b/packages/opentelemetry/test/helpers/isSpan.ts
@@ -1,5 +1,5 @@
-import type { Span } from '@opentelemetry/api';
-import { type SpanContext, INVALID_SPANID, INVALID_TRACEID } from '@opentelemetry/api';
+import type { Span, SpanContext } from '@opentelemetry/api';
+import { INVALID_SPANID, INVALID_TRACEID } from '@opentelemetry/api';
 
 export const isSpan = (value: unknown): value is Span => {
   return (
diff --git a/packages/profiling-node/src/integration.ts b/packages/profiling-node/src/integration.ts
index fb0cdbe6195c..17ce6f702639 100644
--- a/packages/profiling-node/src/integration.ts
+++ b/packages/profiling-node/src/integration.ts
@@ -13,7 +13,7 @@ import {
   uuid4,
 } from '@sentry/core';
 import type { NodeClient, NodeOptions } from '@sentry/node';
-import { type RawThreadCpuProfile, CpuProfilerBindings, ProfileFormat } from '@sentry-internal/node-cpu-profiler';
+import { CpuProfilerBindings, ProfileFormat, type RawThreadCpuProfile } from '@sentry-internal/node-cpu-profiler';
 import { DEBUG_BUILD } from './debug-build';
 import { NODE_MAJOR, NODE_VERSION } from './nodeVersion';
 import { MAX_PROFILE_DURATION_MS, maybeProfileSpan, stopSpanProfile } from './spanProfileUtils';
diff --git a/packages/profiling-node/src/spanProfileUtils.ts b/packages/profiling-node/src/spanProfileUtils.ts
index 0f3365bbd261..bf1be3a0bf44 100644
--- a/packages/profiling-node/src/spanProfileUtils.ts
+++ b/packages/profiling-node/src/spanProfileUtils.ts
@@ -2,7 +2,7 @@
 import type { CustomSamplingContext, Span } from '@sentry/core';
 import { debug, spanIsSampled, spanToJSON, uuid4 } from '@sentry/core';
 import type { NodeClient } from '@sentry/node';
-import { type RawThreadCpuProfile, CpuProfilerBindings } from '@sentry-internal/node-cpu-profiler';
+import { CpuProfilerBindings, type RawThreadCpuProfile } from '@sentry-internal/node-cpu-profiler';
 import { DEBUG_BUILD } from './debug-build';
 import { isValidSampleRate } from './utils';
 
diff --git a/packages/profiling-node/test/integration.worker.test.ts b/packages/profiling-node/test/integration.worker.test.ts
index 6ce62f018c01..1d34c03b33cb 100644
--- a/packages/profiling-node/test/integration.worker.test.ts
+++ b/packages/profiling-node/test/integration.worker.test.ts
@@ -1,5 +1,4 @@
-import type { Transport } from '@sentry/core';
-import { type ProfilingIntegration } from '@sentry/core';
+import type { ProfilingIntegration, Transport } from '@sentry/core';
 import * as Sentry from '@sentry/node';
 import { expect, it, vi } from 'vitest';
 import { _nodeProfilingIntegration } from '../src/integration';
diff --git a/packages/react-router/src/client/index.ts b/packages/react-router/src/client/index.ts
index 507f4172fe0b..ba5c1c1264cb 100644
--- a/packages/react-router/src/client/index.ts
+++ b/packages/react-router/src/client/index.ts
@@ -1,3 +1,6 @@
+// import/export got a false positive, and affects most of our index barrel files
+// can be removed once following issue is fixed: https://github.com/import-js/eslint-plugin-import/issues/703
+/* eslint-disable import/export */
 export * from '@sentry/browser';
 
 export { init } from './sdk';
diff --git a/packages/react-router/src/index.types.ts b/packages/react-router/src/index.types.ts
index 58566ba214fe..c9c5cb371763 100644
--- a/packages/react-router/src/index.types.ts
+++ b/packages/react-router/src/index.types.ts
@@ -1,3 +1,5 @@
+// import/export got a false positive, and affects most of our index barrel files
+// can be removed once following issue is fixed: https://github.com/import-js/eslint-plugin-import/issues/703
 /* eslint-disable import/export */
 
 import type { Integration, Options, StackParser } from '@sentry/core';
diff --git a/packages/react-router/src/server/index.ts b/packages/react-router/src/server/index.ts
index f595146ffe68..acca80a94d81 100644
--- a/packages/react-router/src/server/index.ts
+++ b/packages/react-router/src/server/index.ts
@@ -1,3 +1,6 @@
+// import/export got a false positive, and affects most of our index barrel files
+// can be removed once following issue is fixed: https://github.com/import-js/eslint-plugin-import/issues/703
+/* eslint-disable import/export */
 export * from '@sentry/node';
 
 export { init } from './sdk';
diff --git a/packages/react-router/src/server/integration/lowQualityTransactionsFilterIntegration.ts b/packages/react-router/src/server/integration/lowQualityTransactionsFilterIntegration.ts
index cc16b03076ec..e4471167f7ce 100644
--- a/packages/react-router/src/server/integration/lowQualityTransactionsFilterIntegration.ts
+++ b/packages/react-router/src/server/integration/lowQualityTransactionsFilterIntegration.ts
@@ -1,4 +1,4 @@
-import { type Client, type Event, type EventHint, debug, defineIntegration } from '@sentry/core';
+import { type Client, debug, defineIntegration, type Event, type EventHint } from '@sentry/core';
 import type { NodeOptions } from '@sentry/node';
 
 /**
diff --git a/packages/react-router/src/vite/plugin.ts b/packages/react-router/src/vite/plugin.ts
index 8163ee4c6a1b..d58b08df3fa2 100644
--- a/packages/react-router/src/vite/plugin.ts
+++ b/packages/react-router/src/vite/plugin.ts
@@ -1,5 +1,4 @@
-import type { ConfigEnv } from 'vite';
-import { type Plugin } from 'vite';
+import type { ConfigEnv, Plugin } from 'vite';
 import { makeConfigInjectorPlugin } from './makeConfigInjectorPlugin';
 import { makeCustomSentryVitePlugins } from './makeCustomSentryVitePlugins';
 import { makeEnableSourceMapsPlugin } from './makeEnableSourceMapsPlugin';
diff --git a/packages/react/package.json b/packages/react/package.json
index 06d56f58b6f5..7fea980365f7 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -56,7 +56,7 @@
     "@types/react-router-4": "npm:@types/react-router@4.0.25",
     "@types/react-router-5": "npm:@types/react-router@5.1.20",
     "eslint-plugin-react": "^7.20.5",
-    "eslint-plugin-react-hooks": "^4.0.8",
+    "eslint-plugin-react-hooks": "^4.6.0",
     "history-4": "npm:history@4.6.0",
     "history-5": "npm:history@4.9.0",
     "react": "^18.3.1",
diff --git a/packages/react/src/index.ts b/packages/react/src/index.ts
index 4638bc5c4c98..139401da7a6e 100644
--- a/packages/react/src/index.ts
+++ b/packages/react/src/index.ts
@@ -1,3 +1,6 @@
+// import/export got a false positive, and affects most of our index barrel files
+// can be removed once following issue is fixed: https://github.com/import-js/eslint-plugin-import/issues/703
+/* eslint-disable import/export */
 export * from '@sentry/browser';
 
 export { init } from './sdk';
diff --git a/packages/remix/src/client/index.ts b/packages/remix/src/client/index.ts
index 6eb908457432..65e6b9fbc184 100644
--- a/packages/remix/src/client/index.ts
+++ b/packages/remix/src/client/index.ts
@@ -1,3 +1,6 @@
+// import/export got a false positive, and affects most of our index barrel files
+// can be removed once following issue is fixed: https://github.com/import-js/eslint-plugin-import/issues/703
+/* eslint-disable import/export */
 import { debug } from '@sentry/core';
 import { DEBUG_BUILD } from '../utils/debug-build';
 
diff --git a/packages/remix/src/client/sdk.ts b/packages/remix/src/client/sdk.ts
index 21b19e1aeb24..d09ec6786ce4 100644
--- a/packages/remix/src/client/sdk.ts
+++ b/packages/remix/src/client/sdk.ts
@@ -1,4 +1,3 @@
-/* eslint-enable @typescript-eslint/no-unused-vars */
 import type { Client } from '@sentry/core';
 import { applySdkMetadata } from '@sentry/core';
 import { init as reactInit } from '@sentry/react';
diff --git a/packages/remix/src/cloudflare/index.ts b/packages/remix/src/cloudflare/index.ts
index 46c443cac39f..9b78855ae2d3 100644
--- a/packages/remix/src/cloudflare/index.ts
+++ b/packages/remix/src/cloudflare/index.ts
@@ -1,3 +1,6 @@
+// import/export got a false positive, and affects most of our index barrel files
+// can be removed once following issue is fixed: https://github.com/import-js/eslint-plugin-import/issues/703
+/* eslint-disable import/export */
 import {
   instrumentBuild as instrumentRemixBuild,
   makeWrappedCreateRequestHandler,
diff --git a/packages/remix/src/index.types.ts b/packages/remix/src/index.types.ts
index cacbac00e591..61d4f7e0b9bb 100644
--- a/packages/remix/src/index.types.ts
+++ b/packages/remix/src/index.types.ts
@@ -1,3 +1,5 @@
+// import/export got a false positive, and affects most of our index barrel files
+// can be removed once following issue is fixed: https://github.com/import-js/eslint-plugin-import/issues/703
 /* eslint-disable import/export */
 
 // We export everything from both the client part of the SDK and from the server part. Some of the exports collide,
diff --git a/packages/remix/src/server/index.ts b/packages/remix/src/server/index.ts
index 9c9885d1749a..88254807ec05 100644
--- a/packages/remix/src/server/index.ts
+++ b/packages/remix/src/server/index.ts
@@ -1,3 +1,6 @@
+// import/export got a false positive, and affects most of our index barrel files
+// can be removed once following issue is fixed: https://github.com/import-js/eslint-plugin-import/issues/703
+/* eslint-disable import/export */
 // We need to explicitly export @sentry/node as they end up under `default` in ESM builds
 // See: https://github.com/getsentry/sentry-javascript/issues/8474
 export {
@@ -7,6 +10,7 @@ export {
   amqplibIntegration,
   // eslint-disable-next-line deprecation/deprecation
   anrIntegration,
+  // eslint-disable-next-line deprecation/deprecation
   disableAnrDetectionForCallback,
   captureCheckIn,
   captureConsoleIntegration,
diff --git a/packages/remix/src/vendor/instrumentation.ts b/packages/remix/src/vendor/instrumentation.ts
index 6ccc56c7a88f..e42f6709c0c4 100644
--- a/packages/remix/src/vendor/instrumentation.ts
+++ b/packages/remix/src/vendor/instrumentation.ts
@@ -1,5 +1,4 @@
 /* eslint-disable deprecation/deprecation */
-/* eslint-disable max-lines */
 /* eslint-disable jsdoc/require-jsdoc */
 
 // Vendored and modified from:
diff --git a/packages/remix/test/index.client.test.ts b/packages/remix/test/index.client.test.ts
index c5af95a420ef..eea6e69da1fb 100644
--- a/packages/remix/test/index.client.test.ts
+++ b/packages/remix/test/index.client.test.ts
@@ -1,5 +1,5 @@
 import * as SentryReact from '@sentry/react';
-import { type Mock, afterEach, describe, expect, it, vi } from 'vitest';
+import { afterEach, describe, expect, it, type Mock, vi } from 'vitest';
 import { init } from '../src/index.client';
 
 vi.mock('@sentry/react', { spy: true });
diff --git a/packages/remix/test/index.server.test.ts b/packages/remix/test/index.server.test.ts
index 8e61ebd77e06..68dc1e249b93 100644
--- a/packages/remix/test/index.server.test.ts
+++ b/packages/remix/test/index.server.test.ts
@@ -1,5 +1,5 @@
 import * as SentryNode from '@sentry/node';
-import { type Mock, afterEach, describe, expect, it, vi } from 'vitest';
+import { afterEach, describe, expect, it, type Mock, vi } from 'vitest';
 import { init } from '../src/index.server';
 
 vi.mock('@sentry/node', { spy: true });
diff --git a/packages/replay-worker/.eslintrc.js b/packages/replay-worker/.eslintrc.js
index 2436a338dfcd..684e70d6a3b2 100644
--- a/packages/replay-worker/.eslintrc.js
+++ b/packages/replay-worker/.eslintrc.js
@@ -17,6 +17,7 @@ module.exports = {
       // these somehow fail with rollup.examples.config.mjs
       files: ['*.mjs'],
       rules: {
+        'import/named': 'off',
         'import/default': 'off',
         'import/no-named-as-default': 'off',
         'import/no-named-as-default-member': 'off',
diff --git a/packages/solid/src/index.ts b/packages/solid/src/index.ts
index 8a05327bcf0b..01cc41072235 100644
--- a/packages/solid/src/index.ts
+++ b/packages/solid/src/index.ts
@@ -1,3 +1,6 @@
+// import/export got a false positive, and affects most of our index barrel files
+// can be removed once following issue is fixed: https://github.com/import-js/eslint-plugin-import/issues/703
+/* eslint-disable import/export */
 export * from '@sentry/browser';
 
 export { init } from './sdk';
diff --git a/packages/solidstart/src/client/index.ts b/packages/solidstart/src/client/index.ts
index 9b455bb3048c..a3ef8a6a27a5 100644
--- a/packages/solidstart/src/client/index.ts
+++ b/packages/solidstart/src/client/index.ts
@@ -1,3 +1,6 @@
+// import/export got a false positive, and affects most of our index barrel files
+// can be removed once following issue is fixed: https://github.com/import-js/eslint-plugin-import/issues/703
+/* eslint-disable import/export */
 export * from '@sentry/solid';
 
 export { init } from './sdk';
diff --git a/packages/solidstart/src/index.types.ts b/packages/solidstart/src/index.types.ts
index 7f7528a0dddb..da45898b3915 100644
--- a/packages/solidstart/src/index.types.ts
+++ b/packages/solidstart/src/index.types.ts
@@ -1,3 +1,5 @@
+// import/export got a false positive, and affects most of our index barrel files
+// can be removed once following issue is fixed: https://github.com/import-js/eslint-plugin-import/issues/703
 /* eslint-disable import/export */
 
 // We export everything from both the client part of the SDK and from the server part.
diff --git a/packages/solidstart/src/server/index.ts b/packages/solidstart/src/server/index.ts
index db470feb3039..6e2bc1cb9f61 100644
--- a/packages/solidstart/src/server/index.ts
+++ b/packages/solidstart/src/server/index.ts
@@ -1,3 +1,6 @@
+// import/export got a false positive, and affects most of our index barrel files
+// can be removed once following issue is fixed: https://github.com/import-js/eslint-plugin-import/issues/703
+/* eslint-disable import/export */
 // Node SDK exports
 // Unfortunately, we cannot `export * from '@sentry/node'` because in prod builds,
 // Vite puts these exports into a `default` property (Sentry.default) rather than
diff --git a/packages/solidstart/src/server/solidrouter.ts b/packages/solidstart/src/server/solidrouter.ts
index 976d87efb8a8..bdd5b0016d25 100644
--- a/packages/solidstart/src/server/solidrouter.ts
+++ b/packages/solidstart/src/server/solidrouter.ts
@@ -1,8 +1,6 @@
 import type { HashRouter, MemoryRouter, Router as BaseRouter, RouteSectionProps, StaticRouter } from '@solidjs/router';
 import type { Component, JSX, ParentProps } from 'solid-js';
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { mergeProps, splitProps } from 'solid-js';
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { createComponent } from 'solid-js/web';
 
 // We use @sentry/solid/solidrouter on the client.
diff --git a/packages/solidstart/src/solidrouter.client.ts b/packages/solidstart/src/solidrouter.client.ts
index ee104bf72e2b..0cc7bf025e83 100644
--- a/packages/solidstart/src/solidrouter.client.ts
+++ b/packages/solidstart/src/solidrouter.client.ts
@@ -1 +1,4 @@
+// import/export got a false positive, and affects most of our index barrel files
+// can be removed once following issue is fixed: https://github.com/import-js/eslint-plugin-import/issues/703
+/* eslint-disable import/export */
 export * from './client/solidrouter';
diff --git a/packages/solidstart/src/solidrouter.ts b/packages/solidstart/src/solidrouter.ts
index 91b7f296750b..019930b90650 100644
--- a/packages/solidstart/src/solidrouter.ts
+++ b/packages/solidstart/src/solidrouter.ts
@@ -1,3 +1,5 @@
+// import/export got a false positive, and affects most of our index barrel files
+// can be removed once following issue is fixed: https://github.com/import-js/eslint-plugin-import/issues/703
 /* eslint-disable import/export */
 
 // We export everything from both the client part of the SDK and from the server part.
diff --git a/packages/svelte/src/index.ts b/packages/svelte/src/index.ts
index 8db23384897e..000c8fe57be4 100644
--- a/packages/svelte/src/index.ts
+++ b/packages/svelte/src/index.ts
@@ -1,3 +1,6 @@
+// import/export got a false positive, and affects most of our index barrel files
+// can be removed once following issue is fixed: https://github.com/import-js/eslint-plugin-import/issues/703
+/* eslint-disable import/export */
 export type {
   ComponentTrackingInitOptions as ComponentTrackingOptions,
   TrackComponentOptions as TrackingOptions,
diff --git a/packages/sveltekit/src/client/index.ts b/packages/sveltekit/src/client/index.ts
index 558526b1f318..0740b56f3c5f 100644
--- a/packages/sveltekit/src/client/index.ts
+++ b/packages/sveltekit/src/client/index.ts
@@ -1,3 +1,6 @@
+// import/export got a false positive, and affects most of our index barrel files
+// can be removed once following issue is fixed: https://github.com/import-js/eslint-plugin-import/issues/703
+/* eslint-disable import/export */
 export * from '@sentry/svelte';
 
 export { init } from './sdk';
diff --git a/packages/sveltekit/src/index.types.ts b/packages/sveltekit/src/index.types.ts
index 40c2f5ff848e..f6bdfef640c7 100644
--- a/packages/sveltekit/src/index.types.ts
+++ b/packages/sveltekit/src/index.types.ts
@@ -1,3 +1,5 @@
+// import/export got a false positive, and affects most of our index barrel files
+// can be removed once following issue is fixed: https://github.com/import-js/eslint-plugin-import/issues/703
 /* eslint-disable import/export */
 
 // We export everything from both the client part of the SDK and from the server part.
diff --git a/packages/sveltekit/src/server-common/integrations/svelteKitSpans.ts b/packages/sveltekit/src/server-common/integrations/svelteKitSpans.ts
index 5ab24a731279..c38108c75542 100644
--- a/packages/sveltekit/src/server-common/integrations/svelteKitSpans.ts
+++ b/packages/sveltekit/src/server-common/integrations/svelteKitSpans.ts
@@ -1,5 +1,5 @@
-import type { Integration, SpanOrigin } from '@sentry/core';
-import { type SpanJSON, SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
+import type { Integration, SpanJSON, SpanOrigin } from '@sentry/core';
+import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
 
 /**
  * A small integration that preprocesses spans so that SvelteKit-generated spans
diff --git a/packages/sveltekit/src/server/index.ts b/packages/sveltekit/src/server/index.ts
index 88177f11354a..9c2e4cd82a34 100644
--- a/packages/sveltekit/src/server/index.ts
+++ b/packages/sveltekit/src/server/index.ts
@@ -1,3 +1,4 @@
+/* eslint-disable import/export */
 // Node SDK exports
 // Unfortunately, we cannot `export * from '@sentry/node'` because in prod builds,
 // Vite puts these exports into a `default` property (Sentry.default) rather than
diff --git a/packages/sveltekit/src/vite/injectGlobalValues.ts b/packages/sveltekit/src/vite/injectGlobalValues.ts
index 20f446b6b46f..8f47a0d9100a 100644
--- a/packages/sveltekit/src/vite/injectGlobalValues.ts
+++ b/packages/sveltekit/src/vite/injectGlobalValues.ts
@@ -1,4 +1,4 @@
-import { type InternalGlobal, escapeStringForRegex } from '@sentry/core';
+import { escapeStringForRegex, type InternalGlobal } from '@sentry/core';
 import MagicString from 'magic-string';
 import type { Plugin } from 'vite';
 import { type BackwardsForwardsCompatibleSvelteConfig, getAdapterOutputDir, getHooksFileName } from './svelteConfig';
diff --git a/packages/sveltekit/test/server-common/serverRoute.test.ts b/packages/sveltekit/test/server-common/serverRoute.test.ts
index 1edfb6da6ebd..1000d513db5e 100644
--- a/packages/sveltekit/test/server-common/serverRoute.test.ts
+++ b/packages/sveltekit/test/server-common/serverRoute.test.ts
@@ -1,6 +1,6 @@
 import * as SentryCore from '@sentry/core';
-import type { NumericRange } from '@sveltejs/kit';
-import { type RequestEvent, error, redirect } from '@sveltejs/kit';
+import type { NumericRange, type RequestEvent } from '@sveltejs/kit';
+import { error, redirect } from '@sveltejs/kit';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 import {
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
diff --git a/packages/tanstackstart-react/src/client/index.ts b/packages/tanstackstart-react/src/client/index.ts
index 7c603d040693..2299b46b7d64 100644
--- a/packages/tanstackstart-react/src/client/index.ts
+++ b/packages/tanstackstart-react/src/client/index.ts
@@ -1,3 +1,6 @@
+// import/export got a false positive, and affects most of our index barrel files
+// can be removed once following issue is fixed: https://github.com/import-js/eslint-plugin-import/issues/703
+/* eslint-disable import/export */
 export * from '@sentry/react';
 
 export { init } from './sdk';
diff --git a/packages/tanstackstart-react/src/index.client.ts b/packages/tanstackstart-react/src/index.client.ts
index 481d8d7cd384..96c65e2ad4b2 100644
--- a/packages/tanstackstart-react/src/index.client.ts
+++ b/packages/tanstackstart-react/src/index.client.ts
@@ -1,6 +1,6 @@
-/* eslint-disable import/export */
-
 // TODO: For now these are empty re-exports, but we may add actual implementations here
 // so we keep this to be future proof
 export * from './client';
+// nothing gets exported yet from there
+// eslint-disable-next-line import/export
 export * from './common';
diff --git a/packages/tanstackstart-react/src/index.types.ts b/packages/tanstackstart-react/src/index.types.ts
index 5a44af1b59d4..bac34058d461 100644
--- a/packages/tanstackstart-react/src/index.types.ts
+++ b/packages/tanstackstart-react/src/index.types.ts
@@ -1,3 +1,5 @@
+// import/export got a false positive, and affects most of our index barrel files
+// can be removed once following issue is fixed: https://github.com/import-js/eslint-plugin-import/issues/703
 /* eslint-disable import/export */
 
 // We export everything from both the client part of the SDK and from the server part. Some of the exports collide,
diff --git a/packages/tanstackstart-react/src/server/index.ts b/packages/tanstackstart-react/src/server/index.ts
index f377305d429f..b91a89ed9482 100644
--- a/packages/tanstackstart-react/src/server/index.ts
+++ b/packages/tanstackstart-react/src/server/index.ts
@@ -1,3 +1,6 @@
+// import/export got a false positive, and affects most of our index barrel files
+// can be removed once following issue is fixed: https://github.com/import-js/eslint-plugin-import/issues/703
+/* eslint-disable import/export */
 export * from '@sentry/node';
 
 export { init } from './sdk';
diff --git a/packages/tanstackstart/src/index.client.ts b/packages/tanstackstart/src/index.client.ts
index 481d8d7cd384..326a9b310951 100644
--- a/packages/tanstackstart/src/index.client.ts
+++ b/packages/tanstackstart/src/index.client.ts
@@ -1,3 +1,5 @@
+// import/export got a false positive, and affects most of our index barrel files
+// can be removed once following issue is fixed: https://github.com/import-js/eslint-plugin-import/issues/703
 /* eslint-disable import/export */
 
 // TODO: For now these are empty re-exports, but we may add actual implementations here
diff --git a/packages/tanstackstart/src/index.server.ts b/packages/tanstackstart/src/index.server.ts
index a3606fe34592..55afc6ebdbee 100644
--- a/packages/tanstackstart/src/index.server.ts
+++ b/packages/tanstackstart/src/index.server.ts
@@ -1,3 +1,5 @@
+// import/export got a false positive, and affects most of our index barrel files
+// can be removed once following issue is fixed: https://github.com/import-js/eslint-plugin-import/issues/703
 /* eslint-disable import/export */
 
 // TODO: For now these are empty re-exports, but we may add actual implementations here
diff --git a/packages/tanstackstart/src/index.types.ts b/packages/tanstackstart/src/index.types.ts
index 730fac2ff284..d2129ff9e5d7 100644
--- a/packages/tanstackstart/src/index.types.ts
+++ b/packages/tanstackstart/src/index.types.ts
@@ -1,3 +1,5 @@
+// import/export got a false positive, and affects most of our index barrel files
+// can be removed once following issue is fixed: https://github.com/import-js/eslint-plugin-import/issues/703
 /* eslint-disable import/export */
 
 // We export everything from both the client part of the SDK and from the server part. Some of the exports collide,
diff --git a/packages/vue/src/index.ts b/packages/vue/src/index.ts
index 7e57d55865f7..3e870ff1062b 100644
--- a/packages/vue/src/index.ts
+++ b/packages/vue/src/index.ts
@@ -1,3 +1,6 @@
+// import/export got a false positive, and affects most of our index barrel files
+// can be removed once following issue is fixed: https://github.com/import-js/eslint-plugin-import/issues/703
+/* eslint-disable import/export */
 export * from '@sentry/browser';
 
 export { init } from './sdk';
diff --git a/yarn.lock b/yarn.lock
index c62e944194d0..6594edaf3f9a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1289,13 +1289,6 @@
     events "^3.0.0"
     tslib "^2.2.0"
 
-"@babel/code-frame@7.12.11":
-  version "7.12.11"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
-  integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==
-  dependencies:
-    "@babel/highlight" "^7.10.4"
-
 "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.23.5", "@babel/code-frame@^7.24.2", "@babel/code-frame@^7.26.2", "@babel/code-frame@^7.27.1":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.27.1.tgz#200f715e66d52a23b221a9435534a91cc13ad5be"
@@ -1560,7 +1553,7 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz#54da796097ab19ce67ed9f88b47bb2ec49367687"
   integrity sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==
 
-"@babel/helper-validator-identifier@^7.22.20", "@babel/helper-validator-identifier@^7.24.7", "@babel/helper-validator-identifier@^7.27.1":
+"@babel/helper-validator-identifier@^7.22.20", "@babel/helper-validator-identifier@^7.27.1":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz#a7054dcc145a967dd4dc8fee845a57c1316c9df8"
   integrity sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==
@@ -1587,16 +1580,6 @@
     "@babel/template" "^7.27.2"
     "@babel/types" "^7.27.6"
 
-"@babel/highlight@^7.10.4":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.7.tgz#a05ab1df134b286558aae0ed41e6c5f731bf409d"
-  integrity sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.24.7"
-    chalk "^2.4.2"
-    js-tokens "^4.0.0"
-    picocolors "^1.0.0"
-
 "@babel/parser@7.26.9":
   version "7.26.9"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.9.tgz#d9e78bee6dc80f9efd8f2349dcfbbcdace280fd5"
@@ -3012,6 +2995,17 @@
   dependencies:
     tslib "^2.4.0"
 
+"@es-joy/jsdoccomment@~0.50.2":
+  version "0.50.2"
+  resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.50.2.tgz#707768f0cb62abe0703d51aa9086986d230a5d5c"
+  integrity sha512-YAdE/IJSpwbOTiaURNCKECdAwqrJuFiZhylmesBcIRawtYKnBR2wxPhoIewMg+Yu+QuYvHfJNReWpoxGBKOChA==
+  dependencies:
+    "@types/estree" "^1.0.6"
+    "@typescript-eslint/types" "^8.11.0"
+    comment-parser "1.4.1"
+    esquery "^1.6.0"
+    jsdoc-type-pratt-parser "~4.1.0"
+
 "@esbuild/aix-ppc64@0.19.12":
   version "0.19.12"
   resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz#d1bc06aedb6936b3b6d313bf809a5a40387d2b7f"
@@ -4104,26 +4098,31 @@
   dependencies:
     eslint-visitor-keys "^3.4.3"
 
-"@eslint-community/regexpp@^4.4.0", "@eslint-community/regexpp@^4.5.0":
+"@eslint-community/regexpp@^4.4.0", "@eslint-community/regexpp@^4.5.0", "@eslint-community/regexpp@^4.6.1":
   version "4.12.2"
   resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.12.2.tgz#bccdf615bcf7b6e8db830ec0b8d21c9a25de597b"
   integrity sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==
 
-"@eslint/eslintrc@^0.4.3":
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c"
-  integrity sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==
+"@eslint/eslintrc@^2.1.4":
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad"
+  integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==
   dependencies:
     ajv "^6.12.4"
-    debug "^4.1.1"
-    espree "^7.3.0"
-    globals "^13.9.0"
-    ignore "^4.0.6"
+    debug "^4.3.2"
+    espree "^9.6.0"
+    globals "^13.19.0"
+    ignore "^5.2.0"
     import-fresh "^3.2.1"
-    js-yaml "^3.13.1"
-    minimatch "^3.0.4"
+    js-yaml "^4.1.0"
+    minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
+"@eslint/js@8.57.0":
+  version "8.57.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f"
+  integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==
+
 "@fastify/busboy@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@fastify/busboy/-/busboy-2.0.0.tgz#f22824caff3ae506b18207bad4126dbc6ccdb6b8"
@@ -4631,19 +4630,24 @@
   resolved "https://registry.yarnpkg.com/@hono/node-server/-/node-server-1.19.4.tgz#2721cda094f7c080ee985494ac3e074f16c503eb"
   integrity sha512-AWKQZ/YkHUBSHeL/5Ld8FWgUs6wFf4TxGYxqp9wLZxRdFuHBpXmgOq+CuDoL4vllkZLzovCf5HBJnypiy3EtHA==
 
-"@humanwhocodes/config-array@^0.5.0":
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9"
-  integrity sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==
+"@humanwhocodes/config-array@^0.11.14":
+  version "0.11.14"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b"
+  integrity sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==
   dependencies:
-    "@humanwhocodes/object-schema" "^1.2.0"
-    debug "^4.1.1"
-    minimatch "^3.0.4"
+    "@humanwhocodes/object-schema" "^2.0.2"
+    debug "^4.3.1"
+    minimatch "^3.0.5"
 
-"@humanwhocodes/object-schema@^1.2.0":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
-  integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
+"@humanwhocodes/module-importer@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
+  integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
+
+"@humanwhocodes/object-schema@^2.0.2":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3"
+  integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==
 
 "@hutson/parse-repository-url@^3.0.0":
   version "3.0.2"
@@ -5288,25 +5292,25 @@
   resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-14.2.13.tgz#859b38aaa57ffe1351d08f9166724936c9e6b365"
   integrity sha512-RQx/rGX7K/+R55x1R6Ax1JzyeHi8cW11dEXpzHWipyuSpusQLUN53F02eMB4VTakXsL3mFNWWy4bX3/LSq8/9w==
 
-"@nodelib/fs.scandir@2.1.4":
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69"
-  integrity sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==
+"@nodelib/fs.scandir@2.1.5":
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
+  integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==
   dependencies:
-    "@nodelib/fs.stat" "2.0.4"
+    "@nodelib/fs.stat" "2.0.5"
     run-parallel "^1.1.9"
 
-"@nodelib/fs.stat@2.0.4", "@nodelib/fs.stat@^2.0.2":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz#a3f2dd61bab43b8db8fa108a121cfffe4c676655"
-  integrity sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==
+"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
+  integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
 
-"@nodelib/fs.walk@^1.2.3":
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz#cce9396b30aa5afe9e3756608f5831adcb53d063"
-  integrity sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==
+"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8":
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
+  integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
   dependencies:
-    "@nodelib/fs.scandir" "2.1.4"
+    "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
 "@nothing-but/utils@~0.17.0":
@@ -6967,6 +6971,11 @@
   resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.52.5.tgz#1657f56326bbe0ac80eedc9f9c18fc1ddd24e107"
   integrity sha512-TAcgQh2sSkykPRWLrdyy2AiceMckNf5loITqXxFI5VuQjS5tSuw3WlwdN8qv8vzjLAUTvYaH/mVjSFpbkFbpTg==
 
+"@rtsao/scc@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@rtsao/scc/-/scc-1.1.0.tgz#927dd2fae9bc3361403ac2c7a00c32ddce9ad7e8"
+  integrity sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==
+
 "@schematics/angular@14.2.13":
   version "14.2.13"
   resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-14.2.13.tgz#35ee9120a3ac07077bad169fa74fdf4ce4e193d7"
@@ -8770,7 +8779,7 @@
     "@types/tough-cookie" "*"
     parse5 "^7.0.0"
 
-"@types/json-schema@*", "@types/json-schema@^7.0.12", "@types/json-schema@^7.0.15", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
+"@types/json-schema@*", "@types/json-schema@^7.0.15", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
   version "7.0.15"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
   integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
@@ -9044,7 +9053,7 @@
   resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.1.tgz#18845205e86ff0038517aab7a18a62a6b9f71275"
   integrity sha512-EaCxbanVeyxDRTQBkdLb3Bvl/HK7PBK6UJjsSixB0iHKoWxE5uu2Q/DgtpOhPIojN0Zl1whvOd7PoHs2P0s5eA==
 
-"@types/semver@^7.3.12", "@types/semver@^7.5.0":
+"@types/semver@^7.3.12":
   version "7.5.3"
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.3.tgz#9a726e116beb26c24f1ccd6850201e1246122e04"
   integrity sha512-OxepLK9EuNEIPxWNME+C6WwbRAOOI2o2BaQEGzz5Lu2e4Z5eDnEo+/aVEDMIXywoJitJ7xWd641wrGLZdtwRyw==
@@ -9172,29 +9181,30 @@
   dependencies:
     "@types/node" "*"
 
-"@typescript-eslint/eslint-plugin@^5.48.0":
-  version "5.48.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.48.0.tgz#54f8368d080eb384a455f60c2ee044e948a8ce67"
-  integrity sha512-SVLafp0NXpoJY7ut6VFVUU9I+YeFsDzeQwtK0WZ+xbRN3mtxJ08je+6Oi2N89qDn087COdO0u3blKZNv9VetRQ==
+"@typescript-eslint/eslint-plugin@^5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz#aeef0328d172b9e37d9bab6dbc13b87ed88977db"
+  integrity sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.48.0"
-    "@typescript-eslint/type-utils" "5.48.0"
-    "@typescript-eslint/utils" "5.48.0"
+    "@eslint-community/regexpp" "^4.4.0"
+    "@typescript-eslint/scope-manager" "5.62.0"
+    "@typescript-eslint/type-utils" "5.62.0"
+    "@typescript-eslint/utils" "5.62.0"
     debug "^4.3.4"
+    graphemer "^1.4.0"
     ignore "^5.2.0"
     natural-compare-lite "^1.4.0"
-    regexpp "^3.2.0"
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/parser@^5.48.0":
-  version "5.48.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.48.0.tgz#02803355b23884a83e543755349809a50b7ed9ba"
-  integrity sha512-1mxNA8qfgxX8kBvRDIHEzrRGrKHQfQlbW6iHyfHYS0Q4X1af+S6mkLNtgCOsGVl8+/LUPrqdHMssAemkrQ01qg==
+"@typescript-eslint/parser@^5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.62.0.tgz#1b63d082d849a2fcae8a569248fbe2ee1b8a56c7"
+  integrity sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.48.0"
-    "@typescript-eslint/types" "5.48.0"
-    "@typescript-eslint/typescript-estree" "5.48.0"
+    "@typescript-eslint/scope-manager" "5.62.0"
+    "@typescript-eslint/types" "5.62.0"
+    "@typescript-eslint/typescript-estree" "5.62.0"
     debug "^4.3.4"
 
 "@typescript-eslint/project-service@8.35.0":
@@ -9206,77 +9216,83 @@
     "@typescript-eslint/types" "^8.35.0"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@5.48.0":
-  version "5.48.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.48.0.tgz#607731cb0957fbc52fd754fd79507d1b6659cecf"
-  integrity sha512-0AA4LviDtVtZqlyUQnZMVHydDATpD9SAX/RC5qh6cBd3xmyWvmXYF+WT1oOmxkeMnWDlUVTwdODeucUnjz3gow==
+"@typescript-eslint/scope-manager@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz#d9457ccc6a0b8d6b37d0eb252a23022478c5460c"
+  integrity sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==
   dependencies:
-    "@typescript-eslint/types" "5.48.0"
-    "@typescript-eslint/visitor-keys" "5.48.0"
+    "@typescript-eslint/types" "5.62.0"
+    "@typescript-eslint/visitor-keys" "5.62.0"
 
-"@typescript-eslint/scope-manager@6.7.4":
-  version "6.7.4"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.7.4.tgz#a484a17aa219e96044db40813429eb7214d7b386"
-  integrity sha512-SdGqSLUPTXAXi7c3Ob7peAGVnmMoGzZ361VswK2Mqf8UOYcODiYvs8rs5ILqEdfvX1lE7wEZbLyELCW+Yrql1A==
+"@typescript-eslint/scope-manager@7.18.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz#c928e7a9fc2c0b3ed92ab3112c614d6bd9951c83"
+  integrity sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==
   dependencies:
-    "@typescript-eslint/types" "6.7.4"
-    "@typescript-eslint/visitor-keys" "6.7.4"
+    "@typescript-eslint/types" "7.18.0"
+    "@typescript-eslint/visitor-keys" "7.18.0"
 
 "@typescript-eslint/tsconfig-utils@8.35.0", "@typescript-eslint/tsconfig-utils@^8.35.0":
   version "8.35.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.35.0.tgz#6e05aeb999999e31d562ceb4fe144f3cbfbd670e"
   integrity sha512-04k/7247kZzFraweuEirmvUj+W3bJLI9fX6fbo1Qm2YykuBvEhRTPl8tcxlYO8kZZW+HIXfkZNoasVb8EV4jpA==
 
-"@typescript-eslint/type-utils@5.48.0":
-  version "5.48.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.48.0.tgz#40496dccfdc2daa14a565f8be80ad1ae3882d6d6"
-  integrity sha512-vbtPO5sJyFjtHkGlGK4Sthmta0Bbls4Onv0bEqOGm7hP9h8UpRsHJwsrCiWtCUndTRNQO/qe6Ijz9rnT/DB+7g==
+"@typescript-eslint/type-utils@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz#286f0389c41681376cdad96b309cedd17d70346a"
+  integrity sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==
   dependencies:
-    "@typescript-eslint/typescript-estree" "5.48.0"
-    "@typescript-eslint/utils" "5.48.0"
+    "@typescript-eslint/typescript-estree" "5.62.0"
+    "@typescript-eslint/utils" "5.62.0"
     debug "^4.3.4"
     tsutils "^3.21.0"
 
-"@typescript-eslint/types@5.48.0":
-  version "5.48.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.48.0.tgz#d725da8dfcff320aab2ac6f65c97b0df30058449"
-  integrity sha512-UTe67B0Ypius0fnEE518NB2N8gGutIlTojeTg4nt0GQvikReVkurqxd2LvYa9q9M5MQ6rtpNyWTBxdscw40Xhw==
+"@typescript-eslint/types@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.62.0.tgz#258607e60effa309f067608931c3df6fed41fd2f"
+  integrity sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==
 
-"@typescript-eslint/types@6.7.4":
-  version "6.7.4"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.7.4.tgz#5d358484d2be986980c039de68e9f1eb62ea7897"
-  integrity sha512-o9XWK2FLW6eSS/0r/tgjAGsYasLAnOWg7hvZ/dGYSSNjCh+49k5ocPN8OmG5aZcSJ8pclSOyVKP2x03Sj+RrCA==
+"@typescript-eslint/types@7.18.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.18.0.tgz#b90a57ccdea71797ffffa0321e744f379ec838c9"
+  integrity sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==
 
-"@typescript-eslint/types@8.35.0", "@typescript-eslint/types@^8.35.0":
+"@typescript-eslint/types@8.35.0":
   version "8.35.0"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.35.0.tgz#e60d062907930e30008d796de5c4170f02618a93"
   integrity sha512-0mYH3emanku0vHw2aRLNGqe7EXh9WHEhi7kZzscrMDf6IIRUQ5Jk4wp1QrledE/36KtdZrVfKnE32eZCf/vaVQ==
 
-"@typescript-eslint/typescript-estree@5.48.0":
-  version "5.48.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.48.0.tgz#a7f04bccb001003405bb5452d43953a382c2fac2"
-  integrity sha512-7pjd94vvIjI1zTz6aq/5wwE/YrfIyEPLtGJmRfyNR9NYIW+rOvzzUv3Cmq2hRKpvt6e9vpvPUQ7puzX7VSmsEw==
+"@typescript-eslint/types@^8.11.0", "@typescript-eslint/types@^8.35.0":
+  version "8.47.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.47.0.tgz#c7fc9b6642d03505f447a8392934b9d1850de5af"
+  integrity sha512-nHAE6bMKsizhA2uuYZbEbmp5z2UpffNrPEqiKIeN7VsV6UY/roxanWfoRrf6x/k9+Obf+GQdkm0nPU+vnMXo9A==
+
+"@typescript-eslint/typescript-estree@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz#7d17794b77fabcac615d6a48fb143330d962eb9b"
+  integrity sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==
   dependencies:
-    "@typescript-eslint/types" "5.48.0"
-    "@typescript-eslint/visitor-keys" "5.48.0"
+    "@typescript-eslint/types" "5.62.0"
+    "@typescript-eslint/visitor-keys" "5.62.0"
     debug "^4.3.4"
     globby "^11.1.0"
     is-glob "^4.0.3"
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/typescript-estree@6.7.4":
-  version "6.7.4"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.7.4.tgz#f2baece09f7bb1df9296e32638b2e1130014ef1a"
-  integrity sha512-ty8b5qHKatlNYd9vmpHooQz3Vki3gG+3PchmtsA4TgrZBKWHNjWfkQid7K7xQogBqqc7/BhGazxMD5vr6Ha+iQ==
+"@typescript-eslint/typescript-estree@7.18.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz#b5868d486c51ce8f312309ba79bdb9f331b37931"
+  integrity sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==
   dependencies:
-    "@typescript-eslint/types" "6.7.4"
-    "@typescript-eslint/visitor-keys" "6.7.4"
+    "@typescript-eslint/types" "7.18.0"
+    "@typescript-eslint/visitor-keys" "7.18.0"
     debug "^4.3.4"
     globby "^11.1.0"
     is-glob "^4.0.3"
-    semver "^7.5.4"
-    ts-api-utils "^1.0.1"
+    minimatch "^9.0.4"
+    semver "^7.6.0"
+    ts-api-utils "^1.3.0"
 
 "@typescript-eslint/typescript-estree@^8.23.0":
   version "8.35.0"
@@ -9294,48 +9310,45 @@
     semver "^7.6.0"
     ts-api-utils "^2.1.0"
 
-"@typescript-eslint/utils@5.48.0":
-  version "5.48.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.48.0.tgz#eee926af2733f7156ad8d15e51791e42ce300273"
-  integrity sha512-x2jrMcPaMfsHRRIkL+x96++xdzvrdBCnYRd5QiW5Wgo1OB4kDYPbC1XjWP/TNqlfK93K/lUL92erq5zPLgFScQ==
+"@typescript-eslint/utils@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.62.0.tgz#141e809c71636e4a75daa39faed2fb5f4b10df86"
+  integrity sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==
   dependencies:
+    "@eslint-community/eslint-utils" "^4.2.0"
     "@types/json-schema" "^7.0.9"
     "@types/semver" "^7.3.12"
-    "@typescript-eslint/scope-manager" "5.48.0"
-    "@typescript-eslint/types" "5.48.0"
-    "@typescript-eslint/typescript-estree" "5.48.0"
+    "@typescript-eslint/scope-manager" "5.62.0"
+    "@typescript-eslint/types" "5.62.0"
+    "@typescript-eslint/typescript-estree" "5.62.0"
     eslint-scope "^5.1.1"
-    eslint-utils "^3.0.0"
     semver "^7.3.7"
 
-"@typescript-eslint/utils@^6.0.0":
-  version "6.7.4"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.7.4.tgz#2236f72b10e38277ee05ef06142522e1de470ff2"
-  integrity sha512-PRQAs+HUn85Qdk+khAxsVV+oULy3VkbH3hQ8hxLRJXWBEd7iI+GbQxH5SEUSH7kbEoTp6oT1bOwyga24ELALTA==
+"@typescript-eslint/utils@^7.0.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.18.0.tgz#bca01cde77f95fc6a8d5b0dbcbfb3d6ca4be451f"
+  integrity sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==
   dependencies:
     "@eslint-community/eslint-utils" "^4.4.0"
-    "@types/json-schema" "^7.0.12"
-    "@types/semver" "^7.5.0"
-    "@typescript-eslint/scope-manager" "6.7.4"
-    "@typescript-eslint/types" "6.7.4"
-    "@typescript-eslint/typescript-estree" "6.7.4"
-    semver "^7.5.4"
+    "@typescript-eslint/scope-manager" "7.18.0"
+    "@typescript-eslint/types" "7.18.0"
+    "@typescript-eslint/typescript-estree" "7.18.0"
 
-"@typescript-eslint/visitor-keys@5.48.0":
-  version "5.48.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.48.0.tgz#4446d5e7f6cadde7140390c0e284c8702d944904"
-  integrity sha512-5motVPz5EgxQ0bHjut3chzBkJ3Z3sheYVcSwS5BpHZpLqSptSmELNtGixmgj65+rIfhvtQTz5i9OP2vtzdDH7Q==
+"@typescript-eslint/visitor-keys@5.62.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz#2174011917ce582875954ffe2f6912d5931e353e"
+  integrity sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==
   dependencies:
-    "@typescript-eslint/types" "5.48.0"
+    "@typescript-eslint/types" "5.62.0"
     eslint-visitor-keys "^3.3.0"
 
-"@typescript-eslint/visitor-keys@6.7.4":
-  version "6.7.4"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.7.4.tgz#80dfecf820fc67574012375859085f91a4dff043"
-  integrity sha512-pOW37DUhlTZbvph50x5zZCkFn3xzwkGtNoJHzIM3svpiSkJzwOYr/kVBaXmf+RAQiUDs1AHEZVNPg6UJCJpwRA==
+"@typescript-eslint/visitor-keys@7.18.0":
+  version "7.18.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz#0564629b6124d67607378d0f0332a0495b25e7d7"
+  integrity sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==
   dependencies:
-    "@typescript-eslint/types" "6.7.4"
-    eslint-visitor-keys "^3.4.1"
+    "@typescript-eslint/types" "7.18.0"
+    eslint-visitor-keys "^3.4.3"
 
 "@typescript-eslint/visitor-keys@8.35.0":
   version "8.35.0"
@@ -9345,10 +9358,10 @@
     "@typescript-eslint/types" "8.35.0"
     eslint-visitor-keys "^4.2.1"
 
-"@ungap/structured-clone@^1.0.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
-  integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
+"@ungap/structured-clone@^1.0.0", "@ungap/structured-clone@^1.2.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.3.0.tgz#d06bbb384ebcf6c505fde1c3d0ed4ddffe0aaff8"
+  integrity sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==
 
 "@unhead/dom@1.11.6", "@unhead/dom@^1.11.5":
   version "1.11.6"
@@ -10279,7 +10292,7 @@ acorn-import-attributes@^1.9.5:
   resolved "https://registry.yarnpkg.com/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz#7eb1557b1ba05ef18b5ed0ec67591bfab04688ef"
   integrity sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==
 
-acorn-jsx@^5.3.1, acorn-jsx@^5.3.2:
+acorn-jsx@^5.3.2:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
@@ -10323,12 +10336,7 @@ acorn@8.14.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.14.0.tgz#063e2c70cac5fb4f6467f0b11152e04c682795b0"
   integrity sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==
 
-acorn@^7.4.0:
-  version "7.4.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
-  integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
-
-acorn@^8.0.4, acorn@^8.1.0, acorn@^8.10.0, acorn@^8.11.0, acorn@^8.12.1, acorn@^8.14.0, acorn@^8.14.1, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.6.0, acorn@^8.7.0, acorn@^8.7.1, acorn@^8.8.1, acorn@^8.8.2, acorn@^8.9.0:
+acorn@^8.0.4, acorn@^8.1.0, acorn@^8.10.0, acorn@^8.11.0, acorn@^8.12.1, acorn@^8.14.0, acorn@^8.14.1, acorn@^8.15.0, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.6.0, acorn@^8.7.0, acorn@^8.7.1, acorn@^8.8.1, acorn@^8.8.2, acorn@^8.9.0:
   version "8.15.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.15.0.tgz#a360898bc415edaac46c8241f6383975b930b816"
   integrity sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==
@@ -10416,7 +10424,7 @@ ajv@8.11.0:
     require-from-string "^2.0.2"
     uri-js "^4.2.2"
 
-ajv@^6.10.0, ajv@^6.11.0, ajv@^6.12.4, ajv@^6.12.5:
+ajv@^6.11.0, ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -10426,7 +10434,7 @@ ajv@^6.10.0, ajv@^6.11.0, ajv@^6.12.4, ajv@^6.12.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^8.0.0, ajv@^8.0.1, ajv@^8.10.0, ajv@^8.9.0:
+ajv@^8.0.0, ajv@^8.10.0, ajv@^8.9.0:
   version "8.17.1"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.17.1.tgz#37d9a5c776af6bc92d7f4f9510eba4c0a60d11a6"
   integrity sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==
@@ -10719,6 +10727,11 @@ archiver@^7.0.0, archiver@^7.0.1:
     tar-stream "^3.0.0"
     zip-stream "^6.0.1"
 
+are-docs-informative@^0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/are-docs-informative/-/are-docs-informative-0.0.2.tgz#387f0e93f5d45280373d387a59d34c96db321963"
+  integrity sha512-ixiS0nLNNG5jNQzgZJNoUpBKdo9yTYZMGJ+QgT2jmjR7G7+QHRCc4v6LQ3NgE7EBJq+o0ams3waJwkrlBom8Ig==
+
 are-we-there-yet@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.0.tgz#ba20bd6b553e31d62fc8c31bd23d22b95734390d"
@@ -10796,13 +10809,13 @@ arr-union@^3.1.0:
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
   integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
-array-buffer-byte-length@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz#1e5583ec16763540a27ae52eed99ff899223568f"
-  integrity sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==
+array-buffer-byte-length@^1.0.0, array-buffer-byte-length@^1.0.1, array-buffer-byte-length@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz#384d12a37295aec3769ab022ad323a18a51ccf8b"
+  integrity sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==
   dependencies:
-    call-bind "^1.0.5"
-    is-array-buffer "^3.0.4"
+    call-bound "^1.0.3"
+    is-array-buffer "^3.0.5"
 
 array-differ@^3.0.0:
   version "3.0.0"
@@ -10829,16 +10842,19 @@ array-ify@^1.0.0:
   resolved "https://registry.yarnpkg.com/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece"
   integrity sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4=
 
-array-includes@^3.1.1, array-includes@^3.1.2, array-includes@^3.1.6:
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.6.tgz#9e9e720e194f198266ba9e18c29e6a9b0e4b225f"
-  integrity sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==
+array-includes@^3.1.2, array-includes@^3.1.6, array-includes@^3.1.9:
+  version "3.1.9"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.9.tgz#1f0ccaa08e90cdbc3eb433210f903ad0f17c3f3a"
+  integrity sha512-FmeCCAenzH0KH381SPT5FZmiA/TmpndpcaShhfgEN9eCVjnFBqq3l1xrI42y8+PPLI6hypzou4GXw00WHmPBLQ==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
-    get-intrinsic "^1.1.3"
-    is-string "^1.0.7"
+    call-bind "^1.0.8"
+    call-bound "^1.0.4"
+    define-properties "^1.2.1"
+    es-abstract "^1.24.0"
+    es-object-atoms "^1.1.1"
+    get-intrinsic "^1.3.0"
+    is-string "^1.1.1"
+    math-intrinsics "^1.1.0"
 
 array-iterate@^2.0.0:
   version "2.0.1"
@@ -10867,25 +10883,38 @@ array-unique@^0.3.2:
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
   integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
-array.prototype.flat@^1.2.3:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz#0b0c1567bf57b38b56b4c97b8aa72ab45e4adc7b"
-  integrity sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw==
+array.prototype.findlastindex@^1.2.6:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.6.tgz#cfa1065c81dcb64e34557c9b81d012f6a421c564"
+  integrity sha512-F/TKATkzseUExPlfvmwQKGITM3DGTK+vkAsCZoDc5daVygbJBnjEUCbgkAvVFsgfXfX4YIqZ/27G3k3tdXrTxQ==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.2"
-    es-shim-unscopables "^1.0.0"
+    call-bind "^1.0.8"
+    call-bound "^1.0.4"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.9"
+    es-errors "^1.3.0"
+    es-object-atoms "^1.1.1"
+    es-shim-unscopables "^1.1.0"
 
-array.prototype.flatmap@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz#1aae7903c2100433cb8261cd4ed310aab5c4a183"
-  integrity sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==
+array.prototype.flat@^1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz#534aaf9e6e8dd79fb6b9a9917f839ef1ec63afe5"
+  integrity sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
-    es-shim-unscopables "^1.0.0"
+    call-bind "^1.0.8"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.5"
+    es-shim-unscopables "^1.0.2"
+
+array.prototype.flatmap@^1.3.1, array.prototype.flatmap@^1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz#712cc792ae70370ae40586264629e33aab5dd38b"
+  integrity sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==
+  dependencies:
+    call-bind "^1.0.8"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.5"
+    es-shim-unscopables "^1.0.2"
 
 array.prototype.tosorted@^1.1.1:
   version "1.1.1"
@@ -10898,6 +10927,19 @@ array.prototype.tosorted@^1.1.1:
     es-shim-unscopables "^1.0.0"
     get-intrinsic "^1.1.3"
 
+arraybuffer.prototype.slice@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz#9d760d84dbdd06d0cbf92c8849615a1a7ab3183c"
+  integrity sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==
+  dependencies:
+    array-buffer-byte-length "^1.0.1"
+    call-bind "^1.0.8"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.5"
+    es-errors "^1.3.0"
+    get-intrinsic "^1.2.6"
+    is-array-buffer "^3.0.4"
+
 arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
@@ -10984,11 +11026,6 @@ ast-walker-scope@^0.6.2:
     "@babel/parser" "^7.25.3"
     ast-kit "^1.0.1"
 
-astral-regex@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
-  integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
-
 astring@^1.8.6:
   version "1.8.6"
   resolved "https://registry.yarnpkg.com/astring/-/astring-1.8.6.tgz#2c9c157cf1739d67561c56ba896e6948f6b93731"
@@ -11086,6 +11123,11 @@ async-disk-cache@^2.0.0:
     rsvp "^4.8.5"
     username-sync "^1.0.2"
 
+async-function@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/async-function/-/async-function-1.0.0.tgz#509c9fca60eaf85034c6829838188e4e4c8ffb2b"
+  integrity sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==
+
 async-mutex@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/async-mutex/-/async-mutex-0.5.0.tgz#353c69a0b9e75250971a64ac203b0ebfddd75482"
@@ -12529,7 +12571,7 @@ call-bind-apply-helpers@^1.0.0, call-bind-apply-helpers@^1.0.1, call-bind-apply-
     es-errors "^1.3.0"
     function-bind "^1.1.2"
 
-call-bind@^1.0.0, call-bind@^1.0.2, call-bind@^1.0.5, call-bind@^1.0.6, call-bind@^1.0.7, call-bind@^1.0.8:
+call-bind@^1.0.0, call-bind@^1.0.2, call-bind@^1.0.5, call-bind@^1.0.7, call-bind@^1.0.8:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.8.tgz#0736a9660f537e3388826f440d5ec45f744eaa4c"
   integrity sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==
@@ -13165,12 +13207,7 @@ commander@^9.0.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-9.5.0.tgz#bc08d1eb5cedf7ccb797a96199d41c7bc3e60d30"
   integrity sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==
 
-comment-parser@^0.7.6:
-  version "0.7.6"
-  resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-0.7.6.tgz#0e743a53c8e646c899a1323db31f6cd337b10f12"
-  integrity sha512-GKNxVA7/iuTnAqGADlTWX4tkhzxZKXp5fLJqKTlQLHkE65XDUKutZ3BHaJC5IGcper2tT3QRD1xr4o3jNpgXXg==
-
-comment-parser@^1.1.2:
+comment-parser@1.4.1, comment-parser@^1.1.2:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.4.1.tgz#bdafead37961ac079be11eb7ec65c4d021eaf9cc"
   integrity sha512-buhp5kePrmda3vhc5B9t7pUQXAb2Tnd0qgpkIhPhkHXxJpiPJ11H0ZEU0oBpJ2QztSbzG/ZxMj/CHsYJqRHmyg==
@@ -13341,11 +13378,6 @@ consolidate@^0.16.0:
   dependencies:
     bluebird "^3.7.2"
 
-contains-path@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a"
-  integrity sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=
-
 content-disposition@0.5.4:
   version "0.5.4"
   resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe"
@@ -13949,6 +13981,33 @@ data-urls@^4.0.0:
     whatwg-mimetype "^3.0.0"
     whatwg-url "^12.0.0"
 
+data-view-buffer@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/data-view-buffer/-/data-view-buffer-1.0.2.tgz#211a03ba95ecaf7798a8c7198d79536211f88570"
+  integrity sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==
+  dependencies:
+    call-bound "^1.0.3"
+    es-errors "^1.3.0"
+    is-data-view "^1.0.2"
+
+data-view-byte-length@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz#9e80f7ca52453ce3e93d25a35318767ea7704735"
+  integrity sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==
+  dependencies:
+    call-bound "^1.0.3"
+    es-errors "^1.3.0"
+    is-data-view "^1.0.2"
+
+data-view-byte-offset@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz#068307f9b71ab76dbbe10291389e020856606191"
+  integrity sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==
+  dependencies:
+    call-bound "^1.0.2"
+    es-errors "^1.3.0"
+    is-data-view "^1.0.1"
+
 dataloader@2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/dataloader/-/dataloader-2.2.2.tgz#216dc509b5abe39d43a9b9d97e6e5e473dfbe3e0"
@@ -13982,7 +14041,7 @@ debounce@^1.2.1:
   resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.1.tgz#38881d8f4166a5c5848020c11827b834bcb3e0a5"
   integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==
 
-debug@2, debug@2.6.9, debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
+debug@2, debug@2.6.9, debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -13996,7 +14055,7 @@ debug@3.1.0:
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@^4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@^4.3.5, debug@^4.3.6, debug@^4.3.7, debug@^4.4.0, debug@^4.4.1:
+debug@4, debug@^4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@^4.3.5, debug@^4.3.6, debug@^4.3.7, debug@^4.4.0, debug@^4.4.1:
   version "4.4.3"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.3.tgz#c6ae432d9bd9662582fce08709b038c58e9e3d6a"
   integrity sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==
@@ -14482,14 +14541,6 @@ dns-packet@^5.2.2:
   dependencies:
     "@leichtgewicht/ip-codec" "^2.0.1"
 
-doctrine@1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
-  integrity sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=
-  dependencies:
-    esutils "^2.0.2"
-    isarray "^1.0.0"
-
 doctrine@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
@@ -14652,7 +14703,7 @@ dset@^3.1.2:
   resolved "https://registry.yarnpkg.com/dset/-/dset-3.1.4.tgz#f8eaf5f023f068a036d08cd07dc9ffb7d0065248"
   integrity sha512-2QF/g9/zTaPDc3BjNcVTGoBbXBgYfMTTceLaYcFJ/W9kggFUkhxD/hMEeuLKbugyef9SqAx8cpgwlIP/jinUTA==
 
-dunder-proto@^1.0.1:
+dunder-proto@^1.0.0, dunder-proto@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/dunder-proto/-/dunder-proto-1.0.1.tgz#d7ae667e1dc83482f8b70fd0f6eefc50da30f58a"
   integrity sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==
@@ -15351,7 +15402,7 @@ enhanced-resolve@^5.10.0, enhanced-resolve@^5.14.1, enhanced-resolve@^5.17.1, en
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
 
-enquirer@^2.3.5, enquirer@~2.3.6:
+enquirer@~2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
   integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
@@ -15415,7 +15466,7 @@ errno@^0.1.1:
   dependencies:
     prr "~1.0.1"
 
-error-ex@^1.2.0, error-ex@^1.3.1:
+error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
   integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
@@ -15451,35 +15502,65 @@ errx@^0.1.0:
   resolved "https://registry.yarnpkg.com/errx/-/errx-0.1.0.tgz#4881e411d90a3b1e1620a07604f50081dd59f3aa"
   integrity sha512-fZmsRiDNv07K6s2KkKFTiD2aIvECa7++PKyD5NC32tpRw46qZA3sOz+aM+/V9V0GDHxVTKLziveV4JhzBHDp9Q==
 
-es-abstract@^1.18.0-next.2, es-abstract@^1.19.0, es-abstract@^1.19.2, es-abstract@^1.19.5, es-abstract@^1.20.4:
-  version "1.20.4"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.4.tgz#1d103f9f8d78d4cf0713edcd6d0ed1a46eed5861"
-  integrity sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA==
+es-abstract@^1.18.0-next.2, es-abstract@^1.20.4, es-abstract@^1.23.2, es-abstract@^1.23.5, es-abstract@^1.23.9, es-abstract@^1.24.0:
+  version "1.24.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.24.0.tgz#c44732d2beb0acc1ed60df840869e3106e7af328"
+  integrity sha512-WSzPgsdLtTcQwm4CROfS5ju2Wa1QQcVeT37jFjYzdFz1r9ahadC8B8/a4qxJxM+09F18iumCdRmlr96ZYkQvEg==
   dependencies:
-    call-bind "^1.0.2"
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    function.prototype.name "^1.1.5"
-    get-intrinsic "^1.1.3"
-    get-symbol-description "^1.0.0"
-    has "^1.0.3"
-    has-property-descriptors "^1.0.0"
-    has-symbols "^1.0.3"
-    internal-slot "^1.0.3"
+    array-buffer-byte-length "^1.0.2"
+    arraybuffer.prototype.slice "^1.0.4"
+    available-typed-arrays "^1.0.7"
+    call-bind "^1.0.8"
+    call-bound "^1.0.4"
+    data-view-buffer "^1.0.2"
+    data-view-byte-length "^1.0.2"
+    data-view-byte-offset "^1.0.1"
+    es-define-property "^1.0.1"
+    es-errors "^1.3.0"
+    es-object-atoms "^1.1.1"
+    es-set-tostringtag "^2.1.0"
+    es-to-primitive "^1.3.0"
+    function.prototype.name "^1.1.8"
+    get-intrinsic "^1.3.0"
+    get-proto "^1.0.1"
+    get-symbol-description "^1.1.0"
+    globalthis "^1.0.4"
+    gopd "^1.2.0"
+    has-property-descriptors "^1.0.2"
+    has-proto "^1.2.0"
+    has-symbols "^1.1.0"
+    hasown "^2.0.2"
+    internal-slot "^1.1.0"
+    is-array-buffer "^3.0.5"
     is-callable "^1.2.7"
-    is-negative-zero "^2.0.2"
-    is-regex "^1.1.4"
-    is-shared-array-buffer "^1.0.2"
-    is-string "^1.0.7"
-    is-weakref "^1.0.2"
-    object-inspect "^1.12.2"
+    is-data-view "^1.0.2"
+    is-negative-zero "^2.0.3"
+    is-regex "^1.2.1"
+    is-set "^2.0.3"
+    is-shared-array-buffer "^1.0.4"
+    is-string "^1.1.1"
+    is-typed-array "^1.1.15"
+    is-weakref "^1.1.1"
+    math-intrinsics "^1.1.0"
+    object-inspect "^1.13.4"
     object-keys "^1.1.1"
-    object.assign "^4.1.4"
-    regexp.prototype.flags "^1.4.3"
-    safe-regex-test "^1.0.0"
-    string.prototype.trimend "^1.0.5"
-    string.prototype.trimstart "^1.0.5"
-    unbox-primitive "^1.0.2"
+    object.assign "^4.1.7"
+    own-keys "^1.0.1"
+    regexp.prototype.flags "^1.5.4"
+    safe-array-concat "^1.1.3"
+    safe-push-apply "^1.0.0"
+    safe-regex-test "^1.1.0"
+    set-proto "^1.0.0"
+    stop-iteration-iterator "^1.1.0"
+    string.prototype.trim "^1.2.10"
+    string.prototype.trimend "^1.0.9"
+    string.prototype.trimstart "^1.0.8"
+    typed-array-buffer "^1.0.3"
+    typed-array-byte-length "^1.0.3"
+    typed-array-byte-offset "^1.0.4"
+    typed-array-length "^1.0.7"
+    unbox-primitive "^1.1.0"
+    which-typed-array "^1.1.19"
 
 es-check@^7.2.1:
   version "7.2.1"
@@ -15544,21 +15625,21 @@ es-set-tostringtag@^2.1.0:
     has-tostringtag "^1.0.2"
     hasown "^2.0.2"
 
-es-shim-unscopables@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz#702e632193201e3edf8713635d083d378e510241"
-  integrity sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==
+es-shim-unscopables@^1.0.0, es-shim-unscopables@^1.0.2, es-shim-unscopables@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.1.0.tgz#438df35520dac5d105f3943d927549ea3b00f4b5"
+  integrity sha512-d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==
   dependencies:
-    has "^1.0.3"
+    hasown "^2.0.2"
 
-es-to-primitive@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
-  integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
+es-to-primitive@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.3.0.tgz#96c89c82cc49fd8794a24835ba3e1ff87f214e18"
+  integrity sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==
   dependencies:
-    is-callable "^1.1.4"
-    is-date-object "^1.0.1"
-    is-symbol "^1.0.2"
+    is-callable "^1.2.7"
+    is-date-object "^1.0.5"
+    is-symbol "^1.0.4"
 
 esbuild-android-64@0.15.18:
   version "0.15.18"
@@ -16129,37 +16210,35 @@ escodegen@^2.0.0, escodegen@^2.1.0:
   optionalDependencies:
     source-map "~0.6.1"
 
-eslint-config-prettier@^6.11.0:
-  version "6.15.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.15.0.tgz#7f93f6cb7d45a92f1537a70ecc06366e1ac6fed9"
-  integrity sha512-a1+kOYLR8wMGustcgAjdydMsQ2A/2ipRPwRKUmfYaSxc9ZPcrku080Ctl6zrZzZNs/U82MjSv+qKREkoq3bJaw==
-  dependencies:
-    get-stdin "^6.0.0"
+eslint-config-prettier@^9.1.0:
+  version "9.1.2"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-9.1.2.tgz#90deb4fa0259592df774b600dbd1d2249a78ce91"
+  integrity sha512-iI1f+D2ViGn+uvv5HuHVUamg8ll4tN+JRHGc6IJi4TP9Kl976C57fzPXgseXNs8v0iA8aSJpHsTWjDb9QJamGQ==
 
-eslint-import-resolver-node@^0.3.4:
-  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717"
-  integrity sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==
+eslint-import-resolver-node@^0.3.9:
+  version "0.3.9"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz#d4eaac52b8a2e7c3cd1903eb00f7e053356118ac"
+  integrity sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==
   dependencies:
-    debug "^2.6.9"
-    resolve "^1.13.1"
+    debug "^3.2.7"
+    is-core-module "^2.13.0"
+    resolve "^1.22.4"
 
-eslint-module-utils@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz#579ebd094f56af7797d19c9866c9c9486629bfa6"
-  integrity sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==
+eslint-module-utils@^2.12.1:
+  version "2.12.1"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.12.1.tgz#f76d3220bfb83c057651359295ab5854eaad75ff"
+  integrity sha512-L8jSWTze7K2mTg0vos/RuLRS5soomksDPoJLXIslC7c8Wmut3bx7CPpJijDcBZtxQ5lrbUdM+s0OlNbz0DCDNw==
   dependencies:
-    debug "^2.6.9"
-    pkg-dir "^2.0.0"
+    debug "^3.2.7"
 
-eslint-plugin-deprecation@^1.5.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-deprecation/-/eslint-plugin-deprecation-1.6.0.tgz#b12d0c5a9baf3bcde0752ff6337703c059a4ae23"
-  integrity sha512-rld+Vrneh/NXRtDB0vQifOvgUy0HJYoejaxWlVnsk/LK7iij2tCWQIFcCKG4uzQb+Ef86bDke39w1lh4wnon4Q==
+eslint-plugin-deprecation@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-deprecation/-/eslint-plugin-deprecation-3.0.0.tgz#c0b6bce543c2a01f231d39a1c54fdfebf3560d48"
+  integrity sha512-JuVLdNg/uf0Adjg2tpTyYoYaMbwQNn/c78P1HcccokvhtRphgnRjZDKmhlxbxYptppex03zO76f97DD/yQHv7A==
   dependencies:
-    "@typescript-eslint/utils" "^6.0.0"
+    "@typescript-eslint/utils" "^7.0.0"
+    ts-api-utils "^1.3.0"
     tslib "^2.3.1"
-    tsutils "^3.21.0"
 
 eslint-plugin-ember@11.9.0:
   version "11.9.0"
@@ -16188,37 +16267,46 @@ eslint-plugin-es@^4.1.0:
     eslint-utils "^2.0.0"
     regexpp "^3.0.0"
 
-eslint-plugin-import@^2.22.0:
-  version "2.22.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz#0896c7e6a0cf44109a2d97b95903c2bb689d7702"
-  integrity sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw==
-  dependencies:
-    array-includes "^3.1.1"
-    array.prototype.flat "^1.2.3"
-    contains-path "^0.1.0"
-    debug "^2.6.9"
-    doctrine "1.5.0"
-    eslint-import-resolver-node "^0.3.4"
-    eslint-module-utils "^2.6.0"
-    has "^1.0.3"
-    minimatch "^3.0.4"
-    object.values "^1.1.1"
-    read-pkg-up "^2.0.0"
-    resolve "^1.17.0"
-    tsconfig-paths "^3.9.0"
+eslint-plugin-import@^2.32.0:
+  version "2.32.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.32.0.tgz#602b55faa6e4caeaa5e970c198b5c00a37708980"
+  integrity sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==
+  dependencies:
+    "@rtsao/scc" "^1.1.0"
+    array-includes "^3.1.9"
+    array.prototype.findlastindex "^1.2.6"
+    array.prototype.flat "^1.3.3"
+    array.prototype.flatmap "^1.3.3"
+    debug "^3.2.7"
+    doctrine "^2.1.0"
+    eslint-import-resolver-node "^0.3.9"
+    eslint-module-utils "^2.12.1"
+    hasown "^2.0.2"
+    is-core-module "^2.16.1"
+    is-glob "^4.0.3"
+    minimatch "^3.1.2"
+    object.fromentries "^2.0.8"
+    object.groupby "^1.0.3"
+    object.values "^1.2.1"
+    semver "^6.3.1"
+    string.prototype.trimend "^1.0.9"
+    tsconfig-paths "^3.15.0"
 
-eslint-plugin-jsdoc@^30.0.3:
-  version "30.7.13"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-30.7.13.tgz#52e5c74fb806d3bbeb51d04a0c829508c3c6b563"
-  integrity sha512-YM4WIsmurrp0rHX6XiXQppqKB8Ne5ATiZLJe2+/fkp9l9ExXFr43BbAbjZaVrpCT+tuPYOZ8k1MICARHnURUNQ==
+eslint-plugin-jsdoc@^50.6.1:
+  version "50.8.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-50.8.0.tgz#a8d192ccca26df368a2fbaff17c9dddefacd773f"
+  integrity sha512-UyGb5755LMFWPrZTEqqvTJ3urLz1iqj+bYOHFNag+sw3NvaMWP9K2z+uIn37XfNALmQLQyrBlJ5mkiVPL7ADEg==
   dependencies:
-    comment-parser "^0.7.6"
-    debug "^4.3.1"
-    jsdoctypeparser "^9.0.0"
-    lodash "^4.17.20"
-    regextras "^0.7.1"
-    semver "^7.3.4"
-    spdx-expression-parse "^3.0.1"
+    "@es-joy/jsdoccomment" "~0.50.2"
+    are-docs-informative "^0.0.2"
+    comment-parser "1.4.1"
+    debug "^4.4.1"
+    escape-string-regexp "^4.0.0"
+    espree "^10.3.0"
+    esquery "^1.6.0"
+    parse-imports-exports "^0.2.4"
+    semver "^7.7.2"
+    spdx-expression-parse "^4.0.0"
 
 eslint-plugin-n@15.0.0:
   version "15.0.0"
@@ -16241,10 +16329,10 @@ eslint-plugin-qunit@8.0.0:
     eslint-utils "^3.0.0"
     requireindex "^1.2.0"
 
-eslint-plugin-react-hooks@^4.0.8:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.2.0.tgz#8c229c268d468956334c943bb45fc860280f5556"
-  integrity sha512-623WEiZJqxR7VdxFCKLI6d6LLpwJkGPYKODnkH3D7WpOG5KM8yWueBd8TLsNAetEJNF5iJmolaAKO3F8yzyVBQ==
+eslint-plugin-react-hooks@^4.6.0:
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.2.tgz#c829eb06c0e6f484b3fbb85a97e57784f328c596"
+  integrity sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ==
 
 eslint-plugin-react@^7.20.5, eslint-plugin-react@^7.31.11:
   version "7.31.11"
@@ -16281,10 +16369,10 @@ eslint-plugin-regexp@^1.15.0:
     regexp-ast-analysis "^0.6.0"
     scslre "^0.2.0"
 
-eslint-plugin-simple-import-sort@^6.0.0:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-6.0.1.tgz#24a3af3b745dcd389c060db28e22d0f5e3edf86e"
-  integrity sha512-RfFnoi7fQtv7z9sZNJidIcZgWc0ZJe8uOPC3ldmatai4Igr5iDpzTmSUDEZKYm4TnrR01N0X32kfKvax7bivHQ==
+eslint-plugin-simple-import-sort@^12.1.1:
+  version "12.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-12.1.1.tgz#e64bfdaf91c5b98a298619aa634a9f7aa43b709e"
+  integrity sha512-6nuzu4xwQtE3332Uz0to+TxDQYRLTKRESSc2hefVT48Zc8JthmN23Gx9lnYhu0FtkRSL1oxny3kJ2aveVhmOVA==
 
 eslint-scope@5.1.1, eslint-scope@^5.1.1:
   version "5.1.1"
@@ -16294,7 +16382,15 @@ eslint-scope@5.1.1, eslint-scope@^5.1.1:
     esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
-eslint-utils@^2.0.0, eslint-utils@^2.1.0:
+eslint-scope@^7.2.2:
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f"
+  integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==
+  dependencies:
+    esrecurse "^4.3.0"
+    estraverse "^5.2.0"
+
+eslint-utils@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
   integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
@@ -16308,7 +16404,7 @@ eslint-utils@^3.0.0:
   dependencies:
     eslint-visitor-keys "^2.0.0"
 
-eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
+eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
   integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
@@ -16328,51 +16424,49 @@ eslint-visitor-keys@^4.2.1:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz#4cfea60fe7dd0ad8e816e1ed026c1d5251b512c1"
   integrity sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==
 
-eslint@7.32.0:
-  version "7.32.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d"
-  integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==
+eslint@8.57.0:
+  version "8.57.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.0.tgz#c786a6fd0e0b68941aaf624596fb987089195668"
+  integrity sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==
   dependencies:
-    "@babel/code-frame" "7.12.11"
-    "@eslint/eslintrc" "^0.4.3"
-    "@humanwhocodes/config-array" "^0.5.0"
-    ajv "^6.10.0"
+    "@eslint-community/eslint-utils" "^4.2.0"
+    "@eslint-community/regexpp" "^4.6.1"
+    "@eslint/eslintrc" "^2.1.4"
+    "@eslint/js" "8.57.0"
+    "@humanwhocodes/config-array" "^0.11.14"
+    "@humanwhocodes/module-importer" "^1.0.1"
+    "@nodelib/fs.walk" "^1.2.8"
+    "@ungap/structured-clone" "^1.2.0"
+    ajv "^6.12.4"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
-    debug "^4.0.1"
+    debug "^4.3.2"
     doctrine "^3.0.0"
-    enquirer "^2.3.5"
     escape-string-regexp "^4.0.0"
-    eslint-scope "^5.1.1"
-    eslint-utils "^2.1.0"
-    eslint-visitor-keys "^2.0.0"
-    espree "^7.3.1"
-    esquery "^1.4.0"
+    eslint-scope "^7.2.2"
+    eslint-visitor-keys "^3.4.3"
+    espree "^9.6.1"
+    esquery "^1.4.2"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
     file-entry-cache "^6.0.1"
-    functional-red-black-tree "^1.0.1"
-    glob-parent "^5.1.2"
-    globals "^13.6.0"
-    ignore "^4.0.6"
-    import-fresh "^3.0.0"
+    find-up "^5.0.0"
+    glob-parent "^6.0.2"
+    globals "^13.19.0"
+    graphemer "^1.4.0"
+    ignore "^5.2.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
-    js-yaml "^3.13.1"
+    is-path-inside "^3.0.3"
+    js-yaml "^4.1.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.4.1"
     lodash.merge "^4.6.2"
-    minimatch "^3.0.4"
+    minimatch "^3.1.2"
     natural-compare "^1.4.0"
-    optionator "^0.9.1"
-    progress "^2.0.0"
-    regexpp "^3.1.0"
-    semver "^7.2.1"
-    strip-ansi "^6.0.0"
-    strip-json-comments "^3.1.0"
-    table "^6.0.9"
+    optionator "^0.9.3"
+    strip-ansi "^6.0.1"
     text-table "^0.2.0"
-    v8-compile-cache "^2.0.3"
 
 esm-env@^1.0.0:
   version "1.0.0"
@@ -16384,14 +16478,23 @@ esm@^3.2.25, esm@^3.2.4:
   resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.25.tgz#342c18c29d56157688ba5ce31f8431fbb795cc10"
   integrity sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==
 
-espree@^7.3.0, espree@^7.3.1:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6"
-  integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==
+espree@^10.3.0:
+  version "10.4.0"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-10.4.0.tgz#d54f4949d4629005a1fa168d937c3ff1f7e2a837"
+  integrity sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==
   dependencies:
-    acorn "^7.4.0"
-    acorn-jsx "^5.3.1"
-    eslint-visitor-keys "^1.3.0"
+    acorn "^8.15.0"
+    acorn-jsx "^5.3.2"
+    eslint-visitor-keys "^4.2.1"
+
+espree@^9.6.0, espree@^9.6.1:
+  version "9.6.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
+  integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
+  dependencies:
+    acorn "^8.9.0"
+    acorn-jsx "^5.3.2"
+    eslint-visitor-keys "^3.4.1"
 
 esprima@^4.0.0, esprima@^4.0.1, esprima@~4.0.0:
   version "4.0.1"
@@ -16403,10 +16506,10 @@ esprima@~3.0.0:
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.0.0.tgz#53cf247acda77313e551c3aa2e73342d3fb4f7d9"
   integrity sha1-U88kes2ncxPlUcOqLnM0LT+099k=
 
-esquery@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"
-  integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==
+esquery@^1.4.2, esquery@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.6.0.tgz#91419234f804d852a82dceec3e16cdc22cf9dae7"
+  integrity sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==
   dependencies:
     estraverse "^5.1.0"
 
@@ -17536,27 +17639,24 @@ fsevents@~2.3.2, fsevents@~2.3.3:
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
   integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
 
-function-bind@^1.1.1, function-bind@^1.1.2:
+function-bind@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
   integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
 
-function.prototype.name@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621"
-  integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==
+function.prototype.name@^1.1.6, function.prototype.name@^1.1.8:
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.8.tgz#e68e1df7b259a5c949eeef95cdbde53edffabb78"
+  integrity sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.0"
-    functions-have-names "^1.2.2"
-
-functional-red-black-tree@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
-  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
+    call-bind "^1.0.8"
+    call-bound "^1.0.3"
+    define-properties "^1.2.1"
+    functions-have-names "^1.2.3"
+    hasown "^2.0.2"
+    is-callable "^1.2.7"
 
-functions-have-names@^1.2.2, functions-have-names@^1.2.3:
+functions-have-names@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
   integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
@@ -17626,6 +17726,11 @@ generate-function@^2.3.1:
   dependencies:
     is-property "^1.0.2"
 
+generator-function@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/generator-function/-/generator-function-2.0.1.tgz#0e75dd410d1243687a0ba2e951b94eedb8f737a2"
+  integrity sha512-SFdFmIJi+ybC0vjlHN0ZGVGHc3lgE0DxPAT0djjVg+kjOnSqclqmj0KQ7ykTOLP6YxoqOvuAODGdcHJn+43q3g==
+
 generic-pool@3.9.0, generic-pool@^3.9.0:
   version "3.9.0"
   resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-3.9.0.tgz#36f4a678e963f4fdb8707eab050823abc4e8f5e4"
@@ -17649,7 +17754,7 @@ get-caller-file@^2.0.5:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.1, get-intrinsic@^1.2.2, get-intrinsic@^1.2.4, get-intrinsic@^1.2.5, get-intrinsic@^1.2.6, get-intrinsic@^1.3.0:
+get-intrinsic@^1.1.3, get-intrinsic@^1.2.2, get-intrinsic@^1.2.4, get-intrinsic@^1.2.5, get-intrinsic@^1.2.6, get-intrinsic@^1.2.7, get-intrinsic@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.3.0.tgz#743f0e3b6964a93a5491ed1bffaae054d7f98d01"
   integrity sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==
@@ -17716,11 +17821,6 @@ get-stdin@^4.0.1:
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
   integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
 
-get-stdin@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b"
-  integrity sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==
-
 get-stdin@^9.0.0:
   version "9.0.0"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-9.0.0.tgz#3983ff82e03d56f1b2ea0d3e60325f39d703a575"
@@ -17755,13 +17855,14 @@ get-stream@^8.0.1:
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-8.0.1.tgz#def9dfd71742cd7754a7761ed43749a27d02eca2"
   integrity sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==
 
-get-symbol-description@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6"
-  integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==
+get-symbol-description@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.1.0.tgz#7bdd54e0befe8ffc9f3b4e203220d9f1e881b6ee"
+  integrity sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==
   dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.1.1"
+    call-bound "^1.0.3"
+    es-errors "^1.3.0"
+    get-intrinsic "^1.2.6"
 
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
@@ -17885,7 +17986,7 @@ glob-parent@5.1.2, glob-parent@^5.1.2, glob-parent@~5.1.2:
   dependencies:
     is-glob "^4.0.1"
 
-glob-parent@^6.0.1:
+glob-parent@^6.0.1, glob-parent@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
   integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
@@ -18020,19 +18121,20 @@ globals@^11.1.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-globals@^13.6.0, globals@^13.9.0:
-  version "13.12.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.12.0.tgz#4d733760304230a0082ed96e21e5c565f898089e"
-  integrity sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==
+globals@^13.19.0:
+  version "13.24.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.24.0.tgz#8432a19d78ce0c1e833949c36adb345400bb1171"
+  integrity sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==
   dependencies:
     type-fest "^0.20.2"
 
-globalthis@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf"
-  integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==
+globalthis@^1.0.2, globalthis@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.4.tgz#7430ed3a975d97bfb59bcce41f5cabbafa651236"
+  integrity sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==
   dependencies:
-    define-properties "^1.1.3"
+    define-properties "^1.2.1"
+    gopd "^1.0.1"
 
 globalyzer@0.1.0:
   version "0.1.0"
@@ -18159,6 +18261,11 @@ grapheme-splitter@^1.0.4:
   resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
   integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
 
+graphemer@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6"
+  integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
+
 graphql-tag@^2.11.0:
   version "2.12.6"
   resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.12.6.tgz#d441a569c1d2537ef10ca3d1633b48725329b5f1"
@@ -18316,8 +18423,15 @@ has-property-descriptors@^1.0.0, has-property-descriptors@^1.0.2:
   dependencies:
     es-define-property "^1.0.0"
 
-has-symbols@^1.0.1, has-symbols@^1.0.3, has-symbols@^1.1.0:
-  version "1.1.0"
+has-proto@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.2.0.tgz#5de5a6eabd95fdffd9818b43055e8065e39fe9d5"
+  integrity sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==
+  dependencies:
+    dunder-proto "^1.0.0"
+
+has-symbols@^1.0.1, has-symbols@^1.0.3, has-symbols@^1.1.0:
+  version "1.1.0"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.1.0.tgz#fc9c6a783a084951d0b971fe1018de813707a338"
   integrity sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==
 
@@ -18364,13 +18478,6 @@ has-values@^1.0.0:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
-has@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
-  dependencies:
-    function-bind "^1.1.1"
-
 hash-for-dep@^1.0.2, hash-for-dep@^1.4.7, hash-for-dep@^1.5.0, hash-for-dep@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/hash-for-dep/-/hash-for-dep-1.5.1.tgz#497754b39bee2f1c4ade4521bfd2af0a7c1196e3"
@@ -18388,7 +18495,7 @@ hash-sum@^2.0.0:
   resolved "https://registry.yarnpkg.com/hash-sum/-/hash-sum-2.0.0.tgz#81d01bb5de8ea4a214ad5d6ead1b523460b0b45a"
   integrity sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==
 
-hasown@^2.0.0, hasown@^2.0.2:
+hasown@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
   integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
@@ -19046,11 +19153,6 @@ ignore-walk@^6.0.0:
   dependencies:
     minimatch "^9.0.0"
 
-ignore@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
-  integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
-
 ignore@^5.0.4, ignore@^5.1.1, ignore@^5.2.0, ignore@^5.2.4, ignore@^5.3.2:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5"
@@ -19076,7 +19178,7 @@ immutable@^4.0.0:
   resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.0.0.tgz#b86f78de6adef3608395efb269a91462797e2c23"
   integrity sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==
 
-import-fresh@^3.0.0, import-fresh@^3.2.1:
+import-fresh@^3.2.1:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
   integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
@@ -19297,14 +19399,14 @@ inquirer@^8.2.1, inquirer@^8.2.4:
     through "^2.3.6"
     wrap-ansi "^6.0.1"
 
-internal-slot@^1.0.3, internal-slot@^1.0.4:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.7.tgz#c06dcca3ed874249881007b0a5523b172a190802"
-  integrity sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==
+internal-slot@^1.0.3, internal-slot@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.1.0.tgz#1eac91762947d2f7056bc838d93e13b2e9604961"
+  integrity sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==
   dependencies:
     es-errors "^1.3.0"
-    hasown "^2.0.0"
-    side-channel "^1.0.4"
+    hasown "^2.0.2"
+    side-channel "^1.1.0"
 
 interpret@^1.0.0:
   version "1.4.0"
@@ -19388,13 +19490,14 @@ is-arguments@^1.0.4, is-arguments@^1.1.1:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
-is-array-buffer@^3.0.2, is-array-buffer@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.4.tgz#7a1f92b3d61edd2bc65d24f130530ea93d7fae98"
-  integrity sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==
+is-array-buffer@^3.0.2, is-array-buffer@^3.0.4, is-array-buffer@^3.0.5:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.5.tgz#65742e1e687bd2cc666253068fd8707fe4d44280"
+  integrity sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==
   dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.2.1"
+    call-bind "^1.0.8"
+    call-bound "^1.0.3"
+    get-intrinsic "^1.2.6"
 
 is-arrayish@^0.2.1:
   version "0.2.1"
@@ -19406,10 +19509,23 @@ is-arrayish@^0.3.1:
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03"
   integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==
 
-is-bigint@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.1.tgz#6923051dfcbc764278540b9ce0e6b3213aa5ebc2"
-  integrity sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg==
+is-async-function@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-async-function/-/is-async-function-2.1.1.tgz#3e69018c8e04e73b738793d020bfe884b9fd3523"
+  integrity sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==
+  dependencies:
+    async-function "^1.0.0"
+    call-bound "^1.0.3"
+    get-proto "^1.0.1"
+    has-tostringtag "^1.0.2"
+    safe-regex-test "^1.1.0"
+
+is-bigint@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.1.0.tgz#dda7a3445df57a42583db4228682eba7c4170672"
+  integrity sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==
+  dependencies:
+    has-bigints "^1.0.2"
 
 is-binary-path@~2.1.0:
   version "2.1.0"
@@ -19418,12 +19534,13 @@ is-binary-path@~2.1.0:
   dependencies:
     binary-extensions "^2.0.0"
 
-is-boolean-object@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.0.tgz#e2aaad3a3a8fca34c28f6eee135b156ed2587ff0"
-  integrity sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA==
+is-boolean-object@^1.2.1:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.2.2.tgz#7067f47709809a393c71ff5bb3e135d8a9215d9e"
+  integrity sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==
   dependencies:
-    call-bind "^1.0.0"
+    call-bound "^1.0.3"
+    has-tostringtag "^1.0.2"
 
 is-buffer@^1.1.5:
   version "1.1.6"
@@ -19442,7 +19559,7 @@ is-builtin-module@^3.1.0, is-builtin-module@^3.2.1:
   dependencies:
     builtin-modules "^3.3.0"
 
-is-callable@^1.1.4, is-callable@^1.2.7:
+is-callable@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
   integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
@@ -19454,7 +19571,7 @@ is-ci@3.0.1:
   dependencies:
     ci-info "^3.2.0"
 
-is-core-module@^2.13.0, is-core-module@^2.16.0, is-core-module@^2.3.0, is-core-module@^2.5.0, is-core-module@^2.8.1, is-core-module@^2.9.0:
+is-core-module@^2.13.0, is-core-module@^2.16.0, is-core-module@^2.16.1, is-core-module@^2.3.0, is-core-module@^2.5.0, is-core-module@^2.8.1, is-core-module@^2.9.0:
   version "2.16.1"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.16.1.tgz#2a98801a849f43e2add644fbb6bc6229b19a4ef4"
   integrity sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==
@@ -19475,12 +19592,22 @@ is-data-descriptor@^1.0.0:
   dependencies:
     kind-of "^6.0.0"
 
-is-date-object@^1.0.1, is-date-object@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f"
-  integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==
+is-data-view@^1.0.1, is-data-view@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-data-view/-/is-data-view-1.0.2.tgz#bae0a41b9688986c2188dda6657e56b8f9e63b8e"
+  integrity sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==
   dependencies:
-    has-tostringtag "^1.0.0"
+    call-bound "^1.0.2"
+    get-intrinsic "^1.2.6"
+    is-typed-array "^1.1.13"
+
+is-date-object@^1.0.5, is-date-object@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.1.0.tgz#ad85541996fc7aa8b2729701d27b7319f95d82f7"
+  integrity sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==
+  dependencies:
+    call-bound "^1.0.2"
+    has-tostringtag "^1.0.2"
 
 is-descriptor@^0.1.0:
   version "0.1.6"
@@ -19527,6 +19654,13 @@ is-extglob@^2.1.1:
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
+is-finalizationregistry@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz#eefdcdc6c94ddd0674d9c85887bf93f944a97c90"
+  integrity sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==
+  dependencies:
+    call-bound "^1.0.3"
+
 is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
@@ -19537,10 +19671,16 @@ is-fullwidth-code-point@^3.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
-is-generator-function@^1.0.7:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.8.tgz#dfb5c2b120e02b0a8d9d2c6806cd5621aa922f7b"
-  integrity sha512-2Omr/twNtufVZFr1GhxjOMFPAj2sjc/dKaIqBhvo4qciXfJmITGH6ZGd8eZYNHza8t1y0e01AuqRhJwfWp26WQ==
+is-generator-function@^1.0.10, is-generator-function@^1.0.7:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.1.2.tgz#ae3b61e3d5ea4e4839b90bad22b02335051a17d5"
+  integrity sha512-upqt1SkGkODW9tsGNG5mtXTXtECizwtS2kA161M+gJPc1xdb/Ax629af6YrTwcOeQHbewrPNlE5Dx7kzvXTizA==
+  dependencies:
+    call-bound "^1.0.4"
+    generator-function "^2.0.0"
+    get-proto "^1.0.1"
+    has-tostringtag "^1.0.2"
+    safe-regex-test "^1.1.0"
 
 is-git-url@^1.0.0:
   version "1.0.0"
@@ -19601,15 +19741,18 @@ is-module@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
   integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=
 
-is-negative-zero@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
-  integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==
+is-negative-zero@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.3.tgz#ced903a027aca6381b777a5743069d7376a49747"
+  integrity sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==
 
-is-number-object@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz#36ac95e741cf18b283fc1ddf5e83da798e3ec197"
-  integrity sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==
+is-number-object@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.1.1.tgz#144b21e95a1bc148205dcc2814a9134ec41b2541"
+  integrity sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==
+  dependencies:
+    call-bound "^1.0.3"
+    has-tostringtag "^1.0.2"
 
 is-number@^3.0.0:
   version "3.0.0"
@@ -19633,6 +19776,11 @@ is-obj@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
   integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
 
+is-path-inside@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
+  integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
+
 is-path-inside@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-4.0.0.tgz#805aeb62c47c1b12fc3fd13bfb3ed1e7430071db"
@@ -19699,13 +19847,15 @@ is-reference@^3.0.0, is-reference@^3.0.1:
   dependencies:
     "@types/estree" "*"
 
-is-regex@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
-  integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
+is-regex@^1.1.4, is-regex@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.2.1.tgz#76d70a3ed10ef9be48eb577887d74205bf0cad22"
+  integrity sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==
   dependencies:
-    call-bind "^1.0.2"
-    has-tostringtag "^1.0.0"
+    call-bound "^1.0.2"
+    gopd "^1.2.0"
+    has-tostringtag "^1.0.2"
+    hasown "^2.0.2"
 
 is-regexp@^1.0.0:
   version "1.0.0"
@@ -19717,12 +19867,12 @@ is-set@^2.0.2, is-set@^2.0.3:
   resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.3.tgz#8ab209ea424608141372ded6e0cb200ef1d9d01d"
   integrity sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==
 
-is-shared-array-buffer@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
-  integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==
+is-shared-array-buffer@^1.0.2, is-shared-array-buffer@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz#9b67844bd9b7f246ba0708c3a93e34269c774f6f"
+  integrity sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==
   dependencies:
-    call-bind "^1.0.2"
+    call-bound "^1.0.3"
 
 is-ssh@^1.4.0:
   version "1.4.0"
@@ -19756,12 +19906,13 @@ is-stream@^4.0.1:
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-4.0.1.tgz#375cf891e16d2e4baec250b85926cffc14720d9b"
   integrity sha512-Dnz92NInDqYckGEUJv689RbRiTSEHCQ7wOVeALbkOz999YpqT46yMRIGtSNl2iCL1waAZSx40+h59NV/EwzV/A==
 
-is-string@^1.0.5, is-string@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
-  integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==
+is-string@^1.0.7, is-string@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.1.1.tgz#92ea3f3d5c5b6e039ca8677e5ac8d07ea773cbb9"
+  integrity sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==
   dependencies:
-    has-tostringtag "^1.0.0"
+    call-bound "^1.0.3"
+    has-tostringtag "^1.0.2"
 
 is-subdir@^1.2.0:
   version "1.2.0"
@@ -19770,12 +19921,14 @@ is-subdir@^1.2.0:
   dependencies:
     better-path-resolve "1.0.0"
 
-is-symbol@^1.0.2, is-symbol@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937"
-  integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==
+is-symbol@^1.0.4, is-symbol@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.1.1.tgz#f47761279f532e2b05a7024a7506dbbedacd0634"
+  integrity sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==
   dependencies:
-    has-symbols "^1.0.1"
+    call-bound "^1.0.2"
+    has-symbols "^1.1.0"
+    safe-regex-test "^1.1.0"
 
 is-text-path@^1.0.1:
   version "1.0.1"
@@ -19791,7 +19944,7 @@ is-type@0.0.1:
   dependencies:
     core-util-is "~1.0.0"
 
-is-typed-array@^1.1.14, is-typed-array@^1.1.3:
+is-typed-array@^1.1.13, is-typed-array@^1.1.14, is-typed-array@^1.1.15, is-typed-array@^1.1.3:
   version "1.1.15"
   resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.15.tgz#4bfb4a45b61cee83a5a46fba778e4e8d59c0ce0b"
   integrity sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==
@@ -19828,12 +19981,12 @@ is-weakmap@^2.0.2:
   resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.2.tgz#bf72615d649dfe5f699079c54b83e47d1ae19cfd"
   integrity sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==
 
-is-weakref@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"
-  integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==
+is-weakref@^1.0.2, is-weakref@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.1.1.tgz#eea430182be8d64174bd96bffbc46f21bf3f9293"
+  integrity sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==
   dependencies:
-    call-bind "^1.0.2"
+    call-bound "^1.0.3"
 
 is-weakset@^2.0.3:
   version "2.0.3"
@@ -20130,6 +20283,11 @@ jsbn@1.1.0:
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-1.1.0.tgz#b01307cb29b618a1ed26ec79e911f803c4da0040"
   integrity sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==
 
+jsdoc-type-pratt-parser@~4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-4.1.0.tgz#ff6b4a3f339c34a6c188cbf50a16087858d22113"
+  integrity sha512-Hicd6JK5Njt2QB6XYFS7ok9e37O8AYk3jTcppG4YVQnYjOemymvTcmc7OWsmq/Qqj5TdRFO5/x/tIPmBeRtGHg==
+
 jsdoctypeparser@^9.0.0:
   version "9.0.0"
   resolved "https://registry.yarnpkg.com/jsdoctypeparser/-/jsdoctypeparser-9.0.0.tgz#8c97e2fb69315eb274b0f01377eaa5c940bd7b26"
@@ -20262,7 +20420,7 @@ json5@^0.5.1:
   resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
   integrity sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw==
 
-json5@^1.0.1:
+json5@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"
   integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==
@@ -20797,16 +20955,6 @@ load-json-file@6.2.0:
     strip-bom "^4.0.0"
     type-fest "^0.6.0"
 
-load-json-file@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
-  integrity sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^2.2.0"
-    pify "^2.0.0"
-    strip-bom "^3.0.0"
-
 load-json-file@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
@@ -21138,11 +21286,6 @@ lodash.templatesettings@^4.0.0:
   dependencies:
     lodash._reinterpolate "^3.0.0"
 
-lodash.truncate@^4.4.2:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
-  integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=
-
 lodash.uniq@^4.2.0, lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
@@ -22258,7 +22401,7 @@ minimalistic-assert@^1.0.0:
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
   integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
 
-"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2:
+"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -23752,7 +23895,7 @@ object-hash@^1.3.1:
   resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.3.1.tgz#fde452098a951cb145f039bb7d455449ddc126df"
   integrity sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==
 
-object-inspect@^1.12.2, object-inspect@^1.13.3:
+object-inspect@^1.13.3, object-inspect@^1.13.4:
   version "1.13.4"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.4.tgz#8375265e21bc20d0fa582c22e1b13485d6e00213"
   integrity sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==
@@ -23777,14 +23920,16 @@ object-visit@^1.0.0:
   dependencies:
     isobject "^3.0.0"
 
-object.assign@^4.1.2, object.assign@^4.1.4:
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f"
-  integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==
+object.assign@^4.1.2, object.assign@^4.1.4, object.assign@^4.1.7:
+  version "4.1.7"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.7.tgz#8c14ca1a424c6a561b0bb2a22f66f5049a945d3d"
+  integrity sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    has-symbols "^1.0.3"
+    call-bind "^1.0.8"
+    call-bound "^1.0.3"
+    define-properties "^1.2.1"
+    es-object-atoms "^1.0.0"
+    has-symbols "^1.1.0"
     object-keys "^1.1.1"
 
 object.entries@^1.1.6:
@@ -23796,14 +23941,15 @@ object.entries@^1.1.6:
     define-properties "^1.1.4"
     es-abstract "^1.20.4"
 
-object.fromentries@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.6.tgz#cdb04da08c539cffa912dcd368b886e0904bfa73"
-  integrity sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==
+object.fromentries@^2.0.6, object.fromentries@^2.0.8:
+  version "2.0.8"
+  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.8.tgz#f7195d8a9b97bd95cbc1999ea939ecd1a2b00c65"
+  integrity sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.2"
+    es-object-atoms "^1.0.0"
 
 object.getownpropertydescriptors@^2.1.1:
   version "2.1.2"
@@ -23814,6 +23960,15 @@ object.getownpropertydescriptors@^2.1.1:
     define-properties "^1.1.3"
     es-abstract "^1.18.0-next.2"
 
+object.groupby@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.3.tgz#9b125c36238129f6f7b61954a1e7176148d5002e"
+  integrity sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==
+  dependencies:
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.2"
+
 object.hasown@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.2.tgz#f919e21fad4eb38a57bc6345b3afd496515c3f92"
@@ -23829,14 +23984,15 @@ object.pick@^1.3.0:
   dependencies:
     isobject "^3.0.1"
 
-object.values@^1.1.1, object.values@^1.1.6:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.6.tgz#4abbaa71eba47d63589d402856f908243eea9b1d"
-  integrity sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==
+object.values@^1.1.6, object.values@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.2.1.tgz#deed520a50809ff7f75a7cfd4bc64c7a038c6216"
+  integrity sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.20.4"
+    call-bind "^1.0.8"
+    call-bound "^1.0.3"
+    define-properties "^1.2.1"
+    es-object-atoms "^1.0.0"
 
 obuf@^1.0.0, obuf@^1.1.2:
   version "1.1.2"
@@ -23986,17 +24142,17 @@ optional-require@^1.1.8:
   dependencies:
     require-at "^1.0.6"
 
-optionator@^0.9.1:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
-  integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
+optionator@^0.9.3:
+  version "0.9.4"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.4.tgz#7ea1c1a5d91d764fb282139c88fe11e182a3a734"
+  integrity sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==
   dependencies:
     deep-is "^0.1.3"
     fast-levenshtein "^2.0.6"
     levn "^0.4.1"
     prelude-ls "^1.2.1"
     type-check "^0.4.0"
-    word-wrap "^1.2.3"
+    word-wrap "^1.2.5"
 
 ora@5.4.1, ora@^5.1.0, ora@^5.4.0, ora@^5.4.1:
   version "5.4.1"
@@ -24067,6 +24223,15 @@ osenv@^0.1.3:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.0"
 
+own-keys@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/own-keys/-/own-keys-1.0.1.tgz#e4006910a2bf913585289676eebd6f390cf51358"
+  integrity sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==
+  dependencies:
+    get-intrinsic "^1.2.6"
+    object-keys "^1.1.1"
+    safe-push-apply "^1.0.0"
+
 p-defer@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
@@ -24367,12 +24532,12 @@ parse-gitignore@^2.0.0:
   resolved "https://registry.yarnpkg.com/parse-gitignore/-/parse-gitignore-2.0.0.tgz#81156b265115c507129f3faea067b8476da3b642"
   integrity sha512-RmVuCHWsfu0QPNW+mraxh/xjQVw/lhUCUru8Zni3Ctq3AoMhpDTq0OVdKS6iesd6Kqb7viCV3isAL43dciOSog==
 
-parse-json@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
-  integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
+parse-imports-exports@^0.2.4:
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/parse-imports-exports/-/parse-imports-exports-0.2.4.tgz#e3fb3b5e264cfb55c25b5dfcbe7f410f8dc4e7af"
+  integrity sha512-4s6vd6dx1AotCx/RCI2m7t7GCh5bDRUtGNvRfHSP2wbBQdMi67pPe7mtzmgwcaQ8VKK/6IB7Glfyu3qdZJPybQ==
   dependencies:
-    error-ex "^1.2.0"
+    parse-statements "1.0.11"
 
 parse-json@^4.0.0:
   version "4.0.0"
@@ -24432,6 +24597,11 @@ parse-path@^7.0.0:
   dependencies:
     protocols "^2.0.0"
 
+parse-statements@1.0.11:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/parse-statements/-/parse-statements-1.0.11.tgz#8787c5d383ae5746568571614be72b0689584344"
+  integrity sha512-HlsyYdMBnbPQ9Jr/VgJ1YF4scnldvJpJxCVx6KgqPL4dxppsWrJHCIIxQXMJrqGnsRkNPATbeMJ8Yxu7JMsYcA==
+
 parse-static-imports@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/parse-static-imports/-/parse-static-imports-1.1.0.tgz#ae2f18f18da1a993080ae406a5219455c0bbad5d"
@@ -24601,13 +24771,6 @@ path-to-regexp@^8.0.0, path-to-regexp@^8.1.0:
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-8.3.0.tgz#aa818a6981f99321003a08987d3cec9c3474cd1f"
   integrity sha512-7jdwVIRtsP8MYpdXSwOS0YdD0Du+qOoF/AEPIt88PcCFrZCzx41oxku1jD88hZBwbNUIEfpqvuhjFaMAqMTWnA==
 
-path-type@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
-  integrity sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=
-  dependencies:
-    pify "^2.0.0"
-
 path-type@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
@@ -24750,7 +24913,7 @@ pify@5.0.0:
   resolved "https://registry.yarnpkg.com/pify/-/pify-5.0.0.tgz#1f5eca3f5e87ebec28cc6d54a0e4aaf00acc127f"
   integrity sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==
 
-pify@^2.0.0, pify@^2.3.0:
+pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
   integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
@@ -24839,13 +25002,6 @@ piscina@3.2.0:
   optionalDependencies:
     nice-napi "^1.0.2"
 
-pkg-dir@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
-  integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=
-  dependencies:
-    find-up "^2.1.0"
-
 pkg-dir@^4.1.0, pkg-dir@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
@@ -25750,7 +25906,7 @@ process@^0.11.10:
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
   integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
 
-progress@^2.0.0, progress@^2.0.3:
+progress@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
@@ -26211,14 +26367,6 @@ read-package-up@^11.0.0:
     read-pkg "^9.0.0"
     type-fest "^4.6.0"
 
-read-pkg-up@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
-  integrity sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=
-  dependencies:
-    find-up "^2.0.0"
-    read-pkg "^2.0.0"
-
 read-pkg-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
@@ -26236,15 +26384,6 @@ read-pkg-up@^7.0.1:
     read-pkg "^5.2.0"
     type-fest "^0.8.1"
 
-read-pkg@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
-  integrity sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=
-  dependencies:
-    load-json-file "^2.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^2.0.0"
-
 read-pkg@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
@@ -26476,6 +26615,20 @@ reflect-metadata@^0.2.2:
   resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.2.2.tgz#400c845b6cba87a21f2c65c4aeb158f4fa4d9c5b"
   integrity sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q==
 
+reflect.getprototypeof@^1.0.6, reflect.getprototypeof@^1.0.9:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz#c629219e78a3316d8b604c765ef68996964e7bf9"
+  integrity sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==
+  dependencies:
+    call-bind "^1.0.8"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.9"
+    es-errors "^1.3.0"
+    es-object-atoms "^1.0.0"
+    get-intrinsic "^1.2.7"
+    get-proto "^1.0.1"
+    which-builtin-type "^1.2.1"
+
 regenerate-unicode-properties@^10.1.0:
   version "10.1.0"
   resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz#7c3192cab6dd24e21cb4461e5ddd7dd24fa8374c"
@@ -26536,17 +26689,19 @@ regexp-tree@^0.1.27:
   resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.27.tgz#2198f0ef54518ffa743fe74d983b56ffd631b6cd"
   integrity sha512-iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA==
 
-regexp.prototype.flags@^1.4.3, regexp.prototype.flags@^1.5.1:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz#138f644a3350f981a858c44f6bb1a61ff59be334"
-  integrity sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==
+regexp.prototype.flags@^1.4.3, regexp.prototype.flags@^1.5.1, regexp.prototype.flags@^1.5.4:
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz#1ad6c62d44a259007e55b3970e00f746efbcaa19"
+  integrity sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==
   dependencies:
-    call-bind "^1.0.6"
+    call-bind "^1.0.8"
     define-properties "^1.2.1"
     es-errors "^1.3.0"
-    set-function-name "^2.0.1"
+    get-proto "^1.0.1"
+    gopd "^1.2.0"
+    set-function-name "^2.0.2"
 
-regexpp@^3.0.0, regexpp@^3.1.0, regexpp@^3.2.0:
+regexpp@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
   integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
@@ -26563,11 +26718,6 @@ regexpu-core@^5.3.1:
     unicode-match-property-ecmascript "^2.0.0"
     unicode-match-property-value-ecmascript "^2.1.0"
 
-regextras@^0.7.1:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/regextras/-/regextras-0.7.1.tgz#be95719d5f43f9ef0b9fa07ad89b7c606995a3b2"
-  integrity sha512-9YXf6xtW+qzQ+hcMQXx95MOvfqXFgsKDZodX3qZB0x2n5Z94ioetIITsBtvJbiOyxa/6s9AtyweBLCdPmPko/w==
-
 regjsparser@^0.9.1:
   version "0.9.1"
   resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.9.1.tgz#272d05aa10c7c1f67095b1ff0addae8442fc5709"
@@ -27229,6 +27379,17 @@ sade@^1.7.3, sade@^1.8.1:
   dependencies:
     mri "^1.1.0"
 
+safe-array-concat@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.3.tgz#c9e54ec4f603b0bbb8e7e5007a5ee7aecd1538c3"
+  integrity sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==
+  dependencies:
+    call-bind "^1.0.8"
+    call-bound "^1.0.2"
+    get-intrinsic "^1.2.6"
+    has-symbols "^1.1.0"
+    isarray "^2.0.5"
+
 safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
@@ -27244,14 +27405,22 @@ safe-json-parse@~1.0.1:
   resolved "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-1.0.1.tgz#3e76723e38dfdda13c9b1d29a1e07ffee4b30b57"
   integrity sha1-PnZyPjjf3aE8mx0poeB//uSzC1c=
 
-safe-regex-test@^1.0.0:
+safe-push-apply@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295"
-  integrity sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==
+  resolved "https://registry.yarnpkg.com/safe-push-apply/-/safe-push-apply-1.0.0.tgz#01850e981c1602d398c85081f360e4e6d03d27f5"
+  integrity sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==
   dependencies:
-    call-bind "^1.0.2"
-    get-intrinsic "^1.1.3"
-    is-regex "^1.1.4"
+    es-errors "^1.3.0"
+    isarray "^2.0.5"
+
+safe-regex-test@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.1.0.tgz#7f87dfb67a3150782eaaf18583ff5d1711ac10c1"
+  integrity sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==
+  dependencies:
+    call-bound "^1.0.2"
+    es-errors "^1.3.0"
+    is-regex "^1.2.1"
 
 safe-regex@^1.1.0:
   version "1.1.0"
@@ -27457,7 +27626,7 @@ semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0, semve
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.0.0, semver@^7.1.1, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.0, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.6.2, semver@^7.6.3, semver@^7.7.2:
+semver@^7.0.0, semver@^7.1.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.0, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.6.2, semver@^7.6.3, semver@^7.7.2:
   version "7.7.2"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.2.tgz#67d99fdcd35cec21e6f8b87a7fd515a33f982b58"
   integrity sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==
@@ -27587,7 +27756,7 @@ set-function-length@^1.2.2:
     gopd "^1.0.1"
     has-property-descriptors "^1.0.2"
 
-set-function-name@^2.0.1:
+set-function-name@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.2.tgz#16a705c5a0dc2f5e638ca96d8a8cd4e1c2b90985"
   integrity sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==
@@ -27597,6 +27766,15 @@ set-function-name@^2.0.1:
     functions-have-names "^1.2.3"
     has-property-descriptors "^1.0.2"
 
+set-proto@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/set-proto/-/set-proto-1.0.0.tgz#0760dbcff30b2d7e801fd6e19983e56da337565e"
+  integrity sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==
+  dependencies:
+    dunder-proto "^1.0.1"
+    es-errors "^1.3.0"
+    es-object-atoms "^1.0.0"
+
 set-value@^2.0.0, set-value@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
@@ -27926,15 +28104,6 @@ slash@^5.1.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-5.1.0.tgz#be3adddcdf09ac38eebe8dcdc7b1a57a75b095ce"
   integrity sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==
 
-slice-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
-  integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==
-  dependencies:
-    ansi-styles "^4.0.0"
-    astral-regex "^2.0.0"
-    is-fullwidth-code-point "^3.0.0"
-
 sliced@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/sliced/-/sliced-1.0.1.tgz#0b3a662b5d04c3177b1926bea82b03f837a2ef41"
@@ -28250,7 +28419,7 @@ spdx-exceptions@^2.1.0:
   resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d"
   integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
 
-spdx-expression-parse@^3.0.0, spdx-expression-parse@^3.0.1:
+spdx-expression-parse@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
   integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
@@ -28258,6 +28427,14 @@ spdx-expression-parse@^3.0.0, spdx-expression-parse@^3.0.1:
     spdx-exceptions "^2.1.0"
     spdx-license-ids "^3.0.0"
 
+spdx-expression-parse@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-4.0.0.tgz#a23af9f3132115465dac215c099303e4ceac5794"
+  integrity sha512-Clya5JIij/7C6bRR22+tnGXbc4VKlibKSVj2iHvVeX5iMW7s1SIQlqu699JkODJJIhh/pUu8L0/VLh8xflD+LQ==
+  dependencies:
+    spdx-exceptions "^2.1.0"
+    spdx-license-ids "^3.0.0"
+
 spdx-expression-validate@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/spdx-expression-validate/-/spdx-expression-validate-2.0.0.tgz#25c9408e1c63fad94fff5517bb7101ffcd23350b"
@@ -28449,12 +28626,13 @@ stdin-discarder@^0.1.0:
   dependencies:
     bl "^5.0.0"
 
-stop-iteration-iterator@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz#6a60be0b4ee757d1ed5254858ec66b10c49285e4"
-  integrity sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==
+stop-iteration-iterator@^1.0.0, stop-iteration-iterator@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz#f481ff70a548f6124d0312c3aa14cbfa7aa542ad"
+  integrity sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==
   dependencies:
-    internal-slot "^1.0.4"
+    es-errors "^1.3.0"
+    internal-slot "^1.1.0"
 
 stoppable@1.1.0, stoppable@^1.1.0:
   version "1.1.0"
@@ -28580,23 +28758,37 @@ string.prototype.matchall@^4.0.5, string.prototype.matchall@^4.0.6, string.proto
     regexp.prototype.flags "^1.4.3"
     side-channel "^1.0.4"
 
-string.prototype.trimend@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz#914a65baaab25fbdd4ee291ca7dde57e869cb8d0"
-  integrity sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==
+string.prototype.trim@^1.2.10:
+  version "1.2.10"
+  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz#40b2dd5ee94c959b4dcfb1d65ce72e90da480c81"
+  integrity sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.19.5"
+    call-bind "^1.0.8"
+    call-bound "^1.0.2"
+    define-data-property "^1.1.4"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.5"
+    es-object-atoms "^1.0.0"
+    has-property-descriptors "^1.0.2"
 
-string.prototype.trimstart@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz#5466d93ba58cfa2134839f81d7f42437e8c01fef"
-  integrity sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==
+string.prototype.trimend@^1.0.9:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz#62e2731272cd285041b36596054e9f66569b6942"
+  integrity sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==
   dependencies:
-    call-bind "^1.0.2"
-    define-properties "^1.1.4"
-    es-abstract "^1.19.5"
+    call-bind "^1.0.8"
+    call-bound "^1.0.2"
+    define-properties "^1.2.1"
+    es-object-atoms "^1.0.0"
+
+string.prototype.trimstart@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz#7ee834dda8c7c17eff3118472bb35bfedaa34dde"
+  integrity sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==
+  dependencies:
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-object-atoms "^1.0.0"
 
 string_decoder@0.10, string_decoder@~0.10.x:
   version "0.10.31"
@@ -28713,7 +28905,7 @@ strip-indent@^3.0.0:
   dependencies:
     min-indent "^1.0.0"
 
-strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
+strip-json-comments@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
@@ -28994,18 +29186,6 @@ system-architecture@^0.1.0:
   resolved "https://registry.yarnpkg.com/system-architecture/-/system-architecture-0.1.0.tgz#71012b3ac141427d97c67c56bc7921af6bff122d"
   integrity sha512-ulAk51I9UVUyJgxlv9M6lFot2WP3e7t8Kz9+IS6D4rVba1tR9kON+Ey69f+1R4Q8cd45Lod6a4IcJIxnzGc/zA==
 
-table@^6.0.9:
-  version "6.7.1"
-  resolved "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz#ee05592b7143831a8c94f3cee6aae4c1ccef33e2"
-  integrity sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==
-  dependencies:
-    ajv "^8.0.1"
-    lodash.clonedeep "^4.5.0"
-    lodash.truncate "^4.4.2"
-    slice-ansi "^4.0.0"
-    string-width "^4.2.0"
-    strip-ansi "^6.0.0"
-
 tap-parser@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/tap-parser/-/tap-parser-7.0.0.tgz#54db35302fda2c2ccc21954ad3be22b2cba42721"
@@ -29589,10 +29769,10 @@ ts-algebra@^2.0.0:
   resolved "https://registry.yarnpkg.com/ts-algebra/-/ts-algebra-2.0.0.tgz#4e3e0953878f26518fce7f6bb115064a65388b7a"
   integrity sha512-FPAhNPFMrkwz76P7cdjdmiShwMynZYN6SgOujD1urY4oNm80Ou9oMdmbR45LotcKOXoy7wSmHkRFE6Mxbrhefw==
 
-ts-api-utils@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.0.3.tgz#f12c1c781d04427313dbac808f453f050e54a331"
-  integrity sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==
+ts-api-utils@^1.3.0:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.4.3.tgz#bfc2215fe6528fecab2b0fba570a2e8a4263b064"
+  integrity sha512-i3eMG77UTMD0hZhgRS562pv83RC6ukSAC2GMNWc+9dieh/+jDM5u5YG+NHX6VNDRHQcHwmsTHctP9LhbC3WxVw==
 
 ts-api-utils@^2.1.0:
   version "2.1.0"
@@ -29646,14 +29826,14 @@ tsconfck@^3.0.0, tsconfck@^3.1.3:
   resolved "https://registry.yarnpkg.com/tsconfck/-/tsconfck-3.1.3.tgz#a8202f51dab684c426314796cdb0bbd0fe0cdf80"
   integrity sha512-ulNZP1SVpRDesxeMLON/LtWM8HIgAJEIVpVVhBM6gsmvQ8+Rh+ZG7FWGvHh7Ah3pRABwVJWklWCr/BTZSv0xnQ==
 
-tsconfig-paths@^3.9.0:
-  version "3.9.0"
-  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b"
-  integrity sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==
+tsconfig-paths@^3.15.0:
+  version "3.15.0"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz#5299ec605e55b1abb23ec939ef15edaf483070d4"
+  integrity sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==
   dependencies:
     "@types/json5" "^0.0.29"
-    json5 "^1.0.1"
-    minimist "^1.2.0"
+    json5 "^1.0.2"
+    minimist "^1.2.6"
     strip-bom "^3.0.0"
 
 tsconfig-paths@^4.1.2, tsconfig-paths@^4.2.0:
@@ -29823,6 +30003,42 @@ typed-array-buffer@^1.0.3:
     es-errors "^1.3.0"
     is-typed-array "^1.1.14"
 
+typed-array-byte-length@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz#8407a04f7d78684f3d252aa1a143d2b77b4160ce"
+  integrity sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==
+  dependencies:
+    call-bind "^1.0.8"
+    for-each "^0.3.3"
+    gopd "^1.2.0"
+    has-proto "^1.2.0"
+    is-typed-array "^1.1.14"
+
+typed-array-byte-offset@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz#ae3698b8ec91a8ab945016108aef00d5bff12355"
+  integrity sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==
+  dependencies:
+    available-typed-arrays "^1.0.7"
+    call-bind "^1.0.8"
+    for-each "^0.3.3"
+    gopd "^1.2.0"
+    has-proto "^1.2.0"
+    is-typed-array "^1.1.15"
+    reflect.getprototypeof "^1.0.9"
+
+typed-array-length@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.7.tgz#ee4deff984b64be1e118b0de8c9c877d5ce73d3d"
+  integrity sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==
+  dependencies:
+    call-bind "^1.0.7"
+    for-each "^0.3.3"
+    gopd "^1.0.1"
+    is-typed-array "^1.1.13"
+    possible-typed-array-names "^1.0.0"
+    reflect.getprototypeof "^1.0.6"
+
 typed-assert@^1.0.8:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/typed-assert/-/typed-assert-1.0.9.tgz#8af9d4f93432c4970ec717e3006f33f135b06213"
@@ -29907,15 +30123,15 @@ ultrahtml@^1.5.3, ultrahtml@^1.6.0:
   resolved "https://registry.yarnpkg.com/ultrahtml/-/ultrahtml-1.6.0.tgz#0d1aad7bbfeae512438d30e799c11622127a1ac8"
   integrity sha512-R9fBn90VTJrqqLDwyMph+HGne8eqY1iPfYhPzZrvKpIfwkWZbcYlfpsb8B9dTvBfpy1/hqAD7Wi8EKfP9e8zdw==
 
-unbox-primitive@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e"
-  integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==
+unbox-primitive@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.1.0.tgz#8d9d2c9edeea8460c7f35033a88867944934d1e2"
+  integrity sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==
   dependencies:
-    call-bind "^1.0.2"
+    call-bound "^1.0.3"
     has-bigints "^1.0.2"
-    has-symbols "^1.0.3"
-    which-boxed-primitive "^1.0.2"
+    has-symbols "^1.1.0"
+    which-boxed-primitive "^1.1.1"
 
 unbuild@^2.0.0:
   version "2.0.0"
@@ -30615,7 +30831,7 @@ v8-compile-cache-lib@^3.0.1:
   resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
   integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
 
-v8-compile-cache@2.3.0, v8-compile-cache@^2.0.3, v8-compile-cache@^2.3.0:
+v8-compile-cache@2.3.0, v8-compile-cache@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
   integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
@@ -31438,18 +31654,37 @@ whatwg-url@^5.0.0:
     tr46 "~0.0.3"
     webidl-conversions "^3.0.0"
 
-which-boxed-primitive@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
-  integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==
+which-boxed-primitive@^1.0.2, which-boxed-primitive@^1.1.0, which-boxed-primitive@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz#d76ec27df7fa165f18d5808374a5fe23c29b176e"
+  integrity sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==
   dependencies:
-    is-bigint "^1.0.1"
-    is-boolean-object "^1.1.0"
-    is-number-object "^1.0.4"
-    is-string "^1.0.5"
-    is-symbol "^1.0.3"
+    is-bigint "^1.1.0"
+    is-boolean-object "^1.2.1"
+    is-number-object "^1.1.1"
+    is-string "^1.1.1"
+    is-symbol "^1.1.1"
 
-which-collection@^1.0.1:
+which-builtin-type@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/which-builtin-type/-/which-builtin-type-1.2.1.tgz#89183da1b4907ab089a6b02029cc5d8d6574270e"
+  integrity sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==
+  dependencies:
+    call-bound "^1.0.2"
+    function.prototype.name "^1.1.6"
+    has-tostringtag "^1.0.2"
+    is-async-function "^2.0.0"
+    is-date-object "^1.1.0"
+    is-finalizationregistry "^1.1.0"
+    is-generator-function "^1.0.10"
+    is-regex "^1.2.1"
+    is-weakref "^1.0.2"
+    isarray "^2.0.5"
+    which-boxed-primitive "^1.1.0"
+    which-collection "^1.0.2"
+    which-typed-array "^1.1.16"
+
+which-collection@^1.0.1, which-collection@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.2.tgz#627ef76243920a107e7ce8e96191debe4b16c2a0"
   integrity sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==
@@ -31480,7 +31715,7 @@ which-pm@^2.1.1:
     load-yaml-file "^0.2.0"
     path-exists "^4.0.0"
 
-which-typed-array@^1.1.13, which-typed-array@^1.1.16, which-typed-array@^1.1.2:
+which-typed-array@^1.1.13, which-typed-array@^1.1.16, which-typed-array@^1.1.19, which-typed-array@^1.1.2:
   version "1.1.19"
   resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.19.tgz#df03842e870b6b88e117524a4b364b6fc689f956"
   integrity sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==
@@ -31591,10 +31826,10 @@ winston@^3.10.0, winston@^3.17.0:
     triple-beam "^1.3.0"
     winston-transport "^4.9.0"
 
-word-wrap@^1.2.3:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.4.tgz#cb4b50ec9aca570abd1f52f33cd45b6c61739a9f"
-  integrity sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==
+word-wrap@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
+  integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
 
 wordwrap@^0.0.3:
   version "0.0.3"

From 20c7c8f0caafa3c95484bf528cf2fd4f26314f41 Mon Sep 17 00:00:00 2001
From: Andrei <168741329+andreiborza@users.noreply.github.com>
Date: Wed, 3 Dec 2025 09:42:02 +0100
Subject: [PATCH 157/186] chore(ci): Add an initial delay to let gitflow ci
 start before checking mergeability (#18383)

I think this action ran through faster than it took the Gitflow PR CI to
start which is why it immediately detected a mergable state and finished
running without reporting an issue.

The action now waits a minute before starting its check.

Closes #18384
---
 .github/workflows/gitflow-merge-conflict.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/gitflow-merge-conflict.yml b/.github/workflows/gitflow-merge-conflict.yml
index c2ad1f42ad1d..8b31d07afd6a 100644
--- a/.github/workflows/gitflow-merge-conflict.yml
+++ b/.github/workflows/gitflow-merge-conflict.yml
@@ -19,6 +19,7 @@ jobs:
         uses: actions/github-script@v8
         with:
           script: |
+            const initialDelay = 60_000; // Wait 1 minute before first check to let CI start
             const retryInterval = 30_000;
             const maxRetries = 10; // (30 seconds * 10 retries) = 5 minutes
 
@@ -39,6 +40,10 @@ jobs:
             let attempt = 0;
             let mergeable = null;
 
+            // Wait before first check to give CI time to start
+            console.log(`Waiting ${initialDelay/1000} seconds before first check to let CI start...`);
+            await sleep(initialDelay);
+
             while (attempt < maxRetries) {
               attempt++;
               console.log(`Attempt ${attempt}/${maxRetries}: Checking if PR is mergeable...`);

From c8d8d213713114e9b1630e98861e183009c75f13 Mon Sep 17 00:00:00 2001
From: Charly Gomez <charly.gomez@sentry.io>
Date: Wed, 3 Dec 2025 11:31:57 +0100
Subject: [PATCH 158/186] chore(e2e): Pin react router framework test apps
 (#18390)

Pinning these versions as the latest seems to introduce breaking changes
that blocks our CI

Closes #18391
---
 .../hydrogen-react-router-7/package.json                  | 8 ++++----
 .../react-router-7-framework-node-20-18/package.json      | 8 ++++----
 .../react-router-7-framework-spa-node-20-18/package.json  | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dev-packages/e2e-tests/test-applications/hydrogen-react-router-7/package.json b/dev-packages/e2e-tests/test-applications/hydrogen-react-router-7/package.json
index bf0b59ca0adf..d714373b3837 100644
--- a/dev-packages/e2e-tests/test-applications/hydrogen-react-router-7/package.json
+++ b/dev-packages/e2e-tests/test-applications/hydrogen-react-router-7/package.json
@@ -24,14 +24,14 @@
     "isbot": "^5.1.22",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-router": "^7.6.0",
-    "react-router-dom": "^7.6.0"
+    "react-router": "7.9.6",
+    "react-router-dom": "7.9.6"
   },
   "devDependencies": {
     "@graphql-codegen/cli": "5.0.2",
     "@playwright/test": "~1.53.2",
-    "@react-router/dev": "7.6.0",
-    "@react-router/fs-routes": "7.6.0",
+    "@react-router/dev": "7.9.6",
+    "@react-router/fs-routes": "7.9.6",
     "@sentry-internal/test-utils": "link:../../../test-utils",
     "@shopify/cli": "3.80.4",
     "@shopify/hydrogen-codegen": "^0.3.3",
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-framework-node-20-18/package.json b/dev-packages/e2e-tests/test-applications/react-router-7-framework-node-20-18/package.json
index 14c507288dc8..bb211d225f0a 100644
--- a/dev-packages/e2e-tests/test-applications/react-router-7-framework-node-20-18/package.json
+++ b/dev-packages/e2e-tests/test-applications/react-router-7-framework-node-20-18/package.json
@@ -6,9 +6,9 @@
   "dependencies": {
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-router": "^7.1.5",
-    "@react-router/node": "^7.1.5",
-    "@react-router/serve": "^7.1.5",
+    "react-router": "7.9.6",
+    "@react-router/node": "7.9.6",
+    "@react-router/serve": "7.9.6",
     "@sentry/react-router": "latest || *",
     "isbot": "^5.1.17"
   },
@@ -16,7 +16,7 @@
     "@types/react": "18.3.1",
     "@types/react-dom": "18.3.1",
     "@types/node": "^20",
-    "@react-router/dev": "^7.1.5",
+    "@react-router/dev": "7.9.6",
     "@playwright/test": "~1.53.2",
     "@sentry-internal/test-utils": "link:../../../test-utils",
     "typescript": "^5.6.3",
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa-node-20-18/package.json b/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa-node-20-18/package.json
index e48333090c1c..04c460363320 100644
--- a/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa-node-20-18/package.json
+++ b/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa-node-20-18/package.json
@@ -18,16 +18,16 @@
   },
   "dependencies": {
     "@sentry/react-router": "latest || *",
-    "@react-router/node": "^7.5.3",
-    "@react-router/serve": "^7.5.3",
+    "@react-router/node": "7.9.6",
+    "@react-router/serve": "7.9.6",
     "isbot": "^5.1.27",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-router": "^7.1.5"
+    "react-router": "7.9.6"
   },
   "devDependencies": {
     "@playwright/test": "~1.53.2",
-    "@react-router/dev": "^7.5.3",
+    "@react-router/dev": "7.9.6",
     "@sentry-internal/test-utils": "link:../../../test-utils",
     "@tailwindcss/vite": "^4.1.4",
     "@types/node": "^20",

From 3f666dad3e560835fa8c64c898d008f347b07a86 Mon Sep 17 00:00:00 2001
From: Andrei Borza <andrei.borza@sentry.io>
Date: Tue, 2 Dec 2025 14:39:58 +0100
Subject: [PATCH 159/186] meta(changelog): Update changelog for 10.28.0

---
 CHANGELOG.md | 38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 551223c6cc62..e6f4d130cbd3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,9 +4,11 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 10.28.0
+
 ### Important Changes
 
-- **feat(core): Make `matcher` parameter optional in `makeMultiplexedTransport` ([#10798](https://github.com/getsentry/sentry-javascript/pull/10798))** .
+- **feat(core): Make `matcher` parameter optional in `makeMultiplexedTransport` ([#10798](https://github.com/getsentry/sentry-javascript/pull/10798))**
 
 The `matcher` parameter in `makeMultiplexedTransport` is now optional with a sensible default. This makes it much easier to use the multiplexed transport for sending events to multiple DSNs based on runtime configuration.
 
@@ -69,6 +71,40 @@ The default matcher looks for routing information in `event.extra[MULTIPLEXED_TR
 
 This release adds support for `cacheComponents` on turbopack builds. We are working on adding support for this feature in webpack builds as well.
 
+### Other Changes
+
+- feat: Publish AWS Lambda Layer for Node 24 ([#18327](https://github.com/getsentry/sentry-javascript/pull/18327))
+- feat(browser): Expose langchain instrumentation ([#18342](https://github.com/getsentry/sentry-javascript/pull/18342))
+- feat(browser): Expose langgraph instrumentation ([#18345](https://github.com/getsentry/sentry-javascript/pull/18345))
+- feat(cloudflare): Allow specifying a custom fetch in Cloudflare transport options ([#18335](https://github.com/getsentry/sentry-javascript/pull/18335))
+- feat(core): Add `isolateTrace` option to `Sentry.withMonitor()` ([#18079](https://github.com/getsentry/sentry-javascript/pull/18079))
+- feat(deps): bump @sentry/webpack-plugin from 4.3.0 to 4.6.1 ([#18272](https://github.com/getsentry/sentry-javascript/pull/18272))
+- feat(nextjs): Add cloudflare `waitUntil` detection ([#18336](https://github.com/getsentry/sentry-javascript/pull/18336))
+- feat(node): Add LangChain v1 support ([#18306](https://github.com/getsentry/sentry-javascript/pull/18306))
+- feat(remix): Add parameterized transaction naming for routes ([#17951](https://github.com/getsentry/sentry-javascript/pull/17951))
+- fix(cloudflare): Keep http root span alive until streaming responses are consumed ([#18087](https://github.com/getsentry/sentry-javascript/pull/18087))
+- fix(cloudflare): Wait for async events to finish ([#18334](https://github.com/getsentry/sentry-javascript/pull/18334))
+- fix(core): `continueTrace` doesn't propagate given trace ID if active span exists ([#18328](https://github.com/getsentry/sentry-javascript/pull/18328))
+- fix(node-core): Handle custom scope in log messages without parameters ([#18322](https://github.com/getsentry/sentry-javascript/pull/18322))
+- fix(opentelemetry): Ensure Sentry spans don't leak when tracing is disabled ([#18337](https://github.com/getsentry/sentry-javascript/pull/18337))
+- fix(react-router): Use underscores in trace origin values ([#18351](https://github.com/getsentry/sentry-javascript/pull/18351))
+
+<details>
+  <summary><strong>Internal Changes</strong></summary>
+
+- chore: Allow URLs as issue ([#18372](https://github.com/getsentry/sentry-javascript/pull/18372))
+- chore(changelog): Add entry for [#18304](https://github.com/getsentry/sentry-javascript/pull/18304) ([#18329](https://github.com/getsentry/sentry-javascript/pull/18329))
+- chore(ci): Add action to track all PRs as issues ([#18363](https://github.com/getsentry/sentry-javascript/pull/18363))
+- chore(github): Adjust `BUGBOT.md` rules to flag invalid op and origin values during review ([#18352](https://github.com/getsentry/sentry-javascript/pull/18352))
+- chore(tanstackstart-react): Export custom inits from tanstackstart-react ([#18369](https://github.com/getsentry/sentry-javascript/pull/18369))
+- chore(tanstackstart-react)!: Remove empty placeholder implementations ([#18338](https://github.com/getsentry/sentry-javascript/pull/18338))
+- ci: Add action to create issue on gitflow merge conflicts ([#18319](https://github.com/getsentry/sentry-javascript/pull/18319))
+- ci(deps): bump actions/checkout from 5 to 6 ([#18268](https://github.com/getsentry/sentry-javascript/pull/18268))
+- ci(deps): bump peter-evans/create-pull-request from 7.0.8 to 7.0.9 ([#18361](https://github.com/getsentry/sentry-javascript/pull/18361))
+- test(cloudflare): Add typechecks for cloudflare-worker e2e test ([#18321](https://github.com/getsentry/sentry-javascript/pull/18321))
+
+</details>
+
 ## 10.27.0
 
 ### Important Changes

From 21b0e481e568f7771bf9f99d998150d5ba626e56 Mon Sep 17 00:00:00 2001
From: Andrei Borza <andrei.borza@sentry.io>
Date: Tue, 2 Dec 2025 14:44:19 +0100
Subject: [PATCH 160/186] meta(changelog): Update changelog for 10.28.0

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6f4d130cbd3..9f745ef5afe5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -88,6 +88,8 @@ This release adds support for `cacheComponents` on turbopack builds. We are work
 - fix(node-core): Handle custom scope in log messages without parameters ([#18322](https://github.com/getsentry/sentry-javascript/pull/18322))
 - fix(opentelemetry): Ensure Sentry spans don't leak when tracing is disabled ([#18337](https://github.com/getsentry/sentry-javascript/pull/18337))
 - fix(react-router): Use underscores in trace origin values ([#18351](https://github.com/getsentry/sentry-javascript/pull/18351))
+- chore(tanstackstart-react): Export custom inits from tanstackstart-react ([#18369](https://github.com/getsentry/sentry-javascript/pull/18369))
+- chore(tanstackstart-react)!: Remove empty placeholder implementations ([#18338](https://github.com/getsentry/sentry-javascript/pull/18338))
 
 <details>
   <summary><strong>Internal Changes</strong></summary>
@@ -96,8 +98,6 @@ This release adds support for `cacheComponents` on turbopack builds. We are work
 - chore(changelog): Add entry for [#18304](https://github.com/getsentry/sentry-javascript/pull/18304) ([#18329](https://github.com/getsentry/sentry-javascript/pull/18329))
 - chore(ci): Add action to track all PRs as issues ([#18363](https://github.com/getsentry/sentry-javascript/pull/18363))
 - chore(github): Adjust `BUGBOT.md` rules to flag invalid op and origin values during review ([#18352](https://github.com/getsentry/sentry-javascript/pull/18352))
-- chore(tanstackstart-react): Export custom inits from tanstackstart-react ([#18369](https://github.com/getsentry/sentry-javascript/pull/18369))
-- chore(tanstackstart-react)!: Remove empty placeholder implementations ([#18338](https://github.com/getsentry/sentry-javascript/pull/18338))
 - ci: Add action to create issue on gitflow merge conflicts ([#18319](https://github.com/getsentry/sentry-javascript/pull/18319))
 - ci(deps): bump actions/checkout from 5 to 6 ([#18268](https://github.com/getsentry/sentry-javascript/pull/18268))
 - ci(deps): bump peter-evans/create-pull-request from 7.0.8 to 7.0.9 ([#18361](https://github.com/getsentry/sentry-javascript/pull/18361))

From 55914d329966afec02d6d34f02c2eb2898592626 Mon Sep 17 00:00:00 2001
From: getsentry-bot <bot@sentry.io>
Date: Tue, 2 Dec 2025 14:34:35 +0000
Subject: [PATCH 161/186] release: 10.28.0

---
 .../browser-integration-tests/package.json         |  4 ++--
 .../bundle-analyzer-scenarios/package.json         |  2 +-
 dev-packages/bundler-tests/package.json            |  4 ++--
 dev-packages/clear-cache-gh-action/package.json    |  2 +-
 .../cloudflare-integration-tests/package.json      |  6 +++---
 dev-packages/e2e-tests/package.json                |  2 +-
 .../external-contributor-gh-action/package.json    |  2 +-
 .../node-core-integration-tests/package.json       |  6 +++---
 dev-packages/node-integration-tests/package.json   | 10 +++++-----
 dev-packages/node-overhead-gh-action/package.json  |  4 ++--
 dev-packages/rollup-utils/package.json             |  2 +-
 dev-packages/size-limit-gh-action/package.json     |  2 +-
 dev-packages/test-utils/package.json               |  4 ++--
 lerna.json                                         |  2 +-
 packages/angular/package.json                      |  6 +++---
 packages/astro/package.json                        |  8 ++++----
 packages/aws-serverless/package.json               |  8 ++++----
 packages/browser-utils/package.json                |  4 ++--
 packages/browser/package.json                      | 14 +++++++-------
 packages/bun/package.json                          |  6 +++---
 packages/cloudflare/package.json                   |  4 ++--
 packages/core/package.json                         |  2 +-
 packages/deno/package.json                         |  4 ++--
 packages/ember/package.json                        |  6 +++---
 packages/eslint-config-sdk/package.json            |  6 +++---
 packages/eslint-plugin-sdk/package.json            |  2 +-
 packages/feedback/package.json                     |  4 ++--
 packages/gatsby/package.json                       |  6 +++---
 packages/google-cloud-serverless/package.json      |  6 +++---
 packages/integration-shims/package.json            |  4 ++--
 packages/nestjs/package.json                       |  6 +++---
 packages/nextjs/package.json                       | 14 +++++++-------
 packages/node-core/package.json                    |  6 +++---
 packages/node-native/package.json                  |  6 +++---
 packages/node/package.json                         |  8 ++++----
 packages/nuxt/package.json                         | 12 ++++++------
 packages/opentelemetry/package.json                |  4 ++--
 packages/profiling-node/package.json               |  6 +++---
 packages/react-router/package.json                 | 10 +++++-----
 packages/react/package.json                        |  6 +++---
 packages/remix/package.json                        |  8 ++++----
 packages/replay-canvas/package.json                |  6 +++---
 packages/replay-internal/package.json              |  8 ++++----
 packages/replay-worker/package.json                |  2 +-
 packages/solid/package.json                        |  6 +++---
 packages/solidstart/package.json                   |  8 ++++----
 packages/svelte/package.json                       |  6 +++---
 packages/sveltekit/package.json                    | 10 +++++-----
 packages/tanstackstart-react/package.json          | 10 +++++-----
 packages/tanstackstart/package.json                |  2 +-
 packages/types/package.json                        |  4 ++--
 packages/typescript/package.json                   |  2 +-
 packages/vercel-edge/package.json                  |  6 +++---
 packages/vue/package.json                          |  6 +++---
 packages/wasm/package.json                         |  6 +++---
 55 files changed, 155 insertions(+), 155 deletions(-)

diff --git a/dev-packages/browser-integration-tests/package.json b/dev-packages/browser-integration-tests/package.json
index e5ff62a58084..87a8ec7aa805 100644
--- a/dev-packages/browser-integration-tests/package.json
+++ b/dev-packages/browser-integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/browser-integration-tests",
-  "version": "10.27.0",
+  "version": "10.28.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": "10.27.0",
+    "@sentry/browser": "10.28.0",
     "@supabase/supabase-js": "2.49.3",
     "axios": "^1.12.2",
     "babel-loader": "^8.2.2",
diff --git a/dev-packages/bundle-analyzer-scenarios/package.json b/dev-packages/bundle-analyzer-scenarios/package.json
index 518da1c1e8af..b8a4892949b0 100644
--- a/dev-packages/bundle-analyzer-scenarios/package.json
+++ b/dev-packages/bundle-analyzer-scenarios/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/bundle-analyzer-scenarios",
-  "version": "10.27.0",
+  "version": "10.28.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",
diff --git a/dev-packages/bundler-tests/package.json b/dev-packages/bundler-tests/package.json
index b2a307291c90..288c9907bcc7 100644
--- a/dev-packages/bundler-tests/package.json
+++ b/dev-packages/bundler-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/bundler-tests",
-  "version": "10.27.0",
+  "version": "10.28.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.27.0",
+    "@sentry/browser": "10.28.0",
     "rollup": "^4.0.0",
     "vite": "^5.0.0",
     "vitest": "^3.2.4",
diff --git a/dev-packages/clear-cache-gh-action/package.json b/dev-packages/clear-cache-gh-action/package.json
index 9592fba2a84d..de29981194c2 100644
--- a/dev-packages/clear-cache-gh-action/package.json
+++ b/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.27.0",
+  "version": "10.28.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
diff --git a/dev-packages/cloudflare-integration-tests/package.json b/dev-packages/cloudflare-integration-tests/package.json
index 89c3abb7d5e8..2bfed522960f 100644
--- a/dev-packages/cloudflare-integration-tests/package.json
+++ b/dev-packages/cloudflare-integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/cloudflare-integration-tests",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
@@ -14,11 +14,11 @@
   },
   "dependencies": {
     "@langchain/langgraph": "^1.0.1",
-    "@sentry/cloudflare": "10.27.0"
+    "@sentry/cloudflare": "10.28.0"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20250922.0",
-    "@sentry-internal/test-utils": "10.27.0",
+    "@sentry-internal/test-utils": "10.28.0",
     "eslint-plugin-regexp": "^1.15.0",
     "vitest": "^3.2.4",
     "wrangler": "4.22.0"
diff --git a/dev-packages/e2e-tests/package.json b/dev-packages/e2e-tests/package.json
index be48359c7045..c2c9e01d0714 100644
--- a/dev-packages/e2e-tests/package.json
+++ b/dev-packages/e2e-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/e2e-tests",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "license": "MIT",
   "private": true,
   "scripts": {
diff --git a/dev-packages/external-contributor-gh-action/package.json b/dev-packages/external-contributor-gh-action/package.json
index 8c839a63b4aa..178953f83ede 100644
--- a/dev-packages/external-contributor-gh-action/package.json
+++ b/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": "10.27.0",
+  "version": "10.28.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
diff --git a/dev-packages/node-core-integration-tests/package.json b/dev-packages/node-core-integration-tests/package.json
index a5be477c7334..90b8e3cfc12e 100644
--- a/dev-packages/node-core-integration-tests/package.json
+++ b/dev-packages/node-core-integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/node-core-integration-tests",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
@@ -34,8 +34,8 @@
     "@opentelemetry/resources": "^2.2.0",
     "@opentelemetry/sdk-trace-base": "^2.2.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry/core": "10.27.0",
-    "@sentry/node-core": "10.27.0",
+    "@sentry/core": "10.28.0",
+    "@sentry/node-core": "10.28.0",
     "body-parser": "^1.20.3",
     "cors": "^2.8.5",
     "cron": "^3.1.6",
diff --git a/dev-packages/node-integration-tests/package.json b/dev-packages/node-integration-tests/package.json
index 8a81e262d33f..c599419ebdee 100644
--- a/dev-packages/node-integration-tests/package.json
+++ b/dev-packages/node-integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/node-integration-tests",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
@@ -36,9 +36,9 @@
     "@nestjs/core": "^11",
     "@nestjs/platform-express": "^11",
     "@prisma/client": "6.15.0",
-    "@sentry/aws-serverless": "10.27.0",
-    "@sentry/core": "10.27.0",
-    "@sentry/node": "10.27.0",
+    "@sentry/aws-serverless": "10.28.0",
+    "@sentry/core": "10.28.0",
+    "@sentry/node": "10.28.0",
     "@types/mongodb": "^3.6.20",
     "@types/mysql": "^2.15.21",
     "@types/pg": "^8.6.5",
@@ -83,7 +83,7 @@
     "yargs": "^16.2.0"
   },
   "devDependencies": {
-    "@sentry-internal/test-utils": "10.27.0",
+    "@sentry-internal/test-utils": "10.28.0",
     "@types/amqplib": "^0.10.5",
     "@types/node-cron": "^3.0.11",
     "@types/node-schedule": "^2.1.7",
diff --git a/dev-packages/node-overhead-gh-action/package.json b/dev-packages/node-overhead-gh-action/package.json
index d044b8047bcc..bc855cf340bc 100644
--- a/dev-packages/node-overhead-gh-action/package.json
+++ b/dev-packages/node-overhead-gh-action/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/node-overhead-gh-action",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
@@ -23,7 +23,7 @@
     "fix": "eslint . --format stylish --fix"
   },
   "dependencies": {
-    "@sentry/node": "10.27.0",
+    "@sentry/node": "10.28.0",
     "express": "^4.21.1",
     "mysql2": "^3.14.4"
   },
diff --git a/dev-packages/rollup-utils/package.json b/dev-packages/rollup-utils/package.json
index 3c8e3a029d28..5399916e9cb2 100644
--- a/dev-packages/rollup-utils/package.json
+++ b/dev-packages/rollup-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/rollup-utils",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Rollup utilities used at Sentry for the Sentry JavaScript SDK",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/rollup-utils",
diff --git a/dev-packages/size-limit-gh-action/package.json b/dev-packages/size-limit-gh-action/package.json
index 59d885937a9f..f624959ffbd4 100644
--- a/dev-packages/size-limit-gh-action/package.json
+++ b/dev-packages/size-limit-gh-action/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@sentry-internal/size-limit-gh-action",
   "description": "An internal Github Action to compare the current size of a PR against the one on develop.",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
diff --git a/dev-packages/test-utils/package.json b/dev-packages/test-utils/package.json
index 3df8bcc441ea..801fc8d73d0a 100644
--- a/dev-packages/test-utils/package.json
+++ b/dev-packages/test-utils/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "10.27.0",
+  "version": "10.28.0",
   "name": "@sentry-internal/test-utils",
   "author": "Sentry",
   "license": "MIT",
@@ -48,7 +48,7 @@
   },
   "devDependencies": {
     "@playwright/test": "~1.53.2",
-    "@sentry/core": "10.27.0",
+    "@sentry/core": "10.28.0",
     "eslint-plugin-regexp": "^1.15.0"
   },
   "volta": {
diff --git a/lerna.json b/lerna.json
index 9ad4c26bf2a7..593e71d979e2 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "npmClient": "yarn"
 }
diff --git a/packages/angular/package.json b/packages/angular/package.json
index 72d29ca6b272..9e02da81a211 100644
--- a/packages/angular/package.json
+++ b/packages/angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/angular",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for Angular",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/angular",
@@ -21,8 +21,8 @@
     "rxjs": "^6.5.5 || ^7.x"
   },
   "dependencies": {
-    "@sentry/browser": "10.27.0",
-    "@sentry/core": "10.27.0",
+    "@sentry/browser": "10.28.0",
+    "@sentry/core": "10.28.0",
     "tslib": "^2.4.1"
   },
   "devDependencies": {
diff --git a/packages/astro/package.json b/packages/astro/package.json
index 99d5eabae3e9..08d950c8e9b6 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/astro",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for Astro",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/astro",
@@ -56,9 +56,9 @@
     "astro": ">=3.x || >=4.0.0-beta || >=5.x"
   },
   "dependencies": {
-    "@sentry/browser": "10.27.0",
-    "@sentry/core": "10.27.0",
-    "@sentry/node": "10.27.0",
+    "@sentry/browser": "10.28.0",
+    "@sentry/core": "10.28.0",
+    "@sentry/node": "10.28.0",
     "@sentry/vite-plugin": "^4.1.0"
   },
   "devDependencies": {
diff --git a/packages/aws-serverless/package.json b/packages/aws-serverless/package.json
index 2aaaa292cd93..86e20d12f519 100644
--- a/packages/aws-serverless/package.json
+++ b/packages/aws-serverless/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/aws-serverless",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for AWS Lambda and AWS Serverless Environments",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/aws-serverless",
@@ -69,9 +69,9 @@
     "@opentelemetry/instrumentation": "^0.208.0",
     "@opentelemetry/instrumentation-aws-sdk": "0.64.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry/core": "10.27.0",
-    "@sentry/node": "10.27.0",
-    "@sentry/node-core": "10.27.0",
+    "@sentry/core": "10.28.0",
+    "@sentry/node": "10.28.0",
+    "@sentry/node-core": "10.28.0",
     "@types/aws-lambda": "^8.10.62"
   },
   "devDependencies": {
diff --git a/packages/browser-utils/package.json b/packages/browser-utils/package.json
index 37ac4a317bc8..d52f4e1ad9cc 100644
--- a/packages/browser-utils/package.json
+++ b/packages/browser-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/browser-utils",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Browser Utilities for all Sentry JavaScript SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/browser-utils",
@@ -39,7 +39,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.27.0"
+    "@sentry/core": "10.28.0"
   },
   "scripts": {
     "build": "run-p build:transpile build:types",
diff --git a/packages/browser/package.json b/packages/browser/package.json
index 2ecab4e6119e..e2be003f4601 100644
--- a/packages/browser/package.json
+++ b/packages/browser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/browser",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for browsers",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/browser",
@@ -44,14 +44,14 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry-internal/browser-utils": "10.27.0",
-    "@sentry-internal/feedback": "10.27.0",
-    "@sentry-internal/replay": "10.27.0",
-    "@sentry-internal/replay-canvas": "10.27.0",
-    "@sentry/core": "10.27.0"
+    "@sentry-internal/browser-utils": "10.28.0",
+    "@sentry-internal/feedback": "10.28.0",
+    "@sentry-internal/replay": "10.28.0",
+    "@sentry-internal/replay-canvas": "10.28.0",
+    "@sentry/core": "10.28.0"
   },
   "devDependencies": {
-    "@sentry-internal/integration-shims": "10.27.0",
+    "@sentry-internal/integration-shims": "10.28.0",
     "fake-indexeddb": "^6.2.4"
   },
   "scripts": {
diff --git a/packages/bun/package.json b/packages/bun/package.json
index f1464af7a732..1c0cb9a44bdd 100644
--- a/packages/bun/package.json
+++ b/packages/bun/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/bun",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for bun",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/bun",
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.27.0",
-    "@sentry/node": "10.27.0"
+    "@sentry/core": "10.28.0",
+    "@sentry/node": "10.28.0"
   },
   "devDependencies": {
     "bun-types": "^1.2.9"
diff --git a/packages/cloudflare/package.json b/packages/cloudflare/package.json
index 163afddca271..8896f95d6e9c 100644
--- a/packages/cloudflare/package.json
+++ b/packages/cloudflare/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/cloudflare",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for Cloudflare Workers and Pages",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/cloudflare",
@@ -50,7 +50,7 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@sentry/core": "10.27.0"
+    "@sentry/core": "10.28.0"
   },
   "peerDependencies": {
     "@cloudflare/workers-types": "^4.x"
diff --git a/packages/core/package.json b/packages/core/package.json
index 76ac4bc3e96f..175d193ea435 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/core",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Base implementation for all Sentry JavaScript SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/core",
diff --git a/packages/deno/package.json b/packages/deno/package.json
index cc40ededd6e7..6e724e196f30 100644
--- a/packages/deno/package.json
+++ b/packages/deno/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/deno",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for Deno",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/deno",
@@ -25,7 +25,7 @@
   ],
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@sentry/core": "10.27.0"
+    "@sentry/core": "10.28.0"
   },
   "scripts": {
     "deno-types": "node ./scripts/download-deno-types.mjs",
diff --git a/packages/ember/package.json b/packages/ember/package.json
index a2307bb11013..a2c165375056 100644
--- a/packages/ember/package.json
+++ b/packages/ember/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/ember",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for Ember.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/ember",
@@ -32,8 +32,8 @@
   "dependencies": {
     "@babel/core": "^7.27.7",
     "@embroider/macros": "^1.16.0",
-    "@sentry/browser": "10.27.0",
-    "@sentry/core": "10.27.0",
+    "@sentry/browser": "10.28.0",
+    "@sentry/core": "10.28.0",
     "ember-auto-import": "^2.7.2",
     "ember-cli-babel": "^8.2.0",
     "ember-cli-htmlbars": "^6.1.1",
diff --git a/packages/eslint-config-sdk/package.json b/packages/eslint-config-sdk/package.json
index cbc53bff0eac..46ae6668207e 100644
--- a/packages/eslint-config-sdk/package.json
+++ b/packages/eslint-config-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/eslint-config-sdk",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK eslint config",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-config-sdk",
@@ -22,8 +22,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry-internal/eslint-plugin-sdk": "10.27.0",
-    "@sentry-internal/typescript": "10.27.0",
+    "@sentry-internal/eslint-plugin-sdk": "10.28.0",
+    "@sentry-internal/typescript": "10.28.0",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
     "eslint-config-prettier": "^9.1.0",
diff --git a/packages/eslint-plugin-sdk/package.json b/packages/eslint-plugin-sdk/package.json
index 2ee8a4be4925..78e414fe59bd 100644
--- a/packages/eslint-plugin-sdk/package.json
+++ b/packages/eslint-plugin-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/eslint-plugin-sdk",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK eslint plugin",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-plugin-sdk",
diff --git a/packages/feedback/package.json b/packages/feedback/package.json
index b2b17bad3033..9f3d504683e0 100644
--- a/packages/feedback/package.json
+++ b/packages/feedback/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/feedback",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Sentry SDK integration for user feedback",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/feedback",
@@ -39,7 +39,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.27.0"
+    "@sentry/core": "10.28.0"
   },
   "devDependencies": {
     "preact": "^10.19.4"
diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json
index 8f5059ac9792..aa636d7bd036 100644
--- a/packages/gatsby/package.json
+++ b/packages/gatsby/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/gatsby",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for Gatsby.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/gatsby",
@@ -45,8 +45,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.27.0",
-    "@sentry/react": "10.27.0",
+    "@sentry/core": "10.28.0",
+    "@sentry/react": "10.28.0",
     "@sentry/webpack-plugin": "^4.6.1"
   },
   "peerDependencies": {
diff --git a/packages/google-cloud-serverless/package.json b/packages/google-cloud-serverless/package.json
index 3495aff8de55..b92bcb9a2bca 100644
--- a/packages/google-cloud-serverless/package.json
+++ b/packages/google-cloud-serverless/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/google-cloud-serverless",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for Google Cloud Functions",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/google-cloud-serverless",
@@ -48,8 +48,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.27.0",
-    "@sentry/node": "10.27.0",
+    "@sentry/core": "10.28.0",
+    "@sentry/node": "10.28.0",
     "@types/express": "^4.17.14"
   },
   "devDependencies": {
diff --git a/packages/integration-shims/package.json b/packages/integration-shims/package.json
index 437b12de6c33..fa4673867071 100644
--- a/packages/integration-shims/package.json
+++ b/packages/integration-shims/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/integration-shims",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Shims for integrations in Sentry SDK.",
   "main": "build/cjs/index.js",
   "module": "build/esm/index.js",
@@ -56,7 +56,7 @@
     "url": "https://github.com/getsentry/sentry-javascript/issues"
   },
   "dependencies": {
-    "@sentry/core": "10.27.0"
+    "@sentry/core": "10.28.0"
   },
   "engines": {
     "node": ">=18"
diff --git a/packages/nestjs/package.json b/packages/nestjs/package.json
index 2b4e04b097b9..1a340ef103da 100644
--- a/packages/nestjs/package.json
+++ b/packages/nestjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/nestjs",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for NestJS",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/nestjs",
@@ -49,8 +49,8 @@
     "@opentelemetry/instrumentation": "^0.208.0",
     "@opentelemetry/instrumentation-nestjs-core": "0.55.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry/core": "10.27.0",
-    "@sentry/node": "10.27.0"
+    "@sentry/core": "10.28.0",
+    "@sentry/node": "10.28.0"
   },
   "devDependencies": {
     "@nestjs/common": "^10.0.0",
diff --git a/packages/nextjs/package.json b/packages/nextjs/package.json
index 710a7dd33623..1f628c76ef76 100644
--- a/packages/nextjs/package.json
+++ b/packages/nextjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/nextjs",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for Next.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/nextjs",
@@ -79,13 +79,13 @@
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
     "@rollup/plugin-commonjs": "28.0.1",
-    "@sentry-internal/browser-utils": "10.27.0",
+    "@sentry-internal/browser-utils": "10.28.0",
     "@sentry/bundler-plugin-core": "^4.6.1",
-    "@sentry/core": "10.27.0",
-    "@sentry/node": "10.27.0",
-    "@sentry/opentelemetry": "10.27.0",
-    "@sentry/react": "10.27.0",
-    "@sentry/vercel-edge": "10.27.0",
+    "@sentry/core": "10.28.0",
+    "@sentry/node": "10.28.0",
+    "@sentry/opentelemetry": "10.28.0",
+    "@sentry/react": "10.28.0",
+    "@sentry/vercel-edge": "10.28.0",
     "@sentry/webpack-plugin": "^4.6.1",
     "resolve": "1.22.8",
     "rollup": "^4.35.0",
diff --git a/packages/node-core/package.json b/packages/node-core/package.json
index 57100fc16cf3..ffb34c67db78 100644
--- a/packages/node-core/package.json
+++ b/packages/node-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/node-core",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Sentry Node-Core SDK",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/node-core",
@@ -67,8 +67,8 @@
   },
   "dependencies": {
     "@apm-js-collab/tracing-hooks": "^0.3.1",
-    "@sentry/core": "10.27.0",
-    "@sentry/opentelemetry": "10.27.0",
+    "@sentry/core": "10.28.0",
+    "@sentry/opentelemetry": "10.28.0",
     "import-in-the-middle": "^2"
   },
   "devDependencies": {
diff --git a/packages/node-native/package.json b/packages/node-native/package.json
index e193f26ae795..c49047205f8c 100644
--- a/packages/node-native/package.json
+++ b/packages/node-native/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/node-native",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Native Tools for the Official Sentry Node.js SDK",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/node-native",
@@ -64,8 +64,8 @@
   },
   "dependencies": {
     "@sentry-internal/node-native-stacktrace": "^0.2.2",
-    "@sentry/core": "10.27.0",
-    "@sentry/node": "10.27.0"
+    "@sentry/core": "10.28.0",
+    "@sentry/node": "10.28.0"
   },
   "devDependencies": {
     "@types/node": "^18.19.1"
diff --git a/packages/node/package.json b/packages/node/package.json
index 95e0610c9828..40457a79fda9 100644
--- a/packages/node/package.json
+++ b/packages/node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/node",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Sentry Node SDK using OpenTelemetry for performance instrumentation",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/node",
@@ -95,9 +95,9 @@
     "@opentelemetry/sdk-trace-base": "^2.2.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
     "@prisma/instrumentation": "6.19.0",
-    "@sentry/core": "10.27.0",
-    "@sentry/node-core": "10.27.0",
-    "@sentry/opentelemetry": "10.27.0",
+    "@sentry/core": "10.28.0",
+    "@sentry/node-core": "10.28.0",
+    "@sentry/opentelemetry": "10.28.0",
     "import-in-the-middle": "^2",
     "minimatch": "^9.0.0"
   },
diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json
index 0ce5df7bb8d5..b2bafe25f57a 100644
--- a/packages/nuxt/package.json
+++ b/packages/nuxt/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/nuxt",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for Nuxt",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/nuxt",
@@ -49,13 +49,13 @@
   },
   "dependencies": {
     "@nuxt/kit": "^3.13.2",
-    "@sentry/browser": "10.27.0",
-    "@sentry/cloudflare": "10.27.0",
-    "@sentry/core": "10.27.0",
-    "@sentry/node": "10.27.0",
+    "@sentry/browser": "10.28.0",
+    "@sentry/cloudflare": "10.28.0",
+    "@sentry/core": "10.28.0",
+    "@sentry/node": "10.28.0",
     "@sentry/rollup-plugin": "^4.3.0",
     "@sentry/vite-plugin": "^4.3.0",
-    "@sentry/vue": "10.27.0"
+    "@sentry/vue": "10.28.0"
   },
   "devDependencies": {
     "@nuxt/module-builder": "^0.8.4",
diff --git a/packages/opentelemetry/package.json b/packages/opentelemetry/package.json
index 4a21c884155f..7f0292aff52a 100644
--- a/packages/opentelemetry/package.json
+++ b/packages/opentelemetry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/opentelemetry",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry utilities for OpenTelemetry",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/opentelemetry",
@@ -39,7 +39,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.27.0"
+    "@sentry/core": "10.28.0"
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.9.0",
diff --git a/packages/profiling-node/package.json b/packages/profiling-node/package.json
index f1082191997e..cf5862af68dc 100644
--- a/packages/profiling-node/package.json
+++ b/packages/profiling-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/profiling-node",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for Node.js Profiling",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/profiling-node",
@@ -63,8 +63,8 @@
   },
   "dependencies": {
     "@sentry-internal/node-cpu-profiler": "^2.2.0",
-    "@sentry/core": "10.27.0",
-    "@sentry/node": "10.27.0"
+    "@sentry/core": "10.28.0",
+    "@sentry/node": "10.28.0"
   },
   "devDependencies": {
     "@types/node": "^18.19.1"
diff --git a/packages/react-router/package.json b/packages/react-router/package.json
index fe662890fa7a..2b314384977e 100644
--- a/packages/react-router/package.json
+++ b/packages/react-router/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/react-router",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for React Router (Framework)",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/react-router",
@@ -49,11 +49,11 @@
     "@opentelemetry/core": "^2.2.0",
     "@opentelemetry/instrumentation": "^0.208.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry/browser": "10.27.0",
+    "@sentry/browser": "10.28.0",
     "@sentry/cli": "^2.58.2",
-    "@sentry/core": "10.27.0",
-    "@sentry/node": "10.27.0",
-    "@sentry/react": "10.27.0",
+    "@sentry/core": "10.28.0",
+    "@sentry/node": "10.28.0",
+    "@sentry/react": "10.28.0",
     "@sentry/vite-plugin": "^4.1.0",
     "glob": "11.1.0"
   },
diff --git a/packages/react/package.json b/packages/react/package.json
index 7fea980365f7..1913ac05af1f 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/react",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for React.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/react",
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "10.27.0",
-    "@sentry/core": "10.27.0",
+    "@sentry/browser": "10.28.0",
+    "@sentry/core": "10.28.0",
     "hoist-non-react-statics": "^3.3.2"
   },
   "peerDependencies": {
diff --git a/packages/remix/package.json b/packages/remix/package.json
index 7230064df963..fd3017d1e097 100644
--- a/packages/remix/package.json
+++ b/packages/remix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/remix",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for Remix",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/remix",
@@ -69,9 +69,9 @@
     "@opentelemetry/semantic-conventions": "^1.37.0",
     "@remix-run/router": "1.x",
     "@sentry/cli": "^2.58.2",
-    "@sentry/core": "10.27.0",
-    "@sentry/node": "10.27.0",
-    "@sentry/react": "10.27.0",
+    "@sentry/core": "10.28.0",
+    "@sentry/node": "10.28.0",
+    "@sentry/react": "10.28.0",
     "glob": "^10.3.4",
     "yargs": "^17.6.0"
   },
diff --git a/packages/replay-canvas/package.json b/packages/replay-canvas/package.json
index f66b691a42fa..4e6ea9414278 100644
--- a/packages/replay-canvas/package.json
+++ b/packages/replay-canvas/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/replay-canvas",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Replay canvas integration",
   "main": "build/npm/cjs/index.js",
   "module": "build/npm/esm/index.js",
@@ -69,8 +69,8 @@
     "@sentry-internal/rrweb": "2.40.0"
   },
   "dependencies": {
-    "@sentry-internal/replay": "10.27.0",
-    "@sentry/core": "10.27.0"
+    "@sentry-internal/replay": "10.28.0",
+    "@sentry/core": "10.28.0"
   },
   "engines": {
     "node": ">=18"
diff --git a/packages/replay-internal/package.json b/packages/replay-internal/package.json
index 1cccb4c2ef50..b570677771be 100644
--- a/packages/replay-internal/package.json
+++ b/packages/replay-internal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/replay",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "User replays for Sentry",
   "main": "build/npm/cjs/index.js",
   "module": "build/npm/esm/index.js",
@@ -81,7 +81,7 @@
   "homepage": "https://docs.sentry.io/platforms/javascript/session-replay/",
   "devDependencies": {
     "@babel/core": "^7.27.7",
-    "@sentry-internal/replay-worker": "10.27.0",
+    "@sentry-internal/replay-worker": "10.28.0",
     "@sentry-internal/rrweb": "2.40.0",
     "@sentry-internal/rrweb-snapshot": "2.40.0",
     "fflate": "0.8.2",
@@ -89,8 +89,8 @@
     "jsdom-worker": "^0.3.0"
   },
   "dependencies": {
-    "@sentry-internal/browser-utils": "10.27.0",
-    "@sentry/core": "10.27.0"
+    "@sentry-internal/browser-utils": "10.28.0",
+    "@sentry/core": "10.28.0"
   },
   "engines": {
     "node": ">=18"
diff --git a/packages/replay-worker/package.json b/packages/replay-worker/package.json
index cdd3dd4059b1..5ac394fe7791 100644
--- a/packages/replay-worker/package.json
+++ b/packages/replay-worker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/replay-worker",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Worker for @sentry-internal/replay",
   "main": "build/esm/index.js",
   "module": "build/esm/index.js",
diff --git a/packages/solid/package.json b/packages/solid/package.json
index 9d6138147612..299c1cef8d49 100644
--- a/packages/solid/package.json
+++ b/packages/solid/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/solid",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for Solid",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/solid",
@@ -54,8 +54,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "10.27.0",
-    "@sentry/core": "10.27.0"
+    "@sentry/browser": "10.28.0",
+    "@sentry/core": "10.28.0"
   },
   "peerDependencies": {
     "@solidjs/router": "^0.13.4",
diff --git a/packages/solidstart/package.json b/packages/solidstart/package.json
index 1069905423fa..0be41812d1a7 100644
--- a/packages/solidstart/package.json
+++ b/packages/solidstart/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/solidstart",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for Solid Start",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/solidstart",
@@ -66,9 +66,9 @@
     }
   },
   "dependencies": {
-    "@sentry/core": "10.27.0",
-    "@sentry/node": "10.27.0",
-    "@sentry/solid": "10.27.0",
+    "@sentry/core": "10.28.0",
+    "@sentry/node": "10.28.0",
+    "@sentry/solid": "10.28.0",
     "@sentry/vite-plugin": "^4.1.0"
   },
   "devDependencies": {
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 83af1efee4a5..da82fb63d1ea 100644
--- a/packages/svelte/package.json
+++ b/packages/svelte/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/svelte",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for Svelte",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/svelte",
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "10.27.0",
-    "@sentry/core": "10.27.0",
+    "@sentry/browser": "10.28.0",
+    "@sentry/core": "10.28.0",
     "magic-string": "^0.30.0"
   },
   "peerDependencies": {
diff --git a/packages/sveltekit/package.json b/packages/sveltekit/package.json
index a39ef877222e..1a10c32d9c13 100644
--- a/packages/sveltekit/package.json
+++ b/packages/sveltekit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/sveltekit",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for SvelteKit",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/sveltekit",
@@ -48,10 +48,10 @@
   },
   "dependencies": {
     "@babel/parser": "7.26.9",
-    "@sentry/cloudflare": "10.27.0",
-    "@sentry/core": "10.27.0",
-    "@sentry/node": "10.27.0",
-    "@sentry/svelte": "10.27.0",
+    "@sentry/cloudflare": "10.28.0",
+    "@sentry/core": "10.28.0",
+    "@sentry/node": "10.28.0",
+    "@sentry/svelte": "10.28.0",
     "@sentry/vite-plugin": "^4.1.0",
     "magic-string": "0.30.7",
     "recast": "0.23.11",
diff --git a/packages/tanstackstart-react/package.json b/packages/tanstackstart-react/package.json
index dac0c980b1f5..230ad3657d81 100644
--- a/packages/tanstackstart-react/package.json
+++ b/packages/tanstackstart-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/tanstackstart-react",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for TanStack Start React",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/tanstackstart-react",
@@ -52,10 +52,10 @@
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry-internal/browser-utils": "10.27.0",
-    "@sentry/core": "10.27.0",
-    "@sentry/node": "10.27.0",
-    "@sentry/react": "10.27.0"
+    "@sentry-internal/browser-utils": "10.28.0",
+    "@sentry/core": "10.28.0",
+    "@sentry/node": "10.28.0",
+    "@sentry/react": "10.28.0"
   },
   "scripts": {
     "build": "run-p build:transpile build:types",
diff --git a/packages/tanstackstart/package.json b/packages/tanstackstart/package.json
index 6a99cfefdb99..314c496baf16 100644
--- a/packages/tanstackstart/package.json
+++ b/packages/tanstackstart/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/tanstackstart",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Utilities for the Sentry TanStack Start SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/tanstackstart",
diff --git a/packages/types/package.json b/packages/types/package.json
index 70cd501b4eb6..671dd8732658 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/types",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Types for all Sentry JavaScript SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/types",
@@ -57,7 +57,7 @@
     "yalc:publish": "yalc publish --push --sig"
   },
   "dependencies": {
-    "@sentry/core": "10.27.0"
+    "@sentry/core": "10.28.0"
   },
   "volta": {
     "extends": "../../package.json"
diff --git a/packages/typescript/package.json b/packages/typescript/package.json
index f1d5c80f4954..ba1f5a3d5d9a 100644
--- a/packages/typescript/package.json
+++ b/packages/typescript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/typescript",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Typescript configuration used at Sentry",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/typescript",
diff --git a/packages/vercel-edge/package.json b/packages/vercel-edge/package.json
index 90d61f964f34..f8e1f076cc17 100644
--- a/packages/vercel-edge/package.json
+++ b/packages/vercel-edge/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/vercel-edge",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for the Vercel Edge Runtime",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/vercel-edge",
@@ -41,14 +41,14 @@
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/resources": "^2.2.0",
-    "@sentry/core": "10.27.0"
+    "@sentry/core": "10.28.0"
   },
   "devDependencies": {
     "@edge-runtime/types": "3.0.1",
     "@opentelemetry/core": "^2.2.0",
     "@opentelemetry/sdk-trace-base": "^2.2.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry/opentelemetry": "10.27.0"
+    "@sentry/opentelemetry": "10.28.0"
   },
   "scripts": {
     "build": "run-p build:transpile build:types",
diff --git a/packages/vue/package.json b/packages/vue/package.json
index 6cb37663ebbf..643a9ca30e5e 100644
--- a/packages/vue/package.json
+++ b/packages/vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/vue",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Official Sentry SDK for Vue.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/vue",
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "10.27.0",
-    "@sentry/core": "10.27.0"
+    "@sentry/browser": "10.28.0",
+    "@sentry/core": "10.28.0"
   },
   "peerDependencies": {
     "pinia": "2.x || 3.x",
diff --git a/packages/wasm/package.json b/packages/wasm/package.json
index a864eca972f7..1996c8e6e1c8 100644
--- a/packages/wasm/package.json
+++ b/packages/wasm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/wasm",
-  "version": "10.27.0",
+  "version": "10.28.0",
   "description": "Support for WASM.",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/wasm",
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "10.27.0",
-    "@sentry/core": "10.27.0"
+    "@sentry/browser": "10.28.0",
+    "@sentry/core": "10.28.0"
   },
   "scripts": {
     "build": "run-p build:transpile build:bundle build:types",

From c3cd0395d31ef5bf132bd172d23a0afd46bc9c03 Mon Sep 17 00:00:00 2001
From: Nicolas Hrubec <nico.hrubec@sentry.io>
Date: Wed, 3 Dec 2025 12:13:30 +0100
Subject: [PATCH 162/186] chore(tanstackstart-react): clean up re-exported
 types (#18393)

closes https://github.com/getsentry/sentry-javascript/issues/18373
---
 packages/tanstackstart-react/src/index.types.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/tanstackstart-react/src/index.types.ts b/packages/tanstackstart-react/src/index.types.ts
index bac34058d461..cf624f5a1a0b 100644
--- a/packages/tanstackstart-react/src/index.types.ts
+++ b/packages/tanstackstart-react/src/index.types.ts
@@ -22,11 +22,7 @@ export declare const contextLinesIntegration: typeof clientSdk.contextLinesInteg
 export declare const getDefaultIntegrations: (options: Options) => Integration[];
 export declare const defaultStackParser: StackParser;
 
-export declare function getSentryRelease(fallback?: string): string | undefined;
-
 export declare const ErrorBoundary: typeof clientSdk.ErrorBoundary;
-export declare const createReduxEnhancer: typeof clientSdk.createReduxEnhancer;
-export declare const showReportDialog: typeof clientSdk.showReportDialog;
 export declare const withErrorBoundary: typeof clientSdk.withErrorBoundary;
 
 export declare const logger: typeof clientSdk.logger | typeof serverSdk.logger;

From e559d73f2b003bf74808ea8cc41e14c2fc3c79e9 Mon Sep 17 00:00:00 2001
From: Charly Gomez <charly.gomez@sentry.io>
Date: Wed, 3 Dec 2025 12:51:11 +0100
Subject: [PATCH 163/186] fix(logs): Add support for `msg` in pino integration
 (#18389)

This fix will check for a `msg` field in the logger call
(https://getpino.io/#/docs/api?id=messagekey-string) if there was no
message string passed:

```ts
logger.info("This was always logged");
logger.info({ msg: "This now gets logged too" }); // This pr adds support for this
```

closes https://github.com/getsentry/sentry-javascript/issues/18381
closes
https://linear.app/getsentry/issue/JS-1245/pinotransport-ignores-msg-field
---
 .../pino/scenario-structured-logging.mjs      | 13 ++++
 .../suites/pino/test.ts                       | 63 +++++++++++++++++++
 packages/node-core/src/integrations/pino.ts   |  5 +-
 3 files changed, 79 insertions(+), 2 deletions(-)
 create mode 100644 dev-packages/node-integration-tests/suites/pino/scenario-structured-logging.mjs

diff --git a/dev-packages/node-integration-tests/suites/pino/scenario-structured-logging.mjs b/dev-packages/node-integration-tests/suites/pino/scenario-structured-logging.mjs
new file mode 100644
index 000000000000..8e3d6b75fb7c
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/pino/scenario-structured-logging.mjs
@@ -0,0 +1,13 @@
+import * as Sentry from '@sentry/node';
+import pino from 'pino';
+
+const logger = pino({ name: 'myapp' });
+
+Sentry.withIsolationScope(() => {
+  Sentry.startSpan({ name: 'startup' }, () => {
+    // Omitting the message string and using the msg field instead
+    logger.info({ msg: 'test-msg' });
+    logger.info({ msg: 'test-msg-2', userId: 'user-123', action: 'login' });
+    logger.info('test-string');
+  });
+});
diff --git a/dev-packages/node-integration-tests/suites/pino/test.ts b/dev-packages/node-integration-tests/suites/pino/test.ts
index 21cd30bdef60..a0a16c422dc2 100644
--- a/dev-packages/node-integration-tests/suites/pino/test.ts
+++ b/dev-packages/node-integration-tests/suites/pino/test.ts
@@ -232,4 +232,67 @@ conditionalTest({ min: 20 })('Pino integration', () => {
       .start()
       .completed();
   });
+
+  test('captures structured logs with msg field', async () => {
+    const instrumentPath = join(__dirname, 'instrument.mjs');
+
+    await createRunner(__dirname, 'scenario-structured-logging.mjs')
+      .withMockSentryServer()
+      .withInstrument(instrumentPath)
+      .ignore('transaction')
+      .expect({
+        log: {
+          items: [
+            {
+              timestamp: expect.any(Number),
+              level: 'info',
+              body: 'test-msg',
+              trace_id: expect.any(String),
+              severity_number: 9,
+              attributes: {
+                name: { value: 'myapp', type: 'string' },
+                'pino.logger.level': { value: 30, type: 'integer' },
+                msg: { value: 'test-msg', type: 'string' },
+                'sentry.origin': { value: 'auto.log.pino', type: 'string' },
+                'sentry.release': { value: '1.0', type: 'string' },
+                'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+              },
+            },
+            {
+              timestamp: expect.any(Number),
+              level: 'info',
+              body: 'test-msg-2',
+              trace_id: expect.any(String),
+              severity_number: 9,
+              attributes: {
+                name: { value: 'myapp', type: 'string' },
+                'pino.logger.level': { value: 30, type: 'integer' },
+                msg: { value: 'test-msg-2', type: 'string' },
+                userId: { value: 'user-123', type: 'string' },
+                action: { value: 'login', type: 'string' },
+                'sentry.origin': { value: 'auto.log.pino', type: 'string' },
+                'sentry.release': { value: '1.0', type: 'string' },
+                'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+              },
+            },
+            {
+              timestamp: expect.any(Number),
+              level: 'info',
+              body: 'test-string',
+              trace_id: expect.any(String),
+              severity_number: 9,
+              attributes: {
+                name: { value: 'myapp', type: 'string' },
+                'pino.logger.level': { value: 30, type: 'integer' },
+                'sentry.origin': { value: 'auto.log.pino', type: 'string' },
+                'sentry.release': { value: '1.0', type: 'string' },
+                'sentry.sdk.name': { value: 'sentry.javascript.node', type: 'string' },
+              },
+            },
+          ],
+        },
+      })
+      .start()
+      .completed();
+  });
 });
diff --git a/packages/node-core/src/integrations/pino.ts b/packages/node-core/src/integrations/pino.ts
index dda9693f90f2..f20d4bae4098 100644
--- a/packages/node-core/src/integrations/pino.ts
+++ b/packages/node-core/src/integrations/pino.ts
@@ -134,6 +134,7 @@ const _pinoIntegration = defineIntegration((userOptions: DeepPartial<PinoOptions
 
         const [captureObj, message, levelNumber] = args;
         const level = self?.levels?.labels?.[levelNumber] || 'info';
+        const logMessage = message || (resultObj?.msg as string | undefined) || '';
 
         if (enableLogs && options.log.levels.includes(level)) {
           const attributes: Record<string, unknown> = {
@@ -142,7 +143,7 @@ const _pinoIntegration = defineIntegration((userOptions: DeepPartial<PinoOptions
             'pino.logger.level': levelNumber,
           };
 
-          _INTERNAL_captureLog({ level, message, attributes });
+          _INTERNAL_captureLog({ level, message: logMessage, attributes });
         }
 
         if (options.error.levels.includes(level)) {
@@ -167,7 +168,7 @@ const _pinoIntegration = defineIntegration((userOptions: DeepPartial<PinoOptions
               return;
             }
 
-            captureMessage(message, captureContext);
+            captureMessage(logMessage, captureContext);
           });
         }
       }

From 2f134c2f97bcd46db672a8eb695819eed3830fbf Mon Sep 17 00:00:00 2001
From: Nicolas Hrubec <nico.hrubec@sentry.io>
Date: Wed, 3 Dec 2025 13:33:23 +0100
Subject: [PATCH 164/186] test(tanstackstart-react): Set up E2E test
 application (#18358)

This sets up a basic E2E test for the Tanstack Start React SDK.

For now I have added the following three tests:
- An error thrown directly on the client is automatically captured.
- An error thrown from a server side function is automatically captured.
I am not sure why this works atm, but probably this is somehow
propagated to the frontend.
- An error thrown from a server route is only captured if we manually
instrument it with `Sentry.captureException`.


Closes #18265
---
 .../tanstackstart-react/.gitignore            | 24 +++++
 .../tanstackstart-react/.npmrc                |  2 +
 .../tanstackstart-react/instrument.server.mjs | 12 +++
 .../tanstackstart-react/package.json          | 38 ++++++++
 .../tanstackstart-react/playwright.config.mjs |  8 ++
 .../tanstackstart-react/src/router.tsx        | 25 +++++
 .../tanstackstart-react/src/routes/__root.tsx | 42 +++++++++
 .../src/routes/api.error.ts                   | 17 ++++
 .../tanstackstart-react/src/routes/index.tsx  | 41 +++++++++
 .../tanstackstart-react/start-event-proxy.mjs |  6 ++
 .../tanstackstart-react/tests/errors.test.ts  | 92 +++++++++++++++++++
 .../tanstackstart-react/tsconfig.json         | 26 ++++++
 .../tanstackstart-react/tsconfig.node.json    | 11 +++
 .../tanstackstart-react/vite.config.ts        | 18 ++++
 14 files changed, 362 insertions(+)
 create mode 100644 dev-packages/e2e-tests/test-applications/tanstackstart-react/.gitignore
 create mode 100644 dev-packages/e2e-tests/test-applications/tanstackstart-react/.npmrc
 create mode 100644 dev-packages/e2e-tests/test-applications/tanstackstart-react/instrument.server.mjs
 create mode 100644 dev-packages/e2e-tests/test-applications/tanstackstart-react/package.json
 create mode 100644 dev-packages/e2e-tests/test-applications/tanstackstart-react/playwright.config.mjs
 create mode 100644 dev-packages/e2e-tests/test-applications/tanstackstart-react/src/router.tsx
 create mode 100644 dev-packages/e2e-tests/test-applications/tanstackstart-react/src/routes/__root.tsx
 create mode 100644 dev-packages/e2e-tests/test-applications/tanstackstart-react/src/routes/api.error.ts
 create mode 100644 dev-packages/e2e-tests/test-applications/tanstackstart-react/src/routes/index.tsx
 create mode 100644 dev-packages/e2e-tests/test-applications/tanstackstart-react/start-event-proxy.mjs
 create mode 100644 dev-packages/e2e-tests/test-applications/tanstackstart-react/tests/errors.test.ts
 create mode 100644 dev-packages/e2e-tests/test-applications/tanstackstart-react/tsconfig.json
 create mode 100644 dev-packages/e2e-tests/test-applications/tanstackstart-react/tsconfig.node.json
 create mode 100644 dev-packages/e2e-tests/test-applications/tanstackstart-react/vite.config.ts

diff --git a/dev-packages/e2e-tests/test-applications/tanstackstart-react/.gitignore b/dev-packages/e2e-tests/test-applications/tanstackstart-react/.gitignore
new file mode 100644
index 000000000000..a547bf36d8d1
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/tanstackstart-react/.gitignore
@@ -0,0 +1,24 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
diff --git a/dev-packages/e2e-tests/test-applications/tanstackstart-react/.npmrc b/dev-packages/e2e-tests/test-applications/tanstackstart-react/.npmrc
new file mode 100644
index 000000000000..070f80f05092
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/tanstackstart-react/.npmrc
@@ -0,0 +1,2 @@
+@sentry:registry=http://127.0.0.1:4873
+@sentry-internal:registry=http://127.0.0.1:4873
diff --git a/dev-packages/e2e-tests/test-applications/tanstackstart-react/instrument.server.mjs b/dev-packages/e2e-tests/test-applications/tanstackstart-react/instrument.server.mjs
new file mode 100644
index 000000000000..8bc20de7578b
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/tanstackstart-react/instrument.server.mjs
@@ -0,0 +1,12 @@
+import * as Sentry from '@sentry/tanstackstart-react';
+
+Sentry.init({
+  environment: 'qa', // dynamic sampling bias to keep transactions
+  dsn: process.env.E2E_TEST_DSN,
+  tunnel: `http://localhost:3031/`, // proxy server
+  tracesSampleRate: 1,
+  transportOptions: {
+    // We expect the app to send a lot of events in a short time
+    bufferSize: 1000,
+  },
+});
diff --git a/dev-packages/e2e-tests/test-applications/tanstackstart-react/package.json b/dev-packages/e2e-tests/test-applications/tanstackstart-react/package.json
new file mode 100644
index 000000000000..e44229cce78f
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/tanstackstart-react/package.json
@@ -0,0 +1,38 @@
+{
+  "name": "tanstackstart-react",
+  "private": true,
+  "version": "0.0.1",
+  "type": "module",
+  "scripts": {
+    "build": "vite build && cp instrument.server.mjs .output/server",
+    "start": "node --import ./.output/server/instrument.server.mjs .output/server/index.mjs",
+    "test": "playwright test",
+    "clean": "npx rimraf node_modules pnpm-lock.yaml",
+    "test:build": "pnpm install && pnpm build",
+    "test:assert": "pnpm test"
+  },
+  "dependencies": {
+    "@sentry/tanstackstart-react": "latest || *",
+    "@tanstack/react-start": "^1.139.12",
+    "@tanstack/react-router": "^1.139.12",
+    "react": "^19.2.0",
+    "react-dom": "^19.2.0"
+  },
+  "devDependencies": {
+    "@types/react": "^19.2.0",
+    "@types/react-dom": "^19.2.0",
+    "@types/node": "^24.10.0",
+    "@typescript-eslint/eslint-plugin": "^7.2.0",
+    "@typescript-eslint/parser": "^7.2.0",
+    "@vitejs/plugin-react-swc": "^3.5.0",
+    "typescript": "^5.9.0",
+    "vite": "7.2.0",
+    "vite-tsconfig-paths": "^5.1.4",
+    "nitro": "^3.0.0",
+    "@playwright/test": "~1.53.2",
+    "@sentry-internal/test-utils": "link:../../../test-utils"
+  },
+  "volta": {
+    "extends": "../../package.json"
+  }
+}
diff --git a/dev-packages/e2e-tests/test-applications/tanstackstart-react/playwright.config.mjs b/dev-packages/e2e-tests/test-applications/tanstackstart-react/playwright.config.mjs
new file mode 100644
index 000000000000..4ca3c24e7fda
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/tanstackstart-react/playwright.config.mjs
@@ -0,0 +1,8 @@
+import { getPlaywrightConfig } from '@sentry-internal/test-utils';
+
+const config = getPlaywrightConfig({
+  startCommand: `pnpm start`,
+  port: 3000,
+});
+
+export default config;
diff --git a/dev-packages/e2e-tests/test-applications/tanstackstart-react/src/router.tsx b/dev-packages/e2e-tests/test-applications/tanstackstart-react/src/router.tsx
new file mode 100644
index 000000000000..b1c6f7727a26
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/tanstackstart-react/src/router.tsx
@@ -0,0 +1,25 @@
+import * as Sentry from '@sentry/tanstackstart-react';
+import { createRouter } from '@tanstack/react-router';
+import { routeTree } from './routeTree.gen';
+
+export const getRouter = () => {
+  const router = createRouter({
+    routeTree,
+    scrollRestoration: true,
+  });
+
+  if (!router.isServer) {
+    Sentry.init({
+      environment: 'qa', // dynamic sampling bias to keep transactions
+      dsn: 'https://public@dsn.ingest.sentry.io/1337',
+      integrations: [Sentry.tanstackRouterBrowserTracingIntegration(router)],
+      // We recommend adjusting this value in production, or using tracesSampler
+      // for finer control
+      tracesSampleRate: 1.0,
+      release: 'e2e-test',
+      tunnel: 'http://localhost:3031/', // proxy server
+    });
+  }
+
+  return router;
+};
diff --git a/dev-packages/e2e-tests/test-applications/tanstackstart-react/src/routes/__root.tsx b/dev-packages/e2e-tests/test-applications/tanstackstart-react/src/routes/__root.tsx
new file mode 100644
index 000000000000..0a268a350e34
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/tanstackstart-react/src/routes/__root.tsx
@@ -0,0 +1,42 @@
+import type { ReactNode } from 'react';
+import { Outlet, createRootRoute, HeadContent, Scripts } from '@tanstack/react-router';
+
+export const Route = createRootRoute({
+  head: () => ({
+    meta: [
+      {
+        charSet: 'utf-8',
+      },
+      {
+        name: 'viewport',
+        content: 'width=device-width, initial-scale=1',
+      },
+      {
+        title: 'TanStack Start Starter',
+      },
+    ],
+  }),
+  component: RootComponent,
+});
+
+function RootComponent() {
+  return (
+    <RootDocument>
+      <Outlet />
+    </RootDocument>
+  );
+}
+
+function RootDocument({ children }: Readonly<{ children: ReactNode }>) {
+  return (
+    <html>
+      <head>
+        <HeadContent />
+      </head>
+      <body>
+        {children}
+        <Scripts />
+      </body>
+    </html>
+  );
+}
diff --git a/dev-packages/e2e-tests/test-applications/tanstackstart-react/src/routes/api.error.ts b/dev-packages/e2e-tests/test-applications/tanstackstart-react/src/routes/api.error.ts
new file mode 100644
index 000000000000..470d53346ad7
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/tanstackstart-react/src/routes/api.error.ts
@@ -0,0 +1,17 @@
+import * as Sentry from '@sentry/tanstackstart-react';
+import { createFileRoute } from '@tanstack/react-router';
+
+export const Route = createFileRoute('/api/error')({
+  server: {
+    handlers: {
+      GET: async () => {
+        try {
+          throw new Error('Sentry API Route Test Error');
+        } catch (error) {
+          Sentry.captureException(error);
+          throw error;
+        }
+      },
+    },
+  },
+});
diff --git a/dev-packages/e2e-tests/test-applications/tanstackstart-react/src/routes/index.tsx b/dev-packages/e2e-tests/test-applications/tanstackstart-react/src/routes/index.tsx
new file mode 100644
index 000000000000..a92fabf20c4a
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/tanstackstart-react/src/routes/index.tsx
@@ -0,0 +1,41 @@
+import { createFileRoute } from '@tanstack/react-router';
+import { createServerFn } from '@tanstack/react-start';
+
+const throwServerError = createServerFn().handler(async () => {
+  throw new Error('Sentry Server Function Test Error');
+});
+
+export const Route = createFileRoute('/')({
+  component: Home,
+});
+
+function Home() {
+  return (
+    <div>
+      <button
+        type="button"
+        onClick={() => {
+          throw new Error('Sentry Client Test Error');
+        }}
+      >
+        Break the client
+      </button>
+      <button
+        type="button"
+        onClick={async () => {
+          await throwServerError();
+        }}
+      >
+        Break server function
+      </button>
+      <button
+        type="button"
+        onClick={async () => {
+          await fetch('/api/error');
+        }}
+      >
+        Break API route
+      </button>
+    </div>
+  );
+}
diff --git a/dev-packages/e2e-tests/test-applications/tanstackstart-react/start-event-proxy.mjs b/dev-packages/e2e-tests/test-applications/tanstackstart-react/start-event-proxy.mjs
new file mode 100644
index 000000000000..a3f8045010bd
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/tanstackstart-react/start-event-proxy.mjs
@@ -0,0 +1,6 @@
+import { startEventProxyServer } from '@sentry-internal/test-utils';
+
+startEventProxyServer({
+  port: 3031,
+  proxyServerName: 'tanstackstart-react',
+});
diff --git a/dev-packages/e2e-tests/test-applications/tanstackstart-react/tests/errors.test.ts b/dev-packages/e2e-tests/test-applications/tanstackstart-react/tests/errors.test.ts
new file mode 100644
index 000000000000..f5d25febb7a4
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/tanstackstart-react/tests/errors.test.ts
@@ -0,0 +1,92 @@
+import { expect, test } from '@playwright/test';
+import { waitForError } from '@sentry-internal/test-utils';
+
+test('Sends client-side error to Sentry with auto-instrumentation', async ({ page }) => {
+  const errorEventPromise = waitForError('tanstackstart-react', errorEvent => {
+    return errorEvent?.exception?.values?.[0]?.value === 'Sentry Client Test Error';
+  });
+
+  await page.goto(`/`);
+
+  await expect(page.locator('button').filter({ hasText: 'Break the client' })).toBeVisible();
+
+  await page.locator('button').filter({ hasText: 'Break the client' }).click();
+
+  const errorEvent = await errorEventPromise;
+
+  expect(errorEvent).toMatchObject({
+    exception: {
+      values: [
+        {
+          type: 'Error',
+          value: 'Sentry Client Test Error',
+          mechanism: {
+            handled: false,
+          },
+        },
+      ],
+    },
+  });
+
+  expect(errorEvent.transaction).toBe('/');
+});
+
+test('Sends server-side function error to Sentry with auto-instrumentation', async ({ page }) => {
+  const errorEventPromise = waitForError('tanstackstart-react', errorEvent => {
+    return errorEvent?.exception?.values?.[0]?.value === 'Sentry Server Function Test Error';
+  });
+
+  await page.goto(`/`);
+
+  await expect(page.locator('button').filter({ hasText: 'Break server function' })).toBeVisible();
+
+  await page.locator('button').filter({ hasText: 'Break server function' }).click();
+
+  const errorEvent = await errorEventPromise;
+
+  expect(errorEvent).toMatchObject({
+    exception: {
+      values: [
+        {
+          type: 'Error',
+          value: 'Sentry Server Function Test Error',
+          mechanism: {
+            handled: false,
+          },
+        },
+      ],
+    },
+  });
+
+  expect(errorEvent.transaction).toBe('/');
+});
+
+test('Sends API route error to Sentry if manually instrumented', async ({ page }) => {
+  const errorEventPromise = waitForError('tanstackstart-react', errorEvent => {
+    return errorEvent?.exception?.values?.[0]?.value === 'Sentry API Route Test Error';
+  });
+
+  await page.goto(`/`);
+
+  await expect(page.locator('button').filter({ hasText: 'Break API route' })).toBeVisible();
+
+  await page.locator('button').filter({ hasText: 'Break API route' }).click();
+
+  const errorEvent = await errorEventPromise;
+
+  expect(errorEvent).toMatchObject({
+    exception: {
+      values: [
+        {
+          type: 'Error',
+          value: 'Sentry API Route Test Error',
+          mechanism: {
+            handled: true,
+          },
+        },
+      ],
+    },
+  });
+
+  expect(errorEvent.transaction).toBe('GET /api/error');
+});
diff --git a/dev-packages/e2e-tests/test-applications/tanstackstart-react/tsconfig.json b/dev-packages/e2e-tests/test-applications/tanstackstart-react/tsconfig.json
new file mode 100644
index 000000000000..5dcdb1fa6f4a
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/tanstackstart-react/tsconfig.json
@@ -0,0 +1,26 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "useDefineForClassFields": true,
+    "lib": ["ES2022", "DOM", "DOM.Iterable"],
+    "module": "ESNext",
+    "skipLibCheck": true,
+
+    /* Bundler mode */
+    "moduleResolution": "bundler",
+    "allowImportingTsExtensions": true,
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "noEmit": true,
+    "jsx": "react-jsx",
+
+    /* Linting */
+    "strict": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "noFallthroughCasesInSwitch": true,
+    "strictNullChecks": true
+  },
+  "include": ["src"],
+  "references": [{ "path": "./tsconfig.node.json" }]
+}
diff --git a/dev-packages/e2e-tests/test-applications/tanstackstart-react/tsconfig.node.json b/dev-packages/e2e-tests/test-applications/tanstackstart-react/tsconfig.node.json
new file mode 100644
index 000000000000..97ede7ee6f2d
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/tanstackstart-react/tsconfig.node.json
@@ -0,0 +1,11 @@
+{
+  "compilerOptions": {
+    "composite": true,
+    "skipLibCheck": true,
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "allowSyntheticDefaultImports": true,
+    "strict": true
+  },
+  "include": ["vite.config.ts"]
+}
diff --git a/dev-packages/e2e-tests/test-applications/tanstackstart-react/vite.config.ts b/dev-packages/e2e-tests/test-applications/tanstackstart-react/vite.config.ts
new file mode 100644
index 000000000000..4df9fbb14208
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/tanstackstart-react/vite.config.ts
@@ -0,0 +1,18 @@
+import { defineConfig } from 'vite';
+import tsConfigPaths from 'vite-tsconfig-paths';
+import { tanstackStart } from '@tanstack/react-start/plugin/vite';
+import viteReact from '@vitejs/plugin-react-swc';
+import { nitro } from 'nitro/vite';
+
+export default defineConfig({
+  server: {
+    port: 3000,
+  },
+  plugins: [
+    tsConfigPaths(),
+    tanstackStart(),
+    nitro(),
+    // react's vite plugin must come after start's vite plugin
+    viteReact(),
+  ],
+});

From f9617719005f3675f7e66d4b2eab79ff839a6ba5 Mon Sep 17 00:00:00 2001
From: Francesco Gringl-Novy <francesco.novy@sentry.io>
Date: Wed, 3 Dec 2025 13:39:27 +0100
Subject: [PATCH 165/186] ref(core): Avoid looking up openai integration
 options (#17695)

This avoids looking up the integration for openai instrumentation,
instead relying on this being passed in (which it already is). When
manually instrumenting the client you need to pass in the options
directly.

1. Node: Options are passed from the integration to
instrumentOpenAiClient anyhow, so nothing changes
2. cloudflare/vercel-edge: There is no integration, users need to
manually call instrumentOpenAiClient() and pass in the options anyhow
(no integration to look anything up from exists there)

See also https://github.com/getsentry/sentry-javascript/pull/17694

Closes #18375

---------

Co-authored-by: RulaKhaled <rola.abuhasna@sentry.io>
---
 .../tracing/openai/instrument-root-span.mjs   |  11 +
 .../openai/instrument-with-options.mjs        |   6 +
 .../tracing/openai/instrument-with-pii.mjs    |   6 +
 .../suites/tracing/openai/instrument.mjs      |   6 +
 .../suites/tracing/openai/scenario-chat.mjs   | 380 ++++++++----------
 .../tracing/openai/scenario-embeddings.mjs    |  74 ++--
 .../suites/tracing/openai/test.ts             |   2 +-
 .../openai/v6/instrument-root-span.mjs        |  11 +
 .../openai/v6/instrument-with-options.mjs     |   7 +
 .../tracing/openai/v6/instrument-with-pii.mjs |   6 +
 .../suites/tracing/openai/v6/instrument.mjs   |   6 +
 .../tracing/openai/v6/scenario-chat.mjs       | 380 ++++++++----------
 .../tracing/openai/v6/scenario-embeddings.mjs |  74 ++--
 .../suites/tracing/openai/v6/test.ts          |   2 +-
 packages/core/src/tracing/openai/index.ts     |  43 +-
 .../src/integrations/tracing/openai/index.ts  |   7 +-
 .../tracing/openai/instrumentation.ts         |  25 +-
 17 files changed, 512 insertions(+), 534 deletions(-)
 create mode 100644 dev-packages/node-integration-tests/suites/tracing/openai/instrument-root-span.mjs
 create mode 100644 dev-packages/node-integration-tests/suites/tracing/openai/v6/instrument-root-span.mjs

diff --git a/dev-packages/node-integration-tests/suites/tracing/openai/instrument-root-span.mjs b/dev-packages/node-integration-tests/suites/tracing/openai/instrument-root-span.mjs
new file mode 100644
index 000000000000..f3fbac9d1274
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/openai/instrument-root-span.mjs
@@ -0,0 +1,11 @@
+import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  release: '1.0',
+  tracesSampleRate: 1.0,
+  sendDefaultPii: false,
+  transport: loggingTransport,
+  integrations: [Sentry.openAIIntegration()],
+});
diff --git a/dev-packages/node-integration-tests/suites/tracing/openai/instrument-with-options.mjs b/dev-packages/node-integration-tests/suites/tracing/openai/instrument-with-options.mjs
index 35f97fd84093..86219de9983a 100644
--- a/dev-packages/node-integration-tests/suites/tracing/openai/instrument-with-options.mjs
+++ b/dev-packages/node-integration-tests/suites/tracing/openai/instrument-with-options.mjs
@@ -13,4 +13,10 @@ Sentry.init({
       recordOutputs: true,
     }),
   ],
+  beforeSendTransaction: event => {
+    if (event.transaction.includes('/openai/')) {
+      return null;
+    }
+    return event;
+  },
 });
diff --git a/dev-packages/node-integration-tests/suites/tracing/openai/instrument-with-pii.mjs b/dev-packages/node-integration-tests/suites/tracing/openai/instrument-with-pii.mjs
index a53a13af7738..74bc63db971b 100644
--- a/dev-packages/node-integration-tests/suites/tracing/openai/instrument-with-pii.mjs
+++ b/dev-packages/node-integration-tests/suites/tracing/openai/instrument-with-pii.mjs
@@ -8,4 +8,10 @@ Sentry.init({
   sendDefaultPii: true,
   transport: loggingTransport,
   integrations: [Sentry.openAIIntegration()],
+  beforeSendTransaction: event => {
+    if (event.transaction.includes('/openai/')) {
+      return null;
+    }
+    return event;
+  },
 });
diff --git a/dev-packages/node-integration-tests/suites/tracing/openai/instrument.mjs b/dev-packages/node-integration-tests/suites/tracing/openai/instrument.mjs
index f3fbac9d1274..1ff3990a0693 100644
--- a/dev-packages/node-integration-tests/suites/tracing/openai/instrument.mjs
+++ b/dev-packages/node-integration-tests/suites/tracing/openai/instrument.mjs
@@ -8,4 +8,10 @@ Sentry.init({
   sendDefaultPii: false,
   transport: loggingTransport,
   integrations: [Sentry.openAIIntegration()],
+  beforeSendTransaction: event => {
+    if (event.transaction.includes('/openai/')) {
+      return null;
+    }
+    return event;
+  },
 });
diff --git a/dev-packages/node-integration-tests/suites/tracing/openai/scenario-chat.mjs b/dev-packages/node-integration-tests/suites/tracing/openai/scenario-chat.mjs
index fde651c3c1ff..6031b6861f5b 100644
--- a/dev-packages/node-integration-tests/suites/tracing/openai/scenario-chat.mjs
+++ b/dev-packages/node-integration-tests/suites/tracing/openai/scenario-chat.mjs
@@ -1,245 +1,203 @@
-import { instrumentOpenAiClient } from '@sentry/core';
 import * as Sentry from '@sentry/node';
+import express from 'express';
+import OpenAI from 'openai';
 
-class MockOpenAI {
-  constructor(config) {
-    this.apiKey = config.apiKey;
+function startMockServer() {
+  const app = express();
+  app.use(express.json());
 
-    this.chat = {
-      completions: {
-        create: async params => {
-          // Simulate processing time
-          await new Promise(resolve => setTimeout(resolve, 10));
+  // Chat completions endpoint
+  app.post('/openai/chat/completions', (req, res) => {
+    const { model, stream } = req.body;
 
-          if (params.model === 'error-model') {
-            const error = new Error('Model not found');
-            error.status = 404;
-            error.headers = { 'x-request-id': 'mock-request-123' };
-            throw error;
-          }
+    // Handle error model
+    if (model === 'error-model') {
+      res.status(500).set('x-request-id', 'mock-request-error').end('Internal server error');
+      return;
+    }
 
-          // If stream is requested, return an async generator
-          if (params.stream) {
-            return this._createChatCompletionStream(params);
-          }
+    if (stream) {
+      // Streaming response
+      res.setHeader('Content-Type', 'text/event-stream');
+      res.setHeader('Cache-Control', 'no-cache');
+      res.setHeader('Connection', 'keep-alive');
 
-          return {
-            id: 'chatcmpl-mock123',
-            object: 'chat.completion',
-            created: 1677652288,
-            model: params.model,
-            system_fingerprint: 'fp_44709d6fcb',
-            choices: [
-              {
-                index: 0,
-                message: {
-                  role: 'assistant',
-                  content: 'Hello from OpenAI mock!',
-                },
-                finish_reason: 'stop',
-              },
-            ],
-            usage: {
-              prompt_tokens: 10,
-              completion_tokens: 15,
-              total_tokens: 25,
+      const chunks = [
+        {
+          id: 'chatcmpl-stream-123',
+          object: 'chat.completion.chunk',
+          created: 1677652300,
+          model: model,
+          choices: [{ delta: { role: 'assistant', content: '' }, index: 0 }],
+        },
+        {
+          id: 'chatcmpl-stream-123',
+          object: 'chat.completion.chunk',
+          created: 1677652300,
+          model: model,
+          choices: [{ delta: { content: 'Hello from OpenAI streaming!' }, index: 0 }],
+        },
+        {
+          id: 'chatcmpl-stream-123',
+          object: 'chat.completion.chunk',
+          created: 1677652300,
+          model: model,
+          choices: [{ delta: {}, index: 0, finish_reason: 'stop' }],
+          usage: {
+            prompt_tokens: 12,
+            completion_tokens: 18,
+            total_tokens: 30,
+          },
+        },
+      ];
+
+      chunks.forEach((chunk, index) => {
+        setTimeout(() => {
+          res.write(`data: ${JSON.stringify(chunk)}\n\n`);
+          if (index === chunks.length - 1) {
+            res.write('data: [DONE]\n\n');
+            res.end();
+          }
+        }, index * 10);
+      });
+    } else {
+      // Non-streaming response
+      res.send({
+        id: 'chatcmpl-mock123',
+        object: 'chat.completion',
+        created: 1677652288,
+        model: model,
+        choices: [
+          {
+            index: 0,
+            message: {
+              role: 'assistant',
+              content: 'Hello from OpenAI mock!',
             },
-          };
+            finish_reason: 'stop',
+          },
+        ],
+        usage: {
+          prompt_tokens: 10,
+          completion_tokens: 15,
+          total_tokens: 25,
         },
-      },
-    };
+      });
+    }
+  });
 
-    this.responses = {
-      create: async params => {
-        await new Promise(resolve => setTimeout(resolve, 10));
+  // Responses API endpoint
+  app.post('/openai/responses', (req, res) => {
+    const { model, stream } = req.body;
 
-        // If stream is requested, return an async generator
-        if (params.stream) {
-          return this._createResponsesApiStream(params);
-        }
+    // Handle error model
+    if (model === 'error-model') {
+      res.status(500).set('x-request-id', 'mock-request-error').end('Internal server error');
+      return;
+    }
 
-        return {
-          id: 'resp_mock456',
-          object: 'response',
-          created_at: 1677652290,
-          model: params.model,
-          input_text: params.input,
-          output_text: `Response to: ${params.input}`,
-          status: 'completed',
-          usage: {
-            input_tokens: 5,
-            output_tokens: 8,
-            total_tokens: 13,
-          },
-        };
-      },
-    };
-  }
+    if (stream) {
+      // Streaming response - using event-based format with 'response' field
+      res.setHeader('Content-Type', 'text/event-stream');
+      res.setHeader('Cache-Control', 'no-cache');
+      res.setHeader('Connection', 'keep-alive');
 
-  // Create a mock streaming response for chat completions
-  async *_createChatCompletionStream(params) {
-    // First chunk with basic info
-    yield {
-      id: 'chatcmpl-stream-123',
-      object: 'chat.completion.chunk',
-      created: 1677652300,
-      model: params.model,
-      system_fingerprint: 'fp_stream_123',
-      choices: [
+      const events = [
         {
-          index: 0,
-          delta: {
-            role: 'assistant',
-            content: 'Hello',
+          type: 'response.created',
+          response: {
+            id: 'resp_stream_456',
+            object: 'response',
+            created_at: 1677652310,
+            model: model,
+            status: 'in_progress',
           },
-          finish_reason: null,
         },
-      ],
-    };
-
-    // Second chunk with more content
-    yield {
-      id: 'chatcmpl-stream-123',
-      object: 'chat.completion.chunk',
-      created: 1677652300,
-      model: params.model,
-      system_fingerprint: 'fp_stream_123',
-      choices: [
         {
-          index: 0,
-          delta: {
-            content: ' from OpenAI streaming!',
+          type: 'response.output_text.delta',
+          delta: 'Streaming response to: Test streaming responses API',
+          response: {
+            id: 'resp_stream_456',
+            model: model,
+            created_at: 1677652310,
           },
-          finish_reason: 'stop',
-        },
-      ],
-      usage: {
-        prompt_tokens: 12,
-        completion_tokens: 18,
-        total_tokens: 30,
-        completion_tokens_details: {
-          accepted_prediction_tokens: 0,
-          audio_tokens: 0,
-          reasoning_tokens: 0,
-          rejected_prediction_tokens: 0,
         },
-        prompt_tokens_details: {
-          audio_tokens: 0,
-          cached_tokens: 0,
-        },
-      },
-    };
-  }
-
-  // Create a mock streaming response for responses API
-  async *_createResponsesApiStream(params) {
-    // Response created event
-    yield {
-      type: 'response.created',
-      response: {
-        id: 'resp_stream_456',
-        object: 'response',
-        created_at: 1677652310,
-        model: params.model,
-        status: 'in_progress',
-        error: null,
-        incomplete_details: null,
-        instructions: params.instructions,
-        max_output_tokens: 1000,
-        parallel_tool_calls: false,
-        previous_response_id: null,
-        reasoning: {
-          effort: null,
-          summary: null,
-        },
-        store: false,
-        temperature: 0.7,
-        text: {
-          format: {
-            type: 'text',
+        {
+          type: 'response.completed',
+          response: {
+            id: 'resp_stream_456',
+            object: 'response',
+            created_at: 1677652310,
+            model: model,
+            status: 'completed',
+            output_text: 'Test streaming responses API',
+            usage: {
+              input_tokens: 6,
+              output_tokens: 10,
+              total_tokens: 16,
+            },
           },
         },
-        tool_choice: 'auto',
-        top_p: 1.0,
-        truncation: 'disabled',
-        user: null,
-        metadata: {},
-        output: [],
-        output_text: '',
-        usage: {
-          input_tokens: 0,
-          output_tokens: 0,
-          total_tokens: 0,
-        },
-      },
-      sequence_number: 1,
-    };
-
-    // Response in progress with output text delta
-    yield {
-      type: 'response.output_text.delta',
-      delta: 'Streaming response to: ',
-      sequence_number: 2,
-    };
+      ];
 
-    yield {
-      type: 'response.output_text.delta',
-      delta: params.input,
-      sequence_number: 3,
-    };
-
-    // Response completed event
-    yield {
-      type: 'response.completed',
-      response: {
-        id: 'resp_stream_456',
+      events.forEach((event, index) => {
+        setTimeout(() => {
+          res.write(`data: ${JSON.stringify(event)}\n\n`);
+          if (index === events.length - 1) {
+            res.write('data: [DONE]\n\n');
+            res.end();
+          }
+        }, index * 10);
+      });
+    } else {
+      // Non-streaming response
+      res.send({
+        id: 'resp_mock456',
         object: 'response',
-        created_at: 1677652310,
-        model: params.model,
-        status: 'completed',
-        error: null,
-        incomplete_details: null,
-        instructions: params.instructions,
-        max_output_tokens: 1000,
-        parallel_tool_calls: false,
-        previous_response_id: null,
-        reasoning: {
-          effort: null,
-          summary: null,
-        },
-        store: false,
-        temperature: 0.7,
-        text: {
-          format: {
-            type: 'text',
+        created_at: 1677652290,
+        model: model,
+        output: [
+          {
+            type: 'message',
+            id: 'msg_mock_output_1',
+            status: 'completed',
+            role: 'assistant',
+            content: [
+              {
+                type: 'output_text',
+                text: `Response to: ${req.body.input}`,
+                annotations: [],
+              },
+            ],
           },
-        },
-        tool_choice: 'auto',
-        top_p: 1.0,
-        truncation: 'disabled',
-        user: null,
-        metadata: {},
-        output: [],
-        output_text: params.input,
+        ],
+        output_text: `Response to: ${req.body.input}`,
+        status: 'completed',
         usage: {
-          input_tokens: 6,
-          output_tokens: 10,
-          total_tokens: 16,
+          input_tokens: 5,
+          output_tokens: 8,
+          total_tokens: 13,
         },
-      },
-      sequence_number: 4,
-    };
-  }
+      });
+    }
+  });
+
+  return new Promise(resolve => {
+    const server = app.listen(0, () => {
+      resolve(server);
+    });
+  });
 }
 
 async function run() {
+  const server = await startMockServer();
+
   await Sentry.startSpan({ op: 'function', name: 'main' }, async () => {
-    const mockClient = new MockOpenAI({
+    const client = new OpenAI({
+      baseURL: `http://localhost:${server.address().port}/openai`,
       apiKey: 'mock-api-key',
     });
 
-    const client = instrumentOpenAiClient(mockClient);
-
     // First test: basic chat completion
     await client.chat.completions.create({
       model: 'gpt-3.5-turbo',
@@ -313,6 +271,8 @@ async function run() {
       // Error is expected and handled
     }
   });
+
+  server.close();
 }
 
 run();
diff --git a/dev-packages/node-integration-tests/suites/tracing/openai/scenario-embeddings.mjs b/dev-packages/node-integration-tests/suites/tracing/openai/scenario-embeddings.mjs
index 9cdb24a42da9..f6cbe1160bf5 100644
--- a/dev-packages/node-integration-tests/suites/tracing/openai/scenario-embeddings.mjs
+++ b/dev-packages/node-integration-tests/suites/tracing/openai/scenario-embeddings.mjs
@@ -1,49 +1,55 @@
-import { instrumentOpenAiClient } from '@sentry/core';
 import * as Sentry from '@sentry/node';
+import express from 'express';
+import OpenAI from 'openai';
 
-class MockOpenAI {
-  constructor(config) {
-    this.apiKey = config.apiKey;
+function startMockServer() {
+  const app = express();
+  app.use(express.json());
 
-    this.embeddings = {
-      create: async params => {
-        await new Promise(resolve => setTimeout(resolve, 10));
+  // Embeddings endpoint
+  app.post('/openai/embeddings', (req, res) => {
+    const { model } = req.body;
 
-        if (params.model === 'error-model') {
-          const error = new Error('Model not found');
-          error.status = 404;
-          error.headers = { 'x-request-id': 'mock-request-123' };
-          throw error;
-        }
+    // Handle error model
+    if (model === 'error-model') {
+      res.status(404).set('x-request-id', 'mock-request-123').end('Model not found');
+      return;
+    }
 
-        return {
-          object: 'list',
-          data: [
-            {
-              object: 'embedding',
-              embedding: [0.1, 0.2, 0.3],
-              index: 0,
-            },
-          ],
-          model: params.model,
-          usage: {
-            prompt_tokens: 10,
-            total_tokens: 10,
-          },
-        };
+    // Return embeddings response
+    res.send({
+      object: 'list',
+      data: [
+        {
+          object: 'embedding',
+          embedding: [0.1, 0.2, 0.3],
+          index: 0,
+        },
+      ],
+      model: model,
+      usage: {
+        prompt_tokens: 10,
+        total_tokens: 10,
       },
-    };
-  }
+    });
+  });
+
+  return new Promise(resolve => {
+    const server = app.listen(0, () => {
+      resolve(server);
+    });
+  });
 }
 
 async function run() {
+  const server = await startMockServer();
+
   await Sentry.startSpan({ op: 'function', name: 'main' }, async () => {
-    const mockClient = new MockOpenAI({
+    const client = new OpenAI({
+      baseURL: `http://localhost:${server.address().port}/openai`,
       apiKey: 'mock-api-key',
     });
 
-    const client = instrumentOpenAiClient(mockClient);
-
     // First test: embeddings API
     await client.embeddings.create({
       input: 'Embedding test!',
@@ -62,6 +68,8 @@ async function run() {
       // Error is expected and handled
     }
   });
+
+  server.close();
 }
 
 run();
diff --git a/dev-packages/node-integration-tests/suites/tracing/openai/test.ts b/dev-packages/node-integration-tests/suites/tracing/openai/test.ts
index a0436d9e5a8b..d56bb27f6a24 100644
--- a/dev-packages/node-integration-tests/suites/tracing/openai/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/openai/test.ts
@@ -454,7 +454,7 @@ describe('OpenAI integration', () => {
     });
   });
 
-  createEsmAndCjsTests(__dirname, 'scenario-root-span.mjs', 'instrument.mjs', (createRunner, test) => {
+  createEsmAndCjsTests(__dirname, 'scenario-root-span.mjs', 'instrument-root-span.mjs', (createRunner, test) => {
     test('it works without a wrapping span', async () => {
       await createRunner()
         // First the span that our mock express server is emitting, unrelated to this test
diff --git a/dev-packages/node-integration-tests/suites/tracing/openai/v6/instrument-root-span.mjs b/dev-packages/node-integration-tests/suites/tracing/openai/v6/instrument-root-span.mjs
new file mode 100644
index 000000000000..f3fbac9d1274
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/tracing/openai/v6/instrument-root-span.mjs
@@ -0,0 +1,11 @@
+import * as Sentry from '@sentry/node';
+import { loggingTransport } from '@sentry-internal/node-integration-tests';
+
+Sentry.init({
+  dsn: 'https://public@dsn.ingest.sentry.io/1337',
+  release: '1.0',
+  tracesSampleRate: 1.0,
+  sendDefaultPii: false,
+  transport: loggingTransport,
+  integrations: [Sentry.openAIIntegration()],
+});
diff --git a/dev-packages/node-integration-tests/suites/tracing/openai/v6/instrument-with-options.mjs b/dev-packages/node-integration-tests/suites/tracing/openai/v6/instrument-with-options.mjs
index 35f97fd84093..51da27f73bbc 100644
--- a/dev-packages/node-integration-tests/suites/tracing/openai/v6/instrument-with-options.mjs
+++ b/dev-packages/node-integration-tests/suites/tracing/openai/v6/instrument-with-options.mjs
@@ -13,4 +13,11 @@ Sentry.init({
       recordOutputs: true,
     }),
   ],
+  debug: true,
+  beforeSendTransaction: event => {
+    if (event.transaction.includes('/openai/')) {
+      return null;
+    }
+    return event;
+  },
 });
diff --git a/dev-packages/node-integration-tests/suites/tracing/openai/v6/instrument-with-pii.mjs b/dev-packages/node-integration-tests/suites/tracing/openai/v6/instrument-with-pii.mjs
index a53a13af7738..74bc63db971b 100644
--- a/dev-packages/node-integration-tests/suites/tracing/openai/v6/instrument-with-pii.mjs
+++ b/dev-packages/node-integration-tests/suites/tracing/openai/v6/instrument-with-pii.mjs
@@ -8,4 +8,10 @@ Sentry.init({
   sendDefaultPii: true,
   transport: loggingTransport,
   integrations: [Sentry.openAIIntegration()],
+  beforeSendTransaction: event => {
+    if (event.transaction.includes('/openai/')) {
+      return null;
+    }
+    return event;
+  },
 });
diff --git a/dev-packages/node-integration-tests/suites/tracing/openai/v6/instrument.mjs b/dev-packages/node-integration-tests/suites/tracing/openai/v6/instrument.mjs
index f3fbac9d1274..1ff3990a0693 100644
--- a/dev-packages/node-integration-tests/suites/tracing/openai/v6/instrument.mjs
+++ b/dev-packages/node-integration-tests/suites/tracing/openai/v6/instrument.mjs
@@ -8,4 +8,10 @@ Sentry.init({
   sendDefaultPii: false,
   transport: loggingTransport,
   integrations: [Sentry.openAIIntegration()],
+  beforeSendTransaction: event => {
+    if (event.transaction.includes('/openai/')) {
+      return null;
+    }
+    return event;
+  },
 });
diff --git a/dev-packages/node-integration-tests/suites/tracing/openai/v6/scenario-chat.mjs b/dev-packages/node-integration-tests/suites/tracing/openai/v6/scenario-chat.mjs
index fde651c3c1ff..6031b6861f5b 100644
--- a/dev-packages/node-integration-tests/suites/tracing/openai/v6/scenario-chat.mjs
+++ b/dev-packages/node-integration-tests/suites/tracing/openai/v6/scenario-chat.mjs
@@ -1,245 +1,203 @@
-import { instrumentOpenAiClient } from '@sentry/core';
 import * as Sentry from '@sentry/node';
+import express from 'express';
+import OpenAI from 'openai';
 
-class MockOpenAI {
-  constructor(config) {
-    this.apiKey = config.apiKey;
+function startMockServer() {
+  const app = express();
+  app.use(express.json());
 
-    this.chat = {
-      completions: {
-        create: async params => {
-          // Simulate processing time
-          await new Promise(resolve => setTimeout(resolve, 10));
+  // Chat completions endpoint
+  app.post('/openai/chat/completions', (req, res) => {
+    const { model, stream } = req.body;
 
-          if (params.model === 'error-model') {
-            const error = new Error('Model not found');
-            error.status = 404;
-            error.headers = { 'x-request-id': 'mock-request-123' };
-            throw error;
-          }
+    // Handle error model
+    if (model === 'error-model') {
+      res.status(500).set('x-request-id', 'mock-request-error').end('Internal server error');
+      return;
+    }
 
-          // If stream is requested, return an async generator
-          if (params.stream) {
-            return this._createChatCompletionStream(params);
-          }
+    if (stream) {
+      // Streaming response
+      res.setHeader('Content-Type', 'text/event-stream');
+      res.setHeader('Cache-Control', 'no-cache');
+      res.setHeader('Connection', 'keep-alive');
 
-          return {
-            id: 'chatcmpl-mock123',
-            object: 'chat.completion',
-            created: 1677652288,
-            model: params.model,
-            system_fingerprint: 'fp_44709d6fcb',
-            choices: [
-              {
-                index: 0,
-                message: {
-                  role: 'assistant',
-                  content: 'Hello from OpenAI mock!',
-                },
-                finish_reason: 'stop',
-              },
-            ],
-            usage: {
-              prompt_tokens: 10,
-              completion_tokens: 15,
-              total_tokens: 25,
+      const chunks = [
+        {
+          id: 'chatcmpl-stream-123',
+          object: 'chat.completion.chunk',
+          created: 1677652300,
+          model: model,
+          choices: [{ delta: { role: 'assistant', content: '' }, index: 0 }],
+        },
+        {
+          id: 'chatcmpl-stream-123',
+          object: 'chat.completion.chunk',
+          created: 1677652300,
+          model: model,
+          choices: [{ delta: { content: 'Hello from OpenAI streaming!' }, index: 0 }],
+        },
+        {
+          id: 'chatcmpl-stream-123',
+          object: 'chat.completion.chunk',
+          created: 1677652300,
+          model: model,
+          choices: [{ delta: {}, index: 0, finish_reason: 'stop' }],
+          usage: {
+            prompt_tokens: 12,
+            completion_tokens: 18,
+            total_tokens: 30,
+          },
+        },
+      ];
+
+      chunks.forEach((chunk, index) => {
+        setTimeout(() => {
+          res.write(`data: ${JSON.stringify(chunk)}\n\n`);
+          if (index === chunks.length - 1) {
+            res.write('data: [DONE]\n\n');
+            res.end();
+          }
+        }, index * 10);
+      });
+    } else {
+      // Non-streaming response
+      res.send({
+        id: 'chatcmpl-mock123',
+        object: 'chat.completion',
+        created: 1677652288,
+        model: model,
+        choices: [
+          {
+            index: 0,
+            message: {
+              role: 'assistant',
+              content: 'Hello from OpenAI mock!',
             },
-          };
+            finish_reason: 'stop',
+          },
+        ],
+        usage: {
+          prompt_tokens: 10,
+          completion_tokens: 15,
+          total_tokens: 25,
         },
-      },
-    };
+      });
+    }
+  });
 
-    this.responses = {
-      create: async params => {
-        await new Promise(resolve => setTimeout(resolve, 10));
+  // Responses API endpoint
+  app.post('/openai/responses', (req, res) => {
+    const { model, stream } = req.body;
 
-        // If stream is requested, return an async generator
-        if (params.stream) {
-          return this._createResponsesApiStream(params);
-        }
+    // Handle error model
+    if (model === 'error-model') {
+      res.status(500).set('x-request-id', 'mock-request-error').end('Internal server error');
+      return;
+    }
 
-        return {
-          id: 'resp_mock456',
-          object: 'response',
-          created_at: 1677652290,
-          model: params.model,
-          input_text: params.input,
-          output_text: `Response to: ${params.input}`,
-          status: 'completed',
-          usage: {
-            input_tokens: 5,
-            output_tokens: 8,
-            total_tokens: 13,
-          },
-        };
-      },
-    };
-  }
+    if (stream) {
+      // Streaming response - using event-based format with 'response' field
+      res.setHeader('Content-Type', 'text/event-stream');
+      res.setHeader('Cache-Control', 'no-cache');
+      res.setHeader('Connection', 'keep-alive');
 
-  // Create a mock streaming response for chat completions
-  async *_createChatCompletionStream(params) {
-    // First chunk with basic info
-    yield {
-      id: 'chatcmpl-stream-123',
-      object: 'chat.completion.chunk',
-      created: 1677652300,
-      model: params.model,
-      system_fingerprint: 'fp_stream_123',
-      choices: [
+      const events = [
         {
-          index: 0,
-          delta: {
-            role: 'assistant',
-            content: 'Hello',
+          type: 'response.created',
+          response: {
+            id: 'resp_stream_456',
+            object: 'response',
+            created_at: 1677652310,
+            model: model,
+            status: 'in_progress',
           },
-          finish_reason: null,
         },
-      ],
-    };
-
-    // Second chunk with more content
-    yield {
-      id: 'chatcmpl-stream-123',
-      object: 'chat.completion.chunk',
-      created: 1677652300,
-      model: params.model,
-      system_fingerprint: 'fp_stream_123',
-      choices: [
         {
-          index: 0,
-          delta: {
-            content: ' from OpenAI streaming!',
+          type: 'response.output_text.delta',
+          delta: 'Streaming response to: Test streaming responses API',
+          response: {
+            id: 'resp_stream_456',
+            model: model,
+            created_at: 1677652310,
           },
-          finish_reason: 'stop',
-        },
-      ],
-      usage: {
-        prompt_tokens: 12,
-        completion_tokens: 18,
-        total_tokens: 30,
-        completion_tokens_details: {
-          accepted_prediction_tokens: 0,
-          audio_tokens: 0,
-          reasoning_tokens: 0,
-          rejected_prediction_tokens: 0,
         },
-        prompt_tokens_details: {
-          audio_tokens: 0,
-          cached_tokens: 0,
-        },
-      },
-    };
-  }
-
-  // Create a mock streaming response for responses API
-  async *_createResponsesApiStream(params) {
-    // Response created event
-    yield {
-      type: 'response.created',
-      response: {
-        id: 'resp_stream_456',
-        object: 'response',
-        created_at: 1677652310,
-        model: params.model,
-        status: 'in_progress',
-        error: null,
-        incomplete_details: null,
-        instructions: params.instructions,
-        max_output_tokens: 1000,
-        parallel_tool_calls: false,
-        previous_response_id: null,
-        reasoning: {
-          effort: null,
-          summary: null,
-        },
-        store: false,
-        temperature: 0.7,
-        text: {
-          format: {
-            type: 'text',
+        {
+          type: 'response.completed',
+          response: {
+            id: 'resp_stream_456',
+            object: 'response',
+            created_at: 1677652310,
+            model: model,
+            status: 'completed',
+            output_text: 'Test streaming responses API',
+            usage: {
+              input_tokens: 6,
+              output_tokens: 10,
+              total_tokens: 16,
+            },
           },
         },
-        tool_choice: 'auto',
-        top_p: 1.0,
-        truncation: 'disabled',
-        user: null,
-        metadata: {},
-        output: [],
-        output_text: '',
-        usage: {
-          input_tokens: 0,
-          output_tokens: 0,
-          total_tokens: 0,
-        },
-      },
-      sequence_number: 1,
-    };
-
-    // Response in progress with output text delta
-    yield {
-      type: 'response.output_text.delta',
-      delta: 'Streaming response to: ',
-      sequence_number: 2,
-    };
+      ];
 
-    yield {
-      type: 'response.output_text.delta',
-      delta: params.input,
-      sequence_number: 3,
-    };
-
-    // Response completed event
-    yield {
-      type: 'response.completed',
-      response: {
-        id: 'resp_stream_456',
+      events.forEach((event, index) => {
+        setTimeout(() => {
+          res.write(`data: ${JSON.stringify(event)}\n\n`);
+          if (index === events.length - 1) {
+            res.write('data: [DONE]\n\n');
+            res.end();
+          }
+        }, index * 10);
+      });
+    } else {
+      // Non-streaming response
+      res.send({
+        id: 'resp_mock456',
         object: 'response',
-        created_at: 1677652310,
-        model: params.model,
-        status: 'completed',
-        error: null,
-        incomplete_details: null,
-        instructions: params.instructions,
-        max_output_tokens: 1000,
-        parallel_tool_calls: false,
-        previous_response_id: null,
-        reasoning: {
-          effort: null,
-          summary: null,
-        },
-        store: false,
-        temperature: 0.7,
-        text: {
-          format: {
-            type: 'text',
+        created_at: 1677652290,
+        model: model,
+        output: [
+          {
+            type: 'message',
+            id: 'msg_mock_output_1',
+            status: 'completed',
+            role: 'assistant',
+            content: [
+              {
+                type: 'output_text',
+                text: `Response to: ${req.body.input}`,
+                annotations: [],
+              },
+            ],
           },
-        },
-        tool_choice: 'auto',
-        top_p: 1.0,
-        truncation: 'disabled',
-        user: null,
-        metadata: {},
-        output: [],
-        output_text: params.input,
+        ],
+        output_text: `Response to: ${req.body.input}`,
+        status: 'completed',
         usage: {
-          input_tokens: 6,
-          output_tokens: 10,
-          total_tokens: 16,
+          input_tokens: 5,
+          output_tokens: 8,
+          total_tokens: 13,
         },
-      },
-      sequence_number: 4,
-    };
-  }
+      });
+    }
+  });
+
+  return new Promise(resolve => {
+    const server = app.listen(0, () => {
+      resolve(server);
+    });
+  });
 }
 
 async function run() {
+  const server = await startMockServer();
+
   await Sentry.startSpan({ op: 'function', name: 'main' }, async () => {
-    const mockClient = new MockOpenAI({
+    const client = new OpenAI({
+      baseURL: `http://localhost:${server.address().port}/openai`,
       apiKey: 'mock-api-key',
     });
 
-    const client = instrumentOpenAiClient(mockClient);
-
     // First test: basic chat completion
     await client.chat.completions.create({
       model: 'gpt-3.5-turbo',
@@ -313,6 +271,8 @@ async function run() {
       // Error is expected and handled
     }
   });
+
+  server.close();
 }
 
 run();
diff --git a/dev-packages/node-integration-tests/suites/tracing/openai/v6/scenario-embeddings.mjs b/dev-packages/node-integration-tests/suites/tracing/openai/v6/scenario-embeddings.mjs
index 9cdb24a42da9..f6cbe1160bf5 100644
--- a/dev-packages/node-integration-tests/suites/tracing/openai/v6/scenario-embeddings.mjs
+++ b/dev-packages/node-integration-tests/suites/tracing/openai/v6/scenario-embeddings.mjs
@@ -1,49 +1,55 @@
-import { instrumentOpenAiClient } from '@sentry/core';
 import * as Sentry from '@sentry/node';
+import express from 'express';
+import OpenAI from 'openai';
 
-class MockOpenAI {
-  constructor(config) {
-    this.apiKey = config.apiKey;
+function startMockServer() {
+  const app = express();
+  app.use(express.json());
 
-    this.embeddings = {
-      create: async params => {
-        await new Promise(resolve => setTimeout(resolve, 10));
+  // Embeddings endpoint
+  app.post('/openai/embeddings', (req, res) => {
+    const { model } = req.body;
 
-        if (params.model === 'error-model') {
-          const error = new Error('Model not found');
-          error.status = 404;
-          error.headers = { 'x-request-id': 'mock-request-123' };
-          throw error;
-        }
+    // Handle error model
+    if (model === 'error-model') {
+      res.status(404).set('x-request-id', 'mock-request-123').end('Model not found');
+      return;
+    }
 
-        return {
-          object: 'list',
-          data: [
-            {
-              object: 'embedding',
-              embedding: [0.1, 0.2, 0.3],
-              index: 0,
-            },
-          ],
-          model: params.model,
-          usage: {
-            prompt_tokens: 10,
-            total_tokens: 10,
-          },
-        };
+    // Return embeddings response
+    res.send({
+      object: 'list',
+      data: [
+        {
+          object: 'embedding',
+          embedding: [0.1, 0.2, 0.3],
+          index: 0,
+        },
+      ],
+      model: model,
+      usage: {
+        prompt_tokens: 10,
+        total_tokens: 10,
       },
-    };
-  }
+    });
+  });
+
+  return new Promise(resolve => {
+    const server = app.listen(0, () => {
+      resolve(server);
+    });
+  });
 }
 
 async function run() {
+  const server = await startMockServer();
+
   await Sentry.startSpan({ op: 'function', name: 'main' }, async () => {
-    const mockClient = new MockOpenAI({
+    const client = new OpenAI({
+      baseURL: `http://localhost:${server.address().port}/openai`,
       apiKey: 'mock-api-key',
     });
 
-    const client = instrumentOpenAiClient(mockClient);
-
     // First test: embeddings API
     await client.embeddings.create({
       input: 'Embedding test!',
@@ -62,6 +68,8 @@ async function run() {
       // Error is expected and handled
     }
   });
+
+  server.close();
 }
 
 run();
diff --git a/dev-packages/node-integration-tests/suites/tracing/openai/v6/test.ts b/dev-packages/node-integration-tests/suites/tracing/openai/v6/test.ts
index 4929325c6790..23520852f070 100644
--- a/dev-packages/node-integration-tests/suites/tracing/openai/v6/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/openai/v6/test.ts
@@ -508,7 +508,7 @@ describe('OpenAI integration (V6)', () => {
   createEsmAndCjsTests(
     __dirname,
     'scenario-root-span.mjs',
-    'instrument.mjs',
+    'instrument-root-span.mjs',
     (createRunner, test) => {
       test('it works without a wrapping span (v6)', async () => {
         await createRunner()
diff --git a/packages/core/src/tracing/openai/index.ts b/packages/core/src/tracing/openai/index.ts
index bba2ee0f5afd..c68e920daf2b 100644
--- a/packages/core/src/tracing/openai/index.ts
+++ b/packages/core/src/tracing/openai/index.ts
@@ -1,4 +1,4 @@
-import { getCurrentScope } from '../../currentScopes';
+import { getClient } from '../../currentScopes';
 import { captureException } from '../../exports';
 import { SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '../../semanticAttributes';
 import { SPAN_STATUS_ERROR } from '../../tracing';
@@ -20,12 +20,10 @@ import {
   GEN_AI_SYSTEM_ATTRIBUTE,
 } from '../ai/gen-ai-attributes';
 import { getTruncatedJsonString } from '../ai/utils';
-import { OPENAI_INTEGRATION_NAME } from './constants';
 import { instrumentStream } from './streaming';
 import type {
   ChatCompletionChunk,
   InstrumentedMethod,
-  OpenAiIntegration,
   OpenAiOptions,
   OpenAiResponse,
   OpenAIStream,
@@ -128,18 +126,6 @@ function addRequestAttributes(span: Span, params: Record<string, unknown>): void
   }
 }
 
-function getOptionsFromIntegration(): OpenAiOptions {
-  const scope = getCurrentScope();
-  const client = scope.getClient();
-  const integration = client?.getIntegrationByName<OpenAiIntegration>(OPENAI_INTEGRATION_NAME);
-  const shouldRecordInputsAndOutputs = integration ? Boolean(client?.getOptions().sendDefaultPii) : false;
-
-  return {
-    recordInputs: integration?.options?.recordInputs ?? shouldRecordInputsAndOutputs,
-    recordOutputs: integration?.options?.recordOutputs ?? shouldRecordInputsAndOutputs,
-  };
-}
-
 /**
  * Instrument a method with Sentry spans
  * Following Sentry AI Agents Manual Instrumentation conventions
@@ -149,10 +135,9 @@ function instrumentMethod<T extends unknown[], R>(
   originalMethod: (...args: T) => Promise<R>,
   methodPath: InstrumentedMethod,
   context: unknown,
-  options?: OpenAiOptions,
+  options: OpenAiOptions,
 ): (...args: T) => Promise<R> {
   return async function instrumentedMethod(...args: T): Promise<R> {
-    const finalOptions = options || getOptionsFromIntegration();
     const requestAttributes = extractRequestAttributes(args, methodPath);
     const model = (requestAttributes[GEN_AI_REQUEST_MODEL_ATTRIBUTE] as string) || 'unknown';
     const operationName = getOperationName(methodPath);
@@ -170,8 +155,8 @@ function instrumentMethod<T extends unknown[], R>(
         },
         async (span: Span) => {
           try {
-            if (finalOptions.recordInputs && args[0] && typeof args[0] === 'object') {
-              addRequestAttributes(span, args[0] as Record<string, unknown>);
+            if (options.recordInputs && params) {
+              addRequestAttributes(span, params);
             }
 
             const result = await originalMethod.apply(context, args);
@@ -179,7 +164,7 @@ function instrumentMethod<T extends unknown[], R>(
             return instrumentStream(
               result as OpenAIStream<ChatCompletionChunk | ResponseStreamingEvent>,
               span,
-              finalOptions.recordOutputs ?? false,
+              options.recordOutputs ?? false,
             ) as unknown as R;
           } catch (error) {
             // For streaming requests that fail before stream creation, we still want to record
@@ -209,12 +194,12 @@ function instrumentMethod<T extends unknown[], R>(
         },
         async (span: Span) => {
           try {
-            if (finalOptions.recordInputs && args[0] && typeof args[0] === 'object') {
-              addRequestAttributes(span, args[0] as Record<string, unknown>);
+            if (options.recordInputs && params) {
+              addRequestAttributes(span, params);
             }
 
             const result = await originalMethod.apply(context, args);
-            addResponseAttributes(span, result, finalOptions.recordOutputs);
+            addResponseAttributes(span, result, options.recordOutputs);
             return result;
           } catch (error) {
             captureException(error, {
@@ -237,7 +222,7 @@ function instrumentMethod<T extends unknown[], R>(
 /**
  * Create a deep proxy for OpenAI client instrumentation
  */
-function createDeepProxy<T extends object>(target: T, currentPath = '', options?: OpenAiOptions): T {
+function createDeepProxy<T extends object>(target: T, currentPath = '', options: OpenAiOptions): T {
   return new Proxy(target, {
     get(obj: object, prop: string): unknown {
       const value = (obj as Record<string, unknown>)[prop];
@@ -267,5 +252,13 @@ function createDeepProxy<T extends object>(target: T, currentPath = '', options?
  * Can be used across Node.js, Cloudflare Workers, and Vercel Edge
  */
 export function instrumentOpenAiClient<T extends object>(client: T, options?: OpenAiOptions): T {
-  return createDeepProxy(client, '', options);
+  const sendDefaultPii = Boolean(getClient()?.getOptions().sendDefaultPii);
+
+  const _options = {
+    recordInputs: sendDefaultPii,
+    recordOutputs: sendDefaultPii,
+    ...options,
+  };
+
+  return createDeepProxy(client, '', _options);
 }
diff --git a/packages/node/src/integrations/tracing/openai/index.ts b/packages/node/src/integrations/tracing/openai/index.ts
index 0e88d2b315cc..e7f4171f87fa 100644
--- a/packages/node/src/integrations/tracing/openai/index.ts
+++ b/packages/node/src/integrations/tracing/openai/index.ts
@@ -3,17 +3,16 @@ import { defineIntegration, OPENAI_INTEGRATION_NAME } from '@sentry/core';
 import { generateInstrumentOnce } from '@sentry/node-core';
 import { SentryOpenAiInstrumentation } from './instrumentation';
 
-export const instrumentOpenAi = generateInstrumentOnce(
+export const instrumentOpenAi = generateInstrumentOnce<OpenAiOptions>(
   OPENAI_INTEGRATION_NAME,
-  () => new SentryOpenAiInstrumentation({}),
+  options => new SentryOpenAiInstrumentation(options),
 );
 
 const _openAiIntegration = ((options: OpenAiOptions = {}) => {
   return {
     name: OPENAI_INTEGRATION_NAME,
-    options,
     setupOnce() {
-      instrumentOpenAi();
+      instrumentOpenAi(options);
     },
   };
 }) satisfies IntegrationFn;
diff --git a/packages/node/src/integrations/tracing/openai/instrumentation.ts b/packages/node/src/integrations/tracing/openai/instrumentation.ts
index 77250b3b6515..42ed7faf71e3 100644
--- a/packages/node/src/integrations/tracing/openai/instrumentation.ts
+++ b/packages/node/src/integrations/tracing/openai/instrumentation.ts
@@ -19,6 +19,8 @@ export interface OpenAiIntegration extends Integration {
   options: OpenAiOptions;
 }
 
+type OpenAiInstrumentationOptions = InstrumentationConfig & OpenAiOptions;
+
 /**
  * Represents the patched shape of the OpenAI module export.
  */
@@ -28,23 +30,11 @@ interface PatchedModuleExports {
   AzureOpenAI?: abstract new (...args: unknown[]) => OpenAiClient;
 }
 
-/**
- * Determines telemetry recording settings.
- */
-function determineRecordingSettings(
-  integrationOptions: OpenAiOptions | undefined,
-  defaultEnabled: boolean,
-): { recordInputs: boolean; recordOutputs: boolean } {
-  const recordInputs = integrationOptions?.recordInputs ?? defaultEnabled;
-  const recordOutputs = integrationOptions?.recordOutputs ?? defaultEnabled;
-  return { recordInputs, recordOutputs };
-}
-
 /**
  * Sentry OpenAI instrumentation using OpenTelemetry.
  */
-export class SentryOpenAiInstrumentation extends InstrumentationBase<InstrumentationConfig> {
-  public constructor(config: InstrumentationConfig = {}) {
+export class SentryOpenAiInstrumentation extends InstrumentationBase<OpenAiInstrumentationOptions> {
+  public constructor(config: OpenAiInstrumentationOptions = {}) {
     super('@sentry/instrumentation-openai', SDK_VERSION, config);
   }
 
@@ -75,6 +65,8 @@ export class SentryOpenAiInstrumentation extends InstrumentationBase<Instrumenta
       return exports;
     }
 
+    const config = this.getConfig();
+
     const WrappedOpenAI = function (this: unknown, ...args: unknown[]) {
       // Check if wrapping should be skipped (e.g., when LangChain is handling instrumentation)
       if (_INTERNAL_shouldSkipAiProviderWrapping(OPENAI_INTEGRATION_NAME)) {
@@ -83,11 +75,10 @@ export class SentryOpenAiInstrumentation extends InstrumentationBase<Instrumenta
 
       const instance = Reflect.construct(Original, args);
       const client = getClient();
-      const integration = client?.getIntegrationByName<OpenAiIntegration>(OPENAI_INTEGRATION_NAME);
-      const integrationOpts = integration?.options;
       const defaultPii = Boolean(client?.getOptions().sendDefaultPii);
 
-      const { recordInputs, recordOutputs } = determineRecordingSettings(integrationOpts, defaultPii);
+      const recordInputs = config.recordInputs ?? defaultPii;
+      const recordOutputs = config.recordOutputs ?? defaultPii;
 
       return instrumentOpenAiClient(instance as OpenAiClient, {
         recordInputs,

From df4c541292d14472b1f99278dd0a04db18c678df Mon Sep 17 00:00:00 2001
From: Andrei <168741329+andreiborza@users.noreply.github.com>
Date: Wed, 3 Dec 2025 14:29:53 +0100
Subject: [PATCH 166/186] feat(solid|solidstart): Bump accepted @solidjs/router
 range (#18395)

Closes: #18368
---
 .../solidstart-dynamic-import/package.json                | 2 +-
 .../test-applications/solidstart-spa/package.json         | 2 +-
 .../solidstart-top-level-import/package.json              | 2 +-
 .../e2e-tests/test-applications/solidstart/package.json   | 2 +-
 packages/solid/package.json                               | 4 ++--
 packages/solidstart/package.json                          | 4 ++--
 yarn.lock                                                 | 8 ++++----
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dev-packages/e2e-tests/test-applications/solidstart-dynamic-import/package.json b/dev-packages/e2e-tests/test-applications/solidstart-dynamic-import/package.json
index fc1d87a63c71..3c896501e487 100644
--- a/dev-packages/e2e-tests/test-applications/solidstart-dynamic-import/package.json
+++ b/dev-packages/e2e-tests/test-applications/solidstart-dynamic-import/package.json
@@ -18,7 +18,7 @@
     "@playwright/test": "~1.53.2",
     "@sentry-internal/test-utils": "link:../../../test-utils",
     "@solidjs/meta": "^0.29.4",
-    "@solidjs/router": "^0.13.4",
+    "@solidjs/router": "^0.15.0",
     "@solidjs/start": "^1.0.2",
     "@solidjs/testing-library": "^0.8.7",
     "@testing-library/jest-dom": "^6.4.2",
diff --git a/dev-packages/e2e-tests/test-applications/solidstart-spa/package.json b/dev-packages/e2e-tests/test-applications/solidstart-spa/package.json
index e3fb382d2387..f1638f71866b 100644
--- a/dev-packages/e2e-tests/test-applications/solidstart-spa/package.json
+++ b/dev-packages/e2e-tests/test-applications/solidstart-spa/package.json
@@ -18,7 +18,7 @@
     "@playwright/test": "~1.53.2",
     "@sentry-internal/test-utils": "link:../../../test-utils",
     "@solidjs/meta": "^0.29.4",
-    "@solidjs/router": "^0.13.4",
+    "@solidjs/router": "^0.15.0",
     "@solidjs/start": "^1.0.2",
     "@solidjs/testing-library": "^0.8.7",
     "@testing-library/jest-dom": "^6.4.2",
diff --git a/dev-packages/e2e-tests/test-applications/solidstart-top-level-import/package.json b/dev-packages/e2e-tests/test-applications/solidstart-top-level-import/package.json
index 8612cd64bfaf..a5dc0d9dc5c9 100644
--- a/dev-packages/e2e-tests/test-applications/solidstart-top-level-import/package.json
+++ b/dev-packages/e2e-tests/test-applications/solidstart-top-level-import/package.json
@@ -18,7 +18,7 @@
     "@playwright/test": "~1.53.2",
     "@sentry-internal/test-utils": "link:../../../test-utils",
     "@solidjs/meta": "^0.29.4",
-    "@solidjs/router": "^0.13.4",
+    "@solidjs/router": "^0.15.0",
     "@solidjs/start": "^1.0.2",
     "@solidjs/testing-library": "^0.8.7",
     "@testing-library/jest-dom": "^6.4.2",
diff --git a/dev-packages/e2e-tests/test-applications/solidstart/package.json b/dev-packages/e2e-tests/test-applications/solidstart/package.json
index e1d0f8b97017..3b5a2d2b51c8 100644
--- a/dev-packages/e2e-tests/test-applications/solidstart/package.json
+++ b/dev-packages/e2e-tests/test-applications/solidstart/package.json
@@ -18,7 +18,7 @@
     "@playwright/test": "~1.53.2",
     "@sentry-internal/test-utils": "link:../../../test-utils",
     "@solidjs/meta": "^0.29.4",
-    "@solidjs/router": "^0.13.4",
+    "@solidjs/router": "^0.15.0",
     "@solidjs/start": "^1.0.2",
     "@solidjs/testing-library": "^0.8.7",
     "@testing-library/jest-dom": "^6.4.2",
diff --git a/packages/solid/package.json b/packages/solid/package.json
index 299c1cef8d49..72ba7e18d3f9 100644
--- a/packages/solid/package.json
+++ b/packages/solid/package.json
@@ -58,7 +58,7 @@
     "@sentry/core": "10.28.0"
   },
   "peerDependencies": {
-    "@solidjs/router": "^0.13.4",
+    "@solidjs/router": "^0.13.4 || ^0.14.0 || ^0.15.0",
     "@tanstack/solid-router": "^1.132.27",
     "solid-js": "^1.8.4"
   },
@@ -71,7 +71,7 @@
     }
   },
   "devDependencies": {
-    "@solidjs/router": "^0.13.4",
+    "@solidjs/router": "^0.15.0",
     "@solidjs/testing-library": "0.8.5",
     "@tanstack/solid-router": "^1.132.27",
     "@testing-library/dom": "^7.21.4",
diff --git a/packages/solidstart/package.json b/packages/solidstart/package.json
index 0be41812d1a7..6ccb821e772a 100644
--- a/packages/solidstart/package.json
+++ b/packages/solidstart/package.json
@@ -57,7 +57,7 @@
     "access": "public"
   },
   "peerDependencies": {
-    "@solidjs/router": "^0.13.4",
+    "@solidjs/router": "^0.13.4 || ^0.14.0 || ^0.15.0",
     "@solidjs/start": "^1.0.0"
   },
   "peerDependenciesMeta": {
@@ -72,7 +72,7 @@
     "@sentry/vite-plugin": "^4.1.0"
   },
   "devDependencies": {
-    "@solidjs/router": "^0.13.4",
+    "@solidjs/router": "^0.15.0",
     "@solidjs/start": "^1.0.0",
     "@solidjs/testing-library": "0.8.5",
     "@testing-library/jest-dom": "^6.4.5",
diff --git a/yarn.lock b/yarn.lock
index 6594edaf3f9a..210e9d186cfb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7866,10 +7866,10 @@
   resolved "https://registry.yarnpkg.com/@solidjs/meta/-/meta-0.29.4.tgz#28a444db5200d1c9e4e62d8762ea808d3e8beffd"
   integrity sha512-zdIWBGpR9zGx1p1bzIPqF5Gs+Ks/BH8R6fWhmUa/dcK1L2rUC8BAcZJzNRYBQv74kScf1TSOs0EY//Vd/I0V8g==
 
-"@solidjs/router@^0.13.4":
-  version "0.13.6"
-  resolved "https://registry.yarnpkg.com/@solidjs/router/-/router-0.13.6.tgz#210ca2761d4bf294f06ac0f9e25c16fafdabefac"
-  integrity sha512-CdpFsBYoiJ/FQ4wZIamj3KEFRkmrYu5sVXM6PouNkmSENta1YJamsm9wa/VjaPmkw2RsnDnO0UvZ705v6EgOXQ==
+"@solidjs/router@^0.15.0":
+  version "0.15.4"
+  resolved "https://registry.yarnpkg.com/@solidjs/router/-/router-0.15.4.tgz#e2b2d797541dcbdc36641e5f610f93ab4fa11c8a"
+  integrity sha512-WOpgg9a9T638cR+5FGbFi/IV4l2FpmBs1GpIMSPa0Ce9vyJN7Wts+X2PqMf9IYn0zUj2MlSJtm1gp7/HI/n5TQ==
 
 "@solidjs/start@^1.0.0":
   version "1.0.2"

From 65f500642f521bff0bfed9fc2d357b774bc052b3 Mon Sep 17 00:00:00 2001
From: isaacs <i@izs.me>
Date: Tue, 25 Nov 2025 22:31:32 -0800
Subject: [PATCH 167/186] fix(tracing): Add missing attributes in vercel-ai
 spans (#18333)

Also, sort the fields in the integration test, in order to more easily
se which fields were missing/misnamed in the fixture objects.

Fix JS-1216
Fix JS-1236
---
 .../tracing/vercelai/test-generate-object.ts  |   4 +-
 .../suites/tracing/vercelai/test.ts           | 423 ++++++++++--------
 .../suites/tracing/vercelai/v5/test.ts        |  74 ++-
 packages/core/src/tracing/vercel-ai/index.ts  |  29 +-
 packages/core/src/tracing/vercel-ai/utils.ts  |  54 ++-
 .../test/lib/utils/vercelai-utils.test.ts     |  55 +++
 6 files changed, 389 insertions(+), 250 deletions(-)
 create mode 100644 packages/core/test/lib/utils/vercelai-utils.test.ts

diff --git a/dev-packages/node-integration-tests/suites/tracing/vercelai/test-generate-object.ts b/dev-packages/node-integration-tests/suites/tracing/vercelai/test-generate-object.ts
index 1e87b63535ac..2e8e8711e9e9 100644
--- a/dev-packages/node-integration-tests/suites/tracing/vercelai/test-generate-object.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/vercelai/test-generate-object.ts
@@ -24,7 +24,7 @@ describe('Vercel AI integration - generateObject', () => {
           'gen_ai.usage.input_tokens': 15,
           'gen_ai.usage.output_tokens': 25,
           'gen_ai.usage.total_tokens': 40,
-          'operation.name': 'ai.generateObject',
+          'gen_ai.operation.name': 'ai.generateObject',
           'sentry.op': 'gen_ai.invoke_agent',
           'sentry.origin': 'auto.vercelai.otel',
         }),
@@ -38,7 +38,7 @@ describe('Vercel AI integration - generateObject', () => {
         data: expect.objectContaining({
           'sentry.origin': 'auto.vercelai.otel',
           'sentry.op': 'gen_ai.generate_object',
-          'operation.name': 'ai.generateObject.doGenerate',
+          'gen_ai.operation.name': 'ai.generateObject.doGenerate',
           'vercel.ai.operationId': 'ai.generateObject.doGenerate',
           'vercel.ai.model.provider': 'mock-provider',
           'vercel.ai.model.id': 'mock-model-id',
diff --git a/dev-packages/node-integration-tests/suites/tracing/vercelai/test.ts b/dev-packages/node-integration-tests/suites/tracing/vercelai/test.ts
index 04ff4a0ac52c..de228303ab0e 100644
--- a/dev-packages/node-integration-tests/suites/tracing/vercelai/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/vercelai/test.ts
@@ -13,7 +13,14 @@ describe('Vercel AI integration', () => {
       // First span - no telemetry config, should enable telemetry but not record inputs/outputs when sendDefaultPii: false
       expect.objectContaining({
         data: {
-          'vercel.ai.model.id': 'mock-model-id',
+          'gen_ai.request.model': 'mock-model-id',
+          'gen_ai.response.model': 'mock-model-id',
+          'gen_ai.usage.input_tokens': 10,
+          'gen_ai.usage.output_tokens': 20,
+          'gen_ai.usage.total_tokens': 30,
+          'gen_ai.operation.name': 'ai.generateText',
+          'sentry.op': 'gen_ai.invoke_agent',
+          'sentry.origin': 'auto.vercelai.otel',
           'vercel.ai.model.provider': 'mock-provider',
           'vercel.ai.operationId': 'ai.generateText',
           'vercel.ai.pipeline.name': 'generateText',
@@ -21,13 +28,6 @@ describe('Vercel AI integration', () => {
           'vercel.ai.settings.maxRetries': 2,
           'vercel.ai.settings.maxSteps': 1,
           'vercel.ai.streaming': false,
-          'gen_ai.response.model': 'mock-model-id',
-          'gen_ai.usage.input_tokens': 10,
-          'gen_ai.usage.output_tokens': 20,
-          'gen_ai.usage.total_tokens': 30,
-          'operation.name': 'ai.generateText',
-          'sentry.op': 'gen_ai.invoke_agent',
-          'sentry.origin': 'auto.vercelai.otel',
         },
         description: 'generateText',
         op: 'gen_ai.invoke_agent',
@@ -37,27 +37,26 @@ describe('Vercel AI integration', () => {
       // Second span - explicitly enabled telemetry but recordInputs/recordOutputs not set, should not record when sendDefaultPii: false
       expect.objectContaining({
         data: {
-          'sentry.origin': 'auto.vercelai.otel',
+          'gen_ai.request.model': 'mock-model-id',
+          'gen_ai.response.finish_reasons': ['stop'],
+          'gen_ai.response.id': expect.any(String),
+          'gen_ai.response.model': 'mock-model-id',
+          'gen_ai.system': 'mock-provider',
+          'gen_ai.usage.input_tokens': 10,
+          'gen_ai.usage.output_tokens': 20,
+          'gen_ai.usage.total_tokens': 30,
+          'gen_ai.operation.name': 'ai.generateText.doGenerate',
           'sentry.op': 'gen_ai.generate_text',
-          'operation.name': 'ai.generateText.doGenerate',
-          'vercel.ai.operationId': 'ai.generateText.doGenerate',
+          'sentry.origin': 'auto.vercelai.otel',
           'vercel.ai.model.provider': 'mock-provider',
-          'vercel.ai.model.id': 'mock-model-id',
-          'vercel.ai.settings.maxRetries': 2,
-          'gen_ai.system': 'mock-provider',
-          'gen_ai.request.model': 'mock-model-id',
+          'vercel.ai.operationId': 'ai.generateText.doGenerate',
           'vercel.ai.pipeline.name': 'generateText.doGenerate',
-          'vercel.ai.streaming': false,
           'vercel.ai.response.finishReason': 'stop',
-          'vercel.ai.response.model': 'mock-model-id',
           'vercel.ai.response.id': expect.any(String),
+          'vercel.ai.response.model': 'mock-model-id',
           'vercel.ai.response.timestamp': expect.any(String),
-          'gen_ai.response.finish_reasons': ['stop'],
-          'gen_ai.usage.input_tokens': 10,
-          'gen_ai.usage.output_tokens': 20,
-          'gen_ai.response.id': expect.any(String),
-          'gen_ai.response.model': 'mock-model-id',
-          'gen_ai.usage.total_tokens': 30,
+          'vercel.ai.settings.maxRetries': 2,
+          'vercel.ai.streaming': false,
         },
         description: 'generate_text mock-model-id',
         op: 'gen_ai.generate_text',
@@ -67,24 +66,25 @@ describe('Vercel AI integration', () => {
       // Third span - explicit telemetry enabled, should record inputs/outputs regardless of sendDefaultPii
       expect.objectContaining({
         data: {
-          'vercel.ai.model.id': 'mock-model-id',
+          'gen_ai.prompt': '{"prompt":"Where is the second span?"}',
+          'gen_ai.request.messages': '[{"role":"user","content":"Where is the second span?"}]',
+          'gen_ai.request.model': 'mock-model-id',
+          'gen_ai.response.model': 'mock-model-id',
+          'gen_ai.response.text': expect.any(String),
+          'gen_ai.usage.input_tokens': 10,
+          'gen_ai.usage.output_tokens': 20,
+          'gen_ai.usage.total_tokens': 30,
+          'gen_ai.operation.name': 'ai.generateText',
+          'sentry.op': 'gen_ai.invoke_agent',
+          'sentry.origin': 'auto.vercelai.otel',
           'vercel.ai.model.provider': 'mock-provider',
           'vercel.ai.operationId': 'ai.generateText',
           'vercel.ai.pipeline.name': 'generateText',
           'vercel.ai.prompt': '{"prompt":"Where is the second span?"}',
           'vercel.ai.response.finishReason': 'stop',
-          'gen_ai.response.text': expect.any(String),
           'vercel.ai.settings.maxRetries': 2,
           'vercel.ai.settings.maxSteps': 1,
           'vercel.ai.streaming': false,
-          'gen_ai.prompt': '{"prompt":"Where is the second span?"}',
-          'gen_ai.response.model': 'mock-model-id',
-          'gen_ai.usage.input_tokens': 10,
-          'gen_ai.usage.output_tokens': 20,
-          'gen_ai.usage.total_tokens': 30,
-          'operation.name': 'ai.generateText',
-          'sentry.op': 'gen_ai.invoke_agent',
-          'sentry.origin': 'auto.vercelai.otel',
         },
         description: 'generateText',
         op: 'gen_ai.invoke_agent',
@@ -94,30 +94,29 @@ describe('Vercel AI integration', () => {
       // Fourth span - doGenerate for explicit telemetry enabled call
       expect.objectContaining({
         data: {
-          'sentry.origin': 'auto.vercelai.otel',
+          'gen_ai.request.messages': expect.any(String),
+          'gen_ai.request.model': 'mock-model-id',
+          'gen_ai.response.finish_reasons': ['stop'],
+          'gen_ai.response.id': expect.any(String),
+          'gen_ai.response.model': 'mock-model-id',
+          'gen_ai.response.text': expect.any(String),
+          'gen_ai.system': 'mock-provider',
+          'gen_ai.usage.input_tokens': 10,
+          'gen_ai.usage.output_tokens': 20,
+          'gen_ai.usage.total_tokens': 30,
+          'gen_ai.operation.name': 'ai.generateText.doGenerate',
           'sentry.op': 'gen_ai.generate_text',
-          'operation.name': 'ai.generateText.doGenerate',
-          'vercel.ai.operationId': 'ai.generateText.doGenerate',
+          'sentry.origin': 'auto.vercelai.otel',
           'vercel.ai.model.provider': 'mock-provider',
-          'vercel.ai.model.id': 'mock-model-id',
-          'vercel.ai.settings.maxRetries': 2,
-          'gen_ai.system': 'mock-provider',
-          'gen_ai.request.model': 'mock-model-id',
+          'vercel.ai.operationId': 'ai.generateText.doGenerate',
           'vercel.ai.pipeline.name': 'generateText.doGenerate',
-          'vercel.ai.streaming': false,
+          'vercel.ai.prompt.format': expect.any(String),
           'vercel.ai.response.finishReason': 'stop',
-          'vercel.ai.response.model': 'mock-model-id',
           'vercel.ai.response.id': expect.any(String),
-          'gen_ai.response.text': expect.any(String),
+          'vercel.ai.response.model': 'mock-model-id',
           'vercel.ai.response.timestamp': expect.any(String),
-          'vercel.ai.prompt.format': expect.any(String),
-          'gen_ai.request.messages': expect.any(String),
-          'gen_ai.response.finish_reasons': ['stop'],
-          'gen_ai.usage.input_tokens': 10,
-          'gen_ai.usage.output_tokens': 20,
-          'gen_ai.response.id': expect.any(String),
-          'gen_ai.response.model': 'mock-model-id',
-          'gen_ai.usage.total_tokens': 30,
+          'vercel.ai.settings.maxRetries': 2,
+          'vercel.ai.streaming': false,
         },
         description: 'generate_text mock-model-id',
         op: 'gen_ai.generate_text',
@@ -127,7 +126,14 @@ describe('Vercel AI integration', () => {
       // Fifth span - tool call generateText span
       expect.objectContaining({
         data: {
-          'vercel.ai.model.id': 'mock-model-id',
+          'gen_ai.request.model': 'mock-model-id',
+          'gen_ai.response.model': 'mock-model-id',
+          'gen_ai.usage.input_tokens': 15,
+          'gen_ai.usage.output_tokens': 25,
+          'gen_ai.usage.total_tokens': 40,
+          'gen_ai.operation.name': 'ai.generateText',
+          'sentry.op': 'gen_ai.invoke_agent',
+          'sentry.origin': 'auto.vercelai.otel',
           'vercel.ai.model.provider': 'mock-provider',
           'vercel.ai.operationId': 'ai.generateText',
           'vercel.ai.pipeline.name': 'generateText',
@@ -135,13 +141,6 @@ describe('Vercel AI integration', () => {
           'vercel.ai.settings.maxRetries': 2,
           'vercel.ai.settings.maxSteps': 1,
           'vercel.ai.streaming': false,
-          'gen_ai.response.model': 'mock-model-id',
-          'gen_ai.usage.input_tokens': 15,
-          'gen_ai.usage.output_tokens': 25,
-          'gen_ai.usage.total_tokens': 40,
-          'operation.name': 'ai.generateText',
-          'sentry.op': 'gen_ai.invoke_agent',
-          'sentry.origin': 'auto.vercelai.otel',
         },
         description: 'generateText',
         op: 'gen_ai.invoke_agent',
@@ -151,16 +150,6 @@ describe('Vercel AI integration', () => {
       // Sixth span - tool call doGenerate span
       expect.objectContaining({
         data: {
-          'vercel.ai.model.id': 'mock-model-id',
-          'vercel.ai.model.provider': 'mock-provider',
-          'vercel.ai.operationId': 'ai.generateText.doGenerate',
-          'vercel.ai.pipeline.name': 'generateText.doGenerate',
-          'vercel.ai.response.finishReason': 'tool-calls',
-          'vercel.ai.response.id': expect.any(String),
-          'vercel.ai.response.model': 'mock-model-id',
-          'vercel.ai.response.timestamp': expect.any(String),
-          'vercel.ai.settings.maxRetries': 2,
-          'vercel.ai.streaming': false,
           'gen_ai.request.model': 'mock-model-id',
           'gen_ai.response.finish_reasons': ['tool-calls'],
           'gen_ai.response.id': expect.any(String),
@@ -169,9 +158,18 @@ describe('Vercel AI integration', () => {
           'gen_ai.usage.input_tokens': 15,
           'gen_ai.usage.output_tokens': 25,
           'gen_ai.usage.total_tokens': 40,
-          'operation.name': 'ai.generateText.doGenerate',
+          'gen_ai.operation.name': 'ai.generateText.doGenerate',
           'sentry.op': 'gen_ai.generate_text',
           'sentry.origin': 'auto.vercelai.otel',
+          'vercel.ai.model.provider': 'mock-provider',
+          'vercel.ai.operationId': 'ai.generateText.doGenerate',
+          'vercel.ai.pipeline.name': 'generateText.doGenerate',
+          'vercel.ai.response.finishReason': 'tool-calls',
+          'vercel.ai.response.id': expect.any(String),
+          'vercel.ai.response.model': 'mock-model-id',
+          'vercel.ai.response.timestamp': expect.any(String),
+          'vercel.ai.settings.maxRetries': 2,
+          'vercel.ai.streaming': false,
         },
         description: 'generate_text mock-model-id',
         op: 'gen_ai.generate_text',
@@ -181,13 +179,13 @@ describe('Vercel AI integration', () => {
       // Seventh span - tool call execution span
       expect.objectContaining({
         data: {
-          'vercel.ai.operationId': 'ai.toolCall',
           'gen_ai.tool.call.id': 'call-1',
           'gen_ai.tool.name': 'getWeather',
           'gen_ai.tool.type': 'function',
-          'operation.name': 'ai.toolCall',
+          'gen_ai.operation.name': 'ai.toolCall',
           'sentry.op': 'gen_ai.execute_tool',
           'sentry.origin': 'auto.vercelai.otel',
+          'vercel.ai.operationId': 'ai.toolCall',
         },
         description: 'execute_tool getWeather',
         op: 'gen_ai.execute_tool',
@@ -206,204 +204,239 @@ describe('Vercel AI integration', () => {
       // First span - no telemetry config, should enable telemetry AND record inputs/outputs when sendDefaultPii: true
       expect.objectContaining({
         data: {
-          'vercel.ai.model.id': 'mock-model-id',
+          'gen_ai.prompt': '{"prompt":"Where is the first span?"}',
+          'gen_ai.request.messages': '[{"role":"user","content":"Where is the first span?"}]',
+          'gen_ai.request.model': 'mock-model-id',
+          'gen_ai.response.model': 'mock-model-id',
+          'gen_ai.response.text': 'First span here!',
+          'gen_ai.usage.input_tokens': 10,
+          'gen_ai.usage.output_tokens': 20,
+          'gen_ai.usage.total_tokens': 30,
+          'gen_ai.operation.name': 'ai.generateText',
+          'sentry.op': 'gen_ai.invoke_agent',
+          'sentry.origin': 'auto.vercelai.otel',
           'vercel.ai.model.provider': 'mock-provider',
           'vercel.ai.operationId': 'ai.generateText',
           'vercel.ai.pipeline.name': 'generateText',
           'vercel.ai.prompt': '{"prompt":"Where is the first span?"}',
           'vercel.ai.response.finishReason': 'stop',
-          'gen_ai.response.text': 'First span here!',
           'vercel.ai.settings.maxRetries': 2,
           'vercel.ai.settings.maxSteps': 1,
           'vercel.ai.streaming': false,
-          'gen_ai.prompt': '{"prompt":"Where is the first span?"}',
-          'gen_ai.response.model': 'mock-model-id',
-          'gen_ai.usage.input_tokens': 10,
-          'gen_ai.usage.output_tokens': 20,
-          'gen_ai.usage.total_tokens': 30,
-          'operation.name': 'ai.generateText',
-          'sentry.op': 'gen_ai.invoke_agent',
-          'sentry.origin': 'auto.vercelai.otel',
         },
         description: 'generateText',
         op: 'gen_ai.invoke_agent',
         origin: 'auto.vercelai.otel',
         status: 'ok',
+        parent_span_id: expect.any(String),
+        span_id: expect.any(String),
+        start_timestamp: expect.any(Number),
+        timestamp: expect.any(Number),
+        trace_id: expect.any(String),
       }),
       // Second span - doGenerate for first call, should also include input/output fields when sendDefaultPii: true
       expect.objectContaining({
         data: {
-          'vercel.ai.model.id': 'mock-model-id',
-          'vercel.ai.model.provider': 'mock-provider',
-          'vercel.ai.operationId': 'ai.generateText.doGenerate',
-          'vercel.ai.pipeline.name': 'generateText.doGenerate',
-          'vercel.ai.prompt.format': 'prompt',
           'gen_ai.request.messages': '[{"role":"user","content":[{"type":"text","text":"Where is the first span?"}]}]',
-          'vercel.ai.response.finishReason': 'stop',
-          'vercel.ai.response.id': expect.any(String),
-          'vercel.ai.response.model': 'mock-model-id',
-          'gen_ai.response.text': 'First span here!',
-          'vercel.ai.response.timestamp': expect.any(String),
-          'vercel.ai.settings.maxRetries': 2,
-          'vercel.ai.streaming': false,
           'gen_ai.request.model': 'mock-model-id',
           'gen_ai.response.finish_reasons': ['stop'],
           'gen_ai.response.id': expect.any(String),
           'gen_ai.response.model': 'mock-model-id',
+          'gen_ai.response.text': 'First span here!',
           'gen_ai.system': 'mock-provider',
           'gen_ai.usage.input_tokens': 10,
           'gen_ai.usage.output_tokens': 20,
           'gen_ai.usage.total_tokens': 30,
-          'operation.name': 'ai.generateText.doGenerate',
+          'gen_ai.operation.name': 'ai.generateText.doGenerate',
           'sentry.op': 'gen_ai.generate_text',
           'sentry.origin': 'auto.vercelai.otel',
+          'vercel.ai.model.provider': 'mock-provider',
+          'vercel.ai.operationId': 'ai.generateText.doGenerate',
+          'vercel.ai.pipeline.name': 'generateText.doGenerate',
+          'vercel.ai.prompt.format': 'prompt',
+          'vercel.ai.response.finishReason': 'stop',
+          'vercel.ai.response.id': expect.any(String),
+          'vercel.ai.response.model': 'mock-model-id',
+          'vercel.ai.response.timestamp': expect.any(String),
+          'vercel.ai.settings.maxRetries': 2,
+          'vercel.ai.streaming': false,
         },
         description: 'generate_text mock-model-id',
         op: 'gen_ai.generate_text',
         origin: 'auto.vercelai.otel',
         status: 'ok',
+        parent_span_id: expect.any(String),
+        span_id: expect.any(String),
+        start_timestamp: expect.any(Number),
+        timestamp: expect.any(Number),
+        trace_id: expect.any(String),
       }),
       // Third span - explicitly enabled telemetry, should record inputs/outputs regardless of sendDefaultPii
       expect.objectContaining({
         data: {
-          'vercel.ai.model.id': 'mock-model-id',
+          'gen_ai.prompt': '{"prompt":"Where is the second span?"}',
+          'gen_ai.request.messages': '[{"role":"user","content":"Where is the second span?"}]',
+          'gen_ai.request.model': 'mock-model-id',
+          'gen_ai.response.model': 'mock-model-id',
+          'gen_ai.response.text': expect.any(String),
+          'gen_ai.usage.input_tokens': 10,
+          'gen_ai.usage.output_tokens': 20,
+          'gen_ai.usage.total_tokens': 30,
+          'gen_ai.operation.name': 'ai.generateText',
+          'sentry.op': 'gen_ai.invoke_agent',
+          'sentry.origin': 'auto.vercelai.otel',
           'vercel.ai.model.provider': 'mock-provider',
           'vercel.ai.operationId': 'ai.generateText',
           'vercel.ai.pipeline.name': 'generateText',
           'vercel.ai.prompt': '{"prompt":"Where is the second span?"}',
           'vercel.ai.response.finishReason': 'stop',
-          'gen_ai.response.text': expect.any(String),
           'vercel.ai.settings.maxRetries': 2,
           'vercel.ai.settings.maxSteps': 1,
           'vercel.ai.streaming': false,
-          'gen_ai.prompt': '{"prompt":"Where is the second span?"}',
-          'gen_ai.response.model': 'mock-model-id',
-          'gen_ai.usage.input_tokens': 10,
-          'gen_ai.usage.output_tokens': 20,
-          'gen_ai.usage.total_tokens': 30,
-          'operation.name': 'ai.generateText',
-          'sentry.op': 'gen_ai.invoke_agent',
-          'sentry.origin': 'auto.vercelai.otel',
         },
         description: 'generateText',
         op: 'gen_ai.invoke_agent',
         origin: 'auto.vercelai.otel',
         status: 'ok',
+        parent_span_id: expect.any(String),
+        span_id: expect.any(String),
+        start_timestamp: expect.any(Number),
+        timestamp: expect.any(Number),
+        trace_id: expect.any(String),
       }),
       // Fourth span - doGenerate for explicitly enabled telemetry call
       expect.objectContaining({
         data: {
-          'sentry.origin': 'auto.vercelai.otel',
+          'gen_ai.request.messages': expect.any(String),
+          'gen_ai.request.model': 'mock-model-id',
+          'gen_ai.response.finish_reasons': ['stop'],
+          'gen_ai.response.id': expect.any(String),
+          'gen_ai.response.model': 'mock-model-id',
+          'gen_ai.response.text': expect.any(String),
+          'gen_ai.system': 'mock-provider',
+          'gen_ai.usage.input_tokens': 10,
+          'gen_ai.usage.output_tokens': 20,
+          'gen_ai.usage.total_tokens': 30,
+          'gen_ai.operation.name': 'ai.generateText.doGenerate',
           'sentry.op': 'gen_ai.generate_text',
-          'operation.name': 'ai.generateText.doGenerate',
-          'vercel.ai.operationId': 'ai.generateText.doGenerate',
+          'sentry.origin': 'auto.vercelai.otel',
           'vercel.ai.model.provider': 'mock-provider',
-          'vercel.ai.model.id': 'mock-model-id',
-          'vercel.ai.settings.maxRetries': 2,
-          'gen_ai.system': 'mock-provider',
-          'gen_ai.request.model': 'mock-model-id',
+          'vercel.ai.operationId': 'ai.generateText.doGenerate',
           'vercel.ai.pipeline.name': 'generateText.doGenerate',
-          'vercel.ai.streaming': false,
+          'vercel.ai.prompt.format': expect.any(String),
           'vercel.ai.response.finishReason': 'stop',
-          'vercel.ai.response.model': 'mock-model-id',
           'vercel.ai.response.id': expect.any(String),
-          'gen_ai.response.text': expect.any(String),
+          'vercel.ai.response.model': 'mock-model-id',
           'vercel.ai.response.timestamp': expect.any(String),
-          'vercel.ai.prompt.format': expect.any(String),
-          'gen_ai.request.messages': expect.any(String),
-          'gen_ai.response.finish_reasons': ['stop'],
-          'gen_ai.usage.input_tokens': 10,
-          'gen_ai.usage.output_tokens': 20,
-          'gen_ai.response.id': expect.any(String),
-          'gen_ai.response.model': 'mock-model-id',
-          'gen_ai.usage.total_tokens': 30,
+          'vercel.ai.settings.maxRetries': 2,
+          'vercel.ai.streaming': false,
         },
         description: 'generate_text mock-model-id',
         op: 'gen_ai.generate_text',
         origin: 'auto.vercelai.otel',
         status: 'ok',
+        parent_span_id: expect.any(String),
+        span_id: expect.any(String),
+        start_timestamp: expect.any(Number),
+        timestamp: expect.any(Number),
+        trace_id: expect.any(String),
       }),
       // Fifth span - tool call generateText span (should include prompts when sendDefaultPii: true)
       expect.objectContaining({
         data: {
-          'vercel.ai.model.id': 'mock-model-id',
+          'gen_ai.prompt': '{"prompt":"What is the weather in San Francisco?"}',
+          'gen_ai.request.messages': '[{"role":"user","content":"What is the weather in San Francisco?"}]',
+          'gen_ai.request.model': 'mock-model-id',
+          'gen_ai.response.model': 'mock-model-id',
+          'gen_ai.response.text': 'Tool call completed!',
+          'gen_ai.response.tool_calls': expect.any(String),
+          'gen_ai.usage.input_tokens': 15,
+          'gen_ai.usage.output_tokens': 25,
+          'gen_ai.usage.total_tokens': 40,
+          'gen_ai.operation.name': 'ai.generateText',
+          'sentry.op': 'gen_ai.invoke_agent',
+          'sentry.origin': 'auto.vercelai.otel',
           'vercel.ai.model.provider': 'mock-provider',
           'vercel.ai.operationId': 'ai.generateText',
           'vercel.ai.pipeline.name': 'generateText',
           'vercel.ai.prompt': '{"prompt":"What is the weather in San Francisco?"}',
           'vercel.ai.response.finishReason': 'tool-calls',
-          'gen_ai.response.text': 'Tool call completed!',
-          'gen_ai.response.tool_calls': expect.any(String),
           'vercel.ai.settings.maxRetries': 2,
           'vercel.ai.settings.maxSteps': 1,
           'vercel.ai.streaming': false,
-          'gen_ai.prompt': '{"prompt":"What is the weather in San Francisco?"}',
-          'gen_ai.response.model': 'mock-model-id',
-          'gen_ai.usage.input_tokens': 15,
-          'gen_ai.usage.output_tokens': 25,
-          'gen_ai.usage.total_tokens': 40,
-          'operation.name': 'ai.generateText',
-          'sentry.op': 'gen_ai.invoke_agent',
-          'sentry.origin': 'auto.vercelai.otel',
         },
         description: 'generateText',
         op: 'gen_ai.invoke_agent',
         origin: 'auto.vercelai.otel',
         status: 'ok',
+        parent_span_id: expect.any(String),
+        span_id: expect.any(String),
+        start_timestamp: expect.any(Number),
+        timestamp: expect.any(Number),
+        trace_id: expect.any(String),
       }),
       // Sixth span - tool call doGenerate span (should include prompts when sendDefaultPii: true)
       expect.objectContaining({
         data: {
-          'vercel.ai.model.id': 'mock-model-id',
-          'vercel.ai.model.provider': 'mock-provider',
-          'vercel.ai.operationId': 'ai.generateText.doGenerate',
-          'vercel.ai.pipeline.name': 'generateText.doGenerate',
-          'vercel.ai.prompt.format': expect.any(String),
-          'gen_ai.request.messages': expect.any(String),
-          'vercel.ai.prompt.toolChoice': expect.any(String),
           'gen_ai.request.available_tools': EXPECTED_AVAILABLE_TOOLS_JSON,
-          'vercel.ai.response.finishReason': 'tool-calls',
-          'vercel.ai.response.id': expect.any(String),
-          'vercel.ai.response.model': 'mock-model-id',
-          'gen_ai.response.text': 'Tool call completed!',
-          'vercel.ai.response.timestamp': expect.any(String),
-          'gen_ai.response.tool_calls': expect.any(String),
-          'vercel.ai.settings.maxRetries': 2,
-          'vercel.ai.streaming': false,
+          'gen_ai.request.messages': expect.any(String),
           'gen_ai.request.model': 'mock-model-id',
           'gen_ai.response.finish_reasons': ['tool-calls'],
           'gen_ai.response.id': expect.any(String),
           'gen_ai.response.model': 'mock-model-id',
+          'gen_ai.response.text': 'Tool call completed!',
+          'gen_ai.response.tool_calls': expect.any(String),
           'gen_ai.system': 'mock-provider',
           'gen_ai.usage.input_tokens': 15,
           'gen_ai.usage.output_tokens': 25,
           'gen_ai.usage.total_tokens': 40,
-          'operation.name': 'ai.generateText.doGenerate',
+          'gen_ai.operation.name': 'ai.generateText.doGenerate',
           'sentry.op': 'gen_ai.generate_text',
           'sentry.origin': 'auto.vercelai.otel',
+          'vercel.ai.model.provider': 'mock-provider',
+          'vercel.ai.operationId': 'ai.generateText.doGenerate',
+          'vercel.ai.pipeline.name': 'generateText.doGenerate',
+          'vercel.ai.prompt.format': expect.any(String),
+          'vercel.ai.prompt.toolChoice': expect.any(String),
+          'vercel.ai.response.finishReason': 'tool-calls',
+          'vercel.ai.response.id': expect.any(String),
+          'vercel.ai.response.model': 'mock-model-id',
+          'vercel.ai.response.timestamp': expect.any(String),
+          'vercel.ai.settings.maxRetries': 2,
+          'vercel.ai.streaming': false,
         },
         description: 'generate_text mock-model-id',
         op: 'gen_ai.generate_text',
         origin: 'auto.vercelai.otel',
         status: 'ok',
+        parent_span_id: expect.any(String),
+        span_id: expect.any(String),
+        start_timestamp: expect.any(Number),
+        timestamp: expect.any(Number),
+        trace_id: expect.any(String),
       }),
       // Seventh span - tool call execution span
       expect.objectContaining({
         data: {
-          'vercel.ai.operationId': 'ai.toolCall',
           'gen_ai.tool.call.id': 'call-1',
-          'gen_ai.tool.name': 'getWeather',
           'gen_ai.tool.input': expect.any(String),
+          'gen_ai.tool.name': 'getWeather',
           'gen_ai.tool.output': expect.any(String),
           'gen_ai.tool.type': 'function',
-          'operation.name': 'ai.toolCall',
+          'gen_ai.operation.name': 'ai.toolCall',
           'sentry.op': 'gen_ai.execute_tool',
           'sentry.origin': 'auto.vercelai.otel',
+          'vercel.ai.operationId': 'ai.toolCall',
         },
         description: 'execute_tool getWeather',
         op: 'gen_ai.execute_tool',
         origin: 'auto.vercelai.otel',
         status: 'ok',
+        parent_span_id: expect.any(String),
+        span_id: expect.any(String),
+        start_timestamp: expect.any(Number),
+        timestamp: expect.any(Number),
+        trace_id: expect.any(String),
       }),
     ]),
   };
@@ -427,20 +460,20 @@ describe('Vercel AI integration', () => {
         spans: expect.arrayContaining([
           expect.objectContaining({
             data: {
-              'vercel.ai.model.id': 'mock-model-id',
-              'vercel.ai.model.provider': 'mock-provider',
-              'vercel.ai.operationId': 'ai.generateText',
-              'vercel.ai.pipeline.name': 'generateText',
-              'vercel.ai.settings.maxRetries': 2,
-              'vercel.ai.settings.maxSteps': 1,
-              'vercel.ai.streaming': false,
+              'gen_ai.request.model': 'mock-model-id',
               'gen_ai.response.model': 'mock-model-id',
               'gen_ai.usage.input_tokens': 15,
               'gen_ai.usage.output_tokens': 25,
               'gen_ai.usage.total_tokens': 40,
-              'operation.name': 'ai.generateText',
+              'gen_ai.operation.name': 'ai.generateText',
               'sentry.op': 'gen_ai.invoke_agent',
               'sentry.origin': 'auto.vercelai.otel',
+              'vercel.ai.model.provider': 'mock-provider',
+              'vercel.ai.operationId': 'ai.generateText',
+              'vercel.ai.pipeline.name': 'generateText',
+              'vercel.ai.settings.maxRetries': 2,
+              'vercel.ai.settings.maxSteps': 1,
+              'vercel.ai.streaming': false,
             },
             description: 'generateText',
             op: 'gen_ai.invoke_agent',
@@ -449,16 +482,6 @@ describe('Vercel AI integration', () => {
           }),
           expect.objectContaining({
             data: {
-              'vercel.ai.model.id': 'mock-model-id',
-              'vercel.ai.model.provider': 'mock-provider',
-              'vercel.ai.operationId': 'ai.generateText.doGenerate',
-              'vercel.ai.pipeline.name': 'generateText.doGenerate',
-              'vercel.ai.response.finishReason': 'tool-calls',
-              'vercel.ai.response.id': expect.any(String),
-              'vercel.ai.response.model': 'mock-model-id',
-              'vercel.ai.response.timestamp': expect.any(String),
-              'vercel.ai.settings.maxRetries': 2,
-              'vercel.ai.streaming': false,
               'gen_ai.request.model': 'mock-model-id',
               'gen_ai.response.finish_reasons': ['tool-calls'],
               'gen_ai.response.id': expect.any(String),
@@ -467,9 +490,18 @@ describe('Vercel AI integration', () => {
               'gen_ai.usage.input_tokens': 15,
               'gen_ai.usage.output_tokens': 25,
               'gen_ai.usage.total_tokens': 40,
-              'operation.name': 'ai.generateText.doGenerate',
+              'gen_ai.operation.name': 'ai.generateText.doGenerate',
               'sentry.op': 'gen_ai.generate_text',
               'sentry.origin': 'auto.vercelai.otel',
+              'vercel.ai.model.provider': 'mock-provider',
+              'vercel.ai.operationId': 'ai.generateText.doGenerate',
+              'vercel.ai.pipeline.name': 'generateText.doGenerate',
+              'vercel.ai.response.finishReason': 'tool-calls',
+              'vercel.ai.response.id': expect.any(String),
+              'vercel.ai.response.model': 'mock-model-id',
+              'vercel.ai.response.timestamp': expect.any(String),
+              'vercel.ai.settings.maxRetries': 2,
+              'vercel.ai.streaming': false,
             },
             description: 'generate_text mock-model-id',
             op: 'gen_ai.generate_text',
@@ -478,13 +510,13 @@ describe('Vercel AI integration', () => {
           }),
           expect.objectContaining({
             data: {
-              'vercel.ai.operationId': 'ai.toolCall',
               'gen_ai.tool.call.id': 'call-1',
               'gen_ai.tool.name': 'getWeather',
               'gen_ai.tool.type': 'function',
-              'operation.name': 'ai.toolCall',
+              'gen_ai.operation.name': 'ai.toolCall',
               'sentry.op': 'gen_ai.execute_tool',
               'sentry.origin': 'auto.vercelai.otel',
+              'vercel.ai.operationId': 'ai.toolCall',
             },
             description: 'execute_tool getWeather',
             op: 'gen_ai.execute_tool',
@@ -548,20 +580,20 @@ describe('Vercel AI integration', () => {
         spans: expect.arrayContaining([
           expect.objectContaining({
             data: {
-              'vercel.ai.model.id': 'mock-model-id',
-              'vercel.ai.model.provider': 'mock-provider',
-              'vercel.ai.operationId': 'ai.generateText',
-              'vercel.ai.pipeline.name': 'generateText',
-              'vercel.ai.settings.maxRetries': 2,
-              'vercel.ai.settings.maxSteps': 1,
-              'vercel.ai.streaming': false,
+              'gen_ai.request.model': 'mock-model-id',
               'gen_ai.response.model': 'mock-model-id',
               'gen_ai.usage.input_tokens': 15,
               'gen_ai.usage.output_tokens': 25,
               'gen_ai.usage.total_tokens': 40,
-              'operation.name': 'ai.generateText',
+              'gen_ai.operation.name': 'ai.generateText',
               'sentry.op': 'gen_ai.invoke_agent',
               'sentry.origin': 'auto.vercelai.otel',
+              'vercel.ai.model.provider': 'mock-provider',
+              'vercel.ai.operationId': 'ai.generateText',
+              'vercel.ai.pipeline.name': 'generateText',
+              'vercel.ai.settings.maxRetries': 2,
+              'vercel.ai.settings.maxSteps': 1,
+              'vercel.ai.streaming': false,
             },
             description: 'generateText',
             op: 'gen_ai.invoke_agent',
@@ -570,16 +602,6 @@ describe('Vercel AI integration', () => {
           }),
           expect.objectContaining({
             data: {
-              'vercel.ai.model.id': 'mock-model-id',
-              'vercel.ai.model.provider': 'mock-provider',
-              'vercel.ai.operationId': 'ai.generateText.doGenerate',
-              'vercel.ai.pipeline.name': 'generateText.doGenerate',
-              'vercel.ai.response.finishReason': 'tool-calls',
-              'vercel.ai.response.id': expect.any(String),
-              'vercel.ai.response.model': 'mock-model-id',
-              'vercel.ai.response.timestamp': expect.any(String),
-              'vercel.ai.settings.maxRetries': 2,
-              'vercel.ai.streaming': false,
               'gen_ai.request.model': 'mock-model-id',
               'gen_ai.response.finish_reasons': ['tool-calls'],
               'gen_ai.response.id': expect.any(String),
@@ -588,9 +610,18 @@ describe('Vercel AI integration', () => {
               'gen_ai.usage.input_tokens': 15,
               'gen_ai.usage.output_tokens': 25,
               'gen_ai.usage.total_tokens': 40,
-              'operation.name': 'ai.generateText.doGenerate',
+              'gen_ai.operation.name': 'ai.generateText.doGenerate',
               'sentry.op': 'gen_ai.generate_text',
               'sentry.origin': 'auto.vercelai.otel',
+              'vercel.ai.model.provider': 'mock-provider',
+              'vercel.ai.operationId': 'ai.generateText.doGenerate',
+              'vercel.ai.pipeline.name': 'generateText.doGenerate',
+              'vercel.ai.response.finishReason': 'tool-calls',
+              'vercel.ai.response.id': expect.any(String),
+              'vercel.ai.response.model': 'mock-model-id',
+              'vercel.ai.response.timestamp': expect.any(String),
+              'vercel.ai.settings.maxRetries': 2,
+              'vercel.ai.streaming': false,
             },
             description: 'generate_text mock-model-id',
             op: 'gen_ai.generate_text',
@@ -599,13 +630,13 @@ describe('Vercel AI integration', () => {
           }),
           expect.objectContaining({
             data: {
-              'vercel.ai.operationId': 'ai.toolCall',
               'gen_ai.tool.call.id': 'call-1',
               'gen_ai.tool.name': 'getWeather',
               'gen_ai.tool.type': 'function',
-              'operation.name': 'ai.toolCall',
+              'gen_ai.operation.name': 'ai.toolCall',
               'sentry.op': 'gen_ai.execute_tool',
               'sentry.origin': 'auto.vercelai.otel',
+              'vercel.ai.operationId': 'ai.toolCall',
             },
             description: 'execute_tool getWeather',
             op: 'gen_ai.execute_tool',
@@ -642,7 +673,7 @@ describe('Vercel AI integration', () => {
       let transactionEvent: Event | undefined;
       let errorEvent: Event | undefined;
 
-      const runner = await createRunner()
+      const runner = createRunner()
         .expect({
           transaction: transaction => {
             transactionEvent = transaction;
diff --git a/dev-packages/node-integration-tests/suites/tracing/vercelai/v5/test.ts b/dev-packages/node-integration-tests/suites/tracing/vercelai/v5/test.ts
index 56860af76925..01aa715bdc77 100644
--- a/dev-packages/node-integration-tests/suites/tracing/vercelai/v5/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/vercelai/v5/test.ts
@@ -13,7 +13,7 @@ describe('Vercel AI integration (V5)', () => {
       // First span - no telemetry config, should enable telemetry but not record inputs/outputs when sendDefaultPii: false
       expect.objectContaining({
         data: {
-          'vercel.ai.model.id': 'mock-model-id',
+          'gen_ai.request.model': 'mock-model-id',
           'vercel.ai.model.provider': 'mock-provider',
           'vercel.ai.operationId': 'ai.generateText',
           'vercel.ai.pipeline.name': 'generateText',
@@ -24,7 +24,7 @@ describe('Vercel AI integration (V5)', () => {
           'gen_ai.usage.input_tokens': 10,
           'gen_ai.usage.output_tokens': 20,
           'gen_ai.usage.total_tokens': 30,
-          'operation.name': 'ai.generateText',
+          'gen_ai.operation.name': 'ai.generateText',
           'sentry.op': 'gen_ai.invoke_agent',
           'sentry.origin': 'auto.vercelai.otel',
         },
@@ -38,13 +38,12 @@ describe('Vercel AI integration (V5)', () => {
         data: {
           'sentry.origin': 'auto.vercelai.otel',
           'sentry.op': 'gen_ai.generate_text',
-          'operation.name': 'ai.generateText.doGenerate',
+          'gen_ai.operation.name': 'ai.generateText.doGenerate',
           'vercel.ai.operationId': 'ai.generateText.doGenerate',
           'vercel.ai.model.provider': 'mock-provider',
-          'vercel.ai.model.id': 'mock-model-id',
+          'gen_ai.request.model': 'mock-model-id',
           'vercel.ai.settings.maxRetries': 2,
           'gen_ai.system': 'mock-provider',
-          'gen_ai.request.model': 'mock-model-id',
           'vercel.ai.pipeline.name': 'generateText.doGenerate',
           'vercel.ai.streaming': false,
           'vercel.ai.response.finishReason': 'stop',
@@ -66,7 +65,7 @@ describe('Vercel AI integration (V5)', () => {
       // Third span - explicit telemetry enabled, should record inputs/outputs regardless of sendDefaultPii
       expect.objectContaining({
         data: {
-          'vercel.ai.model.id': 'mock-model-id',
+          'gen_ai.request.model': 'mock-model-id',
           'vercel.ai.model.provider': 'mock-provider',
           'vercel.ai.operationId': 'ai.generateText',
           'vercel.ai.pipeline.name': 'generateText',
@@ -76,11 +75,12 @@ describe('Vercel AI integration (V5)', () => {
           'vercel.ai.settings.maxRetries': 2,
           'vercel.ai.streaming': false,
           'gen_ai.prompt': '{"prompt":"Where is the second span?"}',
+          'gen_ai.request.messages': '[{"role":"user","content":"Where is the second span?"}]',
           'gen_ai.response.model': 'mock-model-id',
           'gen_ai.usage.input_tokens': 10,
           'gen_ai.usage.output_tokens': 20,
           'gen_ai.usage.total_tokens': 30,
-          'operation.name': 'ai.generateText',
+          'gen_ai.operation.name': 'ai.generateText',
           'sentry.op': 'gen_ai.invoke_agent',
           'sentry.origin': 'auto.vercelai.otel',
         },
@@ -94,13 +94,12 @@ describe('Vercel AI integration (V5)', () => {
         data: {
           'sentry.origin': 'auto.vercelai.otel',
           'sentry.op': 'gen_ai.generate_text',
-          'operation.name': 'ai.generateText.doGenerate',
+          'gen_ai.operation.name': 'ai.generateText.doGenerate',
           'vercel.ai.operationId': 'ai.generateText.doGenerate',
           'vercel.ai.model.provider': 'mock-provider',
-          'vercel.ai.model.id': 'mock-model-id',
+          'gen_ai.request.model': 'mock-model-id',
           'vercel.ai.settings.maxRetries': 2,
           'gen_ai.system': 'mock-provider',
-          'gen_ai.request.model': 'mock-model-id',
           'vercel.ai.pipeline.name': 'generateText.doGenerate',
           'vercel.ai.streaming': false,
           'vercel.ai.response.finishReason': 'stop',
@@ -124,7 +123,7 @@ describe('Vercel AI integration (V5)', () => {
       // Fifth span - tool call generateText span
       expect.objectContaining({
         data: {
-          'vercel.ai.model.id': 'mock-model-id',
+          'gen_ai.request.model': 'mock-model-id',
           'vercel.ai.model.provider': 'mock-provider',
           'vercel.ai.operationId': 'ai.generateText',
           'vercel.ai.pipeline.name': 'generateText',
@@ -135,7 +134,7 @@ describe('Vercel AI integration (V5)', () => {
           'gen_ai.usage.input_tokens': 15,
           'gen_ai.usage.output_tokens': 25,
           'gen_ai.usage.total_tokens': 40,
-          'operation.name': 'ai.generateText',
+          'gen_ai.operation.name': 'ai.generateText',
           'sentry.op': 'gen_ai.invoke_agent',
           'sentry.origin': 'auto.vercelai.otel',
         },
@@ -147,7 +146,7 @@ describe('Vercel AI integration (V5)', () => {
       // Sixth span - tool call doGenerate span
       expect.objectContaining({
         data: {
-          'vercel.ai.model.id': 'mock-model-id',
+          'gen_ai.request.model': 'mock-model-id',
           'vercel.ai.model.provider': 'mock-provider',
           'vercel.ai.operationId': 'ai.generateText.doGenerate',
           'vercel.ai.pipeline.name': 'generateText.doGenerate',
@@ -157,7 +156,6 @@ describe('Vercel AI integration (V5)', () => {
           'vercel.ai.response.timestamp': expect.any(String),
           'vercel.ai.settings.maxRetries': 2,
           'vercel.ai.streaming': false,
-          'gen_ai.request.model': 'mock-model-id',
           'gen_ai.response.finish_reasons': ['tool-calls'],
           'gen_ai.response.id': expect.any(String),
           'gen_ai.response.model': 'mock-model-id',
@@ -165,7 +163,7 @@ describe('Vercel AI integration (V5)', () => {
           'gen_ai.usage.input_tokens': 15,
           'gen_ai.usage.output_tokens': 25,
           'gen_ai.usage.total_tokens': 40,
-          'operation.name': 'ai.generateText.doGenerate',
+          'gen_ai.operation.name': 'ai.generateText.doGenerate',
           'sentry.op': 'gen_ai.generate_text',
           'sentry.origin': 'auto.vercelai.otel',
         },
@@ -181,7 +179,7 @@ describe('Vercel AI integration (V5)', () => {
           'gen_ai.tool.call.id': 'call-1',
           'gen_ai.tool.name': 'getWeather',
           'gen_ai.tool.type': 'function',
-          'operation.name': 'ai.toolCall',
+          'gen_ai.operation.name': 'ai.toolCall',
           'sentry.op': 'gen_ai.execute_tool',
           'sentry.origin': 'auto.vercelai.otel',
         },
@@ -202,11 +200,12 @@ describe('Vercel AI integration (V5)', () => {
       // First span - no telemetry config, should enable telemetry AND record inputs/outputs when sendDefaultPii: true
       expect.objectContaining({
         data: {
-          'vercel.ai.model.id': 'mock-model-id',
+          'gen_ai.request.model': 'mock-model-id',
           'vercel.ai.model.provider': 'mock-provider',
           'vercel.ai.operationId': 'ai.generateText',
           'vercel.ai.pipeline.name': 'generateText',
           'vercel.ai.prompt': '{"prompt":"Where is the first span?"}',
+          'gen_ai.request.messages': '[{"role":"user","content":"Where is the first span?"}]',
           'vercel.ai.response.finishReason': 'stop',
           'gen_ai.response.text': 'First span here!',
           'vercel.ai.settings.maxRetries': 2,
@@ -216,7 +215,7 @@ describe('Vercel AI integration (V5)', () => {
           'gen_ai.usage.input_tokens': 10,
           'gen_ai.usage.output_tokens': 20,
           'gen_ai.usage.total_tokens': 30,
-          'operation.name': 'ai.generateText',
+          'gen_ai.operation.name': 'ai.generateText',
           'sentry.op': 'gen_ai.invoke_agent',
           'sentry.origin': 'auto.vercelai.otel',
         },
@@ -228,7 +227,7 @@ describe('Vercel AI integration (V5)', () => {
       // Second span - doGenerate for first call, should also include input/output fields when sendDefaultPii: true
       expect.objectContaining({
         data: {
-          'vercel.ai.model.id': 'mock-model-id',
+          'gen_ai.request.model': 'mock-model-id',
           'vercel.ai.model.provider': 'mock-provider',
           'vercel.ai.operationId': 'ai.generateText.doGenerate',
           'vercel.ai.pipeline.name': 'generateText.doGenerate',
@@ -240,7 +239,6 @@ describe('Vercel AI integration (V5)', () => {
           'vercel.ai.response.timestamp': expect.any(String),
           'vercel.ai.settings.maxRetries': 2,
           'vercel.ai.streaming': false,
-          'gen_ai.request.model': 'mock-model-id',
           'gen_ai.response.finish_reasons': ['stop'],
           'gen_ai.response.id': expect.any(String),
           'gen_ai.response.model': 'mock-model-id',
@@ -248,7 +246,7 @@ describe('Vercel AI integration (V5)', () => {
           'gen_ai.usage.input_tokens': 10,
           'gen_ai.usage.output_tokens': 20,
           'gen_ai.usage.total_tokens': 30,
-          'operation.name': 'ai.generateText.doGenerate',
+          'gen_ai.operation.name': 'ai.generateText.doGenerate',
           'sentry.op': 'gen_ai.generate_text',
           'sentry.origin': 'auto.vercelai.otel',
         },
@@ -260,11 +258,12 @@ describe('Vercel AI integration (V5)', () => {
       // Third span - explicitly enabled telemetry, should record inputs/outputs regardless of sendDefaultPii
       expect.objectContaining({
         data: {
-          'vercel.ai.model.id': 'mock-model-id',
+          'gen_ai.request.model': 'mock-model-id',
           'vercel.ai.model.provider': 'mock-provider',
           'vercel.ai.operationId': 'ai.generateText',
           'vercel.ai.pipeline.name': 'generateText',
           'vercel.ai.prompt': '{"prompt":"Where is the second span?"}',
+          'gen_ai.request.messages': '[{"role":"user","content":"Where is the second span?"}]',
           'vercel.ai.response.finishReason': 'stop',
           'gen_ai.response.text': expect.any(String),
           'vercel.ai.settings.maxRetries': 2,
@@ -274,7 +273,7 @@ describe('Vercel AI integration (V5)', () => {
           'gen_ai.usage.input_tokens': 10,
           'gen_ai.usage.output_tokens': 20,
           'gen_ai.usage.total_tokens': 30,
-          'operation.name': 'ai.generateText',
+          'gen_ai.operation.name': 'ai.generateText',
           'sentry.op': 'gen_ai.invoke_agent',
           'sentry.origin': 'auto.vercelai.otel',
         },
@@ -288,13 +287,12 @@ describe('Vercel AI integration (V5)', () => {
         data: {
           'sentry.origin': 'auto.vercelai.otel',
           'sentry.op': 'gen_ai.generate_text',
-          'operation.name': 'ai.generateText.doGenerate',
+          'gen_ai.operation.name': 'ai.generateText.doGenerate',
           'vercel.ai.operationId': 'ai.generateText.doGenerate',
           'vercel.ai.model.provider': 'mock-provider',
-          'vercel.ai.model.id': 'mock-model-id',
+          'gen_ai.request.model': 'mock-model-id',
           'vercel.ai.settings.maxRetries': 2,
           'gen_ai.system': 'mock-provider',
-          'gen_ai.request.model': 'mock-model-id',
           'vercel.ai.pipeline.name': 'generateText.doGenerate',
           'vercel.ai.streaming': false,
           'vercel.ai.response.finishReason': 'stop',
@@ -318,13 +316,13 @@ describe('Vercel AI integration (V5)', () => {
       // Fifth span - tool call generateText span (should include prompts when sendDefaultPii: true)
       expect.objectContaining({
         data: {
-          'vercel.ai.model.id': 'mock-model-id',
+          'gen_ai.request.model': 'mock-model-id',
           'vercel.ai.model.provider': 'mock-provider',
           'vercel.ai.operationId': 'ai.generateText',
           'vercel.ai.pipeline.name': 'generateText',
           'vercel.ai.prompt': '{"prompt":"What is the weather in San Francisco?"}',
+          'gen_ai.request.messages': '[{"role":"user","content":"What is the weather in San Francisco?"}]',
           'vercel.ai.response.finishReason': 'tool-calls',
-          // 'gen_ai.response.text': 'Tool call completed!',
           'gen_ai.response.tool_calls': expect.any(String),
           'vercel.ai.settings.maxRetries': 2,
           'vercel.ai.streaming': false,
@@ -333,7 +331,7 @@ describe('Vercel AI integration (V5)', () => {
           'gen_ai.usage.input_tokens': 15,
           'gen_ai.usage.output_tokens': 25,
           'gen_ai.usage.total_tokens': 40,
-          'operation.name': 'ai.generateText',
+          'gen_ai.operation.name': 'ai.generateText',
           'sentry.op': 'gen_ai.invoke_agent',
           'sentry.origin': 'auto.vercelai.otel',
         },
@@ -345,7 +343,7 @@ describe('Vercel AI integration (V5)', () => {
       // Sixth span - tool call doGenerate span (should include prompts when sendDefaultPii: true)
       expect.objectContaining({
         data: {
-          'vercel.ai.model.id': 'mock-model-id',
+          'gen_ai.request.model': 'mock-model-id',
           'vercel.ai.model.provider': 'mock-provider',
           'vercel.ai.operationId': 'ai.generateText.doGenerate',
           'vercel.ai.pipeline.name': 'generateText.doGenerate',
@@ -360,7 +358,6 @@ describe('Vercel AI integration (V5)', () => {
           'gen_ai.response.tool_calls': expect.any(String),
           'vercel.ai.settings.maxRetries': 2,
           'vercel.ai.streaming': false,
-          'gen_ai.request.model': 'mock-model-id',
           'gen_ai.response.finish_reasons': ['tool-calls'],
           'gen_ai.response.id': expect.any(String),
           'gen_ai.response.model': 'mock-model-id',
@@ -368,7 +365,7 @@ describe('Vercel AI integration (V5)', () => {
           'gen_ai.usage.input_tokens': 15,
           'gen_ai.usage.output_tokens': 25,
           'gen_ai.usage.total_tokens': 40,
-          'operation.name': 'ai.generateText.doGenerate',
+          'gen_ai.operation.name': 'ai.generateText.doGenerate',
           'sentry.op': 'gen_ai.generate_text',
           'sentry.origin': 'auto.vercelai.otel',
         },
@@ -386,7 +383,7 @@ describe('Vercel AI integration (V5)', () => {
           'gen_ai.tool.input': expect.any(String),
           'gen_ai.tool.output': expect.any(String),
           'gen_ai.tool.type': 'function',
-          'operation.name': 'ai.toolCall',
+          'gen_ai.operation.name': 'ai.toolCall',
           'sentry.op': 'gen_ai.execute_tool',
           'sentry.origin': 'auto.vercelai.otel',
         },
@@ -441,7 +438,7 @@ describe('Vercel AI integration (V5)', () => {
           spans: expect.arrayContaining([
             expect.objectContaining({
               data: {
-                'vercel.ai.model.id': 'mock-model-id',
+                'gen_ai.request.model': 'mock-model-id',
                 'vercel.ai.model.provider': 'mock-provider',
                 'vercel.ai.operationId': 'ai.generateText',
                 'vercel.ai.pipeline.name': 'generateText',
@@ -451,7 +448,7 @@ describe('Vercel AI integration (V5)', () => {
                 'gen_ai.usage.input_tokens': 15,
                 'gen_ai.usage.output_tokens': 25,
                 'gen_ai.usage.total_tokens': 40,
-                'operation.name': 'ai.generateText',
+                'gen_ai.operation.name': 'ai.generateText',
                 'sentry.op': 'gen_ai.invoke_agent',
                 'sentry.origin': 'auto.vercelai.otel',
                 'vercel.ai.response.finishReason': 'tool-calls',
@@ -462,7 +459,7 @@ describe('Vercel AI integration (V5)', () => {
             }),
             expect.objectContaining({
               data: {
-                'vercel.ai.model.id': 'mock-model-id',
+                'gen_ai.request.model': 'mock-model-id',
                 'vercel.ai.model.provider': 'mock-provider',
                 'vercel.ai.operationId': 'ai.generateText.doGenerate',
                 'vercel.ai.pipeline.name': 'generateText.doGenerate',
@@ -472,7 +469,6 @@ describe('Vercel AI integration (V5)', () => {
                 'vercel.ai.response.timestamp': expect.any(String),
                 'vercel.ai.settings.maxRetries': 2,
                 'vercel.ai.streaming': false,
-                'gen_ai.request.model': 'mock-model-id',
                 'gen_ai.response.finish_reasons': ['tool-calls'],
                 'gen_ai.response.id': expect.any(String),
                 'gen_ai.response.model': 'mock-model-id',
@@ -480,7 +476,7 @@ describe('Vercel AI integration (V5)', () => {
                 'gen_ai.usage.input_tokens': 15,
                 'gen_ai.usage.output_tokens': 25,
                 'gen_ai.usage.total_tokens': 40,
-                'operation.name': 'ai.generateText.doGenerate',
+                'gen_ai.operation.name': 'ai.generateText.doGenerate',
                 'sentry.op': 'gen_ai.generate_text',
                 'sentry.origin': 'auto.vercelai.otel',
               },
@@ -495,7 +491,7 @@ describe('Vercel AI integration (V5)', () => {
                 'gen_ai.tool.call.id': 'call-1',
                 'gen_ai.tool.name': 'getWeather',
                 'gen_ai.tool.type': 'function',
-                'operation.name': 'ai.toolCall',
+                'gen_ai.operation.name': 'ai.toolCall',
                 'sentry.op': 'gen_ai.execute_tool',
                 'sentry.origin': 'auto.vercelai.otel',
               },
diff --git a/packages/core/src/tracing/vercel-ai/index.ts b/packages/core/src/tracing/vercel-ai/index.ts
index f07244088ff9..62272d222fd5 100644
--- a/packages/core/src/tracing/vercel-ai/index.ts
+++ b/packages/core/src/tracing/vercel-ai/index.ts
@@ -4,18 +4,27 @@ import type { Event } from '../../types-hoist/event';
 import type { Span, SpanAttributes, SpanAttributeValue, SpanJSON, SpanOrigin } from '../../types-hoist/span';
 import { spanToJSON } from '../../utils/spanUtils';
 import {
+  GEN_AI_OPERATION_NAME_ATTRIBUTE,
+  GEN_AI_REQUEST_MESSAGES_ATTRIBUTE,
+  GEN_AI_REQUEST_MODEL_ATTRIBUTE,
+  GEN_AI_RESPONSE_MODEL_ATTRIBUTE,
+  GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE,
   GEN_AI_USAGE_INPUT_TOKENS_CACHE_WRITE_ATTRIBUTE,
   GEN_AI_USAGE_INPUT_TOKENS_CACHED_ATTRIBUTE,
+  GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE,
 } from '../ai/gen-ai-attributes';
-import { getTruncatedJsonString } from '../ai/utils';
 import { toolCallSpanMap } from './constants';
 import type { TokenSummary } from './types';
-import { accumulateTokensForParent, applyAccumulatedTokens, convertAvailableToolsToJsonString } from './utils';
+import {
+  accumulateTokensForParent,
+  applyAccumulatedTokens,
+  convertAvailableToolsToJsonString,
+  requestMessagesFromPrompt,
+} from './utils';
 import type { ProviderMetadata } from './vercel-ai-attributes';
 import {
   AI_MODEL_ID_ATTRIBUTE,
   AI_MODEL_PROVIDER_ATTRIBUTE,
-  AI_PROMPT_ATTRIBUTE,
   AI_PROMPT_MESSAGES_ATTRIBUTE,
   AI_PROMPT_TOOLS_ATTRIBUTE,
   AI_RESPONSE_OBJECT_ATTRIBUTE,
@@ -31,9 +40,7 @@ import {
   AI_USAGE_CACHED_INPUT_TOKENS_ATTRIBUTE,
   AI_USAGE_COMPLETION_TOKENS_ATTRIBUTE,
   AI_USAGE_PROMPT_TOKENS_ATTRIBUTE,
-  GEN_AI_RESPONSE_MODEL_ATTRIBUTE,
-  GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE,
-  GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE,
+  OPERATION_NAME_ATTRIBUTE,
 } from './vercel-ai-attributes';
 
 function addOriginToSpan(span: Span, origin: SpanOrigin): void {
@@ -131,7 +138,8 @@ function processEndedVercelAiSpan(span: SpanJSON): void {
   }
 
   // Rename AI SDK attributes to standardized gen_ai attributes
-  renameAttributeKey(attributes, AI_PROMPT_MESSAGES_ATTRIBUTE, 'gen_ai.request.messages');
+  renameAttributeKey(attributes, OPERATION_NAME_ATTRIBUTE, GEN_AI_OPERATION_NAME_ATTRIBUTE);
+  renameAttributeKey(attributes, AI_PROMPT_MESSAGES_ATTRIBUTE, GEN_AI_REQUEST_MESSAGES_ATTRIBUTE);
   renameAttributeKey(attributes, AI_RESPONSE_TEXT_ATTRIBUTE, 'gen_ai.response.text');
   renameAttributeKey(attributes, AI_RESPONSE_TOOL_CALLS_ATTRIBUTE, 'gen_ai.response.tool_calls');
   renameAttributeKey(attributes, AI_RESPONSE_OBJECT_ATTRIBUTE, 'gen_ai.response.object');
@@ -141,6 +149,7 @@ function processEndedVercelAiSpan(span: SpanJSON): void {
   renameAttributeKey(attributes, AI_TOOL_CALL_RESULT_ATTRIBUTE, 'gen_ai.tool.output');
 
   renameAttributeKey(attributes, AI_SCHEMA_ATTRIBUTE, 'gen_ai.request.schema');
+  renameAttributeKey(attributes, AI_MODEL_ID_ATTRIBUTE, GEN_AI_REQUEST_MODEL_ATTRIBUTE);
 
   addProviderMetadataToAttributes(attributes);
 
@@ -203,10 +212,8 @@ function processGenerateSpan(span: Span, name: string, attributes: SpanAttribute
     span.setAttribute('gen_ai.function_id', functionId);
   }
 
-  if (attributes[AI_PROMPT_ATTRIBUTE]) {
-    const truncatedPrompt = getTruncatedJsonString(attributes[AI_PROMPT_ATTRIBUTE] as string | string[]);
-    span.setAttribute('gen_ai.prompt', truncatedPrompt);
-  }
+  requestMessagesFromPrompt(span, attributes);
+
   if (attributes[AI_MODEL_ID_ATTRIBUTE] && !attributes[GEN_AI_RESPONSE_MODEL_ATTRIBUTE]) {
     span.setAttribute(GEN_AI_RESPONSE_MODEL_ATTRIBUTE, attributes[AI_MODEL_ID_ATTRIBUTE]);
   }
diff --git a/packages/core/src/tracing/vercel-ai/utils.ts b/packages/core/src/tracing/vercel-ai/utils.ts
index 9a0b57eb16f7..bc390ccc1672 100644
--- a/packages/core/src/tracing/vercel-ai/utils.ts
+++ b/packages/core/src/tracing/vercel-ai/utils.ts
@@ -1,8 +1,14 @@
 import type { TraceContext } from '../../types-hoist/context';
-import type { Span, SpanJSON } from '../../types-hoist/span';
-import { GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE, GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE } from '../ai/gen-ai-attributes';
+import type { Span, SpanAttributes, SpanJSON } from '../../types-hoist/span';
+import {
+  GEN_AI_REQUEST_MESSAGES_ATTRIBUTE,
+  GEN_AI_USAGE_INPUT_TOKENS_ATTRIBUTE,
+  GEN_AI_USAGE_OUTPUT_TOKENS_ATTRIBUTE,
+} from '../ai/gen-ai-attributes';
+import { getTruncatedJsonString } from '../ai/utils';
 import { toolCallSpanMap } from './constants';
 import type { TokenSummary } from './types';
+import { AI_PROMPT_ATTRIBUTE, AI_PROMPT_MESSAGES_ATTRIBUTE } from './vercel-ai-attributes';
 
 /**
  * Accumulates token data from a span to its parent in the token accumulator map.
@@ -87,3 +93,47 @@ export function convertAvailableToolsToJsonString(tools: unknown[]): string {
   });
   return JSON.stringify(toolObjects);
 }
+
+/**
+ * Convert the prompt string to messages array
+ */
+export function convertPromptToMessages(prompt: string): { role: string; content: string }[] {
+  try {
+    const p = JSON.parse(prompt);
+    if (!!p && typeof p === 'object') {
+      const { prompt, system } = p;
+      if (typeof prompt === 'string' || typeof system === 'string') {
+        const messages: { role: string; content: string }[] = [];
+        if (typeof system === 'string') {
+          messages.push({ role: 'system', content: system });
+        }
+        if (typeof prompt === 'string') {
+          messages.push({ role: 'user', content: prompt });
+        }
+        return messages;
+      }
+    }
+    // eslint-disable-next-line no-empty
+  } catch {}
+  return [];
+}
+
+/**
+ * Generate a request.messages JSON array from the prompt field in the
+ * invoke_agent op
+ */
+export function requestMessagesFromPrompt(span: Span, attributes: SpanAttributes): void {
+  if (attributes[AI_PROMPT_ATTRIBUTE]) {
+    const truncatedPrompt = getTruncatedJsonString(attributes[AI_PROMPT_ATTRIBUTE] as string | string[]);
+    span.setAttribute('gen_ai.prompt', truncatedPrompt);
+  }
+  const prompt = attributes[AI_PROMPT_ATTRIBUTE];
+  if (
+    typeof prompt === 'string' &&
+    !attributes[GEN_AI_REQUEST_MESSAGES_ATTRIBUTE] &&
+    !attributes[AI_PROMPT_MESSAGES_ATTRIBUTE]
+  ) {
+    const messages = convertPromptToMessages(prompt);
+    if (messages.length) span.setAttribute(GEN_AI_REQUEST_MESSAGES_ATTRIBUTE, getTruncatedJsonString(messages));
+  }
+}
diff --git a/packages/core/test/lib/utils/vercelai-utils.test.ts b/packages/core/test/lib/utils/vercelai-utils.test.ts
new file mode 100644
index 000000000000..be329e6f5970
--- /dev/null
+++ b/packages/core/test/lib/utils/vercelai-utils.test.ts
@@ -0,0 +1,55 @@
+import { describe, expect, it } from 'vitest';
+import { convertPromptToMessages } from '../../../src/tracing/vercel-ai/utils';
+
+describe('vercel-ai-utils', () => {
+  describe('convertPromptToMessages', () => {
+    it('should convert a prompt with system to a messages array', () => {
+      expect(
+        convertPromptToMessages(
+          JSON.stringify({
+            system: 'You are a friendly robot',
+            prompt: 'Hello, robot',
+          }),
+        ),
+      ).toStrictEqual([
+        { role: 'system', content: 'You are a friendly robot' },
+        { role: 'user', content: 'Hello, robot' },
+      ]);
+    });
+
+    it('should convert a system prompt to a messages array', () => {
+      expect(
+        convertPromptToMessages(
+          JSON.stringify({
+            system: 'You are a friendly robot',
+          }),
+        ),
+      ).toStrictEqual([{ role: 'system', content: 'You are a friendly robot' }]);
+    });
+
+    it('should convert a user only prompt to a messages array', () => {
+      expect(
+        convertPromptToMessages(
+          JSON.stringify({
+            prompt: 'Hello, robot',
+          }),
+        ),
+      ).toStrictEqual([{ role: 'user', content: 'Hello, robot' }]);
+    });
+
+    it('should ignore unexpected data', () => {
+      expect(
+        convertPromptToMessages(
+          JSON.stringify({
+            randomField: 'Hello, robot',
+            nothing: 'that we know how to handle',
+          }),
+        ),
+      ).toStrictEqual([]);
+    });
+
+    it('should not break on invalid json', () => {
+      expect(convertPromptToMessages('this is not json')).toStrictEqual([]);
+    });
+  });
+});

From b6eb205db06b90cdfad1b5953247f13212eed1ed Mon Sep 17 00:00:00 2001
From: isaacs <i@izs.me>
Date: Tue, 25 Nov 2025 10:49:16 -0800
Subject: [PATCH 168/186] fix(node): Include system message in anthropic-ai
 messages span (#18332)

Fixes JS-1223
Fixes GH-18331
---
 .../suites/tracing/anthropic/test.ts          | 177 ++++++++++++++----
 .../core/src/tracing/anthropic-ai/index.ts    |   8 +-
 .../core/src/tracing/anthropic-ai/utils.ts    |  13 ++
 .../test/lib/utils/anthropic-utils.test.ts    |  56 ++++++
 4 files changed, 214 insertions(+), 40 deletions(-)
 create mode 100644 packages/core/test/lib/utils/anthropic-utils.test.ts

diff --git a/dev-packages/node-integration-tests/suites/tracing/anthropic/test.ts b/dev-packages/node-integration-tests/suites/tracing/anthropic/test.ts
index 3fc3b544b843..ebebf60db042 100644
--- a/dev-packages/node-integration-tests/suites/tracing/anthropic/test.ts
+++ b/dev-packages/node-integration-tests/suites/tracing/anthropic/test.ts
@@ -11,7 +11,7 @@ describe('Anthropic integration', () => {
     spans: expect.arrayContaining([
       // First span - basic message completion without PII
       expect.objectContaining({
-        data: {
+        data: expect.objectContaining({
           'gen_ai.operation.name': 'messages',
           'sentry.op': 'gen_ai.messages',
           'sentry.origin': 'auto.ai.anthropic',
@@ -24,7 +24,7 @@ describe('Anthropic integration', () => {
           'gen_ai.usage.input_tokens': 10,
           'gen_ai.usage.output_tokens': 15,
           'gen_ai.usage.total_tokens': 25,
-        },
+        }),
         description: 'messages claude-3-haiku-20240307',
         op: 'gen_ai.messages',
         origin: 'auto.ai.anthropic',
@@ -32,13 +32,13 @@ describe('Anthropic integration', () => {
       }),
       // Second span - error handling
       expect.objectContaining({
-        data: {
+        data: expect.objectContaining({
           'gen_ai.operation.name': 'messages',
           'sentry.op': 'gen_ai.messages',
           'sentry.origin': 'auto.ai.anthropic',
           'gen_ai.system': 'anthropic',
           'gen_ai.request.model': 'error-model',
-        },
+        }),
         description: 'messages error-model',
         op: 'gen_ai.messages',
         origin: 'auto.ai.anthropic',
@@ -46,13 +46,13 @@ describe('Anthropic integration', () => {
       }),
       // Third span - token counting (no response.text because recordOutputs=false by default)
       expect.objectContaining({
-        data: {
+        data: expect.objectContaining({
           'gen_ai.operation.name': 'messages',
           'sentry.op': 'gen_ai.messages',
           'sentry.origin': 'auto.ai.anthropic',
           'gen_ai.system': 'anthropic',
           'gen_ai.request.model': 'claude-3-haiku-20240307',
-        },
+        }),
         description: 'messages claude-3-haiku-20240307',
         op: 'gen_ai.messages',
         origin: 'auto.ai.anthropic',
@@ -60,7 +60,7 @@ describe('Anthropic integration', () => {
       }),
       // Fourth span - models.retrieve
       expect.objectContaining({
-        data: {
+        data: expect.objectContaining({
           'anthropic.response.timestamp': '2024-05-08T05:20:00.000Z',
           'gen_ai.operation.name': 'models',
           'sentry.op': 'gen_ai.models',
@@ -69,7 +69,7 @@ describe('Anthropic integration', () => {
           'gen_ai.request.model': 'claude-3-haiku-20240307',
           'gen_ai.response.id': 'claude-3-haiku-20240307',
           'gen_ai.response.model': 'claude-3-haiku-20240307',
-        },
+        }),
         description: 'models claude-3-haiku-20240307',
         op: 'gen_ai.models',
         origin: 'auto.ai.anthropic',
@@ -83,88 +83,191 @@ describe('Anthropic integration', () => {
     spans: expect.arrayContaining([
       // First span - basic message completion with PII
       expect.objectContaining({
-        data: {
+        data: expect.objectContaining({
           'gen_ai.operation.name': 'messages',
-          'sentry.op': 'gen_ai.messages',
-          'sentry.origin': 'auto.ai.anthropic',
-          'gen_ai.system': 'anthropic',
+          'gen_ai.request.max_tokens': 100,
+          'gen_ai.request.messages':
+            '[{"role":"system","content":"You are a helpful assistant."},{"role":"user","content":"What is the capital of France?"}]',
           'gen_ai.request.model': 'claude-3-haiku-20240307',
           'gen_ai.request.temperature': 0.7,
-          'gen_ai.request.max_tokens': 100,
-          'gen_ai.request.messages': '[{"role":"user","content":"What is the capital of France?"}]',
-          'gen_ai.response.model': 'claude-3-haiku-20240307',
           'gen_ai.response.id': 'msg_mock123',
+          'gen_ai.response.model': 'claude-3-haiku-20240307',
           'gen_ai.response.text': 'Hello from Anthropic mock!',
+          'gen_ai.system': 'anthropic',
           'gen_ai.usage.input_tokens': 10,
           'gen_ai.usage.output_tokens': 15,
           'gen_ai.usage.total_tokens': 25,
-        },
+          'sentry.op': 'gen_ai.messages',
+          'sentry.origin': 'auto.ai.anthropic',
+        }),
         description: 'messages claude-3-haiku-20240307',
         op: 'gen_ai.messages',
         origin: 'auto.ai.anthropic',
         status: 'ok',
       }),
-      // Second span - error handling with PII
       expect.objectContaining({
-        data: {
+        data: expect.objectContaining({
+          'http.request.method': 'POST',
+          'http.request.method_original': 'POST',
+          'http.response.header.content-length': 247,
+          'http.response.status_code': 200,
+          'otel.kind': 'CLIENT',
+          'sentry.op': 'http.client',
+          'sentry.origin': 'auto.http.otel.node_fetch',
+          'url.path': '/anthropic/v1/messages',
+          'url.query': '',
+          'url.scheme': 'http',
+        }),
+        op: 'http.client',
+        origin: 'auto.http.otel.node_fetch',
+        status: 'ok',
+      }),
+
+      // Second - error handling with PII
+      expect.objectContaining({
+        data: expect.objectContaining({
           'gen_ai.operation.name': 'messages',
+          'gen_ai.request.messages': '[{"role":"user","content":"This will fail"}]',
+          'gen_ai.request.model': 'error-model',
+          'gen_ai.system': 'anthropic',
           'sentry.op': 'gen_ai.messages',
           'sentry.origin': 'auto.ai.anthropic',
-          'gen_ai.system': 'anthropic',
-          'gen_ai.request.model': 'error-model',
-          'gen_ai.request.messages': '[{"role":"user","content":"This will fail"}]',
-        },
+        }),
         description: 'messages error-model',
         op: 'gen_ai.messages',
         origin: 'auto.ai.anthropic',
         status: 'internal_error',
       }),
-      // Third span - token counting with PII (response.text is present because sendDefaultPii=true enables recordOutputs)
       expect.objectContaining({
-        data: {
+        data: expect.objectContaining({
+          'http.request.method': 'POST',
+          'http.request.method_original': 'POST',
+          'http.response.header.content-length': 15,
+          'http.response.status_code': 404,
+          'otel.kind': 'CLIENT',
+          'sentry.op': 'http.client',
+          'sentry.origin': 'auto.http.otel.node_fetch',
+          'url.path': '/anthropic/v1/messages',
+          'url.query': '',
+          'url.scheme': 'http',
+        }),
+        op: 'http.client',
+        origin: 'auto.http.otel.node_fetch',
+        status: 'not_found',
+      }),
+
+      // Third - token counting with PII (response.text is present because sendDefaultPii=true enables recordOutputs)
+      expect.objectContaining({
+        data: expect.objectContaining({
           'gen_ai.operation.name': 'messages',
+          'gen_ai.request.messages': '[{"role":"user","content":"What is the capital of France?"}]',
+          'gen_ai.request.model': 'claude-3-haiku-20240307',
+          'gen_ai.response.text': '15',
+          'gen_ai.system': 'anthropic',
           'sentry.op': 'gen_ai.messages',
           'sentry.origin': 'auto.ai.anthropic',
-          'gen_ai.system': 'anthropic',
-          'gen_ai.request.model': 'claude-3-haiku-20240307',
-          'gen_ai.request.messages': '[{"role":"user","content":"What is the capital of France?"}]',
-          'gen_ai.response.text': '15', // Only present because recordOutputs=true when sendDefaultPii=true
-        },
+        }),
         description: 'messages claude-3-haiku-20240307',
         op: 'gen_ai.messages',
         origin: 'auto.ai.anthropic',
         status: 'ok',
       }),
-      // Fourth span - models.retrieve with PII
       expect.objectContaining({
-        data: {
+        data: expect.objectContaining({
+          'http.request.method': 'POST',
+          'http.request.method_original': 'POST',
+          'http.response.header.content-length': 19,
+          'http.response.status_code': 200,
+          'otel.kind': 'CLIENT',
+          'sentry.op': 'http.client',
+          'sentry.origin': 'auto.http.otel.node_fetch',
+          'url.path': '/anthropic/v1/messages/count_tokens',
+          'url.query': '',
+          'url.scheme': 'http',
+        }),
+        op: 'http.client',
+        origin: 'auto.http.otel.node_fetch',
+        status: 'ok',
+      }),
+
+      // Fourth - models.retrieve with PII
+      expect.objectContaining({
+        data: expect.objectContaining({
           'anthropic.response.timestamp': '2024-05-08T05:20:00.000Z',
           'gen_ai.operation.name': 'models',
-          'sentry.op': 'gen_ai.models',
-          'sentry.origin': 'auto.ai.anthropic',
-          'gen_ai.system': 'anthropic',
           'gen_ai.request.model': 'claude-3-haiku-20240307',
           'gen_ai.response.id': 'claude-3-haiku-20240307',
           'gen_ai.response.model': 'claude-3-haiku-20240307',
-        },
+          'gen_ai.system': 'anthropic',
+          'sentry.op': 'gen_ai.models',
+          'sentry.origin': 'auto.ai.anthropic',
+        }),
         description: 'models claude-3-haiku-20240307',
         op: 'gen_ai.models',
         origin: 'auto.ai.anthropic',
         status: 'ok',
       }),
-      // Fifth span - messages.create with stream: true
+      expect.objectContaining({
+        data: expect.objectContaining({
+          'http.request.method': 'GET',
+          'http.request.method_original': 'GET',
+          'http.response.header.content-length': 123,
+          'http.response.status_code': 200,
+          'otel.kind': 'CLIENT',
+          'sentry.op': 'http.client',
+          'sentry.origin': 'auto.http.otel.node_fetch',
+          'url.path': '/anthropic/v1/models/claude-3-haiku-20240307',
+          'url.query': '',
+          'url.scheme': 'http',
+          'user_agent.original': 'Anthropic/JS 0.63.0',
+        }),
+        op: 'http.client',
+        origin: 'auto.http.otel.node_fetch',
+        status: 'ok',
+      }),
+
+      // Fifth - messages.create with stream: true
       expect.objectContaining({
         data: expect.objectContaining({
           'gen_ai.operation.name': 'messages',
+          'gen_ai.request.messages': '[{"role":"user","content":"What is the capital of France?"}]',
           'gen_ai.request.model': 'claude-3-haiku-20240307',
           'gen_ai.request.stream': true,
+          'gen_ai.response.id': 'msg_stream123',
+          'gen_ai.response.model': 'claude-3-haiku-20240307',
+          'gen_ai.response.streaming': true,
+          'gen_ai.response.text': 'Hello from stream!',
+          'gen_ai.system': 'anthropic',
+          'gen_ai.usage.input_tokens': 10,
+          'gen_ai.usage.output_tokens': 15,
+          'gen_ai.usage.total_tokens': 25,
+          'sentry.op': 'gen_ai.messages',
+          'sentry.origin': 'auto.ai.anthropic',
         }),
         description: 'messages claude-3-haiku-20240307 stream-response',
         op: 'gen_ai.messages',
         origin: 'auto.ai.anthropic',
         status: 'ok',
       }),
-      // Sixth span - messages.stream
+      expect.objectContaining({
+        data: expect.objectContaining({
+          'http.request.method': 'POST',
+          'http.request.method_original': 'POST',
+          'http.response.status_code': 200,
+          'otel.kind': 'CLIENT',
+          'sentry.op': 'http.client',
+          'sentry.origin': 'auto.http.otel.node_fetch',
+          'url.path': '/anthropic/v1/messages',
+          'url.query': '',
+          'url.scheme': 'http',
+          'user_agent.original': 'Anthropic/JS 0.63.0',
+        }),
+        op: 'http.client',
+        origin: 'auto.http.otel.node_fetch',
+        status: 'ok',
+      }),
+
+      // Sixth - messages.stream
       expect.objectContaining({
         data: expect.objectContaining({
           'gen_ai.operation.name': 'messages',
diff --git a/packages/core/src/tracing/anthropic-ai/index.ts b/packages/core/src/tracing/anthropic-ai/index.ts
index aa48a1e4c21d..d8d06efdc9e5 100644
--- a/packages/core/src/tracing/anthropic-ai/index.ts
+++ b/packages/core/src/tracing/anthropic-ai/index.ts
@@ -39,7 +39,7 @@ import type {
   AnthropicAiStreamingEvent,
   ContentBlock,
 } from './types';
-import { handleResponseError, shouldInstrument } from './utils';
+import { handleResponseError, messagesFromParams, shouldInstrument } from './utils';
 
 /**
  * Extract request attributes from method arguments
@@ -82,10 +82,12 @@ function extractRequestAttributes(args: unknown[], methodPath: string): Record<s
  * This is only recorded if recordInputs is true.
  */
 function addPrivateRequestAttributes(span: Span, params: Record<string, unknown>): void {
-  if ('messages' in params) {
-    const truncatedMessages = getTruncatedJsonString(params.messages);
+  const messages = messagesFromParams(params);
+  if (messages.length) {
+    const truncatedMessages = getTruncatedJsonString(messages);
     span.setAttributes({ [GEN_AI_REQUEST_MESSAGES_ATTRIBUTE]: truncatedMessages });
   }
+
   if ('input' in params) {
     const truncatedInput = getTruncatedJsonString(params.input);
     span.setAttributes({ [GEN_AI_REQUEST_MESSAGES_ATTRIBUTE]: truncatedInput });
diff --git a/packages/core/src/tracing/anthropic-ai/utils.ts b/packages/core/src/tracing/anthropic-ai/utils.ts
index 16c85908d4f7..01f86b41adfc 100644
--- a/packages/core/src/tracing/anthropic-ai/utils.ts
+++ b/packages/core/src/tracing/anthropic-ai/utils.ts
@@ -27,3 +27,16 @@ export function handleResponseError(span: Span, response: AnthropicAiResponse):
     });
   }
 }
+
+/**
+ * Include the system prompt in the messages list, if available
+ */
+export function messagesFromParams(params: Record<string, unknown>): unknown[] {
+  const { system, messages } = params;
+
+  const systemMessages = typeof system === 'string' ? [{ role: 'system', content: params.system }] : [];
+
+  const userMessages = Array.isArray(messages) ? messages : messages != null ? [messages] : [];
+
+  return [...systemMessages, ...userMessages];
+}
diff --git a/packages/core/test/lib/utils/anthropic-utils.test.ts b/packages/core/test/lib/utils/anthropic-utils.test.ts
new file mode 100644
index 000000000000..0be295b85813
--- /dev/null
+++ b/packages/core/test/lib/utils/anthropic-utils.test.ts
@@ -0,0 +1,56 @@
+import { describe, expect, it } from 'vitest';
+import { messagesFromParams, shouldInstrument } from '../../../src/tracing/anthropic-ai/utils';
+
+describe('anthropic-ai-utils', () => {
+  describe('shouldInstrument', () => {
+    it('should instrument known methods', () => {
+      expect(shouldInstrument('models.get')).toBe(true);
+    });
+
+    it('should not instrument unknown methods', () => {
+      expect(shouldInstrument('models.unknown.thing')).toBe(false);
+    });
+  });
+
+  describe('messagesFromParams', () => {
+    it('includes system message in messages list', () => {
+      expect(
+        messagesFromParams({
+          messages: [{ role: 'user', content: 'hello' }],
+          system: 'You are a friendly robot awaiting a greeting.',
+        }),
+      ).toStrictEqual([
+        { role: 'system', content: 'You are a friendly robot awaiting a greeting.' },
+        { role: 'user', content: 'hello' },
+      ]);
+    });
+
+    it('includes system message along with non-array messages', () => {
+      expect(
+        messagesFromParams({
+          messages: { role: 'user', content: 'hello' },
+          system: 'You are a friendly robot awaiting a greeting.',
+        }),
+      ).toStrictEqual([
+        { role: 'system', content: 'You are a friendly robot awaiting a greeting.' },
+        { role: 'user', content: 'hello' },
+      ]);
+    });
+
+    it('includes system message if no other messages', () => {
+      expect(
+        messagesFromParams({
+          system: 'You are a friendly robot awaiting a greeting.',
+        }),
+      ).toStrictEqual([{ role: 'system', content: 'You are a friendly robot awaiting a greeting.' }]);
+    });
+
+    it('returns messages if no system message', () => {
+      expect(
+        messagesFromParams({
+          messages: [{ role: 'user', content: 'hello' }],
+        }),
+      ).toStrictEqual([{ role: 'user', content: 'hello' }]);
+    });
+  });
+});

From 862f41599ffb37c75a7bd1fa6b4a8ae85205015a Mon Sep 17 00:00:00 2001
From: Abdelrahman Awad <me@awad.dev>
Date: Thu, 4 Dec 2025 13:16:34 +0200
Subject: [PATCH 169/186] test(nuxt): Relax captured unhandled error assertion
 (#18397)

This is the opposite of the flake that happened in
https://github.com/getsentry/sentry-javascript/pull/18035, so apparently
nuxt-3 flaky tests started after merging that PR.

It looks like the same problem, we have a race condition, if Nitro
catches the error first when executing the middleware handler it will be
swallowed by an H3 error but it seems the `instanceof` check isn't being
satisfied in this case, so perhaps with Nuxt 3, there isn't a unified H3
instance or perhaps we are using a different one for the check.

I will take a better look later, this is a band-aid to stop this from
randomly failing our PRs. I couldn't reproduce this locally at all tho.

If we don't like this relaxation we can close this PR and I can spend
more time on this, I thought the most important thing here is we do
capture an error with the critical information.
---
 .../test-applications/nuxt-3/tests/middleware.test.ts       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dev-packages/e2e-tests/test-applications/nuxt-3/tests/middleware.test.ts b/dev-packages/e2e-tests/test-applications/nuxt-3/tests/middleware.test.ts
index e9debf8496c2..7cb3c84e9050 100644
--- a/dev-packages/e2e-tests/test-applications/nuxt-3/tests/middleware.test.ts
+++ b/dev-packages/e2e-tests/test-applications/nuxt-3/tests/middleware.test.ts
@@ -121,7 +121,11 @@ test.describe('Server Middleware Instrumentation', () => {
         type: 'Error',
         mechanism: expect.objectContaining({
           handled: false,
-          type: 'auto.middleware.nuxt',
+          // Type changes depending on whether it is being wrapped by Nitro or not
+          // This is a timing problem, sometimes Nitro can capture the error first, and sometimes it can't
+          // If nitro captures the error first, the type will be 'chained'
+          // If Sentry captures the error first, the type will be 'auto.middleware.nuxt'
+          type: expect.stringMatching(/^(auto\.middleware\.nuxt|chained)$/),
         }),
       }),
     );

From 477f6adbd434b5d037674bc48765800ba2f6feb5 Mon Sep 17 00:00:00 2001
From: Andrei Borza <andrei.borza@sentry.io>
Date: Thu, 4 Dec 2025 14:28:27 +0100
Subject: [PATCH 170/186] meta(changelog): Update changelog for 10.29.0

---
 CHANGELOG.md | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f745ef5afe5..15972e85dfdd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,30 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 10.29.0
+
+### Important Changes
+
+- **feat(solid|solidstart): Bump accepted @solidjs/router range ([#18395](https://github.com/getsentry/sentry-javascript/pull/18395))**
+
+We expanded the supported version range for `@solidjs/router` to include `0.14.x` and `0.15.x` versions.
+
+### Other Changes
+
+- fix(logs): Add support for `msg` in pino integration ([#18389](https://github.com/getsentry/sentry-javascript/pull/18389))
+- fix(node): Include system message in anthropic-ai messages span ([#18332](https://github.com/getsentry/sentry-javascript/pull/18332))
+- fix(tracing): Add missing attributes in vercel-ai spans ([#18333](https://github.com/getsentry/sentry-javascript/pull/18333))
+
+<details>
+  <summary> <strong>Internal Changes</strong> </summary>
+
+- chore(tanstackstart-react): clean up re-exported types ([#18393](https://github.com/getsentry/sentry-javascript/pull/18393))
+- ref(core): Avoid looking up openai integration options ([#17695](https://github.com/getsentry/sentry-javascript/pull/17695))
+- test(nuxt): Relax captured unhandled error assertion ([#18397](https://github.com/getsentry/sentry-javascript/pull/18397))
+- test(tanstackstart-react): Set up E2E test application ([#18358](https://github.com/getsentry/sentry-javascript/pull/18358))
+
+</details>
+
 ## 10.28.0
 
 ### Important Changes

From 3529d462957712c69772f3343274c73811fbe0ed Mon Sep 17 00:00:00 2001
From: getsentry-bot <bot@sentry.io>
Date: Thu, 4 Dec 2025 13:45:39 +0000
Subject: [PATCH 171/186] release: 10.29.0

---
 .../browser-integration-tests/package.json         |  4 ++--
 .../bundle-analyzer-scenarios/package.json         |  2 +-
 dev-packages/bundler-tests/package.json            |  4 ++--
 dev-packages/clear-cache-gh-action/package.json    |  2 +-
 .../cloudflare-integration-tests/package.json      |  6 +++---
 dev-packages/e2e-tests/package.json                |  2 +-
 .../external-contributor-gh-action/package.json    |  2 +-
 .../node-core-integration-tests/package.json       |  6 +++---
 dev-packages/node-integration-tests/package.json   | 10 +++++-----
 dev-packages/node-overhead-gh-action/package.json  |  4 ++--
 dev-packages/rollup-utils/package.json             |  2 +-
 dev-packages/size-limit-gh-action/package.json     |  2 +-
 dev-packages/test-utils/package.json               |  4 ++--
 lerna.json                                         |  2 +-
 packages/angular/package.json                      |  6 +++---
 packages/astro/package.json                        |  8 ++++----
 packages/aws-serverless/package.json               |  8 ++++----
 packages/browser-utils/package.json                |  4 ++--
 packages/browser/package.json                      | 14 +++++++-------
 packages/bun/package.json                          |  6 +++---
 packages/cloudflare/package.json                   |  4 ++--
 packages/core/package.json                         |  2 +-
 packages/deno/package.json                         |  4 ++--
 packages/ember/package.json                        |  6 +++---
 packages/eslint-config-sdk/package.json            |  6 +++---
 packages/eslint-plugin-sdk/package.json            |  2 +-
 packages/feedback/package.json                     |  4 ++--
 packages/gatsby/package.json                       |  6 +++---
 packages/google-cloud-serverless/package.json      |  6 +++---
 packages/integration-shims/package.json            |  4 ++--
 packages/nestjs/package.json                       |  6 +++---
 packages/nextjs/package.json                       | 14 +++++++-------
 packages/node-core/package.json                    |  6 +++---
 packages/node-native/package.json                  |  6 +++---
 packages/node/package.json                         |  8 ++++----
 packages/nuxt/package.json                         | 12 ++++++------
 packages/opentelemetry/package.json                |  4 ++--
 packages/profiling-node/package.json               |  6 +++---
 packages/react-router/package.json                 | 10 +++++-----
 packages/react/package.json                        |  6 +++---
 packages/remix/package.json                        |  8 ++++----
 packages/replay-canvas/package.json                |  6 +++---
 packages/replay-internal/package.json              |  8 ++++----
 packages/replay-worker/package.json                |  2 +-
 packages/solid/package.json                        |  6 +++---
 packages/solidstart/package.json                   |  8 ++++----
 packages/svelte/package.json                       |  6 +++---
 packages/sveltekit/package.json                    | 10 +++++-----
 packages/tanstackstart-react/package.json          | 10 +++++-----
 packages/tanstackstart/package.json                |  2 +-
 packages/types/package.json                        |  4 ++--
 packages/typescript/package.json                   |  2 +-
 packages/vercel-edge/package.json                  |  6 +++---
 packages/vue/package.json                          |  6 +++---
 packages/wasm/package.json                         |  6 +++---
 55 files changed, 155 insertions(+), 155 deletions(-)

diff --git a/dev-packages/browser-integration-tests/package.json b/dev-packages/browser-integration-tests/package.json
index 87a8ec7aa805..97bfb58ceb7a 100644
--- a/dev-packages/browser-integration-tests/package.json
+++ b/dev-packages/browser-integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/browser-integration-tests",
-  "version": "10.28.0",
+  "version": "10.29.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": "10.28.0",
+    "@sentry/browser": "10.29.0",
     "@supabase/supabase-js": "2.49.3",
     "axios": "^1.12.2",
     "babel-loader": "^8.2.2",
diff --git a/dev-packages/bundle-analyzer-scenarios/package.json b/dev-packages/bundle-analyzer-scenarios/package.json
index b8a4892949b0..efffe165a886 100644
--- a/dev-packages/bundle-analyzer-scenarios/package.json
+++ b/dev-packages/bundle-analyzer-scenarios/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/bundle-analyzer-scenarios",
-  "version": "10.28.0",
+  "version": "10.29.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",
diff --git a/dev-packages/bundler-tests/package.json b/dev-packages/bundler-tests/package.json
index 288c9907bcc7..b98dc94aa749 100644
--- a/dev-packages/bundler-tests/package.json
+++ b/dev-packages/bundler-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/bundler-tests",
-  "version": "10.28.0",
+  "version": "10.29.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.28.0",
+    "@sentry/browser": "10.29.0",
     "rollup": "^4.0.0",
     "vite": "^5.0.0",
     "vitest": "^3.2.4",
diff --git a/dev-packages/clear-cache-gh-action/package.json b/dev-packages/clear-cache-gh-action/package.json
index de29981194c2..e70ba22bc2f8 100644
--- a/dev-packages/clear-cache-gh-action/package.json
+++ b/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.28.0",
+  "version": "10.29.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
diff --git a/dev-packages/cloudflare-integration-tests/package.json b/dev-packages/cloudflare-integration-tests/package.json
index 2bfed522960f..e5a54fc23719 100644
--- a/dev-packages/cloudflare-integration-tests/package.json
+++ b/dev-packages/cloudflare-integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/cloudflare-integration-tests",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
@@ -14,11 +14,11 @@
   },
   "dependencies": {
     "@langchain/langgraph": "^1.0.1",
-    "@sentry/cloudflare": "10.28.0"
+    "@sentry/cloudflare": "10.29.0"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20250922.0",
-    "@sentry-internal/test-utils": "10.28.0",
+    "@sentry-internal/test-utils": "10.29.0",
     "eslint-plugin-regexp": "^1.15.0",
     "vitest": "^3.2.4",
     "wrangler": "4.22.0"
diff --git a/dev-packages/e2e-tests/package.json b/dev-packages/e2e-tests/package.json
index c2c9e01d0714..1d5af2057ce5 100644
--- a/dev-packages/e2e-tests/package.json
+++ b/dev-packages/e2e-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/e2e-tests",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "license": "MIT",
   "private": true,
   "scripts": {
diff --git a/dev-packages/external-contributor-gh-action/package.json b/dev-packages/external-contributor-gh-action/package.json
index 178953f83ede..fe3254ca2fde 100644
--- a/dev-packages/external-contributor-gh-action/package.json
+++ b/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": "10.28.0",
+  "version": "10.29.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
diff --git a/dev-packages/node-core-integration-tests/package.json b/dev-packages/node-core-integration-tests/package.json
index 90b8e3cfc12e..cda704e0d08a 100644
--- a/dev-packages/node-core-integration-tests/package.json
+++ b/dev-packages/node-core-integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/node-core-integration-tests",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
@@ -34,8 +34,8 @@
     "@opentelemetry/resources": "^2.2.0",
     "@opentelemetry/sdk-trace-base": "^2.2.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry/core": "10.28.0",
-    "@sentry/node-core": "10.28.0",
+    "@sentry/core": "10.29.0",
+    "@sentry/node-core": "10.29.0",
     "body-parser": "^1.20.3",
     "cors": "^2.8.5",
     "cron": "^3.1.6",
diff --git a/dev-packages/node-integration-tests/package.json b/dev-packages/node-integration-tests/package.json
index c599419ebdee..e9d131840e8b 100644
--- a/dev-packages/node-integration-tests/package.json
+++ b/dev-packages/node-integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/node-integration-tests",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
@@ -36,9 +36,9 @@
     "@nestjs/core": "^11",
     "@nestjs/platform-express": "^11",
     "@prisma/client": "6.15.0",
-    "@sentry/aws-serverless": "10.28.0",
-    "@sentry/core": "10.28.0",
-    "@sentry/node": "10.28.0",
+    "@sentry/aws-serverless": "10.29.0",
+    "@sentry/core": "10.29.0",
+    "@sentry/node": "10.29.0",
     "@types/mongodb": "^3.6.20",
     "@types/mysql": "^2.15.21",
     "@types/pg": "^8.6.5",
@@ -83,7 +83,7 @@
     "yargs": "^16.2.0"
   },
   "devDependencies": {
-    "@sentry-internal/test-utils": "10.28.0",
+    "@sentry-internal/test-utils": "10.29.0",
     "@types/amqplib": "^0.10.5",
     "@types/node-cron": "^3.0.11",
     "@types/node-schedule": "^2.1.7",
diff --git a/dev-packages/node-overhead-gh-action/package.json b/dev-packages/node-overhead-gh-action/package.json
index bc855cf340bc..c75d2fcacc8b 100644
--- a/dev-packages/node-overhead-gh-action/package.json
+++ b/dev-packages/node-overhead-gh-action/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/node-overhead-gh-action",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
@@ -23,7 +23,7 @@
     "fix": "eslint . --format stylish --fix"
   },
   "dependencies": {
-    "@sentry/node": "10.28.0",
+    "@sentry/node": "10.29.0",
     "express": "^4.21.1",
     "mysql2": "^3.14.4"
   },
diff --git a/dev-packages/rollup-utils/package.json b/dev-packages/rollup-utils/package.json
index 5399916e9cb2..f7fca3bef7ac 100644
--- a/dev-packages/rollup-utils/package.json
+++ b/dev-packages/rollup-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/rollup-utils",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "description": "Rollup utilities used at Sentry for the Sentry JavaScript SDK",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/rollup-utils",
diff --git a/dev-packages/size-limit-gh-action/package.json b/dev-packages/size-limit-gh-action/package.json
index f624959ffbd4..f078474a5361 100644
--- a/dev-packages/size-limit-gh-action/package.json
+++ b/dev-packages/size-limit-gh-action/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@sentry-internal/size-limit-gh-action",
   "description": "An internal Github Action to compare the current size of a PR against the one on develop.",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
diff --git a/dev-packages/test-utils/package.json b/dev-packages/test-utils/package.json
index 801fc8d73d0a..be79abd0c813 100644
--- a/dev-packages/test-utils/package.json
+++ b/dev-packages/test-utils/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "10.28.0",
+  "version": "10.29.0",
   "name": "@sentry-internal/test-utils",
   "author": "Sentry",
   "license": "MIT",
@@ -48,7 +48,7 @@
   },
   "devDependencies": {
     "@playwright/test": "~1.53.2",
-    "@sentry/core": "10.28.0",
+    "@sentry/core": "10.29.0",
     "eslint-plugin-regexp": "^1.15.0"
   },
   "volta": {
diff --git a/lerna.json b/lerna.json
index 593e71d979e2..be223901558e 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "npmClient": "yarn"
 }
diff --git a/packages/angular/package.json b/packages/angular/package.json
index 9e02da81a211..b86e736f3ae8 100644
--- a/packages/angular/package.json
+++ b/packages/angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/angular",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "description": "Official Sentry SDK for Angular",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/angular",
@@ -21,8 +21,8 @@
     "rxjs": "^6.5.5 || ^7.x"
   },
   "dependencies": {
-    "@sentry/browser": "10.28.0",
-    "@sentry/core": "10.28.0",
+    "@sentry/browser": "10.29.0",
+    "@sentry/core": "10.29.0",
     "tslib": "^2.4.1"
   },
   "devDependencies": {
diff --git a/packages/astro/package.json b/packages/astro/package.json
index 08d950c8e9b6..8277bf8b152e 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/astro",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "description": "Official Sentry SDK for Astro",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/astro",
@@ -56,9 +56,9 @@
     "astro": ">=3.x || >=4.0.0-beta || >=5.x"
   },
   "dependencies": {
-    "@sentry/browser": "10.28.0",
-    "@sentry/core": "10.28.0",
-    "@sentry/node": "10.28.0",
+    "@sentry/browser": "10.29.0",
+    "@sentry/core": "10.29.0",
+    "@sentry/node": "10.29.0",
     "@sentry/vite-plugin": "^4.1.0"
   },
   "devDependencies": {
diff --git a/packages/aws-serverless/package.json b/packages/aws-serverless/package.json
index 86e20d12f519..7db027739f54 100644
--- a/packages/aws-serverless/package.json
+++ b/packages/aws-serverless/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/aws-serverless",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "description": "Official Sentry SDK for AWS Lambda and AWS Serverless Environments",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/aws-serverless",
@@ -69,9 +69,9 @@
     "@opentelemetry/instrumentation": "^0.208.0",
     "@opentelemetry/instrumentation-aws-sdk": "0.64.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry/core": "10.28.0",
-    "@sentry/node": "10.28.0",
-    "@sentry/node-core": "10.28.0",
+    "@sentry/core": "10.29.0",
+    "@sentry/node": "10.29.0",
+    "@sentry/node-core": "10.29.0",
     "@types/aws-lambda": "^8.10.62"
   },
   "devDependencies": {
diff --git a/packages/browser-utils/package.json b/packages/browser-utils/package.json
index d52f4e1ad9cc..33ebffad4189 100644
--- a/packages/browser-utils/package.json
+++ b/packages/browser-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/browser-utils",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "description": "Browser Utilities for all Sentry JavaScript SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/browser-utils",
@@ -39,7 +39,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.28.0"
+    "@sentry/core": "10.29.0"
   },
   "scripts": {
     "build": "run-p build:transpile build:types",
diff --git a/packages/browser/package.json b/packages/browser/package.json
index e2be003f4601..971b114fbc33 100644
--- a/packages/browser/package.json
+++ b/packages/browser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/browser",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "description": "Official Sentry SDK for browsers",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/browser",
@@ -44,14 +44,14 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry-internal/browser-utils": "10.28.0",
-    "@sentry-internal/feedback": "10.28.0",
-    "@sentry-internal/replay": "10.28.0",
-    "@sentry-internal/replay-canvas": "10.28.0",
-    "@sentry/core": "10.28.0"
+    "@sentry-internal/browser-utils": "10.29.0",
+    "@sentry-internal/feedback": "10.29.0",
+    "@sentry-internal/replay": "10.29.0",
+    "@sentry-internal/replay-canvas": "10.29.0",
+    "@sentry/core": "10.29.0"
   },
   "devDependencies": {
-    "@sentry-internal/integration-shims": "10.28.0",
+    "@sentry-internal/integration-shims": "10.29.0",
     "fake-indexeddb": "^6.2.4"
   },
   "scripts": {
diff --git a/packages/bun/package.json b/packages/bun/package.json
index 1c0cb9a44bdd..f64447757df1 100644
--- a/packages/bun/package.json
+++ b/packages/bun/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/bun",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "description": "Official Sentry SDK for bun",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/bun",
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.28.0",
-    "@sentry/node": "10.28.0"
+    "@sentry/core": "10.29.0",
+    "@sentry/node": "10.29.0"
   },
   "devDependencies": {
     "bun-types": "^1.2.9"
diff --git a/packages/cloudflare/package.json b/packages/cloudflare/package.json
index 8896f95d6e9c..84dcdf3dd8c8 100644
--- a/packages/cloudflare/package.json
+++ b/packages/cloudflare/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/cloudflare",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "description": "Official Sentry SDK for Cloudflare Workers and Pages",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/cloudflare",
@@ -50,7 +50,7 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@sentry/core": "10.28.0"
+    "@sentry/core": "10.29.0"
   },
   "peerDependencies": {
     "@cloudflare/workers-types": "^4.x"
diff --git a/packages/core/package.json b/packages/core/package.json
index 175d193ea435..669a70e5e8ba 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/core",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "description": "Base implementation for all Sentry JavaScript SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/core",
diff --git a/packages/deno/package.json b/packages/deno/package.json
index 6e724e196f30..a3c03eec89d8 100644
--- a/packages/deno/package.json
+++ b/packages/deno/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/deno",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "description": "Official Sentry SDK for Deno",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/deno",
@@ -25,7 +25,7 @@
   ],
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@sentry/core": "10.28.0"
+    "@sentry/core": "10.29.0"
   },
   "scripts": {
     "deno-types": "node ./scripts/download-deno-types.mjs",
diff --git a/packages/ember/package.json b/packages/ember/package.json
index a2c165375056..037cebc5ef5c 100644
--- a/packages/ember/package.json
+++ b/packages/ember/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/ember",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "description": "Official Sentry SDK for Ember.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/ember",
@@ -32,8 +32,8 @@
   "dependencies": {
     "@babel/core": "^7.27.7",
     "@embroider/macros": "^1.16.0",
-    "@sentry/browser": "10.28.0",
-    "@sentry/core": "10.28.0",
+    "@sentry/browser": "10.29.0",
+    "@sentry/core": "10.29.0",
     "ember-auto-import": "^2.7.2",
     "ember-cli-babel": "^8.2.0",
     "ember-cli-htmlbars": "^6.1.1",
diff --git a/packages/eslint-config-sdk/package.json b/packages/eslint-config-sdk/package.json
index 46ae6668207e..e106483e5ddb 100644
--- a/packages/eslint-config-sdk/package.json
+++ b/packages/eslint-config-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/eslint-config-sdk",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "description": "Official Sentry SDK eslint config",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-config-sdk",
@@ -22,8 +22,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry-internal/eslint-plugin-sdk": "10.28.0",
-    "@sentry-internal/typescript": "10.28.0",
+    "@sentry-internal/eslint-plugin-sdk": "10.29.0",
+    "@sentry-internal/typescript": "10.29.0",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
     "eslint-config-prettier": "^9.1.0",
diff --git a/packages/eslint-plugin-sdk/package.json b/packages/eslint-plugin-sdk/package.json
index 78e414fe59bd..072badfb39da 100644
--- a/packages/eslint-plugin-sdk/package.json
+++ b/packages/eslint-plugin-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/eslint-plugin-sdk",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "description": "Official Sentry SDK eslint plugin",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-plugin-sdk",
diff --git a/packages/feedback/package.json b/packages/feedback/package.json
index 9f3d504683e0..b016c325ed71 100644
--- a/packages/feedback/package.json
+++ b/packages/feedback/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/feedback",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "description": "Sentry SDK integration for user feedback",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/feedback",
@@ -39,7 +39,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.28.0"
+    "@sentry/core": "10.29.0"
   },
   "devDependencies": {
     "preact": "^10.19.4"
diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json
index aa636d7bd036..523ef04f127a 100644
--- a/packages/gatsby/package.json
+++ b/packages/gatsby/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/gatsby",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "description": "Official Sentry SDK for Gatsby.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/gatsby",
@@ -45,8 +45,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.28.0",
-    "@sentry/react": "10.28.0",
+    "@sentry/core": "10.29.0",
+    "@sentry/react": "10.29.0",
     "@sentry/webpack-plugin": "^4.6.1"
   },
   "peerDependencies": {
diff --git a/packages/google-cloud-serverless/package.json b/packages/google-cloud-serverless/package.json
index b92bcb9a2bca..64761da8d428 100644
--- a/packages/google-cloud-serverless/package.json
+++ b/packages/google-cloud-serverless/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/google-cloud-serverless",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "description": "Official Sentry SDK for Google Cloud Functions",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/google-cloud-serverless",
@@ -48,8 +48,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.28.0",
-    "@sentry/node": "10.28.0",
+    "@sentry/core": "10.29.0",
+    "@sentry/node": "10.29.0",
     "@types/express": "^4.17.14"
   },
   "devDependencies": {
diff --git a/packages/integration-shims/package.json b/packages/integration-shims/package.json
index fa4673867071..0411d93e0d76 100644
--- a/packages/integration-shims/package.json
+++ b/packages/integration-shims/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/integration-shims",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "description": "Shims for integrations in Sentry SDK.",
   "main": "build/cjs/index.js",
   "module": "build/esm/index.js",
@@ -56,7 +56,7 @@
     "url": "https://github.com/getsentry/sentry-javascript/issues"
   },
   "dependencies": {
-    "@sentry/core": "10.28.0"
+    "@sentry/core": "10.29.0"
   },
   "engines": {
     "node": ">=18"
diff --git a/packages/nestjs/package.json b/packages/nestjs/package.json
index 1a340ef103da..3468a1a0e21e 100644
--- a/packages/nestjs/package.json
+++ b/packages/nestjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/nestjs",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "description": "Official Sentry SDK for NestJS",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/nestjs",
@@ -49,8 +49,8 @@
     "@opentelemetry/instrumentation": "^0.208.0",
     "@opentelemetry/instrumentation-nestjs-core": "0.55.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry/core": "10.28.0",
-    "@sentry/node": "10.28.0"
+    "@sentry/core": "10.29.0",
+    "@sentry/node": "10.29.0"
   },
   "devDependencies": {
     "@nestjs/common": "^10.0.0",
diff --git a/packages/nextjs/package.json b/packages/nextjs/package.json
index 1f628c76ef76..27f525cf86e3 100644
--- a/packages/nextjs/package.json
+++ b/packages/nextjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/nextjs",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "description": "Official Sentry SDK for Next.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/nextjs",
@@ -79,13 +79,13 @@
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
     "@rollup/plugin-commonjs": "28.0.1",
-    "@sentry-internal/browser-utils": "10.28.0",
+    "@sentry-internal/browser-utils": "10.29.0",
     "@sentry/bundler-plugin-core": "^4.6.1",
-    "@sentry/core": "10.28.0",
-    "@sentry/node": "10.28.0",
-    "@sentry/opentelemetry": "10.28.0",
-    "@sentry/react": "10.28.0",
-    "@sentry/vercel-edge": "10.28.0",
+    "@sentry/core": "10.29.0",
+    "@sentry/node": "10.29.0",
+    "@sentry/opentelemetry": "10.29.0",
+    "@sentry/react": "10.29.0",
+    "@sentry/vercel-edge": "10.29.0",
     "@sentry/webpack-plugin": "^4.6.1",
     "resolve": "1.22.8",
     "rollup": "^4.35.0",
diff --git a/packages/node-core/package.json b/packages/node-core/package.json
index ffb34c67db78..d2de42c4d42b 100644
--- a/packages/node-core/package.json
+++ b/packages/node-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/node-core",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "description": "Sentry Node-Core SDK",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/node-core",
@@ -67,8 +67,8 @@
   },
   "dependencies": {
     "@apm-js-collab/tracing-hooks": "^0.3.1",
-    "@sentry/core": "10.28.0",
-    "@sentry/opentelemetry": "10.28.0",
+    "@sentry/core": "10.29.0",
+    "@sentry/opentelemetry": "10.29.0",
     "import-in-the-middle": "^2"
   },
   "devDependencies": {
diff --git a/packages/node-native/package.json b/packages/node-native/package.json
index c49047205f8c..f5f2ef232c4b 100644
--- a/packages/node-native/package.json
+++ b/packages/node-native/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/node-native",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "description": "Native Tools for the Official Sentry Node.js SDK",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/node-native",
@@ -64,8 +64,8 @@
   },
   "dependencies": {
     "@sentry-internal/node-native-stacktrace": "^0.2.2",
-    "@sentry/core": "10.28.0",
-    "@sentry/node": "10.28.0"
+    "@sentry/core": "10.29.0",
+    "@sentry/node": "10.29.0"
   },
   "devDependencies": {
     "@types/node": "^18.19.1"
diff --git a/packages/node/package.json b/packages/node/package.json
index 40457a79fda9..867124cb6318 100644
--- a/packages/node/package.json
+++ b/packages/node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/node",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "description": "Sentry Node SDK using OpenTelemetry for performance instrumentation",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/node",
@@ -95,9 +95,9 @@
     "@opentelemetry/sdk-trace-base": "^2.2.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
     "@prisma/instrumentation": "6.19.0",
-    "@sentry/core": "10.28.0",
-    "@sentry/node-core": "10.28.0",
-    "@sentry/opentelemetry": "10.28.0",
+    "@sentry/core": "10.29.0",
+    "@sentry/node-core": "10.29.0",
+    "@sentry/opentelemetry": "10.29.0",
     "import-in-the-middle": "^2",
     "minimatch": "^9.0.0"
   },
diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json
index b2bafe25f57a..ea4cc88bc3a3 100644
--- a/packages/nuxt/package.json
+++ b/packages/nuxt/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/nuxt",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "description": "Official Sentry SDK for Nuxt",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/nuxt",
@@ -49,13 +49,13 @@
   },
   "dependencies": {
     "@nuxt/kit": "^3.13.2",
-    "@sentry/browser": "10.28.0",
-    "@sentry/cloudflare": "10.28.0",
-    "@sentry/core": "10.28.0",
-    "@sentry/node": "10.28.0",
+    "@sentry/browser": "10.29.0",
+    "@sentry/cloudflare": "10.29.0",
+    "@sentry/core": "10.29.0",
+    "@sentry/node": "10.29.0",
     "@sentry/rollup-plugin": "^4.3.0",
     "@sentry/vite-plugin": "^4.3.0",
-    "@sentry/vue": "10.28.0"
+    "@sentry/vue": "10.29.0"
   },
   "devDependencies": {
     "@nuxt/module-builder": "^0.8.4",
diff --git a/packages/opentelemetry/package.json b/packages/opentelemetry/package.json
index 7f0292aff52a..e218c87033e1 100644
--- a/packages/opentelemetry/package.json
+++ b/packages/opentelemetry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/opentelemetry",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "description": "Official Sentry utilities for OpenTelemetry",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/opentelemetry",
@@ -39,7 +39,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.28.0"
+    "@sentry/core": "10.29.0"
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.9.0",
diff --git a/packages/profiling-node/package.json b/packages/profiling-node/package.json
index cf5862af68dc..258b043cb2e6 100644
--- a/packages/profiling-node/package.json
+++ b/packages/profiling-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/profiling-node",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "description": "Official Sentry SDK for Node.js Profiling",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/profiling-node",
@@ -63,8 +63,8 @@
   },
   "dependencies": {
     "@sentry-internal/node-cpu-profiler": "^2.2.0",
-    "@sentry/core": "10.28.0",
-    "@sentry/node": "10.28.0"
+    "@sentry/core": "10.29.0",
+    "@sentry/node": "10.29.0"
   },
   "devDependencies": {
     "@types/node": "^18.19.1"
diff --git a/packages/react-router/package.json b/packages/react-router/package.json
index 2b314384977e..10aab7897e3e 100644
--- a/packages/react-router/package.json
+++ b/packages/react-router/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/react-router",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "description": "Official Sentry SDK for React Router (Framework)",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/react-router",
@@ -49,11 +49,11 @@
     "@opentelemetry/core": "^2.2.0",
     "@opentelemetry/instrumentation": "^0.208.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry/browser": "10.28.0",
+    "@sentry/browser": "10.29.0",
     "@sentry/cli": "^2.58.2",
-    "@sentry/core": "10.28.0",
-    "@sentry/node": "10.28.0",
-    "@sentry/react": "10.28.0",
+    "@sentry/core": "10.29.0",
+    "@sentry/node": "10.29.0",
+    "@sentry/react": "10.29.0",
     "@sentry/vite-plugin": "^4.1.0",
     "glob": "11.1.0"
   },
diff --git a/packages/react/package.json b/packages/react/package.json
index 1913ac05af1f..fd650fe0b87c 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/react",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "description": "Official Sentry SDK for React.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/react",
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "10.28.0",
-    "@sentry/core": "10.28.0",
+    "@sentry/browser": "10.29.0",
+    "@sentry/core": "10.29.0",
     "hoist-non-react-statics": "^3.3.2"
   },
   "peerDependencies": {
diff --git a/packages/remix/package.json b/packages/remix/package.json
index fd3017d1e097..615d64f87383 100644
--- a/packages/remix/package.json
+++ b/packages/remix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/remix",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "description": "Official Sentry SDK for Remix",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/remix",
@@ -69,9 +69,9 @@
     "@opentelemetry/semantic-conventions": "^1.37.0",
     "@remix-run/router": "1.x",
     "@sentry/cli": "^2.58.2",
-    "@sentry/core": "10.28.0",
-    "@sentry/node": "10.28.0",
-    "@sentry/react": "10.28.0",
+    "@sentry/core": "10.29.0",
+    "@sentry/node": "10.29.0",
+    "@sentry/react": "10.29.0",
     "glob": "^10.3.4",
     "yargs": "^17.6.0"
   },
diff --git a/packages/replay-canvas/package.json b/packages/replay-canvas/package.json
index 4e6ea9414278..d24ae95ca6af 100644
--- a/packages/replay-canvas/package.json
+++ b/packages/replay-canvas/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/replay-canvas",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "description": "Replay canvas integration",
   "main": "build/npm/cjs/index.js",
   "module": "build/npm/esm/index.js",
@@ -69,8 +69,8 @@
     "@sentry-internal/rrweb": "2.40.0"
   },
   "dependencies": {
-    "@sentry-internal/replay": "10.28.0",
-    "@sentry/core": "10.28.0"
+    "@sentry-internal/replay": "10.29.0",
+    "@sentry/core": "10.29.0"
   },
   "engines": {
     "node": ">=18"
diff --git a/packages/replay-internal/package.json b/packages/replay-internal/package.json
index b570677771be..6ac7b8590a05 100644
--- a/packages/replay-internal/package.json
+++ b/packages/replay-internal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/replay",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "description": "User replays for Sentry",
   "main": "build/npm/cjs/index.js",
   "module": "build/npm/esm/index.js",
@@ -81,7 +81,7 @@
   "homepage": "https://docs.sentry.io/platforms/javascript/session-replay/",
   "devDependencies": {
     "@babel/core": "^7.27.7",
-    "@sentry-internal/replay-worker": "10.28.0",
+    "@sentry-internal/replay-worker": "10.29.0",
     "@sentry-internal/rrweb": "2.40.0",
     "@sentry-internal/rrweb-snapshot": "2.40.0",
     "fflate": "0.8.2",
@@ -89,8 +89,8 @@
     "jsdom-worker": "^0.3.0"
   },
   "dependencies": {
-    "@sentry-internal/browser-utils": "10.28.0",
-    "@sentry/core": "10.28.0"
+    "@sentry-internal/browser-utils": "10.29.0",
+    "@sentry/core": "10.29.0"
   },
   "engines": {
     "node": ">=18"
diff --git a/packages/replay-worker/package.json b/packages/replay-worker/package.json
index 5ac394fe7791..396aa670652c 100644
--- a/packages/replay-worker/package.json
+++ b/packages/replay-worker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/replay-worker",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "description": "Worker for @sentry-internal/replay",
   "main": "build/esm/index.js",
   "module": "build/esm/index.js",
diff --git a/packages/solid/package.json b/packages/solid/package.json
index 72ba7e18d3f9..8d7b241316ca 100644
--- a/packages/solid/package.json
+++ b/packages/solid/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/solid",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "description": "Official Sentry SDK for Solid",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/solid",
@@ -54,8 +54,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "10.28.0",
-    "@sentry/core": "10.28.0"
+    "@sentry/browser": "10.29.0",
+    "@sentry/core": "10.29.0"
   },
   "peerDependencies": {
     "@solidjs/router": "^0.13.4 || ^0.14.0 || ^0.15.0",
diff --git a/packages/solidstart/package.json b/packages/solidstart/package.json
index 6ccb821e772a..7ad53d2db590 100644
--- a/packages/solidstart/package.json
+++ b/packages/solidstart/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/solidstart",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "description": "Official Sentry SDK for Solid Start",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/solidstart",
@@ -66,9 +66,9 @@
     }
   },
   "dependencies": {
-    "@sentry/core": "10.28.0",
-    "@sentry/node": "10.28.0",
-    "@sentry/solid": "10.28.0",
+    "@sentry/core": "10.29.0",
+    "@sentry/node": "10.29.0",
+    "@sentry/solid": "10.29.0",
     "@sentry/vite-plugin": "^4.1.0"
   },
   "devDependencies": {
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index da82fb63d1ea..4847d77da75d 100644
--- a/packages/svelte/package.json
+++ b/packages/svelte/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/svelte",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "description": "Official Sentry SDK for Svelte",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/svelte",
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "10.28.0",
-    "@sentry/core": "10.28.0",
+    "@sentry/browser": "10.29.0",
+    "@sentry/core": "10.29.0",
     "magic-string": "^0.30.0"
   },
   "peerDependencies": {
diff --git a/packages/sveltekit/package.json b/packages/sveltekit/package.json
index 1a10c32d9c13..926b22acc0b8 100644
--- a/packages/sveltekit/package.json
+++ b/packages/sveltekit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/sveltekit",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "description": "Official Sentry SDK for SvelteKit",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/sveltekit",
@@ -48,10 +48,10 @@
   },
   "dependencies": {
     "@babel/parser": "7.26.9",
-    "@sentry/cloudflare": "10.28.0",
-    "@sentry/core": "10.28.0",
-    "@sentry/node": "10.28.0",
-    "@sentry/svelte": "10.28.0",
+    "@sentry/cloudflare": "10.29.0",
+    "@sentry/core": "10.29.0",
+    "@sentry/node": "10.29.0",
+    "@sentry/svelte": "10.29.0",
     "@sentry/vite-plugin": "^4.1.0",
     "magic-string": "0.30.7",
     "recast": "0.23.11",
diff --git a/packages/tanstackstart-react/package.json b/packages/tanstackstart-react/package.json
index 230ad3657d81..642b9000c8ba 100644
--- a/packages/tanstackstart-react/package.json
+++ b/packages/tanstackstart-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/tanstackstart-react",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "description": "Official Sentry SDK for TanStack Start React",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/tanstackstart-react",
@@ -52,10 +52,10 @@
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry-internal/browser-utils": "10.28.0",
-    "@sentry/core": "10.28.0",
-    "@sentry/node": "10.28.0",
-    "@sentry/react": "10.28.0"
+    "@sentry-internal/browser-utils": "10.29.0",
+    "@sentry/core": "10.29.0",
+    "@sentry/node": "10.29.0",
+    "@sentry/react": "10.29.0"
   },
   "scripts": {
     "build": "run-p build:transpile build:types",
diff --git a/packages/tanstackstart/package.json b/packages/tanstackstart/package.json
index 314c496baf16..a5043986e2b2 100644
--- a/packages/tanstackstart/package.json
+++ b/packages/tanstackstart/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/tanstackstart",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "description": "Utilities for the Sentry TanStack Start SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/tanstackstart",
diff --git a/packages/types/package.json b/packages/types/package.json
index 671dd8732658..cd95f72afc88 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/types",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "description": "Types for all Sentry JavaScript SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/types",
@@ -57,7 +57,7 @@
     "yalc:publish": "yalc publish --push --sig"
   },
   "dependencies": {
-    "@sentry/core": "10.28.0"
+    "@sentry/core": "10.29.0"
   },
   "volta": {
     "extends": "../../package.json"
diff --git a/packages/typescript/package.json b/packages/typescript/package.json
index ba1f5a3d5d9a..fc8dc3170d4c 100644
--- a/packages/typescript/package.json
+++ b/packages/typescript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/typescript",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "description": "Typescript configuration used at Sentry",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/typescript",
diff --git a/packages/vercel-edge/package.json b/packages/vercel-edge/package.json
index f8e1f076cc17..9c3df1ef6188 100644
--- a/packages/vercel-edge/package.json
+++ b/packages/vercel-edge/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/vercel-edge",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "description": "Official Sentry SDK for the Vercel Edge Runtime",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/vercel-edge",
@@ -41,14 +41,14 @@
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/resources": "^2.2.0",
-    "@sentry/core": "10.28.0"
+    "@sentry/core": "10.29.0"
   },
   "devDependencies": {
     "@edge-runtime/types": "3.0.1",
     "@opentelemetry/core": "^2.2.0",
     "@opentelemetry/sdk-trace-base": "^2.2.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry/opentelemetry": "10.28.0"
+    "@sentry/opentelemetry": "10.29.0"
   },
   "scripts": {
     "build": "run-p build:transpile build:types",
diff --git a/packages/vue/package.json b/packages/vue/package.json
index 643a9ca30e5e..f75cb129cfdc 100644
--- a/packages/vue/package.json
+++ b/packages/vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/vue",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "description": "Official Sentry SDK for Vue.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/vue",
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "10.28.0",
-    "@sentry/core": "10.28.0"
+    "@sentry/browser": "10.29.0",
+    "@sentry/core": "10.29.0"
   },
   "peerDependencies": {
     "pinia": "2.x || 3.x",
diff --git a/packages/wasm/package.json b/packages/wasm/package.json
index 1996c8e6e1c8..c6f622b15501 100644
--- a/packages/wasm/package.json
+++ b/packages/wasm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/wasm",
-  "version": "10.28.0",
+  "version": "10.29.0",
   "description": "Support for WASM.",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/wasm",
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "10.28.0",
-    "@sentry/core": "10.28.0"
+    "@sentry/browser": "10.29.0",
+    "@sentry/core": "10.29.0"
   },
   "scripts": {
     "build": "run-p build:transpile build:bundle build:types",

From 422d546553ace0b862efbb9bfab18f1d7b74a6c4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Dec 2025 11:55:43 -0500
Subject: [PATCH 172/186] chore(deps): bump next from 15.5.4 to 15.5.7 in
 /dev-packages/e2e-tests/test-applications/nextjs-15-intl (#18400)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [next](https://github.com/vercel/next.js) from 15.5.4 to 15.5.7.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/vercel/next.js/releases">next's
releases</a>.</em></p>
<blockquote>
<h2>v15.5.7</h2>
<p>Please see <a
href="https://nextjs.org/blog/CVE-2025-66478">CVE-2025-66478</a> for
additional details about this release.</p>
<h2>v15.5.6</h2>
<blockquote>
<p>[!NOTE]<br />
This release is backporting bug fixes. It does <strong>not</strong>
include all pending features/changes on canary.</p>
</blockquote>
<h3>Core Changes</h3>
<ul>
<li>Turbopack: don't define process.cwd() in node_modules <a
href="https://github.com/vercel/next.js/issues/83452">#83452</a></li>
</ul>
<h3>Credits</h3>
<p>Huge thanks to <a
href="https://github.com/mischnic"><code>@​mischnic</code></a> for
helping!</p>
<h2>v15.5.5</h2>
<blockquote>
<p>[!NOTE]<br />
This release is backporting bug fixes. It does <strong>not</strong>
include all pending features/changes on canary.</p>
</blockquote>
<h3>Core Changes</h3>
<ul>
<li>Split code-frame into separate compiled package (<a
href="https://github.com/vercel/next.js/issues/84238">#84238</a>)</li>
<li>Add deprecation warning to Runtime config (<a
href="https://github.com/vercel/next.js/issues/84650">#84650</a>)</li>
<li>fix: unstable_cache should perform blocking revalidation during ISR
revalidation (<a
href="https://github.com/vercel/next.js/issues/84716">#84716</a>)</li>
<li>feat: <code>experimental.middlewareClientMaxBodySize</code> body
cloning limit (<a
href="https://github.com/vercel/next.js/issues/84722">#84722</a>)</li>
<li>fix: missing next/link types with typedRoutes (<a
href="https://github.com/vercel/next.js/issues/84779">#84779</a>)</li>
</ul>
<h3>Misc Changes</h3>
<ul>
<li>docs: early October improvements and fixes (<a
href="https://github.com/vercel/next.js/issues/84334">#84334</a>)</li>
</ul>
<h3>Credits</h3>
<p>Huge thanks to <a
href="https://github.com/devjiwonchoi"><code>@​devjiwonchoi</code></a>,
<a href="https://github.com/ztanner"><code>@​ztanner</code></a>, and <a
href="https://github.com/icyJoseph"><code>@​icyJoseph</code></a> for
helping!</p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/vercel/next.js/commit/3eaf68b09b2b6b8c0c8e080a9713e131a78dc529"><code>3eaf68b</code></a>
v15.5.7</li>
<li><a
href="https://github.com/vercel/next.js/commit/8367ce592ad0190ec941dac1ce6d0b5a44606593"><code>8367ce5</code></a>
update version script</li>
<li><a
href="https://github.com/vercel/next.js/commit/9115040008baf255499136933a50084b76f4bfd8"><code>9115040</code></a>
Update React Version for Next.js 15.5.7 (<a
href="https://github.com/vercel/next.js/issues/10">#10</a>)</li>
<li><a
href="https://github.com/vercel/next.js/commit/96f699902a5c57293e312591f843080a4d68ee1b"><code>96f6999</code></a>
update tag</li>
<li><a
href="https://github.com/vercel/next.js/commit/55ef0e3ebc1d43e1a4a191341dc2a415e12124d4"><code>55ef0e3</code></a>
v15.5.6</li>
<li><a
href="https://github.com/vercel/next.js/commit/92bbbb1beca8738c783ea36ee5dd84d89cd638be"><code>92bbbb1</code></a>
Backport: don't define <code>process.cwd()</code> in node_modules (<a
href="https://github.com/vercel/next.js/issues/84957">#84957</a>)</li>
<li><a
href="https://github.com/vercel/next.js/commit/f895b727626ad921d5068bcfada284f68c998bfa"><code>f895b72</code></a>
Fix url-imports test on 15-5 (<a
href="https://github.com/vercel/next.js/issues/84966">#84966</a>)</li>
<li><a
href="https://github.com/vercel/next.js/commit/81f530db2652a96d4b88fabaf4dfaf30c2269695"><code>81f530d</code></a>
v15.5.5</li>
<li><a
href="https://github.com/vercel/next.js/commit/9abbc0e9eba67d635d4da5293273de123263101d"><code>9abbc0e</code></a>
[backport] fix: missing <code>next/link</code> types with
<code>typedRoutes</code> (<a
href="https://github.com/vercel/next.js/issues/82814">#82814</a>)
(<a
href="https://github.com/vercel/next.js/issues/84779">#84779</a>)</li>
<li><a
href="https://github.com/vercel/next.js/commit/121e1b566f8bf632dd09bf06fbbdb5ff5a21a51c"><code>121e1b5</code></a>
[backport] docs: early October improvements and fixes (<a
href="https://github.com/vercel/next.js/issues/84334">#84334</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/vercel/next.js/compare/v15.5.4...v15.5.7">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=next&package-manager=npm_and_yarn&previous-version=15.5.4&new-version=15.5.7)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
You can disable automated security fix PRs for this repo from the
[Security Alerts
page](https://github.com/getsentry/sentry-javascript/network/alerts).

</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .../e2e-tests/test-applications/nextjs-15-intl/package.json     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-packages/e2e-tests/test-applications/nextjs-15-intl/package.json b/dev-packages/e2e-tests/test-applications/nextjs-15-intl/package.json
index 359b939eaf50..af7863b46e81 100644
--- a/dev-packages/e2e-tests/test-applications/nextjs-15-intl/package.json
+++ b/dev-packages/e2e-tests/test-applications/nextjs-15-intl/package.json
@@ -15,7 +15,7 @@
     "@types/node": "^18.19.1",
     "@types/react": "18.0.26",
     "@types/react-dom": "18.0.9",
-    "next": "15.5.4",
+    "next": "15.5.7",
     "next-intl": "^4.3.12",
     "react": "latest",
     "react-dom": "latest",

From 4b7afc96718b9c525744260414938e66ec685a1d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Dec 2025 12:36:32 -0500
Subject: [PATCH 173/186] chore(deps): bump next from 16.0.0 to 16.0.7 in
 /dev-packages/e2e-tests/test-applications/nextjs-16 (#18399)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [next](https://github.com/vercel/next.js) from 16.0.0 to 16.0.7.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/vercel/next.js/releases">next's
releases</a>.</em></p>
<blockquote>
<h2>v16.0.7</h2>
<p>Please see <a
href="https://nextjs.org/blog/CVE-2025-66478">CVE-2025-66478</a> for
additional details about this release.</p>
<h2>v16.0.6</h2>
<blockquote>
<p>[!NOTE]
This release is backporting bug fixes. It does <strong>not</strong>
include all pending features/changes on canary.</p>
</blockquote>
<h3>Core Changes</h3>
<ul>
<li>bump the browserslist version to silence a warning in CI (<a
href="https://github.com/vercel/next.js/issues/86625">#86625</a>)</li>
</ul>
<h3>Credits</h3>
<p>Huge thanks to <a
href="https://github.com/lukesandberg"><code>@​lukesandberg</code></a>
for helping!</p>
<h2>v16.0.5</h2>
<blockquote>
<p>[!NOTE]
This release is backporting bug fixes. It does <strong>not</strong>
include all pending features/changes on canary.</p>
</blockquote>
<h3>Core Changes</h3>
<ul>
<li>fix(nodejs-middleware): await for body cloning to be properly
finalized (<a
href="https://github.com/vercel/next.js/issues/85418">#85418</a>)</li>
</ul>
<h3>Credits</h3>
<p>Huge thanks to <a
href="https://github.com/lucasadrianof"><code>@​lucasadrianof</code></a>
for helping!</p>
<h2>v16.0.4</h2>
<blockquote>
<p>[!NOTE]
This release is backporting bug fixes. It does <strong>not</strong>
include all pending features/changes on canary.</p>
</blockquote>
<h3>Core Changes</h3>
<ul>
<li>fix: Rename proxy.js to middleware.js in NFT file (<a
href="https://github.com/vercel/next.js/issues/86214">#86214</a>)</li>
<li>fix: prevent fetch abort errors propagating to user error boundaries
(<a
href="https://github.com/vercel/next.js/issues/86277">#86277</a>)</li>
<li>Turbopack: fix passing project options from napi (<a
href="https://github.com/vercel/next.js/issues/86256">#86256</a>)</li>
</ul>
<h3>Credits</h3>
<p>Huge thanks to <a
href="https://github.com/devjiwonchoi"><code>@​devjiwonchoi</code></a>,
<a href="https://github.com/sokra"><code>@​sokra</code></a> and <a
href="https://github.com/ztanner"><code>@​ztanner</code></a> for
helping!</p>
<h2>v16.0.3</h2>
<h3>Core Changes</h3>
<ul>
<li>fix: Rspack throw error when using ForceCompleteRuntimePlugin: <a
href="https://github.com/vercel/next.js/issues/85221">#85221</a></li>
<li>fix: build CLI output not displaying Proxy (Middleware) when nodejs
runtime: <a
href="https://github.com/vercel/next.js/issues/85403">#85403</a></li>
<li>fix: staleTimes.static should consistently enforce a 30s minimum: <a
href="https://github.com/vercel/next.js/issues/85479">#85479</a></li>
<li>[turbopack] fix build of empty entries of pages: <a
href="https://github.com/vercel/next.js/issues/84873">#84873</a></li>
<li>Cache the head separately from the route tree: <a
href="https://github.com/vercel/next.js/issues/84724">#84724</a></li>
<li>Allow inspecting dev server on default port with <code>next dev
--inspect</code>: <a
href="https://github.com/vercel/next.js/issues/85037">#85037</a></li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/vercel/next.js/commit/7492122a3bbc6655b64ccba04076c73ab418cdcc"><code>7492122</code></a>
v16.0.7</li>
<li><a
href="https://github.com/vercel/next.js/commit/d21259d920f666814fa634e744d2c6e797ceae43"><code>d21259d</code></a>
update version script</li>
<li><a
href="https://github.com/vercel/next.js/commit/b1a04a84e991b48b6558d15841b86f3017878607"><code>b1a04a8</code></a>
Update React Version (<a
href="https://github.com/vercel/next.js/issues/11">#11</a>)</li>
<li><a
href="https://github.com/vercel/next.js/commit/aab1edcb8d7a57a6f7a1637d0f87be84ea62edc8"><code>aab1edc</code></a>
v16.0.6</li>
<li><a
href="https://github.com/vercel/next.js/commit/279f2e319e939af54db81f9f5db730501f755284"><code>279f2e3</code></a>
bump the browserslist version to silence a warning in CI (<a
href="https://github.com/vercel/next.js/issues/86625">#86625</a>)</li>
<li><a
href="https://github.com/vercel/next.js/commit/89ccb9fc86c13ca6aaaa5eb0e61c02c309abf1a3"><code>89ccb9f</code></a>
v16.0.5</li>
<li><a
href="https://github.com/vercel/next.js/commit/75f63f70084de2198a22267fc344884b091f9d7c"><code>75f63f7</code></a>
backport fix(nodejs-middleware): await for body cloning to be properly
finali...</li>
<li><a
href="https://github.com/vercel/next.js/commit/d440c75650c79b8be450df5fd434afbfe230506a"><code>d440c75</code></a>
v16.0.4</li>
<li><a
href="https://github.com/vercel/next.js/commit/296923e0cd66084708ac108026c414b4a64d07e9"><code>296923e</code></a>
Turbopack: fix passing project options from napi (<a
href="https://github.com/vercel/next.js/issues/86256">#86256</a>)</li>
<li><a
href="https://github.com/vercel/next.js/commit/98317f5a3bd0cae2565e44e0108a0d7ab6cd5185"><code>98317f5</code></a>
fix: prevent fetch abort errors propagating to user error boundaries (<a
href="https://github.com/vercel/next.js/issues/86277">#86277</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/vercel/next.js/compare/v16.0.0...v16.0.7">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=next&package-manager=npm_and_yarn&previous-version=16.0.0&new-version=16.0.7)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
You can disable automated security fix PRs for this repo from the
[Security Alerts
page](https://github.com/getsentry/sentry-javascript/network/alerts).

</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 dev-packages/e2e-tests/test-applications/nextjs-16/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16/package.json b/dev-packages/e2e-tests/test-applications/nextjs-16/package.json
index 662e1b85936a..54e3fc3eddeb 100644
--- a/dev-packages/e2e-tests/test-applications/nextjs-16/package.json
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16/package.json
@@ -27,7 +27,7 @@
     "@sentry/core": "latest || *",
     "ai": "^3.0.0",
     "import-in-the-middle": "^2",
-    "next": "16.0.0",
+    "next": "16.0.7",
     "react": "19.1.0",
     "react-dom": "19.1.0",
     "require-in-the-middle": "^8",

From 656e8de4bc2f0b15ac9f164b8c4eec23eb8fd180 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Dec 2025 17:37:11 +0000
Subject: [PATCH 174/186] ci(deps): bump actions/create-github-app-token from
 2.1.4 to 2.2.0 (#18362)

---
 .github/workflows/auto-release.yml | 2 +-
 .github/workflows/release.yml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/auto-release.yml b/.github/workflows/auto-release.yml
index f693c62d765d..e1f22cff2f64 100644
--- a/.github/workflows/auto-release.yml
+++ b/.github/workflows/auto-release.yml
@@ -15,7 +15,7 @@ jobs:
     steps:
       - name: Get auth token
         id: token
-        uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
+        uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
         with:
           app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
           private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0ff10040dc97..4a0278ae85a4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -19,7 +19,7 @@ jobs:
     steps:
       - name: Get auth token
         id: token
-        uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
+        uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
         with:
           app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
           private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}

From fdf22a31afce27e71d74ae46db7de253e53fcb6f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Dec 2025 21:39:57 +0100
Subject: [PATCH 175/186] chore(deps): bump next from 15.5.4 to 15.5.7 in
 /dev-packages/e2e-tests/test-applications/nextjs-15 (#18411)

---
 dev-packages/e2e-tests/test-applications/nextjs-15/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-packages/e2e-tests/test-applications/nextjs-15/package.json b/dev-packages/e2e-tests/test-applications/nextjs-15/package.json
index 9d56bf6c3df5..2c0a4956e34a 100644
--- a/dev-packages/e2e-tests/test-applications/nextjs-15/package.json
+++ b/dev-packages/e2e-tests/test-applications/nextjs-15/package.json
@@ -20,7 +20,7 @@
     "@types/react": "18.0.26",
     "@types/react-dom": "18.0.9",
     "ai": "^3.0.0",
-    "next": "15.5.4",
+    "next": "15.5.7",
     "react": "latest",
     "react-dom": "latest",
     "typescript": "~5.0.0",

From 6e539e03c827ef1ad53d2279a91943f9b0deea1a Mon Sep 17 00:00:00 2001
From: Abdelrahman Awad <me@awad.dev>
Date: Fri, 5 Dec 2025 17:21:01 +0200
Subject: [PATCH 176/186] feat(nextjs): Deprecate Webpack top-level options
 (#18343)

This PR deprecates the webpack-only configurations via the `@deprecated`
JSDoc annotation and introduces a new `webpack` config namespace for
them.

Under the hood the logic was changed to read from the new values, with a
compatibility layer that sets them from the deprecated top-level options
while warning for each option if used.

This should set us up for a v11/v12 deletion of those options.

I might have missed a few options that only affect webpack, so I
appreciate a good look at this. At any case this isn't breaking so even
if missed a few, users won't experience disruptions.
---
 .../src/config/getBuildPluginOptions.ts       |  10 +-
 packages/nextjs/src/config/types.ts           | 106 ++++++++++
 packages/nextjs/src/config/webpack.ts         |  12 +-
 .../nextjs/src/config/withSentryConfig.ts     |  92 ++++++++-
 .../test/config/getBuildPluginOptions.test.ts |  40 ++--
 .../test/config/withSentryConfig.test.ts      | 183 ++++++++++++++++++
 6 files changed, 414 insertions(+), 29 deletions(-)

diff --git a/packages/nextjs/src/config/getBuildPluginOptions.ts b/packages/nextjs/src/config/getBuildPluginOptions.ts
index e36e88802fa5..e43061eb59a5 100644
--- a/packages/nextjs/src/config/getBuildPluginOptions.ts
+++ b/packages/nextjs/src/config/getBuildPluginOptions.ts
@@ -205,7 +205,7 @@ function createReleaseConfig(
       vcsRemote: sentryBuildOptions.release?.vcsRemote,
       setCommits: sentryBuildOptions.release?.setCommits,
       deploy: sentryBuildOptions.release?.deploy,
-      ...sentryBuildOptions.unstable_sentryWebpackPluginOptions?.release,
+      ...sentryBuildOptions.webpack?.unstable_sentryWebpackPluginOptions?.release,
     };
   }
 
@@ -272,8 +272,8 @@ export function getBuildPluginOptions({
     reactComponentAnnotation: buildTool.startsWith('after-production-compile')
       ? undefined
       : {
-          ...sentryBuildOptions.reactComponentAnnotation,
-          ...sentryBuildOptions.unstable_sentryWebpackPluginOptions?.reactComponentAnnotation,
+          ...sentryBuildOptions.webpack?.reactComponentAnnotation,
+          ...sentryBuildOptions.webpack?.unstable_sentryWebpackPluginOptions?.reactComponentAnnotation,
         },
     silent: sentryBuildOptions.silent,
     url: sentryBuildOptions.sentryUrl,
@@ -283,7 +283,7 @@ export function getBuildPluginOptions({
       assets: sentryBuildOptions.sourcemaps?.assets ?? sourcemapUploadAssets,
       ignore: sentryBuildOptions.sourcemaps?.ignore ?? sourcemapUploadIgnore,
       filesToDeleteAfterUpload,
-      ...sentryBuildOptions.unstable_sentryWebpackPluginOptions?.sourcemaps,
+      ...sentryBuildOptions.webpack?.unstable_sentryWebpackPluginOptions?.sourcemaps,
     },
     release: createReleaseConfig(releaseName, sentryBuildOptions),
     bundleSizeOptimizations: {
@@ -295,6 +295,6 @@ export function getBuildPluginOptions({
         metaFramework: 'nextjs',
       },
     },
-    ...sentryBuildOptions.unstable_sentryWebpackPluginOptions,
+    ...sentryBuildOptions.webpack?.unstable_sentryWebpackPluginOptions,
   };
 }
diff --git a/packages/nextjs/src/config/types.ts b/packages/nextjs/src/config/types.ts
index 28e038b6d0f2..c7472c08fc20 100644
--- a/packages/nextjs/src/config/types.ts
+++ b/packages/nextjs/src/config/types.ts
@@ -57,6 +57,91 @@ export type NextConfigObject = {
   };
 };
 
+export type SentryBuildWebpackOptions = {
+  /**
+   * Automatically instrument Next.js data fetching methods and Next.js API routes with error and performance monitoring.
+   * Defaults to `true`.
+   */
+  autoInstrumentServerFunctions?: boolean;
+
+  /**
+   * Automatically instrument Next.js middleware with error and performance monitoring. Defaults to `true`.
+   */
+  autoInstrumentMiddleware?: boolean;
+
+  /**
+   * Automatically instrument components in the `app` directory with error monitoring. Defaults to `true`.
+   */
+  autoInstrumentAppDirectory?: boolean;
+
+  /**
+   * Automatically create cron monitors in Sentry for your Vercel Cron Jobs if configured via `vercel.json`.
+   *
+   * Defaults to `false`.
+   */
+  automaticVercelMonitors?: boolean;
+
+  /**
+   * Exclude certain serverside API routes or pages from being instrumented with Sentry during build-time. This option
+   * takes an array of strings or regular expressions. This options also affects pages in the `app` directory.
+   *
+   * NOTE: Pages should be specified as routes (`/animals` or `/api/animals/[animalType]/habitat`), not filepaths
+   * (`pages/animals/index.js` or `.\src\pages\api\animals\[animalType]\habitat.tsx`), and strings must be be a full,
+   * exact match.
+   *
+   * Notice: If you build Next.js with turbopack, the Sentry SDK will no longer apply build-time instrumentation and
+   * purely rely on Next.js telemetry features, meaning that this option will effectively no-op.
+   */
+  excludeServerRoutes?: Array<RegExp | string>;
+
+  /**
+   * Disables automatic injection of Sentry's Webpack configuration.
+   *
+   * By default, the Sentry Next.js SDK injects its own Webpack configuration to enable features such as
+   * source map upload and automatic instrumentation. Set this option to `true` if you want to prevent
+   * the SDK from modifying your Webpack config (for example, if you want to handle Sentry integration manually
+   * or if you are on an older version of Next.js while using Turbopack).
+   */
+  disableSentryConfig?: boolean;
+
+  /**
+   * Tree-shaking options to help reduce the size of the Sentry SDK bundle.
+   */
+  treeshake?: {
+    /**
+     * Removes Sentry SDK logger statements from the bundle. Note that this doesn't affect Sentry Logs.
+     */
+    removeDebugLogging?: boolean;
+  };
+
+  /**
+   * Options to be passed directly to the Sentry Webpack Plugin (`@sentry/webpack-plugin`) that ships with the Sentry SDK.
+   * You can use this option to override any options the SDK passes to the Webpack plugin.
+   *
+   * Please note that this option is unstable and may change in a breaking way in any release.
+   */
+  unstable_sentryWebpackPluginOptions?: SentryWebpackPluginOptions;
+
+  /**
+   * Options related to react component name annotations.
+   * Disabled by default, unless a value is set for this option.
+   * When enabled, your app's DOM will automatically be annotated during build-time with their respective component names.
+   * This will unlock the capability to search for Replays in Sentry by component name, as well as see component names in breadcrumbs and performance monitoring.
+   * Please note that this feature is not currently supported by the esbuild bundler plugins, and will only annotate React components
+   */
+  reactComponentAnnotation?: {
+    /**
+     * Whether the component name annotate plugin should be enabled or not.
+     */
+    enabled?: boolean;
+
+    /**
+     * A list of strings representing the names of components to ignore. The plugin will not apply `data-sentry` annotations on the DOM element for these components.
+     */
+    ignoredComponents?: string[];
+  };
+};
+
 export type SentryBuildOptions = {
   /**
    * The slug of the Sentry organization associated with the app.
@@ -363,6 +448,8 @@ export type SentryBuildOptions = {
    * When enabled, your app's DOM will automatically be annotated during build-time with their respective component names.
    * This will unlock the capability to search for Replays in Sentry by component name, as well as see component names in breadcrumbs and performance monitoring.
    * Please note that this feature is not currently supported by the esbuild bundler plugins, and will only annotate React components
+   *
+   * @deprecated Use `webpack.reactComponentAnnotation` instead.
    */
   reactComponentAnnotation?: {
     /**
@@ -381,6 +468,7 @@ export type SentryBuildOptions = {
    * You can use this option to override any options the SDK passes to the webpack plugin.
    *
    * Please note that this option is unstable and may change in a breaking way in any release.
+   * @deprecated Use `webpack.unstable_sentryWebpackPluginOptions` instead.
    */
   unstable_sentryWebpackPluginOptions?: SentryWebpackPluginOptions;
 
@@ -391,6 +479,8 @@ export type SentryBuildOptions = {
    * Disabling this option will leave you without readable stacktraces for dependencies and Next.js-internal code.
    *
    * Defaults to `false`.
+   *
+   * This option applies to both webpack and turbopack builds.
    */
   // Enabling this option may upload a lot of source maps and since the sourcemap upload endpoint in Sentry is super
   // slow we don't enable it by default so that we don't opaquely increase build times for users.
@@ -400,16 +490,19 @@ export type SentryBuildOptions = {
   /**
    * Automatically instrument Next.js data fetching methods and Next.js API routes with error and performance monitoring.
    * Defaults to `true`.
+   * @deprecated Use `webpack.autoInstrumentServerFunctions` instead.
    */
   autoInstrumentServerFunctions?: boolean;
 
   /**
    * Automatically instrument Next.js middleware with error and performance monitoring. Defaults to `true`.
+   * @deprecated Use `webpack.autoInstrumentMiddleware` instead.
    */
   autoInstrumentMiddleware?: boolean;
 
   /**
    * Automatically instrument components in the `app` directory with error monitoring. Defaults to `true`.
+   * @deprecated Use `webpack.autoInstrumentAppDirectory` instead.
    */
   autoInstrumentAppDirectory?: boolean;
 
@@ -423,6 +516,8 @@ export type SentryBuildOptions = {
    *
    * Notice: If you build Next.js with turbopack, the Sentry SDK will no longer apply build-time instrumentation and
    * purely rely on Next.js telemetry features, meaning that this option will effectively no-op.
+   *
+   * @deprecated Use `webpack.excludeServerRoutes` instead.
    */
   excludeServerRoutes?: Array<RegExp | string>;
 
@@ -439,6 +534,8 @@ export type SentryBuildOptions = {
 
   /**
    * Tree shakes Sentry SDK logger statements from the bundle.
+   *
+   * @deprecated Use `webpack.treeshake.removeDebugLogging` instead.
    */
   disableLogger?: boolean;
 
@@ -446,6 +543,8 @@ export type SentryBuildOptions = {
    * Automatically create cron monitors in Sentry for your Vercel Cron Jobs if configured via `vercel.json`.
    *
    * Defaults to `false`.
+   *
+   * @deprecated Use `webpack.automaticVercelMonitors` instead.
    */
   automaticVercelMonitors?: boolean;
 
@@ -497,6 +596,8 @@ export type SentryBuildOptions = {
    * the SDK from modifying your Webpack config (for example, if you want to handle Sentry integration manually
    * or if you are on an older version of Next.js while using Turbopack).
    *
+   * @deprecated Use `webpack.disableSentryConfig` instead.
+   *
    * @default false
    */
   disableSentryWebpackConfig?: boolean;
@@ -519,6 +620,11 @@ export type SentryBuildOptions = {
   _experimental?: Partial<{
     thirdPartyOriginStackFrames?: boolean;
   }>;
+
+  /**
+   * Options related to webpack builds, has no effect if you are using Turbopack.
+   */
+  webpack?: SentryBuildWebpackOptions;
 };
 
 export type NextConfigFunction = (
diff --git a/packages/nextjs/src/config/webpack.ts b/packages/nextjs/src/config/webpack.ts
index 3b4eae22898f..3630e1005c87 100644
--- a/packages/nextjs/src/config/webpack.ts
+++ b/packages/nextjs/src/config/webpack.ts
@@ -145,7 +145,7 @@ export function constructWebpackConfigFunction({
       appDir: appDirPath,
       pagesDir: pagesDirPath,
       pageExtensionRegex,
-      excludeServerRoutes: userSentryOptions.excludeServerRoutes,
+      excludeServerRoutes: userSentryOptions.webpack?.excludeServerRoutes,
       nextjsRequestAsyncStorageModulePath: getRequestAsyncStorageModuleLocation(
         projectDir,
         rawNewConfig.resolve?.modules,
@@ -220,7 +220,7 @@ export function constructWebpackConfigFunction({
       );
     };
 
-    if (isServer && userSentryOptions.autoInstrumentServerFunctions !== false) {
+    if (isServer && userSentryOptions.webpack?.autoInstrumentServerFunctions !== false) {
       // It is very important that we insert our loaders at the beginning of the array because we expect any sort of transformations/transpilations (e.g. TS -> JS) to already have happened.
 
       // Wrap pages
@@ -239,7 +239,7 @@ export function constructWebpackConfigFunction({
 
       let vercelCronsConfig: VercelCronsConfig = undefined;
       try {
-        if (process.env.VERCEL && userSentryOptions.automaticVercelMonitors) {
+        if (process.env.VERCEL && userSentryOptions.webpack?.automaticVercelMonitors) {
           // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
           vercelCronsConfig = JSON.parse(fs.readFileSync(path.join(process.cwd(), 'vercel.json'), 'utf8')).crons;
           if (vercelCronsConfig) {
@@ -277,7 +277,7 @@ export function constructWebpackConfigFunction({
 
       // Wrap middleware
       const canWrapStandaloneMiddleware = userNextConfig.output !== 'standalone' || !major || major < 16;
-      if ((userSentryOptions.autoInstrumentMiddleware ?? true) && canWrapStandaloneMiddleware) {
+      if ((userSentryOptions.webpack?.autoInstrumentMiddleware ?? true) && canWrapStandaloneMiddleware) {
         newConfig.module.rules.unshift({
           test: isMiddlewareResource,
           use: [
@@ -293,7 +293,7 @@ export function constructWebpackConfigFunction({
       }
     }
 
-    if (isServer && userSentryOptions.autoInstrumentAppDirectory !== false) {
+    if (isServer && userSentryOptions.webpack?.autoInstrumentAppDirectory !== false) {
       // Wrap server components
       newConfig.module.rules.unshift({
         test: isServerComponentResource,
@@ -428,7 +428,7 @@ export function constructWebpackConfigFunction({
       }
     }
 
-    if (userSentryOptions.disableLogger) {
+    if (userSentryOptions.webpack?.treeshake?.removeDebugLogging) {
       newConfig.plugins = newConfig.plugins || [];
       newConfig.plugins.push(
         new buildContext.webpack.DefinePlugin({
diff --git a/packages/nextjs/src/config/withSentryConfig.ts b/packages/nextjs/src/config/withSentryConfig.ts
index 892f4d6745fa..835ef6dc68a4 100644
--- a/packages/nextjs/src/config/withSentryConfig.ts
+++ b/packages/nextjs/src/config/withSentryConfig.ts
@@ -98,12 +98,102 @@ function generateRandomTunnelRoute(): string {
   return `/${randomString}`;
 }
 
+/**
+ * Migrates deprecated top-level webpack options to the new `webpack.*` path for backward compatibility.
+ * The new path takes precedence over deprecated options. This mutates the userSentryOptions object.
+ */
+function migrateDeprecatedWebpackOptions(userSentryOptions: SentryBuildOptions): void {
+  // Initialize webpack options if not present
+  userSentryOptions.webpack = userSentryOptions.webpack || {};
+
+  const webpack = userSentryOptions.webpack;
+
+  const withDeprecatedFallback = <T>(
+    newValue: T | undefined,
+    deprecatedValue: T | undefined,
+    message: string,
+  ): T | undefined => {
+    if (deprecatedValue !== undefined) {
+      // eslint-disable-next-line no-console
+      console.warn(message);
+    }
+
+    return newValue ?? deprecatedValue;
+  };
+
+  const deprecatedMessage = (deprecatedPath: string, newPath: string): string =>
+    `[@sentry/nextjs] DEPRECATION WARNING: ${deprecatedPath} is deprecated and will be removed in a future version. Use ${newPath} instead.`;
+
+  /* eslint-disable deprecation/deprecation */
+  // Migrate each deprecated option to the new path, but only if the new path isn't already set
+  webpack.autoInstrumentServerFunctions = withDeprecatedFallback(
+    webpack.autoInstrumentServerFunctions,
+    userSentryOptions.autoInstrumentServerFunctions,
+    deprecatedMessage('autoInstrumentServerFunctions', 'webpack.autoInstrumentServerFunctions'),
+  );
+
+  webpack.autoInstrumentMiddleware = withDeprecatedFallback(
+    webpack.autoInstrumentMiddleware,
+    userSentryOptions.autoInstrumentMiddleware,
+    deprecatedMessage('autoInstrumentMiddleware', 'webpack.autoInstrumentMiddleware'),
+  );
+
+  webpack.autoInstrumentAppDirectory = withDeprecatedFallback(
+    webpack.autoInstrumentAppDirectory,
+    userSentryOptions.autoInstrumentAppDirectory,
+    deprecatedMessage('autoInstrumentAppDirectory', 'webpack.autoInstrumentAppDirectory'),
+  );
+
+  webpack.excludeServerRoutes = withDeprecatedFallback(
+    webpack.excludeServerRoutes,
+    userSentryOptions.excludeServerRoutes,
+    deprecatedMessage('excludeServerRoutes', 'webpack.excludeServerRoutes'),
+  );
+
+  webpack.unstable_sentryWebpackPluginOptions = withDeprecatedFallback(
+    webpack.unstable_sentryWebpackPluginOptions,
+    userSentryOptions.unstable_sentryWebpackPluginOptions,
+    deprecatedMessage('unstable_sentryWebpackPluginOptions', 'webpack.unstable_sentryWebpackPluginOptions'),
+  );
+
+  webpack.disableSentryConfig = withDeprecatedFallback(
+    webpack.disableSentryConfig,
+    userSentryOptions.disableSentryWebpackConfig,
+    deprecatedMessage('disableSentryWebpackConfig', 'webpack.disableSentryConfig'),
+  );
+
+  // Handle treeshake.removeDebugLogging specially since it's nested
+  if (userSentryOptions.disableLogger !== undefined) {
+    webpack.treeshake = webpack.treeshake || {};
+    webpack.treeshake.removeDebugLogging = withDeprecatedFallback(
+      webpack.treeshake.removeDebugLogging,
+      userSentryOptions.disableLogger,
+      deprecatedMessage('disableLogger', 'webpack.treeshake.removeDebugLogging'),
+    );
+  }
+
+  webpack.automaticVercelMonitors = withDeprecatedFallback(
+    webpack.automaticVercelMonitors,
+    userSentryOptions.automaticVercelMonitors,
+    deprecatedMessage('automaticVercelMonitors', 'webpack.automaticVercelMonitors'),
+  );
+
+  webpack.reactComponentAnnotation = withDeprecatedFallback(
+    webpack.reactComponentAnnotation,
+    userSentryOptions.reactComponentAnnotation,
+    deprecatedMessage('reactComponentAnnotation', 'webpack.reactComponentAnnotation'),
+  );
+}
+
 // Modify the materialized object form of the user's next config by deleting the `sentry` property and wrapping the
 // `webpack` property
 function getFinalConfigObject(
   incomingUserNextConfigObject: NextConfigObject,
   userSentryOptions: SentryBuildOptions,
 ): NextConfigObject {
+  // Migrate deprecated webpack options to new webpack path for backward compatibility
+  migrateDeprecatedWebpackOptions(userSentryOptions);
+
   // Only determine a release name if release creation is not explicitly disabled
   // This prevents injection of Git commit hashes that break build determinism
   const shouldCreateRelease = userSentryOptions.release?.create !== false;
@@ -363,7 +453,7 @@ function getFinalConfigObject(
             ],
           },
         }),
-    ...(isWebpack && !userSentryOptions.disableSentryWebpackConfig
+    ...(isWebpack && !userSentryOptions.webpack?.disableSentryConfig
       ? {
           webpack: constructWebpackConfigFunction({
             userNextConfig: incomingUserNextConfigObject,
diff --git a/packages/nextjs/test/config/getBuildPluginOptions.test.ts b/packages/nextjs/test/config/getBuildPluginOptions.test.ts
index 609183d198bb..3e95eadafc96 100644
--- a/packages/nextjs/test/config/getBuildPluginOptions.test.ts
+++ b/packages/nextjs/test/config/getBuildPluginOptions.test.ts
@@ -573,13 +573,15 @@ describe('getBuildPluginOptions', () => {
           create: true,
           vcsRemote: 'origin',
         },
-        unstable_sentryWebpackPluginOptions: {
-          release: {
-            setCommits: {
-              auto: true,
-            },
-            deploy: {
-              env: 'production',
+        webpack: {
+          unstable_sentryWebpackPluginOptions: {
+            release: {
+              setCommits: {
+                auto: true,
+              },
+              deploy: {
+                env: 'production',
+              },
             },
           },
         },
@@ -592,7 +594,7 @@ describe('getBuildPluginOptions', () => {
         buildTool: 'webpack-client',
       });
 
-      // The unstable_sentryWebpackPluginOptions.release is spread at the end and may override base properties
+      // The webpack.unstable_sentryWebpackPluginOptions.release is spread at the end and may override base properties
       expect(result.release).toHaveProperty('setCommits.auto', true);
       expect(result.release).toHaveProperty('deploy.env', 'production');
     });
@@ -603,12 +605,14 @@ describe('getBuildPluginOptions', () => {
       const sentryBuildOptions: SentryBuildOptions = {
         org: 'test-org',
         project: 'test-project',
-        reactComponentAnnotation: {
-          enabled: true,
-        },
-        unstable_sentryWebpackPluginOptions: {
+        webpack: {
           reactComponentAnnotation: {
-            enabled: false, // This will override the base setting
+            enabled: true,
+          },
+          unstable_sentryWebpackPluginOptions: {
+            reactComponentAnnotation: {
+              enabled: false, // This will override the base setting
+            },
           },
         },
       };
@@ -695,10 +699,12 @@ describe('getBuildPluginOptions', () => {
       const sentryBuildOptions: SentryBuildOptions = {
         org: 'test-org',
         project: 'test-project',
-        unstable_sentryWebpackPluginOptions: {
-          applicationKey: 'test-app-key',
-          sourcemaps: {
-            disable: false,
+        webpack: {
+          unstable_sentryWebpackPluginOptions: {
+            applicationKey: 'test-app-key',
+            sourcemaps: {
+              disable: false,
+            },
           },
         },
       };
diff --git a/packages/nextjs/test/config/withSentryConfig.test.ts b/packages/nextjs/test/config/withSentryConfig.test.ts
index b67a05845a7e..ed4b96a78125 100644
--- a/packages/nextjs/test/config/withSentryConfig.test.ts
+++ b/packages/nextjs/test/config/withSentryConfig.test.ts
@@ -267,6 +267,189 @@ describe('withSentryConfig', () => {
 
       expect(finalConfig.turbopack).toBeUndefined();
     });
+
+    describe('webpack configuration options path', () => {
+      afterEach(() => {
+        delete process.env.TURBOPACK;
+        vi.restoreAllMocks();
+      });
+
+      it('uses new webpack.disableSentryConfig option', () => {
+        delete process.env.TURBOPACK;
+
+        const originalWebpackFunction = vi.fn();
+        const configWithWebpack = {
+          ...exportedNextConfig,
+          webpack: originalWebpackFunction,
+        };
+
+        const sentryOptions = {
+          webpack: {
+            disableSentryConfig: true,
+          },
+        };
+
+        const finalConfig = materializeFinalNextConfig(configWithWebpack, undefined, sentryOptions);
+        expect(finalConfig.webpack).toBe(originalWebpackFunction);
+      });
+
+      it('new webpack path takes precedence over deprecated top-level options', () => {
+        delete process.env.TURBOPACK;
+
+        const originalWebpackFunction = vi.fn();
+        const configWithWebpack = {
+          ...exportedNextConfig,
+          webpack: originalWebpackFunction,
+        };
+
+        // Both old and new paths set, new should win
+        const sentryOptions = {
+          disableSentryWebpackConfig: false, // deprecated - says enable
+          webpack: {
+            disableSentryConfig: true, // new - says disable
+          },
+        };
+
+        const finalConfig = materializeFinalNextConfig(configWithWebpack, undefined, sentryOptions);
+        // Should preserve original webpack because new path disables it
+        expect(finalConfig.webpack).toBe(originalWebpackFunction);
+      });
+
+      it('falls back to deprecated option when new path is not set', () => {
+        delete process.env.TURBOPACK;
+
+        const originalWebpackFunction = vi.fn();
+        const configWithWebpack = {
+          ...exportedNextConfig,
+          webpack: originalWebpackFunction,
+        };
+
+        // Only deprecated path set
+        const sentryOptions = {
+          disableSentryWebpackConfig: true,
+        };
+
+        const finalConfig = materializeFinalNextConfig(configWithWebpack, undefined, sentryOptions);
+        // Should preserve original webpack because deprecated option disables it
+        expect(finalConfig.webpack).toBe(originalWebpackFunction);
+      });
+
+      it('merges webpack.treeshake.removeDebugLogging with deprecated disableLogger', () => {
+        delete process.env.TURBOPACK;
+
+        // New webpack.treeshake.removeDebugLogging should map to disableLogger internally
+        const sentryOptionsNew = {
+          webpack: {
+            treeshake: {
+              removeDebugLogging: true,
+            },
+          },
+        };
+
+        const sentryOptionsOld = {
+          disableLogger: true,
+        };
+
+        // Both should work the same way internally (though we can't easily test the actual effect here)
+        const finalConfigNew = materializeFinalNextConfig(exportedNextConfig, undefined, sentryOptionsNew);
+        const finalConfigOld = materializeFinalNextConfig(exportedNextConfig, undefined, sentryOptionsOld);
+
+        // Both should have webpack functions (not disabled)
+        expect(finalConfigNew.webpack).toBeInstanceOf(Function);
+        expect(finalConfigOld.webpack).toBeInstanceOf(Function);
+      });
+    });
+
+    describe('deprecation warnings', () => {
+      let consoleWarnSpy: ReturnType<typeof vi.spyOn>;
+
+      beforeEach(() => {
+        consoleWarnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
+      });
+
+      afterEach(() => {
+        consoleWarnSpy.mockRestore();
+        delete process.env.TURBOPACK;
+        vi.restoreAllMocks();
+      });
+
+      it('warns when using deprecated top-level options', () => {
+        delete process.env.TURBOPACK;
+
+        const sentryOptions = {
+          disableLogger: true,
+        };
+
+        materializeFinalNextConfig(exportedNextConfig, undefined, sentryOptions);
+
+        expect(consoleWarnSpy).toHaveBeenCalledWith(
+          expect.stringContaining('[@sentry/nextjs] DEPRECATION WARNING: disableLogger is deprecated'),
+        );
+        expect(consoleWarnSpy).toHaveBeenCalledWith(
+          expect.stringContaining('Use webpack.treeshake.removeDebugLogging instead'),
+        );
+      });
+
+      it('does not warn when using new webpack path', () => {
+        delete process.env.TURBOPACK;
+
+        const sentryOptions = {
+          webpack: {
+            treeshake: {
+              removeDebugLogging: true,
+            },
+          },
+        };
+
+        materializeFinalNextConfig(exportedNextConfig, undefined, sentryOptions);
+
+        expect(consoleWarnSpy).not.toHaveBeenCalled();
+      });
+
+      it('warns even when new path is also set', () => {
+        delete process.env.TURBOPACK;
+
+        const sentryOptions = {
+          disableLogger: true, // deprecated
+          webpack: {
+            treeshake: {
+              removeDebugLogging: false, // new path takes precedence
+            },
+          },
+        };
+
+        materializeFinalNextConfig(exportedNextConfig, undefined, sentryOptions);
+
+        // Should warn because deprecated value is present
+        expect(consoleWarnSpy).toHaveBeenCalledWith(
+          expect.stringContaining('[@sentry/nextjs] DEPRECATION WARNING: disableLogger is deprecated'),
+        );
+      });
+
+      it('warns for multiple deprecated options at once', () => {
+        delete process.env.TURBOPACK;
+
+        const sentryOptions = {
+          disableLogger: true,
+          automaticVercelMonitors: false,
+          excludeServerRoutes: ['/api/test'],
+        };
+
+        materializeFinalNextConfig(exportedNextConfig, undefined, sentryOptions);
+
+        // Should warn for all three deprecated options
+        expect(consoleWarnSpy).toHaveBeenCalledWith(
+          expect.stringContaining('[@sentry/nextjs] DEPRECATION WARNING: disableLogger is deprecated'),
+        );
+        expect(consoleWarnSpy).toHaveBeenCalledWith(
+          expect.stringContaining('[@sentry/nextjs] DEPRECATION WARNING: automaticVercelMonitors is deprecated'),
+        );
+        expect(consoleWarnSpy).toHaveBeenCalledWith(
+          expect.stringContaining('[@sentry/nextjs] DEPRECATION WARNING: excludeServerRoutes is deprecated'),
+        );
+        expect(consoleWarnSpy).toHaveBeenCalledTimes(3);
+      });
+    });
   });
 
   describe('bundler detection', () => {

From a6eec86be57f17d5a6345814a38ce913ee81828a Mon Sep 17 00:00:00 2001
From: Onur Temizkan <onur@narval.co.uk>
Date: Tue, 9 Dec 2025 10:18:21 +0000
Subject: [PATCH 177/186] fix(react): Add transaction name guards for rapid
 lazy-route navigations (#18346)

Following up on #18098 and #18155

Fixes a race condition where rapid navigations between lazy routes cause
transaction names to be incorrectly assigned or corrupted.

This occurs when async lazy handlers resolve after the user already
navigated to a different route. The root cause was
`captureCurrentLocation()` was reading `window.location` at the time of
handler invocation, but during `patchRoutesOnNavigation`, the browser
URL hasn't actually updated yet. So when handlers invoked during
navigation A resolve later, they would capture navigation B's location
(or whatever the current URL is), leading to incorrect span updates.

The fix introduces a navigation context mechanism that captures both the
correct `targetPath` and the active span at the start of
`patchRoutesOnNavigation`, making them available to async handler
proxies during invocation. This ensures handlers always use the
navigation context they were invoked with, not the current browser
state.

The navigation context uses a stack to properly handle
overlapping/concurrent `patchRoutesOnNavigation` calls. If a second
navigation starts before the first one's handlers complete, each
navigation maintains its own captured context.
---
 .../react-router-7-lazy-routes/src/index.tsx  |   8 +
 .../src/pages/DelayedLazyRoute.tsx            |   8 +
 .../src/pages/Index.tsx                       |   4 +
 .../src/pages/SlowFetchLazyRoutes.tsx         |  42 +++
 .../tests/transactions.test.ts                | 347 +++++++++++++++++-
 .../src/reactrouter-compat-utils/index.ts     |   5 +
 .../instrumentation.tsx                       |  72 ++--
 .../reactrouter-compat-utils/lazy-routes.tsx  |  93 ++++-
 .../src/reactrouter-compat-utils/utils.ts     |  66 +++-
 .../instrumentation.test.tsx                  |   1 +
 .../lazy-routes.test.ts                       |  86 +++--
 .../reactrouter-compat-utils/utils.test.ts    | 138 ++++++-
 12 files changed, 804 insertions(+), 66 deletions(-)
 create mode 100644 dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/src/pages/SlowFetchLazyRoutes.tsx

diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/src/index.tsx b/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/src/index.tsx
index 7787b60be398..1bcad5eaf4ce 100644
--- a/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/src/index.tsx
+++ b/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/src/index.tsx
@@ -126,6 +126,14 @@ const router = sentryCreateBrowserRouter(
         lazyChildren: () => import('./pages/deep/Level1Routes').then(module => module.level2Routes),
       },
     },
+    {
+      path: '/slow-fetch',
+      handle: {
+        // This lazy handler takes 500ms due to the top-level await in SlowFetchLazyRoutes.tsx
+        // It also makes a fetch request during loading which creates a span
+        lazyChildren: () => import('./pages/SlowFetchLazyRoutes').then(module => module.slowFetchRoutes),
+      },
+    },
   ],
   {
     async patchRoutesOnNavigation({ matches, patch }: Parameters<PatchRoutesOnNavigationFunction>[0]) {
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/src/pages/DelayedLazyRoute.tsx b/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/src/pages/DelayedLazyRoute.tsx
index 41e5ba5463be..53bfe048ca4e 100644
--- a/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/src/pages/DelayedLazyRoute.tsx
+++ b/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/src/pages/DelayedLazyRoute.tsx
@@ -23,6 +23,14 @@ const DelayedLazyRoute = () => {
           Back Home
         </Link>
         <br />
+        <Link to="/slow-fetch/222" id="delayed-lazy-to-slow-fetch">
+          Go to Slow Fetch Route (500ms)
+        </Link>
+        <br />
+        <Link to="/another-lazy/sub" id="delayed-lazy-to-another-lazy">
+          Go to Another Lazy Route
+        </Link>
+        <br />
         <Link to={`/delayed-lazy/${id}?view=detailed`} id="link-to-query-view-detailed">
           View: Detailed (query param)
         </Link>
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/src/pages/Index.tsx b/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/src/pages/Index.tsx
index 21b965f571f3..cf80af402b96 100644
--- a/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/src/pages/Index.tsx
+++ b/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/src/pages/Index.tsx
@@ -31,6 +31,10 @@ const Index = () => {
       <Link to="/deep/level2/level3/123" id="navigation-to-deep">
         Navigate to Deep Nested Route (3 levels, 900ms total)
       </Link>
+      <br />
+      <Link to="/slow-fetch/123" id="navigation-to-slow-fetch">
+        Navigate to Slow Fetch Route (500ms delay with fetch)
+      </Link>
     </>
   );
 };
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/src/pages/SlowFetchLazyRoutes.tsx b/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/src/pages/SlowFetchLazyRoutes.tsx
new file mode 100644
index 000000000000..f24a8c56f416
--- /dev/null
+++ b/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/src/pages/SlowFetchLazyRoutes.tsx
@@ -0,0 +1,42 @@
+import React from 'react';
+import { Link, useParams } from 'react-router-dom';
+
+// Simulate a slow async fetch during lazy route loading
+// This delay happens before the module exports, simulating network latency
+const fetchPromise = fetch('/api/slow-data')
+  .then(res => res.json())
+  .catch(() => ({ message: 'fallback data' }));
+
+// Add a 500ms delay to simulate slow lazy loading
+await new Promise(resolve => setTimeout(resolve, 500));
+
+// Component that displays the lazy-loaded data
+const SlowFetchComponent = () => {
+  const { id } = useParams<{ id: string }>();
+  const [data, setData] = React.useState<{ message: string } | null>(null);
+
+  React.useEffect(() => {
+    fetchPromise.then(setData);
+  }, []);
+
+  return (
+    <div id="slow-fetch-content">
+      <h1>Slow Fetch Route</h1>
+      <p id="slow-fetch-id">ID: {id}</p>
+      <p id="slow-fetch-data">Data: {data?.message || 'loading...'}</p>
+      <Link to="/" id="slow-fetch-home-link">
+        Go Home
+      </Link>
+      <Link to="/another-lazy/sub/999/888" id="slow-fetch-to-another">
+        Go to Another Lazy Route
+      </Link>
+    </div>
+  );
+};
+
+export const slowFetchRoutes = [
+  {
+    path: ':id',
+    element: <SlowFetchComponent />,
+  },
+];
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/tests/transactions.test.ts
index ce8137d7f686..f7a3ec4a5519 100644
--- a/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/tests/transactions.test.ts
+++ b/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/tests/transactions.test.ts
@@ -666,7 +666,7 @@ test('Creates navigation transaction when navigating with query parameters from
   await expect(page.locator('id=delayed-lazy-source')).toHaveText('Source: homepage');
 
   // Verify the navigation transaction has the correct parameterized route name
-  // Query parameters should NOT affect the transaction name (still /delayed-lazy/:id)
+  // Query parameters don't affect the transaction name (still /delayed-lazy/:id)
   expect(navigationEvent.transaction).toBe('/delayed-lazy/:id');
   expect(navigationEvent.contexts?.trace?.op).toBe('navigation');
   expect(navigationEvent.contexts?.trace?.data?.['sentry.source']).toBe('route');
@@ -883,3 +883,348 @@ test('Creates navigation transaction when changing both query and hash on same r
   expect(navigationEvent.contexts?.trace?.data?.['sentry.source']).toBe('route');
   expect(navigationEvent.contexts?.trace?.status).toBe('ok');
 });
+
+test('Creates navigation transaction with correct name for slow lazy route', async ({ page }) => {
+  // This test verifies that navigating to a slow lazy route (with top-level await)
+  // creates a correctly named navigation transaction.
+  // The route uses handle.lazyChildren with a 500ms delay.
+
+  await page.goto('/');
+
+  const navigationPromise = waitForTransaction('react-router-7-lazy-routes', async transactionEvent => {
+    return (
+      !!transactionEvent?.transaction &&
+      transactionEvent.contexts?.trace?.op === 'navigation' &&
+      transactionEvent.transaction === '/slow-fetch/:id'
+    );
+  });
+
+  // Navigate to slow-fetch route (500ms delay)
+  const navigationToSlowFetch = page.locator('id=navigation-to-slow-fetch');
+  await expect(navigationToSlowFetch).toBeVisible();
+  await navigationToSlowFetch.click();
+
+  const navigationEvent = await navigationPromise;
+
+  // Wait for the component to render (after the 500ms delay)
+  const slowFetchContent = page.locator('id=slow-fetch-content');
+  await expect(slowFetchContent).toBeVisible({ timeout: 5000 });
+  await expect(page.locator('id=slow-fetch-id')).toHaveText('ID: 123');
+
+  // Verify the transaction has the correct parameterized route name
+  expect(navigationEvent.transaction).toBe('/slow-fetch/:id');
+  expect(navigationEvent.contexts?.trace?.op).toBe('navigation');
+  expect(navigationEvent.contexts?.trace?.data?.['sentry.source']).toBe('route');
+});
+
+test('Rapid navigation does not corrupt transaction names when lazy handlers resolve late', async ({ page }) => {
+  await page.goto('/');
+
+  const allTransactions: Array<{ name: string; op: string }> = [];
+
+  const collectorPromise = waitForTransaction('react-router-7-lazy-routes', async transactionEvent => {
+    if (transactionEvent?.transaction && transactionEvent.contexts?.trace?.op) {
+      allTransactions.push({
+        name: transactionEvent.transaction,
+        op: transactionEvent.contexts.trace.op,
+      });
+    }
+    return allTransactions.length >= 2;
+  });
+
+  // Navigate to slow-fetch route (500ms delay)
+  const slowFetchLink = page.locator('id=navigation-to-slow-fetch');
+  await expect(slowFetchLink).toBeVisible();
+  await slowFetchLink.click();
+
+  // Navigate away before lazy handler resolves
+  await page.waitForTimeout(200);
+  const anotherLink = page.locator('id=navigation-to-another');
+  await anotherLink.click();
+
+  await expect(page.locator('id=another-lazy-route')).toBeVisible({ timeout: 10000 });
+  await page.waitForTimeout(3000);
+
+  await Promise.race([
+    collectorPromise,
+    new Promise<'timeout'>(resolve => setTimeout(() => resolve('timeout'), 15000)),
+  ]);
+
+  const navigationTransactions = allTransactions.filter(t => t.op === 'navigation');
+
+  expect(navigationTransactions.length).toBeGreaterThanOrEqual(1);
+
+  // No "/" corruption
+  const corruptedToRoot = navigationTransactions.filter(t => t.name === '/');
+  expect(corruptedToRoot.length).toBe(0);
+
+  // At least one valid route name
+  const validRoutePatterns = [
+    '/slow-fetch/:id',
+    '/another-lazy/sub',
+    '/another-lazy/sub/:id',
+    '/another-lazy/sub/:id/:subId',
+  ];
+  const hasValidRouteName = navigationTransactions.some(t => validRoutePatterns.includes(t.name));
+  expect(hasValidRouteName).toBe(true);
+});
+
+test('Correctly names pageload transaction for slow lazy route with fetch', async ({ page }) => {
+  // This test verifies that a slow lazy route (with top-level await and fetch)
+  // creates a correctly named pageload transaction
+
+  const pageloadPromise = waitForTransaction('react-router-7-lazy-routes', async transactionEvent => {
+    return (
+      !!transactionEvent?.transaction &&
+      transactionEvent.contexts?.trace?.op === 'pageload' &&
+      transactionEvent.transaction === '/slow-fetch/:id'
+    );
+  });
+
+  await page.goto('/slow-fetch/123');
+
+  const pageloadEvent = await pageloadPromise;
+
+  // Wait for the component to render (after the 500ms delay)
+  const slowFetchContent = page.locator('id=slow-fetch-content');
+  await expect(slowFetchContent).toBeVisible({ timeout: 5000 });
+  await expect(page.locator('id=slow-fetch-id')).toHaveText('ID: 123');
+
+  // Verify the transaction has the correct parameterized route name
+  expect(pageloadEvent.transaction).toBe('/slow-fetch/:id');
+  expect(pageloadEvent.contexts?.trace?.op).toBe('pageload');
+  expect(pageloadEvent.contexts?.trace?.data?.['sentry.source']).toBe('route');
+
+  // Verify the transaction contains a fetch span
+  const spans = pageloadEvent.spans || [];
+  const fetchSpan = spans.find(
+    (span: { op?: string; description?: string }) =>
+      span.op === 'http.client' && span.description?.includes('/api/slow-data'),
+  );
+
+  // The fetch span should exist (even if the fetch failed, the span is created)
+  expect(fetchSpan).toBeDefined();
+});
+
+test('Three-route rapid navigation preserves distinct transaction names', async ({ page }) => {
+  const navigationTransactions: Array<{ name: string }> = [];
+
+  const navigationCollector = waitForTransaction('react-router-7-lazy-routes', async transactionEvent => {
+    if (transactionEvent.contexts?.trace?.op === 'navigation') {
+      navigationTransactions.push({ name: transactionEvent.transaction || '' });
+    }
+    return false;
+  });
+
+  const pageloadPromise = waitForTransaction('react-router-7-lazy-routes', async transactionEvent => {
+    return (
+      !!transactionEvent?.transaction &&
+      transactionEvent.contexts?.trace?.op === 'pageload' &&
+      transactionEvent.transaction === '/delayed-lazy/:id'
+    );
+  });
+
+  // Pageload to delayed-lazy route
+  await page.goto('/delayed-lazy/111');
+  await pageloadPromise;
+  await expect(page.locator('id=delayed-lazy-ready')).toBeVisible({ timeout: 5000 });
+
+  // Navigate to slow-fetch (500ms delay)
+  const slowFetchLink = page.locator('id=delayed-lazy-to-slow-fetch');
+  await slowFetchLink.click();
+  await page.waitForTimeout(150);
+
+  // Navigate to another-lazy before slow-fetch resolves
+  const anotherLazyLink = page.locator('id=delayed-lazy-to-another-lazy');
+  await anotherLazyLink.click();
+
+  await expect(page.locator('id=another-lazy-route')).toBeVisible({ timeout: 10000 });
+  await page.waitForTimeout(2000);
+
+  await Promise.race([
+    navigationCollector,
+    new Promise<'timeout'>(resolve => setTimeout(() => resolve('timeout'), 5000)),
+  ]).catch(() => {});
+
+  expect(navigationTransactions.length).toBe(2);
+
+  // Distinct names (corruption causes both to have same name)
+  const uniqueNames = new Set(navigationTransactions.map(t => t.name));
+  expect(uniqueNames.size).toBe(2);
+
+  // No "/" corruption
+  const corruptedToRoot = navigationTransactions.filter(t => t.name === '/');
+  expect(corruptedToRoot.length).toBe(0);
+});
+
+test('Zero-wait rapid navigation does not corrupt transaction names', async ({ page }) => {
+  const navigationTransactions: Array<{ name: string }> = [];
+
+  const collector = waitForTransaction('react-router-7-lazy-routes', async transactionEvent => {
+    if (transactionEvent.contexts?.trace?.op === 'navigation') {
+      navigationTransactions.push({ name: transactionEvent.transaction || '' });
+    }
+    return false;
+  });
+
+  await page.goto('/');
+
+  const slowFetchLink = page.locator('id=navigation-to-slow-fetch');
+  const anotherLink = page.locator('id=navigation-to-another');
+  await expect(slowFetchLink).toBeVisible();
+  await expect(anotherLink).toBeVisible();
+
+  // Click first then immediately second (no wait)
+  await slowFetchLink.click();
+  await anotherLink.click();
+
+  await expect(page.locator('id=another-lazy-route')).toBeVisible({ timeout: 10000 });
+  await page.waitForTimeout(3000);
+
+  await Promise.race([collector, new Promise<'timeout'>(resolve => setTimeout(() => resolve('timeout'), 5000))]).catch(
+    () => {},
+  );
+
+  expect(navigationTransactions.length).toBeGreaterThanOrEqual(1);
+
+  // No "/" corruption
+  const corruptedToRoot = navigationTransactions.filter(t => t.name === '/');
+  expect(corruptedToRoot.length).toBe(0);
+});
+
+test('Browser back during lazy handler resolution does not corrupt', async ({ page }) => {
+  const allTransactions: Array<{ name: string; op: string }> = [];
+
+  const collector = waitForTransaction('react-router-7-lazy-routes', async transactionEvent => {
+    if (transactionEvent?.transaction && transactionEvent.contexts?.trace?.op) {
+      allTransactions.push({
+        name: transactionEvent.transaction,
+        op: transactionEvent.contexts.trace.op,
+      });
+    }
+    return false;
+  });
+
+  await page.goto('/');
+  await expect(page.locator('id=navigation')).toBeVisible();
+
+  // Navigate to another-lazy to establish history
+  const anotherLink = page.locator('id=navigation-to-another');
+  await anotherLink.click();
+  await expect(page.locator('id=another-lazy-route')).toBeVisible({ timeout: 10000 });
+
+  // Navigate to slow-fetch route
+  await page.goto('/slow-fetch/123');
+  await page.waitForTimeout(150);
+
+  // Press browser back before handler resolves
+  await page.goBack();
+  await page.waitForTimeout(3000);
+
+  await Promise.race([collector, new Promise<'timeout'>(resolve => setTimeout(() => resolve('timeout'), 10000))]).catch(
+    () => {},
+  );
+
+  expect(allTransactions.length).toBeGreaterThanOrEqual(1);
+  expect(allTransactions.every(t => t.name.length > 0)).toBe(true);
+});
+
+test('Multiple overlapping lazy handlers do not corrupt each other', async ({ page }) => {
+  const navigationTransactions: Array<{ name: string }> = [];
+
+  const collector = waitForTransaction('react-router-7-lazy-routes', async transactionEvent => {
+    if (transactionEvent.contexts?.trace?.op === 'navigation') {
+      navigationTransactions.push({ name: transactionEvent.transaction || '' });
+    }
+    return false;
+  });
+
+  await page.goto('/');
+
+  // Navigation 1: To delayed-lazy (400ms delay)
+  const delayedLazyLink = page.locator('id=navigation-to-delayed-lazy');
+  await expect(delayedLazyLink).toBeVisible();
+  await delayedLazyLink.click();
+  await page.waitForTimeout(50);
+
+  // Navigation 2: To slow-fetch (500ms delay)
+  const slowFetchLink = page.locator('id=navigation-to-slow-fetch');
+  await slowFetchLink.click();
+  await page.waitForTimeout(50);
+
+  // Navigation 3: To another-lazy (fast)
+  const anotherLink = page.locator('id=navigation-to-another');
+  await anotherLink.click();
+
+  await expect(page.locator('id=another-lazy-route')).toBeVisible({ timeout: 10000 });
+  await page.waitForTimeout(3000);
+
+  await Promise.race([collector, new Promise<'timeout'>(resolve => setTimeout(() => resolve('timeout'), 5000))]).catch(
+    () => {},
+  );
+
+  expect(navigationTransactions.length).toBeGreaterThanOrEqual(1);
+
+  // No "/" corruption
+  const corruptedToRoot = navigationTransactions.filter(t => t.name === '/');
+  expect(corruptedToRoot.length).toBe(0);
+
+  // If multiple navigations, they should have distinct names
+  if (navigationTransactions.length >= 2) {
+    const allSameName = navigationTransactions.every(t => t.name === navigationTransactions[0].name);
+    expect(allSameName).toBe(false);
+  }
+});
+
+test('Query/hash navigation does not corrupt transaction name', async ({ page }) => {
+  const navigationTransactions: Array<{ name: string }> = [];
+
+  const collectorPromise = waitForTransaction('react-router-7-lazy-routes', async transactionEvent => {
+    if (transactionEvent?.transaction && transactionEvent.contexts?.trace?.op === 'navigation') {
+      navigationTransactions.push({ name: transactionEvent.transaction });
+    }
+    return navigationTransactions.length >= 1;
+  });
+
+  await page.goto('/');
+
+  // Navigate to delayed-lazy route
+  const delayedLazyLink = page.locator('id=navigation-to-delayed-lazy');
+  await expect(delayedLazyLink).toBeVisible();
+  await delayedLazyLink.click();
+  await expect(page.locator('id=delayed-lazy-ready')).toBeVisible({ timeout: 10000 });
+
+  // Trigger query-only navigation
+  const queryLink = page.locator('id=link-to-query-view-detailed');
+  await expect(queryLink).toBeVisible();
+  await queryLink.click();
+  await page.waitForURL('**/delayed-lazy/**?view=detailed');
+
+  // Trigger hash-only navigation
+  const hashLink = page.locator('id=link-to-hash-section1');
+  await expect(hashLink).toBeVisible();
+  await hashLink.click();
+  await page.waitForTimeout(500);
+  expect(page.url()).toContain('#section1');
+
+  // Trigger combined query+hash navigation
+  const combinedLink = page.locator('id=link-to-query-and-hash');
+  await expect(combinedLink).toBeVisible();
+  await combinedLink.click();
+  await page.waitForTimeout(500);
+  expect(page.url()).toContain('view=grid');
+  expect(page.url()).toContain('#results');
+
+  await page.waitForTimeout(2000);
+  await Promise.race([
+    collectorPromise,
+    new Promise<'timeout'>(resolve => setTimeout(() => resolve('timeout'), 5000)),
+  ]).catch(() => {});
+
+  expect(navigationTransactions.length).toBeGreaterThanOrEqual(1);
+  expect(navigationTransactions[0].name).toBe('/delayed-lazy/:id');
+
+  // No "/" corruption from query/hash navigations
+  const corruptedToRoot = navigationTransactions.filter(t => t.name === '/');
+  expect(corruptedToRoot.length).toBe(0);
+});
diff --git a/packages/react/src/reactrouter-compat-utils/index.ts b/packages/react/src/reactrouter-compat-utils/index.ts
index bb91ba8d3072..968abd9ecae6 100644
--- a/packages/react/src/reactrouter-compat-utils/index.ts
+++ b/packages/react/src/reactrouter-compat-utils/index.ts
@@ -26,6 +26,11 @@ export {
   pathIsWildcardAndHasChildren,
   getNumberOfUrlSegments,
   transactionNameHasWildcard,
+  getActiveRootSpan,
+  // Navigation context functions (internal use and testing)
+  setNavigationContext,
+  clearNavigationContext,
+  getNavigationContext,
 } from './utils';
 
 // Lazy route exports
diff --git a/packages/react/src/reactrouter-compat-utils/instrumentation.tsx b/packages/react/src/reactrouter-compat-utils/instrumentation.tsx
index 6e19b9021ba5..d646624618f9 100644
--- a/packages/react/src/reactrouter-compat-utils/instrumentation.tsx
+++ b/packages/react/src/reactrouter-compat-utils/instrumentation.tsx
@@ -12,10 +12,8 @@ import type { Client, Integration, Span } from '@sentry/core';
 import {
   addNonEnumerableProperty,
   debug,
-  getActiveSpan,
   getClient,
   getCurrentScope,
-  getRootSpan,
   SEMANTIC_ATTRIBUTE_SENTRY_OP,
   SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
@@ -41,7 +39,14 @@ import type {
   UseRoutes,
 } from '../types';
 import { checkRouteForAsyncHandler } from './lazy-routes';
-import { initializeRouterUtils, resolveRouteNameAndSource, transactionNameHasWildcard } from './utils';
+import {
+  clearNavigationContext,
+  getActiveRootSpan,
+  initializeRouterUtils,
+  resolveRouteNameAndSource,
+  setNavigationContext,
+  transactionNameHasWildcard,
+} from './utils';
 
 let _useEffect: UseEffect;
 let _useLocation: UseLocation;
@@ -230,11 +235,14 @@ function trackLazyRouteLoad(span: Span, promise: Promise<unknown>): void {
 
 /**
  * Processes resolved routes by adding them to allRoutes and checking for nested async handlers.
+ * When capturedSpan is provided, updates that specific span instead of the current active span.
+ * This prevents race conditions where a lazy handler resolves after the user has navigated away.
  */
 export function processResolvedRoutes(
   resolvedRoutes: RouteObject[],
   parentRoute?: RouteObject,
   currentLocation: Location | null = null,
+  capturedSpan?: Span,
 ): void {
   resolvedRoutes.forEach(child => {
     allRoutes.add(child);
@@ -249,17 +257,27 @@ export function processResolvedRoutes(
     addResolvedRoutesToParent(resolvedRoutes, parentRoute);
   }
 
-  // After processing lazy routes, check if we need to update an active transaction
-  const activeRootSpan = getActiveRootSpan();
-  if (activeRootSpan) {
-    const spanOp = spanToJSON(activeRootSpan).op;
+  // Use captured span if provided, otherwise fall back to current active span
+  const targetSpan = capturedSpan ?? getActiveRootSpan();
+  if (targetSpan) {
+    const spanJson = spanToJSON(targetSpan);
 
-    // Try to use the provided location first, then fall back to global window location if needed
+    // Skip update if span has already ended (timestamp is set when span.end() is called)
+    if (spanJson.timestamp) {
+      DEBUG_BUILD && debug.warn('[React Router] Lazy handler resolved after span ended - skipping update');
+      return;
+    }
+
+    const spanOp = spanJson.op;
+
+    // Use captured location for route matching (ensures we match against the correct route)
+    // Fall back to window.location only if no captured location and no captured span
+    // (i.e., this is not from an async handler)
     let location = currentLocation;
-    if (!location) {
+    if (!location && !capturedSpan) {
       if (typeof WINDOW !== 'undefined') {
         const globalLocation = WINDOW.location;
-        if (globalLocation) {
+        if (globalLocation?.pathname) {
           location = { pathname: globalLocation.pathname };
         }
       }
@@ -269,14 +287,14 @@ export function processResolvedRoutes(
       if (spanOp === 'pageload') {
         // Re-run the pageload transaction update with the newly loaded routes
         updatePageloadTransaction({
-          activeRootSpan,
+          activeRootSpan: targetSpan,
           location: { pathname: location.pathname },
           routes: Array.from(allRoutes),
           allRoutes: Array.from(allRoutes),
         });
       } else if (spanOp === 'navigation') {
         // For navigation spans, update the name with the newly loaded routes
-        updateNavigationSpan(activeRootSpan, location, Array.from(allRoutes), false, _matchRoutes);
+        updateNavigationSpan(targetSpan, location, Array.from(allRoutes), false, _matchRoutes);
       }
     }
   }
@@ -713,7 +731,12 @@ function wrapPatchRoutesOnNavigation(
           (args as any).patch = (routeId: string, children: RouteObject[]) => {
             addRoutesToAllRoutes(children);
             const currentActiveRootSpan = getActiveRootSpan();
-            if (currentActiveRootSpan && (spanToJSON(currentActiveRootSpan) as { op?: string }).op === 'navigation') {
+            // Only update if we have a valid targetPath (patchRoutesOnNavigation can be called without path)
+            if (
+              targetPath &&
+              currentActiveRootSpan &&
+              (spanToJSON(currentActiveRootSpan) as { op?: string }).op === 'navigation'
+            ) {
               updateNavigationSpan(
                 currentActiveRootSpan,
                 { pathname: targetPath, search: '', hash: '', state: null, key: 'default' },
@@ -728,7 +751,14 @@ function wrapPatchRoutesOnNavigation(
       }
 
       const lazyLoadPromise = (async () => {
-        const result = await originalPatchRoutes(args);
+        // Set context so async handlers can access correct targetPath and span
+        const contextToken = setNavigationContext(targetPath, activeRootSpan);
+        let result;
+        try {
+          result = await originalPatchRoutes(args);
+        } finally {
+          clearNavigationContext(contextToken);
+        }
 
         const currentActiveRootSpan = getActiveRootSpan();
         if (currentActiveRootSpan && (spanToJSON(currentActiveRootSpan) as { op?: string }).op === 'navigation') {
@@ -1184,17 +1214,3 @@ export function createV6CompatibleWithSentryReactRouterRouting<P extends Record<
   // will break advanced type inference done by react router params
   return SentryRoutes;
 }
-
-function getActiveRootSpan(): Span | undefined {
-  const span = getActiveSpan();
-  const rootSpan = span ? getRootSpan(span) : undefined;
-
-  if (!rootSpan) {
-    return undefined;
-  }
-
-  const op = spanToJSON(rootSpan).op;
-
-  // Only use this root span if it is a pageload or navigation span
-  return op === 'navigation' || op === 'pageload' ? rootSpan : undefined;
-}
diff --git a/packages/react/src/reactrouter-compat-utils/lazy-routes.tsx b/packages/react/src/reactrouter-compat-utils/lazy-routes.tsx
index 49923854554c..0a4f838dfd17 100644
--- a/packages/react/src/reactrouter-compat-utils/lazy-routes.tsx
+++ b/packages/react/src/reactrouter-compat-utils/lazy-routes.tsx
@@ -1,20 +1,88 @@
+import { WINDOW } from '@sentry/browser';
+import type { Span } from '@sentry/core';
 import { addNonEnumerableProperty, debug, isThenable } from '@sentry/core';
 import { DEBUG_BUILD } from '../debug-build';
 import type { Location, RouteObject } from '../types';
+import { getActiveRootSpan, getNavigationContext } from './utils';
+
+/**
+ * Captures location at invocation time. Prefers navigation context over window.location
+ * since window.location hasn't updated yet when async handlers are invoked.
+ */
+function captureCurrentLocation(): Location | null {
+  const navContext = getNavigationContext();
+  // Only use navigation context if targetPath is defined (it can be undefined
+  // if patchRoutesOnNavigation was invoked without a path argument)
+  if (navContext?.targetPath) {
+    return {
+      pathname: navContext.targetPath,
+      search: '',
+      hash: '',
+      state: null,
+      key: 'default',
+    };
+  }
+
+  if (typeof WINDOW !== 'undefined') {
+    try {
+      const windowLocation = WINDOW.location;
+      if (windowLocation) {
+        return {
+          pathname: windowLocation.pathname,
+          search: windowLocation.search || '',
+          hash: windowLocation.hash || '',
+          state: null,
+          key: 'default',
+        };
+      }
+    } catch {
+      DEBUG_BUILD && debug.warn('[React Router] Could not access window.location');
+    }
+  }
+  return null;
+}
+
+/**
+ * Captures the active span at invocation time. Prefers navigation context span
+ * to ensure we update the correct span even if another navigation starts.
+ */
+function captureActiveSpan(): Span | undefined {
+  const navContext = getNavigationContext();
+  if (navContext) {
+    return navContext.span;
+  }
+  return getActiveRootSpan();
+}
 
 /**
  * Creates a proxy wrapper for an async handler function.
+ * Captures both the location and the active span at invocation time to ensure
+ * the correct span is updated when the handler resolves.
  */
 export function createAsyncHandlerProxy(
   originalFunction: (...args: unknown[]) => unknown,
   route: RouteObject,
   handlerKey: string,
-  processResolvedRoutes: (resolvedRoutes: RouteObject[], parentRoute?: RouteObject, currentLocation?: Location) => void,
+  processResolvedRoutes: (
+    resolvedRoutes: RouteObject[],
+    parentRoute?: RouteObject,
+    currentLocation?: Location,
+    capturedSpan?: Span,
+  ) => void,
 ): (...args: unknown[]) => unknown {
   const proxy = new Proxy(originalFunction, {
     apply(target: (...args: unknown[]) => unknown, thisArg, argArray) {
+      const locationAtInvocation = captureCurrentLocation();
+      const spanAtInvocation = captureActiveSpan();
       const result = target.apply(thisArg, argArray);
-      handleAsyncHandlerResult(result, route, handlerKey, processResolvedRoutes);
+      handleAsyncHandlerResult(
+        result,
+        route,
+        handlerKey,
+        processResolvedRoutes,
+        locationAtInvocation,
+        spanAtInvocation,
+      );
       return result;
     },
   });
@@ -26,25 +94,33 @@ export function createAsyncHandlerProxy(
 
 /**
  * Handles the result of an async handler function call.
+ * Passes the captured span through to ensure the correct span is updated.
  */
 export function handleAsyncHandlerResult(
   result: unknown,
   route: RouteObject,
   handlerKey: string,
-  processResolvedRoutes: (resolvedRoutes: RouteObject[], parentRoute?: RouteObject, currentLocation?: Location) => void,
+  processResolvedRoutes: (
+    resolvedRoutes: RouteObject[],
+    parentRoute?: RouteObject,
+    currentLocation?: Location,
+    capturedSpan?: Span,
+  ) => void,
+  currentLocation: Location | null,
+  capturedSpan: Span | undefined,
 ): void {
   if (isThenable(result)) {
     (result as Promise<unknown>)
       .then((resolvedRoutes: unknown) => {
         if (Array.isArray(resolvedRoutes)) {
-          processResolvedRoutes(resolvedRoutes, route);
+          processResolvedRoutes(resolvedRoutes, route, currentLocation ?? undefined, capturedSpan);
         }
       })
       .catch((e: unknown) => {
         DEBUG_BUILD && debug.warn(`Error resolving async handler '${handlerKey}' for route`, route, e);
       });
   } else if (Array.isArray(result)) {
-    processResolvedRoutes(result, route);
+    processResolvedRoutes(result, route, currentLocation ?? undefined, capturedSpan);
   }
 }
 
@@ -53,7 +129,12 @@ export function handleAsyncHandlerResult(
  */
 export function checkRouteForAsyncHandler(
   route: RouteObject,
-  processResolvedRoutes: (resolvedRoutes: RouteObject[], parentRoute?: RouteObject, currentLocation?: Location) => void,
+  processResolvedRoutes: (
+    resolvedRoutes: RouteObject[],
+    parentRoute?: RouteObject,
+    currentLocation?: Location,
+    capturedSpan?: Span,
+  ) => void,
 ): void {
   // Set up proxies for any functions in the route's handle
   if (route.handle && typeof route.handle === 'object') {
diff --git a/packages/react/src/reactrouter-compat-utils/utils.ts b/packages/react/src/reactrouter-compat-utils/utils.ts
index 8431e283108b..96c178b64c14 100644
--- a/packages/react/src/reactrouter-compat-utils/utils.ts
+++ b/packages/react/src/reactrouter-compat-utils/utils.ts
@@ -1,10 +1,57 @@
-import type { TransactionSource } from '@sentry/core';
+import type { Span, TransactionSource } from '@sentry/core';
+import { debug, getActiveSpan, getRootSpan, spanToJSON } from '@sentry/core';
+import { DEBUG_BUILD } from '../debug-build';
 import type { Location, MatchRoutes, RouteMatch, RouteObject } from '../types';
 
 // Global variables that these utilities depend on
 let _matchRoutes: MatchRoutes;
 let _stripBasename: boolean = false;
 
+// Navigation context stack for nested/concurrent patchRoutesOnNavigation calls.
+// Required because window.location hasn't updated yet when handlers are invoked.
+interface NavigationContext {
+  token: object;
+  targetPath: string | undefined;
+  span: Span | undefined;
+}
+
+const _navigationContextStack: NavigationContext[] = [];
+const MAX_CONTEXT_STACK_SIZE = 10;
+
+/**
+ * Pushes a navigation context and returns a unique token for cleanup.
+ * The token uses object identity for uniqueness (no counter needed).
+ */
+export function setNavigationContext(targetPath: string | undefined, span: Span | undefined): object {
+  const token = {};
+  // Prevent unbounded stack growth - oldest (likely stale) contexts are evicted first
+  if (_navigationContextStack.length >= MAX_CONTEXT_STACK_SIZE) {
+    DEBUG_BUILD && debug.warn('[React Router] Navigation context stack overflow - removing oldest context');
+    _navigationContextStack.shift();
+  }
+  _navigationContextStack.push({ token, targetPath, span });
+  return token;
+}
+
+/**
+ * Clears the navigation context if it's on top of the stack (LIFO).
+ * If our context is not on top (out-of-order completion), we leave it -
+ * it will be cleaned up by overflow protection when the stack fills up.
+ */
+export function clearNavigationContext(token: object): void {
+  const top = _navigationContextStack[_navigationContextStack.length - 1];
+  if (top?.token === token) {
+    _navigationContextStack.pop();
+  }
+}
+
+/** Gets the current (most recent) navigation context if inside a patchRoutesOnNavigation call. */
+export function getNavigationContext(): NavigationContext | null {
+  const length = _navigationContextStack.length;
+  // The `?? null` converts undefined (from array access) to null to match return type
+  return length > 0 ? (_navigationContextStack[length - 1] ?? null) : null;
+}
+
 /**
  * Initialize function to set dependencies that the router utilities need.
  * Must be called before using any of the exported utility functions.
@@ -273,3 +320,20 @@ export function resolveRouteNameAndSource(
 
   return [name || location.pathname, source];
 }
+
+/**
+ * Gets the active root span if it's a pageload or navigation span.
+ */
+export function getActiveRootSpan(): Span | undefined {
+  const span = getActiveSpan();
+  const rootSpan = span ? getRootSpan(span) : undefined;
+
+  if (!rootSpan) {
+    return undefined;
+  }
+
+  const op = spanToJSON(rootSpan).op;
+
+  // Only use this root span if it is a pageload or navigation span
+  return op === 'navigation' || op === 'pageload' ? rootSpan : undefined;
+}
diff --git a/packages/react/test/reactrouter-compat-utils/instrumentation.test.tsx b/packages/react/test/reactrouter-compat-utils/instrumentation.test.tsx
index 276a5b9950fc..3d2b4f198cf5 100644
--- a/packages/react/test/reactrouter-compat-utils/instrumentation.test.tsx
+++ b/packages/react/test/reactrouter-compat-utils/instrumentation.test.tsx
@@ -59,6 +59,7 @@ vi.mock('../../src/reactrouter-compat-utils/utils', () => ({
   transactionNameHasWildcard: vi.fn((name: string) => {
     return name.includes('/*') || name === '*' || name.endsWith('*');
   }),
+  getActiveRootSpan: vi.fn(() => undefined),
 }));
 
 vi.mock('../../src/reactrouter-compat-utils/lazy-routes', () => ({
diff --git a/packages/react/test/reactrouter-compat-utils/lazy-routes.test.ts b/packages/react/test/reactrouter-compat-utils/lazy-routes.test.ts
index 732b893ea8f8..0d1a493e08f2 100644
--- a/packages/react/test/reactrouter-compat-utils/lazy-routes.test.ts
+++ b/packages/react/test/reactrouter-compat-utils/lazy-routes.test.ts
@@ -106,7 +106,9 @@ describe('reactrouter-compat-utils/lazy-routes', () => {
       proxy();
 
       // Since handleAsyncHandlerResult is called internally, we verify through its side effects
-      expect(mockProcessResolvedRoutes).toHaveBeenCalledWith(['route1', 'route2'], route);
+      // The third parameter is the captured location (undefined in jsdom test environment)
+      // The fourth parameter is the captured span (undefined since no active span in test)
+      expect(mockProcessResolvedRoutes).toHaveBeenCalledWith(['route1', 'route2'], route, undefined, undefined);
     });
 
     it('should handle functions that throw exceptions', () => {
@@ -137,35 +139,38 @@ describe('reactrouter-compat-utils/lazy-routes', () => {
       const proxy = createAsyncHandlerProxy(originalFunction, route, handlerKey, mockProcessResolvedRoutes);
       proxy();
 
-      expect(mockProcessResolvedRoutes).toHaveBeenCalledWith([], route);
+      // The third parameter is the captured location (undefined in jsdom test environment)
+      // The fourth parameter is the captured span (undefined since no active span in test)
+      expect(mockProcessResolvedRoutes).toHaveBeenCalledWith([], route, undefined, undefined);
     });
   });
 
   describe('handleAsyncHandlerResult', () => {
     const route: RouteObject = { path: '/test' };
     const handlerKey = 'testHandler';
+    const mockLocation = { pathname: '/test', search: '', hash: '', state: null, key: 'default' };
 
     it('should handle array results directly', () => {
       const routes: RouteObject[] = [{ path: '/route1' }, { path: '/route2' }];
 
-      handleAsyncHandlerResult(routes, route, handlerKey, mockProcessResolvedRoutes);
+      handleAsyncHandlerResult(routes, route, handlerKey, mockProcessResolvedRoutes, mockLocation, undefined);
 
-      expect(mockProcessResolvedRoutes).toHaveBeenCalledWith(routes, route);
+      expect(mockProcessResolvedRoutes).toHaveBeenCalledWith(routes, route, mockLocation, undefined);
     });
 
     it('should handle empty array results', () => {
       const routes: RouteObject[] = [];
 
-      handleAsyncHandlerResult(routes, route, handlerKey, mockProcessResolvedRoutes);
+      handleAsyncHandlerResult(routes, route, handlerKey, mockProcessResolvedRoutes, mockLocation, undefined);
 
-      expect(mockProcessResolvedRoutes).toHaveBeenCalledWith(routes, route);
+      expect(mockProcessResolvedRoutes).toHaveBeenCalledWith(routes, route, mockLocation, undefined);
     });
 
     it('should handle Promise results that resolve to arrays', async () => {
       const routes: RouteObject[] = [{ path: '/route1' }, { path: '/route2' }];
       const promiseResult = Promise.resolve(routes);
 
-      handleAsyncHandlerResult(promiseResult, route, handlerKey, mockProcessResolvedRoutes);
+      handleAsyncHandlerResult(promiseResult, route, handlerKey, mockProcessResolvedRoutes, mockLocation, undefined);
 
       // Wait for the promise to resolve
       await promiseResult;
@@ -173,25 +178,25 @@ describe('reactrouter-compat-utils/lazy-routes', () => {
       // Use setTimeout to wait for the async handling
       await new Promise(resolve => setTimeout(resolve, 0));
 
-      expect(mockProcessResolvedRoutes).toHaveBeenCalledWith(routes, route);
+      expect(mockProcessResolvedRoutes).toHaveBeenCalledWith(routes, route, mockLocation, undefined);
     });
 
     it('should handle Promise results that resolve to empty arrays', async () => {
       const routes: RouteObject[] = [];
       const promiseResult = Promise.resolve(routes);
 
-      handleAsyncHandlerResult(promiseResult, route, handlerKey, mockProcessResolvedRoutes);
+      handleAsyncHandlerResult(promiseResult, route, handlerKey, mockProcessResolvedRoutes, mockLocation, undefined);
 
       await promiseResult;
       await new Promise(resolve => setTimeout(resolve, 0));
 
-      expect(mockProcessResolvedRoutes).toHaveBeenCalledWith(routes, route);
+      expect(mockProcessResolvedRoutes).toHaveBeenCalledWith(routes, route, mockLocation, undefined);
     });
 
     it('should handle Promise results that resolve to non-arrays', async () => {
       const promiseResult = Promise.resolve('not an array');
 
-      handleAsyncHandlerResult(promiseResult, route, handlerKey, mockProcessResolvedRoutes);
+      handleAsyncHandlerResult(promiseResult, route, handlerKey, mockProcessResolvedRoutes, mockLocation, undefined);
 
       await promiseResult;
       await new Promise(resolve => setTimeout(resolve, 0));
@@ -202,7 +207,7 @@ describe('reactrouter-compat-utils/lazy-routes', () => {
     it('should handle Promise results that resolve to null', async () => {
       const promiseResult = Promise.resolve(null);
 
-      handleAsyncHandlerResult(promiseResult, route, handlerKey, mockProcessResolvedRoutes);
+      handleAsyncHandlerResult(promiseResult, route, handlerKey, mockProcessResolvedRoutes, mockLocation, undefined);
 
       await promiseResult;
       await new Promise(resolve => setTimeout(resolve, 0));
@@ -213,7 +218,7 @@ describe('reactrouter-compat-utils/lazy-routes', () => {
     it('should handle Promise results that resolve to undefined', async () => {
       const promiseResult = Promise.resolve(undefined);
 
-      handleAsyncHandlerResult(promiseResult, route, handlerKey, mockProcessResolvedRoutes);
+      handleAsyncHandlerResult(promiseResult, route, handlerKey, mockProcessResolvedRoutes, mockLocation, undefined);
 
       await promiseResult;
       await new Promise(resolve => setTimeout(resolve, 0));
@@ -224,7 +229,7 @@ describe('reactrouter-compat-utils/lazy-routes', () => {
     it('should handle Promise rejections gracefully', async () => {
       const promiseResult = Promise.reject(new Error('Test error'));
 
-      handleAsyncHandlerResult(promiseResult, route, handlerKey, mockProcessResolvedRoutes);
+      handleAsyncHandlerResult(promiseResult, route, handlerKey, mockProcessResolvedRoutes, mockLocation, undefined);
 
       // Wait for the promise to be handled
       await new Promise(resolve => setTimeout(resolve, 0));
@@ -240,7 +245,7 @@ describe('reactrouter-compat-utils/lazy-routes', () => {
     it('should handle Promise rejections with non-Error values', async () => {
       const promiseResult = Promise.reject('string error');
 
-      handleAsyncHandlerResult(promiseResult, route, handlerKey, mockProcessResolvedRoutes);
+      handleAsyncHandlerResult(promiseResult, route, handlerKey, mockProcessResolvedRoutes, mockLocation, undefined);
 
       await new Promise(resolve => setTimeout(resolve, 0));
 
@@ -253,25 +258,25 @@ describe('reactrouter-compat-utils/lazy-routes', () => {
     });
 
     it('should ignore non-promise, non-array results', () => {
-      handleAsyncHandlerResult('string result', route, handlerKey, mockProcessResolvedRoutes);
-      handleAsyncHandlerResult(123, route, handlerKey, mockProcessResolvedRoutes);
-      handleAsyncHandlerResult({ not: 'array' }, route, handlerKey, mockProcessResolvedRoutes);
-      handleAsyncHandlerResult(null, route, handlerKey, mockProcessResolvedRoutes);
-      handleAsyncHandlerResult(undefined, route, handlerKey, mockProcessResolvedRoutes);
+      handleAsyncHandlerResult('string result', route, handlerKey, mockProcessResolvedRoutes, mockLocation, undefined);
+      handleAsyncHandlerResult(123, route, handlerKey, mockProcessResolvedRoutes, mockLocation, undefined);
+      handleAsyncHandlerResult({ not: 'array' }, route, handlerKey, mockProcessResolvedRoutes, mockLocation, undefined);
+      handleAsyncHandlerResult(null, route, handlerKey, mockProcessResolvedRoutes, mockLocation, undefined);
+      handleAsyncHandlerResult(undefined, route, handlerKey, mockProcessResolvedRoutes, mockLocation, undefined);
 
       expect(mockProcessResolvedRoutes).not.toHaveBeenCalled();
     });
 
     it('should ignore boolean values', () => {
-      handleAsyncHandlerResult(true, route, handlerKey, mockProcessResolvedRoutes);
-      handleAsyncHandlerResult(false, route, handlerKey, mockProcessResolvedRoutes);
+      handleAsyncHandlerResult(true, route, handlerKey, mockProcessResolvedRoutes, mockLocation, undefined);
+      handleAsyncHandlerResult(false, route, handlerKey, mockProcessResolvedRoutes, mockLocation, undefined);
 
       expect(mockProcessResolvedRoutes).not.toHaveBeenCalled();
     });
 
     it('should ignore functions as results', () => {
       const functionResult = () => 'test';
-      handleAsyncHandlerResult(functionResult, route, handlerKey, mockProcessResolvedRoutes);
+      handleAsyncHandlerResult(functionResult, route, handlerKey, mockProcessResolvedRoutes, mockLocation, undefined);
 
       expect(mockProcessResolvedRoutes).not.toHaveBeenCalled();
     });
@@ -281,7 +286,14 @@ describe('reactrouter-compat-utils/lazy-routes', () => {
         then: 'not a function',
       };
 
-      handleAsyncHandlerResult(fakeThenableButNotPromise, route, handlerKey, mockProcessResolvedRoutes);
+      handleAsyncHandlerResult(
+        fakeThenableButNotPromise,
+        route,
+        handlerKey,
+        mockProcessResolvedRoutes,
+        mockLocation,
+        undefined,
+      );
 
       expect(mockProcessResolvedRoutes).not.toHaveBeenCalled();
     });
@@ -291,7 +303,7 @@ describe('reactrouter-compat-utils/lazy-routes', () => {
         then: null,
       };
 
-      handleAsyncHandlerResult(almostPromise, route, handlerKey, mockProcessResolvedRoutes);
+      handleAsyncHandlerResult(almostPromise, route, handlerKey, mockProcessResolvedRoutes, mockLocation, undefined);
 
       expect(mockProcessResolvedRoutes).not.toHaveBeenCalled();
     });
@@ -306,12 +318,19 @@ describe('reactrouter-compat-utils/lazy-routes', () => {
       const routes: RouteObject[] = [{ path: '/dynamic1' }, { path: '/dynamic2' }];
       const promiseResult = Promise.resolve(routes);
 
-      handleAsyncHandlerResult(promiseResult, complexRoute, 'complexHandler', mockProcessResolvedRoutes);
+      handleAsyncHandlerResult(
+        promiseResult,
+        complexRoute,
+        'complexHandler',
+        mockProcessResolvedRoutes,
+        mockLocation,
+        undefined,
+      );
 
       await promiseResult;
       await new Promise(resolve => setTimeout(resolve, 0));
 
-      expect(mockProcessResolvedRoutes).toHaveBeenCalledWith(routes, complexRoute);
+      expect(mockProcessResolvedRoutes).toHaveBeenCalledWith(routes, complexRoute, mockLocation, undefined);
     });
 
     it('should handle nested route objects in arrays', () => {
@@ -322,9 +341,18 @@ describe('reactrouter-compat-utils/lazy-routes', () => {
         },
       ];
 
-      handleAsyncHandlerResult(routes, route, handlerKey, mockProcessResolvedRoutes);
+      handleAsyncHandlerResult(routes, route, handlerKey, mockProcessResolvedRoutes, mockLocation, undefined);
+
+      expect(mockProcessResolvedRoutes).toHaveBeenCalledWith(routes, route, mockLocation, undefined);
+    });
+
+    it('should convert null location to undefined for processResolvedRoutes', () => {
+      const routes: RouteObject[] = [{ path: '/route1' }];
+
+      handleAsyncHandlerResult(routes, route, handlerKey, mockProcessResolvedRoutes, null, undefined);
 
-      expect(mockProcessResolvedRoutes).toHaveBeenCalledWith(routes, route);
+      // When null is passed, it should convert to undefined for processResolvedRoutes
+      expect(mockProcessResolvedRoutes).toHaveBeenCalledWith(routes, route, undefined, undefined);
     });
   });
 
diff --git a/packages/react/test/reactrouter-compat-utils/utils.test.ts b/packages/react/test/reactrouter-compat-utils/utils.test.ts
index 438b026104bd..401ea648b0fc 100644
--- a/packages/react/test/reactrouter-compat-utils/utils.test.ts
+++ b/packages/react/test/reactrouter-compat-utils/utils.test.ts
@@ -1,5 +1,7 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import {
+  clearNavigationContext,
+  getNavigationContext,
   getNormalizedName,
   getNumberOfUrlSegments,
   initializeRouterUtils,
@@ -9,6 +11,7 @@ import {
   prefixWithSlash,
   rebuildRoutePathFromAllRoutes,
   resolveRouteNameAndSource,
+  setNavigationContext,
   transactionNameHasWildcard,
 } from '../../src/reactrouter-compat-utils';
 import type { Location, MatchRoutes, RouteMatch, RouteObject } from '../../src/types';
@@ -664,4 +667,137 @@ describe('reactrouter-compat-utils/utils', () => {
       expect(transactionNameHasWildcard('/path/to/asterisk')).toBe(false); // 'asterisk' contains 'isk' but not '*'
     });
   });
+
+  describe('navigation context management', () => {
+    // Clean up navigation context after each test by popping until empty
+    afterEach(() => {
+      // Pop all remaining contexts
+      while (getNavigationContext() !== null) {
+        const ctx = getNavigationContext();
+        if (ctx) {
+          clearNavigationContext((ctx as any).token);
+        }
+      }
+    });
+
+    describe('setNavigationContext', () => {
+      it('should return unique tokens (object identity)', () => {
+        const token1 = setNavigationContext('/path1', undefined);
+        const token2 = setNavigationContext('/path2', undefined);
+        const token3 = setNavigationContext('/path3', undefined);
+
+        // Each token should be a unique object
+        expect(token1).not.toBe(token2);
+        expect(token2).not.toBe(token3);
+        expect(token1).not.toBe(token3);
+      });
+
+      it('should store targetPath and span in context', () => {
+        const mockSpan = { name: 'test-span' } as any;
+        setNavigationContext('/test-path', mockSpan);
+
+        const context = getNavigationContext();
+        expect(context).not.toBeNull();
+        expect(context?.targetPath).toBe('/test-path');
+        expect(context?.span).toBe(mockSpan);
+      });
+
+      it('should handle undefined targetPath', () => {
+        setNavigationContext(undefined, undefined);
+
+        const context = getNavigationContext();
+        expect(context).not.toBeNull();
+        expect(context?.targetPath).toBeUndefined();
+      });
+    });
+
+    describe('clearNavigationContext', () => {
+      it('should remove context when token matches top of stack (LIFO)', () => {
+        const token = setNavigationContext('/test', undefined);
+
+        expect(getNavigationContext()).not.toBeNull();
+
+        clearNavigationContext(token);
+
+        expect(getNavigationContext()).toBeNull();
+      });
+
+      it('should NOT remove context when token is not on top (out-of-order completion)', () => {
+        // Simulate: Nav1 starts, Nav2 starts, Nav1 tries to complete first
+        const token1 = setNavigationContext('/nav1', undefined);
+        const token2 = setNavigationContext('/nav2', undefined);
+
+        // Most recent should be nav2
+        expect(getNavigationContext()?.targetPath).toBe('/nav2');
+
+        // Nav1 tries to complete first (out of order) - should NOT pop because nav1 is not on top
+        clearNavigationContext(token1);
+
+        // Nav2 should still be the current context (nav1's context is still buried)
+        expect(getNavigationContext()?.targetPath).toBe('/nav2');
+
+        // Nav2 completes - should pop because nav2 IS on top
+        clearNavigationContext(token2);
+
+        // Now nav1's stale context is on top (will be cleaned by overflow protection)
+        expect(getNavigationContext()?.targetPath).toBe('/nav1');
+      });
+
+      it('should not throw when clearing with unknown token', () => {
+        const unknownToken = {};
+        expect(() => clearNavigationContext(unknownToken)).not.toThrow();
+      });
+
+      it('should correctly handle LIFO cleanup order', () => {
+        const token1 = setNavigationContext('/path1', undefined);
+        const token2 = setNavigationContext('/path2', undefined);
+        const token3 = setNavigationContext('/path3', undefined);
+
+        // Clear in LIFO order
+        clearNavigationContext(token3);
+        expect(getNavigationContext()?.targetPath).toBe('/path2');
+
+        clearNavigationContext(token2);
+        expect(getNavigationContext()?.targetPath).toBe('/path1');
+
+        clearNavigationContext(token1);
+        expect(getNavigationContext()).toBeNull();
+      });
+    });
+
+    describe('getNavigationContext', () => {
+      it('should return null when stack is empty', () => {
+        expect(getNavigationContext()).toBeNull();
+      });
+
+      it('should return the most recent context', () => {
+        setNavigationContext('/first', undefined);
+        setNavigationContext('/second', undefined);
+        setNavigationContext('/third', undefined);
+
+        expect(getNavigationContext()?.targetPath).toBe('/third');
+      });
+    });
+
+    describe('stack overflow protection', () => {
+      it('should remove oldest context when stack exceeds limit', () => {
+        // Push 12 contexts (limit is 10)
+        const tokens: object[] = [];
+        for (let i = 0; i < 12; i++) {
+          tokens.push(setNavigationContext(`/path${i}`, undefined));
+        }
+
+        // Most recent should be /path11
+        expect(getNavigationContext()?.targetPath).toBe('/path11');
+
+        // The oldest contexts (path0, path1) were evicted due to overflow
+        // Trying to clear them does nothing (their tokens no longer match anything)
+        clearNavigationContext(tokens[0]!);
+        clearNavigationContext(tokens[1]!);
+
+        // /path11 should still be current
+        expect(getNavigationContext()?.targetPath).toBe('/path11');
+      });
+    });
+  });
 });

From c786fc52e5957747a59ce1ad085cf51be1f97d97 Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Tue, 9 Dec 2025 11:57:35 +0100
Subject: [PATCH 178/186] chore(ci): Fix double issue creation for unreferenced
 PRs (#18442)

This fixes a problem, where our unreferenced PR GH workflow would
trigger another new issue being created because of a race condition
between creating the issue and updating the PR description
automatically.
---
 .../workflows/create-issue-for-unreferenced-prs.yml    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/create-issue-for-unreferenced-prs.yml b/.github/workflows/create-issue-for-unreferenced-prs.yml
index a0eee060f282..a47df32738d7 100644
--- a/.github/workflows/create-issue-for-unreferenced-prs.yml
+++ b/.github/workflows/create-issue-for-unreferenced-prs.yml
@@ -41,6 +41,14 @@ jobs:
               return;
             }
 
+            // Bail if this edit was made by the GitHub Actions bot (this workflow)
+            // This prevents infinite loops when we update the PR body with the new issue reference
+            // We check login specifically to not skip edits from other legitimate bots
+            if (context.payload.sender && context.payload.sender.login === 'github-actions[bot]') {
+              console.log(`PR #${pr.number} was edited by github-actions[bot] (this workflow), skipping.`);
+              return;
+            }
+
             // Check if the PR is already approved
             const reviewsResponse = await github.rest.pulls.listReviews({
               owner: context.repo.owner,
@@ -109,7 +117,7 @@ jobs:
             console.log(`Created issue #${issueID}.`);
 
             // Update the PR body to reference the new issue
-            const updatedPrBody = `${prBody}\n\nCloses #${issueID}`;
+            const updatedPrBody = `${prBody}\n\nCloses #${issueID} (added automatically)`;
 
             await github.rest.pulls.update({
               owner: context.repo.owner,

From ca146a57deaca8e6da3eb660177401f8a014ce66 Mon Sep 17 00:00:00 2001
From: Lukas Stracke <lukas.stracke@sentry.io>
Date: Tue, 9 Dec 2025 12:00:12 +0100
Subject: [PATCH 179/186] chore(publish): Fix publish order for `@sentry/types`
 (#18429)

Types depends on core but we accidentally published it before core. Not
the end of the world but theoretically, if publishing core failed, we
would have published a faulty types package. h/t @BYK for detecting
this!

Closes #18431
---
 .craft.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.craft.yml b/.craft.yml
index cf86175ca43d..f2ffca132f23 100644
--- a/.craft.yml
+++ b/.craft.yml
@@ -4,14 +4,14 @@ preReleaseCommand: bash scripts/craft-pre-release.sh
 targets:
   # NPM Targets
   ## 1. Base Packages, node or browser SDKs depend on
-  ## 1.1 Types
-  - name: npm
-    id: '@sentry/types'
-    includeNames: /^sentry-types-\d.*\.tgz$/
-  ## 1.2 Core SDKs
+  ## 1.1 Core SDKs
   - name: npm
     id: '@sentry/core'
     includeNames: /^sentry-core-\d.*\.tgz$/
+    ## 1.2 Types
+  - name: npm
+    id: '@sentry/types'
+    includeNames: /^sentry-types-\d.*\.tgz$/
   - name: npm
     id: '@sentry/node-core'
     includeNames: /^sentry-node-core-\d.*\.tgz$/

From 49facf21411058f14d9651a6609c1d6cd1193de0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Dec 2025 12:05:14 +0100
Subject: [PATCH 180/186] chore(deps): bump next from 16.0.0 to 16.0.7 in
 /dev-packages/e2e-tests/test-applications/nextjs-16-tunnel (#18439)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [next](https://github.com/vercel/next.js) from 16.0.0 to 16.0.7.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/vercel/next.js/releases">next's
releases</a>.</em></p>
<blockquote>
<h2>v16.0.7</h2>
<p>Please see <a
href="https://nextjs.org/blog/CVE-2025-66478">CVE-2025-66478</a> for
additional details about this release.</p>
<h2>v16.0.6</h2>
<blockquote>
<p>[!NOTE]
This release is backporting bug fixes. It does <strong>not</strong>
include all pending features/changes on canary.</p>
</blockquote>
<h3>Core Changes</h3>
<ul>
<li>bump the browserslist version to silence a warning in CI (<a
href="https://github.com/vercel/next.js/issues/86625">#86625</a>)</li>
</ul>
<h3>Credits</h3>
<p>Huge thanks to <a
href="https://github.com/lukesandberg"><code>@​lukesandberg</code></a>
for helping!</p>
<h2>v16.0.5</h2>
<blockquote>
<p>[!NOTE]
This release is backporting bug fixes. It does <strong>not</strong>
include all pending features/changes on canary.</p>
</blockquote>
<h3>Core Changes</h3>
<ul>
<li>fix(nodejs-middleware): await for body cloning to be properly
finalized (<a
href="https://github.com/vercel/next.js/issues/85418">#85418</a>)</li>
</ul>
<h3>Credits</h3>
<p>Huge thanks to <a
href="https://github.com/lucasadrianof"><code>@​lucasadrianof</code></a>
for helping!</p>
<h2>v16.0.4</h2>
<blockquote>
<p>[!NOTE]
This release is backporting bug fixes. It does <strong>not</strong>
include all pending features/changes on canary.</p>
</blockquote>
<h3>Core Changes</h3>
<ul>
<li>fix: Rename proxy.js to middleware.js in NFT file (<a
href="https://github.com/vercel/next.js/issues/86214">#86214</a>)</li>
<li>fix: prevent fetch abort errors propagating to user error boundaries
(<a
href="https://github.com/vercel/next.js/issues/86277">#86277</a>)</li>
<li>Turbopack: fix passing project options from napi (<a
href="https://github.com/vercel/next.js/issues/86256">#86256</a>)</li>
</ul>
<h3>Credits</h3>
<p>Huge thanks to <a
href="https://github.com/devjiwonchoi"><code>@​devjiwonchoi</code></a>,
<a href="https://github.com/sokra"><code>@​sokra</code></a> and <a
href="https://github.com/ztanner"><code>@​ztanner</code></a> for
helping!</p>
<h2>v16.0.3</h2>
<h3>Core Changes</h3>
<ul>
<li>fix: Rspack throw error when using ForceCompleteRuntimePlugin: <a
href="https://github.com/vercel/next.js/issues/85221">#85221</a></li>
<li>fix: build CLI output not displaying Proxy (Middleware) when nodejs
runtime: <a
href="https://github.com/vercel/next.js/issues/85403">#85403</a></li>
<li>fix: staleTimes.static should consistently enforce a 30s minimum: <a
href="https://github.com/vercel/next.js/issues/85479">#85479</a></li>
<li>[turbopack] fix build of empty entries of pages: <a
href="https://github.com/vercel/next.js/issues/84873">#84873</a></li>
<li>Cache the head separately from the route tree: <a
href="https://github.com/vercel/next.js/issues/84724">#84724</a></li>
<li>Allow inspecting dev server on default port with <code>next dev
--inspect</code>: <a
href="https://github.com/vercel/next.js/issues/85037">#85037</a></li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/vercel/next.js/commit/7492122a3bbc6655b64ccba04076c73ab418cdcc"><code>7492122</code></a>
v16.0.7</li>
<li><a
href="https://github.com/vercel/next.js/commit/d21259d920f666814fa634e744d2c6e797ceae43"><code>d21259d</code></a>
update version script</li>
<li><a
href="https://github.com/vercel/next.js/commit/b1a04a84e991b48b6558d15841b86f3017878607"><code>b1a04a8</code></a>
Update React Version (<a
href="https://github.com/vercel/next.js/issues/11">#11</a>)</li>
<li><a
href="https://github.com/vercel/next.js/commit/aab1edcb8d7a57a6f7a1637d0f87be84ea62edc8"><code>aab1edc</code></a>
v16.0.6</li>
<li><a
href="https://github.com/vercel/next.js/commit/279f2e319e939af54db81f9f5db730501f755284"><code>279f2e3</code></a>
bump the browserslist version to silence a warning in CI (<a
href="https://github.com/vercel/next.js/issues/86625">#86625</a>)</li>
<li><a
href="https://github.com/vercel/next.js/commit/89ccb9fc86c13ca6aaaa5eb0e61c02c309abf1a3"><code>89ccb9f</code></a>
v16.0.5</li>
<li><a
href="https://github.com/vercel/next.js/commit/75f63f70084de2198a22267fc344884b091f9d7c"><code>75f63f7</code></a>
backport fix(nodejs-middleware): await for body cloning to be properly
finali...</li>
<li><a
href="https://github.com/vercel/next.js/commit/d440c75650c79b8be450df5fd434afbfe230506a"><code>d440c75</code></a>
v16.0.4</li>
<li><a
href="https://github.com/vercel/next.js/commit/296923e0cd66084708ac108026c414b4a64d07e9"><code>296923e</code></a>
Turbopack: fix passing project options from napi (<a
href="https://github.com/vercel/next.js/issues/86256">#86256</a>)</li>
<li><a
href="https://github.com/vercel/next.js/commit/98317f5a3bd0cae2565e44e0108a0d7ab6cd5185"><code>98317f5</code></a>
fix: prevent fetch abort errors propagating to user error boundaries (<a
href="https://github.com/vercel/next.js/issues/86277">#86277</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/vercel/next.js/compare/v16.0.0...v16.0.7">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=next&package-manager=npm_and_yarn&previous-version=16.0.0&new-version=16.0.7)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
You can disable automated security fix PRs for this repo from the
[Security Alerts
page](https://github.com/getsentry/sentry-javascript/network/alerts).

</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .../e2e-tests/test-applications/nextjs-16-tunnel/package.json   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/package.json b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/package.json
index 40389ad0888f..724dc9e58e4d 100644
--- a/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/package.json
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-tunnel/package.json
@@ -27,7 +27,7 @@
     "@sentry/core": "latest || *",
     "ai": "^3.0.0",
     "import-in-the-middle": "^1",
-    "next": "16.0.0",
+    "next": "16.0.7",
     "react": "19.1.0",
     "react-dom": "19.1.0",
     "require-in-the-middle": "^7",

From 23c16fd6fd7ffb6bf25db285ab1562d227716dfa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Dec 2025 12:05:22 +0100
Subject: [PATCH 181/186] chore(deps): bump next from 16.0.0 to 16.0.7 in
 /dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents (#18427)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps [next](https://github.com/vercel/next.js) from 16.0.0 to 16.0.7.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/vercel/next.js/releases">next's
releases</a>.</em></p>
<blockquote>
<h2>v16.0.7</h2>
<p>Please see <a
href="https://nextjs.org/blog/CVE-2025-66478">CVE-2025-66478</a> for
additional details about this release.</p>
<h2>v16.0.6</h2>
<blockquote>
<p>[!NOTE]
This release is backporting bug fixes. It does <strong>not</strong>
include all pending features/changes on canary.</p>
</blockquote>
<h3>Core Changes</h3>
<ul>
<li>bump the browserslist version to silence a warning in CI (<a
href="https://github.com/vercel/next.js/issues/86625">#86625</a>)</li>
</ul>
<h3>Credits</h3>
<p>Huge thanks to <a
href="https://github.com/lukesandberg"><code>@​lukesandberg</code></a>
for helping!</p>
<h2>v16.0.5</h2>
<blockquote>
<p>[!NOTE]
This release is backporting bug fixes. It does <strong>not</strong>
include all pending features/changes on canary.</p>
</blockquote>
<h3>Core Changes</h3>
<ul>
<li>fix(nodejs-middleware): await for body cloning to be properly
finalized (<a
href="https://github.com/vercel/next.js/issues/85418">#85418</a>)</li>
</ul>
<h3>Credits</h3>
<p>Huge thanks to <a
href="https://github.com/lucasadrianof"><code>@​lucasadrianof</code></a>
for helping!</p>
<h2>v16.0.4</h2>
<blockquote>
<p>[!NOTE]
This release is backporting bug fixes. It does <strong>not</strong>
include all pending features/changes on canary.</p>
</blockquote>
<h3>Core Changes</h3>
<ul>
<li>fix: Rename proxy.js to middleware.js in NFT file (<a
href="https://github.com/vercel/next.js/issues/86214">#86214</a>)</li>
<li>fix: prevent fetch abort errors propagating to user error boundaries
(<a
href="https://github.com/vercel/next.js/issues/86277">#86277</a>)</li>
<li>Turbopack: fix passing project options from napi (<a
href="https://github.com/vercel/next.js/issues/86256">#86256</a>)</li>
</ul>
<h3>Credits</h3>
<p>Huge thanks to <a
href="https://github.com/devjiwonchoi"><code>@​devjiwonchoi</code></a>,
<a href="https://github.com/sokra"><code>@​sokra</code></a> and <a
href="https://github.com/ztanner"><code>@​ztanner</code></a> for
helping!</p>
<h2>v16.0.3</h2>
<h3>Core Changes</h3>
<ul>
<li>fix: Rspack throw error when using ForceCompleteRuntimePlugin: <a
href="https://github.com/vercel/next.js/issues/85221">#85221</a></li>
<li>fix: build CLI output not displaying Proxy (Middleware) when nodejs
runtime: <a
href="https://github.com/vercel/next.js/issues/85403">#85403</a></li>
<li>fix: staleTimes.static should consistently enforce a 30s minimum: <a
href="https://github.com/vercel/next.js/issues/85479">#85479</a></li>
<li>[turbopack] fix build of empty entries of pages: <a
href="https://github.com/vercel/next.js/issues/84873">#84873</a></li>
<li>Cache the head separately from the route tree: <a
href="https://github.com/vercel/next.js/issues/84724">#84724</a></li>
<li>Allow inspecting dev server on default port with <code>next dev
--inspect</code>: <a
href="https://github.com/vercel/next.js/issues/85037">#85037</a></li>
</ul>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/vercel/next.js/commit/7492122a3bbc6655b64ccba04076c73ab418cdcc"><code>7492122</code></a>
v16.0.7</li>
<li><a
href="https://github.com/vercel/next.js/commit/d21259d920f666814fa634e744d2c6e797ceae43"><code>d21259d</code></a>
update version script</li>
<li><a
href="https://github.com/vercel/next.js/commit/b1a04a84e991b48b6558d15841b86f3017878607"><code>b1a04a8</code></a>
Update React Version (<a
href="https://github.com/vercel/next.js/issues/11">#11</a>)</li>
<li><a
href="https://github.com/vercel/next.js/commit/aab1edcb8d7a57a6f7a1637d0f87be84ea62edc8"><code>aab1edc</code></a>
v16.0.6</li>
<li><a
href="https://github.com/vercel/next.js/commit/279f2e319e939af54db81f9f5db730501f755284"><code>279f2e3</code></a>
bump the browserslist version to silence a warning in CI (<a
href="https://github.com/vercel/next.js/issues/86625">#86625</a>)</li>
<li><a
href="https://github.com/vercel/next.js/commit/89ccb9fc86c13ca6aaaa5eb0e61c02c309abf1a3"><code>89ccb9f</code></a>
v16.0.5</li>
<li><a
href="https://github.com/vercel/next.js/commit/75f63f70084de2198a22267fc344884b091f9d7c"><code>75f63f7</code></a>
backport fix(nodejs-middleware): await for body cloning to be properly
finali...</li>
<li><a
href="https://github.com/vercel/next.js/commit/d440c75650c79b8be450df5fd434afbfe230506a"><code>d440c75</code></a>
v16.0.4</li>
<li><a
href="https://github.com/vercel/next.js/commit/296923e0cd66084708ac108026c414b4a64d07e9"><code>296923e</code></a>
Turbopack: fix passing project options from napi (<a
href="https://github.com/vercel/next.js/issues/86256">#86256</a>)</li>
<li><a
href="https://github.com/vercel/next.js/commit/98317f5a3bd0cae2565e44e0108a0d7ab6cd5185"><code>98317f5</code></a>
fix: prevent fetch abort errors propagating to user error boundaries (<a
href="https://github.com/vercel/next.js/issues/86277">#86277</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/vercel/next.js/compare/v16.0.0...v16.0.7">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=next&package-manager=npm_and_yarn&previous-version=16.0.0&new-version=16.0.7)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
You can disable automated security fix PRs for this repo from the
[Security Alerts
page](https://github.com/getsentry/sentry-javascript/network/alerts).

</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .../test-applications/nextjs-16-cacheComponents/package.json    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/package.json b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/package.json
index de2d67b0ed4b..bbd1573fc5be 100644
--- a/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/package.json
+++ b/dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents/package.json
@@ -26,7 +26,7 @@
     "@sentry/nextjs": "latest || *",
     "@sentry/core": "latest || *",
     "import-in-the-middle": "^1",
-    "next": "16.0.0",
+    "next": "16.0.7",
     "react": "19.1.0",
     "react-dom": "19.1.0",
     "require-in-the-middle": "^7",

From 859608626338666a807699bd8be7b0b4b2cb520d Mon Sep 17 00:00:00 2001
From: Onur Temizkan <onur@narval.co.uk>
Date: Tue, 9 Dec 2025 20:57:00 +0000
Subject: [PATCH 182/186] fix(aws-serverless): Remove hyphens from AWS-lambda
 origins (#18353)

Following up: https://github.com/getsentry/sentry-javascript/pull/18351
Looks like these are also forgotten in hyphens
---
 .github/workflows/build.yml                   |  4 ++
 dev-packages/e2e-tests/run.ts                 |  2 +
 .../aws-serverless/src/stack.ts               | 55 ++++++++++++++++++-
 .../aws-serverless/tests/lambda-fixtures.ts   | 28 +++++++++-
 .../aws-serverless/tests/layer.test.ts        | 12 ++--
 .../aws-serverless/tests/npm.test.ts          |  8 +--
 .../src/integration/awslambda.ts              |  2 +-
 7 files changed, 96 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5575f81c9e4a..b351bdc647a0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -992,6 +992,8 @@ jobs:
         working-directory: ${{ runner.temp }}/test-application
         timeout-minutes: 7
         run: ${{ matrix.build-command || 'pnpm test:build' }}
+        env:
+          SENTRY_E2E_WORKSPACE_ROOT: ${{ github.workspace }}
 
       - name: Install Playwright
         uses: ./.github/actions/install-playwright
@@ -1003,6 +1005,8 @@ jobs:
         working-directory: ${{ runner.temp }}/test-application
         timeout-minutes: 10
         run: ${{ matrix.assert-command || 'pnpm test:assert' }}
+        env:
+          SENTRY_E2E_WORKSPACE_ROOT: ${{ github.workspace }}
 
       - name: Upload Playwright Traces
         uses: actions/upload-artifact@v5
diff --git a/dev-packages/e2e-tests/run.ts b/dev-packages/e2e-tests/run.ts
index 5312dc664cee..e0331f0694f8 100644
--- a/dev-packages/e2e-tests/run.ts
+++ b/dev-packages/e2e-tests/run.ts
@@ -76,6 +76,8 @@ async function run(): Promise<void> {
     REACT_APP_E2E_TEST_DSN: dsn,
     E2E_TEST_SENTRY_ORG_SLUG: process.env.E2E_TEST_SENTRY_ORG_SLUG || DEFAULT_SENTRY_ORG_SLUG,
     E2E_TEST_SENTRY_PROJECT: process.env.E2E_TEST_SENTRY_PROJECT || DEFAULT_SENTRY_PROJECT,
+    // Pass workspace root so tests copied to temp dirs can find local packages
+    SENTRY_E2E_WORKSPACE_ROOT: resolve(__dirname, '../..'),
   };
 
   const env = {
diff --git a/dev-packages/e2e-tests/test-applications/aws-serverless/src/stack.ts b/dev-packages/e2e-tests/test-applications/aws-serverless/src/stack.ts
index d23feae60811..63463c914e1d 100644
--- a/dev-packages/e2e-tests/test-applications/aws-serverless/src/stack.ts
+++ b/dev-packages/e2e-tests/test-applications/aws-serverless/src/stack.ts
@@ -15,6 +15,17 @@ const LAYER_DIR = './node_modules/@sentry/aws-serverless/';
 const DEFAULT_NODE_VERSION = '22';
 export const SAM_PORT = 3001;
 
+function resolvePackagesDir(): string {
+  // When running via the e2e test runner, tests are copied to a temp directory
+  // so we need the workspace root passed via env var
+  const workspaceRoot = process.env.SENTRY_E2E_WORKSPACE_ROOT;
+  if (workspaceRoot) {
+    return path.join(workspaceRoot, 'packages');
+  }
+  // Fallback for local development when running from the original location
+  return path.resolve(__dirname, '../../../../../packages');
+}
+
 export class LocalLambdaStack extends Stack {
   sentryLayer: CfnResource;
 
@@ -67,10 +78,48 @@ export class LocalLambdaStack extends Stack {
       const functionName = `${addLayer ? 'Layer' : 'Npm'}${lambdaDir}`;
 
       if (!addLayer) {
+        const lambdaPath = path.resolve(functionsDir, lambdaDir);
+        const packageLockPath = path.join(lambdaPath, 'package-lock.json');
+        const nodeModulesPath = path.join(lambdaPath, 'node_modules');
+
+        // Point the dependency at the locally built packages so tests use the current workspace bits
+        // We need to link all @sentry/* packages that are dependencies of aws-serverless
+        // because otherwise npm will try to install them from the registry, where the current version is not yet published
+        const packagesToLink = ['aws-serverless', 'node', 'core', 'node-core', 'opentelemetry'];
+        const dependencies: Record<string, string> = {};
+
+        const packagesDir = resolvePackagesDir();
+        for (const pkgName of packagesToLink) {
+          const pkgDir = path.join(packagesDir, pkgName);
+          if (!fs.existsSync(pkgDir)) {
+            throw new Error(
+              `[LocalLambdaStack] Workspace package ${pkgName} not found at ${pkgDir}. Did you run the build?`,
+            );
+          }
+          const relativePath = path.relative(lambdaPath, pkgDir);
+          dependencies[`@sentry/${pkgName}`] = `file:${relativePath.replace(/\\/g, '/')}`;
+        }
+
         console.log(`[LocalLambdaStack] Install dependencies for ${functionName}`);
-        const packageJson = { dependencies: { '@sentry/aws-serverless': '* || latest' } };
-        fs.writeFileSync(path.join(functionsDir, lambdaDir, 'package.json'), JSON.stringify(packageJson, null, 2));
-        execFileSync('npm', ['install', '--prefix', path.join(functionsDir, lambdaDir)], { stdio: 'inherit' });
+
+        if (fs.existsSync(packageLockPath)) {
+          // Prevent stale lock files from pinning the published package version
+          fs.rmSync(packageLockPath);
+        }
+
+        if (fs.existsSync(nodeModulesPath)) {
+          // Ensure we reinstall from the workspace instead of reusing cached dependencies
+          fs.rmSync(nodeModulesPath, { recursive: true, force: true });
+        }
+
+        const packageJson = {
+          dependencies,
+        };
+
+        fs.writeFileSync(path.join(lambdaPath, 'package.json'), JSON.stringify(packageJson, null, 2));
+        // Use --install-links to copy files instead of creating symlinks for file: dependencies.
+        // Symlinks don't work inside the Docker container because the target paths don't exist there.
+        execFileSync('npm', ['install', '--install-links', '--prefix', lambdaPath], { stdio: 'inherit' });
       }
 
       new CfnResource(this, functionName, {
diff --git a/dev-packages/e2e-tests/test-applications/aws-serverless/tests/lambda-fixtures.ts b/dev-packages/e2e-tests/test-applications/aws-serverless/tests/lambda-fixtures.ts
index d6f331c7e96b..23aab3a7d683 100644
--- a/dev-packages/e2e-tests/test-applications/aws-serverless/tests/lambda-fixtures.ts
+++ b/dev-packages/e2e-tests/test-applications/aws-serverless/tests/lambda-fixtures.ts
@@ -17,7 +17,7 @@ export const test = base.extend<{ testEnvironment: LocalLambdaStack; lambdaClien
       console.log('[testEnvironment fixture] Setting up AWS Lambda test infrastructure');
 
       execSync('docker network prune -f');
-      execSync(`docker network create --driver bridge ${DOCKER_NETWORK_NAME}`);
+      createDockerNetwork();
 
       const hostIp = await getHostIp();
       const app = new App();
@@ -71,6 +71,8 @@ export const test = base.extend<{ testEnvironment: LocalLambdaStack; lambdaClien
             resolve(void 0);
           }, 5000);
         });
+
+        removeDockerNetwork();
       }
     },
     { scope: 'worker', auto: true },
@@ -88,3 +90,27 @@ export const test = base.extend<{ testEnvironment: LocalLambdaStack; lambdaClien
     await use(lambdaClient);
   },
 });
+
+function createDockerNetwork() {
+  try {
+    execSync(`docker network create --driver bridge ${DOCKER_NETWORK_NAME}`);
+  } catch (error) {
+    const stderr = (error as { stderr?: Buffer }).stderr?.toString() ?? '';
+    if (stderr.includes('already exists')) {
+      console.log(`[testEnvironment fixture] Reusing existing docker network ${DOCKER_NETWORK_NAME}`);
+      return;
+    }
+    throw error;
+  }
+}
+
+function removeDockerNetwork() {
+  try {
+    execSync(`docker network rm ${DOCKER_NETWORK_NAME}`);
+  } catch (error) {
+    const stderr = (error as { stderr?: Buffer }).stderr?.toString() ?? '';
+    if (!stderr.includes('No such network')) {
+      console.warn(`[testEnvironment fixture] Failed to remove docker network ${DOCKER_NETWORK_NAME}: ${stderr}`);
+    }
+  }
+}
diff --git a/dev-packages/e2e-tests/test-applications/aws-serverless/tests/layer.test.ts b/dev-packages/e2e-tests/test-applications/aws-serverless/tests/layer.test.ts
index bb7ae03a96e7..966ddf032218 100644
--- a/dev-packages/e2e-tests/test-applications/aws-serverless/tests/layer.test.ts
+++ b/dev-packages/e2e-tests/test-applications/aws-serverless/tests/layer.test.ts
@@ -23,7 +23,7 @@ test.describe('Lambda layer', () => {
       data: {
         'sentry.sample_rate': 1,
         'sentry.source': 'custom',
-        'sentry.origin': 'auto.otel.aws-lambda',
+        'sentry.origin': 'auto.otel.aws_lambda',
         'sentry.op': 'function.aws.lambda',
         'cloud.account.id': '012345678912',
         'faas.execution': expect.any(String),
@@ -32,7 +32,7 @@ test.describe('Lambda layer', () => {
         'otel.kind': 'SERVER',
       },
       op: 'function.aws.lambda',
-      origin: 'auto.otel.aws-lambda',
+      origin: 'auto.otel.aws_lambda',
       span_id: expect.stringMatching(/[a-f0-9]{16}/),
       status: 'ok',
       trace_id: expect.stringMatching(/[a-f0-9]{32}/),
@@ -91,7 +91,7 @@ test.describe('Lambda layer', () => {
       data: {
         'sentry.sample_rate': 1,
         'sentry.source': 'custom',
-        'sentry.origin': 'auto.otel.aws-lambda',
+        'sentry.origin': 'auto.otel.aws_lambda',
         'sentry.op': 'function.aws.lambda',
         'cloud.account.id': '012345678912',
         'faas.execution': expect.any(String),
@@ -100,7 +100,7 @@ test.describe('Lambda layer', () => {
         'otel.kind': 'SERVER',
       },
       op: 'function.aws.lambda',
-      origin: 'auto.otel.aws-lambda',
+      origin: 'auto.otel.aws_lambda',
       span_id: expect.stringMatching(/[a-f0-9]{16}/),
       status: 'ok',
       trace_id: expect.stringMatching(/[a-f0-9]{32}/),
@@ -214,7 +214,7 @@ test.describe('Lambda layer', () => {
       data: {
         'sentry.sample_rate': 1,
         'sentry.source': 'custom',
-        'sentry.origin': 'auto.otel.aws-lambda',
+        'sentry.origin': 'auto.otel.aws_lambda',
         'sentry.op': 'function.aws.lambda',
         'cloud.account.id': '012345678912',
         'faas.execution': expect.any(String),
@@ -223,7 +223,7 @@ test.describe('Lambda layer', () => {
         'otel.kind': 'SERVER',
       },
       op: 'function.aws.lambda',
-      origin: 'auto.otel.aws-lambda',
+      origin: 'auto.otel.aws_lambda',
       span_id: expect.stringMatching(/[a-f0-9]{16}/),
       status: 'ok',
       trace_id: expect.stringMatching(/[a-f0-9]{32}/),
diff --git a/dev-packages/e2e-tests/test-applications/aws-serverless/tests/npm.test.ts b/dev-packages/e2e-tests/test-applications/aws-serverless/tests/npm.test.ts
index 9b4183425c95..e5b6ee1b9f32 100644
--- a/dev-packages/e2e-tests/test-applications/aws-serverless/tests/npm.test.ts
+++ b/dev-packages/e2e-tests/test-applications/aws-serverless/tests/npm.test.ts
@@ -23,7 +23,7 @@ test.describe('NPM package', () => {
       data: {
         'sentry.sample_rate': 1,
         'sentry.source': 'custom',
-        'sentry.origin': 'auto.otel.aws-lambda',
+        'sentry.origin': 'auto.otel.aws_lambda',
         'sentry.op': 'function.aws.lambda',
         'cloud.account.id': '012345678912',
         'faas.execution': expect.any(String),
@@ -32,7 +32,7 @@ test.describe('NPM package', () => {
         'otel.kind': 'SERVER',
       },
       op: 'function.aws.lambda',
-      origin: 'auto.otel.aws-lambda',
+      origin: 'auto.otel.aws_lambda',
       span_id: expect.stringMatching(/[a-f0-9]{16}/),
       status: 'ok',
       trace_id: expect.stringMatching(/[a-f0-9]{32}/),
@@ -91,7 +91,7 @@ test.describe('NPM package', () => {
       data: {
         'sentry.sample_rate': 1,
         'sentry.source': 'custom',
-        'sentry.origin': 'auto.otel.aws-lambda',
+        'sentry.origin': 'auto.otel.aws_lambda',
         'sentry.op': 'function.aws.lambda',
         'cloud.account.id': '012345678912',
         'faas.execution': expect.any(String),
@@ -100,7 +100,7 @@ test.describe('NPM package', () => {
         'otel.kind': 'SERVER',
       },
       op: 'function.aws.lambda',
-      origin: 'auto.otel.aws-lambda',
+      origin: 'auto.otel.aws_lambda',
       span_id: expect.stringMatching(/[a-f0-9]{16}/),
       status: 'ok',
       trace_id: expect.stringMatching(/[a-f0-9]{32}/),
diff --git a/packages/aws-serverless/src/integration/awslambda.ts b/packages/aws-serverless/src/integration/awslambda.ts
index 2eaa1fd17354..0da2ea148a3f 100644
--- a/packages/aws-serverless/src/integration/awslambda.ts
+++ b/packages/aws-serverless/src/integration/awslambda.ts
@@ -24,7 +24,7 @@ export const instrumentAwsLambda = generateInstrumentOnce(
       ...options,
       eventContextExtractor,
       requestHook(span) {
-        span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, 'auto.otel.aws-lambda');
+        span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, 'auto.otel.aws_lambda');
         span.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_OP, 'function.aws.lambda');
       },
       responseHook(_span, { err }) {

From fd67c1937818ec6778795129552c9392985edd1f Mon Sep 17 00:00:00 2001
From: Sigrid <32902192+s1gr1d@users.noreply.github.com>
Date: Wed, 10 Dec 2025 11:21:59 +0100
Subject: [PATCH 183/186] fix(core): Parse method from Request object in fetch
 (#18453)

Fixes the case that the instrumentation defaulted to `GET` in case
`undefined` was parsed as a second `fetch` argument.

```js
const request = new Request("https://httpbin.org/post", { method: "POST" });

const response = await fetch(request, undefined);   <-- will be GET (should be POST)
```


Closes #18455 (added automatically)
---
 packages/core/src/instrument/fetch.ts         | 11 +++++---
 .../core/test/lib/instrument/fetch.test.ts    | 25 +++++++++++++++++++
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/packages/core/src/instrument/fetch.ts b/packages/core/src/instrument/fetch.ts
index 0780b25bb29f..ef69ba8223e0 100644
--- a/packages/core/src/instrument/fetch.ts
+++ b/packages/core/src/instrument/fetch.ts
@@ -240,11 +240,16 @@ export function parseFetchArgs(fetchArgs: unknown[]): { method: string; url: str
   }
 
   if (fetchArgs.length === 2) {
-    const [url, options] = fetchArgs as [FetchResource, object];
+    const [resource, options] = fetchArgs as [FetchResource, object];
 
     return {
-      url: getUrlFromResource(url),
-      method: hasProp(options, 'method') ? String(options.method).toUpperCase() : 'GET',
+      url: getUrlFromResource(resource),
+      method: hasProp(options, 'method')
+        ? String(options.method).toUpperCase()
+        : // Request object as first argument
+          isRequest(resource) && hasProp(resource, 'method')
+          ? String(resource.method).toUpperCase()
+          : 'GET',
     };
   }
 
diff --git a/packages/core/test/lib/instrument/fetch.test.ts b/packages/core/test/lib/instrument/fetch.test.ts
index 88d780a7dbad..215b0c513ee5 100644
--- a/packages/core/test/lib/instrument/fetch.test.ts
+++ b/packages/core/test/lib/instrument/fetch.test.ts
@@ -27,4 +27,29 @@ describe('instrument > parseFetchArgs', () => {
 
     expect(actual).toEqual(expected);
   });
+
+  describe('fetch with Request object', () => {
+    it.each([
+      [
+        'Request object (as only arg)',
+        [new Request('http://example.com', { method: 'POST' })],
+        { method: 'POST', url: 'http://example.com/' },
+      ],
+      [
+        'Request object (with undefined options arg)',
+        [new Request('http://example.com', { method: 'POST' }), undefined],
+        { method: 'POST', url: 'http://example.com/' },
+      ],
+      [
+        'Request object (with overwritten options arg)',
+        [new Request('http://example.com', { method: 'POST' }), { method: 'DELETE' }],
+        // fetch options overwrite Request object options
+        { method: 'DELETE', url: 'http://example.com/' },
+      ],
+    ])('%s', (_name, args, expected) => {
+      const actual = parseFetchArgs(args as unknown[]);
+
+      expect(actual).toEqual(expected);
+    });
+  });
 });

From 741ad6a39a05c2dee5f3f466e39718b6796b360f Mon Sep 17 00:00:00 2001
From: Tim Fish <tim@timfish.uk>
Date: Wed, 10 Dec 2025 11:28:04 +0100
Subject: [PATCH 184/186] feat(node): Capture scope when event loop blocked
 (#18040)

- Closes #17887

This currently only capture scope if it gets forked as isolation scope
(`Sentry.withIsolationScope`)
---
 .../suites/thread-blocked-native/isolated.mjs | 37 ++++++++++
 .../suites/thread-blocked-native/test.ts      | 71 +++++++++++++++++--
 .../node-integration-tests/utils/index.ts     |  2 +-
 packages/node-core/src/sdk/client.ts          |  4 +-
 packages/node-native/package.json             |  2 +-
 .../src/event-loop-block-integration.ts       | 32 +++++----
 .../src/event-loop-block-watchdog.ts          | 44 ++++++++++--
 packages/node/src/sdk/initOtel.ts             | 21 ++++--
 packages/opentelemetry/src/contextManager.ts  | 28 +++++++-
 packages/opentelemetry/src/index.ts           |  1 +
 yarn.lock                                     |  8 +--
 11 files changed, 212 insertions(+), 38 deletions(-)
 create mode 100644 dev-packages/node-integration-tests/suites/thread-blocked-native/isolated.mjs

diff --git a/dev-packages/node-integration-tests/suites/thread-blocked-native/isolated.mjs b/dev-packages/node-integration-tests/suites/thread-blocked-native/isolated.mjs
new file mode 100644
index 000000000000..c2c0f39fc44e
--- /dev/null
+++ b/dev-packages/node-integration-tests/suites/thread-blocked-native/isolated.mjs
@@ -0,0 +1,37 @@
+import * as Sentry from '@sentry/node';
+import { longWork } from './long-work.js';
+
+setTimeout(() => {
+  process.exit();
+}, 10000);
+
+function neverResolve() {
+  return new Promise(() => {
+    //
+  });
+}
+
+const fns = [
+  neverResolve,
+  neverResolve,
+  neverResolve,
+  neverResolve,
+  neverResolve,
+  longWork, // [5]
+  neverResolve,
+  neverResolve,
+  neverResolve,
+  neverResolve,
+];
+
+setTimeout(() => {
+  for (let id = 0; id < 10; id++) {
+    Sentry.withIsolationScope(async () => {
+      // eslint-disable-next-line no-console
+      console.log(`Starting task ${id}`);
+      Sentry.setUser({ id });
+
+      await fns[id]();
+    });
+  }
+}, 1000);
diff --git a/dev-packages/node-integration-tests/suites/thread-blocked-native/test.ts b/dev-packages/node-integration-tests/suites/thread-blocked-native/test.ts
index d168b8ce75d5..75f957f07af5 100644
--- a/dev-packages/node-integration-tests/suites/thread-blocked-native/test.ts
+++ b/dev-packages/node-integration-tests/suites/thread-blocked-native/test.ts
@@ -1,6 +1,7 @@
 import { join } from 'node:path';
 import type { Event } from '@sentry/core';
 import { afterAll, describe, expect, test } from 'vitest';
+import { NODE_VERSION } from '../../utils/index';
 import { cleanupChildProcesses, createRunner } from '../../utils/runner';
 
 function EXCEPTION(thread_id = '0', fn = 'longWork') {
@@ -34,9 +35,17 @@ function EXCEPTION(thread_id = '0', fn = 'longWork') {
   };
 }
 
-const ANR_EVENT = {
+const ANR_EVENT = (trace: boolean = false) => ({
   // Ensure we have context
   contexts: {
+    ...(trace
+      ? {
+          trace: {
+            span_id: expect.stringMatching(/[a-f\d]{16}/),
+            trace_id: expect.stringMatching(/[a-f\d]{32}/),
+          },
+        }
+      : {}),
     device: {
       arch: expect.any(String),
     },
@@ -63,11 +72,11 @@ const ANR_EVENT = {
   },
   // and an exception that is our ANR
   exception: EXCEPTION(),
-};
+});
 
 function ANR_EVENT_WITH_DEBUG_META(file: string): Event {
   return {
-    ...ANR_EVENT,
+    ...ANR_EVENT(),
     debug_meta: {
       images: [
         {
@@ -103,7 +112,7 @@ describe('Thread Blocked Native', { timeout: 30_000 }, () => {
 
   test('Custom appRootPath', async () => {
     const ANR_EVENT_WITH_SPECIFIC_DEBUG_META: Event = {
-      ...ANR_EVENT,
+      ...ANR_EVENT(),
       debug_meta: {
         images: [
           {
@@ -134,7 +143,7 @@ describe('Thread Blocked Native', { timeout: 30_000 }, () => {
   test('blocked indefinitely', async () => {
     await createRunner(__dirname, 'indefinite.mjs')
       .withMockSentryServer()
-      .expect({ event: ANR_EVENT })
+      .expect({ event: ANR_EVENT() })
       .start()
       .completed();
   });
@@ -160,7 +169,7 @@ describe('Thread Blocked Native', { timeout: 30_000 }, () => {
       .withMockSentryServer()
       .expect({
         event: {
-          ...ANR_EVENT,
+          ...ANR_EVENT(),
           exception: EXCEPTION('0', 'longWorkOther'),
         },
       })
@@ -179,7 +188,7 @@ describe('Thread Blocked Native', { timeout: 30_000 }, () => {
           expect(crashedThread).toBeDefined();
 
           expect(event).toMatchObject({
-            ...ANR_EVENT,
+            ...ANR_EVENT(),
             exception: {
               ...EXCEPTION(crashedThread),
             },
@@ -210,4 +219,52 @@ describe('Thread Blocked Native', { timeout: 30_000 }, () => {
       .start()
       .completed();
   });
+
+  test('Capture scope via AsyncLocalStorage', async ctx => {
+    if (NODE_VERSION < 24) {
+      ctx.skip();
+      return;
+    }
+
+    const instrument = join(__dirname, 'instrument.mjs');
+    await createRunner(__dirname, 'isolated.mjs')
+      .withMockSentryServer()
+      .withInstrument(instrument)
+      .expect({
+        event: event => {
+          const crashedThread = event.threads?.values?.find(thread => thread.crashed)?.id as string;
+          expect(crashedThread).toBeDefined();
+
+          expect(event).toMatchObject({
+            ...ANR_EVENT(true),
+            exception: {
+              ...EXCEPTION(crashedThread),
+            },
+            breadcrumbs: [
+              {
+                timestamp: expect.any(Number),
+                category: 'console',
+                data: { arguments: ['Starting task 5'], logger: 'console' },
+                level: 'log',
+                message: 'Starting task 5',
+              },
+            ],
+            user: { id: 5 },
+            threads: {
+              values: [
+                {
+                  id: '0',
+                  name: 'main',
+                  crashed: true,
+                  current: true,
+                  main: true,
+                },
+              ],
+            },
+          });
+        },
+      })
+      .start()
+      .completed();
+  });
 });
diff --git a/dev-packages/node-integration-tests/utils/index.ts b/dev-packages/node-integration-tests/utils/index.ts
index e08d89a92131..92851b42ba5e 100644
--- a/dev-packages/node-integration-tests/utils/index.ts
+++ b/dev-packages/node-integration-tests/utils/index.ts
@@ -3,7 +3,7 @@ import { parseSemver } from '@sentry/core';
 import type * as http from 'http';
 import { describe } from 'vitest';
 
-const NODE_VERSION = parseSemver(process.versions.node).major;
+export const NODE_VERSION = parseSemver(process.versions.node).major || 0;
 
 export type TestServerConfig = {
   url: string;
diff --git a/packages/node-core/src/sdk/client.ts b/packages/node-core/src/sdk/client.ts
index efc144989421..1e783ee24b80 100644
--- a/packages/node-core/src/sdk/client.ts
+++ b/packages/node-core/src/sdk/client.ts
@@ -12,7 +12,7 @@ import {
   SDK_VERSION,
   ServerRuntimeClient,
 } from '@sentry/core';
-import { getTraceContextForScope } from '@sentry/opentelemetry';
+import { type AsyncLocalStorageLookup, getTraceContextForScope } from '@sentry/opentelemetry';
 import { isMainThread, threadId } from 'worker_threads';
 import { DEBUG_BUILD } from '../debug-build';
 import type { NodeClientOptions } from '../types';
@@ -22,6 +22,8 @@ const DEFAULT_CLIENT_REPORT_FLUSH_INTERVAL_MS = 60_000; // 60s was chosen arbitr
 /** A client for using Sentry with Node & OpenTelemetry. */
 export class NodeClient extends ServerRuntimeClient<NodeClientOptions> {
   public traceProvider: BasicTracerProvider | undefined;
+  public asyncLocalStorageLookup: AsyncLocalStorageLookup | undefined;
+
   private _tracer: Tracer | undefined;
   private _clientReportInterval: NodeJS.Timeout | undefined;
   private _clientReportOnExitFlushListener: (() => void) | undefined;
diff --git a/packages/node-native/package.json b/packages/node-native/package.json
index f5f2ef232c4b..e4da1791544c 100644
--- a/packages/node-native/package.json
+++ b/packages/node-native/package.json
@@ -63,7 +63,7 @@
     "build:tarball": "npm pack"
   },
   "dependencies": {
-    "@sentry-internal/node-native-stacktrace": "^0.2.2",
+    "@sentry-internal/node-native-stacktrace": "^0.3.0",
     "@sentry/core": "10.29.0",
     "@sentry/node": "10.29.0"
   },
diff --git a/packages/node-native/src/event-loop-block-integration.ts b/packages/node-native/src/event-loop-block-integration.ts
index 713093f77961..7b5c4bc43430 100644
--- a/packages/node-native/src/event-loop-block-integration.ts
+++ b/packages/node-native/src/event-loop-block-integration.ts
@@ -1,7 +1,6 @@
 import { isPromise } from 'node:util/types';
 import { isMainThread, Worker } from 'node:worker_threads';
 import type {
-  Client,
   ClientOptions,
   Contexts,
   DsnComponents,
@@ -47,7 +46,7 @@ function poll(enabled: boolean, clientOptions: ClientOptions): void {
     // serialized without making it a SerializedSession
     const session = currentSession ? { ...currentSession, toJSON: undefined } : undefined;
     // message the worker to tell it the main event loop is still running
-    threadPoll({ session, debugImages: getFilenameToDebugIdMap(clientOptions.stackParser) }, !enabled);
+    threadPoll(enabled, { session, debugImages: getFilenameToDebugIdMap(clientOptions.stackParser) });
   } catch {
     // we ignore all errors
   }
@@ -57,10 +56,15 @@ function poll(enabled: boolean, clientOptions: ClientOptions): void {
  * Starts polling
  */
 function startPolling(
-  client: Client,
+  client: NodeClient,
   integrationOptions: Partial<ThreadBlockedIntegrationOptions>,
 ): IntegrationInternal | undefined {
-  registerThread();
+  if (client.asyncLocalStorageLookup) {
+    const { asyncLocalStorage, contextSymbol } = client.asyncLocalStorageLookup;
+    registerThread({ asyncLocalStorage, stateLookup: ['_currentContext', contextSymbol] });
+  } else {
+    registerThread();
+  }
 
   let enabled = true;
 
@@ -160,15 +164,19 @@ const _eventLoopBlockIntegration = ((options: Partial<ThreadBlockedIntegrationOp
         return;
       }
 
-      try {
-        polling = await startPolling(client, options);
-
-        if (isMainThread) {
-          await startWorker(dsn, client, options);
+      // Otel is not setup until after afterAllSetup returns.
+      setImmediate(async () => {
+        try {
+          polling = startPolling(client, options);
+
+          if (isMainThread) {
+            await startWorker(dsn, client, options);
+          }
+        } catch (err) {
+          log('Failed to start integration', err);
+          return;
         }
-      } catch (err) {
-        log('Failed to start integration', err);
-      }
+      });
     },
     start() {
       polling?.start();
diff --git a/packages/node-native/src/event-loop-block-watchdog.ts b/packages/node-native/src/event-loop-block-watchdog.ts
index 492070a2d1dc..a4eb696c7a95 100644
--- a/packages/node-native/src/event-loop-block-watchdog.ts
+++ b/packages/node-native/src/event-loop-block-watchdog.ts
@@ -1,12 +1,16 @@
 import { workerData } from 'node:worker_threads';
-import type { DebugImage, Event, Session, StackFrame, Thread } from '@sentry/core';
+import type { DebugImage, Event, ScopeData, Session, StackFrame, Thread } from '@sentry/core';
 import {
+  applyScopeDataToEvent,
   createEventEnvelope,
   createSessionEnvelope,
   filenameIsInApp,
+  generateSpanId,
   getEnvelopeEndpointWithUrlEncodedAuth,
   makeSession,
+  mergeScopeData,
   normalizeUrlToBase,
+  Scope,
   stripSentryFramesAndReverse,
   updateSession,
   uuid4,
@@ -16,6 +20,11 @@ import { captureStackTrace, getThreadsLastSeen } from '@sentry-internal/node-nat
 import type { ThreadState, WorkerStartData } from './common';
 import { POLL_RATIO } from './common';
 
+type CurrentScopes = {
+  scope: Scope;
+  isolationScope: Scope;
+};
+
 const {
   threshold,
   appRootPath,
@@ -178,7 +187,7 @@ function applyDebugMeta(event: Event, debugImages: Record<string, string>): void
 
 function getExceptionAndThreads(
   crashedThreadId: string,
-  threads: ReturnType<typeof captureStackTrace<ThreadState>>,
+  threads: ReturnType<typeof captureStackTrace<CurrentScopes, ThreadState>>,
 ): Event {
   const crashedThread = threads[crashedThreadId];
 
@@ -217,12 +226,28 @@ function getExceptionAndThreads(
   };
 }
 
+function applyScopeToEvent(event: Event, scope: ScopeData): void {
+  applyScopeDataToEvent(event, scope);
+
+  if (!event.contexts?.trace) {
+    const { traceId, parentSpanId, propagationSpanId } = scope.propagationContext;
+    event.contexts = {
+      trace: {
+        trace_id: traceId,
+        span_id: propagationSpanId || generateSpanId(),
+        parent_span_id: parentSpanId,
+      },
+      ...event.contexts,
+    };
+  }
+}
+
 async function sendBlockEvent(crashedThreadId: string): Promise<void> {
   if (isRateLimited()) {
     return;
   }
 
-  const threads = captureStackTrace<ThreadState>();
+  const threads = captureStackTrace<CurrentScopes, ThreadState>();
   const crashedThread = threads[crashedThreadId];
 
   if (!crashedThread) {
@@ -231,7 +256,7 @@ async function sendBlockEvent(crashedThreadId: string): Promise<void> {
   }
 
   try {
-    await sendAbnormalSession(crashedThread.state?.session);
+    await sendAbnormalSession(crashedThread.pollState?.session);
   } catch (error) {
     log(`Failed to send abnormal session for thread '${crashedThreadId}':`, error);
   }
@@ -250,8 +275,17 @@ async function sendBlockEvent(crashedThreadId: string): Promise<void> {
     ...getExceptionAndThreads(crashedThreadId, threads),
   };
 
+  const asyncState = threads[crashedThreadId]?.asyncState;
+  if (asyncState) {
+    // We need to rehydrate the scopes from the serialized objects so we can call getScopeData()
+    const scope = Object.assign(new Scope(), asyncState.scope).getScopeData();
+    const isolationScope = Object.assign(new Scope(), asyncState.isolationScope).getScopeData();
+    mergeScopeData(scope, isolationScope);
+    applyScopeToEvent(event, scope);
+  }
+
   const allDebugImages: Record<string, string> = Object.values(threads).reduce((acc, threadState) => {
-    return { ...acc, ...threadState.state?.debugImages };
+    return { ...acc, ...threadState.pollState?.debugImages };
   }, {});
 
   applyDebugMeta(event, allDebugImages);
diff --git a/packages/node/src/sdk/initOtel.ts b/packages/node/src/sdk/initOtel.ts
index 9eec5d752371..a0f1951c376b 100644
--- a/packages/node/src/sdk/initOtel.ts
+++ b/packages/node/src/sdk/initOtel.ts
@@ -14,7 +14,12 @@ import {
   SentryContextManager,
   setupOpenTelemetryLogger,
 } from '@sentry/node-core';
-import { SentryPropagator, SentrySampler, SentrySpanProcessor } from '@sentry/opentelemetry';
+import {
+  type AsyncLocalStorageLookup,
+  SentryPropagator,
+  SentrySampler,
+  SentrySpanProcessor,
+} from '@sentry/opentelemetry';
 import { DEBUG_BUILD } from '../debug-build';
 import { getOpenTelemetryInstrumentationToPreload } from '../integrations/tracing';
 
@@ -34,8 +39,9 @@ export function initOpenTelemetry(client: NodeClient, options: AdditionalOpenTel
     setupOpenTelemetryLogger();
   }
 
-  const provider = setupOtel(client, options);
+  const [provider, asyncLocalStorageLookup] = setupOtel(client, options);
   client.traceProvider = provider;
+  client.asyncLocalStorageLookup = asyncLocalStorageLookup;
 }
 
 interface NodePreloadOptions {
@@ -82,7 +88,10 @@ function getPreloadMethods(integrationNames?: string[]): ((() => void) & { id: s
 }
 
 /** Just exported for tests. */
-export function setupOtel(client: NodeClient, options: AdditionalOpenTelemetryOptions = {}): BasicTracerProvider {
+export function setupOtel(
+  client: NodeClient,
+  options: AdditionalOpenTelemetryOptions = {},
+): [BasicTracerProvider, AsyncLocalStorageLookup] {
   // Create and configure NodeTracerProvider
   const provider = new BasicTracerProvider({
     sampler: new SentrySampler(client),
@@ -106,9 +115,11 @@ export function setupOtel(client: NodeClient, options: AdditionalOpenTelemetryOp
   // Register as globals
   trace.setGlobalTracerProvider(provider);
   propagation.setGlobalPropagator(new SentryPropagator());
-  context.setGlobalContextManager(new SentryContextManager());
 
-  return provider;
+  const ctxManager = new SentryContextManager();
+  context.setGlobalContextManager(ctxManager);
+
+  return [provider, ctxManager.getAsyncLocalStorageLookup()];
 }
 
 /** Just exported for tests. */
diff --git a/packages/opentelemetry/src/contextManager.ts b/packages/opentelemetry/src/contextManager.ts
index e8632b095c02..ac8b2eab5c9b 100644
--- a/packages/opentelemetry/src/contextManager.ts
+++ b/packages/opentelemetry/src/contextManager.ts
@@ -1,3 +1,4 @@
+import type { AsyncLocalStorage } from 'node:async_hooks';
 import type { Context, ContextManager } from '@opentelemetry/api';
 import type { Scope } from '@sentry/core';
 import { getCurrentScope, getIsolationScope } from '@sentry/core';
@@ -5,10 +6,22 @@ import {
   SENTRY_FORK_ISOLATION_SCOPE_CONTEXT_KEY,
   SENTRY_FORK_SET_ISOLATION_SCOPE_CONTEXT_KEY,
   SENTRY_FORK_SET_SCOPE_CONTEXT_KEY,
+  SENTRY_SCOPES_CONTEXT_KEY,
 } from './constants';
 import { getScopesFromContext, setContextOnScope, setScopesOnContext } from './utils/contextData';
 import { setIsSetup } from './utils/setupCheck';
 
+export type AsyncLocalStorageLookup = {
+  asyncLocalStorage: AsyncLocalStorage<unknown>;
+  contextSymbol: symbol;
+};
+
+type ExtendedContextManagerInstance<ContextManagerInstance extends ContextManager> = new (
+  ...args: unknown[]
+) => ContextManagerInstance & {
+  getAsyncLocalStorageLookup(): AsyncLocalStorageLookup;
+};
+
 /**
  * Wrap an OpenTelemetry ContextManager in a way that ensures the context is kept in sync with the Sentry Scope.
  *
@@ -19,7 +32,7 @@ import { setIsSetup } from './utils/setupCheck';
  */
 export function wrapContextManagerClass<ContextManagerInstance extends ContextManager>(
   ContextManagerClass: new (...args: unknown[]) => ContextManagerInstance,
-): typeof ContextManagerClass {
+): ExtendedContextManagerInstance<ContextManagerInstance> {
   /**
    * This is a custom ContextManager for OpenTelemetry, which extends the default AsyncLocalStorageContextManager.
    * It ensures that we create new scopes per context, so that the OTEL Context & the Sentry Scope are always in sync.
@@ -69,7 +82,18 @@ export function wrapContextManagerClass<ContextManagerInstance extends ContextMa
 
       return super.with(ctx2, fn, thisArg, ...args);
     }
+
+    /**
+     * Gets underlying AsyncLocalStorage and symbol to allow lookup of scope.
+     */
+    public getAsyncLocalStorageLookup(): AsyncLocalStorageLookup {
+      return {
+        // @ts-expect-error This is on the base class, but not part of the interface
+        asyncLocalStorage: this._asyncLocalStorage,
+        contextSymbol: SENTRY_SCOPES_CONTEXT_KEY,
+      };
+    }
   }
 
-  return SentryContextManager as unknown as typeof ContextManagerClass;
+  return SentryContextManager as unknown as ExtendedContextManagerInstance<ContextManagerInstance>;
 }
diff --git a/packages/opentelemetry/src/index.ts b/packages/opentelemetry/src/index.ts
index 6958d1c9fbdd..e0112812dc69 100644
--- a/packages/opentelemetry/src/index.ts
+++ b/packages/opentelemetry/src/index.ts
@@ -41,6 +41,7 @@ export { setupEventContextTrace } from './setupEventContextTrace';
 
 export { setOpenTelemetryContextAsyncContextStrategy } from './asyncContextStrategy';
 export { wrapContextManagerClass } from './contextManager';
+export type { AsyncLocalStorageLookup } from './contextManager';
 export { SentryPropagator, shouldPropagateTraceForUrl } from './propagator';
 export { SentrySpanProcessor } from './spanProcessor';
 export { SentrySampler, wrapSamplingDecision } from './sampler';
diff --git a/yarn.lock b/yarn.lock
index 210e9d186cfb..a0d0b72f6718 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6993,10 +6993,10 @@
     detect-libc "^2.0.3"
     node-abi "^3.73.0"
 
-"@sentry-internal/node-native-stacktrace@^0.2.2":
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/@sentry-internal/node-native-stacktrace/-/node-native-stacktrace-0.2.2.tgz#b32dde884642f100dd691b12b643361040825eeb"
-  integrity sha512-ZRS+a1Ik+w6awjp9na5vHBqLNkIxysfGDswLVAkjtVdBUxtfsEVI8OA6r8PijJC5Gm1oAJJap2e9H7TSiCUQIQ==
+"@sentry-internal/node-native-stacktrace@^0.3.0":
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/@sentry-internal/node-native-stacktrace/-/node-native-stacktrace-0.3.0.tgz#68c80dcf11ee070a3a54406b35d4571952caa793"
+  integrity sha512-ef0M2y2JDrC/H0AxMJJQInGTdZTlnwa6AAVWR4fMOpJRubkfdH2IZXE/nWU0Nj74oeJLQgdPtS6DeijLJtqq8Q==
   dependencies:
     detect-libc "^2.0.4"
     node-abi "^3.73.0"

From cce2c81e4cc2767c3af1f8f58955b3549f9b5734 Mon Sep 17 00:00:00 2001
From: s1gr1d <32902192+s1gr1d@users.noreply.github.com>
Date: Wed, 10 Dec 2025 13:24:57 +0100
Subject: [PATCH 185/186] meta(changelog): Update changelog for 10.30.0

---
 CHANGELOG.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15972e85dfdd..d967a7c39408 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,28 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 10.30.0
+
+- feat(nextjs): Deprecate Webpack top-level options ([#18343](https://github.com/getsentry/sentry-javascript/pull/18343))
+- feat(node): Capture scope when event loop blocked ([#18040](https://github.com/getsentry/sentry-javascript/pull/18040))
+- fix(aws-serverless): Remove hyphens from AWS-lambda origins ([#18353](https://github.com/getsentry/sentry-javascript/pull/18353))
+- fix(core): Parse method from Request object in fetch ([#18453](https://github.com/getsentry/sentry-javascript/pull/18453))
+- fix(react): Add transaction name guards for rapid lazy-route navigations ([#18346](https://github.com/getsentry/sentry-javascript/pull/18346))
+
+<details>
+  <summary> <strong>Internal Changes</strong> </summary>
+
+- chore(ci): Fix double issue creation for unreferenced PRs ([#18442](https://github.com/getsentry/sentry-javascript/pull/18442))
+- chore(deps): bump next from 15.5.4 to 15.5.7 in /dev-packages/e2e-tests/test-applications/nextjs-15 ([#18411](https://github.com/getsentry/sentry-javascript/pull/18411))
+- chore(deps): bump next from 15.5.4 to 15.5.7 in /dev-packages/e2e-tests/test-applications/nextjs-15-intl ([#18400](https://github.com/getsentry/sentry-javascript/pull/18400))
+- chore(deps): bump next from 16.0.0 to 16.0.7 in /dev-packages/e2e-tests/test-applications/nextjs-16 ([#18399](https://github.com/getsentry/sentry-javascript/pull/18399))
+- chore(deps): bump next from 16.0.0 to 16.0.7 in /dev-packages/e2e-tests/test-applications/nextjs-16-cacheComponents ([#18427](https://github.com/getsentry/sentry-javascript/pull/18427))
+- chore(deps): bump next from 16.0.0 to 16.0.7 in /dev-packages/e2e-tests/test-applications/nextjs-16-tunnel ([#18439](https://github.com/getsentry/sentry-javascript/pull/18439))
+- chore(publish): Fix publish order for `@sentry/types` ([#18429](https://github.com/getsentry/sentry-javascript/pull/18429))
+- ci(deps): bump actions/create-github-app-token from 2.1.4 to 2.2.0 ([#18362](https://github.com/getsentry/sentry-javascript/pull/18362))
+
+</details>
+
 ## 10.29.0
 
 ### Important Changes

From 540dbefe5fcc74b17fceebe7cd24d916e9afcc85 Mon Sep 17 00:00:00 2001
From: getsentry-bot <bot@sentry.io>
Date: Wed, 10 Dec 2025 16:13:44 +0000
Subject: [PATCH 186/186] release: 10.30.0

---
 .../browser-integration-tests/package.json         |  4 ++--
 .../bundle-analyzer-scenarios/package.json         |  2 +-
 dev-packages/bundler-tests/package.json            |  4 ++--
 dev-packages/clear-cache-gh-action/package.json    |  2 +-
 .../cloudflare-integration-tests/package.json      |  6 +++---
 dev-packages/e2e-tests/package.json                |  2 +-
 .../external-contributor-gh-action/package.json    |  2 +-
 .../node-core-integration-tests/package.json       |  6 +++---
 dev-packages/node-integration-tests/package.json   | 10 +++++-----
 dev-packages/node-overhead-gh-action/package.json  |  4 ++--
 dev-packages/rollup-utils/package.json             |  2 +-
 dev-packages/size-limit-gh-action/package.json     |  2 +-
 dev-packages/test-utils/package.json               |  4 ++--
 lerna.json                                         |  2 +-
 packages/angular/package.json                      |  6 +++---
 packages/astro/package.json                        |  8 ++++----
 packages/aws-serverless/package.json               |  8 ++++----
 packages/browser-utils/package.json                |  4 ++--
 packages/browser/package.json                      | 14 +++++++-------
 packages/bun/package.json                          |  6 +++---
 packages/cloudflare/package.json                   |  4 ++--
 packages/core/package.json                         |  2 +-
 packages/deno/package.json                         |  4 ++--
 packages/ember/package.json                        |  6 +++---
 packages/eslint-config-sdk/package.json            |  6 +++---
 packages/eslint-plugin-sdk/package.json            |  2 +-
 packages/feedback/package.json                     |  4 ++--
 packages/gatsby/package.json                       |  6 +++---
 packages/google-cloud-serverless/package.json      |  6 +++---
 packages/integration-shims/package.json            |  4 ++--
 packages/nestjs/package.json                       |  6 +++---
 packages/nextjs/package.json                       | 14 +++++++-------
 packages/node-core/package.json                    |  6 +++---
 packages/node-native/package.json                  |  6 +++---
 packages/node/package.json                         |  8 ++++----
 packages/nuxt/package.json                         | 12 ++++++------
 packages/opentelemetry/package.json                |  4 ++--
 packages/profiling-node/package.json               |  6 +++---
 packages/react-router/package.json                 | 10 +++++-----
 packages/react/package.json                        |  6 +++---
 packages/remix/package.json                        |  8 ++++----
 packages/replay-canvas/package.json                |  6 +++---
 packages/replay-internal/package.json              |  8 ++++----
 packages/replay-worker/package.json                |  2 +-
 packages/solid/package.json                        |  6 +++---
 packages/solidstart/package.json                   |  8 ++++----
 packages/svelte/package.json                       |  6 +++---
 packages/sveltekit/package.json                    | 10 +++++-----
 packages/tanstackstart-react/package.json          | 10 +++++-----
 packages/tanstackstart/package.json                |  2 +-
 packages/types/package.json                        |  4 ++--
 packages/typescript/package.json                   |  2 +-
 packages/vercel-edge/package.json                  |  6 +++---
 packages/vue/package.json                          |  6 +++---
 packages/wasm/package.json                         |  6 +++---
 55 files changed, 155 insertions(+), 155 deletions(-)

diff --git a/dev-packages/browser-integration-tests/package.json b/dev-packages/browser-integration-tests/package.json
index 97bfb58ceb7a..a42cd499956a 100644
--- a/dev-packages/browser-integration-tests/package.json
+++ b/dev-packages/browser-integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/browser-integration-tests",
-  "version": "10.29.0",
+  "version": "10.30.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": "10.29.0",
+    "@sentry/browser": "10.30.0",
     "@supabase/supabase-js": "2.49.3",
     "axios": "^1.12.2",
     "babel-loader": "^8.2.2",
diff --git a/dev-packages/bundle-analyzer-scenarios/package.json b/dev-packages/bundle-analyzer-scenarios/package.json
index efffe165a886..5fc6993e9649 100644
--- a/dev-packages/bundle-analyzer-scenarios/package.json
+++ b/dev-packages/bundle-analyzer-scenarios/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/bundle-analyzer-scenarios",
-  "version": "10.29.0",
+  "version": "10.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",
diff --git a/dev-packages/bundler-tests/package.json b/dev-packages/bundler-tests/package.json
index b98dc94aa749..620d1ff6c301 100644
--- a/dev-packages/bundler-tests/package.json
+++ b/dev-packages/bundler-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/bundler-tests",
-  "version": "10.29.0",
+  "version": "10.30.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.29.0",
+    "@sentry/browser": "10.30.0",
     "rollup": "^4.0.0",
     "vite": "^5.0.0",
     "vitest": "^3.2.4",
diff --git a/dev-packages/clear-cache-gh-action/package.json b/dev-packages/clear-cache-gh-action/package.json
index e70ba22bc2f8..547a51f06cf3 100644
--- a/dev-packages/clear-cache-gh-action/package.json
+++ b/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.29.0",
+  "version": "10.30.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
diff --git a/dev-packages/cloudflare-integration-tests/package.json b/dev-packages/cloudflare-integration-tests/package.json
index e5a54fc23719..deb810ad9217 100644
--- a/dev-packages/cloudflare-integration-tests/package.json
+++ b/dev-packages/cloudflare-integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/cloudflare-integration-tests",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
@@ -14,11 +14,11 @@
   },
   "dependencies": {
     "@langchain/langgraph": "^1.0.1",
-    "@sentry/cloudflare": "10.29.0"
+    "@sentry/cloudflare": "10.30.0"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20250922.0",
-    "@sentry-internal/test-utils": "10.29.0",
+    "@sentry-internal/test-utils": "10.30.0",
     "eslint-plugin-regexp": "^1.15.0",
     "vitest": "^3.2.4",
     "wrangler": "4.22.0"
diff --git a/dev-packages/e2e-tests/package.json b/dev-packages/e2e-tests/package.json
index 1d5af2057ce5..c0889e05bda7 100644
--- a/dev-packages/e2e-tests/package.json
+++ b/dev-packages/e2e-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/e2e-tests",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "license": "MIT",
   "private": true,
   "scripts": {
diff --git a/dev-packages/external-contributor-gh-action/package.json b/dev-packages/external-contributor-gh-action/package.json
index fe3254ca2fde..b76cb43ca2f6 100644
--- a/dev-packages/external-contributor-gh-action/package.json
+++ b/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": "10.29.0",
+  "version": "10.30.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
diff --git a/dev-packages/node-core-integration-tests/package.json b/dev-packages/node-core-integration-tests/package.json
index cda704e0d08a..bd2ff4d1e070 100644
--- a/dev-packages/node-core-integration-tests/package.json
+++ b/dev-packages/node-core-integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/node-core-integration-tests",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
@@ -34,8 +34,8 @@
     "@opentelemetry/resources": "^2.2.0",
     "@opentelemetry/sdk-trace-base": "^2.2.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry/core": "10.29.0",
-    "@sentry/node-core": "10.29.0",
+    "@sentry/core": "10.30.0",
+    "@sentry/node-core": "10.30.0",
     "body-parser": "^1.20.3",
     "cors": "^2.8.5",
     "cron": "^3.1.6",
diff --git a/dev-packages/node-integration-tests/package.json b/dev-packages/node-integration-tests/package.json
index e9d131840e8b..0bb2c9ad1f9c 100644
--- a/dev-packages/node-integration-tests/package.json
+++ b/dev-packages/node-integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/node-integration-tests",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
@@ -36,9 +36,9 @@
     "@nestjs/core": "^11",
     "@nestjs/platform-express": "^11",
     "@prisma/client": "6.15.0",
-    "@sentry/aws-serverless": "10.29.0",
-    "@sentry/core": "10.29.0",
-    "@sentry/node": "10.29.0",
+    "@sentry/aws-serverless": "10.30.0",
+    "@sentry/core": "10.30.0",
+    "@sentry/node": "10.30.0",
     "@types/mongodb": "^3.6.20",
     "@types/mysql": "^2.15.21",
     "@types/pg": "^8.6.5",
@@ -83,7 +83,7 @@
     "yargs": "^16.2.0"
   },
   "devDependencies": {
-    "@sentry-internal/test-utils": "10.29.0",
+    "@sentry-internal/test-utils": "10.30.0",
     "@types/amqplib": "^0.10.5",
     "@types/node-cron": "^3.0.11",
     "@types/node-schedule": "^2.1.7",
diff --git a/dev-packages/node-overhead-gh-action/package.json b/dev-packages/node-overhead-gh-action/package.json
index c75d2fcacc8b..44cb8812e8db 100644
--- a/dev-packages/node-overhead-gh-action/package.json
+++ b/dev-packages/node-overhead-gh-action/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/node-overhead-gh-action",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
@@ -23,7 +23,7 @@
     "fix": "eslint . --format stylish --fix"
   },
   "dependencies": {
-    "@sentry/node": "10.29.0",
+    "@sentry/node": "10.30.0",
     "express": "^4.21.1",
     "mysql2": "^3.14.4"
   },
diff --git a/dev-packages/rollup-utils/package.json b/dev-packages/rollup-utils/package.json
index f7fca3bef7ac..5bbc6eca3644 100644
--- a/dev-packages/rollup-utils/package.json
+++ b/dev-packages/rollup-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/rollup-utils",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "description": "Rollup utilities used at Sentry for the Sentry JavaScript SDK",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/rollup-utils",
diff --git a/dev-packages/size-limit-gh-action/package.json b/dev-packages/size-limit-gh-action/package.json
index f078474a5361..af1600cf32d5 100644
--- a/dev-packages/size-limit-gh-action/package.json
+++ b/dev-packages/size-limit-gh-action/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@sentry-internal/size-limit-gh-action",
   "description": "An internal Github Action to compare the current size of a PR against the one on develop.",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "license": "MIT",
   "engines": {
     "node": ">=18"
diff --git a/dev-packages/test-utils/package.json b/dev-packages/test-utils/package.json
index be79abd0c813..fd5d0b44dbc5 100644
--- a/dev-packages/test-utils/package.json
+++ b/dev-packages/test-utils/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "10.29.0",
+  "version": "10.30.0",
   "name": "@sentry-internal/test-utils",
   "author": "Sentry",
   "license": "MIT",
@@ -48,7 +48,7 @@
   },
   "devDependencies": {
     "@playwright/test": "~1.53.2",
-    "@sentry/core": "10.29.0",
+    "@sentry/core": "10.30.0",
     "eslint-plugin-regexp": "^1.15.0"
   },
   "volta": {
diff --git a/lerna.json b/lerna.json
index be223901558e..cbf7930b5e6c 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "npmClient": "yarn"
 }
diff --git a/packages/angular/package.json b/packages/angular/package.json
index b86e736f3ae8..7067f1e4ab14 100644
--- a/packages/angular/package.json
+++ b/packages/angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/angular",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "description": "Official Sentry SDK for Angular",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/angular",
@@ -21,8 +21,8 @@
     "rxjs": "^6.5.5 || ^7.x"
   },
   "dependencies": {
-    "@sentry/browser": "10.29.0",
-    "@sentry/core": "10.29.0",
+    "@sentry/browser": "10.30.0",
+    "@sentry/core": "10.30.0",
     "tslib": "^2.4.1"
   },
   "devDependencies": {
diff --git a/packages/astro/package.json b/packages/astro/package.json
index 8277bf8b152e..975107016fb8 100644
--- a/packages/astro/package.json
+++ b/packages/astro/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/astro",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "description": "Official Sentry SDK for Astro",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/astro",
@@ -56,9 +56,9 @@
     "astro": ">=3.x || >=4.0.0-beta || >=5.x"
   },
   "dependencies": {
-    "@sentry/browser": "10.29.0",
-    "@sentry/core": "10.29.0",
-    "@sentry/node": "10.29.0",
+    "@sentry/browser": "10.30.0",
+    "@sentry/core": "10.30.0",
+    "@sentry/node": "10.30.0",
     "@sentry/vite-plugin": "^4.1.0"
   },
   "devDependencies": {
diff --git a/packages/aws-serverless/package.json b/packages/aws-serverless/package.json
index 7db027739f54..d4641d235cbc 100644
--- a/packages/aws-serverless/package.json
+++ b/packages/aws-serverless/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/aws-serverless",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "description": "Official Sentry SDK for AWS Lambda and AWS Serverless Environments",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/aws-serverless",
@@ -69,9 +69,9 @@
     "@opentelemetry/instrumentation": "^0.208.0",
     "@opentelemetry/instrumentation-aws-sdk": "0.64.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry/core": "10.29.0",
-    "@sentry/node": "10.29.0",
-    "@sentry/node-core": "10.29.0",
+    "@sentry/core": "10.30.0",
+    "@sentry/node": "10.30.0",
+    "@sentry/node-core": "10.30.0",
     "@types/aws-lambda": "^8.10.62"
   },
   "devDependencies": {
diff --git a/packages/browser-utils/package.json b/packages/browser-utils/package.json
index 33ebffad4189..29b29253deed 100644
--- a/packages/browser-utils/package.json
+++ b/packages/browser-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/browser-utils",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "description": "Browser Utilities for all Sentry JavaScript SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/browser-utils",
@@ -39,7 +39,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.29.0"
+    "@sentry/core": "10.30.0"
   },
   "scripts": {
     "build": "run-p build:transpile build:types",
diff --git a/packages/browser/package.json b/packages/browser/package.json
index 971b114fbc33..ec88ca7ca6ea 100644
--- a/packages/browser/package.json
+++ b/packages/browser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/browser",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "description": "Official Sentry SDK for browsers",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/browser",
@@ -44,14 +44,14 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry-internal/browser-utils": "10.29.0",
-    "@sentry-internal/feedback": "10.29.0",
-    "@sentry-internal/replay": "10.29.0",
-    "@sentry-internal/replay-canvas": "10.29.0",
-    "@sentry/core": "10.29.0"
+    "@sentry-internal/browser-utils": "10.30.0",
+    "@sentry-internal/feedback": "10.30.0",
+    "@sentry-internal/replay": "10.30.0",
+    "@sentry-internal/replay-canvas": "10.30.0",
+    "@sentry/core": "10.30.0"
   },
   "devDependencies": {
-    "@sentry-internal/integration-shims": "10.29.0",
+    "@sentry-internal/integration-shims": "10.30.0",
     "fake-indexeddb": "^6.2.4"
   },
   "scripts": {
diff --git a/packages/bun/package.json b/packages/bun/package.json
index f64447757df1..ef1707452808 100644
--- a/packages/bun/package.json
+++ b/packages/bun/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/bun",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "description": "Official Sentry SDK for bun",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/bun",
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.29.0",
-    "@sentry/node": "10.29.0"
+    "@sentry/core": "10.30.0",
+    "@sentry/node": "10.30.0"
   },
   "devDependencies": {
     "bun-types": "^1.2.9"
diff --git a/packages/cloudflare/package.json b/packages/cloudflare/package.json
index 84dcdf3dd8c8..a919a802a387 100644
--- a/packages/cloudflare/package.json
+++ b/packages/cloudflare/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/cloudflare",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "description": "Official Sentry SDK for Cloudflare Workers and Pages",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/cloudflare",
@@ -50,7 +50,7 @@
   },
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@sentry/core": "10.29.0"
+    "@sentry/core": "10.30.0"
   },
   "peerDependencies": {
     "@cloudflare/workers-types": "^4.x"
diff --git a/packages/core/package.json b/packages/core/package.json
index 669a70e5e8ba..0dd7dd7c1294 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/core",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "description": "Base implementation for all Sentry JavaScript SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/core",
diff --git a/packages/deno/package.json b/packages/deno/package.json
index a3c03eec89d8..6b9e751d2acc 100644
--- a/packages/deno/package.json
+++ b/packages/deno/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/deno",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "description": "Official Sentry SDK for Deno",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/deno",
@@ -25,7 +25,7 @@
   ],
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@sentry/core": "10.29.0"
+    "@sentry/core": "10.30.0"
   },
   "scripts": {
     "deno-types": "node ./scripts/download-deno-types.mjs",
diff --git a/packages/ember/package.json b/packages/ember/package.json
index 037cebc5ef5c..23f44b9395cd 100644
--- a/packages/ember/package.json
+++ b/packages/ember/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/ember",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "description": "Official Sentry SDK for Ember.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/ember",
@@ -32,8 +32,8 @@
   "dependencies": {
     "@babel/core": "^7.27.7",
     "@embroider/macros": "^1.16.0",
-    "@sentry/browser": "10.29.0",
-    "@sentry/core": "10.29.0",
+    "@sentry/browser": "10.30.0",
+    "@sentry/core": "10.30.0",
     "ember-auto-import": "^2.7.2",
     "ember-cli-babel": "^8.2.0",
     "ember-cli-htmlbars": "^6.1.1",
diff --git a/packages/eslint-config-sdk/package.json b/packages/eslint-config-sdk/package.json
index e106483e5ddb..ee45fd3bb486 100644
--- a/packages/eslint-config-sdk/package.json
+++ b/packages/eslint-config-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/eslint-config-sdk",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "description": "Official Sentry SDK eslint config",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-config-sdk",
@@ -22,8 +22,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry-internal/eslint-plugin-sdk": "10.29.0",
-    "@sentry-internal/typescript": "10.29.0",
+    "@sentry-internal/eslint-plugin-sdk": "10.30.0",
+    "@sentry-internal/typescript": "10.30.0",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
     "eslint-config-prettier": "^9.1.0",
diff --git a/packages/eslint-plugin-sdk/package.json b/packages/eslint-plugin-sdk/package.json
index 072badfb39da..c691eaf14846 100644
--- a/packages/eslint-plugin-sdk/package.json
+++ b/packages/eslint-plugin-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/eslint-plugin-sdk",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "description": "Official Sentry SDK eslint plugin",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/eslint-plugin-sdk",
diff --git a/packages/feedback/package.json b/packages/feedback/package.json
index b016c325ed71..93930e643f72 100644
--- a/packages/feedback/package.json
+++ b/packages/feedback/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/feedback",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "description": "Sentry SDK integration for user feedback",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/feedback",
@@ -39,7 +39,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.29.0"
+    "@sentry/core": "10.30.0"
   },
   "devDependencies": {
     "preact": "^10.19.4"
diff --git a/packages/gatsby/package.json b/packages/gatsby/package.json
index 523ef04f127a..74e5f8787f9c 100644
--- a/packages/gatsby/package.json
+++ b/packages/gatsby/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/gatsby",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "description": "Official Sentry SDK for Gatsby.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/gatsby",
@@ -45,8 +45,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.29.0",
-    "@sentry/react": "10.29.0",
+    "@sentry/core": "10.30.0",
+    "@sentry/react": "10.30.0",
     "@sentry/webpack-plugin": "^4.6.1"
   },
   "peerDependencies": {
diff --git a/packages/google-cloud-serverless/package.json b/packages/google-cloud-serverless/package.json
index 64761da8d428..f1dabb7901bd 100644
--- a/packages/google-cloud-serverless/package.json
+++ b/packages/google-cloud-serverless/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/google-cloud-serverless",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "description": "Official Sentry SDK for Google Cloud Functions",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/google-cloud-serverless",
@@ -48,8 +48,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.29.0",
-    "@sentry/node": "10.29.0",
+    "@sentry/core": "10.30.0",
+    "@sentry/node": "10.30.0",
     "@types/express": "^4.17.14"
   },
   "devDependencies": {
diff --git a/packages/integration-shims/package.json b/packages/integration-shims/package.json
index 0411d93e0d76..aa6369830f88 100644
--- a/packages/integration-shims/package.json
+++ b/packages/integration-shims/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/integration-shims",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "description": "Shims for integrations in Sentry SDK.",
   "main": "build/cjs/index.js",
   "module": "build/esm/index.js",
@@ -56,7 +56,7 @@
     "url": "https://github.com/getsentry/sentry-javascript/issues"
   },
   "dependencies": {
-    "@sentry/core": "10.29.0"
+    "@sentry/core": "10.30.0"
   },
   "engines": {
     "node": ">=18"
diff --git a/packages/nestjs/package.json b/packages/nestjs/package.json
index 3468a1a0e21e..0e41a6eda644 100644
--- a/packages/nestjs/package.json
+++ b/packages/nestjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/nestjs",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "description": "Official Sentry SDK for NestJS",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/nestjs",
@@ -49,8 +49,8 @@
     "@opentelemetry/instrumentation": "^0.208.0",
     "@opentelemetry/instrumentation-nestjs-core": "0.55.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry/core": "10.29.0",
-    "@sentry/node": "10.29.0"
+    "@sentry/core": "10.30.0",
+    "@sentry/node": "10.30.0"
   },
   "devDependencies": {
     "@nestjs/common": "^10.0.0",
diff --git a/packages/nextjs/package.json b/packages/nextjs/package.json
index 27f525cf86e3..e677572352b5 100644
--- a/packages/nextjs/package.json
+++ b/packages/nextjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/nextjs",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "description": "Official Sentry SDK for Next.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/nextjs",
@@ -79,13 +79,13 @@
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
     "@rollup/plugin-commonjs": "28.0.1",
-    "@sentry-internal/browser-utils": "10.29.0",
+    "@sentry-internal/browser-utils": "10.30.0",
     "@sentry/bundler-plugin-core": "^4.6.1",
-    "@sentry/core": "10.29.0",
-    "@sentry/node": "10.29.0",
-    "@sentry/opentelemetry": "10.29.0",
-    "@sentry/react": "10.29.0",
-    "@sentry/vercel-edge": "10.29.0",
+    "@sentry/core": "10.30.0",
+    "@sentry/node": "10.30.0",
+    "@sentry/opentelemetry": "10.30.0",
+    "@sentry/react": "10.30.0",
+    "@sentry/vercel-edge": "10.30.0",
     "@sentry/webpack-plugin": "^4.6.1",
     "resolve": "1.22.8",
     "rollup": "^4.35.0",
diff --git a/packages/node-core/package.json b/packages/node-core/package.json
index d2de42c4d42b..5fe80a2d34ca 100644
--- a/packages/node-core/package.json
+++ b/packages/node-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/node-core",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "description": "Sentry Node-Core SDK",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/node-core",
@@ -67,8 +67,8 @@
   },
   "dependencies": {
     "@apm-js-collab/tracing-hooks": "^0.3.1",
-    "@sentry/core": "10.29.0",
-    "@sentry/opentelemetry": "10.29.0",
+    "@sentry/core": "10.30.0",
+    "@sentry/opentelemetry": "10.30.0",
     "import-in-the-middle": "^2"
   },
   "devDependencies": {
diff --git a/packages/node-native/package.json b/packages/node-native/package.json
index e4da1791544c..fd9dff8fd337 100644
--- a/packages/node-native/package.json
+++ b/packages/node-native/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/node-native",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "description": "Native Tools for the Official Sentry Node.js SDK",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/node-native",
@@ -64,8 +64,8 @@
   },
   "dependencies": {
     "@sentry-internal/node-native-stacktrace": "^0.3.0",
-    "@sentry/core": "10.29.0",
-    "@sentry/node": "10.29.0"
+    "@sentry/core": "10.30.0",
+    "@sentry/node": "10.30.0"
   },
   "devDependencies": {
     "@types/node": "^18.19.1"
diff --git a/packages/node/package.json b/packages/node/package.json
index 867124cb6318..87f76aa6a38c 100644
--- a/packages/node/package.json
+++ b/packages/node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/node",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "description": "Sentry Node SDK using OpenTelemetry for performance instrumentation",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/node",
@@ -95,9 +95,9 @@
     "@opentelemetry/sdk-trace-base": "^2.2.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
     "@prisma/instrumentation": "6.19.0",
-    "@sentry/core": "10.29.0",
-    "@sentry/node-core": "10.29.0",
-    "@sentry/opentelemetry": "10.29.0",
+    "@sentry/core": "10.30.0",
+    "@sentry/node-core": "10.30.0",
+    "@sentry/opentelemetry": "10.30.0",
     "import-in-the-middle": "^2",
     "minimatch": "^9.0.0"
   },
diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json
index ea4cc88bc3a3..f17461a38171 100644
--- a/packages/nuxt/package.json
+++ b/packages/nuxt/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/nuxt",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "description": "Official Sentry SDK for Nuxt",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/nuxt",
@@ -49,13 +49,13 @@
   },
   "dependencies": {
     "@nuxt/kit": "^3.13.2",
-    "@sentry/browser": "10.29.0",
-    "@sentry/cloudflare": "10.29.0",
-    "@sentry/core": "10.29.0",
-    "@sentry/node": "10.29.0",
+    "@sentry/browser": "10.30.0",
+    "@sentry/cloudflare": "10.30.0",
+    "@sentry/core": "10.30.0",
+    "@sentry/node": "10.30.0",
     "@sentry/rollup-plugin": "^4.3.0",
     "@sentry/vite-plugin": "^4.3.0",
-    "@sentry/vue": "10.29.0"
+    "@sentry/vue": "10.30.0"
   },
   "devDependencies": {
     "@nuxt/module-builder": "^0.8.4",
diff --git a/packages/opentelemetry/package.json b/packages/opentelemetry/package.json
index e218c87033e1..311c511578eb 100644
--- a/packages/opentelemetry/package.json
+++ b/packages/opentelemetry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/opentelemetry",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "description": "Official Sentry utilities for OpenTelemetry",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/opentelemetry",
@@ -39,7 +39,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "10.29.0"
+    "@sentry/core": "10.30.0"
   },
   "peerDependencies": {
     "@opentelemetry/api": "^1.9.0",
diff --git a/packages/profiling-node/package.json b/packages/profiling-node/package.json
index 258b043cb2e6..56ae8a5b470b 100644
--- a/packages/profiling-node/package.json
+++ b/packages/profiling-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/profiling-node",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "description": "Official Sentry SDK for Node.js Profiling",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/profiling-node",
@@ -63,8 +63,8 @@
   },
   "dependencies": {
     "@sentry-internal/node-cpu-profiler": "^2.2.0",
-    "@sentry/core": "10.29.0",
-    "@sentry/node": "10.29.0"
+    "@sentry/core": "10.30.0",
+    "@sentry/node": "10.30.0"
   },
   "devDependencies": {
     "@types/node": "^18.19.1"
diff --git a/packages/react-router/package.json b/packages/react-router/package.json
index 10aab7897e3e..f971952daa61 100644
--- a/packages/react-router/package.json
+++ b/packages/react-router/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/react-router",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "description": "Official Sentry SDK for React Router (Framework)",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/react-router",
@@ -49,11 +49,11 @@
     "@opentelemetry/core": "^2.2.0",
     "@opentelemetry/instrumentation": "^0.208.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry/browser": "10.29.0",
+    "@sentry/browser": "10.30.0",
     "@sentry/cli": "^2.58.2",
-    "@sentry/core": "10.29.0",
-    "@sentry/node": "10.29.0",
-    "@sentry/react": "10.29.0",
+    "@sentry/core": "10.30.0",
+    "@sentry/node": "10.30.0",
+    "@sentry/react": "10.30.0",
     "@sentry/vite-plugin": "^4.1.0",
     "glob": "11.1.0"
   },
diff --git a/packages/react/package.json b/packages/react/package.json
index fd650fe0b87c..f096fb51c990 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/react",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "description": "Official Sentry SDK for React.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/react",
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "10.29.0",
-    "@sentry/core": "10.29.0",
+    "@sentry/browser": "10.30.0",
+    "@sentry/core": "10.30.0",
     "hoist-non-react-statics": "^3.3.2"
   },
   "peerDependencies": {
diff --git a/packages/remix/package.json b/packages/remix/package.json
index 615d64f87383..dd2b07cbd550 100644
--- a/packages/remix/package.json
+++ b/packages/remix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/remix",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "description": "Official Sentry SDK for Remix",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/remix",
@@ -69,9 +69,9 @@
     "@opentelemetry/semantic-conventions": "^1.37.0",
     "@remix-run/router": "1.x",
     "@sentry/cli": "^2.58.2",
-    "@sentry/core": "10.29.0",
-    "@sentry/node": "10.29.0",
-    "@sentry/react": "10.29.0",
+    "@sentry/core": "10.30.0",
+    "@sentry/node": "10.30.0",
+    "@sentry/react": "10.30.0",
     "glob": "^10.3.4",
     "yargs": "^17.6.0"
   },
diff --git a/packages/replay-canvas/package.json b/packages/replay-canvas/package.json
index d24ae95ca6af..d8b2b2c3e710 100644
--- a/packages/replay-canvas/package.json
+++ b/packages/replay-canvas/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/replay-canvas",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "description": "Replay canvas integration",
   "main": "build/npm/cjs/index.js",
   "module": "build/npm/esm/index.js",
@@ -69,8 +69,8 @@
     "@sentry-internal/rrweb": "2.40.0"
   },
   "dependencies": {
-    "@sentry-internal/replay": "10.29.0",
-    "@sentry/core": "10.29.0"
+    "@sentry-internal/replay": "10.30.0",
+    "@sentry/core": "10.30.0"
   },
   "engines": {
     "node": ">=18"
diff --git a/packages/replay-internal/package.json b/packages/replay-internal/package.json
index 6ac7b8590a05..43a12bf5fe80 100644
--- a/packages/replay-internal/package.json
+++ b/packages/replay-internal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/replay",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "description": "User replays for Sentry",
   "main": "build/npm/cjs/index.js",
   "module": "build/npm/esm/index.js",
@@ -81,7 +81,7 @@
   "homepage": "https://docs.sentry.io/platforms/javascript/session-replay/",
   "devDependencies": {
     "@babel/core": "^7.27.7",
-    "@sentry-internal/replay-worker": "10.29.0",
+    "@sentry-internal/replay-worker": "10.30.0",
     "@sentry-internal/rrweb": "2.40.0",
     "@sentry-internal/rrweb-snapshot": "2.40.0",
     "fflate": "0.8.2",
@@ -89,8 +89,8 @@
     "jsdom-worker": "^0.3.0"
   },
   "dependencies": {
-    "@sentry-internal/browser-utils": "10.29.0",
-    "@sentry/core": "10.29.0"
+    "@sentry-internal/browser-utils": "10.30.0",
+    "@sentry/core": "10.30.0"
   },
   "engines": {
     "node": ">=18"
diff --git a/packages/replay-worker/package.json b/packages/replay-worker/package.json
index 396aa670652c..05911ee02a64 100644
--- a/packages/replay-worker/package.json
+++ b/packages/replay-worker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/replay-worker",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "description": "Worker for @sentry-internal/replay",
   "main": "build/esm/index.js",
   "module": "build/esm/index.js",
diff --git a/packages/solid/package.json b/packages/solid/package.json
index 8d7b241316ca..53317d35213f 100644
--- a/packages/solid/package.json
+++ b/packages/solid/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/solid",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "description": "Official Sentry SDK for Solid",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/solid",
@@ -54,8 +54,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "10.29.0",
-    "@sentry/core": "10.29.0"
+    "@sentry/browser": "10.30.0",
+    "@sentry/core": "10.30.0"
   },
   "peerDependencies": {
     "@solidjs/router": "^0.13.4 || ^0.14.0 || ^0.15.0",
diff --git a/packages/solidstart/package.json b/packages/solidstart/package.json
index 7ad53d2db590..c50729efd3af 100644
--- a/packages/solidstart/package.json
+++ b/packages/solidstart/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/solidstart",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "description": "Official Sentry SDK for Solid Start",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/solidstart",
@@ -66,9 +66,9 @@
     }
   },
   "dependencies": {
-    "@sentry/core": "10.29.0",
-    "@sentry/node": "10.29.0",
-    "@sentry/solid": "10.29.0",
+    "@sentry/core": "10.30.0",
+    "@sentry/node": "10.30.0",
+    "@sentry/solid": "10.30.0",
     "@sentry/vite-plugin": "^4.1.0"
   },
   "devDependencies": {
diff --git a/packages/svelte/package.json b/packages/svelte/package.json
index 4847d77da75d..0ca946a41a97 100644
--- a/packages/svelte/package.json
+++ b/packages/svelte/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/svelte",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "description": "Official Sentry SDK for Svelte",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/svelte",
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "10.29.0",
-    "@sentry/core": "10.29.0",
+    "@sentry/browser": "10.30.0",
+    "@sentry/core": "10.30.0",
     "magic-string": "^0.30.0"
   },
   "peerDependencies": {
diff --git a/packages/sveltekit/package.json b/packages/sveltekit/package.json
index 926b22acc0b8..5310d64dbb5f 100644
--- a/packages/sveltekit/package.json
+++ b/packages/sveltekit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/sveltekit",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "description": "Official Sentry SDK for SvelteKit",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/sveltekit",
@@ -48,10 +48,10 @@
   },
   "dependencies": {
     "@babel/parser": "7.26.9",
-    "@sentry/cloudflare": "10.29.0",
-    "@sentry/core": "10.29.0",
-    "@sentry/node": "10.29.0",
-    "@sentry/svelte": "10.29.0",
+    "@sentry/cloudflare": "10.30.0",
+    "@sentry/core": "10.30.0",
+    "@sentry/node": "10.30.0",
+    "@sentry/svelte": "10.30.0",
     "@sentry/vite-plugin": "^4.1.0",
     "magic-string": "0.30.7",
     "recast": "0.23.11",
diff --git a/packages/tanstackstart-react/package.json b/packages/tanstackstart-react/package.json
index 642b9000c8ba..7dff98e0cafb 100644
--- a/packages/tanstackstart-react/package.json
+++ b/packages/tanstackstart-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/tanstackstart-react",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "description": "Official Sentry SDK for TanStack Start React",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/tanstackstart-react",
@@ -52,10 +52,10 @@
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry-internal/browser-utils": "10.29.0",
-    "@sentry/core": "10.29.0",
-    "@sentry/node": "10.29.0",
-    "@sentry/react": "10.29.0"
+    "@sentry-internal/browser-utils": "10.30.0",
+    "@sentry/core": "10.30.0",
+    "@sentry/node": "10.30.0",
+    "@sentry/react": "10.30.0"
   },
   "scripts": {
     "build": "run-p build:transpile build:types",
diff --git a/packages/tanstackstart/package.json b/packages/tanstackstart/package.json
index a5043986e2b2..06d7adbfcde1 100644
--- a/packages/tanstackstart/package.json
+++ b/packages/tanstackstart/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/tanstackstart",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "description": "Utilities for the Sentry TanStack Start SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/tanstackstart",
diff --git a/packages/types/package.json b/packages/types/package.json
index cd95f72afc88..d020056d737f 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/types",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "description": "Types for all Sentry JavaScript SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/types",
@@ -57,7 +57,7 @@
     "yalc:publish": "yalc publish --push --sig"
   },
   "dependencies": {
-    "@sentry/core": "10.29.0"
+    "@sentry/core": "10.30.0"
   },
   "volta": {
     "extends": "../../package.json"
diff --git a/packages/typescript/package.json b/packages/typescript/package.json
index fc8dc3170d4c..498e1c4d8622 100644
--- a/packages/typescript/package.json
+++ b/packages/typescript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/typescript",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "description": "Typescript configuration used at Sentry",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/typescript",
diff --git a/packages/vercel-edge/package.json b/packages/vercel-edge/package.json
index 9c3df1ef6188..b5446b95c2a2 100644
--- a/packages/vercel-edge/package.json
+++ b/packages/vercel-edge/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/vercel-edge",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "description": "Official Sentry SDK for the Vercel Edge Runtime",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/vercel-edge",
@@ -41,14 +41,14 @@
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/resources": "^2.2.0",
-    "@sentry/core": "10.29.0"
+    "@sentry/core": "10.30.0"
   },
   "devDependencies": {
     "@edge-runtime/types": "3.0.1",
     "@opentelemetry/core": "^2.2.0",
     "@opentelemetry/sdk-trace-base": "^2.2.0",
     "@opentelemetry/semantic-conventions": "^1.37.0",
-    "@sentry/opentelemetry": "10.29.0"
+    "@sentry/opentelemetry": "10.30.0"
   },
   "scripts": {
     "build": "run-p build:transpile build:types",
diff --git a/packages/vue/package.json b/packages/vue/package.json
index f75cb129cfdc..a02f357428d6 100644
--- a/packages/vue/package.json
+++ b/packages/vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/vue",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "description": "Official Sentry SDK for Vue.js",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/vue",
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "10.29.0",
-    "@sentry/core": "10.29.0"
+    "@sentry/browser": "10.30.0",
+    "@sentry/core": "10.30.0"
   },
   "peerDependencies": {
     "pinia": "2.x || 3.x",
diff --git a/packages/wasm/package.json b/packages/wasm/package.json
index c6f622b15501..0c5f3e66cdff 100644
--- a/packages/wasm/package.json
+++ b/packages/wasm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/wasm",
-  "version": "10.29.0",
+  "version": "10.30.0",
   "description": "Support for WASM.",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/wasm",
@@ -39,8 +39,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/browser": "10.29.0",
-    "@sentry/core": "10.29.0"
+    "@sentry/browser": "10.30.0",
+    "@sentry/core": "10.30.0"
   },
   "scripts": {
     "build": "run-p build:transpile build:bundle build:types",