fixup! fixup! feat(http): portable node:http client instrumentation (#20393)

Author: isaacs

packages/node-core/src/integrations/http/SentryHttpInstrumentation.ts

@@ -4,6 +4,7 @@ import { context, trace } from '@opentelemetry/api';
 import { isTracingSuppressed } from '@opentelemetry/core';
 import type { InstrumentationConfig } from '@opentelemetry/instrumentation';
 import { InstrumentationBase, InstrumentationNodeModuleDefinition } from '@opentelemetry/instrumentation';
+import type { ClientRequest, IncomingMessage, ServerResponse } from 'node:http';
 import type {
   HttpClientRequest,
   HttpIncomingMessage,
@@ -16,6 +17,7 @@ import { INSTRUMENTATION_NAME } from './constants';
 import { HTTP_ON_CLIENT_REQUEST } from '@sentry/core';
 import { NODE_VERSION } from '../../nodeVersion';
 import { errorMonitor } from 'node:events';
+import { getRequestOptions } from '../../utils/outgoingHttpRequest';
 
 const FULLY_SUPPORTS_HTTP_DIAGNOSTICS_CHANNEL =
   (NODE_VERSION.major === 22 && NODE_VERSION.minor >= 12) ||
@@ -74,8 +76,8 @@ export type SentryHttpInstrumentationOptions = InstrumentationConfig & {
    * Hooks for outgoing request spans, called when `createSpansForOutgoingRequests` is enabled.
    * These mirror the OTEL HttpInstrumentation hooks for backwards compatibility.
    */
-  outgoingRequestHook?: (span: Span, request: http.ClientRequest | HttpClientRequest) => void;
-  outgoingResponseHook?: (span: Span, response: http.IncomingMessage | HttpIncomingMessage) => void;
+  outgoingRequestHook?: (span: Span, request: ClientRequest | HttpClientRequest) => void;
+  outgoingResponseHook?: (span: Span, response: IncomingMessage | HttpIncomingMessage) => void;
   outgoingRequestApplyCustomAttributes?: (
     span: Span,
     request: HttpClientRequest,
@@ -103,7 +105,7 @@ export type SentryHttpInstrumentationOptions = InstrumentationConfig & {
   /**
    * @deprecated This no longer does anything.
    */
-  ignoreSpansForIncomingRequests?: (urlPath: string, request: http.IncomingMessage) => boolean;
+  ignoreSpansForIncomingRequests?: (urlPath: string, request: IncomingMessage) => boolean;
 
   /**
    * @deprecated This no longer does anything.
@@ -124,12 +126,12 @@ export type SentryHttpInstrumentationOptions = InstrumentationConfig & {
    * @deprecated This no longer does anything.
    */
   instrumentation?: {
-    requestHook?: (span: Span, req: http.ClientRequest | http.IncomingMessage) => void;
-    responseHook?: (span: Span, response: http.IncomingMessage | http.ServerResponse) => void;
+    requestHook?: (span: Span, req: ClientRequest | IncomingMessage) => void;
+    responseHook?: (span: Span, response: IncomingMessage | ServerResponse) => void;
     applyCustomAttributesOnSpan?: (
       span: Span,
-      request: http.ClientRequest | http.IncomingMessage,
-      response: http.IncomingMessage | http.ServerResponse,
+      request: ClientRequest | IncomingMessage,
+      response: IncomingMessage | ServerResponse,
     ) => void;
   };
 
@@ -169,7 +171,7 @@ export class SentryHttpInstrumentation extends InstrumentationBase<SentryHttpIns
       ...options,
       spans: options.createSpansForOutgoingRequests ?? options.spans,
       ignoreOutgoingRequests(url, request) {
-        return isTracingSuppressed(context.active()) || !!options.ignoreOutgoingRequests?.(url, request);
+        return isTracingSuppressed(context.active()) || !!options.ignoreOutgoingRequests?.(url, getRequestOptions(request as ClientRequest));
       },
       outgoingRequestHook(span, request) {
         options.outgoingRequestHook?.(span, request);