newrelic 6.13.2 → 7.0.2

package/NEWS.md

@@ -1,4 +1,77 @@
-## 6.13.2 (2020-10-13):
+### 7.0.2 (2020-12-01):
+
+* Fixes a bug where the `http.statusCode` attribute was not being captured for an async invoked lambda.
+* Fixed typos in code comments, documentation, and debugging logger messages.
+  Thank you @TysonAndre for the contribution.
+
+### 7.0.1 (2020-11-17):
+
+* Fixed a bug where spans queued up during backpressure situations would be improperly formatted and ultimately dropped when sent to an Infinite Tracing trace observer.
+* Updated @grpc/grpc-js to version v1.2.0.
+* Updated tap to clear up npm audit issues around lodash sub-dependency.
+
+### 7.0.0 (2020-11-09):
+
+* Added official parity support for Node 14
+
+* Dropped Node v8.x support. For further information on our support policy,
+  see: https://docs.newrelic.com/docs/agents/nodejs-agent/getting-started/compatibility-requirements-nodejs-agent.
+  * Removed Node v8.x from CI
+  * Adds check that minimum Node version is >=10 and warns if >=15
+  * Sets Node engine to >=10
+  * **BREAKING** Dropped support for Node v8.x HTTP get() function signature
+    * strictly uses global.URL class in http core instrumentation
+    * removes Nodejs 8.x - 9.x checks
+  * Update New Relic Dependencies to versions with updated Node version support
+    * @newrelic/aws-sdk v3.0.0
+    * @newrelic/koa v5.0.0
+    * @newrelic/native-metrics v6.0.0
+    * @newrelic/superagent v4.0.0
+    * @newrelic/test-utilities v5.0.0
+
+* **BREAKING** Removed deprecated setIgnoreTransaction API method
+
+* **BREAKING** Removed deprecated httpResponseCode, response.status and
+  httpResponseMessage http response attributes
+
+* **BREAKING** Removed the api.custom_parameters_enabled configuration item and
+  associated environment variable NEW_RELIC_API_CUSTOM_PARAMETERS. Please use
+  api.custom_attributes_enabled instead
+
+* **BREAKING** Removed deprecated Distributed Tracing API methods,
+  createDistributedTracePayload() and acceptDistributedTracePayload()
+
+* Finalized removal of ignored_params and capture_params
+
+* Added additional logging to W3C Trace Context header creation
+
+### 6.14.0 (2020-10-28):
+
+* Updated README for consistency.
+
+* Fixed issue where gRPC connection used for infinite tracing could throw if the server
+  shutdown during disconnect of an existing connection.
+
+* Bumped @grpc/grpc-js to 1.1.7.
+
+* Bumped @grpc/proto-loader to ^0.5.5.
+
+* Infinite tracing logging and support metric improvements.
+
+  * Increased logging level of certain infinite tracing / gRPC errors.
+  * Decreased logging interval of dropped span warning for infinite tracing.
+  * Added additional support metrics and logging for infinite tracing.
+
+* Fixed bug where errors would still be collected for transactions with ignored error
+  status codes in certain situations.
+
+* Converted errors ignore unit tests to tap API.
+
+* Added Node 14 to CI test coverage.
+
+  Many thanks to @jgeurts for the contribution.
+
+### 6.13.2 (2020-10-13):
 
 * Removed lodash as a development dependency
 
@@ -10,7 +83,7 @@
 
   Thank you to @ronen-e for the contribution!
 
-## 6.13.1 (2020-09-24):
+### 6.13.1 (2020-09-24):
 
 * Fixed named-pipe check for lambda invocations to avoid race-condition.
 
@@ -269,7 +342,7 @@ Special thanks to Ryan Copley (@RyanCopley) for the contribution.
   object from API#getLinkingMetadata().
 
   This issue would cause the `@newrelic/winston-enricher` module to crash when
-  attempting to inject log metatdata.
+  attempting to inject log metadata.
 
 * Reduced logging level of raw `x-queue-start` or `x-request-start` header values
   to avoid logging very large values at default logging levels.
@@ -3221,7 +3294,7 @@ Special thanks to Ryan Copley (@RyanCopley) for the contribution.
 
 * Fixed a bug where custom events weren't being sent.
 
-  In a refactor of our data collection cycle, we omited the custom
+  In a refactor of our data collection cycle, we omitted the custom
   events from the list of commands, this is now fixed.
 
 * Fixed a very rare bug where the custom event pool could be set to 10
@@ -3445,7 +3518,7 @@ Special thanks to Ryan Copley (@RyanCopley) for the contribution.
   ended when the view ended.
 
 * Added a configuration option to completely disable logging. `logger.enabled`
-  defaults to true, if set to false it wont try to create the log file.
+  defaults to true, if set to false it won't try to create the log file.
 
 ### v1.16.2 (2015-02-13):
 
@@ -4216,7 +4289,7 @@ Special thanks to Ryan Copley (@RyanCopley) for the contribution.
   too many times. Thanks to José F. Romaniello for confirming the fix.
 * Changed how requests handled by Express and Restify routes are named. This
   change is being rolled out both in this module and on the New Relic website,
-  so there is a chance you will see the same route (or very similiar routes)
+  so there is a chance you will see the same route (or very similar routes)
   show up twice in aggregated metrics.
 * Dropped the default apdex tolerating value from 500 milliseconds to 100
   milliseconds. This means that transactions slower than 400 milliseconds will
@@ -4453,7 +4526,7 @@ Special thanks to Ryan Copley (@RyanCopley) for the contribution.
   crash.
 * Some metric normalization rules were not being interpreted correctly, leading
   to malformed normalized metric names.
-* Metric normalization rules that specifed that matching metrics were to be
+* Metric normalization rules that specified that matching metrics were to be
   ignored were not being enforced.
 
 ### v0.9.12-91 / beta-12 (2012-12-28):

package/README.md

@@ -10,7 +10,7 @@ In order to take full advantage of this package, make sure you have a [New Relic
 
 As with any instrumentation tool, please test before using in production.
 
-## Installation and getting started
+## Installation
 
 To use New Relic's Node.js agent entails these three steps, which are described in detail below:
 
@@ -57,9 +57,13 @@ If you're compiling your JavaScript and can't control the final `require` order,
     $ node -r newrelic your-program.js
     $ node --require newrelic your-program.js
 
+## Getting Started
+
 For more information on getting started, [check the Node.js docs](https://docs.newrelic.com/docs/agents/nodejs-agent/getting-started/introduction-new-relic-nodejs).
 
-## Using the API
+## Usage
+
+### Using the API
 
 The `newrelic` module returns an object with the Node agent's API methods attached.
 
@@ -72,7 +76,7 @@ The `newrelic` module returns an object with the Node agent's API methods attach
 
 You can read more about using the API over on the [New Relic documentation](https://docs.newrelic.com/docs/agents/nodejs-agent/api-guides/guide-using-nodejs-agent-api) site.
 
-## Core agent development and tests
+## Testing
 
 These are the steps to work on core agent features, with more detail below:
 
@@ -149,17 +153,22 @@ Please review [New Relic’s General Data Privacy Notice](https://newrelic.com/t
 
 See our [roadmap](./ROADMAP_Node.md), to learn more about our product vision, understand our plans, and provide us valuable feedback.
 
-## Contributing
+## Contribute
 
 We encourage your contributions to improve the Node.js agent! Keep in mind when you submit your pull request, you'll need to sign the CLA via the click-through using CLA-Assistant. You only have to sign the CLA one time per project.
+
 If you have any questions, or to execute our corporate CLA, required if your contribution is on behalf of a company,  please drop us an email at opensource@newrelic.com.
 
 **A note about vulnerabilities**
 
-As noted in our [security policy](https://github.com/newrelic/node-newrelic/security/policy), New Relic is committed to the privacy and security of our customers and their data. We believe that providing coordinated disclosure by security researchers and engaging with the security community are important means to achieve our security goals.
+As noted in our [security policy](../../security/policy), New Relic is committed to the privacy and security of our customers and their data. We believe that providing coordinated disclosure by security researchers and engaging with the security community are important means to achieve our security goals.
 
 If you believe you have found a security vulnerability in this project or any of New Relic's products or websites, we welcome and greatly appreciate you reporting it to New Relic through [HackerOne](https://hackerone.com/newrelic).
 
+If you would like to contribute to this project, review [these guidelines](./CONTRIBUTING.md).
+
+To [all contributors](https://github.com/newrelic/node-newrelic/graphs/contributors), we thank you!  Without your contribution, this project would not be what it is today.  We also host a community project page dedicated to [New Relic Node Agent](https://opensource.newrelic.com/projects/newrelic/node-newrelic).
+
 ## License
 
 The Node.js agent is licensed under the [Apache 2.0](http://apache.org/licenses/LICENSE-2.0.txt) License.

package/ROADMAP_Node.md

@@ -15,7 +15,7 @@ This roadmap project is broken down into the following sections:
 - **Next**:
     - This section contains work planned within the next three months. These features may still be deprioritized and moved to Future.
 - **Future**:
-    - This section is for ideas for future work that is alined with the product vision and possible opportunities for community contribution. It contains a list of features that anyone can implement. No guarantees can be provided on if or when these features will be completed.
+    - This section is for ideas for future work that is aligned with the product vision and possible opportunities for community contribution. It contains a list of features that anyone can implement. No guarantees can be provided on if or when these features will be completed.
      
 
 **The roadmap project is found [here](https://github.com/orgs/newrelic/projects/11)**

package/THIRD_PARTY_NOTICES.md

@@ -68,15 +68,12 @@ code, the source code can be found at [https://github.com/newrelic/node-newrelic
 * [through](#through)
 * [when](#when)
 
-**[additional-licenses](#additional-licenses)**
-
-* [symantec](#symantec)
 
 ## dependencies
 
 ### @grpc/grpc-js
 
-This product includes source derived from [@grpc/grpc-js](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js) ([v1.0.5](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/tree/v1.0.5)), distributed under the [Apache-2.0 License](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/blob/v1.0.5/LICENSE):
+This product includes source derived from [@grpc/grpc-js](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js) ([v1.2.0](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/tree/v1.2.0)), distributed under the [Apache-2.0 License](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/blob/v1.2.0/LICENSE):
 
 ```
                                  Apache License
@@ -285,7 +282,7 @@ This product includes source derived from [@grpc/grpc-js](https://github.com/grp
 
 ### @grpc/proto-loader
 
-This product includes source derived from [@grpc/proto-loader](https://github.com/grpc/grpc-node) ([v0.5.4](https://github.com/grpc/grpc-node/tree/v0.5.4)), distributed under the [Apache-2.0 License](https://github.com/grpc/grpc-node/blob/v0.5.4/LICENSE):
+This product includes source derived from [@grpc/proto-loader](https://github.com/grpc/grpc-node) ([v0.5.5](https://github.com/grpc/grpc-node/tree/v0.5.5)), distributed under the [Apache-2.0 License](https://github.com/grpc/grpc-node/blob/v0.5.5/LICENSE):
 
 ```
                                  Apache License
@@ -494,7 +491,7 @@ This product includes source derived from [@grpc/proto-loader](https://github.co
 
 ### @newrelic/aws-sdk
 
-This product includes source derived from [@newrelic/aws-sdk](https://github.com/newrelic/node-newrelic-aws-sdk) ([v2.0.0](https://github.com/newrelic/node-newrelic-aws-sdk/tree/v2.0.0)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-newrelic-aws-sdk/blob/v2.0.0/LICENSE):
+This product includes source derived from [@newrelic/aws-sdk](https://github.com/newrelic/node-newrelic-aws-sdk) ([v3.0.0](https://github.com/newrelic/node-newrelic-aws-sdk/tree/v3.0.0)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-newrelic-aws-sdk/blob/v3.0.0/LICENSE):
 
 ```
                                  Apache License
@@ -702,7 +699,7 @@ This product includes source derived from [@newrelic/aws-sdk](https://github.com
 
 ### @newrelic/koa
 
-This product includes source derived from [@newrelic/koa](https://github.com/newrelic/node-newrelic-koa) ([v4.0.0](https://github.com/newrelic/node-newrelic-koa/tree/v4.0.0)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-newrelic-koa/blob/v4.0.0/LICENSE):
+This product includes source derived from [@newrelic/koa](https://github.com/newrelic/node-newrelic-koa) ([v5.0.0](https://github.com/newrelic/node-newrelic-koa/tree/v5.0.0)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-newrelic-koa/blob/v5.0.0/LICENSE):
 
 ```
 Apache License
@@ -911,7 +908,7 @@ Apache License
 
 ### @newrelic/superagent
 
-This product includes source derived from [@newrelic/superagent](https://github.com/newrelic/node-newrelic-superagent) ([v3.0.0](https://github.com/newrelic/node-newrelic-superagent/tree/v3.0.0)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-newrelic-superagent/blob/v3.0.0/LICENSE):
+This product includes source derived from [@newrelic/superagent](https://github.com/newrelic/node-newrelic-superagent) ([v4.0.0](https://github.com/newrelic/node-newrelic-superagent/tree/v4.0.0)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-newrelic-superagent/blob/v4.0.0/LICENSE):
 
 ```
                                  Apache License
@@ -1323,7 +1320,7 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 ## optionalDependencies
 
 ### @newrelic/native-metrics
-This product includes source derived from [@newrelic/native-metrics](https://github.com/newrelic/node-native-metrics) ([v5.3.0](https://github.com/newrelic/node-native-metrics/tree/v5.3.0)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-native-metrics/blob/v5.3.0/LICENSE):
+This product includes source derived from [@newrelic/native-metrics](https://github.com/newrelic/node-native-metrics) ([v6.0.0](https://github.com/newrelic/node-native-metrics/tree/v6.0.0)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-native-metrics/blob/v6.0.0/LICENSE):
 
 ```
                                  Apache License
@@ -1548,7 +1545,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ### @newrelic/test-utilities
 
-This product includes source derived from [@newrelic/test-utilities](https://github.com/newrelic/node-test-utilities) ([v4.0.0](https://github.com/newrelic/node-test-utilities/tree/v4.0.0)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-test-utilities/blob/v4.0.0/LICENSE):
+This product includes source derived from [@newrelic/test-utilities](https://github.com/newrelic/node-test-utilities) ([v5.0.0](https://github.com/newrelic/node-test-utilities/tree/v5.0.0)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-test-utilities/blob/v5.0.0/LICENSE):
 
 ```
                                  Apache License
@@ -2888,7 +2885,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ### tap
 
-This product includes source derived from [tap](https://github.com/tapjs/node-tap) ([v14.10.7](https://github.com/tapjs/node-tap/tree/v14.10.7)), distributed under the [ISC License](https://github.com/tapjs/node-tap/blob/v14.10.7/LICENSE):
+This product includes source derived from [tap](https://github.com/tapjs/node-tap) ([v14.10.8](https://github.com/tapjs/node-tap/tree/v14.10.8)), distributed under the [ISC License](https://github.com/tapjs/node-tap/blob/v14.10.8/LICENSE):
 
 ```
 The ISC License
@@ -3000,6 +2997,7 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ```
 
+
 ## additional-licenses
 
 ### symantec
@@ -3204,4 +3202,4 @@ Root Certificate License Agreement v3.0 (January 2014)
 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.”
+for additional details regarding externally maintained libraries and certain related licenses and notices.”

package/api.js

@@ -430,38 +430,6 @@ API.prototype.addCustomSpanAttribute = function addCustomSpanAttribute(key, valu
   spanContext.addCustomAttribute(key, value)
 }
 
-API.prototype.setIgnoreTransaction = util.deprecate(
-  setIgnoreTransaction, [
-    'API#setIgnoreTransaction is being deprecated!',
-    'Please use TransactionHandle#ignore to ignore a transaction.',
-    'Use API#getTransaction to create a new TransactionHandle instance.'
-  ].join(' ')
-)
-
-/**
- * Tell the tracer whether to ignore the current transaction. The most common
- * use for this will be to mark a transaction as ignored (maybe it's handling
- * a websocket polling channel, or maybe it's an external call you don't care
- * is slow), but it's also useful when you want a transaction that would
- * otherwise be ignored due to URL or transaction name normalization rules
- * to *not* be ignored.
- *
- * @param {boolean} ignored Ignore, or don't ignore, the current transaction.
- */
-function setIgnoreTransaction(ignored) {
-  var metric = this.agent.metrics.getOrCreateMetric(
-    NAMES.SUPPORTABILITY.API + '/setIgnoreTransaction'
-  )
-  metric.incrementCallCount()
-
-  var transaction = this.agent.tracer.getTransaction()
-  if (!transaction) {
-    return logger.warn("No transaction found to ignore.")
-  }
-
-  transaction.setForceIgnore(ignored)
-}
-
 /**
  * Send errors to New Relic that you've already handled yourself. Should be an
  * `Error` or one of its subtypes, but the API will handle strings and objects

package/bin/run-versioned-tests.sh

@@ -24,14 +24,9 @@ fi
 
 export AGENT_PATH=`pwd`
 
-# @koa/router 8.03+ breaks segment naming for nested routes
-skip="koa"
-
 # Don't run the aws-sdk tests if we don't have the keys set
 if [[ -z "$AWS_ACCESS_KEY_ID" ]]; then
-  skip="${skip},aws-sdk"
+  time ./node_modules/.bin/versioned-tests $VERSIONED_MODE -i 2 -s aws-sdk ${directories[@]}
+else
+  time ./node_modules/.bin/versioned-tests $VERSIONED_MODE -i 2 ${directories[@]}
 fi
-
-
-# This is meant to be temporary. Remove once new major version with fixes rolled into agent.
-time ./node_modules/.bin/versioned-tests $VERSIONED_MODE -i 2 -s $skip ${directories[@]}

package/index.js

@@ -48,14 +48,16 @@ function initialize() {
       preAgentTime
     )
 
-    // TODO: Update this check when Node v8 is deprecated.
-    if (psemver.satisfies('<8.0.0')) {
+    // TODO: Update this check when Node v10 is deprecated.
+    if (psemver.satisfies('<10.0.0')) {
       message = 'New Relic for Node.js requires a version of Node equal to or\n' +
                 'greater than 8.0.0. Not starting!'
 
       logger.error(message)
       throw new Error(message)
-    } else if (!psemver.satisfies(pkgJSON.engines.node)) {
+
+      // TODO: Update this check when Node v16 support is added
+    } else if (!psemver.satisfies(pkgJSON.engines.node) || psemver.satisfies('>=15.0.0')) { 
       logger.warn(
         'New Relic for Node.js %s has not been tested on Node.js %s. Please ' +
         'update the agent or downgrade your version of Node.js',

package/lib/agent.js

@@ -581,6 +581,10 @@ Agent.prototype._beforeMetricDataSend = function _beforeMetricDataSend() {
 
   // Send uninstrumented supportability metrics every metric harvest cycle
   uninstrumented.createMetrics(this.metrics)
+
+  if (this.spanEventAggregator.isStream) {
+    this.spanEventAggregator.createMetrics()
+  }
 }
 
 Agent.prototype._generateEntityStatsAndClear = function _generateHarvestMetrics() {

package/lib/collector/api.js

@@ -511,12 +511,12 @@ CollectorAPI.prototype._sendData = function _sendData(method, data, callback) {
     if (response.agentRun === AGENT_RUN_BEHAVIOR.SHUTDOWN) {
       // TODO: for now, shut handled in _handleResponseCode for consistency
       // either find way to safely change while side-by-side or move
-      // once side-by-side gone. Currently, stop is called twice on teh old code path
+      // once side-by-side gone. Currently, stop is called twice on the old code path
 
       // TODO: almost seems better to let aggregator finish (cb) then shutdown?
 
       // this._agent.stop((err) => {
-      //   // TODO: agent stop requires a callback. if we don't care to do anythig here
+      //   // TODO: agent stop requires a callback. if we don't care to do anything here
       //   // do we loosen that requirement or perhaps have a different "shutdown"
       //   // method? Does seem like you'd want to log a shutdown error
       //   // but don't really care about that *here*

package/lib/collector/http-agents.js

@@ -42,7 +42,7 @@ exports.keepAliveAgent = function keepAliveAgent(config) {
  * NPM package with configuration suitable for working via
  * the configured newrelic-agent's proxy configuration.
  *
- * Include keep-alive configuration, but ultimatly its up
+ * Include keep-alive configuration, but ultimately its up
  * to the proxy server as to how its connection is made
  * with New Relic's servers.
  */

package/lib/collector/remote-method.js

@@ -107,17 +107,23 @@ RemoteMethod.prototype._post = function _post(data, nrHeaders, callback) {
   }
 
   if (options.compressed) {
-    var useGzip = this._config.compressed_content_encoding === 'gzip'
-    var compressor = useGzip ? zlib.gzip : zlib.deflate
-    compressor(data, function onCompress(err, compressed) {
-      if (err) {
-        logger.warn(err, 'Error compressing JSON for delivery. Not sending.')
-        return callback(err)
-      }
-
-      options.body = compressed
-      makeRequest()
-    })
+    // NOTE: gzip and deflate throw immediately in Node 14+ with an invalid argument
+    try {
+      var useGzip = this._config.compressed_content_encoding === 'gzip'
+      var compressor = useGzip ? zlib.gzip : zlib.deflate
+      compressor(data, function onCompress(err, compressed) {
+        if (err) {
+          logger.warn(err, 'Error compressing JSON for delivery. Not sending.')
+          return callback(err)
+        }
+
+        options.body = compressed
+        makeRequest()
+      })
+    } catch (err) {
+      logger.warn(err, 'Error compressing JSON for delivery. Not sending.')
+      return callback(err)
+    }
   } else {
     options.body = data
     makeRequest()
@@ -184,7 +190,7 @@ RemoteMethod.prototype._safeRequest = function _safeRequest(options) {
     throw new Error('Maximum payload size exceeded')
   }
 
-  // If trace level is not explicity enabled check to see if the audit log is
+  // If trace level is not explicitly enabled check to see if the audit log is
   // enabled.
   if (logConfig != null && logConfig.level !== 'trace' && auditLog.enabled) {
     // If the filter property is empty, then always log the event otherwise

package/lib/config/attribute-filter.js

@@ -145,7 +145,7 @@ AttributeFilter.prototype._filter = function _filter(scope, destinations, key) {
   var globalInclude = null
   var globalExclude = null
 
-  // Iterate over each desination and see if the rules apply.
+  // Iterate over each destination and see if the rules apply.
   for (var i = 0; i < scope.length; ++i) {
     var dest = scope[i]
     var destId = dest.id

package/lib/config/default.js

@@ -231,7 +231,7 @@ exports.config = () => ({
     enabled: false,
 
     /**
-     * Specify which methods are logged. Used in conjuction with the audit_log flag
+     * Specify which methods are logged. Used in conjunction with the audit_log flag
      * If audit_log is enabled and this property is empty, all methods will be logged
      * Otherwise, if the audit log is enabled, only the methods specified
      * in the filter will be logged
@@ -340,7 +340,7 @@ exports.config = () => ({
     detect_aws: true,
     /**
      * This flag dictates whether the agent attempts to detect if the
-     * the process is running on Pivotal Cloud Foundary.
+     * the process is running on Pivotal Cloud Foundry.
      *
      * @env NEW_RELIC_UTILIZATION_DETECT_PCF
      */
@@ -595,14 +595,6 @@ exports.config = () => ({
    * options are disabled when high-security mode is enabled.
    */
   api: {
-    /**
-     * Deprecated. Please use `api.custom_attributes_enabled` instead.
-     *
-     * @env NEW_RELIC_API_CUSTOM_PARAMETERS
-     */
-    // TODO: This somehow survived the v5 cut, even though
-    // it's already removed from docs site. Remove in v6.
-    custom_parameters_enabled: true,
     /**
      * Controls for the `API.addCustomAttribute` method.
      *
@@ -854,7 +846,7 @@ exports.config = () => ({
     enabled: false,
 
     /**
-     * Exludes New Relic format distributed tracing header (`newrelic`) on
+     * Excludes New Relic format distributed tracing header (`newrelic`) on
      * outbound requests when set to `true`. By default (when false)
      * both W3C TraceContext (`traceparent`, `tracecontext`) and
      * New Relic formats will be sent.

package/lib/config/env.js

@@ -106,7 +106,6 @@ const ENV_MAPPING = {
   },
   api: {
     custom_attributes_enabled: 'NEW_RELIC_API_CUSTOM_ATTRIBUTES',
-    custom_parameters_enabled: 'NEW_RELIC_API_CUSTOM_PARAMETERS',
     custom_events_enabled: 'NEW_RELIC_API_CUSTOM_EVENTS',
     notice_error_enabled: 'NEW_RELIC_API_NOTICE_ERROR'
   },

package/lib/config/index.js

@@ -1025,15 +1025,6 @@ Config.prototype._fromPassed = function _fromPassed(external, internal, arbitrar
       return
     }
 
-    // TODO: remove in v6
-    if (key === 'ignored_params') {
-      warnDeprecated(key, 'attributes.exclude')
-    }
-
-    if (key === 'capture_params') {
-      warnDeprecated(key, 'attributes.enabled')
-    }
-
     try {
       var node = external[key]
     } catch (err) {
@@ -1049,14 +1040,6 @@ Config.prototype._fromPassed = function _fromPassed(external, internal, arbitrar
       internal[key] = node
     }
   }, this)
-
-  function warnDeprecated(key, replacement) {
-    logger.warn(
-      'Config key %s is deprecated, please use %s instead',
-      key,
-      replacement
-    )
-  }
 }
 
 /**
@@ -1327,10 +1310,6 @@ Config.prototype._canonicalize = function _canonicalize() {
     )
   }
 
-  this.api.custom_attributes_enabled = !this.api.custom_attributes_enabled
-    ? this.api.custom_attributes_enabled
-    : this.api.custom_parameters_enabled
-
   this.serverless_mode.enabled = this.serverless_mode.enabled
     && this.feature_flag.serverless_mode
 
@@ -1481,7 +1460,7 @@ Config.prototype.applyLasp = function applyLasp(agent, policies) {
       var localVal = settingBlock[valueName]
 
       // Indexes into "allowed values" based on "enabled" setting
-      // to retreive proper mapping.
+      // to retrieve proper mapping.
       var policyValues = localMapping.allowedValues
       var policyValue = policyValues[policy.enabled ? 1 : 0]
 
@@ -1623,7 +1602,7 @@ Config.prototype.getAggregatorConfig = function getAggregatorConfig(method) {
  *   5. If this module is installed as a dependency, the directory above the
  *      node_modules folder in which newrelic is installed.
  *
- * For configration via environment (useful on Joyent, Azure, Heroku, or
+ * For configuration via environment (useful on Joyent, Azure, Heroku, or
  * other PaaS offerings), set NEW_RELIC_NO_CONFIG_FILE to something truthy
  * and read README.md for details on what configuration variables are
  * necessary, as well as a complete enumeration of the other available

package/lib/db/parse-sql.js

@@ -22,7 +22,7 @@ var OPERATIONS = [
 ]
 var COMMENT_PATTERN = /\/\\*.*?\\*\//
 
-// This must be called syncronously after the initial db call for backtraces to
+// This must be called synchronously after the initial db call for backtraces to
 // work correctly
 
 module.exports = function parseSql(type, sql) {

package/lib/db/query-parsers/sql.js

@@ -24,7 +24,7 @@ var OPERATIONS = [
 ]
 var COMMENT_PATTERN = /\/\\*.*?\\*\//g
 
-// This must be called syncronously after the initial db call for backtraces to
+// This must be called synchronously after the initial db call for backtraces to
 // work correctly
 
 module.exports = function parseSql(sql) {

package/lib/errors/error-collector.js

@@ -142,13 +142,18 @@ class ErrorCollector {
     }
 
     const isErroredTransaction = urltils.isError(this.config, transaction.statusCode)
+    const isIgnoredErrorStatusCode = urltils.isIgnoredError(
+      this.config,
+      transaction.statusCode
+    )
+
     const isExpectedErrorStatusCode = urltils.isExpectedError(
       this.config,
       transaction.statusCode
     )
 
     // collect other exceptions only if status code is not ignored
-    if (transaction.exceptions.length) {
+    if (transaction.exceptions.length && !isIgnoredErrorStatusCode) {
       for (let i = 0; i < transaction.exceptions.length; i++) {
         const exception = transaction.exceptions[i]
         if (this.collect(transaction, exception)) {

package/lib/errors/index.js

@@ -20,7 +20,20 @@ class Exception {
   }
 
   getErrorDetails(config) {
-    return errorHelper.extractErrorInformation(null, this.error, config)
+    const errorDetails = errorHelper.extractErrorInformation(null, this.error, config)
+    errorDetails.expected = this.isExpected(config, errorDetails)
+
+    return errorDetails
+  }
+
+  isExpected(config, {type, message}) {
+    if (!this._expected) {
+      this._expected =
+        errorHelper.isExpectedErrorClass(config, type) ||
+        errorHelper.isExpectedErrorMessage(config, type, message)
+    }
+
+    return this._expected
   }
 }