Rename chat* files to chat-completion*, appName for langchain only, id should be 32

appName only for langchain, makeId(32) instead of 36

Author: amychisholm03

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

@@ -73,7 +73,6 @@ function isStreamingEnabled({ commandName, config }) {
  * @param {object} params.msg LLM event
  */
 function recordEvent({ agent, type, msg }) {
-  if (msg.serialize) msg.serialize() // TODO: remove
   const llmContext = extractLlmContext(agent)
   const timestamp = msg?.timestamp ?? Date.now()
 
@@ -216,10 +215,9 @@ function recordEmbeddingMessage({
     agent,
     segment,
     transaction,
-    requestModel: bedrockCommand?.modelId,
+    bedrockCommand,
     requestInput: prompt.content,
-    requestId: bedrockResponse?.requestId,
-    totalTokenCount: bedrockResponse?.totalTokenCount,
+    bedrockResponse,
     error: err !== null
   }))
 

…b/llm-events/aws-bedrock/chat-message.js …s/aws-bedrock/chat-completion-message.jslib/llm-events/aws-bedrock/chat-message.js renamed to lib/llm-events/aws-bedrock/chat-completion-message.js lib/llm-events/aws-bedrock/chat-message.js renamed to lib/llm-events/aws-bedrock/chat-completion-message.js

@@ -3,7 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-const LlmChatCompletionMessage = require('../chat-message')
+'use strict'
+
+const LlmChatCompletionMessage = require('../chat-completion-message')
 
 module.exports = class AwsBedrockLlmChatCompletionMessage extends LlmChatCompletionMessage {
   /**

…b/llm-events/aws-bedrock/chat-summary.js …s/aws-bedrock/chat-completion-summary.jslib/llm-events/aws-bedrock/chat-summary.js renamed to lib/llm-events/aws-bedrock/chat-completion-summary.js lib/llm-events/aws-bedrock/chat-summary.js renamed to lib/llm-events/aws-bedrock/chat-completion-summary.js

@@ -3,7 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-const LlmChatCompletionSummary = require('../chat-summary')
+'use strict'
+
+const LlmChatCompletionSummary = require('../chat-completion-summary')
 
 module.exports = class AwsBedrockLlmChatCompletionSummary extends LlmChatCompletionSummary {
   /**

lib/llm-events/aws-bedrock/embedding.js

@@ -3,6 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+'use strict'
+
 const LlmEmbedding = require('../embedding')
 
 /**
@@ -15,31 +17,27 @@ module.exports = class AwsBedrockLlmEmbedding extends LlmEmbedding {
    * @param {Agent} params.agent New Relic agent instance
    * @param {object} params.segment Current segment
    * @param {object} params.transaction Current and active transaction
-   * @param {string} params.requestId ID associated with the request - typically available in response headers
    * @param {string} params.requestInput Input to the embedding creation call
-   * @param {string} params.requestModel Model name specified in the request (e.g. 'gpt-4')
-   * @param {number} params.totalTokenCount Retrieved from the Bedrock response object, fallback for token calculation
-   * @param {boolean} [params.error] Set to `true` if an error occurred during creation call - omitted if no error occurred
+   * @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, requestInput, requestModel, requestId, totalTokenCount = 0, error }) {
+  constructor({ agent, segment, transaction, requestInput, bedrockCommand, bedrockResponse, error }) {
     super({ agent,
       segment,
       transaction,
       vendor: 'bedrock',
+      requestId: bedrockResponse?.requestId,
       requestInput,
-      requestModel,
-      requestId,
-      responseModel: requestModel, // we can assume this in bedrock
+      requestModel: bedrockCommand?.modelId,
+      responseModel: bedrockCommand?.modelId, // we can assume requestModel==responseModel in bedrock
       error })
 
-    this.appName = agent.config.applications()[0] // TODO: still required?
-    this.setTotalTokens(agent, requestInput, totalTokenCount)
-    // TODO: bedrockResponse has headers, but they are not
-    // in the list of `response.headers.<vendor_specific_headers>`,
-    // still include them?
+    this.setTotalTokens({ agent, input: requestInput, totalTokenCount: bedrockResponse?.totalTokenCount })
   }
 
-  setTotalTokens(agent, input, totalTokenCount) {
+  setTotalTokens({ agent, input, totalTokenCount }) {
     const tokenCB = agent?.llm?.tokenCountCallback
 
     // For embedding events, only total token count is relevant.

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

@@ -3,11 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-'use strict'
-
 module.exports = {
-  LlmChatCompletionMessage: require('./chat-message'),
-  LlmChatCompletionSummary: require('./chat-summary'),
+  LlmChatCompletionMessage: require('./chat-completion-message'),
+  LlmChatCompletionSummary: require('./chat-completion-summary'),
   LlmEmbedding: require('./embedding'),
   // Helper classes to create the Llm events
   BedrockCommand: require('./bedrock-command'),

lib/llm-events/base.js

@@ -36,14 +36,11 @@ class LlmEvent {
    * @param {boolean} [params.error] Set to `true` if an error occurred during creation call, omitted if no error occurred
    */
   constructor({ agent, segment, transaction, vendor, responseModel, requestId, error }) {
-    this.id = makeId(36)
+    this.id = makeId(32)
     this.span_id = segment?.id
     this.trace_id = transaction?.traceId
     this.vendor = vendor
     this.metadata = agent
-    // TODO: Does not appear in AIM spec, but was a
-    // requirement for LangChain instrumentation back in 2024?
-    // this.appName = agent.config.applications()[0]
 
     // Omit `error` property if no error occurred
     if (error === true) {

lib/llm-events/chat-message.js lib/llm-events/chat-completion-message.jslib/llm-events/chat-message.js renamed to lib/llm-events/chat-completion-message.js

@@ -3,6 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+'use strict'
+
 const LlmEvent = require('./base')
 
 /**
@@ -13,7 +15,7 @@ const LlmEvent = require('./base')
  * @property {string} id ID in the format `response_id`-`sequence`,
  *  or a UUID generated by the agent if no response ID is returned by the LLM
  */
-class LlmChatCompletionMessage extends LlmEvent {
+module.exports = class LlmChatCompletionMessage extends LlmEvent {
   /**
    *
    * @param {object} params constructor params
@@ -70,5 +72,3 @@ class LlmChatCompletionMessage extends LlmEvent {
     }
   }
 }
-
-module.exports = LlmChatCompletionMessage

lib/llm-events/chat-summary.js lib/llm-events/chat-completion-summary.jslib/llm-events/chat-summary.js renamed to lib/llm-events/chat-completion-summary.js

@@ -3,6 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+'use strict'
+
 const LlmEvent = require('./base')
 
 /**
@@ -17,7 +19,7 @@ const LlmEvent = require('./base')
  * @property {string} response.organization Organization ID returned in the response or response headers
  * @property {number} timestamp Timestamp captured at the time of the LLM request with millisecond precision
  */
-class LlmChatCompletionSummary extends LlmEvent {
+module.exports = class LlmChatCompletionSummary extends LlmEvent {
   /**
    * @param {object} params constructor parameters
    * @param {Agent} params.agent New Relic agent instance
@@ -52,5 +54,3 @@ class LlmChatCompletionSummary extends LlmEvent {
     this.duration = segment.getDurationInMillis()
   }
 }
-
-module.exports = LlmChatCompletionSummary

lib/llm-events/embedding.js

@@ -3,6 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+'use strict'
+
 const LlmEvent = require('./base')
 
 /**
@@ -14,9 +16,9 @@ const LlmEvent = require('./base')
  * @property {string} response.organization Organization ID returned in the response or request headers
  * @property {number} response.usage.total_tokens Total number of tokens used for input text
  * @property {number} duration Total time taken for the embedding call to complete in milliseconds
- * @property {*} response.headers Vendor-specific headers
+ * @property {object} response.headers Vendor-specific headers, if any
  */
-class LlmEmbedding extends LlmEvent {
+module.exports = class LlmEmbedding extends LlmEvent {
   /**
    *
    * @param {object} params constructor parameters
@@ -42,5 +44,3 @@ class LlmEmbedding extends LlmEvent {
     }
   }
 }
-
-module.exports = LlmEmbedding

…/llm-events/google-genai/chat-message.js …/google-genai/chat-completion-message.jslib/llm-events/google-genai/chat-message.js renamed to lib/llm-events/google-genai/chat-completion-message.js lib/llm-events/google-genai/chat-message.js renamed to lib/llm-events/google-genai/chat-completion-message.js

@@ -3,13 +3,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-const LlmChatCompletionMessage = require('../chat-message')
+'use strict'
+
+const LlmChatCompletionMessage = require('../chat-completion-message')
 const { getUsageTokens } = require('./utils')
 
 /**
  * Encapsulates a Google Gen AI LlmChatCompletionMessage.
  */
-class GoogleGenAiLlmChatCompletionMessage extends LlmChatCompletionMessage {
+module.exports = class GoogleGenAiLlmChatCompletionMessage extends LlmChatCompletionMessage {
   constructor({ agent,
     segment,
     transaction,
@@ -62,5 +64,3 @@ class GoogleGenAiLlmChatCompletionMessage extends LlmChatCompletionMessage {
     this.setTokenInCompletionMessage(tokens)
   }
 }
-
-module.exports = GoogleGenAiLlmChatCompletionMessage