fix(agent): report network error

Author: dszakallas

lib/agent/index.js

@@ -232,37 +232,18 @@ Agent.prototype.clientSend = function (data) {
     return
   }
 
-  if (data.err) {
-    span.isForceSampled = true
-  }
-
   var event = {
-    time: data.time || microtime.now()
-  }
-
-  if (data.err) {
-    assign(event, {
-      type: Agent.ERROR,
-      data: {
+    time: data.time || microtime.now(),
+    type: Agent.CLIENT_SEND,
+    data: assign({}, data.protocolData
+      ? data.protocolData
+      : {}, {
+        protocol: data.protocol,
         rpcId: data.childCommId,
-        type: data.err.type,
-        message: data.err.message,
-        raw: data.err.raw
-      }
-    })
-  } else {
-    assign(event, {
-      type: Agent.CLIENT_SEND,
-      data: assign({}, data.protocolData
-        ? data.protocolData
-        : {}, {
-          protocol: data.protocol,
-          rpcId: data.childCommId,
-          host: data.host,
-          endpoint: data.url,
-          method: data.method
-        })
-    })
+        host: data.host,
+        endpoint: data.url,
+        method: data.method
+      })
   }
 
   span.events.push(event)
@@ -302,18 +283,39 @@ Agent.prototype.clientReceive = function (data) {
 
   data.time = data.time || this.getMicrotime()
 
-  span.events.push({
-    time: data.time,
-    type: Agent.CLIENT_RECV,
-    data: assign({}, data.protocolData
-      ? data.protocolData
-      : {}, {
-        protocol: data.protocol,
+  if (data.err) {
+    span.isForceSampled = true
+  }
+
+  var event = {
+    time: data.time || this.getMicrotime()
+  }
+
+  if (data.err) {
+    assign(event, {
+      type: Agent.ERROR,
+      data: {
         rpcId: data.childCommId,
-        status: data.status === consts.EDGE_STATUS.OK ? 'ok' : 'bad',
-        statusDescription: data.statusDescription
-      })
-  })
+        type: 'network-error',
+        message: data.err.message,
+        raw: data.err.raw
+      }
+    })
+  } else {
+    assign(event, {
+      type: Agent.CLIENT_RECV,
+      data: assign({}, data.protocolData
+        ? data.protocolData
+        : {}, {
+          protocol: data.protocol,
+          rpcId: data.childCommId,
+          status: data.status === consts.EDGE_STATUS.OK ? 'ok' : 'bad',
+          statusDescription: data.statusDescription
+        })
+    })
+  }
+
+  span.events.push(event)
 }
 
 Agent.prototype.onCrash = function (data) {

lib/agent/index.spec.js

@@ -314,6 +314,90 @@ describe('The Trace agent', function () {
     }])
   })
 
+  it('does network error', function () {
+    agent.sampleRate = 1
+    agent.serverReceive({
+      requestId: requestId,
+      parentCommId: parentCommId,
+      parentServiceId: parentServiceId,
+      url: url,
+      protocol: 'http',
+      host: host,
+      method: 'GET'
+    })
+    agent.clientSend({
+      requestId: requestId,
+      childCommId: childCommId,
+      method: 'POST',
+      host: 'remote-host',
+      url: '/products',
+      protocol: 'http'
+    })
+
+    agent.clientReceive({
+      requestId: requestId,
+      childCommId: childCommId,
+      host: 'remote-host',
+      url: '/products',
+      protocol: 'http',
+      status: 1,
+      err: {
+        message: 'Message',
+        raw: {
+          code: 'ECONNRESET',
+          host: 'localhsot',
+          port: 80,
+          syscall: 'connect'
+        }
+      }
+    })
+
+    expect(agent.totalRequestCount).to.eql(1)
+    expect(agent.reservoirSampler.getItems()).to.eql([])
+    expect(agent.partials[requestId]).to.eql({
+      requestId: requestId,
+      isForceSampled: true,
+      isSampled: false,
+      events: [{
+        type: 'sr',
+        time: time,
+        data: {
+          host: host,
+          protocol: 'http',
+          rpcId: parentCommId,
+          endpoint: url,
+          method: 'GET',
+          parent: 0,
+          originTime: undefined
+        }
+      }, {
+        type: 'cs',
+        time: time,
+        data: {
+          protocol: 'http',
+          rpcId: childCommId,
+          method: 'POST',
+          host: 'remote-host',
+          endpoint: '/products'
+        }
+      }, {
+        data: {
+          message: 'Message',
+          raw: {
+            code: 'ECONNRESET',
+            host: 'localhsot',
+            port: 80,
+            syscall: 'connect'
+          },
+          rpcId: '23',
+          type: 'network-error'
+        },
+        time: 12345678,
+        type: 'err'
+      }]
+    })
+  })
+
   it('does client send', function () {
     agent.sampleRate = 1
     agent.serverReceive({

lib/instrumentations/core/http/request.js

@@ -85,7 +85,6 @@ function wrapRequest (originalHttpRequest, agent, mustCollectStore) {
         protocol: consts.PROTOCOLS.HTTP,
         status: consts.EDGE_STATUS.NOT_OK,
         err: {
-          type: 'network-error',
           message: err.message,
           raw: {
             code: err.code,