newrelic 13.18.0 → 13.19.1

package/NEWS.md

@@ -1,3 +1,44 @@
+### v13.19.1 (2026-04-15)
+
+#### Bug fixes
+
+* Fixed detecting AWS SDK message attributes presence ([#3903](https://github.com/newrelic/node-newrelic/pull/3903)) ([e81dc61](https://github.com/newrelic/node-newrelic/commit/e81dc61924f756f8edf5b7ce0770840cdc435d76))
+
+#### Tests 
+
+* Updated `minAgentVersion` for Anthropic versioned tests ([#3900](https://github.com/newrelic/node-newrelic/pull/3900)) ([e1f6c32](https://github.com/newrelic/node-newrelic/commit/e1f6c3295627126dad9333a58a83084312370c5b))
+* Reorganized the test utilities in AWS versioned tests ([#3895](https://github.com/newrelic/node-newrelic/pull/3895)) ([3025571](https://github.com/newrelic/node-newrelic/commit/3025571741c71d8a41968a0c06a412f5a9689bad))
+
+### v13.19.0 (2026-04-13)
+
+#### Features
+* Added instrumentation support for `@anthropic-ai/sdk` ([#3881](https://github.com/newrelic/node-newrelic/pull/3881)) ([e8713bb](https://github.com/newrelic/node-newrelic/commit/e8713bbe43d181ea96a33ccd6b241532e41206f4))
+* Updated OTel DB attributes to stable names from semantic conventions 1.40.0 ([#3826](https://github.com/newrelic/node-newrelic/pull/3826)) ([6d3000d](https://github.com/newrelic/node-newrelic/commit/6d3000d8dd699bdf5f3ecf4b4a18b28990234486))
+* Added distributed tracing propagation to SNS ([#3893](https://github.com/newrelic/node-newrelic/pull/3893)) ([8fc1144](https://github.com/newrelic/node-newrelic/commit/8fc11445122181f60404b7a75c35d2d914b0c5d0))
+
+#### Code refactoring
+
+* Refactor `@aws-sdk` v3 instrumentation to subscribe to events emitted
+	* Added `@aws-sdk/smithy-client` subscriber ([#3877](https://github.com/newrelic/node-newrelic/pull/3877)) ([0e350fc](https://github.com/newrelic/node-newrelic/commit/0e350fc92156b73928f37e6d32be0c3ea823d3e4))
+	* Added `@smithy/smithy-client` `send` subscriber with AWS Bedrock Middleware ([#3864](https://github.com/newrelic/node-newrelic/pull/3864)) ([5e0a6d1](https://github.com/newrelic/node-newrelic/commit/5e0a6d1cdbfbcc90d397c14e34e82ae86cb101b5))
+	* Moved generic AWS `Client` middleware to subscriber ([#3889](https://github.com/newrelic/node-newrelic/pull/3889)) ([3cb1e1b](https://github.com/newrelic/node-newrelic/commit/3cb1e1bf6818d63475f132979e7e4c965ba7add5))
+	* Updated `aws-sdk/dynamodb` instrumentation to a subscriber middleware ([#3891](https://github.com/newrelic/node-newrelic/pull/3891)) ([ff677a2](https://github.com/newrelic/node-newrelic/commit/ff677a26a62d4af80de7c92a238a0591a012485d))
+	* Updated aws sdk v3 instrumentation to split out bedrock utilities from actual wrapped middleware ([#3883](https://github.com/newrelic/node-newrelic/pull/3883)) ([eed340e](https://github.com/newrelic/node-newrelic/commit/eed340eb6bd66e1821a4f3659fe16e376555fd37))
+	* Updated Lambda instrumentation to a subscriber middleware ([#3890](https://github.com/newrelic/node-newrelic/pull/3890)) ([12f8284](https://github.com/newrelic/node-newrelic/commit/12f8284b2946101f295e7fabe439c7db8afb161d))
+	* Refactored SNS instrumentation to subscriber type ([#3876](https://github.com/newrelic/node-newrelic/pull/3876)) ([b9f3326](https://github.com/newrelic/node-newrelic/commit/b9f332644755c8bf89a88f8c786e642797cecf70))
+	* Refactored SQS instrumentation to subscriber type ([#3880](https://github.com/newrelic/node-newrelic/pull/3880)) ([de46dee](https://github.com/newrelic/node-newrelic/commit/de46deed6d9e1673e7504b5f48b5836d2c244a68))
+* Refactored `LlmErrorMessage` to use vendor-specific subclasses ([#3882](https://github.com/newrelic/node-newrelic/pull/3882)) ([5b0fd2b](https://github.com/newrelic/node-newrelic/commit/5b0fd2ba21a68ab678e05e1bb3533e1547c1f1d5))
+* Refactored `amqplib` to use message broker constants ([#3879](https://github.com/newrelic/node-newrelic/pull/3879)) ([77621fb](https://github.com/newrelic/node-newrelic/commit/77621fbb33169bad90165de95f11c3c4a1b7fc94))
+
+#### Documentation
+
+* Updated compatibility report ([#3874](https://github.com/newrelic/node-newrelic/pull/3874)) ([ae887c4](https://github.com/newrelic/node-newrelic/commit/ae887c42241dad86d222bd31c44b36af8e5ac76f))
+
+#### Miscellaneous chores
+
+* Updated `@apm-js-collab/tracing-hooks` to `0.6.0` ([#3884](https://github.com/newrelic/node-newrelic/pull/3884)) ([f6ef470](https://github.com/newrelic/node-newrelic/commit/f6ef470378445180bcd2fc12f5972df868bb74e5))
+* Updated Undici tests to cover version 8 ([#3896](https://github.com/newrelic/node-newrelic/pull/3896)) ([f27e75f](https://github.com/newrelic/node-newrelic/commit/f27e75fcb1cd5b87a3908f1e0f99cd2eb1eaae37))
+
 ### v13.18.0 (2026-03-30)
 
 #### Features

package/THIRD_PARTY_NOTICES.md

@@ -95,7 +95,7 @@ code, the source code can be found at [https://github.com/newrelic/node-newrelic
 
 ### @apm-js-collab/tracing-hooks
 
-This product includes source derived from [@apm-js-collab/tracing-hooks](https://github.com/apm-js-collab/tracing-hooks) ([v0.3.1](https://github.com/apm-js-collab/tracing-hooks/tree/v0.3.1)), distributed under the [Apache-2.0 License](https://github.com/apm-js-collab/tracing-hooks/blob/v0.3.1/LICENSE):
+This product includes source derived from [@apm-js-collab/tracing-hooks](https://github.com/apm-js-collab/tracing-hooks) ([v0.6.0](https://github.com/apm-js-collab/tracing-hooks/tree/v0.6.0)), distributed under the [Apache-2.0 License](https://github.com/apm-js-collab/tracing-hooks/blob/v0.6.0/LICENSE):
 
 ```
 
@@ -978,7 +978,7 @@ This product includes source derived from [@opentelemetry/api-logs](https://gith
 
 ### @opentelemetry/api
 
-This product includes source derived from [@opentelemetry/api](https://github.com/open-telemetry/opentelemetry-js) ([v1.9.0](https://github.com/open-telemetry/opentelemetry-js/tree/v1.9.0)), distributed under the [Apache-2.0 License](https://github.com/open-telemetry/opentelemetry-js/blob/v1.9.0/LICENSE):
+This product includes source derived from [@opentelemetry/api](https://github.com/open-telemetry/opentelemetry-js) ([v1.9.1](https://github.com/open-telemetry/opentelemetry-js/tree/v1.9.1)), distributed under the [Apache-2.0 License](https://github.com/open-telemetry/opentelemetry-js/blob/v1.9.1/LICENSE):
 
 ```
                                  Apache License
@@ -1187,7 +1187,7 @@ This product includes source derived from [@opentelemetry/api](https://github.co
 
 ### @opentelemetry/core
 
-This product includes source derived from [@opentelemetry/core](https://github.com/open-telemetry/opentelemetry-js) ([v2.5.1](https://github.com/open-telemetry/opentelemetry-js/tree/v2.5.1)), distributed under the [Apache-2.0 License](https://github.com/open-telemetry/opentelemetry-js/blob/v2.5.1/LICENSE):
+This product includes source derived from [@opentelemetry/core](https://github.com/open-telemetry/opentelemetry-js) ([v2.6.1](https://github.com/open-telemetry/opentelemetry-js/tree/v2.6.1)), distributed under the [Apache-2.0 License](https://github.com/open-telemetry/opentelemetry-js/blob/v2.6.1/LICENSE):
 
 ```
                                  Apache License
@@ -1605,7 +1605,7 @@ This product includes source derived from [@opentelemetry/exporter-metrics-otlp-
 
 ### @opentelemetry/resources
 
-This product includes source derived from [@opentelemetry/resources](https://github.com/open-telemetry/opentelemetry-js) ([v2.5.1](https://github.com/open-telemetry/opentelemetry-js/tree/v2.5.1)), distributed under the [Apache-2.0 License](https://github.com/open-telemetry/opentelemetry-js/blob/v2.5.1/LICENSE):
+This product includes source derived from [@opentelemetry/resources](https://github.com/open-telemetry/opentelemetry-js) ([v2.6.1](https://github.com/open-telemetry/opentelemetry-js/tree/v2.6.1)), distributed under the [Apache-2.0 License](https://github.com/open-telemetry/opentelemetry-js/blob/v2.6.1/LICENSE):
 
 ```
                                  Apache License
@@ -2023,7 +2023,7 @@ This product includes source derived from [@opentelemetry/sdk-logs](https://gith
 
 ### @opentelemetry/sdk-metrics
 
-This product includes source derived from [@opentelemetry/sdk-metrics](https://github.com/open-telemetry/opentelemetry-js) ([v2.5.1](https://github.com/open-telemetry/opentelemetry-js/tree/v2.5.1)), distributed under the [Apache-2.0 License](https://github.com/open-telemetry/opentelemetry-js/blob/v2.5.1/LICENSE):
+This product includes source derived from [@opentelemetry/sdk-metrics](https://github.com/open-telemetry/opentelemetry-js) ([v2.6.1](https://github.com/open-telemetry/opentelemetry-js/tree/v2.6.1)), distributed under the [Apache-2.0 License](https://github.com/open-telemetry/opentelemetry-js/blob/v2.6.1/LICENSE):
 
 ```
                                  Apache License
@@ -2232,7 +2232,7 @@ This product includes source derived from [@opentelemetry/sdk-metrics](https://g
 
 ### @opentelemetry/sdk-trace-base
 
-This product includes source derived from [@opentelemetry/sdk-trace-base](https://github.com/open-telemetry/opentelemetry-js) ([v2.5.1](https://github.com/open-telemetry/opentelemetry-js/tree/v2.5.1)), distributed under the [Apache-2.0 License](https://github.com/open-telemetry/opentelemetry-js/blob/v2.5.1/LICENSE):
+This product includes source derived from [@opentelemetry/sdk-trace-base](https://github.com/open-telemetry/opentelemetry-js) ([v2.6.1](https://github.com/open-telemetry/opentelemetry-js/tree/v2.6.1)), distributed under the [Apache-2.0 License](https://github.com/open-telemetry/opentelemetry-js/blob/v2.6.1/LICENSE):
 
 ```
                                  Apache License
@@ -2961,7 +2961,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.1000.0](https://github.com/aws/aws-sdk-js-v3/tree/v3.1000.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.1000.0/LICENSE):
+This product includes source derived from [@aws-sdk/client-s3](https://github.com/aws/aws-sdk-js-v3) ([v3.1019.0](https://github.com/aws/aws-sdk-js-v3/tree/v3.1019.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.1019.0/LICENSE):
 
 ```
                                 Apache License
@@ -3170,7 +3170,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.1000.0](https://github.com/aws/aws-sdk-js-v3/tree/v3.1000.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.1000.0/LICENSE):
+This product includes source derived from [@aws-sdk/s3-request-presigner](https://github.com/aws/aws-sdk-js-v3) ([v3.1019.0](https://github.com/aws/aws-sdk-js-v3/tree/v3.1019.0)), distributed under the [Apache-2.0 License](https://github.com/aws/aws-sdk-js-v3/blob/v3.1019.0/LICENSE):
 
 ```
                                 Apache License
@@ -4832,27 +4832,27 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 This product includes source derived from [clean-jsdoc-theme](https://github.com/ankitskvmdam/clean-jsdoc-theme) ([v4.3.0](https://github.com/ankitskvmdam/clean-jsdoc-theme/tree/v4.3.0)), distributed under the [MIT License](https://github.com/ankitskvmdam/clean-jsdoc-theme/blob/v4.3.0/LICENSE):
 
 ```
-MIT License
-
-Copyright (c) 2019-2022 Ankit Kumar (अंकित कुमार)
-
-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.
+MIT License
+
+Copyright (c) 2019-2022 Ankit Kumar (अंकित कुमार)
+
+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.
 
 ```
 
@@ -5001,7 +5001,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ### eslint
 
-This product includes source derived from [eslint](https://github.com/eslint/eslint) ([v9.39.3](https://github.com/eslint/eslint/tree/v9.39.3)), distributed under the [MIT License](https://github.com/eslint/eslint/blob/v9.39.3/LICENSE):
+This product includes source derived from [eslint](https://github.com/eslint/eslint) ([v9.39.4](https://github.com/eslint/eslint/tree/v9.39.4)), distributed under the [MIT License](https://github.com/eslint/eslint/blob/v9.39.4/LICENSE):
 
 ```
 Copyright OpenJS Foundation and other contributors, <www.openjsf.org>
@@ -5752,7 +5752,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ### @datadog/pprof
 
-This product includes source derived from [@datadog/pprof](https://github.com/DataDog/pprof-nodejs) ([v5.13.4](https://github.com/DataDog/pprof-nodejs/tree/v5.13.4)), distributed under the [Apache-2.0 License](https://github.com/DataDog/pprof-nodejs/blob/v5.13.4/LICENSE):
+This product includes source derived from [@datadog/pprof](https://github.com/DataDog/pprof-nodejs) ([v5.14.1](https://github.com/DataDog/pprof-nodejs/tree/v5.14.1)), distributed under the [Apache-2.0 License](https://github.com/DataDog/pprof-nodejs/blob/v5.14.1/LICENSE):
 
 ```
 
@@ -6480,3 +6480,4 @@ Portions copyright Node.js contributors. Depending on your existing libraries an
 your systems may call externally maintained libraries in addition to those listed above.
 See [here](https://nodejs.org/en/docs/meta/topics/dependencies/) and [here](https://github.com/nodejs/node/blob/v4.3.1/LICENSE)
 for additional details regarding externally maintained libraries and certain related licenses and notices.
+

package/lib/instrumentation/aws-sdk/nr-hooks.js

@@ -11,18 +11,6 @@ const instrumentations = [
     type: InstrumentationDescriptor.TYPE_CONGLOMERATE,
     moduleName: 'aws-sdk',
     onRequire: require('./v2/instrumentation')
-  },
-  {
-    type: InstrumentationDescriptor.TYPE_CONGLOMERATE,
-    moduleName: '@aws-sdk/smithy-client',
-    onRequire: require('./v3/smithy-client'),
-    shimName: 'aws-sdk'
-  },
-  {
-    type: InstrumentationDescriptor.TYPE_CONGLOMERATE,
-    moduleName: '@smithy/smithy-client',
-    onRequire: require('./v3/smithy-client'),
-    shimName: 'aws-sdk'
   }
 ]
 

package/lib/llm-events/anthropic-sdk/chat-completion-message.js

@@ -0,0 +1,80 @@
+/*
+ * Copyright 2026 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+
+const LlmChatCompletionMessage = require('../chat-completion-message')
+const getUsageTokens = require('./get-usage-tokens')
+
+/**
+ * Encapsulates an Anthropic SDK LlmChatCompletionMessage.
+ */
+module.exports = class AnthropicLlmChatCompletionMessage extends LlmChatCompletionMessage {
+  constructor({
+    agent,
+    segment,
+    transaction,
+    request = {},
+    response = {},
+    sequence = 0,
+    content,
+    role,
+    completionId,
+    isResponse
+  }) {
+    super({
+      agent,
+      segment,
+      transaction,
+      vendor: 'anthropic',
+      sequence,
+      content,
+      role,
+      completionId,
+      isResponse,
+      responseModel: response?.model
+    })
+
+    this.setTokenCount(agent, request, response)
+  }
+
+  setTokenCount(agent, request, response) {
+    const tokenCB = agent.llm?.tokenCountCallback
+
+    if (tokenCB) {
+      const promptContent = request?.messages
+        ?.map((msg) => {
+          if (typeof msg.content === 'string') return msg.content
+          if (Array.isArray(msg.content)) {
+            return msg.content
+              .filter((block) => block.type === 'text')
+              .map((block) => block.text)
+              .join(' ')
+          }
+          return ''
+        })
+        .join(' ')
+
+      const completionContent = response?.content
+        ?.filter((block) => block.type === 'text')
+        ?.map((block) => block.text)
+        ?.join(' ')
+
+      if (promptContent && completionContent) {
+        this.setTokenFromCallback({
+          tokenCB,
+          reqModel: request.model,
+          resModel: this['response.model'],
+          promptContent,
+          completionContent
+        })
+      }
+      return
+    }
+
+    const tokens = getUsageTokens(response)
+    this.setTokenInCompletionMessage(tokens)
+  }
+}

package/lib/llm-events/anthropic-sdk/chat-completion-summary.js

@@ -0,0 +1,88 @@
+/*
+ * Copyright 2026 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+
+const LlmChatCompletionSummary = require('../chat-completion-summary')
+const getUsageTokens = require('./get-usage-tokens')
+
+/**
+ * Encapsulates an Anthropic SDK LlmChatCompletionSummary.
+ */
+module.exports = class AnthropicLlmChatCompletionSummary extends LlmChatCompletionSummary {
+  /**
+   * @param {object} params Constructor parameters
+   * @param {Agent} params.agent New Relic agent instance
+   * @param {TraceSegment} params.segment Current segment
+   * @param {Transaction} params.transaction Current and active transaction
+   * @param {object} params.request Anthropic SDK request object
+   * @param {object} params.response Anthropic SDK response object
+   * @param {number} [params.timeOfFirstToken] Timestamp of when the first token was sent, for streaming only.
+   * @param {boolean} [params.error] Set to `true` if an error occurred
+   */
+  constructor({ agent, segment, transaction, request, response, timeOfFirstToken, error }) {
+    super({
+      agent,
+      segment,
+      transaction,
+      responseModel: response?.model,
+      requestModel: request?.model,
+      finishReason: response?.stop_reason,
+      maxTokens: request?.max_tokens,
+      temperature: request?.temperature,
+      vendor: 'anthropic',
+      timeOfFirstToken,
+      error
+    })
+
+    let requestMessagesLength = 0
+    if (Array.isArray(request?.messages)) {
+      requestMessagesLength = request.messages.length
+    }
+    // Response is always a single message from the assistant
+    const responseMessageCount = response?.content ? 1 : 0
+    this['response.number_of_messages'] = requestMessagesLength + responseMessageCount
+
+    this.setTokens(agent, request, response)
+  }
+
+  setTokens(agent, request, response) {
+    const tokenCB = agent.llm?.tokenCountCallback
+
+    if (tokenCB) {
+      const promptContent = request?.messages
+        ?.map((msg) => {
+          if (typeof msg.content === 'string') return msg.content
+          if (Array.isArray(msg.content)) {
+            return msg.content
+              .filter((block) => block.type === 'text')
+              .map((block) => block.text)
+              .join(' ')
+          }
+          return ''
+        })
+        .join(' ')
+
+      const completionContent = response?.content
+        ?.filter((block) => block.type === 'text')
+        ?.map((block) => block.text)
+        ?.join(' ')
+
+      if (promptContent && completionContent) {
+        this.setTokenUsageFromCallback({
+          tokenCB,
+          reqModel: request.model,
+          resModel: this['response.model'],
+          promptContent,
+          completionContent
+        })
+      }
+      return
+    }
+
+    const tokens = getUsageTokens(response)
+    this.setTokensInResponse(tokens)
+  }
+}

package/lib/llm-events/anthropic-sdk/error-message.js

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2026 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+
+const LlmErrorMessage = require('../error-message')
+
+module.exports = class AnthrophicLlmErrorMessage extends LlmErrorMessage {
+  constructor(params = {}) {
+    super(params)
+    const { cause } = params
+    // Anthropic SDK errors seem to have two different formats:
+    // `cause.cause` and `cause.error.error`
+
+    // For errors like 'Connection error', attributes live on `cause.cause`.
+    if (cause?.cause?.message) {
+      // `cause.cause.message` is more verbose than `cause.message`,
+      // so we'll use it instead
+      this['error.message'] = cause.cause.message
+    }
+    // For errors like 'UnprocessableEntityError', there is also
+    // `cause.error.error.message` but it is actually less verbose
+    // than `cause.message`, so we'll use `cause.message` in this case.
+    if (cause?.error?.error?.code) {
+      this['error.code'] = cause.error.error.code
+    }
+  }
+}

package/lib/llm-events/anthropic-sdk/get-usage-tokens.js

@@ -0,0 +1,28 @@
+/*
+ * Copyright 2026 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+
+module.exports = getUsageTokens
+
+/**
+ * Grabs the prompt, completion, and total token count from the
+ * given response object.
+ * @param {object} response Anthropic SDK response object
+ * @returns {object} { promptTokens, completionTokens, totalTokens }
+ */
+function getUsageTokens(response) {
+  const { usage } = response
+  if (!usage) {
+    return { promptTokens: 0, completionTokens: 0, totalTokens: 0 }
+  }
+  const promptTokens = Number(usage.input_tokens)
+  const completionTokens = Number(usage.output_tokens)
+  return {
+    promptTokens,
+    completionTokens,
+    totalTokens: promptTokens + completionTokens
+  }
+}

package/lib/llm-events/anthropic-sdk/index.js

@@ -0,0 +1,10 @@
+/*
+ * Copyright 2026 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+module.exports = {
+  LlmChatCompletionMessage: require('./chat-completion-message'),
+  LlmChatCompletionSummary: require('./chat-completion-summary'),
+  LlmErrorMessage: require('./error-message')
+}

package/lib/llm-events/aws-bedrock/error-message.js

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2026 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+
+const LlmErrorMessage = require('../error-message')
+
+/**
+ * AWS Bedrock-specific LLM error message.
+ * Uses `cause.name` as the error code instead of the default error code resolution.
+ *
+ * @augments LlmErrorMessage
+ */
+module.exports = class AwsBedrockLlmErrorMessage extends LlmErrorMessage {
+  constructor(params = {}) {
+    super(params)
+    if (params.cause?.name) {
+      this['error.code'] = params.cause.name
+    }
+  }
+}

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

@@ -7,6 +7,7 @@ module.exports = {
   LlmChatCompletionMessage: require('./chat-completion-message'),
   LlmChatCompletionSummary: require('./chat-completion-summary'),
   LlmEmbedding: require('./embedding'),
+  LlmErrorMessage: require('./error-message'),
   // Helper classes to create the Llm events
   BedrockCommand: require('./bedrock-command'),
   BedrockResponse: require('./bedrock-response'),

package/lib/llm-events/error-message.js

@@ -22,51 +22,20 @@ module.exports = class LlmErrorMessage {
    * search if it was a vector search event.
    * @param {LlmTool} [params.tool] Details about the tool event if it was a tool event.
    * @param {object} [params.aiAgent] Details about the AI agent event if it was an AI agent event.
-   * @param {boolean} [params.useNameAsCode] defaults to false, only Bedrock sets it to true so far
    */
-  constructor({ response, cause, summary = {}, embedding = {}, vectorsearch = {}, tool = {}, aiAgent = {}, useNameAsCode = false } = {}) {
+  constructor({ response, cause, summary = {}, embedding = {}, vectorsearch = {}, tool = {}, aiAgent = {} } = {}) {
     this['http.statusCode'] = response?.statusCode ?? response?.status ?? cause?.status
     this['error.message'] = cause?.message
-    this['error.code'] = response?.code ?? cause?.error?.code ?? cause?.code
-    if (useNameAsCode) {
-      this['error.code'] = cause?.name
-    }
-    if (cause?.['lc_error_code']) {
-      // this is where langchain error codes live
-      this['error.code'] = cause['lc_error_code']
-    }
-    this['error.param'] = response?.param ?? cause?.error?.param
+    this['error.code'] = response?.code ?? cause?.error?.code ?? cause?.code ?? cause?.cause?.code
+    this['error.param'] = response?.param ?? cause?.param ?? cause?.error?.param
     this.completion_id = summary?.id
     this.embedding_id = embedding?.id
     this.vector_store_id = vectorsearch?.id
     this.tool_id = tool?.id
     this.agent_id = aiAgent?.id
-
-    if (embedding?.vendor === 'gemini' || summary?.vendor === 'gemini') {
-      this.#handleGemini(cause)
-    }
   }
 
   get [Symbol.toStringTag]() {
     return 'LlmErrorMessage'
   }
-
-  /**
-   * For `@google/genai` only, `cause` does not have the `error` or `status` fields,
-   * but it does have `message` with the info we need. So, we need to parse
-   * the relevant fields from cause.message to get `status` and `error`.
-   * @param {object} cause error object
-   */
-  #handleGemini(cause) {
-    if (cause?.message) {
-      try {
-        const jsonStartIndex = cause.message.indexOf('{')
-        const jsonString = cause.message.substring(jsonStartIndex)
-        const parsedError = JSON.parse(jsonString)?.error
-
-        this['http.statusCode'] = parsedError?.code
-        this['error.code'] = parsedError?.code
-      } catch { }
-    }
-  }
 }

package/lib/llm-events/google-genai/error-message.js

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2026 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+
+const LlmErrorMessage = require('../error-message')
+
+/**
+ * Google GenAI (Gemini)-specific LLM error message.
+ * For `@google/genai`, `cause` does not have the `error` or `status` fields,
+ * but it does have `message` with the info we need. Parses the relevant fields
+ * from `cause.message` to get `status` and `error`.
+ *
+ * @augments LlmErrorMessage
+ */
+module.exports = class GoogleGenAiLlmErrorMessage extends LlmErrorMessage {
+  constructor(params = {}) {
+    super(params)
+    if (params.cause?.message === null) return
+
+    try {
+      const jsonStartIndex = params.cause.message.indexOf('{')
+      const jsonString = params.cause.message.substring(jsonStartIndex)
+      const parsedError = JSON.parse(jsonString)?.error
+
+      if (parsedError?.code) {
+        this['http.statusCode'] = parsedError.code
+        this['error.code'] = parsedError.code
+      }
+    } catch (error) {
+      this['error.message'] = `failed to parse cause.message: ${error.message}`
+    }
+  }
+}

package/lib/llm-events/google-genai/index.js

@@ -6,5 +6,6 @@
 module.exports = {
   LlmChatCompletionMessage: require('./chat-completion-message'),
   LlmChatCompletionSummary: require('./chat-completion-summary'),
-  LlmEmbedding: require('./embedding')
+  LlmEmbedding: require('./embedding'),
+  LlmErrorMessage: require('./error-message')
 }

package/lib/llm-events/langchain/error-message.js

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2026 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+
+const LlmErrorMessage = require('../error-message')
+
+/**
+ * LangChain-specific LLM error message.
+ * Uses `cause.lc_error_code` as the error code when present.
+ *
+ * @augments LlmErrorMessage
+ */
+module.exports = class LangChainLlmErrorMessage extends LlmErrorMessage {
+  constructor(params = {}) {
+    super(params)
+    if (params.cause?.['lc_error_code']) {
+      this['error.code'] = params.cause['lc_error_code']
+    }
+  }
+}

package/lib/llm-events/langchain/index.js

@@ -8,5 +8,6 @@ module.exports = {
   LlmChatCompletionSummary: require('./chat-completion-summary'),
   LlmTool: require('./tool'),
   LlmVectorSearch: require('./vector-search'),
-  LlmVectorSearchResult: require('./vector-search-result')
+  LlmVectorSearchResult: require('./vector-search-result'),
+  LlmErrorMessage: require('./error-message')
 }