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

Author: isaacs

packages/core/src/integrations/http/client-subscriptions.ts

@@ -67,12 +67,17 @@ export function getHttpClientSubscriptions(options: HttpInstrumentationOptions):
     if (!createSpans) {
       // Even without spans, set up a response listener for breadcrumbs.
       if (breadcrumbs) {
+        const onRequestError = () => {
+          addOutgoingRequestBreadcrumb(request, undefined);
+        };
+        request.on(errorMonitor, onRequestError);
         request.prependListener('response', response => {
+          // no longer need this, got a response.
+          request.removeListener(errorMonitor, onRequestError);
           if (request.listenerCount('response') <= 1) {
             response.resume();
           }
           response.on('end', () => addOutgoingRequestBreadcrumb(request, response));
-          // TODO: should we include the response here, even though it errored?
           response.on(errorMonitor, () => addOutgoingRequestBreadcrumb(request, undefined));
         });
       }
@@ -113,6 +118,9 @@ export function getHttpClientSubscriptions(options: HttpInstrumentationOptions):
 
     request.on(errorMonitor, error => {
       DEBUG_BUILD && debug.log(LOG_PREFIX, 'outgoingRequest on request error()', error);
+      if (breadcrumbs) {
+        addOutgoingRequestBreadcrumb(request, undefined);
+      }
       endSpan({ code: SPAN_STATUS_ERROR });
     });
 

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

@@ -20,9 +20,8 @@ import { errorMonitor } from 'node:events';
 import { getRequestOptions } from '../../utils/outgoingHttpRequest';
 
 const FULLY_SUPPORTS_HTTP_DIAGNOSTICS_CHANNEL =
-  (NODE_VERSION.major === 22 && NODE_VERSION.minor >= 12) ||
-  (NODE_VERSION.major === 23 && NODE_VERSION.minor >= 2) ||
-  NODE_VERSION.major >= 24;
+  (NODE_VERSION.major === 18 && NODE_VERSION.minor >= 7) ||
+  NODE_VERSION.major >= 20;
 
 export type SentryHttpInstrumentationOptions = InstrumentationConfig & {
   /**