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

Author: isaacs

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

@@ -72,8 +72,6 @@ export function getHttpClientSubscriptions(options: HttpInstrumentationOptions):
         };
         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();
           }
@@ -125,7 +123,8 @@ export function getHttpClientSubscriptions(options: HttpInstrumentationOptions):
     });
 
     request.prependListener('response', response => {
-      // no longer need this, listen on response now
+      // 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) {
         response.resume();

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

@@ -128,12 +128,15 @@ const _httpIntegration = ((options: HttpIntegrationOptions = {}) => {
       // time. The http.client.request.error channel is only available on
       // the same node versions as client.request.created, so no help.
       if (_options.breadcrumbs && !FULLY_SUPPORTS_HTTP_DIAGNOSTICS_CHANNEL) {
-        subscribe('http.client.response.finish', (data: unknown) => {
-          const { request, response } = data as {
-            request: HttpClientRequest;
-            response: HttpIncomingMessage;
-          };
-          onOutgoingResponseFinish(request, response, _options);
+        subscribe('http.client.response.start', (data: unknown) => {
+          const { request } = data as { request: HttpClientRequest };
+          request.on(errorMonitor, () => onOutgoingResponseFinish(request, undefined, _options));
+          request.prependListener('response', response => {
+            if (request.listenerCount('response') <= 1) {
+              response.resume();
+            }
+            onOutgoingResponseFinish(request, response, _options);
+          });
         });
       }
     },