fix: propagate serviceKey to tracer

Author: dszakallas

lib/agent/metrics/incomingEdge/index.js

@@ -38,7 +38,7 @@ IncomingEdgeMetrics.prototype.report = function (data) {
   if (data.transportDelay < 0) {
     return
   }
-  var serviceKey = data.serviceKey === undefined
+  var serviceKey = data.serviceKey == null
     ? 'root' : data.serviceKey
   var edge = this._getEdge(data.protocol, serviceKey)
 

lib/agent/tracer/collector.js

@@ -155,6 +155,11 @@ Collector.prototype.flush = function () {
   return result
 }
 
+Collector.prototype.setServiceKey = function (serviceKey) {
+  this.serviceKey = serviceKey
+  this.tracer.setServiceKey(serviceKey)
+}
+
 // Purely for cache management
 Collector.prototype.end = function (briefcase) {
   if (!briefcase) {

lib/agent/tracer/index.js

@@ -31,7 +31,8 @@ inherits(Tracer, Agent)
 
 Tracer.prototype.initialize = function (opts) {
   Agent.prototype.initialize.call(this, opts)
-  this.collector.serviceKey = this.serviceKey = opts.serviceKey
+  this.serviceKey = opts.serviceKey
+  this.collector.setServiceKey(opts.serviceKey)
 }
 
 Tracer.prototype.start = function () {

lib/agent/tracer/tracer.js

@@ -303,6 +303,10 @@ Tracer.prototype.getTransactionId = function (briefcase) {
   return history[0][1].r
 }
 
+Tracer.prototype.setServiceKey = function (serviceKey) {
+  this.serviceKey = serviceKey
+}
+
 module.exports = Tracer
 module.exports.create = function (options) {
   return new Tracer(options)

test/e2e/apiCalls.spec.js

@@ -65,7 +65,7 @@ apiCalls.forEach(function (name) {
           t.pass('collector sends ' + name)
           if (typeof requestBody === 'object') {
             t.pass('requestBody is valid JSON')
-            console.log(requestBody)
+            console.log(JSON.stringify(requestBody))
             ok()
           } else {
             var buffer = new Buffer(requestBody, 'hex')