newrelic 12.21.0 → 12.23.0

package/NEWS.md

@@ -1,3 +1,63 @@
+### v12.23.0 (2025-06-30)
+
+#### Features
+
+* Added ability to report only on entry and exit spans ([#3184](https://github.com/newrelic/node-newrelic/pull/3184)) ([1f909d3](https://github.com/newrelic/node-newrelic/commit/1f909d389f790733c8787a9db8b0ee71c26bb5ed))
+* Added Node.js 24 support ([#3080](https://github.com/newrelic/node-newrelic/pull/3080)) ([a538c2a](https://github.com/newrelic/node-newrelic/commit/a538c2a5e23b96be40fa3c014e60b912f695423e))
+
+#### Documentation
+
+* Updated compatibility report ([#3186](https://github.com/newrelic/node-newrelic/pull/3186)) ([5498c15](https://github.com/newrelic/node-newrelic/commit/5498c15bb6cf3329fe50595da46ab4f2b1385170))
+
+#### Miscellaneous chores
+
+* Fix issues on Node 24 ([#3181](https://github.com/newrelic/node-newrelic/pull/3181)) ([24832df](https://github.com/newrelic/node-newrelic/commit/24832df2984df960a4e44375525a8127a00a637c))
+* Removed force labels on main CI workflow ([#3183](https://github.com/newrelic/node-newrelic/pull/3183)) ([3aaee17](https://github.com/newrelic/node-newrelic/commit/3aaee17586f817ae1a2ab0573570a740bd6397ef))
+* Updated undici tests to unblock CI ([#3185](https://github.com/newrelic/node-newrelic/pull/3185)) ([08261eb](https://github.com/newrelic/node-newrelic/commit/08261ebcdbafdb625a451f4ccec9b0cba7641cc2))
+
+#### Continuous integration
+
+* Fixed the name of todo colum in add to board reusable workflow ([#3178](https://github.com/newrelic/node-newrelic/pull/3178)) ([f216e0c](https://github.com/newrelic/node-newrelic/commit/f216e0c48adf0291bfa38b3edbb04c9dcc96f92c))
+
+### v12.22.0 (2025-06-24)
+
+#### Features
+
+* Added `openai` v5 streaming support ([#3148](https://github.com/newrelic/node-newrelic/pull/3148)) ([6e90d41](https://github.com/newrelic/node-newrelic/commit/6e90d41756929bf69b82e190dc39792f97ec6d92))
+* Added support for `openai.responses.create` api ([#3139](https://github.com/newrelic/node-newrelic/pull/3139)) ([a1204b2](https://github.com/newrelic/node-newrelic/commit/a1204b2484f3307eac74e7a370be2fc38061c358))
+
+#### Bug fixes
+
+* Fixed error logging for undefined tracestate header ([#3170](https://github.com/newrelic/node-newrelic/pull/3170)) ([3c915f5](https://github.com/newrelic/node-newrelic/commit/3c915f5a631b609daa6b87f3018e458945077f65))
+
+#### Code refactoring
+
+* Updated transformation rules to remove the bespoke rule to appease `@google-cloud/pubsub` < 5.1.0 ([#3151](https://github.com/newrelic/node-newrelic/pull/3151)) ([2d9b4b4](https://github.com/newrelic/node-newrelic/commit/2d9b4b4642e856622175adcfd2e31fa4cdfa7a3a))
+
+#### Documentation
+
+* Gemini compatibility ([#3134](https://github.com/newrelic/node-newrelic/pull/3134)) ([bbdc531](https://github.com/newrelic/node-newrelic/commit/bbdc531ac59aad7b53f1a98306b6857927b87237))
+* Updated compatibility report ([#3171](https://github.com/newrelic/node-newrelic/pull/3171)) ([f3361e4](https://github.com/newrelic/node-newrelic/commit/f3361e421d67a0015719c3ae91bed64e5d38f317))
+
+#### Miscellaneous chores
+
+* Added logging of used New Relic environment variables ([#3145](https://github.com/newrelic/node-newrelic/pull/3145)) ([1a9d9f5](https://github.com/newrelic/node-newrelic/commit/1a9d9f53ddce7f373a7ff868b363feacf10e3bd8))
+* Added supportability metrics to OTEL metrics API ([#3164](https://github.com/newrelic/node-newrelic/pull/3164)) ([5312db0](https://github.com/newrelic/node-newrelic/commit/5312db0f7c0b4260dd39691e246625380ea2ed12))
+* Fixed formatting in Slack PR titles ([#3167](https://github.com/newrelic/node-newrelic/pull/3167)) ([847859f](https://github.com/newrelic/node-newrelic/commit/847859f8ece852d4fa511039d2131573d4b1392b))
+* Improved output of pending prs script ([#3160](https://github.com/newrelic/node-newrelic/pull/3160)) ([9bafd77](https://github.com/newrelic/node-newrelic/commit/9bafd7758fc63d7fb5106fe0a28aaa5a626bdf3d))
+* Improved setup of OpenTelemetry metrics API ([#3138](https://github.com/newrelic/node-newrelic/pull/3138)) ([e91592d](https://github.com/newrelic/node-newrelic/commit/e91592d8365a3e2543228526d6959751da7ea5aa))
+* Pinned google/genai to <1.5.0 ([#3154](https://github.com/newrelic/node-newrelic/pull/3154)) ([04b9bde](https://github.com/newrelic/node-newrelic/commit/04b9bdef417d6ce9e9148c9489bbfc28081d5e84))
+* Removed discontinued Bedrock models ([#3158](https://github.com/newrelic/node-newrelic/pull/3158)) ([2c79a31](https://github.com/newrelic/node-newrelic/commit/2c79a312daf31f51f8a270facf1c3a125700e987))
+* Removed usage of `shim.argsToArray` in favor of rest parameters ([#3141](https://github.com/newrelic/node-newrelic/pull/3141)) ([b144d71](https://github.com/newrelic/node-newrelic/commit/b144d712f6e75265dc4be6f82a2fc3977ac1c640))
+* Tweaked nestjs test manifest ([#3152](https://github.com/newrelic/node-newrelic/pull/3152)) ([51b82aa](https://github.com/newrelic/node-newrelic/commit/51b82aa28279e0d5ac8be5f4e6a4274532c76a22))
+
+#### Tests
+
+* Added JSDoc annotation for benchmark interface ([#3127](https://github.com/newrelic/node-newrelic/pull/3127)) ([77e7e0a](https://github.com/newrelic/node-newrelic/commit/77e7e0a27f719ce14d31636e46600ec7ff881b13))
+* fixed test assertion for langchain openai ([#3169](https://github.com/newrelic/node-newrelic/pull/3169)) ([29ec912](https://github.com/newrelic/node-newrelic/commit/29ec9122fdf9347875b884efa6f6fba9cb32303e))
+* Skips running nest 11+ on node 18 due to dropping support ([#3149](https://github.com/newrelic/node-newrelic/pull/3149)) ([961975b](https://github.com/newrelic/node-newrelic/commit/961975baeb74e46c0e60d96cbd49fb421acd0dfd))
+* unpinned google genai tests ([#3168](https://github.com/newrelic/node-newrelic/pull/3168)) ([cfa7114](https://github.com/newrelic/node-newrelic/commit/cfa71142ba7fb9861a1e7ab835276e7c651b9993))
+
 ### v12.21.0 (2025-06-04)
 
 #### Features

package/THIRD_PARTY_NOTICES.md

@@ -72,6 +72,7 @@ code, the source code can be found at [https://github.com/newrelic/node-newrelic
 * [lint-staged](#lint-staged)
 * [lockfile-lint](#lockfile-lint)
 * [nock](#nock)
+* [protobufjs](#protobufjs)
 * [proxyquire](#proxyquire)
 * [rimraf](#rimraf)
 * [self-cert](#self-cert)
@@ -94,7 +95,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.13.3](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/tree/v1.13.3)), distributed under the [Apache-2.0 License](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/blob/v1.13.3/LICENSE):
+This product includes source derived from [@grpc/grpc-js](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js) ([v1.13.4](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/tree/v1.13.4)), distributed under the [Apache-2.0 License](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/blob/v1.13.4/LICENSE):
 
 ```
                                  Apache License
@@ -1901,7 +1902,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ### import-in-the-middle
 
-This product includes source derived from [import-in-the-middle](https://github.com/nodejs/import-in-the-middle) ([v1.13.2](https://github.com/nodejs/import-in-the-middle/tree/v1.13.2)), distributed under the [Apache-2.0 License](https://github.com/nodejs/import-in-the-middle/blob/v1.13.2/LICENSE):
+This product includes source derived from [import-in-the-middle](https://github.com/nodejs/import-in-the-middle) ([v1.14.0](https://github.com/nodejs/import-in-the-middle/tree/v1.14.0)), distributed under the [Apache-2.0 License](https://github.com/nodejs/import-in-the-middle/blob/v1.14.0/LICENSE):
 
 ```
                                  Apache License
@@ -2332,7 +2333,7 @@ SOFTWARE.
 
 ### @aws-sdk/client-s3
 
-This product includes source derived from [@aws-sdk/client-s3](https://github.com/aws/aws-sdk-js-v3) ([v3.810.0](https://github.com/aws/aws-sdk-js-v3/tree/v3.810.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.810.0/LICENSE):
+This product includes source derived from [@aws-sdk/client-s3](https://github.com/aws/aws-sdk-js-v3) ([v3.821.0](https://github.com/aws/aws-sdk-js-v3/tree/v3.821.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.821.0/LICENSE):
 
 ```
                                 Apache License
@@ -2541,7 +2542,7 @@ This product includes source derived from [@aws-sdk/client-s3](https://github.co
 
 ### @aws-sdk/s3-request-presigner
 
-This product includes source derived from [@aws-sdk/s3-request-presigner](https://github.com/aws/aws-sdk-js-v3) ([v3.810.0](https://github.com/aws/aws-sdk-js-v3/tree/v3.810.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.810.0/LICENSE):
+This product includes source derived from [@aws-sdk/s3-request-presigner](https://github.com/aws/aws-sdk-js-v3) ([v3.821.0](https://github.com/aws/aws-sdk-js-v3/tree/v3.821.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.821.0/LICENSE):
 
 ```
                                 Apache License
@@ -4369,7 +4370,7 @@ SOFTWARE.
 
 ### eslint-plugin-jsdoc
 
-This product includes source derived from [eslint-plugin-jsdoc](https://github.com/gajus/eslint-plugin-jsdoc) ([v50.6.17](https://github.com/gajus/eslint-plugin-jsdoc/tree/v50.6.17)), distributed under the [BSD-3-Clause License](https://github.com/gajus/eslint-plugin-jsdoc/blob/v50.6.17/LICENSE):
+This product includes source derived from [eslint-plugin-jsdoc](https://github.com/gajus/eslint-plugin-jsdoc) ([v50.7.1](https://github.com/gajus/eslint-plugin-jsdoc/tree/v50.7.1)), distributed under the [BSD-3-Clause License](https://github.com/gajus/eslint-plugin-jsdoc/blob/v50.7.1/LICENSE):
 
 ```
 Copyright (c) 2018, Gajus Kuizinas (http://gajus.com/)
@@ -4401,7 +4402,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ### eslint
 
-This product includes source derived from [eslint](https://github.com/eslint/eslint) ([v9.26.0](https://github.com/eslint/eslint/tree/v9.26.0)), distributed under the [MIT License](https://github.com/eslint/eslint/blob/v9.26.0/LICENSE):
+This product includes source derived from [eslint](https://github.com/eslint/eslint) ([v9.28.0](https://github.com/eslint/eslint/tree/v9.28.0)), distributed under the [MIT License](https://github.com/eslint/eslint/blob/v9.28.0/LICENSE):
 
 ```
 Copyright OpenJS Foundation and other contributors, <www.openjsf.org>
@@ -5012,6 +5013,53 @@ SOFTWARE.
 
 ```
 
+### protobufjs
+
+This product includes source derived from [protobufjs](https://github.com/protobufjs/protobuf.js) ([v7.5.3](https://github.com/protobufjs/protobuf.js/tree/v7.5.3)), distributed under the [BSD-3-Clause License](https://github.com/protobufjs/protobuf.js/blob/v7.5.3/LICENSE):
+
+```
+This license applies to all parts of protobuf.js except those files
+either explicitly including or referencing a different license or
+located in a directory containing a different LICENSE file.
+
+---
+
+Copyright (c) 2016, Daniel Wirtz  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+* Neither the name of its author, nor the names of its contributors
+  may be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+---
+
+Code generated by the command line utilities is owned by the owner
+of the input file used when generating it. This code is not
+standalone and requires a support library to be linked with it. This
+support library is itself covered by the above license.
+
+```
+
 ### proxyquire
 
 This product includes source derived from [proxyquire](https://github.com/thlorenz/proxyquire) ([v1.8.0](https://github.com/thlorenz/proxyquire/tree/v1.8.0)), distributed under the [MIT License](https://github.com/thlorenz/proxyquire/blob/v1.8.0/LICENSE):

package/index.js

@@ -5,7 +5,7 @@
 
 'use strict'
 
-const HealthReporter = require('./lib/health-reporter')
+const HealthReporter = require('./lib/health-reporter.js')
 
 // Record opening times before loading any other files.
 const preAgentTime = process.uptime()
@@ -64,8 +64,8 @@ function initialize() {
       throw new Error(message)
     }
 
-    // TODO: Update this check when Node v24 support is added
-    if (psemver.satisfies('>=23.0.0')) {
+    // TODO: Update this check when Node v26 support is added
+    if (psemver.satisfies('>=25.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

@@ -104,6 +104,14 @@ const DEFAULT_HARVEST_INTERVAL_MS = 60000
  * @event Agent#harvestStarted
  */
 
+/**
+ * Indicates that the OpenTelemetry metrics API client has been fully
+ * configured and is ready to send metrics to New Relic. This happens
+ * subsequent to the {@link Agent#started} event.
+ *
+ * @event Agent#otelMetricsBootstrapped
+ */
+
 /**
  * Indicates that the agent state has entered the "started" state. That is,
  * the agent has finished bootstrapping and is collecting and sending data.

package/lib/config/default.js

@@ -1120,6 +1120,19 @@ defaultConfig.definition = () => ({
       default: false
     },
 
+    /**
+     * Controls whether the agent will generate spans for in-process actions.
+     * When disabled, this will only create spans for entry and exit spans.
+     * entry spans - initial actions for web servers and messsage queue consumption.
+     * exit spans - all outgoing calls to external services(external and database calls)
+     */
+    in_process_spans: {
+      enabled: {
+        formatter: boolean,
+        default: true
+      }
+    },
+
     sampler: {
       /**
        * When set to `always_on`, the sampled flag in the `traceparent` header
@@ -1706,7 +1719,28 @@ defaultConfig.definition = () => ({
      * application entity that is instrumented by the New Relic agent.
      */
     metrics: {
-      enabled: { default: false, formatter: boolean }
+      enabled: { default: false, formatter: boolean },
+
+      /**
+       * `exportInterval` defines the number of milliseconds between each
+       * attempt to ship metrics to New Relic. This value must be equal to
+       * or greater than the value of `exportTimeout`.
+       */
+      exportInterval: {
+        default: 60_000,
+        formatter: int
+      },
+
+      /**
+       * `exportTimeout` defines the number of milliseconds an export operation
+       * is allowed in order to successfully complete. If the timeout is
+       * exceeded, it will be reported via the OpenTelemetry diagnostics
+       * API.
+       */
+      exportTimeout: {
+        default: 30_000,
+        formatter: int
+      }
     }
   }
 })

package/lib/config/index.js

@@ -1143,6 +1143,13 @@ function setFromEnv({ config, key, envVar, formatter, paths }) {
   const setting = process.env[envVar]
   if (setting) {
     const formattedSetting = formatter ? formatter(setting, logger) : setting
+    // `setting` _should_ be a string when reading from the actual process
+    // environment. But we have tests that construct an environment with
+    // non-string values. So we need to convert them before accessing.
+    const prefix = setting.toString().at(0)
+    const suffix = setting.toString().at(-1)
+    const redacted = prefix + '*'.repeat(setting.length) + suffix
+    logger.trace({ env: { [envVar]: redacted } }, 'setting value from environment variable')
     setNestedKey(config, [...paths, key], formattedSetting)
   }
 }
@@ -1162,31 +1169,36 @@ Config.prototype._fromEnvironment = function _fromEnvironment(
   objectKeys = 1
 ) {
   let keysSeen = 0
-  Object.entries(data).forEach(([key, value]) => {
+  for (const [key, value] of Object.entries(data)) {
     const type = typeof value
-    keysSeen++
+    keysSeen += 1
+
+    if (type !== 'string' && type !== 'object') {
+      continue
+    }
+
     if (type === 'string') {
       const envVar = deriveEnvVar(key, paths)
       setFromEnv({ config, key, envVar, paths })
-    } else if (type === 'object') {
-      if (Object.prototype.hasOwnProperty.call(value, 'env')) {
-        setFromEnv({
-          config,
-          key,
-          envVar: value.env,
-          paths,
-          formatter: value.formatter
-        })
-      } else if (Object.prototype.hasOwnProperty.call(value, 'default')) {
-        const envVar = deriveEnvVar(key, paths)
-        setFromEnv({ config, key, envVar, formatter: value.formatter, paths })
-      } else {
-        paths.push(key)
-        const { length } = Object.keys(value)
-        this._fromEnvironment(config, value, paths, length)
-      }
+      continue
     }
-  })
+
+    if (Object.prototype.hasOwnProperty.call(value, 'env') === true) {
+      const envVar = value.env
+      setFromEnv({ config, key, paths, envVar, formatter: value.formatter })
+      continue
+    }
+
+    if (Object.prototype.hasOwnProperty.call(value, 'default') === true) {
+      const envVar = deriveEnvVar(key, paths)
+      setFromEnv({ config, key, paths, envVar, formatter: value.formatter })
+      continue
+    }
+
+    paths.push(key)
+    const { length } = Object.keys(value)
+    this._fromEnvironment(config, value, paths, length)
+  }
 
   // we have traversed every key in current object leaf node, remove wrapping key
   // to properly derive env vars of future leaf nodes
@@ -1738,16 +1750,18 @@ Config.prototype._warnDeprecations = function _warnDeprecations() {
  * configuration file settings.
  *
  * @param {object} config Optional configuration to be used in place of a config file.
+ * @param root0
+ * @param root0.loggerInstance
  * @returns {object} instantiated configuration object
  */
-function initialize(config) {
+function initialize(config, { loggerInstance } = {}) {
   /**
    * When the logger is required here, it bootstraps itself and then
    * injects itself into this module's closure via setLogger on the
    * instance of the logger it creates.  Logs are queued until config
    * has been loaded to apply logging settings to bootstrapping logs
    */
-  logger = require('../logger')
+  logger = loggerInstance ?? require('../logger')
 
   if (config) {
     return new Config(config)

package/lib/instrumentation/@hapi/hapi.js

@@ -72,16 +72,14 @@ function serverPostConstructor(shim) {
 
 function wrapProtoDecorate(shim, proto) {
   shim.wrap(proto, 'decorate', function wrapDecorate(shim, original) {
-    return function wrappedDecorate(type) {
+    return function wrappedDecorate(...args) {
+      const [type] = args
       // server.decorate also accepts 'request', 'toolkit', 'server' types,
       // but we're only concerned with 'handler'
       if (type !== 'handler') {
-        return original.apply(this, arguments)
+        return original.apply(this, args)
       }
 
-      // Convert arguments to usable array
-      const args = shim.argsToArray.apply(shim, arguments)
-
       // Wrap the third server.decorate arg, the user-defined handler
       shim.wrap(args, shim.THIRD, function wrapHandler(shim, fn) {
         if (typeof fn !== 'function') {
@@ -108,9 +106,7 @@ function wrapProtoDecorate(shim, proto) {
 
 function wrapProtoRoute(shim, proto) {
   shim.wrap(proto, 'route', function wrapRoute(shim, original) {
-    return function wrappedRoute() {
-      const args = shim.argsToArray.apply(shim, arguments)
-
+    return function wrappedRoute(...args) {
       if (!shim.isObject(args[0])) {
         return original.apply(this, args)
       }
@@ -171,8 +167,8 @@ function _wrapRouteHandler(shim, container, path) {
 
 function wrapProtoExt(shim, proto) {
   shim.wrap(proto, 'ext', function wrapExt(shim, original) {
-    return function wrappedExt(event, method) {
-      const args = shim.argsToArray.apply(shim, arguments)
+    return function wrappedExt(...args) {
+      const [event, method] = args
 
       if (shim.isArray(event)) {
         for (let i = 0; i < event.length; i++) {

package/lib/instrumentation/@hapi/vision.js

@@ -31,12 +31,12 @@ module.exports = function initialize(agent, vision, moduleName, shim) {
 }
 
 function wrapDecorate(shim, decorate) {
-  return function wrappedDecorate(type, name, handler) {
+  return function wrappedDecorate(...args) {
+    const [type, name, handler] = args
     if (type !== 'toolkit' || name !== 'view') {
-      return decorate.apply(this, arguments)
+      return decorate.apply(this, args)
     }
 
-    const args = shim.argsToArray.apply(shim, arguments)
     args[2] = shim.recordRender(handler, new RenderSpec({ promise: true }))
 
     return decorate.apply(this, args)

package/lib/instrumentation/amqplib/amqplib.js

@@ -83,14 +83,12 @@ function instrumentAMQP(shim, amqp, promiseMode) {
  */
 function wrapConnect(shim, amqp, promiseMode) {
   shim.wrap(amqp, 'connect', function wrapConnect(shim, connect) {
-    return function wrappedConnect() {
-      const args = shim.argsToArray.apply(shim, arguments)
+    return function wrappedConnect(...args) {
       const [connArgs] = args
       const params = parseConnectionArgs({ shim, connArgs })
       const cb = args[args.length - 1]
       if (!promiseMode) {
-        args[args.length - 1] = function wrappedCallback() {
-          const cbArgs = shim.argsToArray.apply(shim, arguments)
+        args[args.length - 1] = function wrappedCallback(...cbArgs) {
           const [, c] = cbArgs
           c.connection[amqpConnection] = params
           return cb.apply(this, cbArgs)

package/lib/instrumentation/amqplib/channel.js

@@ -33,16 +33,15 @@ module.exports = function wrapChannel(shim) {
       return fn
     }
 
-    return function wrappedSendOrEnqueue() {
+    return function wrappedSendOrEnqueue(...args) {
       const segment = shim.getSegment()
-      const cb = arguments[arguments.length - 1]
+      const cb = args[args.length - 1]
       if (!shim.isFunction(cb) || !segment) {
         shim.logger.debug({ cb: !!cb, segment: !!segment }, 'Not binding sendOrEnqueue callback')
-        return fn.apply(this, arguments)
+        return fn.apply(this, args)
       }
 
       shim.logger.trace('Binding sendOrEnqueue callback to %s', segment.name)
-      const args = shim.argsToArray.apply(shim, arguments)
       args[args.length - 1] = shim.bindSegment(cb, segment)
       return fn.apply(this, args)
     }

package/lib/instrumentation/bunyan.js

@@ -82,8 +82,7 @@ module.exports = function instrument(agent, bunyan, _, shim) {
 
   if (metricsEnabled || localDecoratingEnabled) {
     shim.wrap(bunyan.prototype, '_emit', function wrapEmit(_shim, emit) {
-      return function wrappedEmit() {
-        const args = shim.argsToArray.apply(shim, arguments)
+      return function wrappedEmit(...args) {
         const rec = args[0]
 
         if (metricsEnabled) {

package/lib/instrumentation/cassandra-driver.js

@@ -71,12 +71,10 @@ module.exports = function initialize(_agent, cassandra, _moduleName, shim) {
     )
 
     shim.wrap(RequestExecutionProto, 'start', function wrapStart(shim, start) {
-      return function wrappedStart() {
+      return function wrappedStart(...args) {
         const parent = shim.getSegment()
         const self = this
 
-        const args = shim.argsToArray.apply(shim, arguments)
-
         /**
          * In older versions of cassandra-driver, we can't rely on RequestExecution._sendOnConnection,
          * so instead we use the callback passed to RequestExecution.start as a sort of hook point,

package/lib/instrumentation/core/child_process.js

@@ -29,8 +29,7 @@ function initialize(agent, childProcess, moduleName, shim) {
 
   function wrapChildProcessClass(shim, childProcessClass) {
     shim.wrap(childProcessClass.prototype, 'on', function wrapChildProcessClassOn(shim, fn) {
-      return function wrappedChildProcessOn() {
-        const args = shim.argsToArray.apply(shim, arguments)
+      return function wrappedChildProcessOn(...args) {
         const cbIndex = args.length - 1
 
         const originalListener = args[cbIndex]

package/lib/instrumentation/core/fs.js

@@ -66,13 +66,12 @@ function initialize(agent, fs, moduleName, shim) {
   })
 
   shim.wrap(fs, nonRecordedMethods, function wrapNonRecordedFs(shim, fn) {
-    return function wrappedNonRecordedFs() {
+    return function wrappedNonRecordedFs(...args) {
       // these are called in tight loops so opting out early
       if (!shim.getActiveSegment()) {
-        return fn.apply(this, arguments)
+        return fn.apply(this, args)
       }
 
-      const args = shim.argsToArray.apply(shim, arguments)
       const cbIndex = args.length - 1
 
       shim.bindSegment(args, cbIndex)

package/lib/instrumentation/core/inspector.js

@@ -14,8 +14,7 @@ function initialize(agent, inspector, name, shim) {
   }
 
   shim.wrap(sessionProto, 'post', function wrapPost(shim, fn) {
-    return function wrappedPost() {
-      const args = shim.argsToArray.apply(shim, arguments)
+    return function wrappedPost(...args) {
       shim.bindCallbackSegment(null, args, shim.LAST)
       return fn.apply(this, args)
     }

package/lib/instrumentation/core/net.js

@@ -24,12 +24,11 @@ module.exports = function initialize(agent, net, moduleName, shim) {
   const serverProto = net.Server.prototype
 
   shim.wrap(serverProto, ['listen', 'close'], function wrapNoRecord(shim, fn) {
-    return function wrappedNoRecord() {
+    return function wrappedNoRecord(...args) {
       if (!shim.getActiveSegment()) {
-        return fn.apply(this, arguments)
+        return fn.apply(this, args)
       }
 
-      const args = shim.argsToArray.apply(shim, arguments)
       const cbIndex = args.length - 1
 
       shim.bindSegment(args, cbIndex)

package/lib/instrumentation/core/zlib.js

@@ -32,12 +32,11 @@ function initialize(agent, zlib, moduleName, shim) {
 }
 
 function wrapNoSegment(shim, fn) {
-  return function wrappedZLibNoSegment() {
+  return function wrappedZLibNoSegment(...args) {
     if (!shim.getActiveSegment()) {
-      return fn.apply(this, arguments)
+      return fn.apply(this, args)
     }
 
-    const args = shim.argsToArray.apply(shim, arguments)
     const cbIndex = args.length - 1
 
     shim.bindSegment(args, cbIndex)

package/lib/instrumentation/fastify.js

@@ -68,8 +68,7 @@ const setupRouteHandler = (shim, fastify) => {
   })
 
   shim.wrap(fastify, 'addHook', function addWrapHook(shim, fn) {
-    return function wrappedAddHook() {
-      const args = shim.argsToArray.apply(shim, arguments)
+    return function wrappedAddHook(...args) {
       const hookName = args[0]
       if (REQUEST_HOOKS.includes(hookName)) {
         const middlewareFunction = args[1]
@@ -122,13 +121,12 @@ function setupMiddlewareHandlers(shim, fastify, isv3Plus) {
     // This style is accomplished leveraging decorators. Both middie (which was built-in in v2)
     // and fastify-express mount a 'use' function for mounting middleware.
     shim.wrap(fastify, 'decorate', function wrapDecorate(shim, fn) {
-      return function wrappedDecorate() {
-        const name = arguments[0]
+      return function wrappedDecorate(...args) {
+        const name = args[0]
         if (name !== 'use') {
-          return fn.apply(this, arguments)
+          return fn.apply(this, args)
         }
 
-        const args = shim.argsToArray.apply(shim, arguments)
         args[1] = shim.wrapMiddlewareMounter(args[1], mounterSpec)
 
         return fn.apply(this, args)

package/lib/instrumentation/grpc-js/grpc.js

@@ -63,9 +63,7 @@ function wrapStart(shim, original) {
 
     return shim.applySegment(callStart, segment, true, this, arguments)
 
-    function callStart() {
-      const args = shim.argsToArray.apply(shim, arguments)
-
+    function callStart(...args) {
       const originalMetadata = args[0]
       const nrMetadata = originalMetadata.clone()
 
@@ -138,9 +136,7 @@ function wrapStart(shim, original) {
 function wrapRegister(shim, original) {
   const constants = shim.require('./build/src/constants')
 
-  return function wrappedRegister() {
-    const args = shim.argsToArray.apply(shim, arguments)
-
+  return function wrappedRegister(...args) {
     const name = args[0]
     const handler = args[1]
     const type = args[args.length - 1]
@@ -219,8 +215,7 @@ function wrapRegister(shim, original) {
       const config = agent.config
       if (!shim.isWrapped(stream.call.callEventTracker, 'onCallEnd')) {
         shim.wrap(stream.call.callEventTracker, 'onCallEnd', function onCallEnd(shim, orig) {
-          return function wrappedOnCallEnd() {
-            const args = shim.argsToArray.apply(shim, arguments)
+          return function wrappedOnCallEnd(...args) {
             const [{ code: statusCode }] = args
             transaction.trace.attributes.addAttribute(DESTINATION, 'response.status', statusCode)
             if (shouldTrackError(statusCode, config)) {

package/lib/instrumentation/kafkajs/consumer.js

@@ -24,8 +24,7 @@ const SEGMENT_PREFIX = 'kafkajs.Kafka.consumer#'
 module.exports = wrapConsumer
 
 function wrapConsumer(shim, orig) {
-  return function wrappedConsumer() {
-    const args = shim.argsToArray.apply(shim, arguments)
+  return function wrappedConsumer(...args) {
     const consumer = orig.apply(this, args)
     consumer[kafkaCtx] = this[kafkaCtx]
 
@@ -58,8 +57,7 @@ function wrapConsumer(shim, orig) {
 
 function wrapRun(shim, fn) {
   const agent = shim.agent
-  return function wrappedRun() {
-    const runArgs = shim.argsToArray.apply(shim, arguments)
+  return function wrappedRun(...runArgs) {
     const brokers = this[kafkaCtx].brokers
     if (runArgs?.[0]?.eachBatch) {
       runArgs[0].eachBatch = shim.wrap(

package/lib/instrumentation/kafkajs/producer.js

@@ -14,8 +14,7 @@ const { kafkaCtx } = require('../../symbols')
 module.exports = nrProducerWrapper
 
 function nrProducerWrapper(shim, orig) {
-  return function nrProducer() {
-    const params = shim.argsToArray.apply(shim, arguments)
+  return function nrProducer(...params) {
     const producer = orig.apply(this, params)
     producer[kafkaCtx] = this[kafkaCtx]