fix(instrumentation): pass undefined if cannot parse number

Author: dszakallas

lib/instrumentations/trace-instrumentation-amqplib.js

@@ -7,7 +7,7 @@ var microtime = require('../optionalDependencies/microtime')
 var debug = require('../utils/debug')('instrumentation')
 var format = require('util').format
 
-function parseNumberOrUndefined (string) {
+function tryParseInt (string) {
   if (!string) { return }
   var n = parseInt(string, 10)
   return isNaN(n) ? undefined : n
@@ -17,12 +17,10 @@ function consumerWrapper (agent, original) {
   return function (queue, callback, options, cb0) {
     var orig = callback
     var wrapped = function (msg) {
-      var originTimestamp = parseInt(get(msg, 'properties.headers[\'x-client-send\']'), 10)
-      var parentServiceKey = parseNumberOrUndefined(get(msg, 'properties.headers[\'x-parent\']'))
-      var timestamp = microtime.now()
-      var transportDelay = isNaN(originTimestamp) ? undefined : timestamp - originTimestamp
-      debug.info('amqplib.consumerWrapper',
-        format('incomingEdge [%s %s %s]', 'amqp', parentServiceKey, transportDelay))
+      var originTimestamp = tryParseInt(get(msg, 'properties.headers[\'x-client-send\']'))
+      var parentServiceKey = tryParseInt(get(msg, 'properties.headers[\'x-parent\']'))
+      var transportDelay = originTimestamp == null ? undefined : microtime.now() - originTimestamp
+      debug.info('amqplib.consumerWrapper', format('incomingEdge [%s %s %s]', 'amqp', parentServiceKey, transportDelay))
       agent.incomingEdgeMetrics.report({
         serviceKey: parentServiceKey,
         protocol: 'amqp',
@@ -44,8 +42,7 @@ function sendMessageWrapper (agent, original) {
       'x-client-send': String(microtime.now()),
       'x-parent': String(agent.getServiceKey())
     }
-    debug.info('amqplib.sendMessageWrapper',
-      'sending instrumented message...')
+    debug.info('amqplib.sendMessageWrapper', 'sending instrumented message...')
     defaults(fields.headers, traceHeaders)
 
     return original.apply(this, arguments)

lib/instrumentations/trace-instrumentation-http/request.js

@@ -5,6 +5,12 @@ var microtime = require('../../optionalDependencies/microtime')
 var util = require('./util')
 var format = require('util').format
 
+function tryParseInt (string) {
+  if (!string) { return }
+  var n = parseInt(string, 10)
+  return isNaN(n) ? undefined : n
+}
+
 function httpClient (originalHttpRequest, agent) {
   var whiteListHosts = agent.getConfig().whiteListHosts
   var config = agent.getConfig()
@@ -105,10 +111,8 @@ function httpClient (originalHttpRequest, agent) {
         ? collector.mustCollectSeverity
         : collector.defaultSeverity
 
-      var ssTimestamp = incomingMessage.headers['x-server-send']
-        ? Number(incomingMessage.headers['x-server-send']) : undefined
-      var serviceKey = incomingMessage.headers['x-parent']
-        ? Number(incomingMessage.headers['x-parent']) : undefined
+      var ssTimestamp = tryParseInt(incomingMessage.headers['x-server-send'])
+      var serviceKey = tryParseInt(incomingMessage.headers['x-parent'])
 
       var duffelBag = {
         severity: severity,

lib/instrumentations/trace-instrumentation-http/server.js

@@ -33,6 +33,12 @@ function isStatusCodeIgnored (ignoreStatusCodes, statusCode) {
   return false
 }
 
+function tryParseInt (string) {
+  if (!string) { return }
+  var n = parseInt(string, 10)
+  return isNaN(n) ? undefined : n
+}
+
 function httpServer (listener, agent) {
   var config = agent.getConfig()
   var collector = agent.tracer.collector
@@ -69,9 +75,9 @@ function httpServer (listener, agent) {
       ? collector.mustCollectSeverity
       : collector.defaultSeverity
 
-    var parentServiceKey = headers['x-parent'] && Number(headers['x-parent'])
-    var timestamp = headers['x-client-send'] && Number(headers['x-client-send'])
-    var communicationId = headers['x-span-id']
+    var parentServiceKey = tryParseInt(headers['x-parent'])
+    var timestamp = tryParseInt(headers['x-client-send'])
+    var communicationId = headers['x-span-id'] || undefined
 
     var duffelBag = {
       severity: severity,

test/instrumentations/redis/redis.spec.js

@@ -7,7 +7,7 @@ var expect = require('chai').expect
 var Shimmer = require('../../../lib/utils/shimmer')
 var Module = require('module')
 
-describe.only('The redis wrapper module', function () {
+describe('The redis wrapper module', function () {
   var sandbox = sinon.sandbox.create()
   var fakeAgent = {
     incomingEdgeMetrics: {