newrelic 11.18.0 → 11.20.0

package/NEWS.md

@@ -1,36 +1,94 @@
-### 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.20.0 (2024-06-24)
+
+#### Features
+
+* Added support for Anthropic Claude 3 messages API ([#2278](https://github.com/newrelic/node-newrelic/pull/2278)) ([7e3cab9](https://github.com/newrelic/node-newrelic/commit/7e3cab9739a9924b904ce78380fd70b1e30cd89f))
+
+#### Code refactoring
+
+* Replaced instances of `substr()` with `substring()` ([#2274](https://github.com/newrelic/node-newrelic/pull/2274)) ([8f96c73](https://github.com/newrelic/node-newrelic/commit/8f96c734862d42f459dd4de8ed9d498ef7d693de))
+
+#### Documentation
+
+* Fixed typos in API jsdoc ([#2287](https://github.com/newrelic/node-newrelic/pull/2287)) ([7b3c8d1](https://github.com/newrelic/node-newrelic/commit/7b3c8d1445ea9876b36eda31d979dac9b65dad14))
+* Updated compatibility report ([#2285](https://github.com/newrelic/node-newrelic/pull/2285)) ([b1b5e3e](https://github.com/newrelic/node-newrelic/commit/b1b5e3e54074cc8b535927f4edad07925618260c))
+
+#### Miscellaneous chores
+
+* Added a missing library we instrument to be picked up by the compatibility report ([#2261](https://github.com/newrelic/node-newrelic/pull/2261)) ([6c964b2](https://github.com/newrelic/node-newrelic/commit/6c964b2029874353908486228113a468959b1597))
+* Added a script that generates Dashboard json for reporting on libraries by version ([#2267](https://github.com/newrelic/node-newrelic/pull/2267)) ([d2877c1](https://github.com/newrelic/node-newrelic/commit/d2877c17c7c2f4432b2ce4056c94200a2e7334b2))
+* Added AI support docs for automation ([#2249](https://github.com/newrelic/node-newrelic/pull/2249)) ([e2efc1f](https://github.com/newrelic/node-newrelic/commit/e2efc1fb202a3e87be710f352546a00df6bf6cef))
+* Fixed comment about transaction_tracer.transaction_threshold ([#2258](https://github.com/newrelic/node-newrelic/pull/2258)) ([7cd6aef](https://github.com/newrelic/node-newrelic/commit/7cd6aef7ecc32d8647f0313b36be368bfa14a0e9))
+* Made elastic versioned tests work on Node 16 ([#2284](https://github.com/newrelic/node-newrelic/pull/2284)) ([143b475](https://github.com/newrelic/node-newrelic/commit/143b4757c27d497a25d1b3c7fd56b32bcede619f))
+* Updated docker compose configuration ([#2268](https://github.com/newrelic/node-newrelic/pull/2268)) ([eb1cce9](https://github.com/newrelic/node-newrelic/commit/eb1cce9143fe87eed1bdd077471942f85cf14f21))
+* Updated GitHub Actions versions ([#2272](https://github.com/newrelic/node-newrelic/pull/2272)) ([07a841b](https://github.com/newrelic/node-newrelic/commit/07a841b9acf0a0dcb1a495c5cb0ee8f77e283fc9))
+* Updated mysql tests to use MySQL 8.3 ([#2280](https://github.com/newrelic/node-newrelic/pull/2280)) ([11e0f8c](https://github.com/newrelic/node-newrelic/commit/11e0f8cf63a5f792419382635496a29c0286c737))
+* Updated mysql2 tests to fix CI issue ([#2282](https://github.com/newrelic/node-newrelic/pull/2282)) ([5a37971](https://github.com/newrelic/node-newrelic/commit/5a37971b03fe8d69b39db66d97ecfc1176c42902))
+* Updated versioned security agent workflow with simpler setup ([#2259](https://github.com/newrelic/node-newrelic/pull/2259)) ([a886187](https://github.com/newrelic/node-newrelic/commit/a886187bf1bf29d2430e38223d0215436e006540))
+
+#### Continuous integration
+
+* Added ability to run a build step in create release ([#2273](https://github.com/newrelic/node-newrelic/pull/2273)) ([4c2f24c](https://github.com/newrelic/node-newrelic/commit/4c2f24cb6e94dd05f269998eeb763196c3fac274))
+* Updated security agent workflow to use large runners when available ([#2271](https://github.com/newrelic/node-newrelic/pull/2271)) ([181ec1b](https://github.com/newrelic/node-newrelic/commit/181ec1bfa8d420514fca3d6de6c3989e796a29db))
+* Updated security agent workflow to use large runners when available ([#2270](https://github.com/newrelic/node-newrelic/pull/2270)) ([761fcd5](https://github.com/newrelic/node-newrelic/commit/761fcd5ca5ae32ba922d0880979dbfff97604641))
+
+### 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/api.js

@@ -244,14 +244,14 @@ API.prototype.setControllerName = function setControllerName(name, action) {
 }
 
 /**
- * Add a custom attribute to the current transaction. Some attributes are
+ * Add a custom attribute to the current transaction and span. Some attributes are
  * reserved (see CUSTOM_DENYLIST for the current, very short list), and
  * as with most API methods, this must be called in the context of an
  * active transaction. Most recently set value wins.
  *
  * @param {string} key  The key you want displayed in the RPM UI.
  * @param {string} value The value you want displayed. Must be serializable.
- * @returns {false|undefined} Retruns false when disabled/errored, otherwise undefined
+ * @returns {false|undefined} Returns false when disabled/errored, otherwise undefined
  */
 API.prototype.addCustomAttribute = function addCustomAttribute(key, value) {
   const metric = this.agent.metrics.getOrCreateMetric(
@@ -298,7 +298,7 @@ API.prototype.addCustomAttribute = function addCustomAttribute(key, value) {
 }
 
 /**
- * Adds all custom attributes in an object to the current transaction.
+ * Adds all custom attributes in an object to the current transaction and span.
  *
  * See documentation for newrelic.addCustomAttribute for more information on
  * setting custom attributes.
@@ -360,7 +360,7 @@ API.prototype.addCustomSpanAttributes = function addCustomSpanAttributes(atts) {
  *
  * @param {string} key  The key you want displayed in the RPM UI.
  * @param {string} value The value you want displayed. Must be serializable.
- * @returns {false|undefined} Retruns false when disabled/errored, otherwise undefined
+ * @returns {false|undefined} Returns false when disabled/errored, otherwise undefined
  */
 API.prototype.addCustomSpanAttribute = function addCustomSpanAttribute(key, value) {
   const metric = this.agent.metrics.getOrCreateMetric(
@@ -807,7 +807,7 @@ API.prototype.getBrowserTimingHeader = function getBrowserTimingHeader(options =
      * Only the first 13 chars of the license should be used for hashing with
      * the transaction name.
      */
-    const key = config.license_key.substr(0, 13)
+    const key = config.license_key.substring(0, 13)
     rumHash.transactionName = hashes.obfuscateNameUsingKey(name, key)
 
     rumHash.queueTime = trans.queueTime
@@ -938,7 +938,7 @@ API.prototype.startSegment = function startSegment(name, record, handler, callba
  * })
  * @param {string} url
  *  The URL of the transaction.  It is used to name and group related transactions in APM,
- *  so it should be a generic name and not iclude any variable parameters.
+ *  so it should be a generic name and not include any variable parameters.
  * @param {Function}  handle
  *  Function that represents the transaction work.
  * @returns {null|*} Returns null if handle is not a function, otherwise the return value of handle
@@ -1026,7 +1026,7 @@ API.prototype.startBackgroundTransaction = startBackgroundTransaction
  * })
  * @param {string} name
  *  The name of the transaction. It is used to name and group related
- *  transactions in APM, so it should be a generic name and not iclude any
+ *  transactions in APM, so it should be a generic name and not include any
  *  variable parameters.
  * @param {string} [group]
  *  Optional, used for grouping background transactions in APM. For more
@@ -1297,14 +1297,14 @@ API.prototype.recordCustomEvent = function recordCustomEvent(eventType, attribut
   // Filter all object type valued attributes out
   const filteredAttributes = _filterAttributes(attributes, `${eventType} custom event`)
 
-  const instrinics = {
+  const intrinsics = {
     type: eventType,
     timestamp: Date.now()
   }
 
   const tx = this.agent.getTransaction()
   const priority = (tx && tx.priority) || Math.random()
-  this.agent.customEventAggregator.add([instrinics, filteredAttributes], priority)
+  this.agent.customEventAggregator.add([intrinsics, filteredAttributes], priority)
 }
 
 /**
@@ -1342,7 +1342,7 @@ API.prototype.instrument = function instrument(moduleName, onRequire, onError) {
  * Registers an instrumentation function.
  *
  * - `newrelic.instrumentConglomerate(moduleName, onRequire [, onError])`
- * - `newrelic.isntrumentConglomerate(options)`
+ * - `newrelic.instrumentConglomerate(options)`
  *
  * @param {string|object} moduleName The module name given to require to load the module, or the instrumentation specification
  * @param {string} moduleName.moduleName The module name given to require to load the module

package/lib/config/attribute-filter.js

@@ -367,7 +367,7 @@ function _convertRulesToRegex(rules) {
           if (i !== r.length - 1) {
             v += '.'
           } else if (/\\\*$/.test(v)) {
-            v = v.substr(0, v.length - 2)
+            v = v.substring(0, v.length - 2)
           }
 
           const idx = c.findIndex(function findV(a) {

package/lib/config/default.js

@@ -519,12 +519,12 @@ defaultConfig.definition = () => ({
       env: 'NEW_RELIC_TRACER_ENABLED'
     },
     /**
-     * The duration at below which the slow transaction tracer should collect a
-     * transaction trace. If set to 'apdex_f', the threshold will be set to
+     * Sets the time, in seconds, for a transaction to be considered slow.
+     * When a transaction exceeds this threshold, a transaction trace will be recorded. When set to 'apdex_f', the threshold will be set to
      * 4 * apdex_t, which with a default apdex_t value of 500 milliseconds will
      * be 2 seconds.
      *
-     * If a time is provided, it is set in seconds.
+     * If a number is provided, it is set in seconds.
      */
     transaction_threshold: {
       formatter: float,

package/lib/feature_flags.js

@@ -15,7 +15,8 @@ exports.prerelease = {
   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/amqplib/amqplib.js

@@ -289,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)

package/lib/instrumentation/aws-sdk/util.js

@@ -14,7 +14,7 @@ function grabLastUrlSegment(url = '/') {
   // string for null, undefined, NaN etc.
   url = '' + (url || '/')
   const lastSlashIndex = url.lastIndexOf('/')
-  return url.substr(lastSlashIndex + 1)
+  return url.substring(lastSlashIndex + 1)
 }
 
 /**

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/instrumentations.js

@@ -29,6 +29,7 @@ module.exports = function instrumentations() {
     'fastify': { type: InstrumentationDescriptor.TYPE_WEB_FRAMEWORK },
     'generic-pool': { type: InstrumentationDescriptor.TYPE_GENERIC },
     'ioredis': { type: InstrumentationDescriptor.TYPE_DATASTORE },
+    'kafkajs': { type: InstrumentationDescriptor.TYPE_MESSAGE },
     'koa': { module: './instrumentation/koa' },
     'langchain': { module: './instrumentation/langchain' },
     'memcached': { type: InstrumentationDescriptor.TYPE_DATASTORE },

package/lib/llm-events/aws-bedrock/bedrock-command.js

@@ -35,7 +35,7 @@ class BedrockCommand {
       result = this.#body.maxTokens
     } else if (this.isClaude() === true) {
       result = this.#body.max_tokens_to_sample
-    } else if (this.isCohere() === true) {
+    } else if (this.isClaude3() === true || this.isCohere() === true) {
       result = this.#body.max_tokens
     } else if (this.isLlama2() === true) {
       result = this.#body.max_gen_length
@@ -83,6 +83,11 @@ class BedrockCommand {
       this.isLlama2() === true
     ) {
       result = this.#body.prompt
+    } else if (this.isClaude3() === true) {
+      result = this.#body?.messages?.reduce((acc, curr) => {
+        acc += curr?.content ?? ''
+        return acc
+      }, '')
     }
     return result
   }
@@ -96,6 +101,7 @@ class BedrockCommand {
       result = this.#body.textGenerationConfig?.temperature
     } else if (
       this.isClaude() === true ||
+      this.isClaude3() === true ||
       this.isAi21() === true ||
       this.isCohere() === true ||
       this.isLlama2() === true
@@ -110,7 +116,11 @@ class BedrockCommand {
   }
 
   isClaude() {
-    return this.#modelId.startsWith('anthropic.claude')
+    return this.#modelId.startsWith('anthropic.claude-v')
+  }
+
+  isClaude3() {
+    return this.#modelId.startsWith('anthropic.claude-3')
   }
 
   isCohere() {

package/lib/llm-events/aws-bedrock/bedrock-response.js

@@ -30,10 +30,12 @@ class BedrockResponse {
   #completions = []
   #id
 
+  /* eslint-disable sonarjs/cognitive-complexity */
   /**
    * @param {object} params
    * @param {AwsBedrockMiddlewareResponse} params.response
    * @param {BedrockCommand} params.bedrockCommand
+   * @param params.isError
    */
   constructor({ response, bedrockCommand, isError = false }) {
     this.#innerResponse = isError ? response.$response : response.response
@@ -57,6 +59,14 @@ class BedrockResponse {
     } else if (cmd.isClaude() === true) {
       // TODO: can we make this thing give more than one completion?
       body.completion && this.#completions.push(body.completion)
+    } else if (cmd.isClaude3() === true) {
+      if (body?.type === 'message_stop') {
+        // Streamed response
+        this.#completions = body.completions
+      } else {
+        this.#completions = body?.content?.map((c) => c.text)
+      }
+      this.#id = body.id
     } else if (cmd.isCohere() === true) {
       this.#completions = body.generations?.map((g) => g.text) ?? []
       this.#id = body.id
@@ -66,6 +76,7 @@ class BedrockResponse {
       this.#completions = body.results?.map((r) => r.outputText) ?? []
     }
   }
+  /* eslint-enable sonarjs/cognitive-complexity */
 
   /**
    * The prompt responses returned by the model.
@@ -92,7 +103,7 @@ class BedrockResponse {
     const cmd = this.#command
     if (cmd.isAi21() === true) {
       result = this.#parsedBody.completions?.[0]?.finishReason.reason
-    } else if (cmd.isClaude() === true) {
+    } else if (cmd.isClaude() === true || cmd.isClaude3() === true) {
       result = this.#parsedBody.stop_reason
     } else if (cmd.isCohere() === true) {
       result = this.#parsedBody.generations?.find((r) => r.finish_reason !== null)?.finish_reason

package/lib/llm-events/aws-bedrock/stream-handler.js

@@ -105,6 +105,9 @@ class StreamHandler {
     if (bedrockCommand.isClaude() === true) {
       this.stopReasonKey = 'stop_reason'
       this.generator = handleClaude
+    } else if (bedrockCommand.isClaude3() === true) {
+      this.stopReasonKey = 'stop_reason'
+      this.generator = handleClaude3
     } else if (bedrockCommand.isCohere() === true) {
       this.stopReasonKey = 'generations.0.finish_reason'
       this.generator = handleCohere
@@ -207,6 +210,31 @@ async function* handleClaude() {
   }
 }
 
+async function* handleClaude3() {
+  let currentBody = {}
+  let stopReason
+  const completions = []
+
+  try {
+    for await (const event of this.stream) {
+      yield event
+      const parsed = this.parseEvent(event)
+      this.updateHeaders(parsed)
+      currentBody = parsed
+      if (parsed.type === 'content_block_delta') {
+        completions.push(parsed.delta.text)
+      } else if (parsed.type === 'message_delta') {
+        stopReason = parsed.delta.stop_reason
+      }
+    }
+  } finally {
+    currentBody.completions = completions
+    currentBody.stop_reason = stopReason
+    this.response.output.body = currentBody
+    this.finish()
+  }
+}
+
 async function* handleCohere() {
   let currentBody = {}
   const generations = []

package/lib/metrics/names.js

@@ -340,54 +340,59 @@ const LOGGING = {
   LOCAL_DECORATING: `${SUPPORTABILITY.LOGGING}/LocalDecorating/${NODEJS.PREFIX}`
 }
 
+const KAFKA = {
+  PREFIX: `${SUPPORTABILITY.FEATURES}/Instrumentation/kafkajs`
+}
+
 module.exports = {
   ACTION_DELIMITER: '/',
   AI,
-  ALL: ALL,
+  ALL,
   APDEX: 'Apdex',
-  CASSANDRA: CASSANDRA,
+  CASSANDRA,
   CLIENT_APPLICATION: 'ClientApplication',
   CONTROLLER: 'Controller',
-  CPU: CPU,
+  CPU,
   CUSTOM: 'Custom',
-  CUSTOM_EVENTS: CUSTOM_EVENTS,
+  CUSTOM_EVENTS,
   DATA_USAGE,
-  DB: DB,
+  DB,
   DISTRIBUTED_TRACE,
-  ERRORS: ERRORS,
-  EVENTS: EVENTS,
-  EVENT_HARVEST: EVENT_HARVEST,
-  EXPRESS: EXPRESS,
-  EXTERNAL: EXTERNAL,
+  ERRORS,
+  EVENTS,
+  EVENT_HARVEST,
+  EXPRESS,
+  EXTERNAL,
   FEATURES,
-  FS: FS,
-  FUNCTION: FUNCTION,
-  GC: GC,
-  HAPI: HAPI,
+  FS,
+  FUNCTION,
+  GC,
+  HAPI,
   HTTP: 'HttpDispatcher',
-  INFINITE_TRACING: INFINITE_TRACING,
-  LOOP: LOOP,
+  INFINITE_TRACING,
+  KAFKA,
+  LOOP,
   LOGGING,
-  MEMCACHE: MEMCACHE,
-  MEMORY: MEMORY,
-  MESSAGE_TRANSACTION: MESSAGE_TRANSACTION,
-  MIDDLEWARE: MIDDLEWARE,
-  MONGODB: MONGODB,
-  MYSQL: MYSQL,
-  NODEJS: NODEJS,
+  MEMCACHE,
+  MEMORY,
+  MESSAGE_TRANSACTION,
+  MIDDLEWARE,
+  MONGODB,
+  MYSQL,
+  NODEJS,
   NORMALIZED: 'NormalizedUri',
-  OTHER_TRANSACTION: OTHER_TRANSACTION,
-  POSTGRES: POSTGRES,
+  OTHER_TRANSACTION,
+  POSTGRES,
+  PRISMA,
   QUEUETIME: 'WebFrontend/QueueTime',
-  REDIS: REDIS,
-  RESTIFY: RESTIFY,
-  SPAN_EVENTS: SPAN_EVENTS,
-  SUPPORTABILITY: SUPPORTABILITY,
-  TRANSACTION_ERROR: TRANSACTION_ERROR,
-  TRUNCATED: TRUNCATED,
+  REDIS,
+  RESTIFY,
+  SPAN_EVENTS,
+  SUPPORTABILITY,
+  TRANSACTION_ERROR,
+  TRUNCATED,
   URI: 'Uri',
-  UTILIZATION: UTILIZATION,
-  VIEW: VIEW,
-  WEB: WEB,
-  PRISMA: PRISMA
+  UTILIZATION,
+  VIEW,
+  WEB
 }

package/lib/shim/datastore-shim.js

@@ -376,10 +376,10 @@ function parseQuery(query, nodule) {
   // strip enclosing special characters from collection (table) name
   if (typeof collection === 'string' && collection.length > 2) {
     if (/^[\[{'"`]/.test(collection)) {
-      collection = collection.substr(1)
+      collection = collection.substring(1)
     }
     if (/[\]}'"`]$/.test(collection)) {
-      collection = collection.substr(0, collection.length - 1)
+      collection = collection.substring(0, collection.length - 1)
     }
   }
 

package/lib/shim/message-shim/index.js

@@ -246,6 +246,16 @@ function recordProduce(nodule, properties, recordNamer) {
       if (msgDesc.headers) {
         shim.insertCATRequestHeaders(msgDesc.headers, true)
       }
+
+      if (msgDesc.messageHeaders) {
+        // Some message broker clients, like kafkajs, allow for sending multiple
+        // messages in one send. Clients are likely to pick up such messages
+        // individually. Thus, we need to propagate any distributed trace
+        // headers to every message in the payload.
+        msgDesc.messageHeaders((headers, altNames = true) => {
+          shim.insertCATRequestHeaders(headers, altNames)
+        })
+      }
     }
     msgDesc.recorder = genericRecorder
     return msgDesc

package/lib/shim/message-shim/subscribe-consume.js

@@ -56,13 +56,25 @@ function createSubscriberWrapper({ shim, fn, spec, destNameIsArg }) {
       }
     }
 
-    if (consumerIdx !== null) {
+    if (consumerIdx !== null && !spec.functions) {
       args[consumerIdx] = shim.wrap(
         args[consumerIdx],
         makeWrapConsumer({ spec, queue, destinationName, destNameIsArg })
       )
     }
 
+    if (consumerIdx !== null && spec.functions) {
+      spec.functions.forEach((name) => {
+        // only wrap the function if it exists on consumer
+        if (args[consumerIdx][name]) {
+          args[consumerIdx][name] = shim.wrap(
+            args[consumerIdx][name],
+            makeWrapConsumer({ spec, queue, destinationName, destNameIsArg })
+          )
+        }
+      })
+    }
+
     return fn.apply(this, args)
   }
 }

package/lib/shim/specs/message-subscribe.js

@@ -27,6 +27,30 @@ class MessageSubscribeSpec extends MessageSpec {
    */
   consumer
 
+  /**
+   * Indicates names of functions to be wrapped for message consumption.
+   * This must be used in tandem with consumer.
+   * @type {Array<string>|null}
+   * @example
+   * // Wrap the eachMessage method on a consumer
+   * class Consumer() {
+   *  constructor() {}
+   *  async run(consumer) {
+   *    consumer.eachMessage({ message })
+   *  }
+   * }
+   *
+   * const spec = new MessageSubscribeSpec({
+   *  name: 'Consumer#run'
+   *  promise: true
+   *  consumer: shim.FIRST,
+   *  functions: ['eachMessage']
+   * })
+   *
+   * shim.recordSubscribedConsume(Consumer.prototype, 'run', spec)
+   */
+  functions
+
   /* eslint-disable jsdoc/require-param-description */
   /**
    * @param {MessageSubscribeSpecParams} params
@@ -35,6 +59,7 @@ class MessageSubscribeSpec extends MessageSpec {
     super(params)
 
     this.consumer = params.consumer ?? null
+    this.functions = Array.isArray(params.functions) ? params.functions : null
   }
 }
 

package/lib/shim/specs/message.js

@@ -14,11 +14,23 @@ const OperationSpec = require('./operation')
  * @property {number|string} [destinationName]
  * @property {string|null} [destinationType]
  * @property {Object<string, string>|null} [headers]
+ * @property {MessageBrokerHeadersFn|null} [messageHeaders]
  * @property {MessageHandlerFunction|null} [messageHandler]
  * @property {number|string|null} [queue]
  * @property {string|null} [routingKey]
  */
 
+/**
+ * @typedef {Function} MessageBrokerHeadersFn
+ * @param {Function} inject A function with the signature
+ * `function(headers, useAlternateHeaderNames)`. The passed in headers object
+ * will be updated with distributed trace headers. When the second parameter
+ * is `true` (the default), alternate style (not HTTP style) header names will
+ * be used, i.e. names that are safe for non-HTTP transports.
+ * @returns {object[]} An array of objects, wherein each object will be updated
+ * with distributed trace headers.
+ */
+
 /**
  * Spec that describes how to instrument a message broker.
  */
@@ -46,6 +58,16 @@ class MessageSpec extends OperationSpec {
    */
   headers
 
+  /**
+   * Function that returns an iterable set of message header objects. The
+   * header objects will be modified to include distributed tracing headers so
+   * that they will be included in the payloads delivered, and read from, the
+   * message broker.
+   *
+   * @type {MessageBrokerHeadersFn}
+   */
+  messageHeaders
+
   /**
    * A function to handle the result of the instrumented message broker
    * function.
@@ -81,6 +103,7 @@ class MessageSpec extends OperationSpec {
     this.destinationName = params.destinationName ?? null
     this.destinationType = params.destinationType ?? null
     this.headers = params.headers ?? null
+    this.messageHeaders = params.messageHeaders ?? null
     this.messageHandler = params.messageHandler ?? null
     this.queue = params.queue ?? null
     this.routingKey = params.routingKey ?? null

package/lib/symbols.js

@@ -11,6 +11,7 @@ module.exports = {
   databaseName: Symbol('databaseName'),
   disableDT: Symbol('Disable distributed tracing'), // description for backwards compatibility
   executorContext: Symbol('executorContext'),
+  kafkaCtx: Symbol('kafkaCtx'),
   koaBody: Symbol('body'),
   koaBodySet: Symbol('bodySet'),
   koaRouter: Symbol('koaRouter'),

package/lib/transaction/name-state.js

@@ -187,7 +187,7 @@ NameState.prototype.getPath = function getPath() {
       if (a[0] !== '/' && path[path.length - 1] !== '/') {
         path += '/'
       } else if (a[0] === '/' && path[path.length - 1] === '/') {
-        a = a.substr(1)
+        a = a.substring(1)
       }
       path += a
     }

package/lib/transaction/tracecontext.js

@@ -313,6 +313,9 @@ class TraceContext {
       return traceParentInfo
     }
 
+    if (Buffer.isBuffer(traceparent)) {
+      traceparent = traceparent.toString()
+    }
     const trimmed = traceparent.trim()
     const parts = trimmed.split('-')
 
@@ -445,10 +448,14 @@ class TraceContext {
   }
 
   _parseTraceState(params) {
-    const { tracestate, hasTrustKey, expectedNrKey } = params
+    const { hasTrustKey, expectedNrKey } = params
+    let { tracestate } = params
     let nrTraceStateValue = null
     const finalListMembers = []
     const vendors = []
+    if (Buffer.isBuffer(tracestate)) {
+      tracestate = tracestate.toString()
+    }
     const incomingListMembers = tracestate.split(',')
     for (let i = 0; i < incomingListMembers.length; i++) {
       const listMember = incomingListMembers[i].trim()

package/lib/util/hashes.js

@@ -41,7 +41,8 @@ function calculatePathHash(appName, pathName, referingPathHash) {
   const result = (rotated ^ hash) >>> 0
 
   // This is a trick to pad it out to 8 chars regardless of length.
-  return ('00000000' + result.toString(16)).substr(-8)
+  const str = '00000000' + result.toString(16)
+  return str.substring(str.length - 8)
 }
 
 function getHash(appName, txName) {
@@ -78,7 +79,7 @@ function int32ToByteArray(int32) {
 // Lookup table for converting byte values to hex
 const byteToHex = []
 for (let i = 0; i < 256; ++i) {
-  byteToHex[i] = (i + 0x100).toString(16).substr(1)
+  byteToHex[i] = (i + 0x100).toString(16).substring(1)
 }
 
 function makeId(length = 16) {

package/lib/utilization/docker-info.js

@@ -41,7 +41,7 @@ module.exports.getBootId = function getBootId(agent, callback) {
     if (data.length !== 36) {
       bootIdError()
       if (data.length > 128) {
-        data = data.substr(0, 128)
+        data = data.substring(0, 128)
       }
     }
 

package/lib/utilization/gcp-info.js

@@ -54,8 +54,10 @@ function fetchGCPInfo(agent, callback) {
         agent.metrics.getOrCreateMetric(NAMES.UTILIZATION.GCP_ERROR).incrementCallCount()
       } else {
         // normalize
-        results.machineType = results.machineType.substr(results.machineType.lastIndexOf('/') + 1)
-        results.zone = results.zone.substr(results.zone.lastIndexOf('/') + 1)
+        results.machineType = results.machineType.substring(
+          results.machineType.lastIndexOf('/') + 1
+        )
+        results.zone = results.zone.substring(results.zone.lastIndexOf('/') + 1)
 
         resultDict = results
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newrelic",
-  "version": "11.18.0",
+  "version": "11.20.0",
   "author": "New Relic Node.js agent team <nodejs@newrelic.com>",
   "license": "Apache-2.0",
   "contributors": [
@@ -155,7 +155,7 @@
   "scripts": {
     "bench": "node ./bin/run-bench.js",
     "docker-env": "./bin/docker-env-vars.sh",
-    "docs": "npm ci && jsdoc -c ./jsdoc-conf.json --private -r .",
+    "docs": "rm -rf ./out && jsdoc -c ./jsdoc-conf.jsonc --private -r .",
     "integration": "npm run prepare-test && npm run sub-install && time c8 -o ./coverage/integration tap --test-regex='(\\/|^test\\/integration\\/.*\\.tap\\.js)$' --timeout=600 --no-coverage --reporter classic",
     "integration:esm": "time c8 -o ./coverage/integration-esm tap --node-arg='--loader=./esm-loader.mjs' --test-regex='(test\\/integration\\/.*\\.tap\\.mjs)$' --timeout=600 --no-coverage --reporter classic",
     "prepare-test": "npm run ssl && npm run docker-env",
@@ -163,7 +163,8 @@
     "lint:fix": "eslint --fix, ./*.{js,mjs} lib test bin examples",
     "public-docs": "jsdoc -c ./jsdoc-conf.jsonc && cp examples/shim/*.png out/",
     "publish-docs": "./bin/publish-docs.sh",
-    "services": "docker compose up -d --wait",
+    "services": "DOCKER_PLATFORM=linux/$(uname -m) docker compose up -d --wait",
+    "services:stop": "docker compose down",
     "smoke": "npm run ssl && time tap test/smoke/**/**/*.tap.js --timeout=180 --no-coverage",
     "ssl": "./bin/ssl.sh",
     "sub-install": "node test/bin/install_sub_deps",
@@ -194,7 +195,7 @@
     "@grpc/grpc-js": "^1.9.4",
     "@grpc/proto-loader": "^0.7.5",
     "@newrelic/ritm": "^7.2.0",
-    "@newrelic/security-agent": "^1.1.1",
+    "@newrelic/security-agent": "^1.3.0",
     "@tyriar/fibonacci-heap": "^2.0.7",
     "concat-stream": "^2.0.0",
     "https-proxy-agent": "^7.0.1",
@@ -246,19 +247,16 @@
     "koa-router": "^12.0.1",
     "lint-staged": "^11.0.0",
     "lockfile-lint": "^4.9.6",
-    "memcached": ">=0.2.8",
     "nock": "11.8.0",
     "proxy": "^2.1.1",
     "proxyquire": "^1.8.0",
-    "q": "*",
     "rfdc": "^1.3.1",
     "rimraf": "^2.6.3",
     "should": "*",
     "sinon": "^4.5.0",
     "superagent": "^9.0.1",
     "tap": "^16.3.4",
-    "temp": "^0.8.1",
-    "when": "*"
+    "temp": "^0.8.1"
   },
   "repository": {
     "type": "git",