AWS Bedrock llm event refactor, rename llm-events-new to llm-events

Author: amychisholm03

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

@@ -4,22 +4,22 @@
  */
 
 'use strict'
+const StreamHandler = require('./stream-handler')
+const ConverseStreamHandler = require('./converse-stream-handler')
 const {
   LlmChatCompletionMessage,
   LlmChatCompletionSummary,
   LlmEmbedding,
-  LlmErrorMessage,
   BedrockCommand,
   BedrockResponse,
-  StreamHandler
 } = require('../../../llm-events/aws-bedrock')
+const LlmErrorMessage = require('#agentlib/llm-events/error-message.js')
 
 const { DESTINATIONS } = require('../../../config/attribute-filter')
 const { AI } = require('../../../metrics/names')
 const { RecorderSpec } = require('../../../shim/specs')
 const InstrumentationDescriptor = require('../../../instrumentation-descriptor')
 const { extractLlmContext } = require('../../../util/llm-utils')
-const ConverseStreamHandler = require('../../../llm-events/aws-bedrock/converse-stream-handler')
 
 let TRACKING_METRIC
 
@@ -73,7 +73,7 @@ function isStreamingEnabled({ commandName, config }) {
  * @param {object} params.msg LLM event
  */
 function recordEvent({ agent, type, msg }) {
-  msg.serialize()
+  if (msg.serialize) msg.serialize() // TODO: remove
   const llmContext = extractLlmContext(agent)
   const timestamp = msg?.timestamp ?? Date.now()
 
@@ -134,7 +134,7 @@ function recordChatCompletionMessages({
     bedrockCommand,
     transaction,
     segment,
-    isError: err !== null
+    error: err !== null
   })
 
   // Record context message(s)
@@ -149,7 +149,7 @@ function recordChatCompletionMessages({
       content: contextMessage.content,
       role: contextMessage.role,
       bedrockResponse,
-      index: i,
+      sequence: i,
       completionId: summary.id
     })
     recordEvent({ agent, type: 'LlmChatCompletionMessage', msg })
@@ -164,7 +164,7 @@ function recordChatCompletionMessages({
       bedrockCommand,
       bedrockResponse,
       isResponse: true,
-      index: promptContextMessages.length + i,
+      sequence: promptContextMessages.length + i,
       content,
       role: 'assistant',
       completionId: summary.id
@@ -216,10 +216,11 @@ function recordEmbeddingMessage({
     agent,
     segment,
     transaction,
-    bedrockCommand,
-    input: prompt.content,
-    bedrockResponse,
-    isError: err !== null
+    requestModel: bedrockCommand?.modelId,
+    requestInput: prompt.content,
+    requestId: bedrockResponse?.requestId,
+    totalTokenCount: bedrockResponse?.totalTokenCount,
+    error: err !== null
   }))
 
   for (const embedding of embeddings) {

…s/aws-bedrock/converse-stream-handler.js …on/aws-sdk/v3/converse-stream-handler.jslib/llm-events/aws-bedrock/converse-stream-handler.js renamed to lib/instrumentation/aws-sdk/v3/converse-stream-handler.js lib/llm-events/aws-bedrock/converse-stream-handler.js renamed to lib/instrumentation/aws-sdk/v3/converse-stream-handler.js

@@ -0,0 +1,67 @@
+/*
+ * Copyright 2026 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+const LlmChatCompletionMessage = require('../chat-message')
+
+module.exports = class AwsBedrockLlmChatCompletionMessage extends LlmChatCompletionMessage {
+  /**
+   *
+   * @param {object} params constructor parameters
+   * @param {Agent} params.agent New Relic agent instance
+   * @param {object} params.segment Current segment
+   * @param {object} params.transaction Current and active transaction
+   * @param {object} params.bedrockCommand AWS Bedrock Command object, represents the request
+   * @param {object} params.bedrockResponse AWS Bedrock Response object
+   * @param {string} params.content Content of the message
+   * @param {string} [params.role] Role of the message creator (e.g. `user`, `assistant`, `tool`)
+   * @param {string} params.completionId ID of the `LlmChatCompletionSummary` event that
+   *    this message event is connected to
+   * @param {number} params.sequence Index (beginning at 0) associated with
+   *    each message including the prompt and responses
+   * @param {boolean} [params.isResponse] Indiciates if this message is the response
+   */
+  constructor({ agent, segment, transaction, bedrockCommand, bedrockResponse, content, role, completionId, sequence = 0, isResponse }) {
+    super({ agent,
+      segment,
+      transaction,
+      vendor: 'bedrock',
+      content,
+      role,
+      sequence,
+      requestId: bedrockResponse?.requestId,
+      responseId: bedrockResponse?.id,
+      responseModel: bedrockCommand?.modelId, // we can assume requestModel==responseModel in bedrock
+      completionId,
+      isResponse })
+
+    this.appName = agent.config.applications()[0] // TODO: still required?
+    this.setTokenCount(agent, bedrockCommand, bedrockResponse)
+  }
+
+  setTokenCount(agent, bedrockCommand, bedrockResponse) {
+    const tokenCB = agent?.llm?.tokenCountCallback
+
+    if (tokenCB) {
+      const promptContent = bedrockCommand?.prompt?.map((msg) => msg.content).join(' ')
+      const completionContent = bedrockResponse?.completions?.join(' ')
+
+      if (promptContent && completionContent) {
+        this.setTokenFromCallback(
+          {
+            tokenCB,
+            reqModel: bedrockCommand.modelId,
+            resModel: bedrockCommand.modelId,
+            promptContent,
+            completionContent
+          }
+        )
+      }
+      return
+    }
+
+    this.setTokenInCompletionMessage({ promptTokens: bedrockResponse.inputTokenCount,
+      completionTokens: bedrockResponse.outputTokenCount })
+  }
+}

…llm-events/aws-bedrock/stream-handler.js …rumentation/aws-sdk/v3/stream-handler.jslib/llm-events/aws-bedrock/stream-handler.js renamed to lib/instrumentation/aws-sdk/v3/stream-handler.js lib/llm-events/aws-bedrock/stream-handler.js renamed to lib/instrumentation/aws-sdk/v3/stream-handler.js

@@ -0,0 +1,61 @@
+/*
+ * Copyright 2026 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+const LlmChatCompletionSummary = require('../chat-summary')
+
+module.exports = class AwsBedrockLlmChatCompletionSummary extends LlmChatCompletionSummary {
+  /**
+   *
+   * @param {object} params constructor parameters
+   * @param {Agent} params.agent New Relic agent instance
+   * @param {object} params.segment Current segment
+   * @param {object} params.transaction Current and active transaction
+   * @param {object} params.bedrockCommand AWS Bedrock Command object, represents the request
+   * @param {object} params.bedrockResponse AWS Bedrock Response object
+   * @param {boolean} [params.error] Set to `true` if an error occurred during creation call, omitted if no error occurred
+   */
+  constructor({ agent, segment, transaction, bedrockCommand, bedrockResponse, error }) {
+    super({ agent,
+      segment,
+      transaction,
+      error,
+      vendor: 'bedrock',
+      requestModel: bedrockCommand?.modelId,
+      requestId: bedrockResponse?.requestId,
+      responseModel: bedrockCommand?.modelId, // we can assume requestModel==responseModel in bedrock
+      temperature: bedrockCommand.temperature,
+      maxTokens: bedrockCommand.maxTokens,
+      numMsgs: (bedrockCommand.prompt.length ?? 0) + (bedrockResponse.completions.length ?? 0),
+      finishReason: bedrockResponse?.finishReason })
+
+    this.appName = agent.config.applications()[0] // TODO: still required?
+    this.setTokens(agent, bedrockCommand, bedrockResponse)
+  }
+
+  setTokens(agent, bedrockCommand, bedrockResponse) {
+    const tokenCB = agent?.llm?.tokenCountCallback
+
+    // Prefer callback for prompt and completion tokens; if unavailable, fall back to response data.
+    if (tokenCB) {
+      const promptContent = bedrockCommand?.prompt?.map((msg) => msg.content).join(' ')
+      const completionContent = bedrockResponse?.completions?.join(' ')
+
+      this.setTokenUsageFromCallback(
+        {
+          tokenCB,
+          reqModel: bedrockCommand.modelId,
+          resModel: bedrockCommand.modelId,
+          promptContent,
+          completionContent
+        }
+      )
+      return
+    }
+
+    this.setTokensInResponse({ promptTokens: bedrockResponse.inputTokenCount,
+      completionTokens: bedrockResponse.outputTokenCount,
+      totalTokens: bedrockResponse.totalTokenCount })
+  }
+}