fix(agent): check for serviceKey uses lodash.isNumber

Author: gergelyke

lib/agent/api/index.js

@@ -2,6 +2,7 @@ var https = require('https')
 var url = require('url')
 var util = require('util')
 var requestSync = require('sync-request')
+var isNumber = require('lodash.isnumber')
 var debug = require('debug')('risingstack/trace')
 var format = require('util').format
 
@@ -69,7 +70,7 @@ CollectorApi.prototype._send = function (destinationUrl, data) {
 }
 
 CollectorApi.prototype.sendRpmMetrics = function (data) {
-  if (isNaN(this.serviceKey)) {
+  if (!isNumber(this.serviceKey)) {
     debug('Service id not present, cannot send rpm metrics')
     return
   }
@@ -79,7 +80,7 @@ CollectorApi.prototype.sendRpmMetrics = function (data) {
 }
 
 CollectorApi.prototype.sendApmMetrics = function (data) {
-  if (isNaN(this.serviceKey)) {
+  if (!isNumber(this.serviceKey)) {
     debug('Service id not present, cannot send metrics')
     return
   }

lib/agent/index.js

@@ -3,6 +3,7 @@ var microtime = require('microtime')
 var uuid = require('node-uuid')
 var cls = require('continuation-local-storage')
 var defaults = require('lodash.defaults')
+var isNumber = require('lodash.isnumber')
 
 var CollectorApi = require('./api')
 var Metrics = require('./metrics')
@@ -310,7 +311,7 @@ Agent.prototype.openSpan = function (data) {
   dataTrace.host = data.host
 
   // fallback to appName if service id is not present
-  if (isNaN(this.serviceKey)) {
+  if (!isNumber(this.serviceKey)) {
     dataTrace.serviceName = this.serviceName
   }
 

lib/instrumentations/core/http/server.js

@@ -2,6 +2,7 @@ var url = require('url')
 
 var qs = require('qs')
 var microtime = require('microtime')
+var isNumber = require('lodash.isnumber')
 var debug = require('debug')('risingstack/trace')
 
 var util = require('./util')
@@ -100,7 +101,7 @@ function wrapListener (listener, agent, mustCollectStore) {
 
       /* Service name may be unavailable due to uninitialized reporter */
       var serviceKey = agent.getServiceKey()
-      if (!isNaN(serviceKey)) {
+      if (isNumber(serviceKey)) {
         debug('trace event (ss); request: %s, x-parent header has been set %s', requestId, serviceKey)
         response.setHeader('x-parent', serviceKey)
       }

package.json

@@ -49,6 +49,7 @@
     "event-loop-stats": "1.0.0",
     "gc-stats": "1.0.0",
     "lodash.defaults": "4.0.1",
+    "lodash.isnumber": "3.0.3",
     "microtime": "2.0.0",
     "node-uuid": "1.4.7",
     "qs": "4.0.0",