newrelic 12.1.0 → 12.2.0

package/NEWS.md

@@ -1,3 +1,44 @@
+### v12.2.0 (2024-08-19)
+
+#### Features
+
+* Added instrumentation support for Express 5 beta ([#2476](https://github.com/newrelic/node-newrelic/pull/2476)) ([06a4c2f](https://github.com/newrelic/node-newrelic/commit/06a4c2f9d62f7313fd246b4eed7f9f04f8b6345b))
+    * This will be experimental until `express@5.0.0` is generally available
+
+#### Bug fixes
+
+* Updated `koa` instrumentation to properly get the matched route name and to handle changes in `@koa/router@13.0.0` ([#2486](https://github.com/newrelic/node-newrelic/pull/2486)) ([0c2ee2f](https://github.com/newrelic/node-newrelic/commit/0c2ee2fd1698972de35a0ad2685e626a074125ed))
+
+#### Documentation
+
+* Removed reference to `@newrelic/next` in README ([#2479](https://github.com/newrelic/node-newrelic/pull/2479)) ([8740539](https://github.com/newrelic/node-newrelic/commit/8740539c4004e421e5f26d0c92216bcffb93c9cc))
+* Updated compatibility report ([#2487](https://github.com/newrelic/node-newrelic/pull/2487)) ([c0a5e64](https://github.com/newrelic/node-newrelic/commit/c0a5e646773c365897a908daf034881703dbd1df))
+
+#### Miscellaneous chores
+
+* Reverted to upstream `require-in-the-middle` ([#2473](https://github.com/newrelic/node-newrelic/pull/2473)) ([9bbc41c](https://github.com/newrelic/node-newrelic/commit/9bbc41c5be479af56d5aa0c87291d2fec607e9e4))
+* Updated aggregators unit tests to node:test ([#2481](https://github.com/newrelic/node-newrelic/pull/2481)) ([fd2d76f](https://github.com/newrelic/node-newrelic/commit/fd2d76fb2f6e8debc165700f932d57a02c3d3956))
+
+### v12.1.1 (2024-08-15)
+
+#### Bug fixes
+
+* Updated `amqplib` instrumentation to properly parse host/port from connect ([#2461](https://github.com/newrelic/node-newrelic/pull/2461)) ([91636a8](https://github.com/newrelic/node-newrelic/commit/91636a8e9702ba4ad1bf9b3941432ea65a3920fe))
+* Updated `redis` instrumentation to parse host/port when a url is not provided ([#2463](https://github.com/newrelic/node-newrelic/pull/2463)) ([2b67623](https://github.com/newrelic/node-newrelic/commit/2b67623afef5fb132105c7f5b1d72e23b6d56dc1))
+* Updated the `kafkajs` node metrics to remove `/Named` from the name ([#2458](https://github.com/newrelic/node-newrelic/pull/2458)) ([37ce113](https://github.com/newrelic/node-newrelic/commit/37ce1137a91c2efa85541cf6ec252a759e5f48ea))
+
+#### Code refactoring
+
+* Updated pino instrumentation to separate the wrapping of asJson into its own function ([#2464](https://github.com/newrelic/node-newrelic/pull/2464)) ([81fdde1](https://github.com/newrelic/node-newrelic/commit/81fdde1e35b5643ff141db1309ca58d7f6176cd5))
+
+#### Documentation
+
+* Updated compatibility report ([#2460](https://github.com/newrelic/node-newrelic/pull/2460)) ([a4570e9](https://github.com/newrelic/node-newrelic/commit/a4570e93298d10f4464570b75867634b95a61e89))
+
+#### Miscellaneous chores
+
+* Removed limit on superagent versioned testing ([#2456](https://github.com/newrelic/node-newrelic/pull/2456)) ([b4b6a6b](https://github.com/newrelic/node-newrelic/commit/b4b6a6b2eca8bd47d17f8b265344b4596c8226b3))
+
 ### v12.1.0 (2024-08-12)
 
 #### Bug fixes

package/README.md

@@ -152,7 +152,6 @@ For more information on getting started, [check the Node.js docs](https://docs.n
 There are modules that can be installed and configured to accompany the Node.js agent:
 
  * [@newrelic/apollo-server-plugin](https://github.com/newrelic/newrelic-node-apollo-server-plugin): New Relic's official Apollo Server plugin for use with the Node.js agent.
- * [@newrelic/next](https://github.com/newrelic/newrelic-node-nextjs): Provides instrumentation for the [Next.js](https://github.com/vercel/next.js/) npm package.
 
 There are modules included within the Node.js agent to add more instrumentation for 3rd party modules:
 

package/THIRD_PARTY_NOTICES.md

@@ -26,6 +26,7 @@ code, the source code can be found at [https://github.com/newrelic/node-newrelic
 * [json-stringify-safe](#json-stringify-safe)
 * [module-details-from-path](#module-details-from-path)
 * [readable-stream](#readable-stream)
+* [require-in-the-middle](#require-in-the-middle)
 * [semver](#semver)
 * [winston-transport](#winston-transport)
 
@@ -541,7 +542,7 @@ SOFTWARE.
 
 ### @newrelic/security-agent
 
-This product includes source derived from [@newrelic/security-agent](https://github.com/newrelic/csec-node-agent) ([v1.4.0](https://github.com/newrelic/csec-node-agent/tree/v1.4.0)), distributed under the [UNKNOWN License](https://github.com/newrelic/csec-node-agent/blob/v1.4.0/LICENSE):
+This product includes source derived from [@newrelic/security-agent](https://github.com/newrelic/csec-node-agent) ([v1.5.0](https://github.com/newrelic/csec-node-agent/tree/v1.5.0)), distributed under the [UNKNOWN License](https://github.com/newrelic/csec-node-agent/blob/v1.5.0/LICENSE):
 
 ```
 ## New Relic Software License v1.0
@@ -676,7 +677,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.9.1](https://github.com/nodejs/import-in-the-middle/tree/v1.9.1)), distributed under the [Apache-2.0 License](https://github.com/nodejs/import-in-the-middle/blob/v1.9.1/LICENSE):
+This product includes source derived from [import-in-the-middle](https://github.com/nodejs/import-in-the-middle) ([v1.11.0](https://github.com/nodejs/import-in-the-middle/tree/v1.11.0)), distributed under the [Apache-2.0 License](https://github.com/nodejs/import-in-the-middle/blob/v1.11.0/LICENSE):
 
 ```
                                  Apache License
@@ -1018,6 +1019,36 @@ IN THE SOFTWARE.
 
 ```
 
+### require-in-the-middle
+
+This product includes source derived from [require-in-the-middle](https://github.com/elastic/require-in-the-middle) ([v7.4.0](https://github.com/elastic/require-in-the-middle/tree/v7.4.0)), distributed under the [MIT License](https://github.com/elastic/require-in-the-middle/blob/v7.4.0/LICENSE):
+
+```
+The MIT License (MIT)
+
+Copyright (c) 2016-2019, Thomas Watson Steen
+Copyright (c) 2019-2023, Elasticsearch B.V.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+```
+
 ### semver
 
 This product includes source derived from [semver](https://github.com/npm/node-semver) ([v7.6.3](https://github.com/npm/node-semver/tree/v7.6.3)), distributed under the [ISC License](https://github.com/npm/node-semver/blob/v7.6.3/LICENSE):
@@ -1076,7 +1107,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.616.0](https://github.com/aws/aws-sdk-js-v3/tree/v3.616.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.616.0/LICENSE):
+This product includes source derived from [@aws-sdk/client-s3](https://github.com/aws/aws-sdk-js-v3) ([v3.631.0](https://github.com/aws/aws-sdk-js-v3/tree/v3.631.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.631.0/LICENSE):
 
 ```
                                 Apache License
@@ -1285,7 +1316,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.616.0](https://github.com/aws/aws-sdk-js-v3/tree/v3.616.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.616.0/LICENSE):
+This product includes source derived from [@aws-sdk/s3-request-presigner](https://github.com/aws/aws-sdk-js-v3) ([v3.631.0](https://github.com/aws/aws-sdk-js-v3/tree/v3.631.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.631.0/LICENSE):
 
 ```
                                 Apache License
@@ -2179,7 +2210,7 @@ THE SOFTWARE.
 
 ### @slack/bolt
 
-This product includes source derived from [@slack/bolt](https://github.com/slackapi/bolt) ([v3.19.0](https://github.com/slackapi/bolt/tree/v3.19.0)), distributed under the [MIT License](https://github.com/slackapi/bolt/blob/v3.19.0/LICENSE):
+This product includes source derived from [@slack/bolt](https://github.com/slackapi/bolt) ([v3.21.0](https://github.com/slackapi/bolt/tree/v3.21.0)), distributed under the [MIT License](https://github.com/slackapi/bolt/blob/v3.21.0/LICENSE):
 
 ```
 The MIT License (MIT)
@@ -2683,7 +2714,7 @@ THE SOFTWARE.
 
 ### aws-sdk
 
-This product includes source derived from [aws-sdk](https://github.com/aws/aws-sdk-js) ([v2.1659.0](https://github.com/aws/aws-sdk-js/tree/v2.1659.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js/blob/v2.1659.0/LICENSE.txt):
+This product includes source derived from [aws-sdk](https://github.com/aws/aws-sdk-js) ([v2.1675.0](https://github.com/aws/aws-sdk-js/tree/v2.1675.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js/blob/v2.1675.0/LICENSE.txt):
 
 ```
 
@@ -3111,7 +3142,7 @@ THE SOFTWARE.
 
 ### eslint-plugin-jsdoc
 
-This product includes source derived from [eslint-plugin-jsdoc](https://github.com/gajus/eslint-plugin-jsdoc) ([v48.8.0](https://github.com/gajus/eslint-plugin-jsdoc/tree/v48.8.0)), distributed under the [BSD-3-Clause License](https://github.com/gajus/eslint-plugin-jsdoc/blob/v48.8.0/LICENSE):
+This product includes source derived from [eslint-plugin-jsdoc](https://github.com/gajus/eslint-plugin-jsdoc) ([v48.11.0](https://github.com/gajus/eslint-plugin-jsdoc/tree/v48.11.0)), distributed under the [BSD-3-Clause License](https://github.com/gajus/eslint-plugin-jsdoc/blob/v48.11.0/LICENSE):
 
 ```
 Copyright (c) 2018, Gajus Kuizinas (http://gajus.com/)
@@ -4189,7 +4220,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ### @contrast/fn-inspect
 
-This product includes source derived from [@contrast/fn-inspect](https://github.com/Contrast-Security-Inc/node-fn-inspect) ([v4.2.0](https://github.com/Contrast-Security-Inc/node-fn-inspect/tree/v4.2.0)), distributed under the [MIT License](https://github.com/Contrast-Security-Inc/node-fn-inspect/blob/v4.2.0/LICENSE):
+This product includes source derived from [@contrast/fn-inspect](https://github.com/Contrast-Security-Inc/node-fn-inspect) ([v4.3.0](https://github.com/Contrast-Security-Inc/node-fn-inspect/tree/v4.3.0)), distributed under the [MIT License](https://github.com/Contrast-Security-Inc/node-fn-inspect/blob/v4.3.0/LICENSE):
 
 ```
 Copyright 2022 Contrast Security, Inc
@@ -4215,7 +4246,7 @@ 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) ([v10.2.0](https://github.com/newrelic/node-native-metrics/tree/v10.2.0)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-native-metrics/blob/v10.2.0/LICENSE):
+This product includes source derived from [@newrelic/native-metrics](https://github.com/newrelic/node-native-metrics) ([v11.0.0](https://github.com/newrelic/node-native-metrics/tree/v11.0.0)), distributed under the [Apache-2.0 License](https://github.com/newrelic/node-native-metrics/blob/v11.0.0/LICENSE):
 
 ```
                                  Apache License

package/lib/instrumentation/@node-redis/client.js

@@ -104,8 +104,9 @@ function getRedisParams(clientOpts) {
   }
 
   return new DatastoreParameters({
-    host: clientOpts?.socket?.host || 'localhost',
-    port_path_or_id: clientOpts?.socket?.path || clientOpts?.socket?.port || '6379',
+    host: clientOpts?.host || clientOpts?.socket?.host || 'localhost',
+    port_path_or_id:
+      clientOpts?.port || clientOpts?.socket?.path || clientOpts?.socket?.port || '6379',
     database_name: clientOpts?.database || 0
   })
 }

package/lib/instrumentation/amqplib/amqplib.js

@@ -9,10 +9,10 @@ const {
   OperationSpec,
   params: { DatastoreParameters }
 } = require('../../shim/specs')
-const url = require('url')
 const wrapModel = require('./channel-model')
-const { setCallback } = require('./utils')
+const { setCallback, parseConnectionArgs } = require('./utils')
 const wrapChannel = require('./channel')
+const { amqpConnection } = require('../../symbols')
 
 module.exports.instrumentPromiseAPI = instrumentChannelAPI
 module.exports.instrumentCallbackAPI = instrumentCallbackAPI
@@ -73,31 +73,52 @@ function instrumentAMQP(shim, amqp, promiseMode) {
 /**
  *
  * Instruments the connect method
+ * We have to both wrap and record because
+ * we need the host/port for all subsequent calls on the model/channel
+ * but record only completes in an active transaction
  *
  * @param {Shim} shim instance of shim
  * @param {object} amqp amqplib object
  * @param {boolean} promiseMode is this promise based?
  */
 function wrapConnect(shim, amqp, promiseMode) {
-  shim.record(amqp, 'connect', function recordConnect(shim, connect, name, args) {
-    let [connArgs] = args
-    const params = new DatastoreParameters()
+  shim.wrap(amqp, 'connect', function wrapConnect(shim, connect) {
+    return function wrappedConnect() {
+      const args = shim.argsToArray.apply(shim, arguments)
+      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)
+          const [, c] = cbArgs
+          c.connection[amqpConnection] = params
+          return cb.apply(this, cbArgs)
+        }
+      }
 
-    if (shim.isString(connArgs)) {
-      connArgs = url.parse(connArgs)
-      params.host = connArgs.hostname
-      if (connArgs.port) {
-        params.port = connArgs.port
+      const result = connect.apply(this, args)
+      if (promiseMode) {
+        return result.then((c) => {
+          c.connection[amqpConnection] = params
+          return c
+        })
       }
+      return result
     }
+  })
 
+  shim.record(amqp, 'connect', function recordConnect(shim, connect, name, args) {
+    const [connArgs] = args
+    const params = parseConnectionArgs({ shim, connArgs })
     return new OperationSpec({
       name: 'amqplib.connect',
       callback: setCallback(shim, promiseMode),
       promise: promiseMode,
-      parameters: params,
-      stream: null,
-      recorder: null
+      parameters: new DatastoreParameters({
+        host: params.host,
+        port_path_or_id: params.port
+      })
     })
   })
 }

package/lib/instrumentation/amqplib/channel-model.js

@@ -5,6 +5,7 @@
 
 'use strict'
 const { MessageSpec, MessageSubscribeSpec, RecorderSpec } = require('../../shim/specs')
+const { amqpConnection } = require('../../symbols')
 const CHANNEL_METHODS = [
   'close',
   'open',
@@ -22,13 +23,7 @@ const CHANNEL_METHODS = [
   'prefetch',
   'recover'
 ]
-const {
-  describeMessage,
-  setCallback,
-  parseConnect,
-  getParametersFromMessage,
-  TEMP_RE
-} = require('./utils')
+const { describeMessage, setCallback, getParametersFromMessage, TEMP_RE } = require('./utils')
 
 /**
  *
@@ -89,7 +84,7 @@ function recordPurge({ shim, proto, promiseMode }) {
 
 function recordGet({ shim, proto, promiseMode }) {
   shim.recordConsume(proto, 'get', function wrapGet() {
-    const { host, port } = parseConnect(this?.connection?.stream)
+    const { host, port } = this?.connection?.[amqpConnection] || {}
     return new MessageSpec({
       destinationName: shim.FIRST,
       callback: setCallback(shim, promiseMode),
@@ -115,7 +110,7 @@ function recordGet({ shim, proto, promiseMode }) {
 
 function recordConsume({ shim, proto, promiseMode }) {
   shim.recordSubscribedConsume(proto, 'consume', function consume() {
-    const { host, port } = parseConnect(this?.connection?.stream)
+    const { host, port } = this?.connection?.[amqpConnection] || {}
     return new MessageSubscribeSpec({
       name: 'amqplib.Channel#consume',
       queue: shim.FIRST,

package/lib/instrumentation/amqplib/channel.js

@@ -5,7 +5,8 @@
 
 'use strict'
 const { MessageSpec } = require('../../shim/specs')
-const { parseConnect, getParameters, TEMP_RE } = require('./utils')
+const { amqpConnection } = require('../../symbols')
+const { getParameters, TEMP_RE } = require('./utils')
 
 /**
  *
@@ -47,24 +48,26 @@ module.exports = function wrapChannel(shim) {
     }
   })
 
-  shim.recordProduce(proto, 'sendMessage', function recordSendMessage(shim, fn, n, args) {
-    const fields = args[0]
-    if (!fields) {
-      return null
-    }
-    const isDefault = fields.exchange === ''
-    let exchange = 'Default'
-    if (!isDefault) {
-      exchange = TEMP_RE.test(fields.exchange) ? null : fields.exchange
-    }
-    const { host, port } = parseConnect(this?.connection?.stream)
+  shim.recordProduce(proto, 'sendMessage', recordSendMessage)
+}
+
+function recordSendMessage(shim, fn, n, args) {
+  const fields = args[0]
+  if (!fields) {
+    return null
+  }
+  const isDefault = fields.exchange === ''
+  let exchange = 'Default'
+  if (!isDefault) {
+    exchange = TEMP_RE.test(fields.exchange) ? null : fields.exchange
+  }
+  const { host, port } = this?.connection?.[amqpConnection] || {}
 
-    return new MessageSpec({
-      destinationName: exchange,
-      destinationType: shim.EXCHANGE,
-      routingKey: fields.routingKey,
-      headers: fields.headers,
-      parameters: getParameters({ parameters: Object.create(null), fields, host, port })
-    })
+  return new MessageSpec({
+    destinationName: exchange,
+    destinationType: shim.EXCHANGE,
+    routingKey: fields.routingKey,
+    headers: fields.headers,
+    parameters: getParameters({ parameters: Object.create(null), fields, host, port })
   })
 }

package/lib/instrumentation/amqplib/utils.js

@@ -8,7 +8,6 @@ const {
   MessageSpec,
   params: { QueueMessageParameters }
 } = require('../../shim/specs')
-const { amqpConnection } = require('../../symbols')
 const TEMP_RE = /^amq\./
 
 /**
@@ -100,25 +99,6 @@ function getParametersFromMessage({ message, host, port }) {
   return parameters
 }
 
-/**
- * Extracts the host/port from the amqp socket connection.
- * Stores on connection as symbol to only parse once.
- *
- * @param {Socket} socket amqp connection
- * @returns {object} {host, port } of connection
- */
-function parseConnect(socket) {
-  if (socket[amqpConnection]) {
-    return socket[amqpConnection]
-  }
-  const host = ['127.0.0.1', '::1', '[::1]'].includes(socket?.remoteAddress)
-    ? 'localhost'
-    : socket?.remoteAddress
-  const port = socket?.remotePort
-  socket[amqpConnection] = { host, port }
-  return { host, port }
-}
-
 /**
  * Helper to set the appropriate value of the callback property
  * in the spec. If it's a promise set to null otherwise set it to `shim.LAST`
@@ -131,11 +111,33 @@ function setCallback(shim, promiseMode) {
   return promiseMode ? null : shim.LAST
 }
 
+/**
+ * Parses the connection args to return host/port
+ *
+ * @param {string|object} connArgs connection arguments
+ * @returns {object} {host, port }
+ */
+function parseConnectionArgs({ shim, connArgs }) {
+  const params = {}
+  if (shim.isString(connArgs)) {
+    connArgs = new URL(connArgs)
+    params.host = connArgs.hostname
+    if (connArgs.port) {
+      params.port = parseInt(connArgs.port, 10)
+    }
+  } else {
+    params.port = connArgs.port || (connArgs.protocol === 'amqp' ? 5672 : 5671)
+    params.host = connArgs.hostname
+  }
+
+  return params
+}
+
 module.exports = {
   describeMessage,
   getParameters,
   getParametersFromMessage,
-  parseConnect,
+  parseConnectionArgs,
   setCallback,
   TEMP_RE
 }

package/lib/instrumentation/express.js

@@ -6,7 +6,6 @@
 'use strict'
 
 const { MiddlewareSpec, MiddlewareMounterSpec, RenderSpec } = require('../../lib/shim/specs')
-const { MIDDLEWARE_TYPE_NAMES } = require('../../lib/shim/webframework-shim/common')
 
 /**
  * Express middleware generates traces where middleware are considered siblings
@@ -25,18 +24,8 @@ module.exports = function initialize(agent, express, moduleName, shim) {
     return err !== 'route' && err !== 'router'
   })
 
-  if (express.Router.use) {
-    wrapExpress4(shim, express)
-  } else {
-    wrapExpress3(shim, express)
-  }
-}
-
-function wrapExpress4(shim, express) {
-  // Wrap `use` and `route` which are hung off `Router` directly, not on a
-  // prototype.
   shim.wrapMiddlewareMounter(
-    express.Router,
+    express.application,
     'use',
     new MiddlewareMounterSpec({
       route: shim.FIRST,
@@ -44,8 +33,13 @@ function wrapExpress4(shim, express) {
     })
   )
 
+  wrapExpressRouter(shim, express.Router.use ? express.Router : express.Router.prototype)
+  wrapResponse(shim, express.response)
+}
+
+function wrapExpressRouter(shim, router) {
   shim.wrapMiddlewareMounter(
-    express.application,
+    router,
     'use',
     new MiddlewareMounterSpec({
       route: shim.FIRST,
@@ -53,7 +47,7 @@ function wrapExpress4(shim, express) {
     })
   )
 
-  shim.wrap(express.Router, 'route', function wrapRoute(shim, fn) {
+  shim.wrap(router, 'route', function wrapRoute(shim, fn) {
     if (!shim.isFunction(fn)) {
       return fn
     }
@@ -89,7 +83,7 @@ function wrapExpress4(shim, express) {
   })
 
   shim.wrapMiddlewareMounter(
-    express.Router,
+    router,
     'param',
     new MiddlewareMounterSpec({
       route: shim.FIRST,
@@ -105,56 +99,6 @@ function wrapExpress4(shim, express) {
       }
     })
   )
-
-  wrapResponse(shim, express.response)
-}
-
-function wrapExpress3(shim, express) {
-  // In Express 3 the app returned from `express()` is actually a `connect` app
-  // which we have no access to before creation. We can not easily wrap the app
-  // because there are a lot of methods dangling on it that act on the app itself.
-  // Really we just care about apps being used as `request` event listeners on
-  // `http.Server` instances so we'll wrap that instead.
-
-  shim.wrapMiddlewareMounter(
-    express.Router.prototype,
-    'param',
-    new MiddlewareMounterSpec({
-      route: shim.FIRST,
-      wrapper: function wrapParamware(shim, middleware, fnName, route) {
-        return shim.recordParamware(
-          middleware,
-          new MiddlewareSpec({
-            name: route,
-            req: shim.FIRST,
-            next: shim.THIRD,
-            type: MIDDLEWARE_TYPE_NAMES.PARAMWARE
-          })
-        )
-      }
-    })
-  )
-  shim.wrapMiddlewareMounter(
-    express.Router.prototype,
-    'use',
-    new MiddlewareMounterSpec({
-      route: shim.FIRST,
-      wrapper: wrapMiddleware
-    })
-  )
-  shim.wrapMiddlewareMounter(
-    express.application,
-    'use',
-    new MiddlewareMounterSpec({
-      route: shim.FIRST,
-      wrapper: wrapMiddleware
-    })
-  )
-
-  // NOTE: Do not wrap application route methods in Express 3, they all just
-  // forward their arguments to the router.
-  wrapRouteMethods(shim, express.Router.prototype, shim.FIRST)
-  wrapResponse(shim, express.response)
 }
 
 function wrapRouteMethods(shim, route, path) {

package/lib/instrumentation/kafkajs/record-linking-metrics.js

@@ -11,7 +11,7 @@ function recordLinkingMetrics({ agent, brokers, topic, producer = true }) {
   const kind = producer === true ? 'Produce' : 'Consume'
   for (const broker of brokers) {
     agent.metrics
-      .getOrCreateMetric(`MessageBroker/Kafka/Nodes/${broker}/${kind}/Named/${topic}`)
+      .getOrCreateMetric(`MessageBroker/Kafka/Nodes/${broker}/${kind}/${topic}`)
       .incrementCallCount()
   }
 }

package/lib/instrumentation/koa/instrumentation.js

@@ -115,10 +115,8 @@ function wrapMatchedRoute(shim, context) {
   Object.defineProperty(context, '_matchedRoute', {
     get: () => context[symbols.koaMatchedRoute],
     set: (val) => {
-      const match = getLayerForTransactionName(context)
-
       // match should never be undefined given _matchedRoute was set
-      if (match) {
+      if (val) {
         const currentSegment = shim.getActiveSegment()
 
         // Segment/Transaction may be null, see:
@@ -131,7 +129,7 @@ function wrapMatchedRoute(shim, context) {
             transaction.nameState.popPath()
           }
 
-          transaction.nameState.appendPath(match.path)
+          transaction.nameState.appendPath(val)
           transaction.nameState.markPath()
         }
       }
@@ -169,22 +167,6 @@ function wrapResponseStatus(shim, context) {
   })
 }
 
-function getLayerForTransactionName(context) {
-  // Context.matched might be null
-  // See https://github.com/newrelic/node-newrelic-koa/pull/29
-  if (!context.matched) {
-    return null
-  }
-  for (let i = context.matched.length - 1; i >= 0; i--) {
-    const layer = context.matched[i]
-    if (layer.opts.end) {
-      return layer
-    }
-  }
-
-  return null
-}
-
 function getInheritedPropertyDescriptor(obj, property) {
   let proto = obj
   let descriptor = null

package/lib/instrumentation/langchain/nr-hooks.js

@@ -22,8 +22,16 @@ module.exports = [
     onRequire: cbManagerInstrumentation
   },
   {
+    // This block is for catching langchain internal imports
+    // of the callback manager. See:
+    // https://github.com/elastic/require-in-the-middle/pull/88#issuecomment-2124940546
     type: InstrumentationDescriptor.TYPE_GENERIC,
-    moduleName: '@langchain/core/dist/runnables/base',
+    moduleName: '@langchain/core/dist/callbacks/manager.cjs',
+    onRequire: cbManagerInstrumentation
+  },
+  {
+    type: InstrumentationDescriptor.TYPE_GENERIC,
+    moduleName: '@langchain/core/runnables',
     onRequire: runnableInstrumentation
   },
   {

package/lib/instrumentation/pino/pino.js

@@ -15,7 +15,6 @@ const {
 } = require('../../util/application-logging')
 const semver = require('semver')
 
-// eslint-disable-next-line sonarjs/cognitive-complexity
 module.exports = function instrument(shim, tools) {
   const pinoVersion = shim.pkgVersion
 
@@ -35,7 +34,20 @@ module.exports = function instrument(shim, tools) {
   const metrics = agent.metrics
   createModuleUsageMetric('pino', metrics)
 
+  wrapAsJson({ shim, tools })
+}
+
+/**
+ * Wraps `asJson` to properly decorate and forward logs
+ *
+ * @param {object} params to function
+ * @param {Shim} params.shim instance of shim
+ * @param {object} params.tools exported `pino/lib/tools`
+ */
+function wrapAsJson({ shim, tools }) {
   const symbols = shim.require('./lib/symbols')
+  const { agent } = shim
+  const { config, metrics } = agent
 
   shim.wrap(tools, 'asJson', function wrapJson(shim, asJson) {
     /**
@@ -98,16 +110,14 @@ module.exports = function instrument(shim, tools) {
  * reformats error and assigns NR context data
  * to log line
  *
- * @param logLine.logLine
- * @param {object} logLine log line
- * @param {object} metadata NR context data
- * @param {string} chindings serialized string of all common log line data
- * @param logLine.args
- * @param logLine.agent
- * @param logLine.chindings
- * @param logLine.msg
- * @param logLine.level
- * @param logLine.logger
+ * @param {object} params to function
+ * @param {object} params.logLine log line
+ * @param {string} params.msg message of log line
+ * @param {object} params.agent instance of agent
+ * @param {string} params.chindings serialized string of all common log line data
+ * @param {string} params.level log level
+ * @param {object} params.logger instance of agent logger
+ * @returns {function} wrapped log formatter function
  */
 function reformatLogLine({ logLine, msg, agent, chindings = '', level, logger }) {
   const metadata = agent.getLinkingMetadata()

package/lib/shimmer.js

@@ -11,7 +11,7 @@ const fs = require('./util/unwrapped-core').fs
 const logger = require('./logger').child({ component: 'shimmer' })
 const INSTRUMENTATIONS = require('./instrumentations')()
 const shims = require('./shim')
-const { Hook } = require('@newrelic/ritm')
+const { Hook } = require('require-in-the-middle')
 const IitmHook = require('import-in-the-middle')
 const { nrEsmProxy } = require('./symbols')
 const isAbsolutePath = require('./util/is-absolute-path')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newrelic",
-  "version": "12.1.0",
+  "version": "12.2.0",
   "author": "New Relic Node.js agent team <nodejs@newrelic.com>",
   "license": "Apache-2.0",
   "contributors": [
@@ -197,7 +197,6 @@
   "dependencies": {
     "@grpc/grpc-js": "^1.9.4",
     "@grpc/proto-loader": "^0.7.5",
-    "@newrelic/ritm": "^7.2.0",
     "@newrelic/security-agent": "^1.3.0",
     "@tyriar/fibonacci-heap": "^2.0.7",
     "concat-stream": "^2.0.0",
@@ -207,6 +206,7 @@
     "json-stringify-safe": "^5.0.0",
     "module-details-from-path": "^1.0.3",
     "readable-stream": "^3.6.1",
+    "require-in-the-middle": "^7.4.0",
     "semver": "^7.5.2",
     "winston-transport": "^4.5.0"
   },