newrelic 9.12.1 → 9.14.0

package/NEWS.md

@@ -1,3 +1,15 @@
+### v9.14.0 (2023-03-23)
+
+* Added new API function called `setErrorGroupCallback`, which provides a way for you to customize the `error.group.name` attribute of errors that are captured by the agent. This attribute controls how the Errors Inbox functionality groups similar errors together. To learn more about this function, please refer to our [example app](https://github.com/newrelic/newrelic-node-examples).
+
+### v9.13.0 (2023-03-20)
+
+* Updated http instrumentation to no longer remove the `x-new-relic-disable-dt` header when using AWS SDK v3.  This was done to prevent the "The request signature we calculated does not match the signature you provided. Check your key and signing method." error from AWS SDK.
+
+* Added an API method `setUserID` to provide an ability to associate a unique identifier with a transaction event, transaction trace and errors within transaction.  The attribute will be `enduser.id`.
+
+* Added default configuration for security agent.
+
 ### v9.12.1 (2023-03-15)
 
 * Added ability to mark errors as expected when using `newrelic.noticeError`, by adding an optional boolean: 

package/THIRD_PARTY_NOTICES.md

@@ -74,6 +74,7 @@ code, the source code can be found at [https://github.com/newrelic/node-newrelic
 **[optionalDependencies](#optionalDependencies)**
 
 * [@contrast/fn-inspect](#contrastfn-inspect)
+* [@newrelic/native-metrics](#newrelicnative-metrics)
 
 **[Additional Licenses](#additional-licenses)**
 
@@ -84,7 +85,7 @@ code, the source code can be found at [https://github.com/newrelic/node-newrelic
 
 ### @grpc/grpc-js
 
-This product includes source derived from [@grpc/grpc-js](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js) ([v1.7.3](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/tree/v1.7.3)), distributed under the [Apache-2.0 License](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/blob/v1.7.3/LICENSE):
+This product includes source derived from [@grpc/grpc-js](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js) ([v1.8.12](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/tree/v1.8.12)), distributed under the [Apache-2.0 License](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/blob/v1.8.12/LICENSE):
 
 ```
                                  Apache License
@@ -293,7 +294,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.7.3](https://github.com/grpc/grpc-node/tree/v0.7.3)), distributed under the [Apache-2.0 License](https://github.com/grpc/grpc-node/blob/v0.7.3/LICENSE):
+This product includes source derived from [@grpc/proto-loader](https://github.com/grpc/grpc-node) ([v0.7.5](https://github.com/grpc/grpc-node/tree/v0.7.5)), distributed under the [Apache-2.0 License](https://github.com/grpc/grpc-node/blob/v0.7.5/LICENSE):
 
 ```
                                  Apache License
@@ -502,7 +503,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) ([v5.0.0](https://github.com/newrelic/node-newrelic-aws-sdk/tree/v5.0.0)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-newrelic-aws-sdk/blob/v5.0.0/LICENSE):
+This product includes source derived from [@newrelic/aws-sdk](https://github.com/newrelic/node-newrelic-aws-sdk) ([v5.0.2](https://github.com/newrelic/node-newrelic-aws-sdk/tree/v5.0.2)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-newrelic-aws-sdk/blob/v5.0.2/LICENSE):
 
 ```
                                  Apache License
@@ -710,7 +711,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) ([v7.0.0](https://github.com/newrelic/node-newrelic-koa/tree/v7.0.0)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-newrelic-koa/blob/v7.0.0/LICENSE):
+This product includes source derived from [@newrelic/koa](https://github.com/newrelic/node-newrelic-koa) ([v7.1.1](https://github.com/newrelic/node-newrelic-koa/tree/v7.1.1)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-newrelic-koa/blob/v7.1.1/LICENSE):
 
 ```
 Apache License
@@ -1255,7 +1256,7 @@ 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) ([v3.6.0](https://github.com/nodejs/readable-stream/tree/v3.6.0)), distributed under the [MIT License](https://github.com/nodejs/readable-stream/blob/v3.6.0/LICENSE):
+This product includes source derived from [readable-stream](https://github.com/nodejs/readable-stream) ([v3.6.2](https://github.com/nodejs/readable-stream/tree/v3.6.2)), distributed under the [MIT License](https://github.com/nodejs/readable-stream/blob/v3.6.2/LICENSE):
 
 ```
 Node.js is licensed for use as follows:
@@ -9452,6 +9453,215 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ```
 
+### @newrelic/native-metrics
+
+This product includes source derived from [@newrelic/native-metrics](https://github.com/newrelic/node-native-metrics) ([v9.0.0](https://github.com/newrelic/node-native-metrics/tree/v9.0.0)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-native-metrics/blob/v9.0.0/LICENSE):
+
+```
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+```
+
 ## Additional Licenses
 
 ### Symantec

package/api.js

@@ -28,6 +28,7 @@ const ATTR_DEST = require('./lib/config/attribute-filter').DESTINATIONS
 const MODULE_TYPE = require('./lib/shim/constants').MODULE_TYPE
 const NAMES = require('./lib/metrics/names')
 const obfuscate = require('./lib/util/sql/obfuscate')
+const { DESTINATIONS } = require('./lib/config/attribute-filter')
 
 /*
  *
@@ -1694,6 +1695,28 @@ API.prototype.obfuscateSql = function obfuscateSql(sql, dialect) {
   return obfuscate(sql, dialect)
 }
 
+/**
+ * Assigns `enduser.id` attribute on transaction and trace events. It will also
+ * assign the attribute to errors if they occur within a transaction.
+ *
+ * @param {string} id a unique identifier used to set the `enduser.id` attribute
+ */
+API.prototype.setUserID = function setUserID(id) {
+  const metric = this.agent.metrics.getOrCreateMetric(NAMES.SUPPORTABILITY.API + '/setUserID')
+  metric.incrementCallCount()
+
+  const transaction = this.agent.tracer.getTransaction()
+
+  if (!(id && transaction)) {
+    logger.warn(
+      'User id is empty or not in a transaction, not assigning `enduser.id` attribute to transaction events, trace events, and/or errors.'
+    )
+    return
+  }
+
+  transaction.trace.attributes.addAttribute(DESTINATIONS.TRANS_COMMON, 'enduser.id', id)
+}
+
 /**
  * Function for removing invalid attribute key/value pairs from an object
  *
@@ -1716,4 +1739,51 @@ function _filterAttributes(attributes, name) {
   return filteredAttributes
 }
 
+/**
+ * Function for adding a custom callback to generate Error Group names, which
+ * will be used by the Errors Inbox to group similar errors together via the `error.group.name`
+ * agent attribute.
+ *
+ * Provided functions must return a string, and receive an object as an argument,
+ * which contains information related to the Error that occurred, and has the
+ * following format:
+ *
+ * ```
+ * {
+ *   customAttributes: object,
+ *   'request.uri': string,
+ *   'http.statusCode': string,
+ *   'http.method': string,
+ *   error: Error,
+ *   'error.expected': boolean
+ * }
+ * ```
+ *
+ * Calling this function multiple times will replace previously defined functions
+ *
+ * @param {Function} callback - callback function to generate `error.group.name` attribute
+ * @example
+ * function myCallback(metadata) {
+ *   if (metadata['http.statusCode'] === '400') {
+ *     return 'Bad User Input'
+ *   }
+ * }
+ * newrelic.setErrorGroupCallback(myCallback)
+ */
+API.prototype.setErrorGroupCallback = function setErrorGroupCallback(callback) {
+  const metric = this.agent.metrics.getOrCreateMetric(
+    NAMES.SUPPORTABILITY.API + '/setErrorGroupCallback'
+  )
+  metric.incrementCallCount()
+
+  if (!this.shim.isFunction(callback) || this.shim.isPromise(callback)) {
+    logger.warn(
+      'Error Group callback must be a synchronous function, Error Group attribute will not be added'
+    )
+    return
+  }
+
+  this.agent.errors.errorGroupCallback = callback
+}
+
 module.exports = API

package/lib/config/default.js

@@ -1256,6 +1256,68 @@ defaultConfig.definition = () => ({
         default: ''
       }
     }
+  },
+  /**
+   * Security agent configurations
+   */
+  security: {
+    /**
+     * Toggles the generation of security events by the security agent.
+     */
+    enabled: {
+      formatter: boolean,
+      default: false
+    },
+
+    /**
+     * Flag to tell the Node.js agent to load the security agent.
+     * This property is read only once at application start.
+     */
+    agent: {
+      enabled: {
+        formatter: boolean,
+        default: false
+      }
+    },
+
+    /**
+     *  Security agent provides two modes: IAST and RASP. Default is IAST.
+     */
+    mode: {
+      formatter: allowList.bind(null, ['IAST', 'RASP']),
+      default: 'IAST'
+    },
+
+    /**
+     * Security agent validator URL. Must be prefixed with wss://.
+     */
+    validator_service_url: {
+      default: 'wss://csec.nr-data.net'
+    },
+
+    /**
+     * Provide ability to toggle sending security events for the following rules.
+     */
+    detection: {
+      rci: {
+        enabled: {
+          formatter: boolean,
+          default: true
+        }
+      },
+      rxss: {
+        enabled: {
+          formatter: boolean,
+          default: true
+        }
+      },
+      deserialization: {
+        enabled: {
+          formatter: boolean,
+          default: true
+        }
+      }
+    }
   }
 })
 

package/lib/errors/error-collector.js

@@ -36,6 +36,8 @@ class ErrorCollector {
     this.seenStringsByTransaction = Object.create(null)
 
     this.traceAggregator.on('starting error_data data send.', this._onSendErrorTrace.bind(this))
+
+    this.errorGroupCallback = null
   }
 
   _onSendErrorTrace() {
@@ -330,6 +332,10 @@ class ErrorCollector {
       return false
     }
 
+    if (this.errorGroupCallback) {
+      exception.errorGroupCallback = this.errorGroupCallback
+    }
+
     const errorTrace = createError(transaction, exception, this.config)
     this._maybeRecordErrorMetrics(errorTrace, transaction)
 

package/lib/errors/index.js

@@ -5,6 +5,7 @@
 
 'use strict'
 
+const logger = require('../logger').child({ component: 'errors_lib' })
 const DESTINATIONS = require('../config/attribute-filter').DESTINATIONS
 const props = require('../util/properties')
 const urltils = require('../util/urltils')
@@ -25,6 +26,7 @@ class Exception {
     this.customAttributes = customAttributes || {}
     this.agentAttributes = agentAttributes || {}
     this._expected = expected
+    this.errorGroupCallback = null
   }
 
   getErrorDetails(config) {
@@ -107,9 +109,44 @@ function createError(transaction, exception, config) {
   params.intrinsics[ERROR_EXPECTED_PATH] =
     exception._expected || errorHelper.isExpected(type, message, transaction, config, urltils)
 
+  maybeAddAgentAttributes(params, exception)
+
   return [0, name, message, type, params]
 }
 
+function isValidErrorGroupOutput(output) {
+  return (typeof output === 'string' || output instanceof String) && output !== ''
+}
+
+function maybeAddAgentAttributes(attributes, exception) {
+  if (exception.errorGroupCallback) {
+    const callbackInput = {
+      'error': exception.error,
+      'customAttributes': Object.assign({}, attributes.userAttributes),
+      'request.uri': attributes.agentAttributes['request.uri'],
+      'http.statusCode': attributes.agentAttributes['http.statusCode'],
+      'http.method': attributes.agentAttributes['request.method'],
+      'error.expected': attributes.intrinsics[ERROR_EXPECTED_PATH]
+    }
+
+    try {
+      const callbackOutput = exception.errorGroupCallback(callbackInput)
+
+      if (!isValidErrorGroupOutput(callbackOutput)) {
+        logger.warn('Function provided via setErrorGroupCallback return value malformed')
+        return
+      }
+
+      attributes.agentAttributes['error.group.name'] = callbackOutput
+    } catch (err) {
+      logger.warn(
+        err,
+        'Function provided via setErrorGroupCallback failed, not generating `error.group.name`'
+      )
+    }
+  }
+}
+
 function maybeAddUserAttributes(userAttributes, exception, config) {
   const customAttributes = exception.customAttributes
   if (!config.high_security && config.api.custom_attributes_enabled && customAttributes) {

package/lib/instrumentation/core/http-outbound.js

@@ -167,11 +167,8 @@ function maybeAddDtCatHeaders(agent, transaction, outboundHeaders, headers = {})
   if (agent.config.distributed_tracing.enabled) {
     if (!!(headers[symbols.disableDT] || headers['x-new-relic-disable-dt'])) {
       logger.trace('Distributed tracing disabled by instrumentation.')
-      // we do not need to remove symbol as it will get implicitly removed
-      // when the request is serialized. in fact removing the symbol will cause
-      // the same issue that we had to change this to a string header
-      // see: https://github.com/newrelic/node-newrelic-aws-sdk/issues/168
-      delete headers['x-new-relic-disable-dt']
+      // do not try to delete this header because AWS will fail with signature fail
+      // See: https://github.com/newrelic/node-newrelic/issues/1549
     } else {
       transaction.insertDistributedTraceHeaders(outboundHeaders)
     }

package/lib/metrics/normalizer/tx_segment.js

@@ -5,8 +5,6 @@
 
 'use strict'
 
-/* eslint sonarjs/cognitive-complexity: ["error", 17] -- TODO: https://issues.newrelic.com/browse/NEWRELIC-5252 */
-
 const logger = require('../../logger').child({ component: 'tx_segment_normalizer' })
 
 module.exports = TxSegmentNormalizer
@@ -17,7 +15,7 @@ function TxSegmentNormalizer() {
 
 /**
  * This normalize method is wicked. The best bet is to read the spec:
- * https://newrelic.atlassian.net/wiki/pages/viewpage.action?spaceKey=eng&title=Language+agent+transaction+segment+terms+rules
+ * https://source.datanerd.us/agents/agent-specs/blob/main/Metric-Name-Rules-PORTED.md
  *
  * A copy paste of the rules that were followed:
  *  1. Find the first rule where the prefix key matches the prefix of the
@@ -31,11 +29,28 @@ function TxSegmentNormalizer() {
  *  6. Join together the modified segments with slashes, and re-prepend the prefix.
  *
  * @param {string} path - The transaction metric path to normalize.
- * @returns {NormalizationResults} - The results of normalizing the given path.
+ * @returns {{ignore: boolean, matched: boolean, value: string}} - The results of normalizing the given path.
  */
 TxSegmentNormalizer.prototype.normalize = function normalize(path) {
   let currentTerm
   let prefix
+  let result
+  let prev
+
+  const normalizeParts = (part, idx, parts) => {
+    if (part === '' && idx + 1 === parts.length) {
+      return // if this is the last one, don't iterate
+    }
+    if (currentTerm.terms.indexOf(part) === -1) {
+      if (prev === '*') {
+        return
+      }
+      result.push((prev = '*'))
+    } else {
+      result.push((prev = part))
+    }
+  }
+
   for (let i = 0; i < this.terms.length; i++) {
     currentTerm = this.terms[i]
     prefix = currentTerm.prefix
@@ -44,26 +59,10 @@ TxSegmentNormalizer.prototype.normalize = function normalize(path) {
     }
     const fragment = path.slice(prefix.length)
     const parts = fragment.split('/')
-    const result = []
-    let prev
-    let segment
-
-    for (let j = 0; j < parts.length; j++) {
-      segment = parts[j]
+    result = []
 
-      if (segment === '' && j + 1 === parts.length) {
-        break
-      }
+    parts.forEach(normalizeParts)
 
-      if (currentTerm.terms.indexOf(segment) === -1) {
-        if (prev === '*') {
-          continue
-        }
-        result.push((prev = '*'))
-      } else {
-        result.push((prev = segment))
-      }
-    }
     logger.trace('Normalizing %s because of rule: %s', path, currentTerm)
     return {
       matched: true, // To match MetricNormalizer

package/lib/shimmer.js

@@ -352,33 +352,15 @@ const shimmer = (module.exports = {
     shimmer.unwrapMethod(Module, 'Module', '_load')
   },
 
-  bootstrapInstrumentation: function bootstrapInstrumentation(agent) {
-    // Instrument global.
-    const globalShim = new shims.Shim(agent, 'globals', 'globals')
-    applyDebugState(globalShim, global)
-    const globalsFilepath = path.join(__dirname, 'instrumentation', 'core', 'globals.js')
-    _firstPartyInstrumentation(agent, globalsFilepath, globalShim, global, 'globals')
-
-    // Instrument each of the core modules.
-    Object.keys(CORE_INSTRUMENTATION).forEach(function forEachCore(mojule) {
-      const core = CORE_INSTRUMENTATION[mojule]
-      const filePath = path.join(__dirname, 'instrumentation', 'core', core.file)
-      let uninstrumented = null
-
-      try {
-        uninstrumented = require(mojule)
-      } catch (err) {
-        logger.trace('Could not load core module %s got error %s', mojule, err)
-      }
-
-      const shim = shims.createShimFromType(core.type, agent, mojule, mojule)
-      applyDebugState(shim, core)
-      _firstPartyInstrumentation(agent, filePath, shim, uninstrumented, mojule)
-    })
-
-    // Register all the first-party instrumentations.
-    Object.keys(INSTRUMENTATIONS).forEach(function forEachInstrumentation(moduleName) {
-      const instrInfo = INSTRUMENTATIONS[moduleName]
+  /**
+   * Registers all instrumentation for "first-party" libraries.
+   *
+   * This is all 3rd party libs with the exception of the domain library in Node.js core
+   *
+   * @param {object} agent NR agent
+   */
+  registerFirstPartyInstrumentation(agent) {
+    for (const [moduleName, instrInfo] of Object.entries(INSTRUMENTATIONS)) {
       if (instrInfo.module) {
         // Because external instrumentations can change independent of
         // the agent core, we don't want breakages in them to entirely
@@ -401,7 +383,7 @@ const shimmer = (module.exports = {
           onRequire: _firstPartyInstrumentation.bind(null, agent, fileName)
         })
       }
-    })
+    }
 
     // Even though domain is a core module we add it as a registered
     // instrumentation to be lazy-loaded because we do not want to cause domain
@@ -414,6 +396,40 @@ const shimmer = (module.exports = {
     })
   },
 
+  /**
+   * Registers all instrumentation for Node.js core libraries.
+   *
+   * @param {object} agent NR agent
+   */
+  registerCoreInstrumentation(agent) {
+    // Instrument global.
+    const globalShim = new shims.Shim(agent, 'globals', 'globals')
+    applyDebugState(globalShim, global)
+    const globalsFilepath = path.join(__dirname, 'instrumentation', 'core', 'globals.js')
+    _firstPartyInstrumentation(agent, globalsFilepath, globalShim, global, 'globals')
+
+    // Instrument each of the core modules.
+    for (const [mojule, core] of Object.entries(CORE_INSTRUMENTATION)) {
+      const filePath = path.join(__dirname, 'instrumentation', 'core', core.file)
+      let uninstrumented = null
+
+      try {
+        uninstrumented = require(mojule)
+      } catch (err) {
+        logger.trace('Could not load core module %s got error %s', mojule, err)
+      }
+
+      const shim = shims.createShimFromType(core.type, agent, mojule, mojule)
+      applyDebugState(shim, core)
+      _firstPartyInstrumentation(agent, filePath, shim, uninstrumented, mojule)
+    }
+  },
+
+  bootstrapInstrumentation: function bootstrapInstrumentation(agent) {
+    shimmer.registerCoreInstrumentation(agent)
+    shimmer.registerFirstPartyInstrumentation(agent)
+  },
+
   registerInstrumentation: function registerInstrumentation(opts) {
     if (!hasValidRegisterOptions(opts)) {
       return

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newrelic",
-  "version": "9.12.1",
+  "version": "9.14.0",
   "author": "New Relic Node.js agent team <nodejs@newrelic.com>",
   "license": "Apache-2.0",
   "contributors": [
@@ -179,7 +179,7 @@
     "newrelic-naming-rules": "./bin/test-naming-rules.js"
   },
   "dependencies": {
-    "@grpc/grpc-js": "^1.8.9",
+    "@grpc/grpc-js": "^1.8.10",
     "@grpc/proto-loader": "^0.7.5",
     "@newrelic/aws-sdk": "^5.0.2",
     "@newrelic/koa": "^7.1.1",
@@ -189,7 +189,7 @@
     "https-proxy-agent": "^5.0.0",
     "json-bigint": "^1.0.0",
     "json-stringify-safe": "^5.0.0",
-    "readable-stream": "^3.6.0",
+    "readable-stream": "^3.6.1",
     "semver": "^5.3.0",
     "winston-transport": "^4.5.0"
   },