manually emit end event from close if one has not already been em…

…ited
open-telemetry · Mar 21, 2023 · 1f07e5f · 1f07e5f
1 parent f2c139d
commit 1f07e5f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/experimental/packages/opentelemetry-instrumentation-http/src/http.ts b/experimental/packages/opentelemetry-instrumentation-http/src/http.ts
@@ -352,8 +352,21 @@ export class HttpInstrumentation extends InstrumentationBase<Http> {
 
         context.bind(context.active(), response);
         this._diag.debug('outgoingRequest on response()');
+
+        // See https://github.com/open-telemetry/opentelemetry-js/pull/3625#issuecomment-1475673533
+        let endEmitted = false;
+        if (semver.lt(process.version, '16.0.0')) {
+          response.on('close', () => {
+            this._diag.debug('outgoingRequest on close()');
+            if (!endEmitted) {
+              response.emit('end');
+            }
+          });
+        }
+
         response.on('end', () => {
           this._diag.debug('outgoingRequest on end()');
+          endEmitted = true;
           let status: SpanStatus;
 
           if (response.aborted && !response.complete) {

diff --git a/...rimental/packages/opentelemetry-instrumentation-http/test/functionals/http-enable.test.ts b/...rimental/packages/opentelemetry-instrumentation-http/test/functionals/http-enable.test.ts
@@ -866,7 +866,7 @@ describe('HttpInstrumentation', () => {
             `${protocol}://${hostname}:${serverPort}/hang`,
             res => {
               res.on('close', () => {});
-              res.on('error', () => {});
+              res.on('error', reject);
             }
           );
           // close the socket.