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

Author: isaacs

packages/core/src/integrations/http/types.ts

@@ -51,7 +51,7 @@ export interface HttpClientRequest {
 
 /** Minimal interface for http client RequestOptions */
 export interface HttpRequestOptions {
-  method?: string | null;
+  method?: string;
   protocol?: string | null;
   hostname?: string | null;
   host?: string | null;

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

@@ -12,12 +12,17 @@ import type {
   HttpModuleExport,
   Span,
 } from '@sentry/core';
-import { getHttpClientSubscriptions, patchHttpModuleClient, patchHttpsModuleClient, SDK_VERSION } from '@sentry/core';
+import {
+  getHttpClientSubscriptions,
+  patchHttpModuleClient,
+  patchHttpsModuleClient,
+  SDK_VERSION,
+  getRequestOptions,
+} from '@sentry/core';
 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) ||

packages/node-core/src/light/integrations/httpIntegration.ts

@@ -14,11 +14,12 @@ import {
   stripUrlQueryAndFragment,
   SUPPRESS_TRACING_KEY,
   withIsolationScope,
+  getRequestOptions,
+  getRequestUrlFromClientRequest,
 } from '@sentry/core';
 import type { ClientRequest, IncomingMessage, Server } from 'node:http';
 import { DEBUG_BUILD } from '../../debug-build';
 import { patchRequestToCaptureBody } from '../../utils/captureRequestBody';
-import { getClientRequestUrl, getRequestOptions } from '../../utils/outgoingHttpRequest';
 import type { LightNodeClient } from '../client';
 import { errorMonitor } from 'node:events';
 import { NODE_VERSION } from '../../nodeVersion';
@@ -160,7 +161,7 @@ function onOutgoingResponseFinish(
   }
   const { ignoreOutgoingRequests } = options;
   if (ignoreOutgoingRequests) {
-    const url = getClientRequestUrl(request as ClientRequest);
+    const url = getRequestUrlFromClientRequest(request as ClientRequest);
     if (ignoreOutgoingRequests(url, getRequestOptions(request as ClientRequest))) {
       return;
     }