@sentry/react-router 10.68.0 → 11.0.0-alpha.0

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

@@ -1 +1 @@
-{"version":3,"file":"createSentryHandleRequest.js","sources":["../../../src/server/createSentryHandleRequest.tsx"],"sourcesContent":["import type { createReadableStreamFromReadable } from '@react-router/node';\nimport type { ReactNode } from 'react';\nimport React from 'react';\nimport type { AppLoadContext, EntryContext, RouterContextProvider, ServerRouter } from 'react-router';\nimport { PassThrough } from 'stream';\nimport { getMetaTagTransformer } from './getMetaTagTransformer';\nimport { wrapSentryHandleRequest } from './wrapSentryHandleRequest';\n\ntype RenderToPipeableStreamOptions = {\n  [key: string]: unknown;\n  onShellReady?: () => void;\n  onAllReady?: () => void;\n  onShellError?: (error: unknown) => void;\n  onError?: (error: unknown) => void;\n};\n\ntype RenderToPipeableStreamResult = {\n  pipe: (destination: NodeJS.WritableStream) => void;\n  abort: () => void;\n};\n\ntype RenderToPipeableStreamFunction = (\n  node: ReactNode,\n  options: RenderToPipeableStreamOptions,\n) => RenderToPipeableStreamResult;\n\nexport interface SentryHandleRequestOptions {\n  /**\n   * Timeout in milliseconds after which the rendering stream will be aborted\n   * @default 10000\n   */\n  streamTimeout?: number;\n\n  /**\n   * React's renderToPipeableStream function from 'react-dom/server'\n   */\n  renderToPipeableStream: RenderToPipeableStreamFunction;\n\n  /**\n   * The <ServerRouter /> component from '@react-router/server'\n   */\n  ServerRouter: typeof ServerRouter;\n\n  /**\n   * createReadableStreamFromReadable from '@react-router/node'\n   */\n  createReadableStreamFromReadable: typeof createReadableStreamFromReadable;\n\n  /**\n   * Regular expression to identify bot user agents\n   * @default /bot|crawler|spider|googlebot|chrome-lighthouse|baidu|bing|google|yahoo|lighthouse/i\n   */\n  botRegex?: RegExp;\n}\n\ntype HandleRequestWithoutMiddleware = (\n  request: Request,\n  responseStatusCode: number,\n  responseHeaders: Headers,\n  routerContext: EntryContext,\n  loadContext: AppLoadContext,\n) => Promise<unknown>;\n\ntype HandleRequestWithMiddleware = (\n  request: Request,\n  responseStatusCode: number,\n  responseHeaders: Headers,\n  routerContext: EntryContext,\n  loadContext: RouterContextProvider,\n) => Promise<unknown>;\n\n/**\n * A complete Sentry-instrumented handleRequest implementation that handles both\n * route parametrization and trace meta tag injection.\n *\n * @param options Configuration options\n * @returns A Sentry-instrumented handleRequest function\n */\nexport function createSentryHandleRequest(\n  options: SentryHandleRequestOptions,\n): HandleRequestWithoutMiddleware & HandleRequestWithMiddleware {\n  const {\n    streamTimeout = 10000,\n    renderToPipeableStream,\n    ServerRouter,\n    createReadableStreamFromReadable,\n    botRegex = /bot|crawler|spider|googlebot|chrome-lighthouse|baidu|bing|google|yahoo|lighthouse/i,\n  } = options;\n\n  const handleRequest = function handleRequest(\n    request: Request,\n    responseStatusCode: number,\n    responseHeaders: Headers,\n    routerContext: EntryContext,\n    _loadContext: AppLoadContext | RouterContextProvider,\n  ): Promise<Response> {\n    return new Promise((resolve, reject) => {\n      let shellRendered = false;\n      const userAgent = request.headers.get('user-agent');\n\n      // Determine if we should use onAllReady or onShellReady\n      const isBot = typeof userAgent === 'string' && botRegex.test(userAgent);\n      const isSpaMode = !!(routerContext as { isSpaMode?: boolean }).isSpaMode;\n\n      const readyOption = isBot || isSpaMode ? 'onAllReady' : 'onShellReady';\n\n      const { pipe, abort } = renderToPipeableStream(<ServerRouter context={routerContext} url={request.url} />, {\n        [readyOption]() {\n          shellRendered = true;\n          const body = new PassThrough();\n\n          const stream = createReadableStreamFromReadable(body);\n\n          responseHeaders.set('Content-Type', 'text/html');\n\n          resolve(\n            new Response(stream, {\n              headers: responseHeaders,\n              status: responseStatusCode,\n            }),\n          );\n\n          // this injects trace data to the HTML head\n          pipe(getMetaTagTransformer(body));\n        },\n        onShellError(error: unknown) {\n          reject(error);\n        },\n        onError(error: unknown) {\n          // eslint-disable-next-line no-param-reassign\n          responseStatusCode = 500;\n          // Log streaming rendering errors from inside the shell.  Don't log\n          // errors encountered during initial shell rendering since they'll\n          // reject and get logged in handleDocumentRequest.\n          if (shellRendered) {\n            // eslint-disable-next-line no-console\n            console.error(error);\n          }\n        },\n      });\n\n      // Abort the rendering stream after the `streamTimeout`\n      setTimeout(abort, streamTimeout);\n    });\n  };\n\n  // Wrap the handle request function for request parametrization\n  return wrapSentryHandleRequest(handleRequest as HandleRequestWithoutMiddleware) as HandleRequestWithoutMiddleware &\n    HandleRequestWithMiddleware;\n}\n"],"names":["handleRequest"],"mappings":";;;;;AA8EO,SAAS,0BACd,OAAA,EAC8D;AAC9D,EAAA,MAAM;AAAA,IACJ,aAAA,GAAgB,GAAA;AAAA,IAChB,sBAAA;AAAA,IACA,YAAA;AAAA,IACA,gCAAA;AAAA,IACA,QAAA,GAAW;AAAA,GACb,GAAI,OAAA;AAEJ,EAAA,MAAM,gBAAgB,SAASA,cAAAA,CAC7B,SACA,kBAAA,EACA,eAAA,EACA,eACA,YAAA,EACmB;AACnB,IAAA,OAAO,IAAI,OAAA,CAAQ,CAAC,OAAA,EAAS,MAAA,KAAW;AACtC,MAAA,IAAI,aAAA,GAAgB,KAAA;AACpB,MAAA,MAAM,SAAA,GAAY,OAAA,CAAQ,OAAA,CAAQ,GAAA,CAAI,YAAY,CAAA;AAGlD,MAAA,MAAM,QAAQ,OAAO,SAAA,KAAc,QAAA,IAAY,QAAA,CAAS,KAAK,SAAS,CAAA;AACtE,MAAA,MAAM,SAAA,GAAY,CAAC,CAAE,aAAA,CAA0C,SAAA;AAE/D,MAAA,MAAM,WAAA,GAAc,KAAA,IAAS,SAAA,GAAY,YAAA,GAAe,cAAA;AAExD,MAAA,MAAM,EAAE,IAAA,EAAM,KAAA,EAAM,GAAI,sBAAA,iBAAuB,KAAA,CAAA,aAAA,CAAC,YAAA,EAAA,EAAa,OAAA,EAAS,aAAA,EAAe,GAAA,EAAK,OAAA,CAAQ,GAAA,EAAK,CAAA,EAAI;AAAA,QACzG,CAAC,WAAW,CAAA,GAAI;AACd,UAAA,aAAA,GAAgB,IAAA;AAChB,UAAA,MAAM,IAAA,GAAO,IAAI,WAAA,EAAY;AAE7B,UAAA,MAAM,MAAA,GAAS,iCAAiC,IAAI,CAAA;AAEpD,UAAA,eAAA,CAAgB,GAAA,CAAI,gBAAgB,WAAW,CAAA;AAE/C,UAAA,OAAA;AAAA,YACE,IAAI,SAAS,MAAA,EAAQ;AAAA,cACnB,OAAA,EAAS,eAAA;AAAA,cACT,MAAA,EAAQ;AAAA,aACT;AAAA,WACH;AAGA,UAAA,IAAA,CAAK,qBAAA,CAAsB,IAAI,CAAC,CAAA;AAAA,QAClC,CAAA;AAAA,QACA,aAAa,KAAA,EAAgB;AAC3B,UAAA,MAAA,CAAO,KAAK,CAAA;AAAA,QACd,CAAA;AAAA,QACA,QAAQ,KAAA,EAAgB;AAEtB,UAAA,kBAAA,GAAqB,GAAA;AAIrB,UAAA,IAAI,aAAA,EAAe;AAEjB,YAAA,OAAA,CAAQ,MAAM,KAAK,CAAA;AAAA,UACrB;AAAA,QACF;AAAA,OACD,CAAA;AAGD,MAAA,UAAA,CAAW,OAAO,aAAa,CAAA;AAAA,IACjC,CAAC,CAAA;AAAA,EACH,CAAA;AAGA,EAAA,OAAO,wBAAwB,aAA+C,CAAA;AAEhF;;;;"}
+{"version":3,"file":"createSentryHandleRequest.js","sources":["../../../src/server/createSentryHandleRequest.tsx"],"sourcesContent":["import type { createReadableStreamFromReadable } from '@react-router/node';\nimport type { ReactNode } from 'react';\nimport React from 'react';\nimport type { AppLoadContext, EntryContext, RouterContextProvider, ServerRouter } from 'react-router';\nimport { PassThrough } from 'stream';\nimport { getMetaTagTransformer } from './getMetaTagTransformer';\nimport { wrapSentryHandleRequest } from './wrapSentryHandleRequest';\n\ntype RenderToPipeableStreamOptions = {\n  [key: string]: unknown;\n  onShellReady?: () => void;\n  onAllReady?: () => void;\n  onShellError?: (error: unknown) => void;\n  onError?: (error: unknown) => void;\n};\n\ntype RenderToPipeableStreamResult = {\n  pipe: (destination: NodeJS.WritableStream) => void;\n  abort: () => void;\n};\n\ntype RenderToPipeableStreamFunction = (\n  node: ReactNode,\n  options: RenderToPipeableStreamOptions,\n) => RenderToPipeableStreamResult;\n\nexport interface SentryHandleRequestOptions {\n  /**\n   * Timeout in milliseconds after which the rendering stream will be aborted\n   * @default 10000\n   */\n  streamTimeout?: number;\n\n  /**\n   * React's renderToPipeableStream function from 'react-dom/server'\n   */\n  renderToPipeableStream: RenderToPipeableStreamFunction;\n\n  /**\n   * The <ServerRouter /> component from '@react-router/server'\n   */\n  ServerRouter: typeof ServerRouter;\n\n  /**\n   * createReadableStreamFromReadable from '@react-router/node'\n   */\n  createReadableStreamFromReadable: typeof createReadableStreamFromReadable;\n\n  /**\n   * Regular expression to identify bot user agents\n   * @default /bot|crawler|spider|googlebot|chrome-lighthouse|baidu|bing|google|yahoo|lighthouse/i\n   */\n  botRegex?: RegExp;\n}\n\ntype HandleRequestWithoutMiddleware = (\n  request: Request,\n  responseStatusCode: number,\n  responseHeaders: Headers,\n  routerContext: EntryContext,\n  loadContext: AppLoadContext,\n) => Promise<unknown>;\n\ntype HandleRequestWithMiddleware = (\n  request: Request,\n  responseStatusCode: number,\n  responseHeaders: Headers,\n  routerContext: EntryContext,\n  loadContext: RouterContextProvider,\n) => Promise<unknown>;\n\n/**\n * A complete Sentry-instrumented handleRequest implementation that handles both\n * route parametrization and trace meta tag injection.\n *\n * @param options Configuration options\n * @returns A Sentry-instrumented handleRequest function\n */\nexport function createSentryHandleRequest(\n  options: SentryHandleRequestOptions,\n): HandleRequestWithoutMiddleware & HandleRequestWithMiddleware {\n  const {\n    streamTimeout = 10000,\n    renderToPipeableStream,\n    ServerRouter,\n    createReadableStreamFromReadable,\n    botRegex = /bot|crawler|spider|googlebot|chrome-lighthouse|baidu|bing|google|yahoo|lighthouse/i,\n  } = options;\n\n  const handleRequest = function handleRequest(\n    request: Request,\n    responseStatusCode: number,\n    responseHeaders: Headers,\n    routerContext: EntryContext,\n    _loadContext: AppLoadContext | RouterContextProvider,\n  ): Promise<Response> {\n    return new Promise((resolve, reject) => {\n      let shellRendered = false;\n      const userAgent = request.headers.get('user-agent');\n\n      // Determine if we should use onAllReady or onShellReady\n      const isBot = typeof userAgent === 'string' && botRegex.test(userAgent);\n      const isSpaMode = !!(routerContext as { isSpaMode?: boolean }).isSpaMode;\n\n      const readyOption = isBot || isSpaMode ? 'onAllReady' : 'onShellReady';\n\n      const { pipe, abort } = renderToPipeableStream(<ServerRouter context={routerContext} url={request.url} />, {\n        [readyOption]() {\n          shellRendered = true;\n          const body = new PassThrough();\n\n          const stream = createReadableStreamFromReadable(body);\n\n          responseHeaders.set('Content-Type', 'text/html');\n\n          resolve(\n            new Response(stream, {\n              headers: responseHeaders,\n              status: responseStatusCode,\n            }),\n          );\n\n          // this injects trace data to the HTML head\n          pipe(getMetaTagTransformer(body));\n        },\n        onShellError(error: unknown) {\n          reject(error);\n        },\n        onError(error: unknown) {\n          // eslint-disable-next-line no-param-reassign\n          responseStatusCode = 500;\n          // Log streaming rendering errors from inside the shell.  Don't log\n          // errors encountered during initial shell rendering since they'll\n          // reject and get logged in handleDocumentRequest.\n          if (shellRendered) {\n            // eslint-disable-next-line no-console\n            console.error(error);\n          }\n        },\n      });\n\n      // Abort the rendering stream after the `streamTimeout`\n      setTimeout(abort, streamTimeout);\n    });\n  };\n\n  // Wrap the handle request function for request parametrization\n  return wrapSentryHandleRequest(handleRequest) as HandleRequestWithoutMiddleware & HandleRequestWithMiddleware;\n}\n"],"names":["handleRequest"],"mappings":";;;;;AA8EO,SAAS,0BACd,OAAA,EAC8D;AAC9D,EAAA,MAAM;AAAA,IACJ,aAAA,GAAgB,GAAA;AAAA,IAChB,sBAAA;AAAA,IACA,YAAA;AAAA,IACA,gCAAA;AAAA,IACA,QAAA,GAAW;AAAA,GACb,GAAI,OAAA;AAEJ,EAAA,MAAM,gBAAgB,SAASA,cAAAA,CAC7B,SACA,kBAAA,EACA,eAAA,EACA,eACA,YAAA,EACmB;AACnB,IAAA,OAAO,IAAI,OAAA,CAAQ,CAAC,OAAA,EAAS,MAAA,KAAW;AACtC,MAAA,IAAI,aAAA,GAAgB,KAAA;AACpB,MAAA,MAAM,SAAA,GAAY,OAAA,CAAQ,OAAA,CAAQ,GAAA,CAAI,YAAY,CAAA;AAGlD,MAAA,MAAM,QAAQ,OAAO,SAAA,KAAc,QAAA,IAAY,QAAA,CAAS,KAAK,SAAS,CAAA;AACtE,MAAA,MAAM,SAAA,GAAY,CAAC,CAAE,aAAA,CAA0C,SAAA;AAE/D,MAAA,MAAM,WAAA,GAAc,KAAA,IAAS,SAAA,GAAY,YAAA,GAAe,cAAA;AAExD,MAAA,MAAM,EAAE,IAAA,EAAM,KAAA,EAAM,GAAI,sBAAA,iBAAuB,KAAA,CAAA,aAAA,CAAC,YAAA,EAAA,EAAa,OAAA,EAAS,aAAA,EAAe,GAAA,EAAK,OAAA,CAAQ,GAAA,EAAK,CAAA,EAAI;AAAA,QACzG,CAAC,WAAW,CAAA,GAAI;AACd,UAAA,aAAA,GAAgB,IAAA;AAChB,UAAA,MAAM,IAAA,GAAO,IAAI,WAAA,EAAY;AAE7B,UAAA,MAAM,MAAA,GAAS,iCAAiC,IAAI,CAAA;AAEpD,UAAA,eAAA,CAAgB,GAAA,CAAI,gBAAgB,WAAW,CAAA;AAE/C,UAAA,OAAA;AAAA,YACE,IAAI,SAAS,MAAA,EAAQ;AAAA,cACnB,OAAA,EAAS,eAAA;AAAA,cACT,MAAA,EAAQ;AAAA,aACT;AAAA,WACH;AAGA,UAAA,IAAA,CAAK,qBAAA,CAAsB,IAAI,CAAC,CAAA;AAAA,QAClC,CAAA;AAAA,QACA,aAAa,KAAA,EAAgB;AAC3B,UAAA,MAAA,CAAO,KAAK,CAAA;AAAA,QACd,CAAA;AAAA,QACA,QAAQ,KAAA,EAAgB;AAEtB,UAAA,kBAAA,GAAqB,GAAA;AAIrB,UAAA,IAAI,aAAA,EAAe;AAEjB,YAAA,OAAA,CAAQ,MAAM,KAAK,CAAA;AAAA,UACrB;AAAA,QACF;AAAA,OACD,CAAA;AAGD,MAAA,UAAA,CAAW,OAAO,aAAa,CAAA;AAAA,IACjC,CAAC,CAAA;AAAA,EACH,CAAA;AAGA,EAAA,OAAO,wBAAwB,aAAa,CAAA;AAC9C;;;;"}

package/build/esm/server/createServerInstrumentation.js

@@ -1,13 +1,13 @@
-import { createContextKey, context } from '@opentelemetry/api';
-import { HTTP_ROUTE, URL_PATH, URL_FULL, HTTP_REQUEST_METHOD } from '@sentry/conventions/attributes';
-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 { CODE_FUNCTION_NAME, SENTRY_OP, HTTP_ROUTE, URL_PATH, URL_FULL, HTTP_REQUEST_METHOD } from '@sentry/conventions/attributes';
+import { WEB_SERVER_FUNCTION_SPAN_OP, WEB_SERVER_MIDDLEWARE_SPAN_OP } from '@sentry/conventions/op';
+import { debug, startSpan, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN, SPAN_STATUS_ERROR, getActiveSpan, getRootSpan, updateSpanName, filterCollectedUrl, SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, SEMANTIC_ATTRIBUTE_SENTRY_OP, flushIfServerless, getCurrentScope } from '@sentry/core';
 import { DEBUG_BUILD } from '../common/debug-build.js';
 import { captureInstrumentationError, getPathFromRequest, getPattern, normalizeRoutePath } from '../common/utils.js';
 import { getMiddlewareName } from './serverBuild.js';
 import { markInstrumentationApiUsed } from './serverGlobals.js';
 export { isInstrumentationApiUsed } from './serverGlobals.js';
 
-const MIDDLEWARE_COUNTER_KEY = createContextKey("sentry_react_router_middleware_counter");
+const middlewareCountersByRootSpan = /* @__PURE__ */ new WeakMap();
 function createSentryServerInstrumentation(options = {}) {
   const { captureErrors = true } = options;
   DEBUG_BUILD && debug.log("React Router server instrumentation created.");
@@ -19,61 +19,57 @@ function createSentryServerInstrumentation(options = {}) {
           const pathname = getPathFromRequest(info.request);
           const activeSpan = getActiveSpan();
           const existingRootSpan = activeSpan ? getRootSpan(activeSpan) : void 0;
-          const counterStore = { counters: {} };
-          const ctx = context.active().setValue(MIDDLEWARE_COUNTER_KEY, counterStore);
-          await context.with(ctx, async () => {
-            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",
-                [URL_FULL]: info.request.url,
-                [URL_PATH]: pathname
-              });
-              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();
+          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",
+              [URL_FULL]: filterCollectedUrl(info.request.url),
+              [URL_PATH]: pathname
+            });
+            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,
+                  [URL_FULL]: pathname
+                });
               }
-            } 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();
+            } 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]: filterCollectedUrl(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,
+                      [URL_FULL]: pathname
+                    });
                   }
+                } finally {
+                  await flushIfServerless();
                 }
-              );
-            }
-          });
+              }
+            );
+          }
         }
       });
     },
@@ -90,7 +86,8 @@ function createSentryServerInstrumentation(options = {}) {
             {
               name: routePattern,
               attributes: {
-                [SEMANTIC_ATTRIBUTE_SENTRY_OP]: "function.react_router.loader",
+                [SENTRY_OP]: WEB_SERVER_FUNCTION_SPAN_OP,
+                [CODE_FUNCTION_NAME]: "loader",
                 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: "auto.function.react_router.instrumentation_api"
               }
             },
@@ -100,7 +97,7 @@ function createSentryServerInstrumentation(options = {}) {
                 span.setStatus({ code: SPAN_STATUS_ERROR, message: "internal_error" });
                 captureInstrumentationError(result, captureErrors, "react_router.loader", {
                   "http.method": info.request.method,
-                  "http.url": urlPath
+                  [URL_FULL]: urlPath
                 });
               }
             }
@@ -115,7 +112,8 @@ function createSentryServerInstrumentation(options = {}) {
             {
               name: routePattern,
               attributes: {
-                [SEMANTIC_ATTRIBUTE_SENTRY_OP]: "function.react_router.action",
+                [SENTRY_OP]: WEB_SERVER_FUNCTION_SPAN_OP,
+                [CODE_FUNCTION_NAME]: "action",
                 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: "auto.function.react_router.instrumentation_api"
               }
             },
@@ -125,7 +123,7 @@ function createSentryServerInstrumentation(options = {}) {
                 span.setStatus({ code: SPAN_STATUS_ERROR, message: "internal_error" });
                 captureInstrumentationError(result, captureErrors, "react_router.action", {
                   "http.method": info.request.method,
-                  "http.url": urlPath
+                  [URL_FULL]: urlPath
                 });
               }
             }
@@ -136,18 +134,25 @@ function createSentryServerInstrumentation(options = {}) {
           const pattern = getPattern(info);
           const routePattern = normalizeRoutePath(pattern) || urlPath;
           updateRootSpanWithRoute(info.request.method, pattern, urlPath);
-          const counterStore = context.active().getValue(MIDDLEWARE_COUNTER_KEY);
+          const activeSpan = getActiveSpan();
+          const rootSpan = activeSpan ? getRootSpan(activeSpan) : void 0;
           let middlewareIndex = 0;
-          if (counterStore) {
-            middlewareIndex = counterStore.counters[routeId] ?? 0;
-            counterStore.counters[routeId] = middlewareIndex + 1;
+          if (rootSpan) {
+            let counters = middlewareCountersByRootSpan.get(rootSpan);
+            if (!counters) {
+              counters = {};
+              middlewareCountersByRootSpan.set(rootSpan, counters);
+            }
+            middlewareIndex = counters[routeId] ?? 0;
+            counters[routeId] = middlewareIndex + 1;
           }
           const middlewareName = getMiddlewareName(routeId, middlewareIndex);
           await startSpan(
             {
               name: `middleware ${middlewareName || routeId}`,
               attributes: {
-                [SEMANTIC_ATTRIBUTE_SENTRY_OP]: "function.react_router.middleware",
+                [SENTRY_OP]: WEB_SERVER_MIDDLEWARE_SPAN_OP,
+                [CODE_FUNCTION_NAME]: "middleware",
                 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: "auto.function.react_router.instrumentation_api",
                 "react_router.route.id": routeId,
                 [HTTP_ROUTE]: routePattern,
@@ -161,7 +166,7 @@ function createSentryServerInstrumentation(options = {}) {
                 span.setStatus({ code: SPAN_STATUS_ERROR, message: "internal_error" });
                 captureInstrumentationError(result, captureErrors, "react_router.middleware", {
                   "http.method": info.request.method,
-                  "http.url": urlPath
+                  [URL_FULL]: urlPath
                 });
               }
             }
@@ -172,7 +177,8 @@ function createSentryServerInstrumentation(options = {}) {
             {
               name: "Lazy Route Load",
               attributes: {
-                [SEMANTIC_ATTRIBUTE_SENTRY_OP]: "function.react_router.lazy",
+                [SENTRY_OP]: WEB_SERVER_FUNCTION_SPAN_OP,
+                [CODE_FUNCTION_NAME]: "lazy",
                 [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: "auto.function.react_router.instrumentation_api"
               }
             },

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

@@ -1 +1 @@
-{"version":3,"file":"createServerInstrumentation.js","sources":["../../../src/server/createServerInstrumentation.ts"],"sourcesContent":["import { context, createContextKey } from '@opentelemetry/api';\nimport { HTTP_REQUEST_METHOD, HTTP_ROUTE, URL_FULL, URL_PATH } from '@sentry/conventions/attributes';\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 { getMiddlewareName } from './serverBuild';\nimport { markInstrumentationApiUsed } from './serverGlobals';\n\nconst MIDDLEWARE_COUNTER_KEY = createContextKey('sentry_react_router_middleware_counter');\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 */\nexport function createSentryServerInstrumentation(\n  options: CreateSentryServerInstrumentationOptions = {},\n): ServerInstrumentation {\n  const { captureErrors = true } = options;\n\n  DEBUG_BUILD && debug.log('React Router server instrumentation created.');\n\n  return {\n    handler(handler: InstrumentableRequestHandler) {\n      // Mark the instrumentation API active only when React Router actually invokes this\n      markInstrumentationApiUsed();\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          const counterStore = { counters: {} as Record<string, number> };\n          const ctx = context.active().setValue(MIDDLEWARE_COUNTER_KEY, counterStore);\n\n          await context.with(ctx, async () => {\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                [URL_FULL]: info.request.url,\n                [URL_PATH]: pathname,\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\n    route(route: InstrumentableRoute) {\n      // Also mark active here, in case route registration runs (mirrors the handler callback above).\n      markInstrumentationApiUsed();\n      const routeId = route.id;\n\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          updateRootSpanWithRoute(info.request.method, pattern, urlPath);\n\n          const counterStore = context.active().getValue(MIDDLEWARE_COUNTER_KEY) as\n            | { counters: Record<string, number> }\n            | undefined;\n          let middlewareIndex = 0;\n          if (counterStore) {\n            middlewareIndex = counterStore.counters[routeId] ?? 0;\n            counterStore.counters[routeId] = middlewareIndex + 1;\n          }\n\n          const middlewareName = getMiddlewareName(routeId, middlewareIndex);\n\n          await startSpan(\n            {\n              name: `middleware ${middlewareName || routeId}`,\n              attributes: {\n                [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'function.react_router.middleware',\n                [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.react_router.instrumentation_api',\n                'react_router.route.id': routeId,\n                [HTTP_ROUTE]: routePattern,\n                ...(middlewareName && { 'react_router.middleware.name': middlewareName }),\n                'react_router.middleware.index': middlewareIndex,\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 transactionName = `${method} ${routeName}`;\n  updateSpanName(rootSpan, transactionName);\n  rootSpan.setAttributes({\n    [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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"}
+{"version":3,"file":"createServerInstrumentation.js","sources":["../../../src/server/createServerInstrumentation.ts"],"sourcesContent":["import {\n  CODE_FUNCTION_NAME,\n  HTTP_REQUEST_METHOD,\n  HTTP_ROUTE,\n  SENTRY_OP,\n  URL_FULL,\n  URL_PATH,\n} from '@sentry/conventions/attributes';\nimport { WEB_SERVER_FUNCTION_SPAN_OP, WEB_SERVER_MIDDLEWARE_SPAN_OP } from '@sentry/conventions/op';\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  filterCollectedUrl,\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 { getMiddlewareName } from './serverBuild';\nimport { markInstrumentationApiUsed } from './serverGlobals';\n\n// Per-request middleware counters, keyed by the request's root span (the one transaction all of a\n// request's middlewares run under). The root span is the same instance across those middleware hooks\n// whether or not a Sentry OpenTelemetry tracer provider is set up, unlike the OTel context the counter\n// used to live on (which does not propagate without a provider).\nconst middlewareCountersByRootSpan = new WeakMap<object, Record<string, number>>();\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 */\nexport function createSentryServerInstrumentation(\n  options: CreateSentryServerInstrumentationOptions = {},\n): ServerInstrumentation {\n  const { captureErrors = true } = options;\n\n  DEBUG_BUILD && debug.log('React Router server instrumentation created.');\n\n  return {\n    handler(handler: InstrumentableRequestHandler) {\n      // Mark the instrumentation API active only when React Router actually invokes this\n      markInstrumentationApiUsed();\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              [URL_FULL]: filterCollectedUrl(info.request.url),\n              [URL_PATH]: pathname,\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                  [URL_FULL]: 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]: filterCollectedUrl(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                      [URL_FULL]: pathname,\n                    });\n                  }\n                } finally {\n                  await flushIfServerless();\n                }\n              },\n            );\n          }\n        },\n      });\n    },\n\n    route(route: InstrumentableRoute) {\n      // Also mark active here, in case route registration runs (mirrors the handler callback above).\n      markInstrumentationApiUsed();\n      const routeId = route.id;\n\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                [SENTRY_OP]: WEB_SERVER_FUNCTION_SPAN_OP,\n                [CODE_FUNCTION_NAME]: '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                  [URL_FULL]: 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                [SENTRY_OP]: WEB_SERVER_FUNCTION_SPAN_OP,\n                [CODE_FUNCTION_NAME]: '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                  [URL_FULL]: 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          updateRootSpanWithRoute(info.request.method, pattern, urlPath);\n\n          const activeSpan = getActiveSpan();\n          const rootSpan = activeSpan ? getRootSpan(activeSpan) : undefined;\n          let middlewareIndex = 0;\n          if (rootSpan) {\n            let counters = middlewareCountersByRootSpan.get(rootSpan);\n            if (!counters) {\n              counters = {};\n              middlewareCountersByRootSpan.set(rootSpan, counters);\n            }\n            middlewareIndex = counters[routeId] ?? 0;\n            counters[routeId] = middlewareIndex + 1;\n          }\n\n          const middlewareName = getMiddlewareName(routeId, middlewareIndex);\n\n          await startSpan(\n            {\n              name: `middleware ${middlewareName || routeId}`,\n              attributes: {\n                [SENTRY_OP]: WEB_SERVER_MIDDLEWARE_SPAN_OP,\n                [CODE_FUNCTION_NAME]: 'middleware',\n                [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.function.react_router.instrumentation_api',\n                'react_router.route.id': routeId,\n                [HTTP_ROUTE]: routePattern,\n                ...(middlewareName && { 'react_router.middleware.name': middlewareName }),\n                'react_router.middleware.index': middlewareIndex,\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                  [URL_FULL]: urlPath,\n                });\n              }\n            },\n          );\n        },\n\n        async lazy(callLazy) {\n          await startSpan(\n            {\n              name: 'Lazy Route Load',\n              attributes: {\n                [SENTRY_OP]: WEB_SERVER_FUNCTION_SPAN_OP,\n                [CODE_FUNCTION_NAME]: '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 transactionName = `${method} ${routeName}`;\n  updateSpanName(rootSpan, transactionName);\n  rootSpan.setAttributes({\n    [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/integration/reactRouterServer.js

@@ -1,53 +1,15 @@
-import { HTTP_ROUTE } from '@sentry/conventions/attributes';
-import { defineIntegration, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
-import { generateInstrumentOnce, NODE_VERSION } from '@sentry/node';
-import { ReactRouterInstrumentation } from '../instrumentation/reactRouter.js';
+import { defineIntegration } from '@sentry/core';
 import { registerServerBuildGlobal } from '../serverBuild.js';
-import { enableOtelDataLoaderSpanCreation } from '../serverGlobals.js';
 
 const INTEGRATION_NAME = "ReactRouterServer";
-const instrumentReactRouter = generateInstrumentOnce(INTEGRATION_NAME, () => {
-  return new ReactRouterInstrumentation();
-});
-const instrumentReactRouterServer = Object.assign(
-  () => {
-    instrumentReactRouter();
-    registerServerBuildGlobal();
-  },
-  { id: INTEGRATION_NAME }
-);
 const reactRouterServerIntegration = defineIntegration(() => {
   return {
     name: INTEGRATION_NAME,
     setupOnce() {
-      if (NODE_VERSION.major === 20 && NODE_VERSION.minor < 19 || NODE_VERSION.major === 22 && NODE_VERSION.minor < 12) {
-        enableOtelDataLoaderSpanCreation();
-      }
-      instrumentReactRouterServer();
-    },
-    processEvent(event) {
-      if (event.type === "transaction" && event.contexts?.trace?.data && event.contexts.trace.data[HTTP_ROUTE] === "*") {
-        const origin = event.contexts.trace.origin;
-        const isInstrumentationApiOrigin = origin?.includes("instrumentation_api");
-        if (isInstrumentationApiOrigin || !event.transaction?.endsWith(" *")) {
-          delete event.contexts.trace.data[HTTP_ROUTE];
-        }
-      }
-      return event;
-    },
-    processSegmentSpan(span) {
-      const attributes = span.attributes;
-      if (attributes?.[HTTP_ROUTE] !== "*") {
-        return;
-      }
-      const origin = attributes[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN];
-      const isInstrumentationApiOrigin = typeof origin === "string" && origin.includes("instrumentation_api");
-      if (isInstrumentationApiOrigin || !span.name?.endsWith(" *")) {
-        delete attributes[HTTP_ROUTE];
-      }
+      registerServerBuildGlobal();
     }
   };
 });
 
-export { instrumentReactRouterServer, reactRouterServerIntegration };
+export { reactRouterServerIntegration };
 //# sourceMappingURL=reactRouterServer.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"reactRouterServer.js","sources":["../../../../src/server/integration/reactRouterServer.ts"],"sourcesContent":["import { HTTP_ROUTE } from '@sentry/conventions/attributes';\nimport { defineIntegration, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';\nimport { generateInstrumentOnce, NODE_VERSION } from '@sentry/node';\nimport { ReactRouterInstrumentation } from '../instrumentation/reactRouter';\nimport { registerServerBuildGlobal } from '../serverBuild';\nimport { enableOtelDataLoaderSpanCreation } from '../serverGlobals';\n\nconst INTEGRATION_NAME = 'ReactRouterServer' as const;\n\nconst instrumentReactRouter = generateInstrumentOnce(INTEGRATION_NAME, () => {\n  return new ReactRouterInstrumentation();\n});\n\nexport const instrumentReactRouterServer = Object.assign(\n  (): void => {\n    instrumentReactRouter();\n    // Register global for Vite plugin ServerBuild capture\n    registerServerBuildGlobal();\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      // Enable OTEL data-loader spans only on Node versions without the diagnostics_channel-based instrumentation API.\n      if (\n        (NODE_VERSION.major === 20 && NODE_VERSION.minor < 19) ||\n        (NODE_VERSION.major === 22 && NODE_VERSION.minor < 12)\n      ) {\n        enableOtelDataLoaderSpanCreation();\n      }\n\n      // Always install to capture ServerBuild for middleware names.\n      // Skips per-request wrapping when instrumentation API is active or OTEL span creation is disabled.\n      instrumentReactRouterServer();\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[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[HTTP_ROUTE];\n        }\n      }\n\n      return event;\n    },\n    processSegmentSpan(span) {\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      const attributes = span.attributes;\n      if (attributes?.[HTTP_ROUTE] !== '*') {\n        return;\n      }\n\n      const origin = attributes[SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN];\n      const isInstrumentationApiOrigin = typeof origin === 'string' && 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 || !span.name?.endsWith(' *')) {\n        // eslint-disable-next-line @typescript-eslint/no-dynamic-delete\n        delete attributes[HTTP_ROUTE];\n      }\n    },\n  };\n});\n"],"names":[],"mappings":";;;;;;;AAOA,MAAM,gBAAA,GAAmB,mBAAA;AAEzB,MAAM,qBAAA,GAAwB,sBAAA,CAAuB,gBAAA,EAAkB,MAAM;AAC3E,EAAA,OAAO,IAAI,0BAAA,EAA2B;AACxC,CAAC,CAAA;AAEM,MAAM,8BAA8B,MAAA,CAAO,MAAA;AAAA,EAChD,MAAY;AACV,IAAA,qBAAA,EAAsB;AAEtB,IAAA,yBAAA,EAA0B;AAAA,EAC5B,CAAA;AAAA,EACA,EAAE,IAAI,gBAAA;AACR;AAKO,MAAM,4BAAA,GAA+B,kBAAkB,MAAM;AAClE,EAAA,OAAO;AAAA,IACL,IAAA,EAAM,gBAAA;AAAA,IACN,SAAA,GAAY;AAEV,MAAA,IACG,YAAA,CAAa,KAAA,KAAU,EAAA,IAAM,YAAA,CAAa,KAAA,GAAQ,EAAA,IAClD,YAAA,CAAa,KAAA,KAAU,EAAA,IAAM,YAAA,CAAa,KAAA,GAAQ,EAAA,EACnD;AACA,QAAA,gCAAA,EAAiC;AAAA,MACnC;AAIA,MAAA,2BAAA,EAA4B;AAAA,IAC9B,CAAA;AAAA,IACA,aAAa,KAAA,EAAO;AAGlB,MAAA,IACE,KAAA,CAAM,IAAA,KAAS,aAAA,IACf,KAAA,CAAM,QAAA,EAAU,KAAA,EAAO,IAAA,IACvB,KAAA,CAAM,QAAA,CAAS,KAAA,CAAM,IAAA,CAAK,UAAU,MAAM,GAAA,EAC1C;AACA,QAAA,MAAM,MAAA,GAAS,KAAA,CAAM,QAAA,CAAS,KAAA,CAAM,MAAA;AACpC,QAAA,MAAM,0BAAA,GAA6B,MAAA,EAAQ,QAAA,CAAS,qBAAqB,CAAA;AAIzE,QAAA,IAAI,8BAA8B,CAAC,KAAA,CAAM,WAAA,EAAa,QAAA,CAAS,IAAI,CAAA,EAAG;AAEpE,UAAA,OAAO,KAAA,CAAM,QAAA,CAAS,KAAA,CAAM,IAAA,CAAK,UAAU,CAAA;AAAA,QAC7C;AAAA,MACF;AAEA,MAAA,OAAO,KAAA;AAAA,IACT,CAAA;AAAA,IACA,mBAAmB,IAAA,EAAM;AAGvB,MAAA,MAAM,aAAa,IAAA,CAAK,UAAA;AACxB,MAAA,IAAI,UAAA,GAAa,UAAU,CAAA,KAAM,GAAA,EAAK;AACpC,QAAA;AAAA,MACF;AAEA,MAAA,MAAM,MAAA,GAAS,WAAW,gCAAgC,CAAA;AAC1D,MAAA,MAAM,6BAA6B,OAAO,MAAA,KAAW,QAAA,IAAY,MAAA,CAAO,SAAS,qBAAqB,CAAA;AAItG,MAAA,IAAI,8BAA8B,CAAC,IAAA,CAAK,IAAA,EAAM,QAAA,CAAS,IAAI,CAAA,EAAG;AAE5D,QAAA,OAAO,WAAW,UAAU,CAAA;AAAA,MAC9B;AAAA,IACF;AAAA,GACF;AACF,CAAC;;;;"}
+{"version":3,"file":"reactRouterServer.js","sources":["../../../../src/server/integration/reactRouterServer.ts"],"sourcesContent":["import { defineIntegration } from '@sentry/core';\nimport { registerServerBuildGlobal } from '../serverBuild';\n\nconst INTEGRATION_NAME = 'ReactRouterServer' as const;\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      // Register global for Vite plugin ServerBuild capture (used for middleware name resolution).\n      registerServerBuildGlobal();\n    },\n  };\n});\n"],"names":[],"mappings":";;;AAGA,MAAM,gBAAA,GAAmB,mBAAA;AAKlB,MAAM,4BAAA,GAA+B,kBAAkB,MAAM;AAClE,EAAA,OAAO;AAAA,IACL,IAAA,EAAM,gBAAA;AAAA,IACN,SAAA,GAAY;AAEV,MAAA,yBAAA,EAA0B;AAAA,IAC5B;AAAA,GACF;AACF,CAAC;;;;"}

package/build/esm/server/serverBuild.js

@@ -2,9 +2,6 @@ import { GLOBAL_OBJ } from '@sentry/core';
 
 const GLOBAL_KEY = "__sentrySetServerBuild";
 let _serverBuild;
-function isServerBuildLike(build) {
-  return build !== null && typeof build === "object" && "routes" in build && build.routes !== null && typeof build.routes === "object";
-}
 function setServerBuild(build) {
   _serverBuild = build;
 }
@@ -19,5 +16,5 @@ function registerServerBuildGlobal() {
   GLOBAL_OBJ[GLOBAL_KEY] = setServerBuild;
 }
 
-export { GLOBAL_KEY, getMiddlewareName, isServerBuildLike, registerServerBuildGlobal, setServerBuild };
+export { GLOBAL_KEY, getMiddlewareName, registerServerBuildGlobal, setServerBuild };
 //# sourceMappingURL=serverBuild.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"serverBuild.js","sources":["../../../src/server/serverBuild.ts"],"sourcesContent":["import { GLOBAL_OBJ } from '@sentry/core';\n\n/**\n * Subset of ServerBuild shape for middleware name lookup.\n * The official React Router types don't expose `middleware` on route modules yet.\n * @internal\n */\ninterface ServerBuildLike {\n  routes?: Record<\n    string,\n    {\n      module?: {\n        middleware?: Array<{ name?: string }>;\n      };\n    }\n  >;\n}\n\n/** @internal */\nexport const GLOBAL_KEY = '__sentrySetServerBuild';\n\ntype GlobalObjWithBuildCapture = typeof GLOBAL_OBJ & {\n  [GLOBAL_KEY]?: (build: ServerBuildLike) => void;\n};\n\n// ServerBuild reference for middleware name lookup. Updated on each createRequestHandler call.\nlet _serverBuild: ServerBuildLike | undefined;\n\n/** @internal */\nexport function isServerBuildLike(build: unknown): build is ServerBuildLike {\n  return (\n    build !== null &&\n    typeof build === 'object' &&\n    'routes' in build &&\n    build.routes !== null &&\n    typeof build.routes === 'object'\n  );\n}\n\n/** @internal */\nexport function setServerBuild(build: ServerBuildLike): void {\n  _serverBuild = build;\n}\n\n/** @internal */\nexport function getMiddlewareName(routeId: string, index: number): string | undefined {\n  if (!_serverBuild?.routes) return undefined;\n\n  const route = _serverBuild.routes[routeId];\n  if (!route?.module?.middleware) return undefined;\n\n  const middlewareFn = route.module.middleware[index];\n  return middlewareFn?.name || undefined;\n}\n\n/** @internal */\nexport function registerServerBuildGlobal(): void {\n  (GLOBAL_OBJ as GlobalObjWithBuildCapture)[GLOBAL_KEY] = setServerBuild;\n}\n\n/** @internal Exported for testing. */\nexport function _resetServerBuild(): void {\n  _serverBuild = undefined;\n  // eslint-disable-next-line @typescript-eslint/no-dynamic-delete\n  delete (GLOBAL_OBJ as GlobalObjWithBuildCapture)[GLOBAL_KEY];\n}\n"],"names":[],"mappings":";;AAmBO,MAAM,UAAA,GAAa;AAO1B,IAAI,YAAA;AAGG,SAAS,kBAAkB,KAAA,EAA0C;AAC1E,EAAA,OACE,KAAA,KAAU,IAAA,IACV,OAAO,KAAA,KAAU,QAAA,IACjB,QAAA,IAAY,KAAA,IACZ,KAAA,CAAM,MAAA,KAAW,IAAA,IACjB,OAAO,KAAA,CAAM,MAAA,KAAW,QAAA;AAE5B;AAGO,SAAS,eAAe,KAAA,EAA8B;AAC3D,EAAA,YAAA,GAAe,KAAA;AACjB;AAGO,SAAS,iBAAA,CAAkB,SAAiB,KAAA,EAAmC;AACpF,EAAA,IAAI,CAAC,YAAA,EAAc,MAAA,EAAQ,OAAO,MAAA;AAElC,EAAA,MAAM,KAAA,GAAQ,YAAA,CAAa,MAAA,CAAO,OAAO,CAAA;AACzC,EAAA,IAAI,CAAC,KAAA,EAAO,MAAA,EAAQ,UAAA,EAAY,OAAO,MAAA;AAEvC,EAAA,MAAM,YAAA,GAAe,KAAA,CAAM,MAAA,CAAO,UAAA,CAAW,KAAK,CAAA;AAClD,EAAA,OAAO,cAAc,IAAA,IAAQ,MAAA;AAC/B;AAGO,SAAS,yBAAA,GAAkC;AAChD,EAAC,UAAA,CAAyC,UAAU,CAAA,GAAI,cAAA;AAC1D;;;;"}
+{"version":3,"file":"serverBuild.js","sources":["../../../src/server/serverBuild.ts"],"sourcesContent":["import { GLOBAL_OBJ } from '@sentry/core';\n\n/**\n * Subset of ServerBuild shape for middleware name lookup.\n * The official React Router types don't expose `middleware` on route modules yet.\n * @internal\n */\ninterface ServerBuildLike {\n  routes?: Record<\n    string,\n    {\n      module?: {\n        middleware?: Array<{ name?: string }>;\n      };\n    }\n  >;\n}\n\n/** @internal */\nexport const GLOBAL_KEY = '__sentrySetServerBuild';\n\ntype GlobalObjWithBuildCapture = typeof GLOBAL_OBJ & {\n  [GLOBAL_KEY]?: (build: ServerBuildLike) => void;\n};\n\n// ServerBuild reference for middleware name lookup. Updated on each createRequestHandler call.\nlet _serverBuild: ServerBuildLike | undefined;\n\n/** @internal */\nexport function isServerBuildLike(build: unknown): build is ServerBuildLike {\n  return (\n    build !== null &&\n    typeof build === 'object' &&\n    'routes' in build &&\n    build.routes !== null &&\n    typeof build.routes === 'object'\n  );\n}\n\n/** @internal */\nexport function setServerBuild(build: ServerBuildLike): void {\n  _serverBuild = build;\n}\n\n/** @internal */\nexport function getMiddlewareName(routeId: string, index: number): string | undefined {\n  if (!_serverBuild?.routes) return undefined;\n\n  const route = _serverBuild.routes[routeId];\n  if (!route?.module?.middleware) return undefined;\n\n  const middlewareFn = route.module.middleware[index];\n  return middlewareFn?.name || undefined;\n}\n\n/** @internal */\nexport function registerServerBuildGlobal(): void {\n  (GLOBAL_OBJ as GlobalObjWithBuildCapture)[GLOBAL_KEY] = setServerBuild;\n}\n\n/** @internal Exported for testing. */\nexport function _resetServerBuild(): void {\n  _serverBuild = undefined;\n  // eslint-disable-next-line @typescript-eslint/no-dynamic-delete\n  delete (GLOBAL_OBJ as GlobalObjWithBuildCapture)[GLOBAL_KEY];\n}\n"],"names":[],"mappings":";;AAmBO,MAAM,UAAA,GAAa;AAO1B,IAAI,YAAA;AAcG,SAAS,eAAe,KAAA,EAA8B;AAC3D,EAAA,YAAA,GAAe,KAAA;AACjB;AAGO,SAAS,iBAAA,CAAkB,SAAiB,KAAA,EAAmC;AACpF,EAAA,IAAI,CAAC,YAAA,EAAc,MAAA,EAAQ,OAAO,MAAA;AAElC,EAAA,MAAM,KAAA,GAAQ,YAAA,CAAa,MAAA,CAAO,OAAO,CAAA;AACzC,EAAA,IAAI,CAAC,KAAA,EAAO,MAAA,EAAQ,UAAA,EAAY,OAAO,MAAA;AAEvC,EAAA,MAAM,YAAA,GAAe,KAAA,CAAM,MAAA,CAAO,UAAA,CAAW,KAAK,CAAA;AAClD,EAAA,OAAO,cAAc,IAAA,IAAQ,MAAA;AAC/B;AAGO,SAAS,yBAAA,GAAkC;AAChD,EAAC,UAAA,CAAyC,UAAU,CAAA,GAAI,cAAA;AAC1D;;;;"}

package/build/esm/server/serverGlobals.js

@@ -1,19 +1,12 @@
 import { GLOBAL_OBJ } from '@sentry/core';
 
 const SENTRY_SERVER_INSTRUMENTATION_FLAG = "__sentryReactRouterServerInstrumentationUsed";
-const SENTRY_OTEL_SPAN_CREATION_FLAG = "__sentryReactRouterOtelSpanCreationEnabled";
 function markInstrumentationApiUsed() {
   GLOBAL_OBJ[SENTRY_SERVER_INSTRUMENTATION_FLAG] = true;
 }
 function isInstrumentationApiUsed() {
   return !!GLOBAL_OBJ[SENTRY_SERVER_INSTRUMENTATION_FLAG];
 }
-function enableOtelDataLoaderSpanCreation() {
-  GLOBAL_OBJ[SENTRY_OTEL_SPAN_CREATION_FLAG] = true;
-}
-function isOtelDataLoaderSpanCreationEnabled() {
-  return !!GLOBAL_OBJ[SENTRY_OTEL_SPAN_CREATION_FLAG];
-}
 
-export { enableOtelDataLoaderSpanCreation, isInstrumentationApiUsed, isOtelDataLoaderSpanCreationEnabled, markInstrumentationApiUsed };
+export { isInstrumentationApiUsed, markInstrumentationApiUsed };
 //# sourceMappingURL=serverGlobals.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"serverGlobals.js","sources":["../../../src/server/serverGlobals.ts"],"sourcesContent":["import { GLOBAL_OBJ } from '@sentry/core';\n\nconst SENTRY_SERVER_INSTRUMENTATION_FLAG = '__sentryReactRouterServerInstrumentationUsed';\nconst SENTRY_OTEL_SPAN_CREATION_FLAG = '__sentryReactRouterOtelSpanCreationEnabled';\n\ntype GlobalObjWithFlag = typeof GLOBAL_OBJ & {\n  [SENTRY_SERVER_INSTRUMENTATION_FLAG]?: boolean;\n  [SENTRY_OTEL_SPAN_CREATION_FLAG]?: boolean;\n};\n\n/**\n * Mark that the React Router instrumentation API is being used on the server.\n * @internal\n */\nexport function markInstrumentationApiUsed(): void {\n  (GLOBAL_OBJ as GlobalObjWithFlag)[SENTRY_SERVER_INSTRUMENTATION_FLAG] = true;\n}\n\n/**\n * Check if React Router's instrumentation API is being used on the server.\n */\nexport function isInstrumentationApiUsed(): boolean {\n  return !!(GLOBAL_OBJ as GlobalObjWithFlag)[SENTRY_SERVER_INSTRUMENTATION_FLAG];\n}\n\n/**\n * Enable OTEL data-loader span creation for React Router server.\n * @internal\n */\nexport function enableOtelDataLoaderSpanCreation(): void {\n  (GLOBAL_OBJ as GlobalObjWithFlag)[SENTRY_OTEL_SPAN_CREATION_FLAG] = true;\n}\n\n/**\n * Check if OTEL data-loader span creation is enabled for React Router server.\n * @internal\n */\nexport function isOtelDataLoaderSpanCreationEnabled(): boolean {\n  return !!(GLOBAL_OBJ as GlobalObjWithFlag)[SENTRY_OTEL_SPAN_CREATION_FLAG];\n}\n"],"names":[],"mappings":";;AAEA,MAAM,kCAAA,GAAqC,8CAAA;AAC3C,MAAM,8BAAA,GAAiC,4CAAA;AAWhC,SAAS,0BAAA,GAAmC;AACjD,EAAC,UAAA,CAAiC,kCAAkC,CAAA,GAAI,IAAA;AAC1E;AAKO,SAAS,wBAAA,GAAoC;AAClD,EAAA,OAAO,CAAC,CAAE,UAAA,CAAiC,kCAAkC,CAAA;AAC/E;AAMO,SAAS,gCAAA,GAAyC;AACvD,EAAC,UAAA,CAAiC,8BAA8B,CAAA,GAAI,IAAA;AACtE;AAMO,SAAS,mCAAA,GAA+C;AAC7D,EAAA,OAAO,CAAC,CAAE,UAAA,CAAiC,8BAA8B,CAAA;AAC3E;;;;"}
+{"version":3,"file":"serverGlobals.js","sources":["../../../src/server/serverGlobals.ts"],"sourcesContent":["import { GLOBAL_OBJ } from '@sentry/core';\n\nconst SENTRY_SERVER_INSTRUMENTATION_FLAG = '__sentryReactRouterServerInstrumentationUsed';\n\ntype GlobalObjWithFlag = typeof GLOBAL_OBJ & {\n  [SENTRY_SERVER_INSTRUMENTATION_FLAG]?: boolean;\n};\n\n/**\n * Mark that the React Router instrumentation API is being used on the server.\n * @internal\n */\nexport function markInstrumentationApiUsed(): void {\n  (GLOBAL_OBJ as GlobalObjWithFlag)[SENTRY_SERVER_INSTRUMENTATION_FLAG] = true;\n}\n\n/**\n * Check if React Router's instrumentation API is being used on the server.\n */\nexport function isInstrumentationApiUsed(): boolean {\n  return !!(GLOBAL_OBJ as GlobalObjWithFlag)[SENTRY_SERVER_INSTRUMENTATION_FLAG];\n}\n"],"names":[],"mappings":";;AAEA,MAAM,kCAAA,GAAqC,8CAAA;AAUpC,SAAS,0BAAA,GAAmC;AACjD,EAAC,UAAA,CAAiC,kCAAkC,CAAA,GAAI,IAAA;AAC1E;AAKO,SAAS,wBAAA,GAAoC;AAClD,EAAA,OAAO,CAAC,CAAE,UAAA,CAAiC,kCAAkC,CAAA;AAC/E;;;;"}

package/build/esm/vite/buildEnd/handleOnBuildEnd.js

@@ -8,6 +8,12 @@ function getSentryConfig(viteConfig) {
   }
   return viteConfig.sentryConfig;
 }
+function resolveSourceMapsDisable(sentryConfig) {
+  if (sentryConfig.sourceMapsUploadOptions?.enabled === false) {
+    return true;
+  }
+  return sentryConfig.sourcemaps?.disable ?? sentryConfig.unstable_sentryVitePluginOptions?.sourcemaps?.disable;
+}
 const sentryOnBuildEnd = async ({ reactRouterConfig, viteConfig }) => {
   const sentryConfig = getSentryConfig(viteConfig);
   const {
@@ -31,8 +37,7 @@ const sentryOnBuildEnd = async ({ reactRouterConfig, viteConfig }) => {
       ...unstableSentryVitePluginOptions?.sourcemaps,
       ...sentryConfig.sourcemaps,
       ...sourceMapsUploadOptions,
-      // eslint-disable-next-line typescript/no-deprecated
-      disable: sourceMapsUploadOptions?.enabled === false ? true : sentryConfig.sourcemaps?.disable
+      disable: resolveSourceMapsDisable(sentryConfig)
     },
     release: {
       ...unstableSentryVitePluginOptions?.release,
@@ -54,7 +59,9 @@ const sentryOnBuildEnd = async ({ reactRouterConfig, viteConfig }) => {
       console.error("[Sentry] Could not create release", error);
     }
   }
-  if (!sourcemaps?.disable && viteConfig.build.sourcemap !== false) {
+  const sourceMapsFullyDisabled = sourcemaps?.disable === true;
+  const uploadDisabled = sourceMapsFullyDisabled || sourcemaps?.disable === "disable-upload";
+  if (!sourceMapsFullyDisabled && viteConfig.build.sourcemap !== false) {
     try {
       await cliInstance.execute(
         ["sourcemaps", "inject", reactRouterConfig.buildDirectory],
@@ -63,19 +70,24 @@ const sentryOnBuildEnd = async ({ reactRouterConfig, viteConfig }) => {
     } catch (error) {
       console.error("[Sentry] Could not inject debug ids", error);
     }
-    try {
-      await cliInstance.releases.uploadSourceMaps(release?.name || "undefined", {
-        include: [
-          {
-            paths: [reactRouterConfig.buildDirectory]
-          }
-        ],
-        live: "rejectOnError"
-      });
-    } catch (error) {
-      console.error("[Sentry] Could not upload sourcemaps", error);
+    if (!uploadDisabled) {
+      try {
+        await cliInstance.releases.uploadSourceMaps(release?.name || "undefined", {
+          include: [
+            {
+              paths: [reactRouterConfig.buildDirectory]
+            }
+          ],
+          live: "rejectOnError"
+        });
+      } catch (error) {
+        console.error("[Sentry] Could not upload sourcemaps", error);
+      }
     }
   }
+  if (uploadDisabled) {
+    return;
+  }
   let updatedFilesToDeleteAfterUpload = await sourcemaps?.filesToDeleteAfterUpload;
   if (typeof updatedFilesToDeleteAfterUpload === "undefined") {
     updatedFilesToDeleteAfterUpload = [`${reactRouterConfig.buildDirectory}/**/*.map`];

package/build/esm/vite/buildEnd/handleOnBuildEnd.js.map

@@ -1 +1 @@
-{"version":3,"file":"handleOnBuildEnd.js","sources":["../../../../src/vite/buildEnd/handleOnBuildEnd.ts"],"sourcesContent":["import { rm } from 'node:fs/promises';\nimport type { Config } from '@react-router/dev/config';\nimport SentryCli from '@sentry/cli';\nimport type { SentryVitePluginOptions } from '@sentry/vite-plugin';\nimport { glob } from 'glob';\nimport type { SentryReactRouterBuildOptions } from '../types';\n\ntype BuildEndHook = NonNullable<Config['buildEnd']>;\n\nfunction getSentryConfig(viteConfig: unknown): SentryReactRouterBuildOptions {\n  if (!viteConfig || typeof viteConfig !== 'object' || !('sentryConfig' in viteConfig)) {\n    // eslint-disable-next-line no-console\n    console.error('[Sentry] sentryConfig not found - it needs to be passed to vite.config.ts');\n  }\n\n  return (viteConfig as { sentryConfig: SentryReactRouterBuildOptions }).sentryConfig;\n}\n\n/**\n * A build end hook that handles Sentry release creation and source map uploads.\n * It creates a new Sentry release if configured, uploads source maps to Sentry,\n * and optionally deletes the source map files after upload.\n */\nexport const sentryOnBuildEnd: BuildEndHook = async ({ reactRouterConfig, viteConfig }) => {\n  const sentryConfig = getSentryConfig(viteConfig);\n\n  // todo(v11): Remove deprecated sourceMapsUploadOptions support (no need for spread/pick anymore)\n  const {\n    sourceMapsUploadOptions, // extract to exclude from rest config\n    ...sentryConfigWithoutDeprecatedSourceMapOption\n  } = sentryConfig;\n\n  const unstableSentryVitePluginOptions = sentryConfig.unstable_sentryVitePluginOptions;\n\n  const {\n    authToken,\n    org,\n    project,\n    release,\n    sourcemaps = { disable: false },\n    debug = false,\n  }: Omit<SentryReactRouterBuildOptions, 'sourcemaps' | 'sourceMapsUploadOptions'> &\n    // Pick 'sourcemaps' from Vite plugin options as the types allow more (e.g. Promise values for `deleteFilesAfterUpload`)\n    Pick<SentryVitePluginOptions, 'sourcemaps'> = {\n    ...unstableSentryVitePluginOptions,\n    ...sentryConfigWithoutDeprecatedSourceMapOption, // spread in the config without the deprecated sourceMapsUploadOptions\n    sourcemaps: {\n      ...unstableSentryVitePluginOptions?.sourcemaps,\n      ...sentryConfig.sourcemaps,\n      ...sourceMapsUploadOptions,\n      // eslint-disable-next-line typescript/no-deprecated\n      disable: sourceMapsUploadOptions?.enabled === false ? true : sentryConfig.sourcemaps?.disable,\n    },\n    release: {\n      ...unstableSentryVitePluginOptions?.release,\n      ...sentryConfig.release,\n    },\n    project: unstableSentryVitePluginOptions?.project\n      ? Array.isArray(unstableSentryVitePluginOptions?.project)\n        ? unstableSentryVitePluginOptions?.project[0]\n        : unstableSentryVitePluginOptions?.project\n      : sentryConfigWithoutDeprecatedSourceMapOption.project,\n  };\n\n  const cliInstance = new SentryCli(null, {\n    authToken,\n    org,\n    ...sentryConfig.unstable_sentryVitePluginOptions,\n    // same handling as in bundler plugins: https://github.com/getsentry/sentry-javascript-bundler-plugins/blob/05084f214c763a05137d863ff5a05ef38254f68d/packages/bundler-plugin-core/src/build-plugin-manager.ts#L102-L103\n    project: Array.isArray(project) ? project[0] : project,\n  });\n\n  // check if release should be created\n  if (release?.name) {\n    try {\n      await cliInstance.releases.new(release.name);\n    } catch (error) {\n      // eslint-disable-next-line no-console\n      console.error('[Sentry] Could not create release', error);\n    }\n  }\n\n  if (!sourcemaps?.disable && viteConfig.build.sourcemap !== false) {\n    // inject debugIds\n    try {\n      await cliInstance.execute(\n        ['sourcemaps', 'inject', reactRouterConfig.buildDirectory],\n        debug ? 'rejectOnError' : false,\n      );\n    } catch (error) {\n      // eslint-disable-next-line no-console\n      console.error('[Sentry] Could not inject debug ids', error);\n    }\n\n    // upload sourcemaps\n    try {\n      await cliInstance.releases.uploadSourceMaps(release?.name || 'undefined', {\n        include: [\n          {\n            paths: [reactRouterConfig.buildDirectory],\n          },\n        ],\n        live: 'rejectOnError',\n      });\n    } catch (error) {\n      // eslint-disable-next-line no-console\n      console.error('[Sentry] Could not upload sourcemaps', error);\n    }\n  }\n  // delete sourcemaps after upload\n  let updatedFilesToDeleteAfterUpload = await sourcemaps?.filesToDeleteAfterUpload;\n\n  // set a default value no option was set\n  if (typeof updatedFilesToDeleteAfterUpload === 'undefined') {\n    updatedFilesToDeleteAfterUpload = [`${reactRouterConfig.buildDirectory}/**/*.map`];\n    debug &&\n      // eslint-disable-next-line no-console\n      console.info(\n        `[Sentry] Automatically setting \\`sourceMapsUploadOptions.filesToDeleteAfterUpload: ${JSON.stringify(\n          updatedFilesToDeleteAfterUpload,\n        )}\\` to delete generated source maps after they were uploaded to Sentry.`,\n      );\n  }\n  if (updatedFilesToDeleteAfterUpload) {\n    try {\n      const filePathsToDelete = await glob(updatedFilesToDeleteAfterUpload, {\n        absolute: true,\n        nodir: true,\n      });\n      if (debug) {\n        filePathsToDelete.forEach(filePathToDelete => {\n          // eslint-disable-next-line no-console\n          console.info(`Deleting asset after upload: ${filePathToDelete}`);\n        });\n      }\n      await Promise.all(\n        filePathsToDelete.map(filePathToDelete =>\n          rm(filePathToDelete, { force: true }).catch((e: unknown) => {\n            // This is allowed to fail - we just don't do anything\n            debug &&\n              // eslint-disable-next-line no-console\n              console.debug(`An error occurred while attempting to delete asset: ${filePathToDelete}`, e);\n          }),\n        ),\n      );\n    } catch (error) {\n      // eslint-disable-next-line no-console\n      console.error('Error deleting files after sourcemap upload:', error);\n    }\n  }\n};\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"handleOnBuildEnd.js","sources":["../../../../src/vite/buildEnd/handleOnBuildEnd.ts"],"sourcesContent":["import { rm } from 'node:fs/promises';\nimport type { Config } from '@react-router/dev/config';\nimport SentryCli from '@sentry/cli';\nimport type { SentryVitePluginOptions } from '@sentry/bundler-plugins/vite';\nimport { glob } from 'glob';\nimport type { SentryReactRouterBuildOptions } from '../types';\n\ntype BuildEndHook = NonNullable<Config['buildEnd']>;\n\nfunction getSentryConfig(viteConfig: unknown): SentryReactRouterBuildOptions {\n  if (!viteConfig || typeof viteConfig !== 'object' || !('sentryConfig' in viteConfig)) {\n    // eslint-disable-next-line no-console\n    console.error('[Sentry] sentryConfig not found - it needs to be passed to vite.config.ts');\n  }\n\n  return (viteConfig as { sentryConfig: SentryReactRouterBuildOptions }).sentryConfig;\n}\n\n/**\n * This hook is the only place that injects debug IDs and uploads source maps for React\n * Router, so `disable` has to be honoured wherever the user set it. Reading it from the\n * top-level config only would silently ignore `unstable_sentryVitePluginOptions`.\n */\nfunction resolveSourceMapsDisable(sentryConfig: SentryReactRouterBuildOptions): boolean | 'disable-upload' | undefined {\n  // eslint-disable-next-line typescript/no-deprecated\n  if (sentryConfig.sourceMapsUploadOptions?.enabled === false) {\n    return true;\n  }\n\n  return sentryConfig.sourcemaps?.disable ?? sentryConfig.unstable_sentryVitePluginOptions?.sourcemaps?.disable;\n}\n\n/**\n * A build end hook that handles Sentry release creation and source map uploads.\n * It creates a new Sentry release if configured, uploads source maps to Sentry,\n * and optionally deletes the source map files after upload.\n */\nexport const sentryOnBuildEnd: BuildEndHook = async ({ reactRouterConfig, viteConfig }) => {\n  const sentryConfig = getSentryConfig(viteConfig);\n\n  // todo(v11): Remove deprecated sourceMapsUploadOptions support (no need for spread/pick anymore)\n  const {\n    sourceMapsUploadOptions, // extract to exclude from rest config\n    ...sentryConfigWithoutDeprecatedSourceMapOption\n  } = sentryConfig;\n\n  const unstableSentryVitePluginOptions = sentryConfig.unstable_sentryVitePluginOptions;\n\n  const {\n    authToken,\n    org,\n    project,\n    release,\n    sourcemaps = { disable: false },\n    debug = false,\n  }: Omit<SentryReactRouterBuildOptions, 'sourcemaps' | 'sourceMapsUploadOptions'> &\n    // Pick 'sourcemaps' from Vite plugin options as the types allow more (e.g. Promise values for `deleteFilesAfterUpload`)\n    Pick<SentryVitePluginOptions, 'sourcemaps'> = {\n    ...unstableSentryVitePluginOptions,\n    ...sentryConfigWithoutDeprecatedSourceMapOption, // spread in the config without the deprecated sourceMapsUploadOptions\n    sourcemaps: {\n      ...unstableSentryVitePluginOptions?.sourcemaps,\n      ...sentryConfig.sourcemaps,\n      ...sourceMapsUploadOptions,\n      disable: resolveSourceMapsDisable(sentryConfig),\n    },\n    release: {\n      ...unstableSentryVitePluginOptions?.release,\n      ...sentryConfig.release,\n    },\n    project: unstableSentryVitePluginOptions?.project\n      ? Array.isArray(unstableSentryVitePluginOptions?.project)\n        ? unstableSentryVitePluginOptions?.project[0]\n        : unstableSentryVitePluginOptions?.project\n      : sentryConfigWithoutDeprecatedSourceMapOption.project,\n  };\n\n  const cliInstance = new SentryCli(null, {\n    authToken,\n    org,\n    ...sentryConfig.unstable_sentryVitePluginOptions,\n    // same handling as in bundler plugins: https://github.com/getsentry/sentry-javascript-bundler-plugins/blob/05084f214c763a05137d863ff5a05ef38254f68d/packages/bundler-plugin-core/src/build-plugin-manager.ts#L102-L103\n    project: Array.isArray(project) ? project[0] : project,\n  });\n\n  // check if release should be created\n  if (release?.name) {\n    try {\n      await cliInstance.releases.new(release.name);\n    } catch (error) {\n      // eslint-disable-next-line no-console\n      console.error('[Sentry] Could not create release', error);\n    }\n  }\n\n  // `disable: 'disable-upload'` still injects debug IDs, so that source maps can be\n  // uploaded manually at a later point - only `true` turns source maps off entirely.\n  const sourceMapsFullyDisabled = sourcemaps?.disable === true;\n  const uploadDisabled = sourceMapsFullyDisabled || sourcemaps?.disable === 'disable-upload';\n\n  if (!sourceMapsFullyDisabled && viteConfig.build.sourcemap !== false) {\n    // inject debugIds\n    try {\n      await cliInstance.execute(\n        ['sourcemaps', 'inject', reactRouterConfig.buildDirectory],\n        debug ? 'rejectOnError' : false,\n      );\n    } catch (error) {\n      // eslint-disable-next-line no-console\n      console.error('[Sentry] Could not inject debug ids', error);\n    }\n\n    if (!uploadDisabled) {\n      // upload sourcemaps\n      try {\n        await cliInstance.releases.uploadSourceMaps(release?.name || 'undefined', {\n          include: [\n            {\n              paths: [reactRouterConfig.buildDirectory],\n            },\n          ],\n          live: 'rejectOnError',\n        });\n      } catch (error) {\n        // eslint-disable-next-line no-console\n        console.error('[Sentry] Could not upload sourcemaps', error);\n      }\n    }\n  }\n\n  // Only clean up source maps that were actually uploaded. Deleting them after skipping\n  // the upload would leave the user with neither, breaking a manual upload.\n  if (uploadDisabled) {\n    return;\n  }\n\n  // delete sourcemaps after upload\n  let updatedFilesToDeleteAfterUpload = await sourcemaps?.filesToDeleteAfterUpload;\n\n  // set a default value no option was set\n  if (typeof updatedFilesToDeleteAfterUpload === 'undefined') {\n    updatedFilesToDeleteAfterUpload = [`${reactRouterConfig.buildDirectory}/**/*.map`];\n    debug &&\n      // eslint-disable-next-line no-console\n      console.info(\n        `[Sentry] Automatically setting \\`sourceMapsUploadOptions.filesToDeleteAfterUpload: ${JSON.stringify(\n          updatedFilesToDeleteAfterUpload,\n        )}\\` to delete generated source maps after they were uploaded to Sentry.`,\n      );\n  }\n  if (updatedFilesToDeleteAfterUpload) {\n    try {\n      const filePathsToDelete = await glob(updatedFilesToDeleteAfterUpload, {\n        absolute: true,\n        nodir: true,\n      });\n      if (debug) {\n        filePathsToDelete.forEach(filePathToDelete => {\n          // eslint-disable-next-line no-console\n          console.info(`Deleting asset after upload: ${filePathToDelete}`);\n        });\n      }\n      await Promise.all(\n        filePathsToDelete.map(filePathToDelete =>\n          rm(filePathToDelete, { force: true }).catch((e: unknown) => {\n            // This is allowed to fail - we just don't do anything\n            debug &&\n              // eslint-disable-next-line no-console\n              console.debug(`An error occurred while attempting to delete asset: ${filePathToDelete}`, e);\n          }),\n        ),\n      );\n    } catch (error) {\n      // eslint-disable-next-line no-console\n      console.error('Error deleting files after sourcemap upload:', error);\n    }\n  }\n};\n"],"names":[],"mappings":"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"}