newrelic 11.17.0 → 11.19.0

package/NEWS.md

@@ -1,3 +1,60 @@
+### v11.19.0 (2024-06-06)
+
+#### Features
+
+* Added instrumentation for `kafkajs` (enabled through a [feature flag](https://github.com/newrelic/node-newrelic/blob/f003ee78204149c7905cb17cb4f084aeac1ba751/documentation/feature-flags.md#kakfajs_instrumentation)) ([#2237](https://github.com/newrelic/node-newrelic/pull/2237)) ([#2244](https://github.com/newrelic/node-newrelic/pull/2244)) ([#2236](https://github.com/newrelic/node-newrelic/pull/2236)) ([#2236](https://github.com/newrelic/node-newrelic/pull/2236)) ([#2251](https://github.com/newrelic/node-newrelic/pull/2251))
+
+
+#### Miscellaneous chores
+
+* Added kafkajs instrumentation and versioned tests skeleton ([#2224](https://github.com/newrelic/node-newrelic/pull/2224)) ([fc13916](https://github.com/newrelic/node-newrelic/commit/fc13916b94b813d028270dfccfed292af91875fb))
+* Added kafkajs to compatibility list ([#2254](https://github.com/newrelic/node-newrelic/pull/2254)) ([f003ee7](https://github.com/newrelic/node-newrelic/commit/f003ee78204149c7905cb17cb4f084aeac1ba751))
+* Implemented DT header injection for message specs ([#2250](https://github.com/newrelic/node-newrelic/pull/2250)) ([3e6bc6d](https://github.com/newrelic/node-newrelic/commit/3e6bc6d5485fd6e236c6f0a58922d698c00c920f))
+* Removed targets for kafka versioned tests ([#2235](https://github.com/newrelic/node-newrelic/pull/2235)) ([838bab2](https://github.com/newrelic/node-newrelic/commit/838bab2ff425f5acb111a19f397760ed01c1bdde))
+* Updated flaky when test ([#2241](https://github.com/newrelic/node-newrelic/pull/2241)) ([4079a0a](https://github.com/newrelic/node-newrelic/commit/4079a0ae38e584181eec284963560341941c5dd3))
+* Updated readme to remove no longer relevant information ([#2240](https://github.com/newrelic/node-newrelic/pull/2240)) ([01fb53c](https://github.com/newrelic/node-newrelic/commit/01fb53cfe3c7df63bc2ef03d85991edb159569a6))
+* Updated versioned tests due to update in @newrelic/security-agent V1.3.0 ([#2239](https://github.com/newrelic/node-newrelic/pull/2239)) ([982276c](https://github.com/newrelic/node-newrelic/commit/982276cd4fca57bbf64219e846a0a93cdfb3400b))
+
+#### Tests
+
+* Migrated `memcached` tests to versioned tests ([#2231](https://github.com/newrelic/node-newrelic/pull/2231)) ([0b3a928](https://github.com/newrelic/node-newrelic/commit/0b3a9284dc5bdc7755d176739186ea3c15cde23e))
+* Ported `when` and `q` integration tests to versioned tests ([#2233](https://github.com/newrelic/node-newrelic/pull/2233)) ([9a4dddc](https://github.com/newrelic/node-newrelic/commit/9a4dddc64ce69ea63866d1ebaf6b86b9234c99ea))
+* Updated ioredis tests to assert the host metric getting created on ioredis calls ([#2230](https://github.com/newrelic/node-newrelic/pull/2230)) ([89df06a](https://github.com/newrelic/node-newrelic/commit/89df06a6b885f8789e68d2b8047bada61db62e24))
+* Updated unit tests that were missing constructing specs at instrumentation source ([#2252](https://github.com/newrelic/node-newrelic/pull/2252)) ([54ab238](https://github.com/newrelic/node-newrelic/commit/54ab238436717b5a248f40374e174f1b19217a0c))
+
+### v11.18.0 (2024-05-29)
+
+#### Features
+
+* Added support for redis v4 legacyMode `client.v4.<command>` ([#2200](https://github.com/newrelic/node-newrelic/pull/2200)) ([b2284c5](https://github.com/newrelic/node-newrelic/commit/b2284c58eb798ab00a141ce08f4072584795c728))
+
+#### Code refactoring
+
+* Updated `shim.recordConsume` to use `shim.record` and added ability to invoke an after hook with callback args ([#2207](https://github.com/newrelic/node-newrelic/pull/2207)) ([4f48fc3](https://github.com/newrelic/node-newrelic/commit/4f48fc3bbd5afce4954019620b112f600b2dfb53))
+
+#### Documentation
+
+* Updated compatibility report ([#2223](https://github.com/newrelic/node-newrelic/pull/2223)) ([a256ca0](https://github.com/newrelic/node-newrelic/commit/a256ca0f2060efe576018527d37718a041ffc925))
+
+#### Miscellaneous chores
+
+* Removed outdated Slack reference ([#2198](https://github.com/newrelic/node-newrelic/pull/2198)) ([8110d42](https://github.com/newrelic/node-newrelic/commit/8110d426f402659d44bf786fec0503ca2413ee6b))
+* Removed package-lock.json ([#2208](https://github.com/newrelic/node-newrelic/pull/2208)) ([b267695](https://github.com/newrelic/node-newrelic/commit/b26769502b4cb38f9133f76f427ee96ce718c15b))
+* Removed unused express5 feature flag ([#2197](https://github.com/newrelic/node-newrelic/pull/2197)) ([366504b](https://github.com/newrelic/node-newrelic/commit/366504ba1e3bfed477a37be5d61f4e30e46b690d))
+
+#### Tests
+
+* Updated langchain versioned tests to separate the vectorstore and other tests. This is to avoid peer resolution of `@langchain/community` package that is being used to test the elasticsearch vectorstore ([#2216](https://github.com/newrelic/node-newrelic/pull/2216)) ([e768955](https://github.com/newrelic/node-newrelic/commit/e7689554aec2a038d5b80c54d4b6b603075856ac))
+* Fixed aws-sdk-v3 bedrock tests ([#2211](https://github.com/newrelic/node-newrelic/pull/2211)) ([050469e](https://github.com/newrelic/node-newrelic/commit/050469ecc59ccc9ba6a6e78527ac392f262ff939))
+* Fixed aws-sdk-v3 bedrock tests (again) ([#2212](https://github.com/newrelic/node-newrelic/pull/2212)) ([330cc4b](https://github.com/newrelic/node-newrelic/commit/330cc4b6ff8e3777b1dfa0fda7f5b4c5b20005af))
+
+#### Continuous integration
+
+* Updated the langchain vectorstore test to reference the correct version of `@langchain/core` getting tested ([#2202](https://github.com/newrelic/node-newrelic/pull/2202)) ([ed81852](https://github.com/newrelic/node-newrelic/commit/ed81852a4b3c582a54c0d274ba9d5887041ebeef))
+* Added updating of docs site with compatibility table ([#2205](https://github.com/newrelic/node-newrelic/pull/2205)) ([c28a938](https://github.com/newrelic/node-newrelic/commit/c28a9387f68feb8fa59d4134828662b3babeb9d0))
+* Fixed CI jobs ([#2215](https://github.com/newrelic/node-newrelic/pull/2215)) ([8b030fb](https://github.com/newrelic/node-newrelic/commit/8b030fbf479cd348e9b75544bc753c1d618bfca7))
+* Fixed should-run CI step ([#2214](https://github.com/newrelic/node-newrelic/pull/2214)) ([d0a481d](https://github.com/newrelic/node-newrelic/commit/d0a481d4b58706c4793fa12fa7706091eaffa0a4))
+
 ### v11.17.0 (2024-05-15)
 
 #### Features

package/README.md

@@ -118,16 +118,13 @@ For more information on getting started, [check the Node.js docs](https://docs.n
 
 ### External Modules
 
-There are several modules that can be installed and configured to accompany the Node.js agent:
+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 several modules included within the Node.js agent to add more instrumentation for 3rd party modules:
+There are modules included within the Node.js agent to add more instrumentation for 3rd party modules:
 
- * [@newrelic/aws-sdk](https://github.com/newrelic/node-newrelic-aws-sdk):  Provides instrumentation for the [AWS SDK](https://www.npmjs.com/package/aws-sdk) npm package.
- * [@newrelic/koa](https://github.com/newrelic/node-newrelic-koa): Provides instrumentation for [koa](https://koajs.com/), [koa-router](https://github.com/ZijianHe/koa-router), [@koa/router](https://github.com/koajs/router), and [koa-route](https://github.com/koajs/route) npm packages.
- * [@newrelic/superagent](https://github.com/newrelic/node-newrelic-superagent): Provides instrumentation for [superagent](https://github.com/visionmedia/superagent) npm package.
  * [@newrelic/native-metrics](https://github.com/newrelic/node-native-metrics): Provides hooks into the native v8 layer of Node.js to provide metrics to the Node.js agent.
 
 ## Usage

package/THIRD_PARTY_NOTICES.md

@@ -65,11 +65,9 @@ code, the source code can be found at [https://github.com/newrelic/node-newrelic
 * [koa](#koa)
 * [lint-staged](#lint-staged)
 * [lockfile-lint](#lockfile-lint)
-* [memcached](#memcached)
 * [nock](#nock)
 * [proxy](#proxy)
 * [proxyquire](#proxyquire)
-* [q](#q)
 * [rfdc](#rfdc)
 * [rimraf](#rimraf)
 * [should](#should)
@@ -77,7 +75,6 @@ code, the source code can be found at [https://github.com/newrelic/node-newrelic
 * [superagent](#superagent)
 * [tap](#tap)
 * [temp](#temp)
-* [when](#when)
 
 **[optionalDependencies](#optionalDependencies)**
 
@@ -94,7 +91,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.10.7](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/tree/v1.10.7)), distributed under the [Apache-2.0 License](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/blob/v1.10.7/LICENSE):
+This product includes source derived from [@grpc/grpc-js](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js) ([v1.10.8](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/tree/v1.10.8)), distributed under the [Apache-2.0 License](https://github.com/grpc/grpc-node/tree/master/packages/grpc-js/blob/v1.10.8/LICENSE):
 
 ```
                                  Apache License
@@ -542,7 +539,7 @@ SOFTWARE.
 
 ### @newrelic/security-agent
 
-This product includes source derived from [@newrelic/security-agent](https://github.com/newrelic/csec-node-agent) ([v1.2.0](https://github.com/newrelic/csec-node-agent/tree/v1.2.0)), distributed under the [UNKNOWN License](https://github.com/newrelic/csec-node-agent/blob/v1.2.0/LICENSE):
+This product includes source derived from [@newrelic/security-agent](https://github.com/newrelic/csec-node-agent) ([v1.3.0](https://github.com/newrelic/csec-node-agent/tree/v1.3.0)), distributed under the [UNKNOWN License](https://github.com/newrelic/csec-node-agent/blob/v1.3.0/LICENSE):
 
 ```
 ## New Relic Software License v1.0
@@ -889,7 +886,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.572.0](https://github.com/aws/aws-sdk-js-v3/tree/v3.572.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.572.0/LICENSE):
+This product includes source derived from [@aws-sdk/client-s3](https://github.com/aws/aws-sdk-js-v3) ([v3.587.0](https://github.com/aws/aws-sdk-js-v3/tree/v3.587.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.587.0/LICENSE):
 
 ```
                                 Apache License
@@ -1098,7 +1095,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.572.0](https://github.com/aws/aws-sdk-js-v3/tree/v3.572.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.572.0/LICENSE):
+This product includes source derived from [@aws-sdk/s3-request-presigner](https://github.com/aws/aws-sdk-js-v3) ([v3.587.0](https://github.com/aws/aws-sdk-js-v3/tree/v3.587.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.587.0/LICENSE):
 
 ```
                                 Apache License
@@ -2496,7 +2493,7 @@ THE SOFTWARE.
 
 ### aws-sdk
 
-This product includes source derived from [aws-sdk](https://github.com/aws/aws-sdk-js) ([v2.1618.0](https://github.com/aws/aws-sdk-js/tree/v2.1618.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js/blob/v2.1618.0/LICENSE.txt):
+This product includes source derived from [aws-sdk](https://github.com/aws/aws-sdk-js) ([v2.1631.0](https://github.com/aws/aws-sdk-js/tree/v2.1631.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js/blob/v2.1631.0/LICENSE.txt):
 
 ```
 
@@ -2895,7 +2892,7 @@ THE SOFTWARE.
 
 ### eslint-plugin-jsdoc
 
-This product includes source derived from [eslint-plugin-jsdoc](https://github.com/gajus/eslint-plugin-jsdoc) ([v48.2.4](https://github.com/gajus/eslint-plugin-jsdoc/tree/v48.2.4)), distributed under the [BSD-3-Clause License](https://github.com/gajus/eslint-plugin-jsdoc/blob/v48.2.4/LICENSE):
+This product includes source derived from [eslint-plugin-jsdoc](https://github.com/gajus/eslint-plugin-jsdoc) ([v48.2.7](https://github.com/gajus/eslint-plugin-jsdoc/tree/v48.2.7)), distributed under the [BSD-3-Clause License](https://github.com/gajus/eslint-plugin-jsdoc/blob/v48.2.7/LICENSE):
 
 ```
 Copyright (c) 2018, Gajus Kuizinas (http://gajus.com/)
@@ -3673,32 +3670,6 @@ This product includes source derived from [lockfile-lint](https://github.com/lir
    limitations under the License.
 ```
 
-### memcached
-
-This product includes source derived from [memcached](https://github.com/3rd-Eden/node-memcached) ([v2.2.2](https://github.com/3rd-Eden/node-memcached/tree/v2.2.2)), distributed under the [MIT License](https://github.com/3rd-Eden/node-memcached/blob/v2.2.2/LICENSE):
-
-```
-Copyright (c) 2010 Arnout Kazemier,3rd-Eden
-
-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.
-```
-
 ### nock
 
 This product includes source derived from [nock](https://github.com/nock/nock) ([v11.8.0](https://github.com/nock/nock/tree/v11.8.0)), distributed under the [MIT License](https://github.com/nock/nock/blob/v11.8.0/LICENSE):
@@ -3775,32 +3746,6 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 ```
 
-### q
-
-This product includes source derived from [q](https://github.com/kriskowal/q) ([v1.5.1](https://github.com/kriskowal/q/tree/v1.5.1)), distributed under the [MIT License](https://github.com/kriskowal/q/blob/v1.5.1/LICENSE):
-
-```
-Copyright 2009–2017 Kristopher Michael Kowal. All rights reserved.
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
-
-```
-
 ### rfdc
 
 This product includes source derived from [rfdc](https://github.com/davidmarkclements/rfdc) ([v1.3.1](https://github.com/davidmarkclements/rfdc/tree/v1.3.1)), distributed under the [MIT License](https://github.com/davidmarkclements/rfdc/blob/v1.3.1/LICENSE):
@@ -3991,37 +3936,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ```
 
-### when
-
-This product includes source derived from [when](https://github.com/cujojs/when) ([v3.7.8](https://github.com/cujojs/when/tree/v3.7.8)), distributed under the [MIT License](https://github.com/cujojs/when/blob/v3.7.8/LICENSE.txt):
-
-```
-Open Source Initiative OSI - The MIT License
-
-http://www.opensource.org/licenses/mit-license.php
-
-Copyright (c) 2011 Brian Cavalier
-
-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.
-```
-
 
 ## optionalDependencies
 

package/lib/feature_flags.js

@@ -7,12 +7,16 @@
 
 // unreleased flags gating an active feature
 exports.prerelease = {
-  express5: false,
+  // internal_test_only is used for testing our feature flag implementation.
+  // It is not used to gate any features.
+  internal_test_only: false,
+
   promise_segments: false,
   reverse_naming_rules: false,
   undici_async_tracking: true,
   unresolved_promise_cleanup: true,
-  legacy_context_manager: false
+  legacy_context_manager: false,
+  kafkajs_instrumentation: false
 }
 
 // flags that are no longer used for released features

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

@@ -21,6 +21,10 @@ module.exports = function initialize(_agent, redis, _moduleName, shim) {
       const client = original.apply(this, arguments)
       client[opts] = getRedisParams(client.options)
       CMDS_TO_INSTRUMENT.forEach(instrumentClientCommand.bind(null, shim, client))
+      if (client.options.legacyMode) {
+        client.v4[opts] = getRedisParams(client.options)
+        CMDS_TO_INSTRUMENT.forEach(instrumentClientCommand.bind(null, shim, client.v4))
+      }
       return client
     }
   })

package/lib/instrumentation/amqplib/amqplib.js

@@ -266,18 +266,20 @@ function wrapModel(shim, Model, promiseMode) {
       destinationName: shim.FIRST,
       callback: setCallback(shim, promiseMode),
       promise: promiseMode,
-      messageHandler: function handleConsumedMessage(shim, fn, name, message) {
+      after: function handleConsumedMessage({ shim, result, args, segment }) {
+        if (!shim.agent.config.message_tracer.segment_parameters.enabled) {
+          shim.logger.trace('Not capturing segment parameters')
+          return
+        }
+
         // the message is the param when using the promised based model
-        message = promiseMode ? message : message[1]
+        const message = promiseMode ? result : args?.[1]
         if (!message) {
           shim.logger.trace('No results from consume.')
           return null
         }
         const parameters = getParametersFromMessage(message)
-
-        const headers = message?.properties?.headers
-
-        return { parameters, headers }
+        shim.copySegmentParameters(segment, parameters)
       }
     })
   )
@@ -287,7 +289,7 @@ function wrapModel(shim, Model, promiseMode) {
     if (TEMP_RE.test(queue)) {
       queue = null
     }
-    return new MessageSubscribeSpec({
+    return new MessageSpec({
       queue,
       promise: promiseMode,
       callback: setCallback(shim, promiseMode)
@@ -312,12 +314,10 @@ function wrapModel(shim, Model, promiseMode) {
  *  Extracts the appropriate messageHandler parameters for the consume method.
  *
  *  @param {Shim} shim instance of shim
- *  @param {object} _consumer not used
- *  @param {string} _name not used
  *  @param {Array} args arguments passed to the consume method
  *  @returns {object} message params
  */
-function describeMessage(shim, _consumer, _name, args) {
+function describeMessage(shim, args) {
   const [message] = args
 
   if (!message?.properties) {

package/lib/instrumentation/aws-sdk/v3/bedrock.js

@@ -197,8 +197,7 @@ function getBedrockSpec({ commandName }, shim, _original, _name, args) {
   return new RecorderSpec({
     promise: true,
     name: `Llm/${modelType}/Bedrock/${commandName}`,
-    // eslint-disable-next-line max-params
-    after: (shim, _fn, _fnName, err, response, segment) => {
+    after: ({ shim, error: err, result: response, segment }) => {
       const passThroughParams = {
         shim,
         err,

package/lib/instrumentation/core/inspector.js

@@ -16,7 +16,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)
-      shim.bindCallbackSegment(args, shim.LAST)
+      shim.bindCallbackSegment(null, args, shim.LAST)
       return fn.apply(this, args)
     }
   })

package/lib/instrumentation/kafkajs/consumer.js

@@ -0,0 +1,132 @@
+/*
+ * Copyright 2024 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+const { kafkaCtx } = require('../../symbols')
+const { MessageSpec, MessageSubscribeSpec, RecorderSpec } = require('../../shim/specs')
+const { DESTINATIONS } = require('../../config/attribute-filter')
+const CONSUMER_METHODS = [
+  'connect',
+  'disconnect',
+  'subscribe',
+  'stop',
+  'commitOffsets',
+  'seek',
+  'pause',
+  'resume'
+]
+const SEGMENT_PREFIX = 'kafkajs.Kafka.consumer#'
+
+module.exports = function instrumentConsumer({ shim, kafkajs, recordMethodMetric }) {
+  const { agent } = shim
+  shim.wrap(kafkajs.Kafka.prototype, 'consumer', function wrapConsumer(shim, orig) {
+    return function wrappedConsumer() {
+      const args = shim.argsToArray.apply(shim, arguments)
+      const consumer = orig.apply(this, args)
+      consumer.on(consumer.events.REQUEST, function listener(data) {
+        // storing broker for when we add `host`, `port` to messaging spans
+        consumer[kafkaCtx] = {
+          clientId: data?.payload?.clientId,
+          broker: data?.payload.broker
+        }
+      })
+      shim.record(consumer, CONSUMER_METHODS, function wrapper(shim, fn, name) {
+        return new RecorderSpec({
+          name: `${SEGMENT_PREFIX}${name}`,
+          promise: true
+        })
+      })
+      shim.recordSubscribedConsume(
+        consumer,
+        'run',
+        new MessageSubscribeSpec({
+          name: `${SEGMENT_PREFIX}#run`,
+          destinationType: shim.TOPIC,
+          promise: true,
+          consumer: shim.FIRST,
+          functions: ['eachMessage'],
+          messageHandler: handler({ consumer, recordMethodMetric })
+        })
+      )
+
+      shim.wrap(consumer, 'run', function wrapRun(shim, fn) {
+        return function wrappedRun() {
+          const runArgs = shim.argsToArray.apply(shim, arguments)
+          if (runArgs?.[0]?.eachBatch) {
+            runArgs[0].eachBatch = shim.wrap(
+              runArgs[0].eachBatch,
+              function wrapEachBatch(shim, eachBatch) {
+                return function wrappedEachBatch() {
+                  recordMethodMetric({ agent, name: 'eachBatch' })
+                  return eachBatch.apply(this, arguments)
+                }
+              }
+            )
+          }
+          return fn.apply(this, runArgs)
+        }
+      })
+      return consumer
+    }
+  })
+}
+
+/**
+ * Wrapped of message handler that passes in consumer and recordMethodMetric.
+ * We do not want to bind this as this gets called with the appropriate binding
+ * in message-shim
+ *
+ * @param {object} params to function
+ * @param {object} params.consumer consumer being instrumented
+ * @param {function} params.recordMethodMetric helper method for logging tracking metrics
+ * @returns {function} message handler for setting metrics and spec for the consumer transaction
+ */
+function handler({ consumer, recordMethodMetric }) {
+  /**
+   * Message handler that extracts the topic and headers from message being consumed.
+   *
+   * This also sets some metrics for byte length of message, and number of messages.
+   * Lastly, adds tx attributes for byteCount and clientId
+   *
+   * @param {MessageShim} shim instance of shim
+   * @param {Array} args arguments passed to the `eachMessage` function of the `consumer.run`
+   * @returns {MessageSpec} spec for message handling
+   */
+  return function messageHandler(shim, args) {
+    recordMethodMetric({ agent: shim.agent, name: 'eachMessage' })
+    const [data] = args
+    const { topic } = data
+    const segment = shim.getActiveSegment()
+
+    if (segment?.transaction) {
+      const tx = segment.transaction
+      const byteLength = data?.message.value?.byteLength
+      const metricPrefix = `Message/Kafka/Topic/Named/${topic}/Received`
+      // This will always be 1
+      tx.metrics.getOrCreateMetric(`${metricPrefix}/Messages`).recordValue(1)
+      if (byteLength) {
+        tx.metrics.measureBytes(`${metricPrefix}/Bytes`, byteLength)
+        tx.trace.attributes.addAttribute(
+          DESTINATIONS.TRANS_SCOPE,
+          'kafka.consume.byteCount',
+          byteLength
+        )
+      }
+      if (consumer?.[kafkaCtx]) {
+        tx.trace.attributes.addAttribute(
+          DESTINATIONS.TRANS_EVENT,
+          'kafka.consume.client_id',
+          consumer[kafkaCtx].clientId
+        )
+      }
+    }
+
+    return new MessageSpec({
+      destinationType: `Topic/Consume`,
+      destinationName: data?.topic,
+      headers: data?.message?.headers
+    })
+  }
+}

package/lib/instrumentation/kafkajs/index.js

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2024 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+
+const instrumentProducer = require('./producer')
+const instrumentConsumer = require('./consumer')
+const { KAFKA } = require('../../metrics/names')
+
+module.exports = function initialize(agent, kafkajs, _moduleName, shim) {
+  if (agent.config.feature_flag.kafkajs_instrumentation === false) {
+    shim.logger.debug(
+      '`config.feature_flag.kafkajs_instrumentation is false, skipping instrumentation of kafkajs`'
+    )
+    return
+  }
+
+  shim.setLibrary(shim.KAFKA)
+  instrumentConsumer({ shim, kafkajs, recordMethodMetric })
+  instrumentProducer({ shim, kafkajs, recordMethodMetric })
+}
+
+/**
+ * Convenience method for logging the tracking metrics for producer and consumer
+ *
+ * @param {object} params to function
+ * @param {Agent} params.agent instance of agent
+ * @param {string} params.name name of function getting instrumented
+ */
+function recordMethodMetric({ agent, name }) {
+  agent.metrics.getOrCreateMetric(`${KAFKA.PREFIX}/${name}`).incrementCallCount()
+}

package/lib/instrumentation/kafkajs/producer.js

@@ -0,0 +1,74 @@
+/*
+ * Copyright 2024 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+
+const { MessageSpec } = require('../../shim/specs')
+const getByPath = require('../../util/get')
+
+module.exports = function instrumentProducer({ shim, kafkajs, recordMethodMetric }) {
+  const { agent } = shim
+  shim.wrap(kafkajs.Kafka.prototype, 'producer', function nrProducerWrapper(shim, orig) {
+    return function nrProducer() {
+      const params = shim.argsToArray.apply(shim, arguments)
+      const producer = orig.apply(this, params)
+
+      // The `.producer()` method returns an object with `send` and `sendBatch`
+      // methods. The `send` method is merely a wrapper around `sendBatch`, but
+      // we cannot simply wrap `sendBatch` because the `send` method does not
+      // use the object scoped instance (i.e. `this.sendBatch`); it utilizes
+      // the closure scoped instance of `sendBatch`. So we must wrap each
+      // method.
+
+      shim.recordProduce(producer, 'send', function nrSend(shim, fn, name, args) {
+        recordMethodMetric({ agent, name })
+        const data = args[0]
+        return new MessageSpec({
+          promise: true,
+          destinationName: data.topic,
+          destinationType: shim.TOPIC,
+          messageHeaders: (inject) => {
+            return data.messages.map((msg) => {
+              if (msg.headers) {
+                return inject(msg.headers)
+              }
+              msg.headers = {}
+              return inject(msg.headers)
+            })
+          }
+        })
+      })
+
+      shim.recordProduce(producer, 'sendBatch', function nrSendBatch(shim, fn, name, args) {
+        recordMethodMetric({ agent, name })
+        const data = args[0]
+        const firstMessage = getByPath(data, 'topicMessages[0].messages[0]')
+
+        if (firstMessage) {
+          firstMessage.headers = firstMessage.headers ?? {}
+        }
+
+        return new MessageSpec({
+          promise: true,
+          destinationName: data.topicMessages[0].topic,
+          destinationType: shim.TOPIC,
+          messageHeaders: (inject) => {
+            return data.topicMessages.map((tm) => {
+              return tm.messages.map((m) => {
+                if (m.headers) {
+                  return inject(m.headers)
+                }
+                m.headers = {}
+                return inject(m.headers)
+              })
+            })
+          }
+        })
+      })
+
+      return producer
+    }
+  })
+}

package/lib/instrumentation/kafkajs.js

@@ -0,0 +1,7 @@
+/*
+ * Copyright 2024 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+module.exports = require('./kafkajs/index')

package/lib/instrumentation/langchain/runnable.js

@@ -61,8 +61,7 @@ function instrumentInvokeChain({ langchain, shim }) {
       return new RecorderSpec({
         name: `${LANGCHAIN.CHAIN}/${fnName}`,
         promise: true,
-        // eslint-disable-next-line max-params
-        after(_shim, _fn, _name, err, output, segment) {
+        after({ error: err, result: output, segment }) {
           recordChatCompletionEvents({
             segment,
             messages: [output],
@@ -97,8 +96,7 @@ function instrumentStream({ langchain, shim }) {
       return new RecorderSpec({
         name: `${LANGCHAIN.CHAIN}/${fnName}`,
         promise: true,
-        // eslint-disable-next-line max-params
-        after(_shim, _fn, _name, err, output, segment) {
+        after({ error: err, result: output, segment }) {
           // Input error occurred which means a stream was not created.
           // Skip instrumenting streaming and create Llm Events from
           // the data we have

package/lib/instrumentation/langchain/tools.js

@@ -31,8 +31,7 @@ module.exports = function initialize(shim, tools) {
     return new RecorderSpec({
       name: `${LANGCHAIN.TOOL}/${name}`,
       promise: true,
-      // eslint-disable-next-line max-params
-      after(_shim, _fn, _name, err, output, segment) {
+      after({ error: err, result: output, segment }) {
         const metadata = mergeMetadata(instanceMeta, paramsMeta)
         const tags = mergeTags(instanceTags, paramsTags)
         segment.end()

package/lib/instrumentation/langchain/vectorstore.js

@@ -89,8 +89,7 @@ module.exports = function initialize(shim, vectorstores) {
       return new RecorderSpec({
         name: `${LANGCHAIN.VECTORSTORE}/${fnName}`,
         promise: true,
-        // eslint-disable-next-line max-params
-        after(_shim, _fn, _name, err, output, segment) {
+        after({ error: err, result: output, segment }) {
           if (!output) {
             // If we get an error, it is possible that `output = null`.
             // In that case, we define it to be an empty array.