fix(spanId): fix spanId collecting

Author: peteyycz

lib/providers/httpTransaction/index.js

@@ -122,18 +122,15 @@ HttpTransaction.prototype.onClientSend = function (data) {
 
 HttpTransaction.prototype.onClientReceive = function (data) {
   var trace = this._initTrace(data);
-  var spanId;
-
-  if (data.headers) {
-    spanId = data.headers['x-span-id'];
-  }
 
   if (data.err) {
     trace.isSampled = true;
   }
 
   trace.events.push({
-    id: spanId,
+    id: data.spanId,
+    host: data.host,
+    url: data.url,
     time: data.time,
     type: HttpTransaction.CLIENT_RECV,
     data: data.err,

lib/providers/httpTransaction/index.spec.js

@@ -62,12 +62,14 @@ describe('The HttpTransaction module', function () {
       var headers = {
         'x-span-id': spanId
       };
+      var host = 'localhost:3000';
 
       httpTransaction.onClientReceive({
         id: id,
-        url: '/fruits/apple',
+        spanId: spanId,
+        url: url,
         time: time,
-        host: 'localhost:3000',
+        host: host,
         statusCode: 301,
         headers: headers
       });
@@ -82,6 +84,8 @@ describe('The HttpTransaction module', function () {
             {
               statusCode: 301,
               id: spanId,
+              url: url,
+              host: host,
               time: time,
               type: 'cr',
               data: undefined

lib/providers/httpTransaction/wraps/http.request.js

@@ -8,6 +8,7 @@ var Collector = require('../');
 
 function wrapRequest (original, collector, config) {
 
+  var spanId;
   var whiteListHosts = config.whiteListHosts;
 
   return function (requestParams) {
@@ -44,7 +45,8 @@ function wrapRequest (original, collector, config) {
 
     requestParams.headers['x-client-send'] = clientSendTime;
 
-    requestParams.headers['x-span-id'] = uuid.v1();
+    spanId = uuid.v1();
+    requestParams.headers['x-span-id'] = spanId;
 
     var collectorDataBag = {
       id: requestId,
@@ -69,6 +71,7 @@ function wrapRequest (original, collector, config) {
     returned.on('error', function (err) {
       var collectorDataBag = {
         id: requestId,
+        spanId: spanId,
         host: requestParams.host,
         url: requestParams.path,
         time: microtime.now(),
@@ -82,6 +85,7 @@ function wrapRequest (original, collector, config) {
     returned.on('response', function (incomingMessage) {
       var collectorDataBag = {
         id: requestId,
+        spanId: spanId,
         host: requestParams.host,
         url: requestParams.path,
         time: microtime.now(),