@sentry/core 10.53.1 → 10.54.0

package/build/esm/integrations/http/client-subscriptions.js

@@ -15,55 +15,42 @@ import { doubleWrapWarning } from './double-wrap-warning.js';
 function getHttpClientSubscriptions(options) {
   const propagationDecisionMap = new LRUMap(100);
   const getConfig = () => getClient()?.getOptions();
-
   const onHttpClientRequestCreated = (data) => {
-    // Skip all instrumentation if tracing is suppressed
-    // (e.g., Sentry's own transport uses this to avoid self-instrumentation)
     if (getCurrentScope().getScopeData().sdkProcessingMetadata[SUPPRESS_TRACING_KEY] === true) {
       return;
     }
-
     const clientOptions = getConfig();
     const {
-      errorMonitor = 'error',
+      errorMonitor = "error",
       spans: createSpans = clientOptions ? hasSpansEnabled(clientOptions) : true,
       propagateTrace = false,
       breadcrumbs = true,
       http,
       https,
-      suppressOtelWarning = false,
+      suppressOtelWarning = false
     } = options;
-
-    const { request } = data ;
-
-    // check if request is ignored. if so, we do nothing at all.
+    const { request } = data;
     if (options.ignoreOutgoingRequests?.(getRequestUrlFromClientRequest(request), request)) {
       return;
     }
-
-    // guard against adding breadcrumbs multiple times, or when not enabled
     let addedBreadcrumbs = false;
-    function addBreadcrumbs(request, response) {
+    function addBreadcrumbs(request2, response) {
       if (!addedBreadcrumbs) {
         addedBreadcrumbs = true;
-        addOutgoingRequestBreadcrumb(request, response);
+        addOutgoingRequestBreadcrumb(request2, response);
       }
     }
-
-    // called if spans and/or trace propagation are disabled
-    function breadcrumbsOnly(request) {
-      request.on(errorMonitor, () => addBreadcrumbs(request, undefined));
-      request.prependListener('response', response => {
-        if (request.listenerCount('response') <= 1) {
+    function breadcrumbsOnly(request2) {
+      request2.on(errorMonitor, () => addBreadcrumbs(request2, void 0));
+      request2.prependListener("response", (response) => {
+        if (request2.listenerCount("response") <= 1) {
           response.resume();
         }
-        response.on('end', () => addBreadcrumbs(request, response));
-        response.on(errorMonitor, () => addBreadcrumbs(request, response));
+        response.on("end", () => addBreadcrumbs(request2, response));
+        response.on(errorMonitor, () => addBreadcrumbs(request2, response));
       });
     }
-
     if (!createSpans) {
-      // no spans, but maybe tracing and/or breadcrumbs
       if (breadcrumbs) {
         breadcrumbsOnly(request);
       }
@@ -72,21 +59,12 @@ function getHttpClientSubscriptions(options) {
       }
       return;
     }
-
-    // guard against OTel wrapping the same module and emitting double-spans
-    // this doesn't prevent it, just prints a debug warning for the user.
     if (!suppressOtelWarning) {
       if (http) doubleWrapWarning(http);
       if (https) doubleWrapWarning(https);
     }
-
-    // spans are enabled
     const span = startInactiveSpan(getOutgoingRequestSpanData(request));
     options.outgoingRequestHook?.(span, request);
-
-    // Inject trace headers after span creation so sentry-trace contains the
-    // outgoing span's ID (not the parent's), enabling downstream services to
-    // link to this span.
     if (propagateTrace) {
       if (span.isRecording()) {
         withActiveSpan(span, () => {
@@ -96,7 +74,6 @@ function getHttpClientSubscriptions(options) {
         injectTracePropagationHeaders(request, propagationDecisionMap);
       }
     }
-
     let spanEnded = false;
     function endSpan(status) {
       if (!spanEnded) {
@@ -105,58 +82,44 @@ function getHttpClientSubscriptions(options) {
         span.end();
       }
     }
-
-    // Fallback: end span if the connection closes before any response.
-    // This is removed if we do get a response, because in that case
-    // we want to only end the span when the response is finished.
     const requestOnClose = () => endSpan({ code: SPAN_STATUS_UNSET });
-    request.on('close', requestOnClose);
-
-    request.on(errorMonitor, error => {
-      DEBUG_BUILD && debug.log(LOG_PREFIX, 'outgoingRequest on request error()', error);
+    request.on("close", requestOnClose);
+    request.on(errorMonitor, (error) => {
+      DEBUG_BUILD && debug.log(LOG_PREFIX, "outgoingRequest on request error()", error);
       if (breadcrumbs) {
-        addBreadcrumbs(request, undefined);
+        addBreadcrumbs(request, void 0);
       }
       endSpan({ code: SPAN_STATUS_ERROR });
     });
-
-    request.prependListener('response', response => {
-      // no longer need this, listen on response now.
-      // do not end the span until the response finishes
-      request.removeListener('close', requestOnClose);
-      if (request.listenerCount('response') <= 1) {
+    request.prependListener("response", (response) => {
+      request.removeListener("close", requestOnClose);
+      if (request.listenerCount("response") <= 1) {
         response.resume();
       }
       setIncomingResponseSpanData(response, span);
       options.outgoingResponseHook?.(span, response);
-
       let finished = false;
       function finishWithResponse(error) {
         if (!finished) {
           finished = true;
           if (error) {
-            DEBUG_BUILD && debug.log(LOG_PREFIX, 'outgoingRequest on response error()', error);
+            DEBUG_BUILD && debug.log(LOG_PREFIX, "outgoingRequest on response error()", error);
           }
           if (breadcrumbs) {
             addBreadcrumbs(request, response);
           }
           const aborted = response.aborted && !response.complete;
-          const status =
-            error || typeof response.statusCode !== 'number' || aborted
-              ? { code: SPAN_STATUS_ERROR }
-              : getSpanStatusFromHttpCode(response.statusCode);
+          const status = error || typeof response.statusCode !== "number" || aborted ? { code: SPAN_STATUS_ERROR } : getSpanStatusFromHttpCode(response.statusCode);
           options.applyCustomAttributesOnSpan?.(span, request, response);
           endSpan(status);
         }
       }
-
-      response.on('end', () => finishWithResponse());
+      response.on("end", () => finishWithResponse());
       response.on(errorMonitor, finishWithResponse);
     });
   };
-
   return {
-    [HTTP_ON_CLIENT_REQUEST]: onHttpClientRequestCreated,
+    [HTTP_ON_CLIENT_REQUEST]: onHttpClientRequestCreated
   };
 }
 

package/build/esm/integrations/http/client-subscriptions.js.map

@@ -1 +1 @@
-{"version":3,"file":"client-subscriptions.js","sources":["../../../../src/integrations/http/client-subscriptions.ts"],"sourcesContent":["/**\n * Define the channels and subscription methods to subscribe to in order to\n * instrument the `node:http` module. Note that this does *not* actually\n * register the subscriptions, it simply returns a data object with the\n * channel names and the subscription handlers. Attach these to diagnostic\n * channels on Node versions where they are supported (ie, >=22.12.0).\n *\n * If any other platforms that do support diagnostic channels eventually add\n * channel coverage for the `node:http` client, then these methods can be\n * used on those platforms as well.\n *\n * This implementation is used in the client-patch strategy, by simply\n * calling the handlers with the relevant data at the appropriate time.\n */\n\nimport type { SpanStatus } from '../../types-hoist/spanStatus';\nimport { addOutgoingRequestBreadcrumb } from './add-outgoing-request-breadcrumb';\nimport {\n  getSpanStatusFromHttpCode,\n  SPAN_STATUS_ERROR,\n  SPAN_STATUS_UNSET,\n  startInactiveSpan,\n  SUPPRESS_TRACING_KEY,\n  withActiveSpan,\n} from '../../tracing';\nimport { debug } from '../../utils/debug-logger';\nimport { LRUMap } from '../../utils/lru';\nimport { getOutgoingRequestSpanData, setIncomingResponseSpanData } from './get-outgoing-span-data';\nimport { getRequestUrlFromClientRequest } from './get-request-url';\nimport { injectTracePropagationHeaders } from './inject-trace-propagation-headers';\nimport type { HttpInstrumentationOptions, HttpClientRequest, HttpIncomingMessage } from './types';\nimport { DEBUG_BUILD } from '../../debug-build';\nimport { LOG_PREFIX, HTTP_ON_CLIENT_REQUEST } from './constants';\nimport type { ClientSubscriptionName } from './constants';\nimport { getClient, getCurrentScope } from '../../currentScopes';\nimport { hasSpansEnabled } from '../../utils/hasSpansEnabled';\nimport { doubleWrapWarning } from './double-wrap-warning';\n\ntype ChannelListener = (message: unknown, name: string | symbol) => void;\n\nexport type HttpClientSubscriptions = Record<ClientSubscriptionName, ChannelListener>;\n\nexport function getHttpClientSubscriptions(options: HttpInstrumentationOptions): HttpClientSubscriptions {\n  const propagationDecisionMap = new LRUMap<string, boolean>(100);\n  const getConfig = () => getClient()?.getOptions();\n\n  const onHttpClientRequestCreated: ChannelListener = (data: unknown): void => {\n    // Skip all instrumentation if tracing is suppressed\n    // (e.g., Sentry's own transport uses this to avoid self-instrumentation)\n    if (getCurrentScope().getScopeData().sdkProcessingMetadata[SUPPRESS_TRACING_KEY] === true) {\n      return;\n    }\n\n    const clientOptions = getConfig();\n    const {\n      errorMonitor = 'error',\n      spans: createSpans = clientOptions ? hasSpansEnabled(clientOptions) : true,\n      propagateTrace = false,\n      breadcrumbs = true,\n      http,\n      https,\n      suppressOtelWarning = false,\n    } = options;\n\n    const { request } = data as { request: HttpClientRequest };\n\n    // check if request is ignored. if so, we do nothing at all.\n    if (options.ignoreOutgoingRequests?.(getRequestUrlFromClientRequest(request), request)) {\n      return;\n    }\n\n    // guard against adding breadcrumbs multiple times, or when not enabled\n    let addedBreadcrumbs = false;\n    function addBreadcrumbs(request: HttpClientRequest, response: HttpIncomingMessage | undefined) {\n      if (!addedBreadcrumbs) {\n        addedBreadcrumbs = true;\n        addOutgoingRequestBreadcrumb(request, response);\n      }\n    }\n\n    // called if spans and/or trace propagation are disabled\n    function breadcrumbsOnly(request: HttpClientRequest) {\n      request.on(errorMonitor, () => addBreadcrumbs(request, undefined));\n      request.prependListener('response', response => {\n        if (request.listenerCount('response') <= 1) {\n          response.resume();\n        }\n        response.on('end', () => addBreadcrumbs(request, response));\n        response.on(errorMonitor, () => addBreadcrumbs(request, response));\n      });\n    }\n\n    if (!createSpans) {\n      // no spans, but maybe tracing and/or breadcrumbs\n      if (breadcrumbs) {\n        breadcrumbsOnly(request);\n      }\n      if (propagateTrace) {\n        injectTracePropagationHeaders(request, propagationDecisionMap);\n      }\n      return;\n    }\n\n    // guard against OTel wrapping the same module and emitting double-spans\n    // this doesn't prevent it, just prints a debug warning for the user.\n    if (!suppressOtelWarning) {\n      if (http) doubleWrapWarning(http);\n      if (https) doubleWrapWarning(https);\n    }\n\n    // spans are enabled\n    const span = startInactiveSpan(getOutgoingRequestSpanData(request));\n    options.outgoingRequestHook?.(span, request);\n\n    // Inject trace headers after span creation so sentry-trace contains the\n    // outgoing span's ID (not the parent's), enabling downstream services to\n    // link to this span.\n    if (propagateTrace) {\n      if (span.isRecording()) {\n        withActiveSpan(span, () => {\n          injectTracePropagationHeaders(request, propagationDecisionMap);\n        });\n      } else {\n        injectTracePropagationHeaders(request, propagationDecisionMap);\n      }\n    }\n\n    let spanEnded = false;\n    function endSpan(status: SpanStatus): void {\n      if (!spanEnded) {\n        spanEnded = true;\n        span.setStatus(status);\n        span.end();\n      }\n    }\n\n    // Fallback: end span if the connection closes before any response.\n    // This is removed if we do get a response, because in that case\n    // we want to only end the span when the response is finished.\n    const requestOnClose = () => endSpan({ code: SPAN_STATUS_UNSET });\n    request.on('close', requestOnClose);\n\n    request.on(errorMonitor, error => {\n      DEBUG_BUILD && debug.log(LOG_PREFIX, 'outgoingRequest on request error()', error);\n      if (breadcrumbs) {\n        addBreadcrumbs(request, undefined);\n      }\n      endSpan({ code: SPAN_STATUS_ERROR });\n    });\n\n    request.prependListener('response', response => {\n      // no longer need this, listen on response now.\n      // do not end the span until the response finishes\n      request.removeListener('close', requestOnClose);\n      if (request.listenerCount('response') <= 1) {\n        response.resume();\n      }\n      setIncomingResponseSpanData(response, span);\n      options.outgoingResponseHook?.(span, response);\n\n      let finished = false;\n      function finishWithResponse(error?: unknown): void {\n        if (!finished) {\n          finished = true;\n          if (error) {\n            DEBUG_BUILD && debug.log(LOG_PREFIX, 'outgoingRequest on response error()', error);\n          }\n          if (breadcrumbs) {\n            addBreadcrumbs(request, response);\n          }\n          const aborted = response.aborted && !response.complete;\n          const status: SpanStatus =\n            error || typeof response.statusCode !== 'number' || aborted\n              ? { code: SPAN_STATUS_ERROR }\n              : getSpanStatusFromHttpCode(response.statusCode);\n          options.applyCustomAttributesOnSpan?.(span, request, response);\n          endSpan(status);\n        }\n      }\n\n      response.on('end', () => finishWithResponse());\n      response.on(errorMonitor, finishWithResponse);\n    });\n  };\n\n  return {\n    [HTTP_ON_CLIENT_REQUEST]: onHttpClientRequestCreated,\n  };\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"client-subscriptions.js","sources":["../../../../src/integrations/http/client-subscriptions.ts"],"sourcesContent":["/**\n * Define the channels and subscription methods to subscribe to in order to\n * instrument the `node:http` module. Note that this does *not* actually\n * register the subscriptions, it simply returns a data object with the\n * channel names and the subscription handlers. Attach these to diagnostic\n * channels on Node versions where they are supported (ie, >=22.12.0).\n *\n * If any other platforms that do support diagnostic channels eventually add\n * channel coverage for the `node:http` client, then these methods can be\n * used on those platforms as well.\n *\n * This implementation is used in the client-patch strategy, by simply\n * calling the handlers with the relevant data at the appropriate time.\n */\n\nimport type { SpanStatus } from '../../types/spanStatus';\nimport { addOutgoingRequestBreadcrumb } from './add-outgoing-request-breadcrumb';\nimport {\n  getSpanStatusFromHttpCode,\n  SPAN_STATUS_ERROR,\n  SPAN_STATUS_UNSET,\n  startInactiveSpan,\n  SUPPRESS_TRACING_KEY,\n  withActiveSpan,\n} from '../../tracing';\nimport { debug } from '../../utils/debug-logger';\nimport { LRUMap } from '../../utils/lru';\nimport { getOutgoingRequestSpanData, setIncomingResponseSpanData } from './get-outgoing-span-data';\nimport { getRequestUrlFromClientRequest } from './get-request-url';\nimport { injectTracePropagationHeaders } from './inject-trace-propagation-headers';\nimport type { HttpInstrumentationOptions, HttpClientRequest, HttpIncomingMessage } from './types';\nimport { DEBUG_BUILD } from '../../debug-build';\nimport { LOG_PREFIX, HTTP_ON_CLIENT_REQUEST } from './constants';\nimport type { ClientSubscriptionName } from './constants';\nimport { getClient, getCurrentScope } from '../../currentScopes';\nimport { hasSpansEnabled } from '../../utils/hasSpansEnabled';\nimport { doubleWrapWarning } from './double-wrap-warning';\n\ntype ChannelListener = (message: unknown, name: string | symbol) => void;\n\nexport type HttpClientSubscriptions = Record<ClientSubscriptionName, ChannelListener>;\n\nexport function getHttpClientSubscriptions(options: HttpInstrumentationOptions): HttpClientSubscriptions {\n  const propagationDecisionMap = new LRUMap<string, boolean>(100);\n  const getConfig = () => getClient()?.getOptions();\n\n  const onHttpClientRequestCreated: ChannelListener = (data: unknown): void => {\n    // Skip all instrumentation if tracing is suppressed\n    // (e.g., Sentry's own transport uses this to avoid self-instrumentation)\n    if (getCurrentScope().getScopeData().sdkProcessingMetadata[SUPPRESS_TRACING_KEY] === true) {\n      return;\n    }\n\n    const clientOptions = getConfig();\n    const {\n      errorMonitor = 'error',\n      spans: createSpans = clientOptions ? hasSpansEnabled(clientOptions) : true,\n      propagateTrace = false,\n      breadcrumbs = true,\n      http,\n      https,\n      suppressOtelWarning = false,\n    } = options;\n\n    const { request } = data as { request: HttpClientRequest };\n\n    // check if request is ignored. if so, we do nothing at all.\n    if (options.ignoreOutgoingRequests?.(getRequestUrlFromClientRequest(request), request)) {\n      return;\n    }\n\n    // guard against adding breadcrumbs multiple times, or when not enabled\n    let addedBreadcrumbs = false;\n    function addBreadcrumbs(request: HttpClientRequest, response: HttpIncomingMessage | undefined) {\n      if (!addedBreadcrumbs) {\n        addedBreadcrumbs = true;\n        addOutgoingRequestBreadcrumb(request, response);\n      }\n    }\n\n    // called if spans and/or trace propagation are disabled\n    function breadcrumbsOnly(request: HttpClientRequest) {\n      request.on(errorMonitor, () => addBreadcrumbs(request, undefined));\n      request.prependListener('response', response => {\n        if (request.listenerCount('response') <= 1) {\n          response.resume();\n        }\n        response.on('end', () => addBreadcrumbs(request, response));\n        response.on(errorMonitor, () => addBreadcrumbs(request, response));\n      });\n    }\n\n    if (!createSpans) {\n      // no spans, but maybe tracing and/or breadcrumbs\n      if (breadcrumbs) {\n        breadcrumbsOnly(request);\n      }\n      if (propagateTrace) {\n        injectTracePropagationHeaders(request, propagationDecisionMap);\n      }\n      return;\n    }\n\n    // guard against OTel wrapping the same module and emitting double-spans\n    // this doesn't prevent it, just prints a debug warning for the user.\n    if (!suppressOtelWarning) {\n      if (http) doubleWrapWarning(http);\n      if (https) doubleWrapWarning(https);\n    }\n\n    // spans are enabled\n    const span = startInactiveSpan(getOutgoingRequestSpanData(request));\n    options.outgoingRequestHook?.(span, request);\n\n    // Inject trace headers after span creation so sentry-trace contains the\n    // outgoing span's ID (not the parent's), enabling downstream services to\n    // link to this span.\n    if (propagateTrace) {\n      if (span.isRecording()) {\n        withActiveSpan(span, () => {\n          injectTracePropagationHeaders(request, propagationDecisionMap);\n        });\n      } else {\n        injectTracePropagationHeaders(request, propagationDecisionMap);\n      }\n    }\n\n    let spanEnded = false;\n    function endSpan(status: SpanStatus): void {\n      if (!spanEnded) {\n        spanEnded = true;\n        span.setStatus(status);\n        span.end();\n      }\n    }\n\n    // Fallback: end span if the connection closes before any response.\n    // This is removed if we do get a response, because in that case\n    // we want to only end the span when the response is finished.\n    const requestOnClose = () => endSpan({ code: SPAN_STATUS_UNSET });\n    request.on('close', requestOnClose);\n\n    request.on(errorMonitor, error => {\n      DEBUG_BUILD && debug.log(LOG_PREFIX, 'outgoingRequest on request error()', error);\n      if (breadcrumbs) {\n        addBreadcrumbs(request, undefined);\n      }\n      endSpan({ code: SPAN_STATUS_ERROR });\n    });\n\n    request.prependListener('response', response => {\n      // no longer need this, listen on response now.\n      // do not end the span until the response finishes\n      request.removeListener('close', requestOnClose);\n      if (request.listenerCount('response') <= 1) {\n        response.resume();\n      }\n      setIncomingResponseSpanData(response, span);\n      options.outgoingResponseHook?.(span, response);\n\n      let finished = false;\n      function finishWithResponse(error?: unknown): void {\n        if (!finished) {\n          finished = true;\n          if (error) {\n            DEBUG_BUILD && debug.log(LOG_PREFIX, 'outgoingRequest on response error()', error);\n          }\n          if (breadcrumbs) {\n            addBreadcrumbs(request, response);\n          }\n          const aborted = response.aborted && !response.complete;\n          const status: SpanStatus =\n            error || typeof response.statusCode !== 'number' || aborted\n              ? { code: SPAN_STATUS_ERROR }\n              : getSpanStatusFromHttpCode(response.statusCode);\n          options.applyCustomAttributesOnSpan?.(span, request, response);\n          endSpan(status);\n        }\n      }\n\n      response.on('end', () => finishWithResponse());\n      response.on(errorMonitor, finishWithResponse);\n    });\n  };\n\n  return {\n    [HTTP_ON_CLIENT_REQUEST]: onHttpClientRequestCreated,\n  };\n}\n"],"names":["request"],"mappings":"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"}

package/build/esm/integrations/http/constants.js

@@ -1,6 +1,6 @@
-const LOG_PREFIX = '@sentry/instrumentation-http';
-const HTTP_ON_CLIENT_REQUEST = 'http.client.request.created';
-const HTTP_ON_SERVER_REQUEST = 'http.server.request.start';
+const LOG_PREFIX = "@sentry/instrumentation-http";
+const HTTP_ON_CLIENT_REQUEST = "http.client.request.created";
+const HTTP_ON_SERVER_REQUEST = "http.server.request.start";
 
 export { HTTP_ON_CLIENT_REQUEST, HTTP_ON_SERVER_REQUEST, LOG_PREFIX };
 //# sourceMappingURL=constants.js.map

package/build/esm/integrations/http/double-wrap-warning.js

@@ -1,26 +1,18 @@
 import { DEBUG_BUILD } from '../../debug-build.js';
 import { debug } from '../../utils/debug-logger.js';
 
-const isOtelWrapped = (fn) =>
-  typeof fn.__unwrap === 'function';
-
-// exported for tess
-const warning =
-  'Double-wrapped http.client detected. Either disable spans in Sentry.httpIntegration, or disable the OpenTelemetry HTTP instrumentation.';
-
+const isOtelWrapped = (fn) => typeof fn.__unwrap === "function";
+const warning = "Double-wrapped http.client detected. Either disable spans in Sentry.httpIntegration, or disable the OpenTelemetry HTTP instrumentation. See: https://docs.sentry.io/platforms/javascript/guides/express/opentelemetry/custom-setup/#custom-http-instrumentation";
 let didDoubleWrapWarning = false;
-// no-op in non-debug builds
-const doubleWrapWarning = DEBUG_BUILD
-  ? (http) => {
-      if (!didDoubleWrapWarning) {
-        if (isOtelWrapped(http.request) || isOtelWrapped(http.get)) {
-          // TODO: add link to documentation
-          didDoubleWrapWarning = true;
-          debug.warn(warning);
-        }
-      }
+const doubleWrapWarning = DEBUG_BUILD ? (http) => {
+  if (!didDoubleWrapWarning) {
+    if (isOtelWrapped(http.request) || isOtelWrapped(http.get)) {
+      didDoubleWrapWarning = true;
+      debug.warn(warning);
     }
-  : () => {};
+  }
+} : () => {
+};
 
 export { doubleWrapWarning, warning };
 //# sourceMappingURL=double-wrap-warning.js.map

package/build/esm/integrations/http/double-wrap-warning.js.map

@@ -1 +1 @@
-{"version":3,"file":"double-wrap-warning.js","sources":["../../../../src/integrations/http/double-wrap-warning.ts"],"sourcesContent":["import { DEBUG_BUILD } from '../../debug-build';\nimport { debug } from '../../utils/debug-logger';\nimport type { HttpModuleExport } from './types';\n\nconst isOtelWrapped = (fn: Function & { __unwrap?: Function }): fn is Function & { __unwrap: Function } =>\n  typeof fn.__unwrap === 'function';\n\n// exported for tess\nexport const warning =\n  'Double-wrapped http.client detected. Either disable spans in Sentry.httpIntegration, or disable the OpenTelemetry HTTP instrumentation.';\n\nlet didDoubleWrapWarning = false;\n// no-op in non-debug builds\nexport const doubleWrapWarning = DEBUG_BUILD\n  ? (http: HttpModuleExport) => {\n      if (!didDoubleWrapWarning) {\n        if (isOtelWrapped(http.request) || isOtelWrapped(http.get)) {\n          // TODO: add link to documentation\n          didDoubleWrapWarning = true;\n          debug.warn(warning);\n        }\n      }\n    }\n  : () => {};\n"],"names":[],"mappings":";;;AAIA,MAAM,aAAA,GAAgB,CAAC,EAAE;AACzB,EAAE,OAAO,EAAE,CAAC,QAAA,KAAa,UAAU;;AAEnC;MACa,OAAA;AACb,EAAE;;AAEF,IAAI,oBAAA,GAAuB,KAAK;AAChC;AACO,MAAM,oBAAoB;AACjC,IAAI,CAAC,IAAI,KAAuB;AAChC,MAAM,IAAI,CAAC,oBAAoB,EAAE;AACjC,QAAQ,IAAI,aAAa,CAAC,IAAI,CAAC,OAAO,CAAA,IAAK,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;AACpE;AACA,UAAU,oBAAA,GAAuB,IAAI;AACrC,UAAU,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC;AAC7B,QAAQ;AACR,MAAM;AACN,IAAI;AACJ,IAAI,MAAM,CAAC;;;;"}
+{"version":3,"file":"double-wrap-warning.js","sources":["../../../../src/integrations/http/double-wrap-warning.ts"],"sourcesContent":["import { DEBUG_BUILD } from '../../debug-build';\nimport { debug } from '../../utils/debug-logger';\nimport type { HttpModuleExport } from './types';\n\nconst isOtelWrapped = (fn: Function & { __unwrap?: Function }): fn is Function & { __unwrap: Function } =>\n  typeof fn.__unwrap === 'function';\n\n// exported for tess\nexport const warning =\n  'Double-wrapped http.client detected. Either disable spans in Sentry.httpIntegration, or disable the OpenTelemetry HTTP instrumentation. See: https://docs.sentry.io/platforms/javascript/guides/express/opentelemetry/custom-setup/#custom-http-instrumentation';\n\nlet didDoubleWrapWarning = false;\n// no-op in non-debug builds\nexport const doubleWrapWarning = DEBUG_BUILD\n  ? (http: HttpModuleExport) => {\n      if (!didDoubleWrapWarning) {\n        if (isOtelWrapped(http.request) || isOtelWrapped(http.get)) {\n          didDoubleWrapWarning = true;\n          debug.warn(warning);\n        }\n      }\n    }\n  : () => {};\n"],"names":[],"mappings":";;;AAIA,MAAM,aAAA,GAAgB,CAAC,EAAA,KACrB,OAAO,GAAG,QAAA,KAAa,UAAA;AAGlB,MAAM,OAAA,GACX;AAEF,IAAI,oBAAA,GAAuB,KAAA;AAEpB,MAAM,iBAAA,GAAoB,WAAA,GAC7B,CAAC,IAAA,KAA2B;AAC1B,EAAA,IAAI,CAAC,oBAAA,EAAsB;AACzB,IAAA,IAAI,cAAc,IAAA,CAAK,OAAO,KAAK,aAAA,CAAc,IAAA,CAAK,GAAG,CAAA,EAAG;AAC1D,MAAA,oBAAA,GAAuB,IAAA;AACvB,MAAA,KAAA,CAAM,KAAK,OAAO,CAAA;AAAA,IACpB;AAAA,EACF;AACF,CAAA,GACA,MAAM;AAAC;;;;"}

package/build/esm/integrations/http/get-outgoing-span-data.js

@@ -2,83 +2,66 @@ import { SEMANTIC_ATTRIBUTE_SENTRY_OP } from '../../semanticAttributes.js';
 import { getHttpSpanDetailsFromUrlObject, parseStringToURLObject } from '../../utils/url.js';
 import { getRequestUrlFromClientRequest } from './get-request-url.js';
 
-/**
- * Build the initial span name and attributes for an outgoing HTTP request.
- * This is called before the span is created, to get the initial details.
- */
 function getOutgoingRequestSpanData(request) {
   const url = getRequestUrlFromClientRequest(request);
   const [name, attributes] = getHttpSpanDetailsFromUrlObject(
     parseStringToURLObject(url),
-    'client',
-    'auto.http.client',
-    request,
+    "client",
+    "auto.http.client",
+    request
   );
-
-  const userAgent = request.getHeader('user-agent');
-
+  const userAgent = request.getHeader("user-agent");
   return {
     name,
     attributes: {
       // TODO(v11): Update these to the Sentry semantic attributes for urls.
       // https://getsentry.github.io/sentry-conventions/attributes/
-      [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'http.client',
-      'otel.kind': 'CLIENT',
-      'http.url': url,
-      'http.method': request.method,
-      'http.target': request.path || '/',
-      'net.peer.name': request.host,
-      'http.host': request.getHeader('host') ,
-      ...(userAgent ? { 'user_agent.original': userAgent  } : {}),
-      ...attributes,
+      [SEMANTIC_ATTRIBUTE_SENTRY_OP]: "http.client",
+      "otel.kind": "CLIENT",
+      "http.url": url,
+      "http.method": request.method,
+      "http.target": request.path || "/",
+      "net.peer.name": request.host,
+      "http.host": request.getHeader("host"),
+      ...userAgent ? { "user_agent.original": userAgent } : {},
+      ...attributes
     },
-    onlyIfParent: true,
+    onlyIfParent: true
   };
 }
-
-/**
- * Add span attributes once the response is received.
- */
 function setIncomingResponseSpanData(response, span) {
   const { statusCode, statusMessage, httpVersion, socket } = response;
-  const transport = httpVersion?.toUpperCase() !== 'QUIC' ? 'ip_tcp' : 'ip_udp';
-
+  const transport = httpVersion?.toUpperCase() !== "QUIC" ? "ip_tcp" : "ip_udp";
   span.setAttributes({
-    'http.response.status_code': statusCode,
-    'network.protocol.version': httpVersion,
+    "http.response.status_code": statusCode,
+    "network.protocol.version": httpVersion,
     // TODO(v11): Update these to the Sentry semantic attributes for urls.
     // https://getsentry.github.io/sentry-conventions/attributes/
-    'http.flavor': httpVersion,
-    'network.transport': transport,
-    'net.transport': transport,
-    'http.status_text': statusMessage?.toUpperCase(),
-    'http.status_code': statusCode,
+    "http.flavor": httpVersion,
+    "network.transport": transport,
+    "net.transport": transport,
+    "http.status_text": statusMessage?.toUpperCase(),
+    "http.status_code": statusCode,
     ...getResponseContentLengthAttributes(response),
-    ...getSocketAttrs(socket),
+    ...getSocketAttrs(socket)
   });
 }
-
 function getSocketAttrs(socket) {
   if (!socket) return {};
   const { remoteAddress, remotePort } = socket;
   return {
-    'network.peer.address': remoteAddress,
-    'network.peer.port': remotePort,
-    'net.peer.ip': remoteAddress,
-    'net.peer.port': remotePort,
+    "network.peer.address": remoteAddress,
+    "network.peer.port": remotePort,
+    "net.peer.ip": remoteAddress,
+    "net.peer.port": remotePort
   };
 }
-
 function getResponseContentLengthAttributes(response) {
   const { headers } = response;
-  const contentLengthHeader = headers['content-length'];
+  const contentLengthHeader = headers["content-length"];
   const length = contentLengthHeader ? parseInt(String(contentLengthHeader), 10) : -1;
-  const encoding = headers['content-encoding'];
-  return length >= 0
-    ? encoding && encoding !== 'identity'
-      ? { 'http.response_content_length': length }
-      : { 'http.response_content_length_uncompressed': length }
-    : {};
+  const encoding = headers["content-encoding"];
+  return length >= 0 ? encoding && encoding !== "identity" ? { "http.response_content_length": length } : { "http.response_content_length_uncompressed": length } : {};
 }
 
 export { getOutgoingRequestSpanData, setIncomingResponseSpanData };

package/build/esm/integrations/http/get-outgoing-span-data.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-outgoing-span-data.js","sources":["../../../../src/integrations/http/get-outgoing-span-data.ts"],"sourcesContent":["import type { Span, SpanAttributes } from '../../types-hoist/span';\nimport { SEMANTIC_ATTRIBUTE_SENTRY_OP } from '../../semanticAttributes';\nimport { getHttpSpanDetailsFromUrlObject, parseStringToURLObject } from '../../utils/url';\nimport type { HttpClientRequest, HttpIncomingMessage } from './types';\nimport { getRequestUrlFromClientRequest } from './get-request-url';\nimport type { StartSpanOptions } from '../../types-hoist/startSpanOptions';\n\n/**\n * Build the initial span name and attributes for an outgoing HTTP request.\n * This is called before the span is created, to get the initial details.\n */\nexport function getOutgoingRequestSpanData(request: HttpClientRequest): StartSpanOptions {\n  const url = getRequestUrlFromClientRequest(request);\n  const [name, attributes] = getHttpSpanDetailsFromUrlObject(\n    parseStringToURLObject(url),\n    'client',\n    'auto.http.client',\n    request,\n  );\n\n  const userAgent = request.getHeader('user-agent');\n\n  return {\n    name,\n    attributes: {\n      // TODO(v11): Update these to the Sentry semantic attributes for urls.\n      // https://getsentry.github.io/sentry-conventions/attributes/\n      [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'http.client',\n      'otel.kind': 'CLIENT',\n      'http.url': url,\n      'http.method': request.method,\n      'http.target': request.path || '/',\n      'net.peer.name': request.host,\n      'http.host': request.getHeader('host') as string | undefined,\n      ...(userAgent ? { 'user_agent.original': userAgent as string } : {}),\n      ...attributes,\n    },\n    onlyIfParent: true,\n  };\n}\n\n/**\n * Add span attributes once the response is received.\n */\nexport function setIncomingResponseSpanData(response: HttpIncomingMessage, span: Span): void {\n  const { statusCode, statusMessage, httpVersion, socket } = response;\n  const transport = httpVersion?.toUpperCase() !== 'QUIC' ? 'ip_tcp' : 'ip_udp';\n\n  span.setAttributes({\n    'http.response.status_code': statusCode,\n    'network.protocol.version': httpVersion,\n    // TODO(v11): Update these to the Sentry semantic attributes for urls.\n    // https://getsentry.github.io/sentry-conventions/attributes/\n    'http.flavor': httpVersion,\n    'network.transport': transport,\n    'net.transport': transport,\n    'http.status_text': statusMessage?.toUpperCase(),\n    'http.status_code': statusCode,\n    ...getResponseContentLengthAttributes(response),\n    ...getSocketAttrs(socket),\n  });\n}\n\nfunction getSocketAttrs(socket: HttpIncomingMessage['socket']): SpanAttributes {\n  if (!socket) return {};\n  const { remoteAddress, remotePort } = socket;\n  return {\n    'network.peer.address': remoteAddress,\n    'network.peer.port': remotePort,\n    'net.peer.ip': remoteAddress,\n    'net.peer.port': remotePort,\n  };\n}\n\nfunction getResponseContentLengthAttributes(response: HttpIncomingMessage): SpanAttributes {\n  const { headers } = response;\n  const contentLengthHeader = headers['content-length'];\n  const length = contentLengthHeader ? parseInt(String(contentLengthHeader), 10) : -1;\n  const encoding = headers['content-encoding'];\n  return length >= 0\n    ? encoding && encoding !== 'identity'\n      ? { 'http.response_content_length': length }\n      : { 'http.response_content_length_uncompressed': length }\n    : {};\n}\n"],"names":[],"mappings":";;;;AAOA;AACA;AACA;AACA;AACO,SAAS,0BAA0B,CAAC,OAAO,EAAuC;AACzF,EAAE,MAAM,GAAA,GAAM,8BAA8B,CAAC,OAAO,CAAC;AACrD,EAAE,MAAM,CAAC,IAAI,EAAE,UAAU,CAAA,GAAI,+BAA+B;AAC5D,IAAI,sBAAsB,CAAC,GAAG,CAAC;AAC/B,IAAI,QAAQ;AACZ,IAAI,kBAAkB;AACtB,IAAI,OAAO;AACX,GAAG;;AAEH,EAAE,MAAM,YAAY,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC;;AAEnD,EAAE,OAAO;AACT,IAAI,IAAI;AACR,IAAI,UAAU,EAAE;AAChB;AACA;AACA,MAAM,CAAC,4BAA4B,GAAG,aAAa;AACnD,MAAM,WAAW,EAAE,QAAQ;AAC3B,MAAM,UAAU,EAAE,GAAG;AACrB,MAAM,aAAa,EAAE,OAAO,CAAC,MAAM;AACnC,MAAM,aAAa,EAAE,OAAO,CAAC,IAAA,IAAQ,GAAG;AACxC,MAAM,eAAe,EAAE,OAAO,CAAC,IAAI;AACnC,MAAM,WAAW,EAAE,OAAO,CAAC,SAAS,CAAC,MAAM,CAAA;AAC3C,MAAM,IAAI,SAAA,GAAY,EAAE,qBAAqB,EAAE,SAAA,GAAoB,GAAI,EAAE,CAAC;AAC1E,MAAM,GAAG,UAAU;AACnB,KAAK;AACL,IAAI,YAAY,EAAE,IAAI;AACtB,GAAG;AACH;;AAEA;AACA;AACA;AACO,SAAS,2BAA2B,CAAC,QAAQ,EAAuB,IAAI,EAAc;AAC7F,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,WAAW,EAAE,MAAA,EAAO,GAAI,QAAQ;AACrE,EAAE,MAAM,SAAA,GAAY,WAAW,EAAE,WAAW,EAAC,KAAM,MAAA,GAAS,QAAA,GAAW,QAAQ;;AAE/E,EAAE,IAAI,CAAC,aAAa,CAAC;AACrB,IAAI,2BAA2B,EAAE,UAAU;AAC3C,IAAI,0BAA0B,EAAE,WAAW;AAC3C;AACA;AACA,IAAI,aAAa,EAAE,WAAW;AAC9B,IAAI,mBAAmB,EAAE,SAAS;AAClC,IAAI,eAAe,EAAE,SAAS;AAC9B,IAAI,kBAAkB,EAAE,aAAa,EAAE,WAAW,EAAE;AACpD,IAAI,kBAAkB,EAAE,UAAU;AAClC,IAAI,GAAG,kCAAkC,CAAC,QAAQ,CAAC;AACnD,IAAI,GAAG,cAAc,CAAC,MAAM,CAAC;AAC7B,GAAG,CAAC;AACJ;;AAEA,SAAS,cAAc,CAAC,MAAM,EAAiD;AAC/E,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE;AACxB,EAAE,MAAM,EAAE,aAAa,EAAE,UAAA,EAAW,GAAI,MAAM;AAC9C,EAAE,OAAO;AACT,IAAI,sBAAsB,EAAE,aAAa;AACzC,IAAI,mBAAmB,EAAE,UAAU;AACnC,IAAI,aAAa,EAAE,aAAa;AAChC,IAAI,eAAe,EAAE,UAAU;AAC/B,GAAG;AACH;;AAEA,SAAS,kCAAkC,CAAC,QAAQ,EAAuC;AAC3F,EAAE,MAAM,EAAE,OAAA,EAAQ,GAAI,QAAQ;AAC9B,EAAE,MAAM,mBAAA,GAAsB,OAAO,CAAC,gBAAgB,CAAC;AACvD,EAAE,MAAM,MAAA,GAAS,mBAAA,GAAsB,QAAQ,CAAC,MAAM,CAAC,mBAAmB,CAAC,EAAE,EAAE,CAAA,GAAI,EAAE;AACrF,EAAE,MAAM,QAAA,GAAW,OAAO,CAAC,kBAAkB,CAAC;AAC9C,EAAE,OAAO,UAAU;AACnB,MAAM,QAAA,IAAY,QAAA,KAAa;AAC/B,QAAQ,EAAE,8BAA8B,EAAE,MAAA;AAC1C,QAAQ,EAAE,2CAA2C,EAAE,MAAA;AACvD,MAAM,EAAE;AACR;;;;"}
+{"version":3,"file":"get-outgoing-span-data.js","sources":["../../../../src/integrations/http/get-outgoing-span-data.ts"],"sourcesContent":["import type { Span, SpanAttributes } from '../../types/span';\nimport { SEMANTIC_ATTRIBUTE_SENTRY_OP } from '../../semanticAttributes';\nimport { getHttpSpanDetailsFromUrlObject, parseStringToURLObject } from '../../utils/url';\nimport type { HttpClientRequest, HttpIncomingMessage } from './types';\nimport { getRequestUrlFromClientRequest } from './get-request-url';\nimport type { StartSpanOptions } from '../../types/startSpanOptions';\n\n/**\n * Build the initial span name and attributes for an outgoing HTTP request.\n * This is called before the span is created, to get the initial details.\n */\nexport function getOutgoingRequestSpanData(request: HttpClientRequest): StartSpanOptions {\n  const url = getRequestUrlFromClientRequest(request);\n  const [name, attributes] = getHttpSpanDetailsFromUrlObject(\n    parseStringToURLObject(url),\n    'client',\n    'auto.http.client',\n    request,\n  );\n\n  const userAgent = request.getHeader('user-agent');\n\n  return {\n    name,\n    attributes: {\n      // TODO(v11): Update these to the Sentry semantic attributes for urls.\n      // https://getsentry.github.io/sentry-conventions/attributes/\n      [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'http.client',\n      'otel.kind': 'CLIENT',\n      'http.url': url,\n      'http.method': request.method,\n      'http.target': request.path || '/',\n      'net.peer.name': request.host,\n      'http.host': request.getHeader('host') as string | undefined,\n      ...(userAgent ? { 'user_agent.original': userAgent as string } : {}),\n      ...attributes,\n    },\n    onlyIfParent: true,\n  };\n}\n\n/**\n * Add span attributes once the response is received.\n */\nexport function setIncomingResponseSpanData(response: HttpIncomingMessage, span: Span): void {\n  const { statusCode, statusMessage, httpVersion, socket } = response;\n  const transport = httpVersion?.toUpperCase() !== 'QUIC' ? 'ip_tcp' : 'ip_udp';\n\n  span.setAttributes({\n    'http.response.status_code': statusCode,\n    'network.protocol.version': httpVersion,\n    // TODO(v11): Update these to the Sentry semantic attributes for urls.\n    // https://getsentry.github.io/sentry-conventions/attributes/\n    'http.flavor': httpVersion,\n    'network.transport': transport,\n    'net.transport': transport,\n    'http.status_text': statusMessage?.toUpperCase(),\n    'http.status_code': statusCode,\n    ...getResponseContentLengthAttributes(response),\n    ...getSocketAttrs(socket),\n  });\n}\n\nfunction getSocketAttrs(socket: HttpIncomingMessage['socket']): SpanAttributes {\n  if (!socket) return {};\n  const { remoteAddress, remotePort } = socket;\n  return {\n    'network.peer.address': remoteAddress,\n    'network.peer.port': remotePort,\n    'net.peer.ip': remoteAddress,\n    'net.peer.port': remotePort,\n  };\n}\n\nfunction getResponseContentLengthAttributes(response: HttpIncomingMessage): SpanAttributes {\n  const { headers } = response;\n  const contentLengthHeader = headers['content-length'];\n  const length = contentLengthHeader ? parseInt(String(contentLengthHeader), 10) : -1;\n  const encoding = headers['content-encoding'];\n  return length >= 0\n    ? encoding && encoding !== 'identity'\n      ? { 'http.response_content_length': length }\n      : { 'http.response_content_length_uncompressed': length }\n    : {};\n}\n"],"names":[],"mappings":";;;;AAWO,SAAS,2BAA2B,OAAA,EAA8C;AACvF,EAAA,MAAM,GAAA,GAAM,+BAA+B,OAAO,CAAA;AAClD,EAAA,MAAM,CAAC,IAAA,EAAM,UAAU,CAAA,GAAI,+BAAA;AAAA,IACzB,uBAAuB,GAAG,CAAA;AAAA,IAC1B,QAAA;AAAA,IACA,kBAAA;AAAA,IACA;AAAA,GACF;AAEA,EAAA,MAAM,SAAA,GAAY,OAAA,CAAQ,SAAA,CAAU,YAAY,CAAA;AAEhD,EAAA,OAAO;AAAA,IACL,IAAA;AAAA,IACA,UAAA,EAAY;AAAA;AAAA;AAAA,MAGV,CAAC,4BAA4B,GAAG,aAAA;AAAA,MAChC,WAAA,EAAa,QAAA;AAAA,MACb,UAAA,EAAY,GAAA;AAAA,MACZ,eAAe,OAAA,CAAQ,MAAA;AAAA,MACvB,aAAA,EAAe,QAAQ,IAAA,IAAQ,GAAA;AAAA,MAC/B,iBAAiB,OAAA,CAAQ,IAAA;AAAA,MACzB,WAAA,EAAa,OAAA,CAAQ,SAAA,CAAU,MAAM,CAAA;AAAA,MACrC,GAAI,SAAA,GAAY,EAAE,qBAAA,EAAuB,SAAA,KAAwB,EAAC;AAAA,MAClE,GAAG;AAAA,KACL;AAAA,IACA,YAAA,EAAc;AAAA,GAChB;AACF;AAKO,SAAS,2BAAA,CAA4B,UAA+B,IAAA,EAAkB;AAC3F,EAAA,MAAM,EAAE,UAAA,EAAY,aAAA,EAAe,WAAA,EAAa,QAAO,GAAI,QAAA;AAC3D,EAAA,MAAM,SAAA,GAAY,WAAA,EAAa,WAAA,EAAY,KAAM,SAAS,QAAA,GAAW,QAAA;AAErE,EAAA,IAAA,CAAK,aAAA,CAAc;AAAA,IACjB,2BAAA,EAA6B,UAAA;AAAA,IAC7B,0BAAA,EAA4B,WAAA;AAAA;AAAA;AAAA,IAG5B,aAAA,EAAe,WAAA;AAAA,IACf,mBAAA,EAAqB,SAAA;AAAA,IACrB,eAAA,EAAiB,SAAA;AAAA,IACjB,kBAAA,EAAoB,eAAe,WAAA,EAAY;AAAA,IAC/C,kBAAA,EAAoB,UAAA;AAAA,IACpB,GAAG,mCAAmC,QAAQ,CAAA;AAAA,IAC9C,GAAG,eAAe,MAAM;AAAA,GACzB,CAAA;AACH;AAEA,SAAS,eAAe,MAAA,EAAuD;AAC7E,EAAA,IAAI,CAAC,MAAA,EAAQ,OAAO,EAAC;AACrB,EAAA,MAAM,EAAE,aAAA,EAAe,UAAA,EAAW,GAAI,MAAA;AACtC,EAAA,OAAO;AAAA,IACL,sBAAA,EAAwB,aAAA;AAAA,IACxB,mBAAA,EAAqB,UAAA;AAAA,IACrB,aAAA,EAAe,aAAA;AAAA,IACf,eAAA,EAAiB;AAAA,GACnB;AACF;AAEA,SAAS,mCAAmC,QAAA,EAA+C;AACzF,EAAA,MAAM,EAAE,SAAQ,GAAI,QAAA;AACpB,EAAA,MAAM,mBAAA,GAAsB,QAAQ,gBAAgB,CAAA;AACpD,EAAA,MAAM,SAAS,mBAAA,GAAsB,QAAA,CAAS,OAAO,mBAAmB,CAAA,EAAG,EAAE,CAAA,GAAI,EAAA;AACjF,EAAA,MAAM,QAAA,GAAW,QAAQ,kBAAkB,CAAA;AAC3C,EAAA,OAAO,MAAA,IAAU,CAAA,GACb,QAAA,IAAY,QAAA,KAAa,UAAA,GACvB,EAAE,8BAAA,EAAgC,MAAA,EAAO,GACzC,EAAE,2CAAA,EAA6C,MAAA,KACjD,EAAC;AACP;;;;"}

package/build/esm/integrations/http/get-request-url.js

@@ -1,14 +1,8 @@
-/** Convert an outgoing request to request options. */
 function getRequestOptions(request) {
-  // request.host may be 'hostname:port' when the caller passed
-  // { host: 'hostname:port' } to http.request(). Split it so that
-  // `hostname` is always port-free (matching the http.RequestOptions contract)
-  // and the port is not lost when request.port is undefined.
-  const hostWithPort = request.host || '';
+  const hostWithPort = request.host || "";
   const portInHost = /^(.*):(\d+)$/.exec(hostWithPort);
   const hostname = portInHost ? portInHost[1] : hostWithPort;
-  const port = request.port ?? (portInHost ? Number(portInHost[2]) : undefined);
-
+  const port = request.port ?? (portInHost ? Number(portInHost[2]) : void 0);
   return {
     method: request.method,
     port,
@@ -16,31 +10,20 @@ function getRequestOptions(request) {
     host: request.host,
     hostname,
     path: request.path,
-    headers: request.getHeaders(),
+    headers: request.getHeaders()
   };
 }
-
 function getRequestUrl(requestOptions) {
   return String(getRequestUrlObject(requestOptions));
 }
-
 function getRequestUrlObject(requestOptions) {
-  const protocol = requestOptions.protocol || 'http:';
+  const protocol = requestOptions.protocol || "http:";
   const hostHeader = requestOptions.headers?.host && String(requestOptions.headers?.host);
-  const hostname = hostHeader || requestOptions.hostname || requestOptions.host || '';
-  // Don't log standard :80 (http) and :443 (https) ports to reduce the noise
-  // Also don't add port if the hostname already includes a port
-  const port =
-    !requestOptions.port || requestOptions.port === 80 || requestOptions.port === 443 || /^(.*):(\d+)$/.test(hostname)
-      ? ''
-      : `:${requestOptions.port}`;
-  const path = requestOptions.path ? requestOptions.path : '/';
+  const hostname = hostHeader || requestOptions.hostname || requestOptions.host || "";
+  const port = !requestOptions.port || requestOptions.port === 80 || requestOptions.port === 443 || /^(.*):(\d+)$/.test(hostname) ? "" : `:${requestOptions.port}`;
+  const path = requestOptions.path ? requestOptions.path : "/";
   return new URL(path, `${protocol}//${hostname}${port}`);
 }
-
-/**
- * Build the full URL string from a Node.js ClientRequest.
- */
 function getRequestUrlFromClientRequest(request) {
   return String(getRequestUrl(getRequestOptions(request)));
 }

package/build/esm/integrations/http/get-request-url.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-request-url.js","sources":["../../../../src/integrations/http/get-request-url.ts"],"sourcesContent":["import type { HttpClientRequest, HttpRequestOptions } from './types';\n\n/** Convert an outgoing request to request options. */\nexport function getRequestOptions(request: HttpClientRequest): HttpRequestOptions {\n  // request.host may be 'hostname:port' when the caller passed\n  // { host: 'hostname:port' } to http.request(). Split it so that\n  // `hostname` is always port-free (matching the http.RequestOptions contract)\n  // and the port is not lost when request.port is undefined.\n  const hostWithPort = request.host || '';\n  const portInHost = /^(.*):(\\d+)$/.exec(hostWithPort);\n  const hostname = portInHost ? portInHost[1] : hostWithPort;\n  const port = request.port ?? (portInHost ? Number(portInHost[2]) : undefined);\n\n  return {\n    method: request.method,\n    port,\n    protocol: request.protocol,\n    host: request.host,\n    hostname,\n    path: request.path,\n    headers: request.getHeaders(),\n  };\n}\n\nexport function getRequestUrl(requestOptions: HttpRequestOptions): string {\n  return String(getRequestUrlObject(requestOptions));\n}\n\nexport function getRequestUrlObject(requestOptions: HttpRequestOptions): URL {\n  const protocol = requestOptions.protocol || 'http:';\n  const hostHeader = requestOptions.headers?.host && String(requestOptions.headers?.host);\n  const hostname = hostHeader || requestOptions.hostname || requestOptions.host || '';\n  // Don't log standard :80 (http) and :443 (https) ports to reduce the noise\n  // Also don't add port if the hostname already includes a port\n  const port =\n    !requestOptions.port || requestOptions.port === 80 || requestOptions.port === 443 || /^(.*):(\\d+)$/.test(hostname)\n      ? ''\n      : `:${requestOptions.port}`;\n  const path = requestOptions.path ? requestOptions.path : '/';\n  return new URL(path, `${protocol}//${hostname}${port}`);\n}\n\n/**\n * Build the full URL string from a Node.js ClientRequest.\n */\nexport function getRequestUrlFromClientRequest(request: HttpClientRequest): string {\n  return String(getRequestUrl(getRequestOptions(request)));\n}\n"],"names":[],"mappings":"AAEA;AACO,SAAS,iBAAiB,CAAC,OAAO,EAAyC;AAClF;AACA;AACA;AACA;AACA,EAAE,MAAM,YAAA,GAAe,OAAO,CAAC,IAAA,IAAQ,EAAE;AACzC,EAAE,MAAM,aAAa,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC;AACtD,EAAE,MAAM,QAAA,GAAW,UAAA,GAAa,UAAU,CAAC,CAAC,CAAA,GAAI,YAAY;AAC5D,EAAE,MAAM,IAAA,GAAO,OAAO,CAAC,IAAA,KAAS,UAAA,GAAa,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA,GAAI,SAAS,CAAC;;AAE/E,EAAE,OAAO;AACT,IAAI,MAAM,EAAE,OAAO,CAAC,MAAM;AAC1B,IAAI,IAAI;AACR,IAAI,QAAQ,EAAE,OAAO,CAAC,QAAQ;AAC9B,IAAI,IAAI,EAAE,OAAO,CAAC,IAAI;AACtB,IAAI,QAAQ;AACZ,IAAI,IAAI,EAAE,OAAO,CAAC,IAAI;AACtB,IAAI,OAAO,EAAE,OAAO,CAAC,UAAU,EAAE;AACjC,GAAG;AACH;;AAEO,SAAS,aAAa,CAAC,cAAc,EAA8B;AAC1E,EAAE,OAAO,MAAM,CAAC,mBAAmB,CAAC,cAAc,CAAC,CAAC;AACpD;;AAEO,SAAS,mBAAmB,CAAC,cAAc,EAA2B;AAC7E,EAAE,MAAM,QAAA,GAAW,cAAc,CAAC,QAAA,IAAY,OAAO;AACrD,EAAE,MAAM,UAAA,GAAa,cAAc,CAAC,OAAO,EAAE,IAAA,IAAQ,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC;AACzF,EAAE,MAAM,QAAA,GAAW,UAAA,IAAc,cAAc,CAAC,QAAA,IAAY,cAAc,CAAC,IAAA,IAAQ,EAAE;AACrF;AACA;AACA,EAAE,MAAM,IAAA;AACR,IAAI,CAAC,cAAc,CAAC,IAAA,IAAQ,cAAc,CAAC,SAAS,EAAA,IAAM,cAAc,CAAC,SAAS,GAAA,IAAO,cAAc,CAAC,IAAI,CAAC,QAAQ;AACrH,QAAQ;AACR,QAAQ,CAAC,CAAC,EAAE,cAAc,CAAC,IAAI,CAAC,CAAA;AACA,EAAA,MAAA,IAAA,GAAA,cAAA,CAAA,IAAA,GAAA,cAAA,CAAA,IAAA,GAAA,GAAA;AACA,EAAA,OAAA,IAAA,GAAA,CAAA,IAAA,EAAA,CAAA,EAAA,QAAA,CAAA,EAAA,EAAA,QAAA,CAAA,EAAA,IAAA,CAAA,CAAA,CAAA;AACA;;AAEA;AACA;AACA;AACA,SAAA,8BAAA,CAAA,OAAA,EAAA;AACA,EAAA,OAAA,MAAA,CAAA,aAAA,CAAA,iBAAA,CAAA,OAAA,CAAA,CAAA,CAAA;AACA;;;;"}
+{"version":3,"file":"get-request-url.js","sources":["../../../../src/integrations/http/get-request-url.ts"],"sourcesContent":["import type { HttpClientRequest, HttpRequestOptions } from './types';\n\n/** Convert an outgoing request to request options. */\nexport function getRequestOptions(request: HttpClientRequest): HttpRequestOptions {\n  // request.host may be 'hostname:port' when the caller passed\n  // { host: 'hostname:port' } to http.request(). Split it so that\n  // `hostname` is always port-free (matching the http.RequestOptions contract)\n  // and the port is not lost when request.port is undefined.\n  const hostWithPort = request.host || '';\n  const portInHost = /^(.*):(\\d+)$/.exec(hostWithPort);\n  const hostname = portInHost ? portInHost[1] : hostWithPort;\n  const port = request.port ?? (portInHost ? Number(portInHost[2]) : undefined);\n\n  return {\n    method: request.method,\n    port,\n    protocol: request.protocol,\n    host: request.host,\n    hostname,\n    path: request.path,\n    headers: request.getHeaders(),\n  };\n}\n\nexport function getRequestUrl(requestOptions: HttpRequestOptions): string {\n  return String(getRequestUrlObject(requestOptions));\n}\n\nexport function getRequestUrlObject(requestOptions: HttpRequestOptions): URL {\n  const protocol = requestOptions.protocol || 'http:';\n  const hostHeader = requestOptions.headers?.host && String(requestOptions.headers?.host);\n  const hostname = hostHeader || requestOptions.hostname || requestOptions.host || '';\n  // Don't log standard :80 (http) and :443 (https) ports to reduce the noise\n  // Also don't add port if the hostname already includes a port\n  const port =\n    !requestOptions.port || requestOptions.port === 80 || requestOptions.port === 443 || /^(.*):(\\d+)$/.test(hostname)\n      ? ''\n      : `:${requestOptions.port}`;\n  const path = requestOptions.path ? requestOptions.path : '/';\n  return new URL(path, `${protocol}//${hostname}${port}`);\n}\n\n/**\n * Build the full URL string from a Node.js ClientRequest.\n */\nexport function getRequestUrlFromClientRequest(request: HttpClientRequest): string {\n  return String(getRequestUrl(getRequestOptions(request)));\n}\n"],"names":[],"mappings":"AAGO,SAAS,kBAAkB,OAAA,EAAgD;AAKhF,EAAA,MAAM,YAAA,GAAe,QAAQ,IAAA,IAAQ,EAAA;AACrC,EAAA,MAAM,UAAA,GAAa,cAAA,CAAe,IAAA,CAAK,YAAY,CAAA;AACnD,EAAA,MAAM,QAAA,GAAW,UAAA,GAAa,UAAA,CAAW,CAAC,CAAA,GAAI,YAAA;AAC9C,EAAA,MAAM,IAAA,GAAO,QAAQ,IAAA,KAAS,UAAA,GAAa,OAAO,UAAA,CAAW,CAAC,CAAC,CAAA,GAAI,MAAA,CAAA;AAEnE,EAAA,OAAO;AAAA,IACL,QAAQ,OAAA,CAAQ,MAAA;AAAA,IAChB,IAAA;AAAA,IACA,UAAU,OAAA,CAAQ,QAAA;AAAA,IAClB,MAAM,OAAA,CAAQ,IAAA;AAAA,IACd,QAAA;AAAA,IACA,MAAM,OAAA,CAAQ,IAAA;AAAA,IACd,OAAA,EAAS,QAAQ,UAAA;AAAW,GAC9B;AACF;AAEO,SAAS,cAAc,cAAA,EAA4C;AACxE,EAAA,OAAO,MAAA,CAAO,mBAAA,CAAoB,cAAc,CAAC,CAAA;AACnD;AAEO,SAAS,oBAAoB,cAAA,EAAyC;AAC3E,EAAA,MAAM,QAAA,GAAW,eAAe,QAAA,IAAY,OAAA;AAC5C,EAAA,MAAM,aAAa,cAAA,CAAe,OAAA,EAAS,QAAQ,MAAA,CAAO,cAAA,CAAe,SAAS,IAAI,CAAA;AACtF,EAAA,MAAM,QAAA,GAAW,UAAA,IAAc,cAAA,CAAe,QAAA,IAAY,eAAe,IAAA,IAAQ,EAAA;AAGjF,EAAA,MAAM,OACJ,CAAC,cAAA,CAAe,IAAA,IAAQ,cAAA,CAAe,SAAS,EAAA,IAAM,cAAA,CAAe,IAAA,KAAS,GAAA,IAAO,eAAe,IAAA,CAAK,QAAQ,IAC7G,EAAA,GACA,CAAA,CAAA,EAAI,eAAe,IAAI,CAAA,CAAA;AAC7B,EAAA,MAAM,IAAA,GAAO,cAAA,CAAe,IAAA,GAAO,cAAA,CAAe,IAAA,GAAO,GAAA;AACzD,EAAA,OAAO,IAAI,IAAI,IAAA,EAAM,CAAA,EAAG,QAAQ,CAAA,EAAA,EAAK,QAAQ,CAAA,EAAG,IAAI,CAAA,CAAE,CAAA;AACxD;AAKO,SAAS,+BAA+B,OAAA,EAAoC;AACjF,EAAA,OAAO,MAAA,CAAO,aAAA,CAAc,iBAAA,CAAkB,OAAO,CAAC,CAAC,CAAA;AACzD;;;;"}

package/build/esm/integrations/http/inject-trace-propagation-headers.js

@@ -8,68 +8,44 @@ import { LOG_PREFIX } from './constants.js';
 import { getRequestUrlFromClientRequest } from './get-request-url.js';
 import { mergeBaggageHeaders } from '../../utils/baggage.js';
 
-/**
- * Inject Sentry trace-propagation headers into an outgoing request if the
- * target URL matches the configured `tracePropagationTargets`.
- *
- * Note: this must be called *before* calling `request.end()` (or firing the
- * `http.client.request.start` diagnostics channel), because at that point,
- * the headers have already been sent, and cannot be modified.
- */
-function injectTracePropagationHeaders(
-  request,
-  propagationDecisionMap,
-) {
+function injectTracePropagationHeaders(request, propagationDecisionMap) {
   const url = getRequestUrlFromClientRequest(request);
   const clientOptions = getClient()?.getOptions();
   const { tracePropagationTargets, propagateTraceparent } = clientOptions ?? {};
-
   if (!shouldPropagateTraceForUrl(url, tracePropagationTargets, propagationDecisionMap)) {
     return;
   }
-
-  const hasExistingSentryTraceHeader = !!request.getHeader('sentry-trace');
-
+  const hasExistingSentryTraceHeader = !!request.getHeader("sentry-trace");
   if (hasExistingSentryTraceHeader) {
-    // add nothing if there's already a sentry-trace header,
-    // or else baggage can be sent twice.
     return;
   }
-
   const traceData = getTraceData({ propagateTraceparent });
   if (!traceData) return;
-
-  const { 'sentry-trace': sentryTrace, baggage, traceparent } = traceData;
-
+  const { "sentry-trace": sentryTrace, baggage, traceparent } = traceData;
   if (sentryTrace) {
     try {
-      request.setHeader('sentry-trace', sentryTrace);
-      DEBUG_BUILD && debug.log(LOG_PREFIX, 'Added sentry-trace header');
+      request.setHeader("sentry-trace", sentryTrace);
+      DEBUG_BUILD && debug.log(LOG_PREFIX, "Added sentry-trace header");
     } catch (e) {
-      DEBUG_BUILD &&
-        debug.error(LOG_PREFIX, 'Failed to set sentry-trace header:', isError(e) ? e.message : 'Unknown error');
+      DEBUG_BUILD && debug.error(LOG_PREFIX, "Failed to set sentry-trace header:", isError(e) ? e.message : "Unknown error");
     }
   }
-
-  if (traceparent && !request.getHeader('traceparent')) {
+  if (traceparent && !request.getHeader("traceparent")) {
     try {
-      request.setHeader('traceparent', traceparent);
-      DEBUG_BUILD && debug.log(LOG_PREFIX, 'Added traceparent header');
+      request.setHeader("traceparent", traceparent);
+      DEBUG_BUILD && debug.log(LOG_PREFIX, "Added traceparent header");
     } catch (e) {
-      DEBUG_BUILD &&
-        debug.error(LOG_PREFIX, 'Failed to set traceparent header:', isError(e) ? e.message : 'Unknown error');
+      DEBUG_BUILD && debug.error(LOG_PREFIX, "Failed to set traceparent header:", isError(e) ? e.message : "Unknown error");
     }
   }
-
   if (baggage) {
-    const merged = mergeBaggageHeaders(request.getHeader('baggage'), baggage);
+    const merged = mergeBaggageHeaders(request.getHeader("baggage"), baggage);
     if (merged) {
       try {
-        request.setHeader('baggage', merged);
-        DEBUG_BUILD && debug.log(LOG_PREFIX, 'Added baggage header');
+        request.setHeader("baggage", merged);
+        DEBUG_BUILD && debug.log(LOG_PREFIX, "Added baggage header");
       } catch (e) {
-        DEBUG_BUILD &&
-          debug.error(LOG_PREFIX, 'Failed to set baggage header:', isError(e) ? e.message : 'Unknown error');
+        DEBUG_BUILD && debug.error(LOG_PREFIX, "Failed to set baggage header:", isError(e) ? e.message : "Unknown error");
       }
     }
   }