newrelic 5.8.0 → 5.11.0

package/LICENSE

@@ -1,5 +1,5 @@
 All components of this product are
-Copyright (c) 2008-2016 New Relic, Inc.  All rights reserved.
+Copyright (c) 2012-2019 New Relic, Inc. All rights reserved.
 
 Certain inventions disclosed in this file may be claimed within
 patents owned or patent applications filed by New Relic, Inc. or third
@@ -293,14 +293,3 @@ party, nor do they have any authority to bind the other party by contract or
 otherwise to any obligation.
 
 Root Certificate License Agreement v3.0 (January 2014)
-
-
-The New Relic Node.js agent also uses code from the following open source
-projects under the following licenses:
-
-async                       http://opensource.org/licenses/MIT
-concat-stream               http://opensource.org/licenses/MIT
-https-proxy-agent           http://opensource.org/licenses/MIT
-json-stringify-safe         http://opensource.org/licenses/ISC
-readable-stream             http://opensource.org/licenses/MIT
-semver                      http://opensource.org/licenses/ISC

package/NEWS.md

@@ -1,3 +1,106 @@
+### 5.11.0 (2019-07-29):
+
+* Implements Expected and Ignored Errors functionality
+
+* Bumps jsdoc and lodash dev dependency to avoid upstream vulnerability warning.
+
+* Added support for scoped package name introduced in hapi v18 (@hapi/hapi).
+
+  This will provide functionality at parity with instrumentation for hapi v17. Any
+  new features may not yet be supported.
+
+ Huge shoutout to Aori Nevo (@aorinevo) for this contribution.
+
+* Fixed bug where agent would count errors towards error metrics even if they were
+  dropped due to the error collector being disabled.
+
+* The agent will now properly track cached paths to files in loaded modules on Node
+  versions >10.
+
+  As of Node v11, the path to a file in a module being loaded will only be resolved
+  on the first load; subsequent resolution of that file will use a cached value.
+  The agent records this resolved path and uses it for relative file look ups in
+  order to deep link into modules using `Shim#require`. Since the agent couldn't
+  reliably get at the path on the subsequent calls to require, it now replicates
+  the caching logic and hold onto the resolved path for a given file.
+
+* Adds detailed logging through harvest/collector code to increase supportability.
+
+### 5.10.0 (2019-06-11):
+
+* The agent now allows installation on node v11 and v12.
+
+  This change relaxes the engines restriction to include Node v11 and v12. This does
+  not constitute official support for those versions, and users on those versions
+  may run into subtle incompatibilities. For those users who are interested in
+  experimenting with the agent on v11 and v12, we are tracking relevant issues
+  here: https://github.com/newrelic/node-newrelic/issues/279.
+
+* Lambda invocations ended with promises will now be recorded properly.
+
+  Previously, the lambda instrumentation was not intercepting the promise
+  resolution/rejection returned from a lambda handler. The instrumentation now
+  properly observes the promise, and ends the transaction when the promise has
+  finished.
+
+* Lambda invocations will only attempt to end the related transaction a single time.
+
+  In the event of two lambda response events (e.g. callback called, and a promise
+  returned), the agent would attempt to end the transaction twice, producing an
+  extraneous empty payload. The agent now limits itself to a single end call for
+  a given transaction.
+
+* The agent will now properly end transactions in the face of uncaught exceptions
+  while in serverless mode.
+
+* Enables ability to migrate to Configurable Security Policies (CSP) on a per agent
+  basis for accounts already using High Security Mode (HSM).
+
+  When both HSM and CSP are enabled for an account, an agent (this version or later)
+  can successfully connect with either `high_security: true` or the appropriate
+  `security_policies_token` configured. `high_security` has been added as part of
+  the preconnect payload.
+
+### 5.9.1 (2019-05-28):
+
+* moved third party notices to `THIRD_PARTY_NOTICES.md`
+
+* Shim#require will now operate as expected.
+
+  Previously, the module interception code made the faulty assumption that a module's
+  filepath would be resolved before the module load call was invoked. This caused
+  the wrap filepath to be attributed to the modules being instrumented. This meant
+  that attempted relative require calls using Shim#require would resolved from the
+  incorrect path. The logic has been changed to keep a stack of the resolved
+  filepaths, resolving the issue.
+
+* Updates error message for license check to indicate all places that need to be
+  updated.
+
+* Shim#wrapReturn now uses ES6 proxies to wrap its methods.
+
+  This will accurately propagate look up and assignment onto the underlying wrapped
+  function, while maintaining all previous functionality.
+
+* Updated versioned test configurations to reflect current engine support.
+
+### 5.9.0 (2019-05-20):
+
+* Removed older versions of Cassandra from versioned tests
+
+* For debug/test runs, shimmer will now cleanup the __NR_shim property on
+  instrumented methods. This leftover property did not result in any negative
+  behaviors but cleaning up for thoroughness and to prevent potential confusion.
+
+* `serverless_mode` feature flag is now enabled by default.
+
+* Fixes `recordMiddleware` promise parenting for certain cases where child segments
+  are created within resolving middleware `next()` promises.
+
+* Added `instrumentLoadedModule` function to the API, allowing end-users to manually
+  apply an instrumentation to a loaded module. Useful for cases where some module
+  needs to be loaded before newrelic
+
 ### 5.8.0 (2019-05-06):
 
 * Modifies `MiddlewareSpec` route property to allow functions. Defers route

package/THIRD_PARTY_NOTICES.md

@@ -0,0 +1,239 @@
+# Third Party Notices
+
+The New Relic Node Agent uses source code from third party libraries which carry
+their own copyright notices and license terms. These notices are provided
+below.
+
+In the event that a required notice is missing or incorrect, please notify us
+by e-mailing [open-source@newrelic.com](mailto:open-source@newrelic.com).
+
+For any licenses that require the disclosure of source code, the source code
+can be found at https://github.com/newrelic/node-newrelic.
+
+## Contents
+
+* [async](#async)
+* [concat-stream](#concat-steam)
+* [https-proxy-agent](#https-proxy-agent)
+* [json-stringify-safe](#json-stringify-safe)
+* [readable-stream](#readable-stream)
+* [semver](#semver)
+
+## async
+
+This product includes source derived from
+[async](https://github.com/caolan/async), distributed under the
+[MIT license](https://github.com/caolan/async/blob/a0b2be5a7add90d74e1337621be536ab01b584ae/LICENSE):
+
+```
+Copyright (c) 2010-2018 Caolan McMahon
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+```
+
+## concat-stream
+
+This product includes source derived from
+[async](https://github.com/maxogden/concat-stream), distributed under the
+[MIT license](https://github.com/maxogden/concat-stream/blob/ceaa101bd2e19c5878a98dd6cb875108f49bf5c5/LICENSE):
+
+```
+The MIT License
+
+Copyright (c) 2013 Max Ogden
+
+Permission is hereby granted, free of charge,
+to any person obtaining a copy of this software and
+associated documentation files (the "Software"), to
+deal in the Software without restriction, including
+without limitation the rights to use, copy, modify,
+merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom
+the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+```
+
+## https-proxy-agent
+
+This product includes source derived from
+[https-proxy-agent](https://github.com/TooTallNate/node-https-proxy-agent), distributed under the
+[MIT license](https://github.com/TooTallNate/node-https-proxy-agent):
+
+```
+(The MIT License)
+
+Copyright (c) 2013 Nathan Rajlich <nathan@tootallnate.net>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+```
+
+## json-stringify-safe
+
+This product includes source derived from
+[json-stringify-safe](https://github.com/moll/json-stringify-safe), distributed under the
+[ISC license](https://github.com/moll/json-stringify-safe/blob/5930d6e51c58cf3a134f36301b029408bcfd09e5/LICENSE):
+
+```
+The ISC License
+
+Copyright (c) Isaac Z. Schlueter and Contributors
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+```
+
+## readable-stream
+
+This product includes source derived from
+[readable-stream](https://github.com/nodejs/readable-stream), distributed under the
+[MIT license](https://github.com/nodejs/readable-stream/blob/4ba93f84cf8812ca2af793c7304a5c16de72088a/LICENSE):
+
+```
+Node.js is licensed for use as follows:
+
+"""
+Copyright Node.js contributors. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE.
+"""
+
+This license applies to parts of Node.js originating from the
+https://github.com/joyent/node repository:
+
+"""
+Copyright Joyent, Inc. and other Node contributors. All rights reserved.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE.
+"""
+
+```
+
+## semver
+
+This product includes source derived from
+[semver](https://github.com/npm/node-semver), distributed under the
+[ISC license](https://github.com/npm/node-semver/blob/0e3bcedfb19e2f7ef64b9eb0a0f1554ed7d94be0/LICENSE):
+
+```
+The ISC License
+
+Copyright (c) Isaac Z. Schlueter and Contributors
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+```
+
+## @tyriar/fibonacci-heap
+
+This product includes source derived from
+[js-fibonacci-heap](https://github.com/gwtw/js-fibonacci-heap), distributed under the
+[MIT license](https://github.com/gwtw/js-fibonacci-heap/blob/ec31d0966f9e54b0a52f3a074fe1d2442ab69979/LICENSE):
+
+```
+The MIT License (MIT)
+
+Copyright (c) 2014 Daniel Imms, http://www.growingwiththeweb.com
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+```
+
+Portions copyright [Node.js] contributors. Depending on your existing libraries and package management settings, your systems may call externally maintained libraries in addition to those listed above. See [here](https://nodejs.org/en/docs/meta/topics/dependencies/) and [here](https://github.com/nodejs/node/blob/v4.3.1/LICENSE) for additional details regarding externally maintained libraries and certain related licenses and notices.

package/api.js

@@ -9,6 +9,7 @@ const hashes = require('./lib/util/hashes')
 const properties = require('./lib/util/properties')
 const stringify = require('json-stringify-safe')
 const shimmer = require('./lib/shimmer')
+const shims = require('./lib/shim')
 const isValidType = require('./lib/util/attribute-types')
 const TransactionShim = require('./lib/shim/transaction-shim')
 const TransactionHandle = require('./lib/transaction/handle')
@@ -1197,6 +1198,57 @@ function instrumentDatastore(moduleName, onRequire, onError) {
   shimmer.registerInstrumentation(opts)
 }
 
+/**
+ * Applies an instrumentation to an already loaded module.
+ *
+ *    // oh no, express was loaded before newrelic
+ *    const express   = require('express')
+ *    const newrelic  = require('newrelic')
+ *
+ *    // phew, we can use instrumentLoadedModule to make
+ *    // sure express is still instrumented
+ *    newrelic.instrumentLoadedModule('express', express)
+ *
+ * @param {string} moduleName
+ *  The module's name/identifier.  Will be normalized
+ *  into an instrumentation key.
+ *
+ * @param {object} module
+ *  The actual module object or function we're instrumenting
+ */
+API.prototype.instrumentLoadedModule =
+function instrumentLoadedModule(moduleName, module) {
+  var metric = this.agent.metrics.getOrCreateMetric(
+    NAMES.SUPPORTABILITY.API + '/instrumentLoadedModule'
+  )
+  metric.incrementCallCount()
+
+  const instrumentationName = shimmer.getInstrumentationNameFromModuleName(moduleName)
+  if (!shimmer.registeredInstrumentations[instrumentationName]) {
+    logger.warn("No instrumentation registered for '%s'.", instrumentationName)
+    return false
+  }
+
+  const instrumentation = shimmer.registeredInstrumentations[instrumentationName]
+  if (!instrumentation.onRequire) {
+    logger.warn("No onRequire function registered for '%s'.", instrumentationName)
+    return false
+  }
+
+  const resolvedName = require.resolve(moduleName)
+
+  const shim = shims.createShimFromType(
+    instrumentation.type,
+    this.agent,
+    moduleName,
+    resolvedName
+  )
+
+  instrumentation.onRequire(shim, module, moduleName)
+
+  return true
+}
+
 /**
  * Registers an instrumentation function.
  *

package/lib/agent.js

@@ -218,6 +218,7 @@ Agent.prototype.stop = function stop(callback) {
   const agent = this
 
   this.setState('stopping')
+
   this._stopHarvester()
   sampler.stop()
 
@@ -234,6 +235,8 @@ Agent.prototype.stop = function stop(callback) {
       callback(error)
     })
   } else {
+    logger.trace('Collector was not connected, invoking callback.')
+
     process.nextTick(callback)
   }
 }
@@ -331,6 +334,8 @@ Agent.prototype.reset = function reset() {
  * struggling.
  */
 Agent.prototype.harvest = function harvest(callback) {
+  logger.trace('Peparing to harvest.')
+
   if (!callback) {
     throw new TypeError('callback required!')
   }
@@ -338,7 +343,10 @@ Agent.prototype.harvest = function harvest(callback) {
   // Generate metrics for this harvest and then check we are connected to the
   // collector.
   this._generateHarvestMetrics()
+
   if (!this.collector.isConnected()) {
+    logger.trace('Collector not connected.')
+
     return setImmediate(function immediatelyError() {
       callback(new Error('Not connected to New Relic!'))
     })
@@ -346,6 +354,8 @@ Agent.prototype.harvest = function harvest(callback) {
 
   // We have a connection, create a new harvest.
   this.emit('harvestStarted')
+  logger.info('Harvest started.')
+
   this._lastHarvest = new Harvest(this)
   this._lastHarvest.prepare(Harvest.ALL_ENDPOINTS)
 
@@ -355,30 +365,40 @@ Agent.prototype.harvest = function harvest(callback) {
   // Send the harvest!
   const collector = this.collector
   const agent = this
+
+  logger.trace('Sending harvest data...')
   this._lastHarvest.send(function afterHarvest(err, agentRunAction) {
     // Do we need to do anything to the agent run?
     if (agentRunAction === AGENT_RUN_BEHAVIOR.SHUTDOWN) {
       agent.emit('harvestFinished')
+      logger.info('Harvest finished. Shutdown requested.')
+
       agent.stop(function afterStop(stopError) {
         const shutdownError = stopError || err
         callback(shutdownError)
       })
     } else if (agentRunAction === AGENT_RUN_BEHAVIOR.RESTART) {
+      logger.info('Restart requested. Harvest will complete upon restart finish.')
+
       collector.restart(function afterRestart(restartError) {
         // TODO: What if preconnect/connect respond with shutdown here?
         if (restartError) {
           logger.warn('Failed to restart agent run after harvest')
           callback(restartError)
         } else {
+          logger.trace('Restart succeeded. Finishing harvest.')
           _finish(err)
         }
       })
     } else {
+      logger.trace('Data sent successfully. Finishing harvest.')
       _finish(err)
     }
 
     function _finish(error) {
       agent.emit('harvestFinished')
+      logger.info('Harvest finished.')
+
       agent._scheduleHarvester(agent.config.data_report_period)
       callback(error)
     }
@@ -391,16 +411,20 @@ Agent.prototype.harvest = function harvest(callback) {
  * NOTE: this doesn't currently work outside of serverless mode.
  */
 Agent.prototype.harvestSync = function harvestSync() {
+  logger.trace('Peparing to harvest.')
+
   // Generate metrics for this harvest and then check we are connected to the
   // collector.
   this._generateHarvestMetrics()
 
   if (!this.collector.isConnected()) {
-    throw new Error('Not connected to New Relic!')
+    throw new Error('Sync harvest not connected/enabled!')
   }
 
   // We have a connection, create a new harvest.
   this.emit('harvestStarted')
+  logger.info('Harvest started.')
+
   this._lastHarvest = new Harvest(this)
   this._lastHarvest.prepare(Harvest.ALL_ENDPOINTS)
 
@@ -414,7 +438,9 @@ Agent.prototype.harvestSync = function harvestSync() {
   const payloads = this._lastHarvest.getPayloads()
   collector.populateDataSync(payloads)
   collector.flushPayloadSync()
+
   agent.emit('harvestFinished')
+  logger.info('Harvest finished.')
 }
 
 Agent.prototype._generateHarvestMetrics = function _generateHarvestMetrics() {
@@ -489,7 +515,7 @@ Agent.prototype.setState = function setState(newState) {
     throw new TypeError('Invalid state ' + newState)
   }
 
-  logger.debug('Agent state changed from %s to %s.', this._state, newState)
+  logger.info('Agent state changed from %s to %s.', this._state, newState)
   this._state = newState
   this.emit(this._state)
 }
@@ -541,6 +567,8 @@ function _harvesterIntervalChange(interval, callback) {
  * @param {number} harvestSeconds How many seconds between harvests.
  */
 Agent.prototype._restartHarvester = function _restartHarvester(harvestSeconds) {
+  logger.trace('Restarting harvester.')
+
   this._stopHarvester()
   this._scheduleHarvester(harvestSeconds)
 }
@@ -549,6 +577,8 @@ Agent.prototype._restartHarvester = function _restartHarvester(harvestSeconds) {
  * Safely stop the harvest cycle timer.
  */
 Agent.prototype._stopHarvester = function _stopHarvester() {
+  logger.trace('Stopping harvester.')
+
   if (this.harvesterHandle) {
     clearTimeout(this.harvesterHandle)
   }
@@ -569,11 +599,17 @@ Agent.prototype._scheduleHarvester = function _scheduleHarvester(harvestSeconds)
 
   // If there was a previous harvest, we want to schedule the next one based on
   // its start time.
-  if (this._lastHarvest && this._lastHarvest.startTime) {
+  const lastHarvestStart = this._lastHarvest && this._lastHarvest.startTime
+  if (lastHarvestStart) {
     const timeSinceHarvest = Date.now() - this._lastHarvest.startTime
     harvestDelay = Math.max(0, harvestDelay - timeSinceHarvest)
   }
 
+  logger.trace(
+    'Scheduling harvester. ' +
+    `Last harvest start: ${lastHarvestStart}. Next harvest delay: ${harvestDelay}`
+  )
+
   this.harvesterHandle = setTimeout(function doHarvest() {
     // Agent#harvest handles scheduling the next harvest and properly reacting to
     // any errors or commands. All we need to do is note any errors it spits out.
@@ -583,6 +619,7 @@ Agent.prototype._scheduleHarvester = function _scheduleHarvester(harvestSeconds)
       }
     })
   }, harvestDelay)
+
   this.harvesterHandle.unref()
 }
 
@@ -735,7 +772,13 @@ Agent.prototype._transactionFinished = function _transactionFinished(transaction
       logger.debug('Explicitly not ignoring %s (%s).', transaction.name, transaction.id)
     }
     this.metrics.merge(transaction.metrics)
-    this.errors.onTransactionFinished(transaction, this.metrics)
+    let collectedErrors = this.errors.onTransactionFinished(transaction)
+
+    // the metric should be incremented only if the error was actually collected
+    if (collectedErrors > 0) {
+      this.metrics.getOrCreateMetric(NAMES.ERRORS.PREFIX + transaction.getFullName())
+        .incrementCallCount(collectedErrors)
+    }
     this.traces.add(transaction)
 
     const trace = transaction.trace

package/lib/collector/api.js

@@ -73,6 +73,8 @@ CollectorAPI.prototype.connect = function connect(callback) {
     throw new TypeError('callback is required')
   }
 
+  logger.trace('Starting collector.')
+
   this._agent.setState('connecting')
 
   const api = this
@@ -146,9 +148,12 @@ CollectorAPI.prototype._login = function _login(callback) {
   var agent = this._agent
   var self = this
 
-  var payload = agent.config.security_policies_token
-    ? [{ security_policies_token: agent.config.security_policies_token }]
-    : null
+  const preconnectData = { high_security: agent.config.high_security }
+  if (agent.config.security_policies_token) {
+    preconnectData.security_policies_token = agent.config.security_policies_token
+  }
+
+  const payload = [preconnectData]
 
   methods.redirect.invoke(payload, onPreConnect)
 
@@ -419,6 +424,8 @@ CollectorAPI.prototype.shutdown = function shutdown(callback) {
     throw new TypeError('callback is required')
   }
 
+  logger.info('Shutting down collector.')
+
   var agent = this._agent
   this._methods.shutdown.invoke(null, this._reqHeadersMap, onShutdown)
 
@@ -439,6 +446,8 @@ CollectorAPI.prototype.shutdown = function shutdown(callback) {
 }
 
 CollectorAPI.prototype.restart = function restart(callback) {
+  logger.info('Restarting collector.')
+
   var api = this
   this.shutdown(function reconnect() {
     api.connect(callback)

package/lib/collector/serverless.js

@@ -64,6 +64,8 @@ class ServerlessCollector {
    * @param {Function} cb The callback to invoke upon disabling the collector.
    */
   shutdown(cb) {
+    logger.trace('Disabling serverless collector.')
+
     this.enabled = false
     setImmediate(cb, null, CollectorResponse.success(null))
   }

package/lib/config/default.js

@@ -298,7 +298,13 @@ exports.config = () => ({
      * your own server's sake. The payload of events is compressed, but if it
      * grows too large the New Relic servers may reject it.
      */
-    max_event_samples_stored: 100
+    max_event_samples_stored: 100,
+
+    expected_classes: [],
+    expected_messages: {},
+    expected_status_codes: [],
+    ignore_classes:[],
+    ignore_messages:{}
   },
   /**
    * Error message redaction