fix(instrumentation): collect timings for non flowing response streams

README.md

@@ -79,13 +79,13 @@ curl http://localhost:3000
 open http://localhost:16686
 ```
 
-![Jaeger Node.js tracing](https://user-images.githubusercontent.com/1764512/26843812-c3198758-4af1-11e7-8aa3-1da55d9e58b6.png)
+![Jaeger Node.js tracing](images/distributed_tracing.png)
 
 ## HTTP timings
 
 You can enable it with the `httpTimings: true`
 
-![HTTP timings](https://user-images.githubusercontent.com/1764512/30158154-92be25ca-93c4-11e7-9679-0d71ea3b8230.png)
+![HTTP timings](images/http_timings.png)
 
 ## Debug
 

example/server1.js

@@ -13,7 +13,10 @@ const tracer = new jaeger.Tracer('my-server-1', reporter, sampler, {
   }
 })
 // eslint-disable-next-line
-const instrument = new Instrument({ tracers: [tracer] })
+const instrument = new Instrument({
+  tracers: [tracer],
+  httpTimings: true
+})
 
 // eslint-disable-next-line
 const http = require('http')

src/instrumentation/httpClient.js

@@ -127,17 +127,17 @@ function patch (http, tracers, { httpTimings } = {}) {
 
       timings.begin = Date.now()
 
-      const req = request.call(this, options, (res) => {
-        function finish () {
-          if (httpTimings) {
-            timings.end = Date.now()
-            addTimings(tracers, spans, timings)
-          }
-
-          spans.forEach((span) => span.finish())
-          isFinish = true
+      function finish () {
+        if (httpTimings) {
+          timings.end = Date.now()
+          addTimings(tracers, spans, timings)
         }
 
+        spans.forEach((span) => span.finish())
+        isFinish = true
+      }
+
+      const req = request.call(this, options, (res) => {
         if (res.statusCode > 399) {
           spans.forEach((span) => span.setTag(Tags.ERROR, true))
 
@@ -188,7 +188,7 @@ function patch (http, tracers, { httpTimings } = {}) {
         socket.on('close', () => {
           // End event is not emitted when stream is not consumed fully
           if (!isFinish) {
-            spans.forEach((span) => span.finish())
+            finish()
           }
         })
       })