newrelic 4.13.0 → 4.13.1

package/.npmignore

@@ -0,0 +1,4 @@
+test
+examples
+out
+Makefile

package/NEWS.md

@@ -1,3 +1,11 @@
+### 4.13.1 (2019-04-23):
+
+* Fixed bug where agent would stop sending data to New Relic servers when a connectivity
+  issue was encountered.
+
+* The agent will no longer crash the process in the event of unexpected calls to the
+  harvest callback.
+
 ### 4.13.0 (2018-12-20):
 
 * Fixed clearing of active harvest via _stopHarvester()

package/lib/agent.js

@@ -367,23 +367,23 @@ Agent.prototype.harvest = function harvest(callback) {
   const collector = this.collector
   const agent = this
   this._lastHarvest.send(function afterHarvest(err, agentRunAction) {
-    if (err) {
-      return callback(err)
-    }
-
     // The serverless collector will never tell us anything interesting to do,
     // but has an awkward, final step that the normal collector does not.
     if (collector instanceof ServerlessCollector) {
-      return collector.flushPayload(function afterFlush() {
+      return collector.flushPayload(function afterFlush(flushError) {
         agent.emit('harvestFinished')
-        callback()
+        const serverlessError = flushError || err
+        callback(serverlessError)
       })
     }
 
     // Do we need to do anything to the agent run?
     if (agentRunAction === AGENT_RUN_BEHAVIOR.SHUTDOWN) {
       agent.emit('harvestFinished')
-      agent.stop(callback)
+      agent.stop(function afterStop(stopError) {
+        const shutdownError = stopError || err
+        callback(shutdownError)
+      })
     } else if (agentRunAction === AGENT_RUN_BEHAVIOR.RESTART) {
       collector.restart(function afterRestart(restartError) {
         // TODO: What if preconnect/connect respond with shutdown here?
@@ -391,17 +391,17 @@ Agent.prototype.harvest = function harvest(callback) {
           logger.warn('Failed to restart agent run after harvest')
           callback(restartError)
         } else {
-          _finish()
+          _finish(err)
         }
       })
     } else {
-      _finish()
+      _finish(err)
     }
 
-    function _finish() {
+    function _finish(error) {
       agent.emit('harvestFinished')
       agent._scheduleHarvester(agent.config.data_report_period)
-      callback()
+      callback(error)
     }
   })
 }

package/lib/harvest.js

@@ -120,7 +120,23 @@ class HarvestStep {
       )
 
       // Send the payload to the collector.
-      self._doSend(payload, i, cb)
+      let callbackCalled = false
+      self._doSend(payload, i, function oncedCallback(err) {
+        if (callbackCalled) {
+          logger.info(
+            'Onced callback called multiple times in ' + self._endpoint,
+            err
+          )
+          return
+        }
+        callbackCalled = true
+        logger.trace(
+          'Onced callback called first time for ' + self._endpoint,
+          err
+        )
+
+        return cb(err)
+      })
     }, function afterSendingAllPayloads(err) {
       if (!err) {
         self.success = true
@@ -578,13 +594,7 @@ class Harvest {
         }
       }
 
-      // If the collector is telling us to shutdown or restart then we'll ignore
-      // the other harvest errors we got this time.
-      if (agentRunAction !== BEHAVIOR.PRESERVE) {
-        callback(null, agentRunAction)
-      } else {
-        callback(errors[0], agentRunAction)
-      }
+      callback(errors[0], agentRunAction)
     })
   }
 }