@sentry/react-router 10.36.0 → 10.38.0

package/build/cjs/server/wrapServerAction.js

@@ -2,6 +2,11 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const semanticConventions = require('@opentelemetry/semantic-conventions');
 const core = require('@sentry/core');
+const debugBuild = require('../common/debug-build.js');
+const serverGlobals = require('./serverGlobals.js');
+
+// Track if we've already warned about duplicate instrumentation
+let hasWarnedAboutDuplicateActionInstrumentation = false;
 
 /**
  * Wraps a React Router server action function with Sentry performance monitoring.
@@ -22,8 +27,23 @@ const core = require('@sentry/core');
  * );
  * ```
  */
-function wrapServerAction(options = {}, actionFn) {
+function wrapServerAction(
+  options = {},
+  actionFn,
+) {
   return async function (args) {
+    // Skip instrumentation if instrumentation API is already handling it
+    if (serverGlobals.isInstrumentationApiUsed()) {
+      if (debugBuild.DEBUG_BUILD && !hasWarnedAboutDuplicateActionInstrumentation) {
+        hasWarnedAboutDuplicateActionInstrumentation = true;
+        core.debug.warn(
+          'wrapServerAction is redundant when using the instrumentation API. ' +
+            'The action is already instrumented automatically. You can safely remove wrapServerAction.',
+        );
+      }
+      return actionFn(args);
+    }
+
     const name = options.name || 'Executing Server Action';
     const active = core.getActiveSpan();
     if (active) {

package/build/cjs/server/wrapServerAction.js.map

@@ -1 +1 @@
-{"version":3,"file":"wrapServerAction.js","sources":["../../../src/server/wrapServerAction.ts"],"sourcesContent":["import { SEMATTRS_HTTP_TARGET } from '@opentelemetry/semantic-conventions';\nimport type { SpanAttributes } from '@sentry/core';\nimport {\n  flushIfServerless,\n  getActiveSpan,\n  getRootSpan,\n  SEMANTIC_ATTRIBUTE_SENTRY_OP,\n  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,\n  SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,\n  spanToJSON,\n  startSpan,\n  updateSpanName,\n} from '@sentry/core';\nimport type { ActionFunctionArgs } from 'react-router';\n\ntype SpanOptions = {\n  name?: string;\n  attributes?: SpanAttributes;\n};\n\n/**\n * Wraps a React Router server action function with Sentry performance monitoring.\n * @param options - Optional span configuration options including name, operation, description and attributes\n * @param actionFn - The server action function to wrap\n *\n * @example\n * ```ts\n * // Wrap an action function with custom span options\n * export const action = wrapServerAction(\n *   {\n *     name: 'Submit Form Data',\n *     description: 'Processes form submission data',\n *   },\n *   async ({ request }) => {\n *     // ... your action logic\n *   }\n * );\n * ```\n */\nexport function wrapServerAction<T>(options: SpanOptions = {}, actionFn: (args: ActionFunctionArgs) => Promise<T>) {\n  return async function (args: ActionFunctionArgs) {\n    const name = options.name || 'Executing Server Action';\n    const active = getActiveSpan();\n    if (active) {\n      const root = getRootSpan(active);\n      const spanData = spanToJSON(root);\n      if (spanData.origin === 'auto.http.otel.http') {\n        // eslint-disable-next-line deprecation/deprecation\n        const target = spanData.data[SEMATTRS_HTTP_TARGET];\n\n        if (target) {\n          // We cannot rely on the regular span name inferral here, as the express instrumentation sets `*` as the route\n          // So we force this to be a more sensible name here\n          updateSpanName(root, `${args.request.method} ${target}`);\n          root.setAttributes({\n            [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',\n            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.action',\n          });\n        }\n      }\n    }\n\n    try {\n      return await startSpan(\n        {\n          name,\n          ...options,\n          attributes: {\n            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.action',\n            [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.react_router.action',\n            ...options.attributes,\n          },\n        },\n        () => actionFn(args),\n      );\n    } finally {\n      await flushIfServerless();\n    }\n  };\n}\n"],"names":["getActiveSpan","getRootSpan","spanToJSON","SEMATTRS_HTTP_TARGET","updateSpanName","SEMANTIC_ATTRIBUTE_SENTRY_SOURCE","SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN","startSpan","SEMANTIC_ATTRIBUTE_SENTRY_OP","flushIfServerless"],"mappings":";;;;;AAoBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAAS,gBAAgB,CAAI,OAAO,GAAgB,EAAE,EAAE,QAAQ,EAA4C;AACnH,EAAE,OAAO,gBAAgB,IAAI,EAAsB;AACnD,IAAI,MAAM,IAAA,GAAO,OAAO,CAAC,IAAA,IAAQ,yBAAyB;AAC1D,IAAI,MAAM,MAAA,GAASA,kBAAa,EAAE;AAClC,IAAI,IAAI,MAAM,EAAE;AAChB,MAAM,MAAM,IAAA,GAAOC,gBAAW,CAAC,MAAM,CAAC;AACtC,MAAM,MAAM,QAAA,GAAWC,eAAU,CAAC,IAAI,CAAC;AACvC,MAAM,IAAI,QAAQ,CAAC,MAAA,KAAW,qBAAqB,EAAE;AACrD;AACA,QAAQ,MAAM,SAAS,QAAQ,CAAC,IAAI,CAACC,wCAAoB,CAAC;;AAE1D,QAAQ,IAAI,MAAM,EAAE;AACpB;AACA;AACA,UAAUC,mBAAc,CAAC,IAAI,EAAE,CAAC,EAAA,IAAA,CAAA,OAAA,CAAA,MAAA,CAAA,CAAA,EAAA,MAAA,CAAA,CAAA,CAAA;AACA,UAAA,IAAA,CAAA,aAAA,CAAA;AACA,YAAA,CAAAC,qCAAA,GAAA,KAAA;AACA,YAAA,CAAAC,qCAAA,GAAA,+BAAA;AACA,WAAA,CAAA;AACA,QAAA;AACA,MAAA;AACA,IAAA;;AAEA,IAAA,IAAA;AACA,MAAA,OAAA,MAAAC,cAAA;AACA,QAAA;AACA,UAAA,IAAA;AACA,UAAA,GAAA,OAAA;AACA,UAAA,UAAA,EAAA;AACA,YAAA,CAAAD,qCAAA,GAAA,+BAAA;AACA,YAAA,CAAAE,iCAAA,GAAA,8BAAA;AACA,YAAA,GAAA,OAAA,CAAA,UAAA;AACA,WAAA;AACA,SAAA;AACA,QAAA,MAAA,QAAA,CAAA,IAAA,CAAA;AACA,OAAA;AACA,IAAA,CAAA,SAAA;AACA,MAAA,MAAAC,sBAAA,EAAA;AACA,IAAA;AACA,EAAA,CAAA;AACA;;;;"}
+{"version":3,"file":"wrapServerAction.js","sources":["../../../src/server/wrapServerAction.ts"],"sourcesContent":["import { SEMATTRS_HTTP_TARGET } from '@opentelemetry/semantic-conventions';\nimport type { SpanAttributes } from '@sentry/core';\nimport {\n  debug,\n  flushIfServerless,\n  getActiveSpan,\n  getRootSpan,\n  SEMANTIC_ATTRIBUTE_SENTRY_OP,\n  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,\n  SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,\n  spanToJSON,\n  startSpan,\n  updateSpanName,\n} from '@sentry/core';\nimport type { ActionFunctionArgs } from 'react-router';\nimport { DEBUG_BUILD } from '../common/debug-build';\nimport { isInstrumentationApiUsed } from './serverGlobals';\n\ntype SpanOptions = {\n  name?: string;\n  attributes?: SpanAttributes;\n};\n\n// Track if we've already warned about duplicate instrumentation\nlet hasWarnedAboutDuplicateActionInstrumentation = false;\n\n/**\n * Wraps a React Router server action function with Sentry performance monitoring.\n * @param options - Optional span configuration options including name, operation, description and attributes\n * @param actionFn - The server action function to wrap\n *\n * @example\n * ```ts\n * // Wrap an action function with custom span options\n * export const action = wrapServerAction(\n *   {\n *     name: 'Submit Form Data',\n *     description: 'Processes form submission data',\n *   },\n *   async ({ request }) => {\n *     // ... your action logic\n *   }\n * );\n * ```\n */\nexport function wrapServerAction<T>(\n  options: SpanOptions = {},\n  actionFn: (args: ActionFunctionArgs) => Promise<T>,\n): (args: ActionFunctionArgs) => Promise<T> {\n  return async function (args: ActionFunctionArgs): Promise<T> {\n    // Skip instrumentation if instrumentation API is already handling it\n    if (isInstrumentationApiUsed()) {\n      if (DEBUG_BUILD && !hasWarnedAboutDuplicateActionInstrumentation) {\n        hasWarnedAboutDuplicateActionInstrumentation = true;\n        debug.warn(\n          'wrapServerAction is redundant when using the instrumentation API. ' +\n            'The action is already instrumented automatically. You can safely remove wrapServerAction.',\n        );\n      }\n      return actionFn(args);\n    }\n\n    const name = options.name || 'Executing Server Action';\n    const active = getActiveSpan();\n    if (active) {\n      const root = getRootSpan(active);\n      const spanData = spanToJSON(root);\n      if (spanData.origin === 'auto.http.otel.http') {\n        // eslint-disable-next-line deprecation/deprecation\n        const target = spanData.data[SEMATTRS_HTTP_TARGET];\n\n        if (target) {\n          // We cannot rely on the regular span name inferral here, as the express instrumentation sets `*` as the route\n          // So we force this to be a more sensible name here\n          updateSpanName(root, `${args.request.method} ${target}`);\n          root.setAttributes({\n            [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',\n            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.action',\n          });\n        }\n      }\n    }\n\n    try {\n      return await startSpan(\n        {\n          name,\n          ...options,\n          attributes: {\n            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.action',\n            [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.react_router.action',\n            ...options.attributes,\n          },\n        },\n        () => actionFn(args),\n      );\n    } finally {\n      await flushIfServerless();\n    }\n  };\n}\n"],"names":["isInstrumentationApiUsed","DEBUG_BUILD","debug","getActiveSpan","getRootSpan","spanToJSON","SEMATTRS_HTTP_TARGET","updateSpanName","SEMANTIC_ATTRIBUTE_SENTRY_SOURCE","SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN","startSpan","SEMANTIC_ATTRIBUTE_SENTRY_OP","flushIfServerless"],"mappings":";;;;;;;AAuBA;AACA,IAAI,4CAAA,GAA+C,KAAK;;AAExD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAAS,gBAAgB;AAChC,EAAE,OAAO,GAAgB,EAAE;AAC3B,EAAE,QAAQ;AACV,EAA4C;AAC5C,EAAE,OAAO,gBAAgB,IAAI,EAAkC;AAC/D;AACA,IAAI,IAAIA,sCAAwB,EAAE,EAAE;AACpC,MAAM,IAAIC,sBAAA,IAAe,CAAC,4CAA4C,EAAE;AACxE,QAAQ,4CAAA,GAA+C,IAAI;AAC3D,QAAQC,UAAK,CAAC,IAAI;AAClB,UAAU,oEAAA;AACV,YAAY,2FAA2F;AACvG,SAAS;AACT,MAAM;AACN,MAAM,OAAO,QAAQ,CAAC,IAAI,CAAC;AAC3B,IAAI;;AAEJ,IAAI,MAAM,IAAA,GAAO,OAAO,CAAC,IAAA,IAAQ,yBAAyB;AAC1D,IAAI,MAAM,MAAA,GAASC,kBAAa,EAAE;AAClC,IAAI,IAAI,MAAM,EAAE;AAChB,MAAM,MAAM,IAAA,GAAOC,gBAAW,CAAC,MAAM,CAAC;AACtC,MAAM,MAAM,QAAA,GAAWC,eAAU,CAAC,IAAI,CAAC;AACvC,MAAM,IAAI,QAAQ,CAAC,MAAA,KAAW,qBAAqB,EAAE;AACrD;AACA,QAAQ,MAAM,SAAS,QAAQ,CAAC,IAAI,CAACC,wCAAoB,CAAC;;AAE1D,QAAQ,IAAI,MAAM,EAAE;AACpB;AACA;AACA,UAAUC,mBAAc,CAAC,IAAI,EAAE,CAAC,EAAA,IAAA,CAAA,OAAA,CAAA,MAAA,CAAA,CAAA,EAAA,MAAA,CAAA,CAAA,CAAA;AACA,UAAA,IAAA,CAAA,aAAA,CAAA;AACA,YAAA,CAAAC,qCAAA,GAAA,KAAA;AACA,YAAA,CAAAC,qCAAA,GAAA,+BAAA;AACA,WAAA,CAAA;AACA,QAAA;AACA,MAAA;AACA,IAAA;;AAEA,IAAA,IAAA;AACA,MAAA,OAAA,MAAAC,cAAA;AACA,QAAA;AACA,UAAA,IAAA;AACA,UAAA,GAAA,OAAA;AACA,UAAA,UAAA,EAAA;AACA,YAAA,CAAAD,qCAAA,GAAA,+BAAA;AACA,YAAA,CAAAE,iCAAA,GAAA,8BAAA;AACA,YAAA,GAAA,OAAA,CAAA,UAAA;AACA,WAAA;AACA,SAAA;AACA,QAAA,MAAA,QAAA,CAAA,IAAA,CAAA;AACA,OAAA;AACA,IAAA,CAAA,SAAA;AACA,MAAA,MAAAC,sBAAA,EAAA;AACA,IAAA;AACA,EAAA,CAAA;AACA;;;;"}

package/build/cjs/server/wrapServerLoader.js

@@ -2,6 +2,11 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
 const semanticConventions = require('@opentelemetry/semantic-conventions');
 const core = require('@sentry/core');
+const debugBuild = require('../common/debug-build.js');
+const serverGlobals = require('./serverGlobals.js');
+
+// Track if we've already warned about duplicate instrumentation
+let hasWarnedAboutDuplicateLoaderInstrumentation = false;
 
 /**
  * Wraps a React Router server loader function with Sentry performance monitoring.
@@ -22,8 +27,23 @@ const core = require('@sentry/core');
  * );
  * ```
  */
-function wrapServerLoader(options = {}, loaderFn) {
+function wrapServerLoader(
+  options = {},
+  loaderFn,
+) {
   return async function (args) {
+    // Skip instrumentation if instrumentation API is already handling it
+    if (serverGlobals.isInstrumentationApiUsed()) {
+      if (debugBuild.DEBUG_BUILD && !hasWarnedAboutDuplicateLoaderInstrumentation) {
+        hasWarnedAboutDuplicateLoaderInstrumentation = true;
+        core.debug.warn(
+          'wrapServerLoader is redundant when using the instrumentation API. ' +
+            'The loader is already instrumented automatically. You can safely remove wrapServerLoader.',
+        );
+      }
+      return loaderFn(args);
+    }
+
     const name = options.name || 'Executing Server Loader';
     const active = core.getActiveSpan();
 

package/build/cjs/server/wrapServerLoader.js.map

@@ -1 +1 @@
-{"version":3,"file":"wrapServerLoader.js","sources":["../../../src/server/wrapServerLoader.ts"],"sourcesContent":["import { SEMATTRS_HTTP_TARGET } from '@opentelemetry/semantic-conventions';\nimport type { SpanAttributes } from '@sentry/core';\nimport {\n  flushIfServerless,\n  getActiveSpan,\n  getRootSpan,\n  SEMANTIC_ATTRIBUTE_SENTRY_OP,\n  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,\n  SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,\n  spanToJSON,\n  startSpan,\n  updateSpanName,\n} from '@sentry/core';\nimport type { LoaderFunctionArgs } from 'react-router';\n\ntype SpanOptions = {\n  name?: string;\n  attributes?: SpanAttributes;\n};\n\n/**\n * Wraps a React Router server loader function with Sentry performance monitoring.\n * @param options - Optional span configuration options including name, operation, description and attributes\n * @param loaderFn - The server loader function to wrap\n *\n * @example\n * ```ts\n * // Wrap a loader function with custom span options\n * export const loader = wrapServerLoader(\n *   {\n *     name: 'Load Some Data',\n *     description: 'Loads some data from the db',\n *   },\n *   async ({ params }) => {\n *     // ... your loader logic\n *   }\n * );\n * ```\n */\nexport function wrapServerLoader<T>(options: SpanOptions = {}, loaderFn: (args: LoaderFunctionArgs) => Promise<T>) {\n  return async function (args: LoaderFunctionArgs) {\n    const name = options.name || 'Executing Server Loader';\n    const active = getActiveSpan();\n\n    if (active) {\n      const root = getRootSpan(active);\n      const spanData = spanToJSON(root);\n      if (spanData.origin === 'auto.http.otel.http') {\n        // eslint-disable-next-line deprecation/deprecation\n        const target = spanData.data[SEMATTRS_HTTP_TARGET];\n\n        if (target) {\n          // We cannot rely on the regular span name inferral here, as the express instrumentation sets `*` as the route\n          // So we force this to be a more sensible name here\n          updateSpanName(root, `${args.request.method} ${target}`);\n          root.setAttributes({\n            [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',\n            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.loader',\n          });\n        }\n      }\n    }\n    try {\n      return await startSpan(\n        {\n          name,\n          ...options,\n          attributes: {\n            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.loader',\n            [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.react_router.loader',\n            ...options.attributes,\n          },\n        },\n        () => loaderFn(args),\n      );\n    } finally {\n      await flushIfServerless();\n    }\n  };\n}\n"],"names":["getActiveSpan","getRootSpan","spanToJSON","SEMATTRS_HTTP_TARGET","updateSpanName","SEMANTIC_ATTRIBUTE_SENTRY_SOURCE","SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN","startSpan","SEMANTIC_ATTRIBUTE_SENTRY_OP","flushIfServerless"],"mappings":";;;;;AAoBA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAAS,gBAAgB,CAAI,OAAO,GAAgB,EAAE,EAAE,QAAQ,EAA4C;AACnH,EAAE,OAAO,gBAAgB,IAAI,EAAsB;AACnD,IAAI,MAAM,IAAA,GAAO,OAAO,CAAC,IAAA,IAAQ,yBAAyB;AAC1D,IAAI,MAAM,MAAA,GAASA,kBAAa,EAAE;;AAElC,IAAI,IAAI,MAAM,EAAE;AAChB,MAAM,MAAM,IAAA,GAAOC,gBAAW,CAAC,MAAM,CAAC;AACtC,MAAM,MAAM,QAAA,GAAWC,eAAU,CAAC,IAAI,CAAC;AACvC,MAAM,IAAI,QAAQ,CAAC,MAAA,KAAW,qBAAqB,EAAE;AACrD;AACA,QAAQ,MAAM,SAAS,QAAQ,CAAC,IAAI,CAACC,wCAAoB,CAAC;;AAE1D,QAAQ,IAAI,MAAM,EAAE;AACpB;AACA;AACA,UAAUC,mBAAc,CAAC,IAAI,EAAE,CAAC,EAAA,IAAA,CAAA,OAAA,CAAA,MAAA,CAAA,CAAA,EAAA,MAAA,CAAA,CAAA,CAAA;AACA,UAAA,IAAA,CAAA,aAAA,CAAA;AACA,YAAA,CAAAC,qCAAA,GAAA,KAAA;AACA,YAAA,CAAAC,qCAAA,GAAA,+BAAA;AACA,WAAA,CAAA;AACA,QAAA;AACA,MAAA;AACA,IAAA;AACA,IAAA,IAAA;AACA,MAAA,OAAA,MAAAC,cAAA;AACA,QAAA;AACA,UAAA,IAAA;AACA,UAAA,GAAA,OAAA;AACA,UAAA,UAAA,EAAA;AACA,YAAA,CAAAD,qCAAA,GAAA,+BAAA;AACA,YAAA,CAAAE,iCAAA,GAAA,8BAAA;AACA,YAAA,GAAA,OAAA,CAAA,UAAA;AACA,WAAA;AACA,SAAA;AACA,QAAA,MAAA,QAAA,CAAA,IAAA,CAAA;AACA,OAAA;AACA,IAAA,CAAA,SAAA;AACA,MAAA,MAAAC,sBAAA,EAAA;AACA,IAAA;AACA,EAAA,CAAA;AACA;;;;"}
+{"version":3,"file":"wrapServerLoader.js","sources":["../../../src/server/wrapServerLoader.ts"],"sourcesContent":["import { SEMATTRS_HTTP_TARGET } from '@opentelemetry/semantic-conventions';\nimport type { SpanAttributes } from '@sentry/core';\nimport {\n  debug,\n  flushIfServerless,\n  getActiveSpan,\n  getRootSpan,\n  SEMANTIC_ATTRIBUTE_SENTRY_OP,\n  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,\n  SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,\n  spanToJSON,\n  startSpan,\n  updateSpanName,\n} from '@sentry/core';\nimport type { LoaderFunctionArgs } from 'react-router';\nimport { DEBUG_BUILD } from '../common/debug-build';\nimport { isInstrumentationApiUsed } from './serverGlobals';\n\ntype SpanOptions = {\n  name?: string;\n  attributes?: SpanAttributes;\n};\n\n// Track if we've already warned about duplicate instrumentation\nlet hasWarnedAboutDuplicateLoaderInstrumentation = false;\n\n/**\n * Wraps a React Router server loader function with Sentry performance monitoring.\n * @param options - Optional span configuration options including name, operation, description and attributes\n * @param loaderFn - The server loader function to wrap\n *\n * @example\n * ```ts\n * // Wrap a loader function with custom span options\n * export const loader = wrapServerLoader(\n *   {\n *     name: 'Load Some Data',\n *     description: 'Loads some data from the db',\n *   },\n *   async ({ params }) => {\n *     // ... your loader logic\n *   }\n * );\n * ```\n */\nexport function wrapServerLoader<T>(\n  options: SpanOptions = {},\n  loaderFn: (args: LoaderFunctionArgs) => Promise<T>,\n): (args: LoaderFunctionArgs) => Promise<T> {\n  return async function (args: LoaderFunctionArgs): Promise<T> {\n    // Skip instrumentation if instrumentation API is already handling it\n    if (isInstrumentationApiUsed()) {\n      if (DEBUG_BUILD && !hasWarnedAboutDuplicateLoaderInstrumentation) {\n        hasWarnedAboutDuplicateLoaderInstrumentation = true;\n        debug.warn(\n          'wrapServerLoader is redundant when using the instrumentation API. ' +\n            'The loader is already instrumented automatically. You can safely remove wrapServerLoader.',\n        );\n      }\n      return loaderFn(args);\n    }\n\n    const name = options.name || 'Executing Server Loader';\n    const active = getActiveSpan();\n\n    if (active) {\n      const root = getRootSpan(active);\n      const spanData = spanToJSON(root);\n      if (spanData.origin === 'auto.http.otel.http') {\n        // eslint-disable-next-line deprecation/deprecation\n        const target = spanData.data[SEMATTRS_HTTP_TARGET];\n\n        if (target) {\n          // We cannot rely on the regular span name inferral here, as the express instrumentation sets `*` as the route\n          // So we force this to be a more sensible name here\n          updateSpanName(root, `${args.request.method} ${target}`);\n          root.setAttributes({\n            [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',\n            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.loader',\n          });\n        }\n      }\n    }\n    try {\n      return await startSpan(\n        {\n          name,\n          ...options,\n          attributes: {\n            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.loader',\n            [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.react_router.loader',\n            ...options.attributes,\n          },\n        },\n        () => loaderFn(args),\n      );\n    } finally {\n      await flushIfServerless();\n    }\n  };\n}\n"],"names":["isInstrumentationApiUsed","DEBUG_BUILD","debug","getActiveSpan","getRootSpan","spanToJSON","SEMATTRS_HTTP_TARGET","updateSpanName","SEMANTIC_ATTRIBUTE_SENTRY_SOURCE","SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN","startSpan","SEMANTIC_ATTRIBUTE_SENTRY_OP","flushIfServerless"],"mappings":";;;;;;;AAuBA;AACA,IAAI,4CAAA,GAA+C,KAAK;;AAExD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAAS,gBAAgB;AAChC,EAAE,OAAO,GAAgB,EAAE;AAC3B,EAAE,QAAQ;AACV,EAA4C;AAC5C,EAAE,OAAO,gBAAgB,IAAI,EAAkC;AAC/D;AACA,IAAI,IAAIA,sCAAwB,EAAE,EAAE;AACpC,MAAM,IAAIC,sBAAA,IAAe,CAAC,4CAA4C,EAAE;AACxE,QAAQ,4CAAA,GAA+C,IAAI;AAC3D,QAAQC,UAAK,CAAC,IAAI;AAClB,UAAU,oEAAA;AACV,YAAY,2FAA2F;AACvG,SAAS;AACT,MAAM;AACN,MAAM,OAAO,QAAQ,CAAC,IAAI,CAAC;AAC3B,IAAI;;AAEJ,IAAI,MAAM,IAAA,GAAO,OAAO,CAAC,IAAA,IAAQ,yBAAyB;AAC1D,IAAI,MAAM,MAAA,GAASC,kBAAa,EAAE;;AAElC,IAAI,IAAI,MAAM,EAAE;AAChB,MAAM,MAAM,IAAA,GAAOC,gBAAW,CAAC,MAAM,CAAC;AACtC,MAAM,MAAM,QAAA,GAAWC,eAAU,CAAC,IAAI,CAAC;AACvC,MAAM,IAAI,QAAQ,CAAC,MAAA,KAAW,qBAAqB,EAAE;AACrD;AACA,QAAQ,MAAM,SAAS,QAAQ,CAAC,IAAI,CAACC,wCAAoB,CAAC;;AAE1D,QAAQ,IAAI,MAAM,EAAE;AACpB;AACA;AACA,UAAUC,mBAAc,CAAC,IAAI,EAAE,CAAC,EAAA,IAAA,CAAA,OAAA,CAAA,MAAA,CAAA,CAAA,EAAA,MAAA,CAAA,CAAA,CAAA;AACA,UAAA,IAAA,CAAA,aAAA,CAAA;AACA,YAAA,CAAAC,qCAAA,GAAA,KAAA;AACA,YAAA,CAAAC,qCAAA,GAAA,+BAAA;AACA,WAAA,CAAA;AACA,QAAA;AACA,MAAA;AACA,IAAA;AACA,IAAA,IAAA;AACA,MAAA,OAAA,MAAAC,cAAA;AACA,QAAA;AACA,UAAA,IAAA;AACA,UAAA,GAAA,OAAA;AACA,UAAA,UAAA,EAAA;AACA,YAAA,CAAAD,qCAAA,GAAA,+BAAA;AACA,YAAA,CAAAE,iCAAA,GAAA,8BAAA;AACA,YAAA,GAAA,OAAA,CAAA,UAAA;AACA,WAAA;AACA,SAAA;AACA,QAAA,MAAA,QAAA,CAAA,IAAA,CAAA;AACA,OAAA;AACA,IAAA,CAAA,SAAA;AACA,MAAA,MAAAC,sBAAA,EAAA;AACA,IAAA;AACA,EAAA,CAAA;AACA;;;;"}

package/build/cjs/vite/makeCustomSentryVitePlugins.js

@@ -53,7 +53,7 @@ async function makeCustomSentryVitePlugins(options) {
     ...sentryVitePlugins.filter(plugin => {
       return [
         'sentry-telemetry-plugin',
-        'sentry-vite-release-injection-plugin',
+        'sentry-vite-injection-plugin',
         ...(reactComponentAnnotation?.enabled || unstable_sentryVitePluginOptions?.reactComponentAnnotation?.enabled
           ? ['sentry-vite-component-name-annotate-plugin']
           : []),

package/build/cjs/vite/makeCustomSentryVitePlugins.js.map

@@ -1 +1 @@
-{"version":3,"file":"makeCustomSentryVitePlugins.js","sources":["../../../src/vite/makeCustomSentryVitePlugins.ts"],"sourcesContent":["import { sentryVitePlugin } from '@sentry/vite-plugin';\nimport { type Plugin } from 'vite';\nimport type { SentryReactRouterBuildOptions } from './types';\n\n/**\n * Create a custom subset of sentry's vite plugins\n */\nexport async function makeCustomSentryVitePlugins(options: SentryReactRouterBuildOptions): Promise<Plugin[]> {\n  const {\n    debug,\n    unstable_sentryVitePluginOptions,\n    bundleSizeOptimizations,\n    authToken,\n    org,\n    project,\n    telemetry,\n    reactComponentAnnotation,\n    release,\n  } = options;\n\n  const sentryVitePlugins = sentryVitePlugin({\n    authToken: authToken ?? process.env.SENTRY_AUTH_TOKEN,\n    bundleSizeOptimizations,\n    debug: debug ?? false,\n    org: org ?? process.env.SENTRY_ORG,\n    project: project ?? process.env.SENTRY_PROJECT,\n    telemetry: telemetry ?? true,\n    _metaOptions: {\n      telemetry: {\n        metaFramework: 'react-router',\n      },\n      ...unstable_sentryVitePluginOptions?._metaOptions,\n    },\n    reactComponentAnnotation: {\n      enabled: reactComponentAnnotation?.enabled ?? undefined,\n      ignoredComponents: reactComponentAnnotation?.ignoredComponents ?? undefined,\n      ...unstable_sentryVitePluginOptions?.reactComponentAnnotation,\n    },\n    release: {\n      ...unstable_sentryVitePluginOptions?.release,\n      ...release,\n    },\n    // will be handled in buildEnd hook\n    sourcemaps: {\n      disable: true,\n      ...unstable_sentryVitePluginOptions?.sourcemaps,\n    },\n    ...unstable_sentryVitePluginOptions,\n  }) as Plugin[];\n\n  // only use a subset of the plugins as all upload and file deletion tasks will be handled in the buildEnd hook\n  return [\n    ...sentryVitePlugins.filter(plugin => {\n      return [\n        'sentry-telemetry-plugin',\n        'sentry-vite-release-injection-plugin',\n        ...(reactComponentAnnotation?.enabled || unstable_sentryVitePluginOptions?.reactComponentAnnotation?.enabled\n          ? ['sentry-vite-component-name-annotate-plugin']\n          : []),\n      ].includes(plugin.name);\n    }),\n  ];\n}\n"],"names":["sentryVitePlugin"],"mappings":";;;;AAIA;AACA;AACA;AACO,eAAe,2BAA2B,CAAC,OAAO,EAAoD;AAC7G,EAAE,MAAM;AACR,IAAI,KAAK;AACT,IAAI,gCAAgC;AACpC,IAAI,uBAAuB;AAC3B,IAAI,SAAS;AACb,IAAI,GAAG;AACP,IAAI,OAAO;AACX,IAAI,SAAS;AACb,IAAI,wBAAwB;AAC5B,IAAI,OAAO;AACX,GAAE,GAAI,OAAO;;AAEb,EAAE,MAAM,iBAAA,GAAoBA,2BAAgB,CAAC;AAC7C,IAAI,SAAS,EAAE,SAAA,IAAa,OAAO,CAAC,GAAG,CAAC,iBAAiB;AACzD,IAAI,uBAAuB;AAC3B,IAAI,KAAK,EAAE,KAAA,IAAS,KAAK;AACzB,IAAI,GAAG,EAAE,GAAA,IAAO,OAAO,CAAC,GAAG,CAAC,UAAU;AACtC,IAAI,OAAO,EAAE,OAAA,IAAW,OAAO,CAAC,GAAG,CAAC,cAAc;AAClD,IAAI,SAAS,EAAE,SAAA,IAAa,IAAI;AAChC,IAAI,YAAY,EAAE;AAClB,MAAM,SAAS,EAAE;AACjB,QAAQ,aAAa,EAAE,cAAc;AACrC,OAAO;AACP,MAAM,GAAG,gCAAgC,EAAE,YAAY;AACvD,KAAK;AACL,IAAI,wBAAwB,EAAE;AAC9B,MAAM,OAAO,EAAE,wBAAwB,EAAE,OAAA,IAAW,SAAS;AAC7D,MAAM,iBAAiB,EAAE,wBAAwB,EAAE,iBAAA,IAAqB,SAAS;AACjF,MAAM,GAAG,gCAAgC,EAAE,wBAAwB;AACnE,KAAK;AACL,IAAI,OAAO,EAAE;AACb,MAAM,GAAG,gCAAgC,EAAE,OAAO;AAClD,MAAM,GAAG,OAAO;AAChB,KAAK;AACL;AACA,IAAI,UAAU,EAAE;AAChB,MAAM,OAAO,EAAE,IAAI;AACnB,MAAM,GAAG,gCAAgC,EAAE,UAAU;AACrD,KAAK;AACL,IAAI,GAAG,gCAAgC;AACvC,GAAG,CAAA;;AAEH;AACA,EAAE,OAAO;AACT,IAAI,GAAG,iBAAiB,CAAC,MAAM,CAAC,UAAU;AAC1C,MAAM,OAAO;AACb,QAAQ,yBAAyB;AACjC,QAAQ,sCAAsC;AAC9C,QAAQ,IAAI,wBAAwB,EAAE,WAAW,gCAAgC,EAAE,wBAAwB,EAAE;AAC7G,YAAY,CAAC,4CAA4C;AACzD,YAAY,EAAE,CAAC;AACf,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC;AAC7B,IAAI,CAAC,CAAC;AACN,GAAG;AACH;;;;"}
+{"version":3,"file":"makeCustomSentryVitePlugins.js","sources":["../../../src/vite/makeCustomSentryVitePlugins.ts"],"sourcesContent":["import { sentryVitePlugin } from '@sentry/vite-plugin';\nimport { type Plugin } from 'vite';\nimport type { SentryReactRouterBuildOptions } from './types';\n\n/**\n * Create a custom subset of sentry's vite plugins\n */\nexport async function makeCustomSentryVitePlugins(options: SentryReactRouterBuildOptions): Promise<Plugin[]> {\n  const {\n    debug,\n    unstable_sentryVitePluginOptions,\n    bundleSizeOptimizations,\n    authToken,\n    org,\n    project,\n    telemetry,\n    reactComponentAnnotation,\n    release,\n  } = options;\n\n  const sentryVitePlugins = sentryVitePlugin({\n    authToken: authToken ?? process.env.SENTRY_AUTH_TOKEN,\n    bundleSizeOptimizations,\n    debug: debug ?? false,\n    org: org ?? process.env.SENTRY_ORG,\n    project: project ?? process.env.SENTRY_PROJECT,\n    telemetry: telemetry ?? true,\n    _metaOptions: {\n      telemetry: {\n        metaFramework: 'react-router',\n      },\n      ...unstable_sentryVitePluginOptions?._metaOptions,\n    },\n    reactComponentAnnotation: {\n      enabled: reactComponentAnnotation?.enabled ?? undefined,\n      ignoredComponents: reactComponentAnnotation?.ignoredComponents ?? undefined,\n      ...unstable_sentryVitePluginOptions?.reactComponentAnnotation,\n    },\n    release: {\n      ...unstable_sentryVitePluginOptions?.release,\n      ...release,\n    },\n    // will be handled in buildEnd hook\n    sourcemaps: {\n      disable: true,\n      ...unstable_sentryVitePluginOptions?.sourcemaps,\n    },\n    ...unstable_sentryVitePluginOptions,\n  }) as Plugin[];\n\n  // only use a subset of the plugins as all upload and file deletion tasks will be handled in the buildEnd hook\n  return [\n    ...sentryVitePlugins.filter(plugin => {\n      return [\n        'sentry-telemetry-plugin',\n        'sentry-vite-injection-plugin',\n        ...(reactComponentAnnotation?.enabled || unstable_sentryVitePluginOptions?.reactComponentAnnotation?.enabled\n          ? ['sentry-vite-component-name-annotate-plugin']\n          : []),\n      ].includes(plugin.name);\n    }),\n  ];\n}\n"],"names":["sentryVitePlugin"],"mappings":";;;;AAIA;AACA;AACA;AACO,eAAe,2BAA2B,CAAC,OAAO,EAAoD;AAC7G,EAAE,MAAM;AACR,IAAI,KAAK;AACT,IAAI,gCAAgC;AACpC,IAAI,uBAAuB;AAC3B,IAAI,SAAS;AACb,IAAI,GAAG;AACP,IAAI,OAAO;AACX,IAAI,SAAS;AACb,IAAI,wBAAwB;AAC5B,IAAI,OAAO;AACX,GAAE,GAAI,OAAO;;AAEb,EAAE,MAAM,iBAAA,GAAoBA,2BAAgB,CAAC;AAC7C,IAAI,SAAS,EAAE,SAAA,IAAa,OAAO,CAAC,GAAG,CAAC,iBAAiB;AACzD,IAAI,uBAAuB;AAC3B,IAAI,KAAK,EAAE,KAAA,IAAS,KAAK;AACzB,IAAI,GAAG,EAAE,GAAA,IAAO,OAAO,CAAC,GAAG,CAAC,UAAU;AACtC,IAAI,OAAO,EAAE,OAAA,IAAW,OAAO,CAAC,GAAG,CAAC,cAAc;AAClD,IAAI,SAAS,EAAE,SAAA,IAAa,IAAI;AAChC,IAAI,YAAY,EAAE;AAClB,MAAM,SAAS,EAAE;AACjB,QAAQ,aAAa,EAAE,cAAc;AACrC,OAAO;AACP,MAAM,GAAG,gCAAgC,EAAE,YAAY;AACvD,KAAK;AACL,IAAI,wBAAwB,EAAE;AAC9B,MAAM,OAAO,EAAE,wBAAwB,EAAE,OAAA,IAAW,SAAS;AAC7D,MAAM,iBAAiB,EAAE,wBAAwB,EAAE,iBAAA,IAAqB,SAAS;AACjF,MAAM,GAAG,gCAAgC,EAAE,wBAAwB;AACnE,KAAK;AACL,IAAI,OAAO,EAAE;AACb,MAAM,GAAG,gCAAgC,EAAE,OAAO;AAClD,MAAM,GAAG,OAAO;AAChB,KAAK;AACL;AACA,IAAI,UAAU,EAAE;AAChB,MAAM,OAAO,EAAE,IAAI;AACnB,MAAM,GAAG,gCAAgC,EAAE,UAAU;AACrD,KAAK;AACL,IAAI,GAAG,gCAAgC;AACvC,GAAG,CAAA;;AAEH;AACA,EAAE,OAAO;AACT,IAAI,GAAG,iBAAiB,CAAC,MAAM,CAAC,UAAU;AAC1C,MAAM,OAAO;AACb,QAAQ,yBAAyB;AACjC,QAAQ,8BAA8B;AACtC,QAAQ,IAAI,wBAAwB,EAAE,WAAW,gCAAgC,EAAE,wBAAwB,EAAE;AAC7G,YAAY,CAAC,4CAA4C;AACzD,YAAY,EAAE,CAAC;AACf,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC;AAC7B,IAAI,CAAC,CAAC;AACN,GAAG;AACH;;;;"}

package/build/esm/client/createClientInstrumentation.js

@@ -0,0 +1,305 @@
+import { startBrowserTracingNavigationSpan } from '@sentry/browser';
+import { debug, startSpan, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_OP, SPAN_STATUS_ERROR, GLOBAL_OBJ, getClient, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE } from '@sentry/core';
+import { DEBUG_BUILD } from '../common/debug-build.js';
+import { captureInstrumentationError, getPathFromRequest, normalizeRoutePath, getPattern } from '../common/utils.js';
+
+const WINDOW = GLOBAL_OBJ ;
+
+// Tracks active numeric navigation span to prevent duplicate spans when popstate fires
+let currentNumericNavigationSpan;
+
+const SENTRY_CLIENT_INSTRUMENTATION_FLAG = '__sentryReactRouterClientInstrumentationUsed';
+// Intentionally never reset - once set, instrumentation API handles all navigations for the session.
+const SENTRY_NAVIGATE_HOOK_INVOKED_FLAG = '__sentryReactRouterNavigateHookInvoked';
+const SENTRY_POPSTATE_LISTENER_ADDED_FLAG = '__sentryReactRouterPopstateListenerAdded';
+
+const GLOBAL_WITH_FLAGS = GLOBAL_OBJ ;
+
+/**
+ * Options for creating Sentry client instrumentation.
+ */
+
+/**
+ * Creates a Sentry client instrumentation for React Router's instrumentation API.
+ * @experimental
+ */
+function createSentryClientInstrumentation(
+  options = {},
+) {
+  const { captureErrors = true } = options;
+
+  DEBUG_BUILD && debug.log('React Router client instrumentation API created.');
+
+  return {
+    router(router) {
+      // Set the flag when React Router actually invokes our instrumentation.
+      // This ensures the flag is only set in Library Mode (where hooks run),
+      // not in Framework Mode (where hooks are never called).
+      // See: https://github.com/remix-run/react-router/discussions/13749
+      GLOBAL_WITH_FLAGS[SENTRY_CLIENT_INSTRUMENTATION_FLAG] = true;
+      DEBUG_BUILD && debug.log('React Router client instrumentation API router hook registered.');
+
+      // Add popstate listener for browser back/forward navigation (persists for session, one listener only)
+      if (!GLOBAL_WITH_FLAGS[SENTRY_POPSTATE_LISTENER_ADDED_FLAG] && WINDOW.addEventListener) {
+        GLOBAL_WITH_FLAGS[SENTRY_POPSTATE_LISTENER_ADDED_FLAG] = true;
+
+        WINDOW.addEventListener('popstate', () => {
+          const client = getClient();
+          if (!client) {
+            currentNumericNavigationSpan = undefined;
+            return;
+          }
+
+          const pathname = WINDOW.location?.pathname || '/';
+
+          // If there's an active numeric navigation span, update it instead of creating a duplicate
+          if (currentNumericNavigationSpan) {
+            if (currentNumericNavigationSpan.isRecording()) {
+              currentNumericNavigationSpan.updateName(pathname);
+            }
+            currentNumericNavigationSpan = undefined;
+            return;
+          }
+
+          // Only create a new span for actual browser back/forward button clicks
+          startBrowserTracingNavigationSpan(client, {
+            name: pathname,
+            attributes: {
+              [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
+              [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation',
+              [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.react_router.instrumentation_api',
+              'navigation.type': 'browser.popstate',
+            },
+          });
+        });
+
+        DEBUG_BUILD && debug.log('React Router popstate listener registered for browser back/forward navigation.');
+      }
+
+      router.instrument({
+        async navigate(callNavigate, info) {
+          // navigate(0) triggers a page reload - skip span creation, but still capture errors
+          // (navigation can be rejected before reload, e.g., by a navigation guard)
+          if (info.to === 0) {
+            const result = await callNavigate();
+            if (result.status === 'error' && result.error instanceof Error) {
+              captureInstrumentationError(result, captureErrors, 'react_router.navigate', {
+                'http.url': info.currentUrl,
+              });
+            }
+            return;
+          }
+
+          GLOBAL_WITH_FLAGS[SENTRY_NAVIGATE_HOOK_INVOKED_FLAG] = true;
+
+          // Handle numeric navigations (navigate(-1), navigate(1), etc.)
+          if (typeof info.to === 'number') {
+            const client = getClient();
+            let navigationSpan;
+
+            if (client) {
+              const navigationType = info.to < 0 ? 'router.back' : 'router.forward';
+              const currentPathname = WINDOW.location?.pathname || info.currentUrl;
+
+              navigationSpan = startBrowserTracingNavigationSpan(client, {
+                name: currentPathname,
+                attributes: {
+                  [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
+                  [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation',
+                  [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.react_router.instrumentation_api',
+                  'navigation.type': navigationType,
+                },
+              });
+
+              // Store ref so popstate listener can update it instead of creating a duplicate
+              currentNumericNavigationSpan = navigationSpan;
+            }
+
+            try {
+              const result = await callNavigate();
+
+              if (navigationSpan && WINDOW.location) {
+                navigationSpan.updateName(WINDOW.location.pathname);
+              }
+
+              if (result.status === 'error' && result.error instanceof Error) {
+                if (navigationSpan) {
+                  navigationSpan.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
+                }
+                captureInstrumentationError(result, captureErrors, 'react_router.navigate', {
+                  'http.url': WINDOW.location?.pathname || info.currentUrl,
+                });
+              }
+            } finally {
+              currentNumericNavigationSpan = undefined;
+            }
+            return;
+          }
+
+          // Handle string navigations (e.g., navigate('/about'))
+          const client = getClient();
+          const toPath = String(info.to);
+          let navigationSpan;
+
+          if (client) {
+            navigationSpan = startBrowserTracingNavigationSpan(client, {
+              name: toPath,
+              attributes: {
+                [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
+                [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation',
+                [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.react_router.instrumentation_api',
+                'navigation.type': 'router.navigate',
+              },
+            });
+          }
+
+          const result = await callNavigate();
+          if (result.status === 'error' && result.error instanceof Error) {
+            if (navigationSpan) {
+              navigationSpan.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
+            }
+            captureInstrumentationError(result, captureErrors, 'react_router.navigate', {
+              'http.url': toPath,
+            });
+          }
+          return;
+        },
+
+        async fetch(callFetch, info) {
+          await startSpan(
+            {
+              name: `Fetcher ${info.fetcherKey}`,
+              attributes: {
+                [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.react_router.fetcher',
+                [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.react_router.instrumentation_api',
+              },
+            },
+            async span => {
+              const result = await callFetch();
+              if (result.status === 'error' && result.error instanceof Error) {
+                span.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
+                captureInstrumentationError(result, captureErrors, 'react_router.fetcher', {
+                  'http.url': info.href,
+                });
+              }
+            },
+          );
+        },
+      });
+    },
+
+    route(route) {
+      route.instrument({
+        async loader(callLoader, info) {
+          const urlPath = getPathFromRequest(info.request);
+          const routePattern = normalizeRoutePath(getPattern(info)) || urlPath;
+
+          await startSpan(
+            {
+              name: routePattern,
+              attributes: {
+                [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.react_router.client_loader',
+                [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.react_router.instrumentation_api',
+              },
+            },
+            async span => {
+              const result = await callLoader();
+              if (result.status === 'error' && result.error instanceof Error) {
+                span.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
+                captureInstrumentationError(result, captureErrors, 'react_router.client_loader', {
+                  'http.url': urlPath,
+                });
+              }
+            },
+          );
+        },
+
+        async action(callAction, info) {
+          const urlPath = getPathFromRequest(info.request);
+          const routePattern = normalizeRoutePath(getPattern(info)) || urlPath;
+
+          await startSpan(
+            {
+              name: routePattern,
+              attributes: {
+                [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.react_router.client_action',
+                [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.react_router.instrumentation_api',
+              },
+            },
+            async span => {
+              const result = await callAction();
+              if (result.status === 'error' && result.error instanceof Error) {
+                span.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
+                captureInstrumentationError(result, captureErrors, 'react_router.client_action', {
+                  'http.url': urlPath,
+                });
+              }
+            },
+          );
+        },
+
+        async middleware(callMiddleware, info) {
+          const urlPath = getPathFromRequest(info.request);
+          const routePattern = normalizeRoutePath(getPattern(info)) || urlPath;
+
+          await startSpan(
+            {
+              name: routePattern,
+              attributes: {
+                [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.react_router.client_middleware',
+                [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.react_router.instrumentation_api',
+              },
+            },
+            async span => {
+              const result = await callMiddleware();
+              if (result.status === 'error' && result.error instanceof Error) {
+                span.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
+                captureInstrumentationError(result, captureErrors, 'react_router.client_middleware', {
+                  'http.url': urlPath,
+                });
+              }
+            },
+          );
+        },
+
+        async lazy(callLazy) {
+          await startSpan(
+            {
+              name: 'Lazy Route Load',
+              attributes: {
+                [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.react_router.client_lazy',
+                [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.react_router.instrumentation_api',
+              },
+            },
+            async span => {
+              const result = await callLazy();
+              if (result.status === 'error' && result.error instanceof Error) {
+                span.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
+                captureInstrumentationError(result, captureErrors, 'react_router.client_lazy', {});
+              }
+            },
+          );
+        },
+      });
+    },
+  };
+}
+
+/**
+ * Check if React Router's instrumentation API is being used on the client.
+ * @experimental
+ */
+function isClientInstrumentationApiUsed() {
+  return !!GLOBAL_WITH_FLAGS[SENTRY_CLIENT_INSTRUMENTATION_FLAG];
+}
+
+/**
+ * Check if React Router's instrumentation API's navigate hook was invoked.
+ * @experimental
+ */
+function isNavigateHookInvoked() {
+  return !!GLOBAL_WITH_FLAGS[SENTRY_NAVIGATE_HOOK_INVOKED_FLAG];
+}
+
+export { createSentryClientInstrumentation, isClientInstrumentationApiUsed, isNavigateHookInvoked };
+//# sourceMappingURL=createClientInstrumentation.js.map

package/build/esm/client/createClientInstrumentation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"createClientInstrumentation.js","sources":["../../../src/client/createClientInstrumentation.ts"],"sourcesContent":["import { startBrowserTracingNavigationSpan } from '@sentry/browser';\nimport type { Span } from '@sentry/core';\nimport {\n  debug,\n  getClient,\n  GLOBAL_OBJ,\n  SEMANTIC_ATTRIBUTE_SENTRY_OP,\n  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,\n  SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,\n  SPAN_STATUS_ERROR,\n  startSpan,\n} from '@sentry/core';\nimport { DEBUG_BUILD } from '../common/debug-build';\nimport type { ClientInstrumentation, InstrumentableRoute, InstrumentableRouter } from '../common/types';\nimport { captureInstrumentationError, getPathFromRequest, getPattern, normalizeRoutePath } from '../common/utils';\n\nconst WINDOW = GLOBAL_OBJ as typeof GLOBAL_OBJ & Window;\n\n// Tracks active numeric navigation span to prevent duplicate spans when popstate fires\nlet currentNumericNavigationSpan: Span | undefined;\n\nconst SENTRY_CLIENT_INSTRUMENTATION_FLAG = '__sentryReactRouterClientInstrumentationUsed';\n// Intentionally never reset - once set, instrumentation API handles all navigations for the session.\nconst SENTRY_NAVIGATE_HOOK_INVOKED_FLAG = '__sentryReactRouterNavigateHookInvoked';\nconst SENTRY_POPSTATE_LISTENER_ADDED_FLAG = '__sentryReactRouterPopstateListenerAdded';\n\ntype GlobalObjWithFlags = typeof GLOBAL_OBJ & {\n  [SENTRY_CLIENT_INSTRUMENTATION_FLAG]?: boolean;\n  [SENTRY_NAVIGATE_HOOK_INVOKED_FLAG]?: boolean;\n  [SENTRY_POPSTATE_LISTENER_ADDED_FLAG]?: boolean;\n};\n\nconst GLOBAL_WITH_FLAGS = GLOBAL_OBJ as GlobalObjWithFlags;\n\n/**\n * Options for creating Sentry client instrumentation.\n */\nexport interface CreateSentryClientInstrumentationOptions {\n  /**\n   * Whether to capture errors from loaders/actions automatically.\n   * Set to `false` to avoid duplicates if using custom error handlers.\n   * @default true\n   */\n  captureErrors?: boolean;\n}\n\n/**\n * Creates a Sentry client instrumentation for React Router's instrumentation API.\n * @experimental\n */\nexport function createSentryClientInstrumentation(\n  options: CreateSentryClientInstrumentationOptions = {},\n): ClientInstrumentation {\n  const { captureErrors = true } = options;\n\n  DEBUG_BUILD && debug.log('React Router client instrumentation API created.');\n\n  return {\n    router(router: InstrumentableRouter) {\n      // Set the flag when React Router actually invokes our instrumentation.\n      // This ensures the flag is only set in Library Mode (where hooks run),\n      // not in Framework Mode (where hooks are never called).\n      // See: https://github.com/remix-run/react-router/discussions/13749\n      GLOBAL_WITH_FLAGS[SENTRY_CLIENT_INSTRUMENTATION_FLAG] = true;\n      DEBUG_BUILD && debug.log('React Router client instrumentation API router hook registered.');\n\n      // Add popstate listener for browser back/forward navigation (persists for session, one listener only)\n      if (!GLOBAL_WITH_FLAGS[SENTRY_POPSTATE_LISTENER_ADDED_FLAG] && WINDOW.addEventListener) {\n        GLOBAL_WITH_FLAGS[SENTRY_POPSTATE_LISTENER_ADDED_FLAG] = true;\n\n        WINDOW.addEventListener('popstate', () => {\n          const client = getClient();\n          if (!client) {\n            currentNumericNavigationSpan = undefined;\n            return;\n          }\n\n          const pathname = WINDOW.location?.pathname || '/';\n\n          // If there's an active numeric navigation span, update it instead of creating a duplicate\n          if (currentNumericNavigationSpan) {\n            if (currentNumericNavigationSpan.isRecording()) {\n              currentNumericNavigationSpan.updateName(pathname);\n            }\n            currentNumericNavigationSpan = undefined;\n            return;\n          }\n\n          // Only create a new span for actual browser back/forward button clicks\n          startBrowserTracingNavigationSpan(client, {\n            name: pathname,\n            attributes: {\n              [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',\n              [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation',\n              [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.react_router.instrumentation_api',\n              'navigation.type': 'browser.popstate',\n            },\n          });\n        });\n\n        DEBUG_BUILD && debug.log('React Router popstate listener registered for browser back/forward navigation.');\n      }\n\n      router.instrument({\n        async navigate(callNavigate, info) {\n          // navigate(0) triggers a page reload - skip span creation, but still capture errors\n          // (navigation can be rejected before reload, e.g., by a navigation guard)\n          if (info.to === 0) {\n            const result = await callNavigate();\n            if (result.status === 'error' && result.error instanceof Error) {\n              captureInstrumentationError(result, captureErrors, 'react_router.navigate', {\n                'http.url': info.currentUrl,\n              });\n            }\n            return;\n          }\n\n          GLOBAL_WITH_FLAGS[SENTRY_NAVIGATE_HOOK_INVOKED_FLAG] = true;\n\n          // Handle numeric navigations (navigate(-1), navigate(1), etc.)\n          if (typeof info.to === 'number') {\n            const client = getClient();\n            let navigationSpan;\n\n            if (client) {\n              const navigationType = info.to < 0 ? 'router.back' : 'router.forward';\n              const currentPathname = WINDOW.location?.pathname || info.currentUrl;\n\n              navigationSpan = startBrowserTracingNavigationSpan(client, {\n                name: currentPathname,\n                attributes: {\n                  [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',\n                  [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation',\n                  [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.react_router.instrumentation_api',\n                  'navigation.type': navigationType,\n                },\n              });\n\n              // Store ref so popstate listener can update it instead of creating a duplicate\n              currentNumericNavigationSpan = navigationSpan;\n            }\n\n            try {\n              const result = await callNavigate();\n\n              if (navigationSpan && WINDOW.location) {\n                navigationSpan.updateName(WINDOW.location.pathname);\n              }\n\n              if (result.status === 'error' && result.error instanceof Error) {\n                if (navigationSpan) {\n                  navigationSpan.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });\n                }\n                captureInstrumentationError(result, captureErrors, 'react_router.navigate', {\n                  'http.url': WINDOW.location?.pathname || info.currentUrl,\n                });\n              }\n            } finally {\n              currentNumericNavigationSpan = undefined;\n            }\n            return;\n          }\n\n          // Handle string navigations (e.g., navigate('/about'))\n          const client = getClient();\n          const toPath = String(info.to);\n          let navigationSpan;\n\n          if (client) {\n            navigationSpan = startBrowserTracingNavigationSpan(client, {\n              name: toPath,\n              attributes: {\n                [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',\n                [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation',\n                [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.react_router.instrumentation_api',\n                'navigation.type': 'router.navigate',\n              },\n            });\n          }\n\n          const result = await callNavigate();\n          if (result.status === 'error' && result.error instanceof Error) {\n            if (navigationSpan) {\n              navigationSpan.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });\n            }\n            captureInstrumentationError(result, captureErrors, 'react_router.navigate', {\n              'http.url': toPath,\n            });\n          }\n          return;\n        },\n\n        async fetch(callFetch, info) {\n          await startSpan(\n            {\n              name: `Fetcher ${info.fetcherKey}`,\n              attributes: {\n                [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.react_router.fetcher',\n                [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.react_router.instrumentation_api',\n              },\n            },\n            async span => {\n              const result = await callFetch();\n              if (result.status === 'error' && result.error instanceof Error) {\n                span.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });\n                captureInstrumentationError(result, captureErrors, 'react_router.fetcher', {\n                  'http.url': info.href,\n                });\n              }\n            },\n          );\n        },\n      });\n    },\n\n    route(route: InstrumentableRoute) {\n      route.instrument({\n        async loader(callLoader, info) {\n          const urlPath = getPathFromRequest(info.request);\n          const routePattern = normalizeRoutePath(getPattern(info)) || urlPath;\n\n          await startSpan(\n            {\n              name: routePattern,\n              attributes: {\n                [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.react_router.client_loader',\n                [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.react_router.instrumentation_api',\n              },\n            },\n            async span => {\n              const result = await callLoader();\n              if (result.status === 'error' && result.error instanceof Error) {\n                span.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });\n                captureInstrumentationError(result, captureErrors, 'react_router.client_loader', {\n                  'http.url': urlPath,\n                });\n              }\n            },\n          );\n        },\n\n        async action(callAction, info) {\n          const urlPath = getPathFromRequest(info.request);\n          const routePattern = normalizeRoutePath(getPattern(info)) || urlPath;\n\n          await startSpan(\n            {\n              name: routePattern,\n              attributes: {\n                [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.react_router.client_action',\n                [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.react_router.instrumentation_api',\n              },\n            },\n            async span => {\n              const result = await callAction();\n              if (result.status === 'error' && result.error instanceof Error) {\n                span.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });\n                captureInstrumentationError(result, captureErrors, 'react_router.client_action', {\n                  'http.url': urlPath,\n                });\n              }\n            },\n          );\n        },\n\n        async middleware(callMiddleware, info) {\n          const urlPath = getPathFromRequest(info.request);\n          const routePattern = normalizeRoutePath(getPattern(info)) || urlPath;\n\n          await startSpan(\n            {\n              name: routePattern,\n              attributes: {\n                [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.react_router.client_middleware',\n                [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.react_router.instrumentation_api',\n              },\n            },\n            async span => {\n              const result = await callMiddleware();\n              if (result.status === 'error' && result.error instanceof Error) {\n                span.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });\n                captureInstrumentationError(result, captureErrors, 'react_router.client_middleware', {\n                  'http.url': urlPath,\n                });\n              }\n            },\n          );\n        },\n\n        async lazy(callLazy) {\n          await startSpan(\n            {\n              name: 'Lazy Route Load',\n              attributes: {\n                [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.react_router.client_lazy',\n                [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.react_router.instrumentation_api',\n              },\n            },\n            async span => {\n              const result = await callLazy();\n              if (result.status === 'error' && result.error instanceof Error) {\n                span.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });\n                captureInstrumentationError(result, captureErrors, 'react_router.client_lazy', {});\n              }\n            },\n          );\n        },\n      });\n    },\n  };\n}\n\n/**\n * Check if React Router's instrumentation API is being used on the client.\n * @experimental\n */\nexport function isClientInstrumentationApiUsed(): boolean {\n  return !!GLOBAL_WITH_FLAGS[SENTRY_CLIENT_INSTRUMENTATION_FLAG];\n}\n\n/**\n * Check if React Router's instrumentation API's navigate hook was invoked.\n * @experimental\n */\nexport function isNavigateHookInvoked(): boolean {\n  return !!GLOBAL_WITH_FLAGS[SENTRY_NAVIGATE_HOOK_INVOKED_FLAG];\n}\n"],"names":[],"mappings":"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"}

package/build/esm/client/hydratedRouter.js

@@ -1,6 +1,7 @@
 import { startBrowserTracingNavigationSpan } from '@sentry/browser';
-import { GLOBAL_OBJ, spanToJSON, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, consoleSandbox, getActiveSpan, getRootSpan, getClient, SEMANTIC_ATTRIBUTE_SENTRY_OP } from '@sentry/core';
+import { GLOBAL_OBJ, spanToJSON, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, debug, getActiveSpan, getRootSpan, getClient, SEMANTIC_ATTRIBUTE_SENTRY_OP } from '@sentry/core';
 import { DEBUG_BUILD } from '../common/debug-build.js';
+import { isClientInstrumentationApiUsed } from './createClientInstrumentation.js';
 
 const GLOBAL_OBJ_WITH_DATA_ROUTER = GLOBAL_OBJ
 
@@ -22,7 +23,6 @@ function instrumentHydratedRouter() {
 
     if (router) {
       // The first time we hit the router, we try to update the pageload transaction
-      // todo: update pageload tx here
       const pageloadSpan = getActiveRootSpan();
 
       if (pageloadSpan) {
@@ -39,18 +39,18 @@ function instrumentHydratedRouter() {
             [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.react_router',
           });
         }
+      }
 
-        // Patching navigate for creating accurate navigation transactions
-        if (typeof router.navigate === 'function') {
-          const originalNav = router.navigate.bind(router);
-          router.navigate = function sentryPatchedNavigate(...args) {
-            maybeCreateNavigationTransaction(
-              String(args[0]) || '<unknown route>', // will be updated anyway
-              'url', // this also will be updated once we have the parameterized route
-            );
-            return originalNav(...args);
-          };
-        }
+      // Patching navigate for creating accurate navigation transactions
+      if (typeof router.navigate === 'function') {
+        const originalNav = router.navigate.bind(router);
+        router.navigate = function sentryPatchedNavigate(...args) {
+          // Skip if instrumentation API is enabled (it handles navigation spans itself)
+          if (!isClientInstrumentationApiUsed()) {
+            maybeCreateNavigationTransaction(String(args[0]) || '<unknown route>', 'url');
+          }
+          return originalNav(...args);
+        };
       }
 
       // Subscribe to router state changes to update navigation transactions with parameterized routes
@@ -67,7 +67,8 @@ function instrumentHydratedRouter() {
         if (
           navigationSpanName &&
           newState.navigation.state === 'idle' && // navigation has completed
-          normalizePathname(newState.location.pathname) === normalizePathname(navigationSpanName) // this event is for the currently active navigation
+          // this event is for the currently active navigation
+          normalizePathname(newState.location.pathname) === normalizePathname(navigationSpanName)
         ) {
           navigationSpan.updateName(parameterizedNavRoute);
           navigationSpan.setAttributes({
@@ -88,11 +89,7 @@ function instrumentHydratedRouter() {
     const interval = setInterval(() => {
       if (trySubscribe() || retryCount >= MAX_RETRIES) {
         if (retryCount >= MAX_RETRIES) {
-          DEBUG_BUILD &&
-            consoleSandbox(() => {
-              // eslint-disable-next-line no-console
-              console.warn('Unable to instrument React Router: router not found after hydration.');
-            });
+          DEBUG_BUILD && debug.warn('Unable to instrument React Router: router not found after hydration.');
         }
         clearInterval(interval);
       }

package/build/esm/client/hydratedRouter.js.map

@@ -1 +1 @@
-{"version":3,"file":"hydratedRouter.js","sources":["../../../src/client/hydratedRouter.ts"],"sourcesContent":["import { startBrowserTracingNavigationSpan } from '@sentry/browser';\nimport type { Span } from '@sentry/core';\nimport {\n  consoleSandbox,\n  getActiveSpan,\n  getClient,\n  getRootSpan,\n  GLOBAL_OBJ,\n  SEMANTIC_ATTRIBUTE_SENTRY_OP,\n  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,\n  SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,\n  spanToJSON,\n} from '@sentry/core';\nimport type { DataRouter, RouterState } from 'react-router';\nimport { DEBUG_BUILD } from '../common/debug-build';\n\nconst GLOBAL_OBJ_WITH_DATA_ROUTER = GLOBAL_OBJ as typeof GLOBAL_OBJ & {\n  __reactRouterDataRouter?: DataRouter;\n};\n\nconst MAX_RETRIES = 40; // 2 seconds at 50ms interval\n\n/**\n * Instruments the React Router Data Router for pageloads and navigation.\n *\n * This function waits for the router to be available after hydration, then:\n * 1. Updates the pageload transaction with parameterized route info\n * 2. Patches router.navigate() to create navigation transactions\n * 3. Subscribes to router state changes to update navigation transactions with parameterized routes\n */\nexport function instrumentHydratedRouter(): void {\n  function trySubscribe(): boolean {\n    const router = GLOBAL_OBJ_WITH_DATA_ROUTER.__reactRouterDataRouter;\n\n    if (router) {\n      // The first time we hit the router, we try to update the pageload transaction\n      // todo: update pageload tx here\n      const pageloadSpan = getActiveRootSpan();\n\n      if (pageloadSpan) {\n        const pageloadName = spanToJSON(pageloadSpan).description;\n        const parameterizePageloadRoute = getParameterizedRoute(router.state);\n        if (\n          pageloadName &&\n          // this event is for the currently active pageload\n          normalizePathname(router.state.location.pathname) === normalizePathname(pageloadName)\n        ) {\n          pageloadSpan.updateName(parameterizePageloadRoute);\n          pageloadSpan.setAttributes({\n            [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',\n            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.react_router',\n          });\n        }\n\n        // Patching navigate for creating accurate navigation transactions\n        if (typeof router.navigate === 'function') {\n          const originalNav = router.navigate.bind(router);\n          router.navigate = function sentryPatchedNavigate(...args) {\n            maybeCreateNavigationTransaction(\n              String(args[0]) || '<unknown route>', // will be updated anyway\n              'url', // this also will be updated once we have the parameterized route\n            );\n            return originalNav(...args);\n          };\n        }\n      }\n\n      // Subscribe to router state changes to update navigation transactions with parameterized routes\n      router.subscribe(newState => {\n        const navigationSpan = getActiveRootSpan();\n\n        if (!navigationSpan) {\n          return;\n        }\n\n        const navigationSpanName = spanToJSON(navigationSpan).description;\n        const parameterizedNavRoute = getParameterizedRoute(newState);\n\n        if (\n          navigationSpanName &&\n          newState.navigation.state === 'idle' && // navigation has completed\n          normalizePathname(newState.location.pathname) === normalizePathname(navigationSpanName) // this event is for the currently active navigation\n        ) {\n          navigationSpan.updateName(parameterizedNavRoute);\n          navigationSpan.setAttributes({\n            [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',\n            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.react_router',\n          });\n        }\n      });\n      return true;\n    }\n    return false;\n  }\n\n  // Wait until the router is available (since the SDK loads before hydration)\n  if (!trySubscribe()) {\n    let retryCount = 0;\n    // Retry until the router is available or max retries reached\n    const interval = setInterval(() => {\n      if (trySubscribe() || retryCount >= MAX_RETRIES) {\n        if (retryCount >= MAX_RETRIES) {\n          DEBUG_BUILD &&\n            consoleSandbox(() => {\n              // eslint-disable-next-line no-console\n              console.warn('Unable to instrument React Router: router not found after hydration.');\n            });\n        }\n        clearInterval(interval);\n      }\n      retryCount++;\n    }, 50);\n  }\n}\n\nfunction maybeCreateNavigationTransaction(name: string, source: 'url' | 'route'): Span | undefined {\n  const client = getClient();\n\n  if (!client) {\n    return undefined;\n  }\n\n  return startBrowserTracingNavigationSpan(client, {\n    name,\n    attributes: {\n      [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: source,\n      [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation',\n      [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.react_router',\n    },\n  });\n}\n\nfunction getActiveRootSpan(): Span | undefined {\n  const activeSpan = getActiveSpan();\n  if (!activeSpan) {\n    return undefined;\n  }\n\n  const rootSpan = getRootSpan(activeSpan);\n\n  const op = spanToJSON(rootSpan).op;\n\n  // Only use this root span if it is a pageload or navigation span\n  return op === 'navigation' || op === 'pageload' ? rootSpan : undefined;\n}\n\nfunction getParameterizedRoute(routerState: RouterState): string {\n  const lastMatch = routerState.matches[routerState.matches.length - 1];\n  return normalizePathname(lastMatch?.route.path ?? routerState.location.pathname);\n}\n\nfunction normalizePathname(pathname: string): string {\n  // Ensure it starts with a single slash\n  let normalized = pathname.startsWith('/') ? pathname : `/${pathname}`;\n  // Remove trailing slash unless it's the root\n  if (normalized.length > 1 && normalized.endsWith('/')) {\n    normalized = normalized.slice(0, -1);\n  }\n  return normalized;\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"hydratedRouter.js","sources":["../../../src/client/hydratedRouter.ts"],"sourcesContent":["import { startBrowserTracingNavigationSpan } from '@sentry/browser';\nimport type { Span } from '@sentry/core';\nimport {\n  debug,\n  getActiveSpan,\n  getClient,\n  getRootSpan,\n  GLOBAL_OBJ,\n  SEMANTIC_ATTRIBUTE_SENTRY_OP,\n  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,\n  SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,\n  spanToJSON,\n} from '@sentry/core';\nimport type { DataRouter, RouterState } from 'react-router';\nimport { DEBUG_BUILD } from '../common/debug-build';\nimport { isClientInstrumentationApiUsed } from './createClientInstrumentation';\n\nconst GLOBAL_OBJ_WITH_DATA_ROUTER = GLOBAL_OBJ as typeof GLOBAL_OBJ & {\n  __reactRouterDataRouter?: DataRouter;\n};\n\nconst MAX_RETRIES = 40; // 2 seconds at 50ms interval\n\n/**\n * Instruments the React Router Data Router for pageloads and navigation.\n *\n * This function waits for the router to be available after hydration, then:\n * 1. Updates the pageload transaction with parameterized route info\n * 2. Patches router.navigate() to create navigation transactions\n * 3. Subscribes to router state changes to update navigation transactions with parameterized routes\n */\nexport function instrumentHydratedRouter(): void {\n  function trySubscribe(): boolean {\n    const router = GLOBAL_OBJ_WITH_DATA_ROUTER.__reactRouterDataRouter;\n\n    if (router) {\n      // The first time we hit the router, we try to update the pageload transaction\n      const pageloadSpan = getActiveRootSpan();\n\n      if (pageloadSpan) {\n        const pageloadName = spanToJSON(pageloadSpan).description;\n        const parameterizePageloadRoute = getParameterizedRoute(router.state);\n        if (\n          pageloadName &&\n          // this event is for the currently active pageload\n          normalizePathname(router.state.location.pathname) === normalizePathname(pageloadName)\n        ) {\n          pageloadSpan.updateName(parameterizePageloadRoute);\n          pageloadSpan.setAttributes({\n            [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',\n            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.pageload.react_router',\n          });\n        }\n      }\n\n      // Patching navigate for creating accurate navigation transactions\n      if (typeof router.navigate === 'function') {\n        const originalNav = router.navigate.bind(router);\n        router.navigate = function sentryPatchedNavigate(...args) {\n          // Skip if instrumentation API is enabled (it handles navigation spans itself)\n          if (!isClientInstrumentationApiUsed()) {\n            maybeCreateNavigationTransaction(String(args[0]) || '<unknown route>', 'url');\n          }\n          return originalNav(...args);\n        };\n      }\n\n      // Subscribe to router state changes to update navigation transactions with parameterized routes\n      router.subscribe(newState => {\n        const navigationSpan = getActiveRootSpan();\n\n        if (!navigationSpan) {\n          return;\n        }\n\n        const navigationSpanName = spanToJSON(navigationSpan).description;\n        const parameterizedNavRoute = getParameterizedRoute(newState);\n\n        if (\n          navigationSpanName &&\n          newState.navigation.state === 'idle' && // navigation has completed\n          // this event is for the currently active navigation\n          normalizePathname(newState.location.pathname) === normalizePathname(navigationSpanName)\n        ) {\n          navigationSpan.updateName(parameterizedNavRoute);\n          navigationSpan.setAttributes({\n            [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',\n            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.react_router',\n          });\n        }\n      });\n      return true;\n    }\n    return false;\n  }\n\n  // Wait until the router is available (since the SDK loads before hydration)\n  if (!trySubscribe()) {\n    let retryCount = 0;\n    // Retry until the router is available or max retries reached\n    const interval = setInterval(() => {\n      if (trySubscribe() || retryCount >= MAX_RETRIES) {\n        if (retryCount >= MAX_RETRIES) {\n          DEBUG_BUILD && debug.warn('Unable to instrument React Router: router not found after hydration.');\n        }\n        clearInterval(interval);\n      }\n      retryCount++;\n    }, 50);\n  }\n}\n\nfunction maybeCreateNavigationTransaction(name: string, source: 'url' | 'route'): Span | undefined {\n  const client = getClient();\n\n  if (!client) {\n    return undefined;\n  }\n\n  return startBrowserTracingNavigationSpan(client, {\n    name,\n    attributes: {\n      [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: source,\n      [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'navigation',\n      [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.navigation.react_router',\n    },\n  });\n}\n\nfunction getActiveRootSpan(): Span | undefined {\n  const activeSpan = getActiveSpan();\n  if (!activeSpan) {\n    return undefined;\n  }\n\n  const rootSpan = getRootSpan(activeSpan);\n\n  const op = spanToJSON(rootSpan).op;\n\n  // Only use this root span if it is a pageload or navigation span\n  return op === 'navigation' || op === 'pageload' ? rootSpan : undefined;\n}\n\nfunction getParameterizedRoute(routerState: RouterState): string {\n  const lastMatch = routerState.matches[routerState.matches.length - 1];\n  return normalizePathname(lastMatch?.route.path ?? routerState.location.pathname);\n}\n\nfunction normalizePathname(pathname: string): string {\n  // Ensure it starts with a single slash\n  let normalized = pathname.startsWith('/') ? pathname : `/${pathname}`;\n  // Remove trailing slash unless it's the root\n  if (normalized.length > 1 && normalized.endsWith('/')) {\n    normalized = normalized.slice(0, -1);\n  }\n  return normalized;\n}\n"],"names":[],"mappings":"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"}