fix(instrumentation): fix http request emitter context propagation

Author: dszakallas

example/config/trace.config.js

@@ -4,7 +4,7 @@
 
  module.exports = {
    serviceName: 'your-awesome-app',
-   apiKey: 'KEEP_ME_SECRET',
+   apiKey: 'KEEP.ME.SECRET',
    ignoreHeaders: {
      'user-agent': ['007']
    },

lib/instrumentations/core/http/request.js

@@ -18,25 +18,37 @@ function httpClient (originalHttpRequest, agent) {
 
     // parse request
     if (typeof requestParams === 'string') {
-      requestParams = url.parse(requestParams)
-      requestParams.method = 'GET'
+      var parsedParams = url.parse(requestParams)
+      if (!parsedParams.hostname) {
+        return originalHttpRequest.apply(this, arguments)
+      } else {
+        requestParams = parsedParams
+      }
     }
 
-    if (requestParams.hostname) {
-      requestParams.host = requestParams.hostname
+    if (typeof requestParams !== 'object') {
+      return originalHttpRequest.apply(this, arguments)
     }
 
+    requestParams.method = (requestParams.method || 'GET').toUpperCase()
+    requestParams.host = requestParams.host || requestParams.hostname || 'localhost'
+    requestParams.path = requestParams.path || '/'
+
     // call original and do not collect
     if (whiteListHosts.indexOf(requestParams.host) > -1) {
       return originalHttpRequest.apply(this, arguments)
     }
 
     var resource
     if (keepQueryParams) {
-      var requestUrl = requestParams.path
-      resource = util.formatDataUrl(requestUrl)
+      resource = util.formatDataUrl(requestParams.path)
     } else {
-      resource = requestParams.path.split('?')[0]
+      var i = requestParams.path.indexOf('?')
+      if (i >= 0) {
+        resource = requestParams.path.substring(0, i)
+      } else {
+        resource = requestParams.path
+      }
     }
 
     var cs = collector.clientSend({
@@ -78,6 +90,8 @@ function httpClient (originalHttpRequest, agent) {
 
     var returned = originalHttpRequest.apply(this, arguments)
 
+    agent.storage.bindEmitter(returned)
+
     // returns with error
     returned.on('error', function (err) {
       debug('#httpClient', format('NE(%s) [%s]', csCtx.communicationId, err.code))
@@ -129,8 +143,6 @@ function httpClient (originalHttpRequest, agent) {
       }
     })
 
-    agent.storage.bind(returned)
-
     return returned
   }
 }

lib/instrumentations/core/http/request.spec.js

@@ -61,7 +61,7 @@ describe('The http.request wrapper module', function () {
         get: this.sandbox.stub().returns({
           communication: {}
         }),
-        bind: this.sandbox.spy()
+        bindEmitter: this.sandbox.spy()
       }
     }
   })
@@ -76,7 +76,9 @@ describe('The http.request wrapper module', function () {
     expect(agent.tracer.collector.clientSend).not.to.be.called
 
     expect(original).to.be.calledWith({
-      host: 'risingstack.com'
+      host: 'risingstack.com',
+      method: 'GET',
+      path: '/'
     })
   })