@sentry/react-router 10.36.0 → 10.38.0

package/build/esm/client/tracingIntegration.js

@@ -1,16 +1,36 @@
 import { browserTracingIntegration } from '@sentry/browser';
+import { createSentryClientInstrumentation } from './createClientInstrumentation.js';
 import { instrumentHydratedRouter } from './hydratedRouter.js';
 
+/**
+ * Options for the React Router tracing integration.
+ */
+
 /**
  * Browser tracing integration for React Router (Framework) applications.
- * This integration will create navigation spans and enhance transactions names with parameterized routes.
+ * This integration will create navigation spans and enhance transaction names with parameterized routes.
  */
-function reactRouterTracingIntegration() {
+function reactRouterTracingIntegration(
+  options = {},
+) {
   const browserTracingIntegrationInstance = browserTracingIntegration({
     // Navigation transactions are started within the hydrated router instrumentation
     instrumentNavigation: false,
   });
 
+  let clientInstrumentationInstance;
+
+  if (options.useInstrumentationAPI || options.instrumentationOptions) {
+    clientInstrumentationInstance = createSentryClientInstrumentation(options.instrumentationOptions);
+  }
+
+  const getClientInstrumentation = () => {
+    if (!clientInstrumentationInstance) {
+      clientInstrumentationInstance = createSentryClientInstrumentation(options.instrumentationOptions);
+    }
+    return clientInstrumentationInstance;
+  };
+
   return {
     ...browserTracingIntegrationInstance,
     name: 'ReactRouterTracingIntegration',
@@ -18,6 +38,9 @@ function reactRouterTracingIntegration() {
       browserTracingIntegrationInstance.afterAllSetup(client);
       instrumentHydratedRouter();
     },
+    get clientInstrumentation() {
+      return getClientInstrumentation();
+    },
   };
 }
 

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

@@ -1 +1 @@
-{"version":3,"file":"tracingIntegration.js","sources":["../../../src/client/tracingIntegration.ts"],"sourcesContent":["import { browserTracingIntegration as originalBrowserTracingIntegration } from '@sentry/browser';\nimport type { Integration } from '@sentry/core';\nimport { instrumentHydratedRouter } from './hydratedRouter';\n\n/**\n * Browser tracing integration for React Router (Framework) applications.\n * This integration will create navigation spans and enhance transactions names with parameterized routes.\n */\nexport function reactRouterTracingIntegration(): Integration {\n  const browserTracingIntegrationInstance = originalBrowserTracingIntegration({\n    // Navigation transactions are started within the hydrated router instrumentation\n    instrumentNavigation: false,\n  });\n\n  return {\n    ...browserTracingIntegrationInstance,\n    name: 'ReactRouterTracingIntegration',\n    afterAllSetup(client) {\n      browserTracingIntegrationInstance.afterAllSetup(client);\n      instrumentHydratedRouter();\n    },\n  };\n}\n"],"names":["originalBrowserTracingIntegration"],"mappings":";;;AAIA;AACA;AACA;AACA;AACO,SAAS,6BAA6B,GAAgB;AAC7D,EAAE,MAAM,iCAAA,GAAoCA,yBAAiC,CAAC;AAC9E;AACA,IAAI,oBAAoB,EAAE,KAAK;AAC/B,GAAG,CAAC;;AAEJ,EAAE,OAAO;AACT,IAAI,GAAG,iCAAiC;AACxC,IAAI,IAAI,EAAE,+BAA+B;AACzC,IAAI,aAAa,CAAC,MAAM,EAAE;AAC1B,MAAM,iCAAiC,CAAC,aAAa,CAAC,MAAM,CAAC;AAC7D,MAAM,wBAAwB,EAAE;AAChC,IAAI,CAAC;AACL,GAAG;AACH;;;;"}
+{"version":3,"file":"tracingIntegration.js","sources":["../../../src/client/tracingIntegration.ts"],"sourcesContent":["import { browserTracingIntegration as originalBrowserTracingIntegration } from '@sentry/browser';\nimport type { Integration } from '@sentry/core';\nimport type { ClientInstrumentation } from '../common/types';\nimport {\n  createSentryClientInstrumentation,\n  type CreateSentryClientInstrumentationOptions,\n} from './createClientInstrumentation';\nimport { instrumentHydratedRouter } from './hydratedRouter';\n\n/**\n * Options for the React Router tracing integration.\n */\nexport interface ReactRouterTracingIntegrationOptions {\n  /**\n   * Options for React Router's instrumentation API.\n   * @experimental\n   */\n  instrumentationOptions?: CreateSentryClientInstrumentationOptions;\n\n  /**\n   * Enable React Router's instrumentation API.\n   * When true, prepares for use with HydratedRouter's `unstable_instrumentations` prop.\n   * @experimental\n   * @default false\n   */\n  useInstrumentationAPI?: boolean;\n}\n\n/**\n * React Router tracing integration with support for the instrumentation API.\n */\nexport interface ReactRouterTracingIntegration extends Integration {\n  /**\n   * Client instrumentation for React Router's instrumentation API.\n   * Lazily initialized on first access.\n   * @experimental HydratedRouter doesn't invoke these hooks in Framework Mode yet.\n   */\n  readonly clientInstrumentation: ClientInstrumentation;\n}\n\n/**\n * Browser tracing integration for React Router (Framework) applications.\n * This integration will create navigation spans and enhance transaction names with parameterized routes.\n */\nexport function reactRouterTracingIntegration(\n  options: ReactRouterTracingIntegrationOptions = {},\n): ReactRouterTracingIntegration {\n  const browserTracingIntegrationInstance = originalBrowserTracingIntegration({\n    // Navigation transactions are started within the hydrated router instrumentation\n    instrumentNavigation: false,\n  });\n\n  let clientInstrumentationInstance: ClientInstrumentation | undefined;\n\n  if (options.useInstrumentationAPI || options.instrumentationOptions) {\n    clientInstrumentationInstance = createSentryClientInstrumentation(options.instrumentationOptions);\n  }\n\n  const getClientInstrumentation = (): ClientInstrumentation => {\n    if (!clientInstrumentationInstance) {\n      clientInstrumentationInstance = createSentryClientInstrumentation(options.instrumentationOptions);\n    }\n    return clientInstrumentationInstance;\n  };\n\n  return {\n    ...browserTracingIntegrationInstance,\n    name: 'ReactRouterTracingIntegration',\n    afterAllSetup(client) {\n      browserTracingIntegrationInstance.afterAllSetup(client);\n      instrumentHydratedRouter();\n    },\n    get clientInstrumentation(): ClientInstrumentation {\n      return getClientInstrumentation();\n    },\n  };\n}\n"],"names":["originalBrowserTracingIntegration"],"mappings":";;;;AASA;AACA;AACA;;AA6BA;AACA;AACA;AACA;AACO,SAAS,6BAA6B;AAC7C,EAAE,OAAO,GAAyC,EAAE;AACpD,EAAiC;AACjC,EAAE,MAAM,iCAAA,GAAoCA,yBAAiC,CAAC;AAC9E;AACA,IAAI,oBAAoB,EAAE,KAAK;AAC/B,GAAG,CAAC;;AAEJ,EAAE,IAAI,6BAA6B;;AAEnC,EAAE,IAAI,OAAO,CAAC,yBAAyB,OAAO,CAAC,sBAAsB,EAAE;AACvE,IAAI,gCAAgC,iCAAiC,CAAC,OAAO,CAAC,sBAAsB,CAAC;AACrG,EAAE;;AAEF,EAAE,MAAM,wBAAA,GAA2B,MAA6B;AAChE,IAAI,IAAI,CAAC,6BAA6B,EAAE;AACxC,MAAM,gCAAgC,iCAAiC,CAAC,OAAO,CAAC,sBAAsB,CAAC;AACvG,IAAI;AACJ,IAAI,OAAO,6BAA6B;AACxC,EAAE,CAAC;;AAEH,EAAE,OAAO;AACT,IAAI,GAAG,iCAAiC;AACxC,IAAI,IAAI,EAAE,+BAA+B;AACzC,IAAI,aAAa,CAAC,MAAM,EAAE;AAC1B,MAAM,iCAAiC,CAAC,aAAa,CAAC,MAAM,CAAC;AAC7D,MAAM,wBAAwB,EAAE;AAChC,IAAI,CAAC;AACL,IAAI,IAAI,qBAAqB,GAA0B;AACvD,MAAM,OAAO,wBAAwB,EAAE;AACvC,IAAI,CAAC;AACL,GAAG;AACH;;;;"}

package/build/esm/cloudflare/index.js

@@ -3,6 +3,7 @@ export * from '@sentry/browser';
 export { init } from '../client/sdk.js';
 export { reactRouterTracingIntegration } from '../client/tracingIntegration.js';
 export { ErrorBoundary, Profiler, captureReactException, reactErrorHandler, useProfiler, withErrorBoundary, withProfiler } from '@sentry/react';
+export { createSentryClientInstrumentation, isClientInstrumentationApiUsed, isNavigateHookInvoked } from '../client/createClientInstrumentation.js';
 export { wrapSentryHandleRequest } from '../server/wrapSentryHandleRequest.js';
 
 /**

package/build/esm/cloudflare/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../../src/cloudflare/index.ts"],"sourcesContent":["import { getTraceMetaTags } from '@sentry/core';\n\nexport * from '../client';\n\nexport { wrapSentryHandleRequest } from '../server/wrapSentryHandleRequest';\n\n/**\n * Injects Sentry trace meta tags into the HTML response by transforming the ReadableStream.\n * This enables distributed tracing by adding trace context to the HTML document head.\n * @param body - ReadableStream containing the HTML response body to modify\n * @returns A new ReadableStream with Sentry trace meta tags injected into the head section\n */\nexport function injectTraceMetaTags(body: ReadableStream): ReadableStream {\n  const headClosingTag = '</head>';\n\n  const reader = body.getReader();\n  const stream = new ReadableStream({\n    async pull(controller) {\n      const { done, value } = await reader.read();\n\n      if (done) {\n        controller.close();\n        return;\n      }\n\n      const encoder = new TextEncoder();\n      const html = value instanceof Uint8Array ? new TextDecoder().decode(value) : String(value);\n\n      if (html.includes(headClosingTag)) {\n        const modifiedHtml = html.replace(headClosingTag, `${getTraceMetaTags()}${headClosingTag}`);\n\n        controller.enqueue(encoder.encode(modifiedHtml));\n        return;\n      }\n\n      controller.enqueue(encoder.encode(html));\n    },\n  });\n\n  return stream;\n}\n"],"names":[],"mappings":";;;;;;;AAMA;AACA;AACA;AACA;AACA;AACA;AACO,SAAS,mBAAmB,CAAC,IAAI,EAAkC;AAC1E,EAAE,MAAM,cAAA,GAAiB,SAAS;;AAElC,EAAE,MAAM,MAAA,GAAS,IAAI,CAAC,SAAS,EAAE;AACjC,EAAE,MAAM,MAAA,GAAS,IAAI,cAAc,CAAC;AACpC,IAAI,MAAM,IAAI,CAAC,UAAU,EAAE;AAC3B,MAAM,MAAM,EAAE,IAAI,EAAE,KAAA,EAAM,GAAI,MAAM,MAAM,CAAC,IAAI,EAAE;;AAEjD,MAAM,IAAI,IAAI,EAAE;AAChB,QAAQ,UAAU,CAAC,KAAK,EAAE;AAC1B,QAAQ;AACR,MAAM;;AAEN,MAAM,MAAM,OAAA,GAAU,IAAI,WAAW,EAAE;AACvC,MAAM,MAAM,OAAO,KAAA,YAAiB,UAAA,GAAa,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,KAAK,CAAA,GAAI,MAAM,CAAC,KAAK,CAAC;;AAEhG,MAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE;AACzC,QAAQ,MAAM,YAAA,GAAe,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC,EAAA,gBAAA,EAAA,CAAA,EAAA,cAAA,CAAA,CAAA,CAAA;;AAEA,QAAA,UAAA,CAAA,OAAA,CAAA,OAAA,CAAA,MAAA,CAAA,YAAA,CAAA,CAAA;AACA,QAAA;AACA,MAAA;;AAEA,MAAA,UAAA,CAAA,OAAA,CAAA,OAAA,CAAA,MAAA,CAAA,IAAA,CAAA,CAAA;AACA,IAAA,CAAA;AACA,GAAA,CAAA;;AAEA,EAAA,OAAA,MAAA;AACA;;;;"}
+{"version":3,"file":"index.js","sources":["../../../src/cloudflare/index.ts"],"sourcesContent":["import { getTraceMetaTags } from '@sentry/core';\n\nexport * from '../client';\n\nexport { wrapSentryHandleRequest } from '../server/wrapSentryHandleRequest';\n\n/**\n * Injects Sentry trace meta tags into the HTML response by transforming the ReadableStream.\n * This enables distributed tracing by adding trace context to the HTML document head.\n * @param body - ReadableStream containing the HTML response body to modify\n * @returns A new ReadableStream with Sentry trace meta tags injected into the head section\n */\nexport function injectTraceMetaTags(body: ReadableStream): ReadableStream {\n  const headClosingTag = '</head>';\n\n  const reader = body.getReader();\n  const stream = new ReadableStream({\n    async pull(controller) {\n      const { done, value } = await reader.read();\n\n      if (done) {\n        controller.close();\n        return;\n      }\n\n      const encoder = new TextEncoder();\n      const html = value instanceof Uint8Array ? new TextDecoder().decode(value) : String(value);\n\n      if (html.includes(headClosingTag)) {\n        const modifiedHtml = html.replace(headClosingTag, `${getTraceMetaTags()}${headClosingTag}`);\n\n        controller.enqueue(encoder.encode(modifiedHtml));\n        return;\n      }\n\n      controller.enqueue(encoder.encode(html));\n    },\n  });\n\n  return stream;\n}\n"],"names":[],"mappings":";;;;;;;;AAMA;AACA;AACA;AACA;AACA;AACA;AACO,SAAS,mBAAmB,CAAC,IAAI,EAAkC;AAC1E,EAAE,MAAM,cAAA,GAAiB,SAAS;;AAElC,EAAE,MAAM,MAAA,GAAS,IAAI,CAAC,SAAS,EAAE;AACjC,EAAE,MAAM,MAAA,GAAS,IAAI,cAAc,CAAC;AACpC,IAAI,MAAM,IAAI,CAAC,UAAU,EAAE;AAC3B,MAAM,MAAM,EAAE,IAAI,EAAE,KAAA,EAAM,GAAI,MAAM,MAAM,CAAC,IAAI,EAAE;;AAEjD,MAAM,IAAI,IAAI,EAAE;AAChB,QAAQ,UAAU,CAAC,KAAK,EAAE;AAC1B,QAAQ;AACR,MAAM;;AAEN,MAAM,MAAM,OAAA,GAAU,IAAI,WAAW,EAAE;AACvC,MAAM,MAAM,OAAO,KAAA,YAAiB,UAAA,GAAa,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,KAAK,CAAA,GAAI,MAAM,CAAC,KAAK,CAAC;;AAEhG,MAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE;AACzC,QAAQ,MAAM,YAAA,GAAe,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC,EAAA,gBAAA,EAAA,CAAA,EAAA,cAAA,CAAA,CAAA,CAAA;;AAEA,QAAA,UAAA,CAAA,OAAA,CAAA,OAAA,CAAA,MAAA,CAAA,YAAA,CAAA,CAAA;AACA,QAAA;AACA,MAAA;;AAEA,MAAA,UAAA,CAAA,OAAA,CAAA,OAAA,CAAA,MAAA,CAAA,IAAA,CAAA,CAAA;AACA,IAAA,CAAA;AACA,GAAA,CAAA;;AAEA,EAAA,OAAA,MAAA;AACA;;;;"}

package/build/esm/common/utils.js

@@ -0,0 +1,63 @@
+import { captureException, debug } from '@sentry/core';
+import { DEBUG_BUILD } from './debug-build.js';
+
+/**
+ * Extracts pathname from request URL.
+ * Falls back to '<unknown>' with DEBUG warning if URL cannot be parsed.
+ */
+function getPathFromRequest(request) {
+  try {
+    return new URL(request.url).pathname;
+  } catch {
+    try {
+      // Fallback: use a dummy base URL since we only care about the pathname
+      return new URL(request.url, 'http://example.com').pathname;
+    } catch (error) {
+      DEBUG_BUILD && debug.warn('Failed to parse URL from request:', request.url, error);
+      return '<unknown>';
+    }
+  }
+}
+
+/**
+ * Extracts route pattern from instrumentation info.
+ * Prefers `pattern` (planned for v8) over `unstable_pattern` (v7.x).
+ */
+function getPattern(info) {
+  return info.pattern ?? info.unstable_pattern;
+}
+
+/**
+ * Normalizes route path by ensuring it starts with a slash.
+ * Returns undefined if the input is falsy.
+ */
+function normalizeRoutePath(pattern) {
+  if (!pattern) {
+    return undefined;
+  }
+  return pattern.startsWith('/') ? pattern : `/${pattern}`;
+}
+
+/**
+ * Captures an error from instrumentation result.
+ * Caller must verify result contains an Error before calling.
+ */
+function captureInstrumentationError(
+  result,
+  captureErrors,
+  mechanismType,
+  data,
+) {
+  if (captureErrors) {
+    captureException(result.error, {
+      mechanism: {
+        type: mechanismType,
+        handled: false,
+        data,
+      },
+    });
+  }
+}
+
+export { captureInstrumentationError, getPathFromRequest, getPattern, normalizeRoutePath };
+//# sourceMappingURL=utils.js.map

package/build/esm/common/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sources":["../../../src/common/utils.ts"],"sourcesContent":["import { captureException, debug } from '@sentry/core';\nimport { DEBUG_BUILD } from './debug-build';\nimport type { InstrumentationResult } from './types';\n\n/**\n * Extracts pathname from request URL.\n * Falls back to '<unknown>' with DEBUG warning if URL cannot be parsed.\n */\nexport function getPathFromRequest(request: { url: string }): string {\n  try {\n    return new URL(request.url).pathname;\n  } catch {\n    try {\n      // Fallback: use a dummy base URL since we only care about the pathname\n      return new URL(request.url, 'http://example.com').pathname;\n    } catch (error) {\n      DEBUG_BUILD && debug.warn('Failed to parse URL from request:', request.url, error);\n      return '<unknown>';\n    }\n  }\n}\n\n/**\n * Extracts route pattern from instrumentation info.\n * Prefers `pattern` (planned for v8) over `unstable_pattern` (v7.x).\n */\nexport function getPattern(info: { pattern?: string; unstable_pattern?: string }): string | undefined {\n  return info.pattern ?? info.unstable_pattern;\n}\n\n/**\n * Normalizes route path by ensuring it starts with a slash.\n * Returns undefined if the input is falsy.\n */\nexport function normalizeRoutePath(pattern?: string): string | undefined {\n  if (!pattern) {\n    return undefined;\n  }\n  return pattern.startsWith('/') ? pattern : `/${pattern}`;\n}\n\n/**\n * Captures an error from instrumentation result.\n * Caller must verify result contains an Error before calling.\n */\nexport function captureInstrumentationError(\n  result: InstrumentationResult,\n  captureErrors: boolean,\n  mechanismType: string,\n  data: Record<string, string | boolean>,\n): void {\n  if (captureErrors) {\n    captureException(result.error, {\n      mechanism: {\n        type: mechanismType,\n        handled: false,\n        data,\n      },\n    });\n  }\n}\n"],"names":[],"mappings":";;;AAIA;AACA;AACA;AACA;AACO,SAAS,kBAAkB,CAAC,OAAO,EAA2B;AACrE,EAAE,IAAI;AACN,IAAI,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,QAAQ;AACxC,EAAE,EAAE,MAAM;AACV,IAAI,IAAI;AACR;AACA,MAAM,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,oBAAoB,CAAC,CAAC,QAAQ;AAChE,IAAI,CAAA,CAAE,OAAO,KAAK,EAAE;AACpB,MAAM,WAAA,IAAe,KAAK,CAAC,IAAI,CAAC,mCAAmC,EAAE,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC;AACxF,MAAM,OAAO,WAAW;AACxB,IAAI;AACJ,EAAE;AACF;;AAEA;AACA;AACA;AACA;AACO,SAAS,UAAU,CAAC,IAAI,EAAuE;AACtG,EAAE,OAAO,IAAI,CAAC,WAAW,IAAI,CAAC,gBAAgB;AAC9C;;AAEA;AACA;AACA;AACA;AACO,SAAS,kBAAkB,CAAC,OAAO,EAA+B;AACzE,EAAE,IAAI,CAAC,OAAO,EAAE;AAChB,IAAI,OAAO,SAAS;AACpB,EAAE;AACF,EAAE,OAAO,OAAO,CAAC,UAAU,CAAC,GAAG,CAAA,GAAI,OAAA,GAAU,CAAC,CAAC,EAAE,OAAO,CAAC,CAAA;AACA;;AAEA;AACA;AACA;AACA;AACA,SAAA,2BAAA;AACA,EAAA,MAAA;AACA,EAAA,aAAA;AACA,EAAA,aAAA;AACA,EAAA,IAAA;AACA,EAAA;AACA,EAAA,IAAA,aAAA,EAAA;AACA,IAAA,gBAAA,CAAA,MAAA,CAAA,KAAA,EAAA;AACA,MAAA,SAAA,EAAA;AACA,QAAA,IAAA,EAAA,aAAA;AACA,QAAA,OAAA,EAAA,KAAA;AACA,QAAA,IAAA;AACA,OAAA;AACA,KAAA,CAAA;AACA,EAAA;AACA;;;;"}

package/build/esm/index.client.js

@@ -2,4 +2,5 @@ export * from '@sentry/browser';
 export { init } from './client/sdk.js';
 export { reactRouterTracingIntegration } from './client/tracingIntegration.js';
 export { ErrorBoundary, Profiler, captureReactException, reactErrorHandler, useProfiler, withErrorBoundary, withProfiler } from '@sentry/react';
+export { createSentryClientInstrumentation, isClientInstrumentationApiUsed, isNavigateHookInvoked } from './client/createClientInstrumentation.js';
 //# sourceMappingURL=index.client.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.client.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;"}
+{"version":3,"file":"index.client.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;"}

package/build/esm/index.server.js

@@ -6,7 +6,9 @@ export { wrapServerAction } from './server/wrapServerAction.js';
 export { wrapServerLoader } from './server/wrapServerLoader.js';
 export { createSentryHandleError } from './server/createSentryHandleError.js';
 export { getMetaTagTransformer } from './server/getMetaTagTransformer.js';
+export { createSentryServerInstrumentation } from './server/createServerInstrumentation.js';
 export { sentryReactRouter } from './vite/plugin.js';
 export { sentryOnBuildEnd } from './vite/buildEnd/handleOnBuildEnd.js';
 export { makeConfigInjectorPlugin } from './vite/makeConfigInjectorPlugin.js';
+export { isInstrumentationApiUsed } from './server/serverGlobals.js';
 //# sourceMappingURL=index.server.js.map

package/build/esm/index.server.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.server.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;"}
+{"version":3,"file":"index.server.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;"}

package/build/esm/package.json

@@ -1 +1 @@
-{"type":"module","version":"10.36.0"}
+{"type":"module","version":"10.38.0"}

package/build/esm/server/createSentryHandleError.js

@@ -6,10 +6,7 @@ import { captureException, flushIfServerless } from '@sentry/core';
  * @returns A Sentry-instrumented handleError function
  */
 function createSentryHandleError({ logErrors = false }) {
-  const handleError = async function handleError(
-    error,
-    args,
-  ) {
+  const handleError = async function handleError(error, args) {
     // React Router may abort some interrupted requests, don't report those
     if (!args.request.signal.aborted) {
       captureException(error, {

package/build/esm/server/createSentryHandleError.js.map

@@ -1 +1 @@
-{"version":3,"file":"createSentryHandleError.js","sources":["../../../src/server/createSentryHandleError.ts"],"sourcesContent":["import { captureException, flushIfServerless } from '@sentry/core';\nimport type { ActionFunctionArgs, HandleErrorFunction, LoaderFunctionArgs } from 'react-router';\n\nexport type SentryHandleErrorOptions = {\n  logErrors?: boolean;\n};\n\n/**\n * A complete Sentry-instrumented handleError implementation that handles error reporting\n *\n * @returns A Sentry-instrumented handleError function\n */\nexport function createSentryHandleError({ logErrors = false }: SentryHandleErrorOptions): HandleErrorFunction {\n  const handleError = async function handleError(\n    error: unknown,\n    args: LoaderFunctionArgs | ActionFunctionArgs,\n  ): Promise<void> {\n    // React Router may abort some interrupted requests, don't report those\n    if (!args.request.signal.aborted) {\n      captureException(error, {\n        mechanism: {\n          type: 'react-router',\n          handled: false,\n        },\n      });\n      if (logErrors) {\n        // eslint-disable-next-line no-console\n        console.error(error);\n      }\n      try {\n        await flushIfServerless();\n      } catch {\n        // Ignore flush errors to ensure error handling completes gracefully\n      }\n    }\n  };\n\n  return handleError;\n}\n"],"names":[],"mappings":";;AAOA;AACA;AACA;AACA;AACA;AACO,SAAS,uBAAuB,CAAC,EAAE,YAAY,KAAA,EAAO,EAAiD;AAC9G,EAAE,MAAM,WAAA,GAAc,eAAe,WAAW;AAChD,IAAI,KAAK;AACT,IAAI,IAAI;AACR,IAAmB;AACnB;AACA,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE;AACtC,MAAM,gBAAgB,CAAC,KAAK,EAAE;AAC9B,QAAQ,SAAS,EAAE;AACnB,UAAU,IAAI,EAAE,cAAc;AAC9B,UAAU,OAAO,EAAE,KAAK;AACxB,SAAS;AACT,OAAO,CAAC;AACR,MAAM,IAAI,SAAS,EAAE;AACrB;AACA,QAAQ,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC;AAC5B,MAAM;AACN,MAAM,IAAI;AACV,QAAQ,MAAM,iBAAiB,EAAE;AACjC,MAAM,EAAE,MAAM;AACd;AACA,MAAM;AACN,IAAI;AACJ,EAAE,CAAC;;AAEH,EAAE,OAAO,WAAW;AACpB;;;;"}
+{"version":3,"file":"createSentryHandleError.js","sources":["../../../src/server/createSentryHandleError.ts"],"sourcesContent":["import { captureException, flushIfServerless } from '@sentry/core';\nimport type { HandleErrorFunction } from 'react-router';\n\nexport type SentryHandleErrorOptions = {\n  logErrors?: boolean;\n};\n\n/**\n * A complete Sentry-instrumented handleError implementation that handles error reporting\n *\n * @returns A Sentry-instrumented handleError function\n */\nexport function createSentryHandleError({ logErrors = false }: SentryHandleErrorOptions): HandleErrorFunction {\n  const handleError: HandleErrorFunction = async function handleError(error, args): Promise<void> {\n    // React Router may abort some interrupted requests, don't report those\n    if (!args.request.signal.aborted) {\n      captureException(error, {\n        mechanism: {\n          type: 'react-router',\n          handled: false,\n        },\n      });\n      if (logErrors) {\n        // eslint-disable-next-line no-console\n        console.error(error);\n      }\n      try {\n        await flushIfServerless();\n      } catch {\n        // Ignore flush errors to ensure error handling completes gracefully\n      }\n    }\n  };\n\n  return handleError;\n}\n"],"names":[],"mappings":";;AAOA;AACA;AACA;AACA;AACA;AACO,SAAS,uBAAuB,CAAC,EAAE,YAAY,KAAA,EAAO,EAAiD;AAC9G,EAAE,MAAM,WAAW,GAAwB,eAAe,WAAW,CAAC,KAAK,EAAE,IAAI,EAAiB;AAClG;AACA,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE;AACtC,MAAM,gBAAgB,CAAC,KAAK,EAAE;AAC9B,QAAQ,SAAS,EAAE;AACnB,UAAU,IAAI,EAAE,cAAc;AAC9B,UAAU,OAAO,EAAE,KAAK;AACxB,SAAS;AACT,OAAO,CAAC;AACR,MAAM,IAAI,SAAS,EAAE;AACrB;AACA,QAAQ,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC;AAC5B,MAAM;AACN,MAAM,IAAI;AACV,QAAQ,MAAM,iBAAiB,EAAE;AACjC,MAAM,EAAE,MAAM;AACd;AACA,MAAM;AACN,IAAI;AACJ,EAAE,CAAC;;AAEH,EAAE,OAAO,WAAW;AACpB;;;;"}

package/build/esm/server/createServerInstrumentation.js

@@ -0,0 +1,229 @@
+import { context } from '@opentelemetry/api';
+import { getRPCMetadata, RPCType } from '@opentelemetry/core';
+import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
+import { debug, startSpan, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_OP, SPAN_STATUS_ERROR, getActiveSpan, getRootSpan, updateSpanName, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, flushIfServerless, getCurrentScope } from '@sentry/core';
+import { DEBUG_BUILD } from '../common/debug-build.js';
+import { captureInstrumentationError, getPathFromRequest, getPattern, normalizeRoutePath } from '../common/utils.js';
+import { markInstrumentationApiUsed } from './serverGlobals.js';
+export { isInstrumentationApiUsed } from './serverGlobals.js';
+
+/**
+ * Options for creating Sentry server instrumentation.
+ */
+
+/**
+ * Creates a Sentry server instrumentation for React Router's instrumentation API.
+ * @experimental
+ */
+function createSentryServerInstrumentation(
+  options = {},
+) {
+  const { captureErrors = true } = options;
+
+  markInstrumentationApiUsed();
+  DEBUG_BUILD && debug.log('React Router server instrumentation API enabled.');
+
+  return {
+    handler(handler) {
+      handler.instrument({
+        async request(handleRequest, info) {
+          const pathname = getPathFromRequest(info.request);
+          const activeSpan = getActiveSpan();
+          const existingRootSpan = activeSpan ? getRootSpan(activeSpan) : undefined;
+
+          if (existingRootSpan) {
+            updateSpanName(existingRootSpan, `${info.request.method} ${pathname}`);
+            existingRootSpan.setAttributes({
+              [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'http.server',
+              [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.instrumentation_api',
+              [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
+            });
+
+            try {
+              const result = await handleRequest();
+              if (result.status === 'error' && result.error instanceof Error) {
+                existingRootSpan.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
+                captureInstrumentationError(result, captureErrors, 'react_router.request_handler', {
+                  'http.method': info.request.method,
+                  'http.url': pathname,
+                });
+              }
+            } finally {
+              await flushIfServerless();
+            }
+          } else {
+            await startSpan(
+              {
+                name: `${info.request.method} ${pathname}`,
+                forceTransaction: true,
+                attributes: {
+                  [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'http.server',
+                  [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.instrumentation_api',
+                  [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',
+                  'http.request.method': info.request.method,
+                  'url.path': pathname,
+                  'url.full': info.request.url,
+                },
+              },
+              async span => {
+                try {
+                  const result = await handleRequest();
+                  if (result.status === 'error' && result.error instanceof Error) {
+                    span.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });
+                    captureInstrumentationError(result, captureErrors, 'react_router.request_handler', {
+                      'http.method': info.request.method,
+                      'http.url': pathname,
+                    });
+                  }
+                } finally {
+                  await flushIfServerless();
+                }
+              },
+            );
+          }
+        },
+      });
+    },
+
+    route(route) {
+      route.instrument({
+        async loader(callLoader, info) {
+          const urlPath = getPathFromRequest(info.request);
+          const pattern = getPattern(info);
+          const routePattern = normalizeRoutePath(pattern) || urlPath;
+          updateRootSpanWithRoute(info.request.method, pattern, urlPath);
+
+          await startSpan(
+            {
+              name: routePattern,
+              attributes: {
+                [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.react_router.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.loader', {
+                  'http.method': info.request.method,
+                  'http.url': urlPath,
+                });
+              }
+            },
+          );
+        },
+
+        async action(callAction, info) {
+          const urlPath = getPathFromRequest(info.request);
+          const pattern = getPattern(info);
+          const routePattern = normalizeRoutePath(pattern) || urlPath;
+          updateRootSpanWithRoute(info.request.method, pattern, urlPath);
+
+          await startSpan(
+            {
+              name: routePattern,
+              attributes: {
+                [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.react_router.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.action', {
+                  'http.method': info.request.method,
+                  'http.url': urlPath,
+                });
+              }
+            },
+          );
+        },
+
+        async middleware(callMiddleware, info) {
+          const urlPath = getPathFromRequest(info.request);
+          const pattern = getPattern(info);
+          const routePattern = normalizeRoutePath(pattern) || urlPath;
+
+          // Update root span with parameterized route (same as loader/action)
+          updateRootSpanWithRoute(info.request.method, pattern, urlPath);
+
+          await startSpan(
+            {
+              name: routePattern,
+              attributes: {
+                [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.react_router.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.middleware', {
+                  'http.method': info.request.method,
+                  'http.url': urlPath,
+                });
+              }
+            },
+          );
+        },
+
+        async lazy(callLazy) {
+          await startSpan(
+            {
+              name: 'Lazy Route Load',
+              attributes: {
+                [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.react_router.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.lazy', {});
+              }
+            },
+          );
+        },
+      });
+    },
+  };
+}
+
+function updateRootSpanWithRoute(method, pattern, urlPath) {
+  const activeSpan = getActiveSpan();
+  if (!activeSpan) return;
+  const rootSpan = getRootSpan(activeSpan);
+  if (!rootSpan) return;
+
+  // Skip update if URL path is invalid (failed to parse)
+  if (!urlPath || urlPath === '<unknown>') {
+    DEBUG_BUILD && debug.warn('Cannot update span with invalid URL path:', urlPath);
+    return;
+  }
+
+  const hasPattern = !!pattern;
+  const routeName = hasPattern ? normalizeRoutePath(pattern) || urlPath : urlPath;
+
+  const rpcMetadata = getRPCMetadata(context.active());
+  if (rpcMetadata?.type === RPCType.HTTP) {
+    rpcMetadata.route = routeName;
+  }
+
+  const transactionName = `${method} ${routeName}`;
+  updateSpanName(rootSpan, transactionName);
+  rootSpan.setAttributes({
+    [ATTR_HTTP_ROUTE]: routeName,
+    [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: hasPattern ? 'route' : 'url',
+  });
+
+  // Also update the scope's transaction name so errors captured during this request
+  // have the correct transaction name (not the initial placeholder like "GET *")
+  getCurrentScope().setTransactionName(transactionName);
+}
+
+export { createSentryServerInstrumentation };
+//# sourceMappingURL=createServerInstrumentation.js.map

package/build/esm/server/createServerInstrumentation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"createServerInstrumentation.js","sources":["../../../src/server/createServerInstrumentation.ts"],"sourcesContent":["import { context } from '@opentelemetry/api';\nimport { getRPCMetadata, RPCType } from '@opentelemetry/core';\nimport { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';\nimport {\n  debug,\n  flushIfServerless,\n  getActiveSpan,\n  getCurrentScope,\n  getRootSpan,\n  SEMANTIC_ATTRIBUTE_SENTRY_OP,\n  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,\n  SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,\n  SPAN_STATUS_ERROR,\n  startSpan,\n  updateSpanName,\n} from '@sentry/core';\nimport { DEBUG_BUILD } from '../common/debug-build';\nimport type { InstrumentableRequestHandler, InstrumentableRoute, ServerInstrumentation } from '../common/types';\nimport { captureInstrumentationError, getPathFromRequest, getPattern, normalizeRoutePath } from '../common/utils';\nimport { markInstrumentationApiUsed } from './serverGlobals';\n\n// Re-export for backward compatibility and external use\nexport { isInstrumentationApiUsed } from './serverGlobals';\n\n/**\n * Options for creating Sentry server instrumentation.\n */\nexport interface CreateSentryServerInstrumentationOptions {\n  /**\n   * Whether to capture errors from loaders/actions automatically.\n   * @default true\n   */\n  captureErrors?: boolean;\n}\n\n/**\n * Creates a Sentry server instrumentation for React Router's instrumentation API.\n * @experimental\n */\nexport function createSentryServerInstrumentation(\n  options: CreateSentryServerInstrumentationOptions = {},\n): ServerInstrumentation {\n  const { captureErrors = true } = options;\n\n  markInstrumentationApiUsed();\n  DEBUG_BUILD && debug.log('React Router server instrumentation API enabled.');\n\n  return {\n    handler(handler: InstrumentableRequestHandler) {\n      handler.instrument({\n        async request(handleRequest, info) {\n          const pathname = getPathFromRequest(info.request);\n          const activeSpan = getActiveSpan();\n          const existingRootSpan = activeSpan ? getRootSpan(activeSpan) : undefined;\n\n          if (existingRootSpan) {\n            updateSpanName(existingRootSpan, `${info.request.method} ${pathname}`);\n            existingRootSpan.setAttributes({\n              [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'http.server',\n              [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.instrumentation_api',\n              [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',\n            });\n\n            try {\n              const result = await handleRequest();\n              if (result.status === 'error' && result.error instanceof Error) {\n                existingRootSpan.setStatus({ code: SPAN_STATUS_ERROR, message: 'internal_error' });\n                captureInstrumentationError(result, captureErrors, 'react_router.request_handler', {\n                  'http.method': info.request.method,\n                  'http.url': pathname,\n                });\n              }\n            } finally {\n              await flushIfServerless();\n            }\n          } else {\n            await startSpan(\n              {\n                name: `${info.request.method} ${pathname}`,\n                forceTransaction: true,\n                attributes: {\n                  [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'http.server',\n                  [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.instrumentation_api',\n                  [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',\n                  'http.request.method': info.request.method,\n                  'url.path': pathname,\n                  'url.full': info.request.url,\n                },\n              },\n              async span => {\n                try {\n                  const result = await handleRequest();\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.request_handler', {\n                      'http.method': info.request.method,\n                      'http.url': pathname,\n                    });\n                  }\n                } finally {\n                  await flushIfServerless();\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 pattern = getPattern(info);\n          const routePattern = normalizeRoutePath(pattern) || urlPath;\n          updateRootSpanWithRoute(info.request.method, pattern, urlPath);\n\n          await startSpan(\n            {\n              name: routePattern,\n              attributes: {\n                [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.react_router.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.loader', {\n                  'http.method': info.request.method,\n                  'http.url': urlPath,\n                });\n              }\n            },\n          );\n        },\n\n        async action(callAction, info) {\n          const urlPath = getPathFromRequest(info.request);\n          const pattern = getPattern(info);\n          const routePattern = normalizeRoutePath(pattern) || urlPath;\n          updateRootSpanWithRoute(info.request.method, pattern, urlPath);\n\n          await startSpan(\n            {\n              name: routePattern,\n              attributes: {\n                [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.react_router.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.action', {\n                  'http.method': info.request.method,\n                  'http.url': urlPath,\n                });\n              }\n            },\n          );\n        },\n\n        async middleware(callMiddleware, info) {\n          const urlPath = getPathFromRequest(info.request);\n          const pattern = getPattern(info);\n          const routePattern = normalizeRoutePath(pattern) || urlPath;\n\n          // Update root span with parameterized route (same as loader/action)\n          updateRootSpanWithRoute(info.request.method, pattern, urlPath);\n\n          await startSpan(\n            {\n              name: routePattern,\n              attributes: {\n                [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.react_router.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.middleware', {\n                  'http.method': info.request.method,\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.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.lazy', {});\n              }\n            },\n          );\n        },\n      });\n    },\n  };\n}\n\nfunction updateRootSpanWithRoute(method: string, pattern: string | undefined, urlPath: string): void {\n  const activeSpan = getActiveSpan();\n  if (!activeSpan) return;\n  const rootSpan = getRootSpan(activeSpan);\n  if (!rootSpan) return;\n\n  // Skip update if URL path is invalid (failed to parse)\n  if (!urlPath || urlPath === '<unknown>') {\n    DEBUG_BUILD && debug.warn('Cannot update span with invalid URL path:', urlPath);\n    return;\n  }\n\n  const hasPattern = !!pattern;\n  const routeName = hasPattern ? normalizeRoutePath(pattern) || urlPath : urlPath;\n\n  const rpcMetadata = getRPCMetadata(context.active());\n  if (rpcMetadata?.type === RPCType.HTTP) {\n    rpcMetadata.route = routeName;\n  }\n\n  const transactionName = `${method} ${routeName}`;\n  updateSpanName(rootSpan, transactionName);\n  rootSpan.setAttributes({\n    [ATTR_HTTP_ROUTE]: routeName,\n    [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: hasPattern ? 'route' : 'url',\n  });\n\n  // Also update the scope's transaction name so errors captured during this request\n  // have the correct transaction name (not the initial placeholder like \"GET *\")\n  getCurrentScope().setTransactionName(transactionName);\n}\n"],"names":[],"mappings":"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"}

package/build/esm/server/instrumentation/reactRouter.js

@@ -1,7 +1,8 @@
 import { InstrumentationBase, InstrumentationNodeModuleDefinition } from '@opentelemetry/instrumentation';
 import { SEMATTRS_HTTP_TARGET } from '@opentelemetry/semantic-conventions';
-import { SDK_VERSION, getActiveSpan, getRootSpan, debug, spanToJSON, updateSpanName, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, startSpan, SEMANTIC_ATTRIBUTE_SENTRY_OP } from '@sentry/core';
+import { SDK_VERSION, debug, getActiveSpan, getRootSpan, spanToJSON, updateSpanName, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, startSpan, SEMANTIC_ATTRIBUTE_SENTRY_OP } from '@sentry/core';
 import { DEBUG_BUILD } from '../../common/debug-build.js';
+import { isInstrumentationApiUsed } from '../serverGlobals.js';
 import { isDataRequest, getOpName, getSpanName } from './util.js';
 
 const supportedVersions = ['>=7.0.0'];
@@ -61,6 +62,13 @@ class ReactRouterInstrumentation extends InstrumentationBase {
                 return originalRequestHandler(request, initialContext);
               }
 
+              // Skip OTEL instrumentation if instrumentation API is being used
+              // as it handles loader/action spans itself
+              if (isInstrumentationApiUsed()) {
+                DEBUG_BUILD && debug.log('Skipping OTEL loader/action instrumentation - using instrumentation API');
+                return originalRequestHandler(request, initialContext);
+              }
+
               const activeSpan = getActiveSpan();
               const rootSpan = activeSpan && getRootSpan(activeSpan);
 

package/build/esm/server/instrumentation/reactRouter.js.map

@@ -1 +1 @@
-{"version":3,"file":"reactRouter.js","sources":["../../../../src/server/instrumentation/reactRouter.ts"],"sourcesContent":["import type { InstrumentationConfig } from '@opentelemetry/instrumentation';\nimport { InstrumentationBase, InstrumentationNodeModuleDefinition } from '@opentelemetry/instrumentation';\nimport { SEMATTRS_HTTP_TARGET } from '@opentelemetry/semantic-conventions';\nimport {\n  debug,\n  getActiveSpan,\n  getRootSpan,\n  SDK_VERSION,\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 * as reactRouter from 'react-router';\nimport { DEBUG_BUILD } from '../../common/debug-build';\nimport { getOpName, getSpanName, isDataRequest } from './util';\n\ntype ReactRouterModuleExports = typeof reactRouter;\n\nconst supportedVersions = ['>=7.0.0'];\nconst COMPONENT = 'react-router';\n\n/**\n * Instrumentation for React Router's server request handler.\n * This patches the requestHandler function to add Sentry performance monitoring for data loaders.\n */\nexport class ReactRouterInstrumentation extends InstrumentationBase<InstrumentationConfig> {\n  public constructor(config: InstrumentationConfig = {}) {\n    super('ReactRouterInstrumentation', SDK_VERSION, config);\n  }\n\n  /**\n   * Initializes the instrumentation by defining the React Router server modules to be patched.\n   */\n  // eslint-disable-next-line @typescript-eslint/naming-convention\n  protected init(): InstrumentationNodeModuleDefinition {\n    const reactRouterServerModule = new InstrumentationNodeModuleDefinition(\n      COMPONENT,\n      supportedVersions,\n      (moduleExports: ReactRouterModuleExports) => {\n        return this._createPatchedModuleProxy(moduleExports);\n      },\n      (_moduleExports: unknown) => {\n        // nothing to unwrap here\n        return _moduleExports;\n      },\n    );\n\n    return reactRouterServerModule;\n  }\n\n  /**\n   * Creates a proxy around the React Router module exports that patches the createRequestHandler function.\n   * This allows us to wrap the request handler to add performance monitoring for data loaders and actions.\n   */\n  private _createPatchedModuleProxy(moduleExports: ReactRouterModuleExports): ReactRouterModuleExports {\n    return new Proxy(moduleExports, {\n      get(target, prop, receiver) {\n        if (prop === 'createRequestHandler') {\n          const original = target[prop];\n          return function sentryWrappedCreateRequestHandler(this: unknown, ...args: unknown[]) {\n            const originalRequestHandler = original.apply(this, args);\n\n            return async function sentryWrappedRequestHandler(request: Request, initialContext?: unknown) {\n              let url: URL;\n              try {\n                url = new URL(request.url);\n              } catch {\n                return originalRequestHandler(request, initialContext);\n              }\n\n              // We currently just want to trace loaders and actions\n              if (!isDataRequest(url.pathname)) {\n                return originalRequestHandler(request, initialContext);\n              }\n\n              const activeSpan = getActiveSpan();\n              const rootSpan = activeSpan && getRootSpan(activeSpan);\n\n              if (!rootSpan) {\n                DEBUG_BUILD && debug.log('No active root span found, skipping tracing for data request');\n                return originalRequestHandler(request, initialContext);\n              }\n\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              // TODO: try to set derived parameterized route from build here (args[0])\n              const spanData = spanToJSON(rootSpan);\n              // eslint-disable-next-line deprecation/deprecation\n              const target = spanData.data[SEMATTRS_HTTP_TARGET] || url.pathname;\n              updateSpanName(rootSpan, `${request.method} ${target}`);\n              rootSpan.setAttributes({\n                [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',\n                [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.server',\n              });\n\n              return startSpan(\n                {\n                  name: getSpanName(url.pathname, request.method),\n                  attributes: {\n                    [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.server',\n                    [SEMANTIC_ATTRIBUTE_SENTRY_OP]: getOpName(url.pathname, request.method),\n                  },\n                },\n                () => {\n                  return originalRequestHandler(request, initialContext);\n                },\n              );\n            };\n          };\n        }\n        return Reflect.get(target, prop, receiver);\n      },\n    });\n  }\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"reactRouter.js","sources":["../../../../src/server/instrumentation/reactRouter.ts"],"sourcesContent":["import type { InstrumentationConfig } from '@opentelemetry/instrumentation';\nimport { InstrumentationBase, InstrumentationNodeModuleDefinition } from '@opentelemetry/instrumentation';\nimport { SEMATTRS_HTTP_TARGET } from '@opentelemetry/semantic-conventions';\nimport {\n  debug,\n  getActiveSpan,\n  getRootSpan,\n  SDK_VERSION,\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 * as reactRouter from 'react-router';\nimport { DEBUG_BUILD } from '../../common/debug-build';\nimport { isInstrumentationApiUsed } from '../serverGlobals';\nimport { getOpName, getSpanName, isDataRequest } from './util';\n\ntype ReactRouterModuleExports = typeof reactRouter;\n\nconst supportedVersions = ['>=7.0.0'];\nconst COMPONENT = 'react-router';\n\n/**\n * Instrumentation for React Router's server request handler.\n * This patches the requestHandler function to add Sentry performance monitoring for data loaders.\n */\nexport class ReactRouterInstrumentation extends InstrumentationBase<InstrumentationConfig> {\n  public constructor(config: InstrumentationConfig = {}) {\n    super('ReactRouterInstrumentation', SDK_VERSION, config);\n  }\n\n  /**\n   * Initializes the instrumentation by defining the React Router server modules to be patched.\n   */\n  // eslint-disable-next-line @typescript-eslint/naming-convention\n  protected init(): InstrumentationNodeModuleDefinition {\n    const reactRouterServerModule = new InstrumentationNodeModuleDefinition(\n      COMPONENT,\n      supportedVersions,\n      (moduleExports: ReactRouterModuleExports) => {\n        return this._createPatchedModuleProxy(moduleExports);\n      },\n      (_moduleExports: unknown) => {\n        // nothing to unwrap here\n        return _moduleExports;\n      },\n    );\n\n    return reactRouterServerModule;\n  }\n\n  /**\n   * Creates a proxy around the React Router module exports that patches the createRequestHandler function.\n   * This allows us to wrap the request handler to add performance monitoring for data loaders and actions.\n   */\n  private _createPatchedModuleProxy(moduleExports: ReactRouterModuleExports): ReactRouterModuleExports {\n    return new Proxy(moduleExports, {\n      get(target, prop, receiver) {\n        if (prop === 'createRequestHandler') {\n          const original = target[prop];\n          return function sentryWrappedCreateRequestHandler(this: unknown, ...args: unknown[]) {\n            const originalRequestHandler = original.apply(this, args);\n\n            return async function sentryWrappedRequestHandler(request: Request, initialContext?: unknown) {\n              let url: URL;\n              try {\n                url = new URL(request.url);\n              } catch {\n                return originalRequestHandler(request, initialContext);\n              }\n\n              // We currently just want to trace loaders and actions\n              if (!isDataRequest(url.pathname)) {\n                return originalRequestHandler(request, initialContext);\n              }\n\n              // Skip OTEL instrumentation if instrumentation API is being used\n              // as it handles loader/action spans itself\n              if (isInstrumentationApiUsed()) {\n                DEBUG_BUILD && debug.log('Skipping OTEL loader/action instrumentation - using instrumentation API');\n                return originalRequestHandler(request, initialContext);\n              }\n\n              const activeSpan = getActiveSpan();\n              const rootSpan = activeSpan && getRootSpan(activeSpan);\n\n              if (!rootSpan) {\n                DEBUG_BUILD && debug.log('No active root span found, skipping tracing for data request');\n                return originalRequestHandler(request, initialContext);\n              }\n\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              // TODO: try to set derived parameterized route from build here (args[0])\n              const spanData = spanToJSON(rootSpan);\n              // eslint-disable-next-line deprecation/deprecation\n              const target = spanData.data[SEMATTRS_HTTP_TARGET] || url.pathname;\n              updateSpanName(rootSpan, `${request.method} ${target}`);\n              rootSpan.setAttributes({\n                [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url',\n                [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.server',\n              });\n\n              return startSpan(\n                {\n                  name: getSpanName(url.pathname, request.method),\n                  attributes: {\n                    [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.react_router.server',\n                    [SEMANTIC_ATTRIBUTE_SENTRY_OP]: getOpName(url.pathname, request.method),\n                  },\n                },\n                () => {\n                  return originalRequestHandler(request, initialContext);\n                },\n              );\n            };\n          };\n        }\n        return Reflect.get(target, prop, receiver);\n      },\n    });\n  }\n}\n"],"names":[],"mappings":"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"}

package/build/esm/server/integration/reactRouterServer.js

@@ -2,6 +2,7 @@ import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';
 import { defineIntegration } from '@sentry/core';
 import { generateInstrumentOnce, NODE_VERSION } from '@sentry/node';
 import { ReactRouterInstrumentation } from '../instrumentation/reactRouter.js';
+import { isInstrumentationApiUsed } from '../serverGlobals.js';
 
 const INTEGRATION_NAME = 'ReactRouterServer';
 
@@ -23,6 +24,11 @@ const reactRouterServerIntegration = defineIntegration(() => {
   return {
     name: INTEGRATION_NAME,
     setupOnce() {
+      // Skip OTEL patching if the instrumentation API is in use
+      if (isInstrumentationApiUsed()) {
+        return;
+      }
+
       if (
         (NODE_VERSION.major === 20 && NODE_VERSION.minor < 19) || // https://nodejs.org/en/blog/release/v20.19.0
         (NODE_VERSION.major === 22 && NODE_VERSION.minor < 12) // https://nodejs.org/en/blog/release/v22.12.0
@@ -36,13 +42,17 @@ const reactRouterServerIntegration = defineIntegration(() => {
       if (
         event.type === 'transaction' &&
         event.contexts?.trace?.data &&
-        event.contexts.trace.data[ATTR_HTTP_ROUTE] === '*' &&
-        // This means the name has been adjusted before, but the http.route remains, so we need to remove it
-        event.transaction !== 'GET *' &&
-        event.transaction !== 'POST *'
+        event.contexts.trace.data[ATTR_HTTP_ROUTE] === '*'
       ) {
-        // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
-        delete event.contexts.trace.data[ATTR_HTTP_ROUTE];
+        const origin = event.contexts.trace.origin;
+        const isInstrumentationApiOrigin = origin?.includes('instrumentation_api');
+
+        // For instrumentation_api, always clean up bogus `*` route since we set better names
+        // For legacy, only clean up if the name has been adjusted (not METHOD *)
+        if (isInstrumentationApiOrigin || !event.transaction?.endsWith(' *')) {
+          // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
+          delete event.contexts.trace.data[ATTR_HTTP_ROUTE];
+        }
       }
 
       return event;

package/build/esm/server/integration/reactRouterServer.js.map

@@ -1 +1 @@
-{"version":3,"file":"reactRouterServer.js","sources":["../../../../src/server/integration/reactRouterServer.ts"],"sourcesContent":["import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';\nimport { defineIntegration } from '@sentry/core';\nimport { generateInstrumentOnce, NODE_VERSION } from '@sentry/node';\nimport { ReactRouterInstrumentation } from '../instrumentation/reactRouter';\n\nconst INTEGRATION_NAME = 'ReactRouterServer';\n\nconst instrumentReactRouter = generateInstrumentOnce(INTEGRATION_NAME, () => {\n  return new ReactRouterInstrumentation();\n});\n\nexport const instrumentReactRouterServer = Object.assign(\n  (): void => {\n    instrumentReactRouter();\n  },\n  { id: INTEGRATION_NAME },\n);\n\n/**\n * Integration capturing tracing data for React Router server functions.\n */\nexport const reactRouterServerIntegration = defineIntegration(() => {\n  return {\n    name: INTEGRATION_NAME,\n    setupOnce() {\n      if (\n        (NODE_VERSION.major === 20 && NODE_VERSION.minor < 19) || // https://nodejs.org/en/blog/release/v20.19.0\n        (NODE_VERSION.major === 22 && NODE_VERSION.minor < 12) // https://nodejs.org/en/blog/release/v22.12.0\n      ) {\n        instrumentReactRouterServer();\n      }\n    },\n    processEvent(event) {\n      // Express generates bogus `*` routes for data loaders, which we want to remove here\n      // we cannot do this earlier because some OTEL instrumentation adds this at some unexpected point\n      if (\n        event.type === 'transaction' &&\n        event.contexts?.trace?.data &&\n        event.contexts.trace.data[ATTR_HTTP_ROUTE] === '*' &&\n        // This means the name has been adjusted before, but the http.route remains, so we need to remove it\n        event.transaction !== 'GET *' &&\n        event.transaction !== 'POST *'\n      ) {\n        // eslint-disable-next-line @typescript-eslint/no-dynamic-delete\n        delete event.contexts.trace.data[ATTR_HTTP_ROUTE];\n      }\n\n      return event;\n    },\n  };\n});\n"],"names":[],"mappings":";;;;;AAKA,MAAM,gBAAA,GAAmB,mBAAmB;;AAE5C,MAAM,qBAAA,GAAwB,sBAAsB,CAAC,gBAAgB,EAAE,MAAM;AAC7E,EAAE,OAAO,IAAI,0BAA0B,EAAE;AACzC,CAAC,CAAC;;AAEK,MAAM,2BAAA,GAA8B,MAAM,CAAC,MAAM;AACxD,EAAE,MAAY;AACd,IAAI,qBAAqB,EAAE;AAC3B,EAAE,CAAC;AACH,EAAE,EAAE,EAAE,EAAE,gBAAA,EAAkB;AAC1B;;AAEA;AACA;AACA;MACa,4BAAA,GAA+B,iBAAiB,CAAC,MAAM;AACpE,EAAE,OAAO;AACT,IAAI,IAAI,EAAE,gBAAgB;AAC1B,IAAI,SAAS,GAAG;AAChB,MAAM;AACN,QAAQ,CAAC,YAAY,CAAC,KAAA,KAAU,EAAA,IAAM,YAAY,CAAC,KAAA,GAAQ,EAAE;AAC7D,SAAS,YAAY,CAAC,KAAA,KAAU,EAAA,IAAM,YAAY,CAAC,KAAA,GAAQ,EAAE,CAAA;AAC7D,QAAQ;AACR,QAAQ,2BAA2B,EAAE;AACrC,MAAM;AACN,IAAI,CAAC;AACL,IAAI,YAAY,CAAC,KAAK,EAAE;AACxB;AACA;AACA,MAAM;AACN,QAAQ,KAAK,CAAC,IAAA,KAAS,aAAA;AACvB,QAAQ,KAAK,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAA;AAC/B,QAAQ,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAA,KAAM,GAAA;AACvD;AACA,QAAQ,KAAK,CAAC,WAAA,KAAgB,OAAA;AAC9B,QAAQ,KAAK,CAAC,WAAA,KAAgB;AAC9B,QAAQ;AACR;AACA,QAAQ,OAAO,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC;AACzD,MAAM;;AAEN,MAAM,OAAO,KAAK;AAClB,IAAI,CAAC;AACL,GAAG;AACH,CAAC;;;;"}
+{"version":3,"file":"reactRouterServer.js","sources":["../../../../src/server/integration/reactRouterServer.ts"],"sourcesContent":["import { ATTR_HTTP_ROUTE } from '@opentelemetry/semantic-conventions';\nimport { defineIntegration } from '@sentry/core';\nimport { generateInstrumentOnce, NODE_VERSION } from '@sentry/node';\nimport { ReactRouterInstrumentation } from '../instrumentation/reactRouter';\nimport { isInstrumentationApiUsed } from '../serverGlobals';\n\nconst INTEGRATION_NAME = 'ReactRouterServer';\n\nconst instrumentReactRouter = generateInstrumentOnce(INTEGRATION_NAME, () => {\n  return new ReactRouterInstrumentation();\n});\n\nexport const instrumentReactRouterServer = Object.assign(\n  (): void => {\n    instrumentReactRouter();\n  },\n  { id: INTEGRATION_NAME },\n);\n\n/**\n * Integration capturing tracing data for React Router server functions.\n */\nexport const reactRouterServerIntegration = defineIntegration(() => {\n  return {\n    name: INTEGRATION_NAME,\n    setupOnce() {\n      // Skip OTEL patching if the instrumentation API is in use\n      if (isInstrumentationApiUsed()) {\n        return;\n      }\n\n      if (\n        (NODE_VERSION.major === 20 && NODE_VERSION.minor < 19) || // https://nodejs.org/en/blog/release/v20.19.0\n        (NODE_VERSION.major === 22 && NODE_VERSION.minor < 12) // https://nodejs.org/en/blog/release/v22.12.0\n      ) {\n        instrumentReactRouterServer();\n      }\n    },\n    processEvent(event) {\n      // Express generates bogus `*` routes for data loaders, which we want to remove here\n      // we cannot do this earlier because some OTEL instrumentation adds this at some unexpected point\n      if (\n        event.type === 'transaction' &&\n        event.contexts?.trace?.data &&\n        event.contexts.trace.data[ATTR_HTTP_ROUTE] === '*'\n      ) {\n        const origin = event.contexts.trace.origin;\n        const isInstrumentationApiOrigin = origin?.includes('instrumentation_api');\n\n        // For instrumentation_api, always clean up bogus `*` route since we set better names\n        // For legacy, only clean up if the name has been adjusted (not METHOD *)\n        if (isInstrumentationApiOrigin || !event.transaction?.endsWith(' *')) {\n          // eslint-disable-next-line @typescript-eslint/no-dynamic-delete\n          delete event.contexts.trace.data[ATTR_HTTP_ROUTE];\n        }\n      }\n\n      return event;\n    },\n  };\n});\n"],"names":[],"mappings":";;;;;;AAMA,MAAM,gBAAA,GAAmB,mBAAmB;;AAE5C,MAAM,qBAAA,GAAwB,sBAAsB,CAAC,gBAAgB,EAAE,MAAM;AAC7E,EAAE,OAAO,IAAI,0BAA0B,EAAE;AACzC,CAAC,CAAC;;AAEK,MAAM,2BAAA,GAA8B,MAAM,CAAC,MAAM;AACxD,EAAE,MAAY;AACd,IAAI,qBAAqB,EAAE;AAC3B,EAAE,CAAC;AACH,EAAE,EAAE,EAAE,EAAE,gBAAA,EAAkB;AAC1B;;AAEA;AACA;AACA;MACa,4BAAA,GAA+B,iBAAiB,CAAC,MAAM;AACpE,EAAE,OAAO;AACT,IAAI,IAAI,EAAE,gBAAgB;AAC1B,IAAI,SAAS,GAAG;AAChB;AACA,MAAM,IAAI,wBAAwB,EAAE,EAAE;AACtC,QAAQ;AACR,MAAM;;AAEN,MAAM;AACN,QAAQ,CAAC,YAAY,CAAC,KAAA,KAAU,EAAA,IAAM,YAAY,CAAC,KAAA,GAAQ,EAAE;AAC7D,SAAS,YAAY,CAAC,KAAA,KAAU,EAAA,IAAM,YAAY,CAAC,KAAA,GAAQ,EAAE,CAAA;AAC7D,QAAQ;AACR,QAAQ,2BAA2B,EAAE;AACrC,MAAM;AACN,IAAI,CAAC;AACL,IAAI,YAAY,CAAC,KAAK,EAAE;AACxB;AACA;AACA,MAAM;AACN,QAAQ,KAAK,CAAC,IAAA,KAAS,aAAA;AACvB,QAAQ,KAAK,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAA;AAC/B,QAAQ,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAA,KAAM;AACvD,QAAQ;AACR,QAAQ,MAAM,SAAS,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM;AAClD,QAAQ,MAAM,6BAA6B,MAAM,EAAE,QAAQ,CAAC,qBAAqB,CAAC;;AAElF;AACA;AACA,QAAQ,IAAI,0BAAA,IAA8B,CAAC,KAAK,CAAC,WAAW,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE;AAC9E;AACA,UAAU,OAAO,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC;AAC3D,QAAQ;AACR,MAAM;;AAEN,MAAM,OAAO,KAAK;AAClB,IAAI,CAAC;AACL,GAAG;AACH,CAAC;;;;"}