newrelic 12.11.0 → 12.11.2

package/NEWS.md

@@ -1,3 +1,43 @@
+### v12.11.2 (2025-01-23)
+
+#### Features
+
+* Added support for Claude 3+ Chat API in Bedrock ([#2870](https://github.com/newrelic/node-newrelic/pull/2870)) ([6a83abf](https://github.com/newrelic/node-newrelic/commit/6a83abf8b1a0cb0f993e9d9285566a09677d7d2e))
+
+#### Bug fixes
+
+* Added defensive code in shim to prevent crashing when checking parent segment ([#2898](https://github.com/newrelic/node-newrelic/pull/2898)) ([751eb96](https://github.com/newrelic/node-newrelic/commit/751eb9608d7401d1123a0e810eac9dc554127e4e))
+
+#### Documentation
+
+* Updated compatibility report ([#2888](https://github.com/newrelic/node-newrelic/pull/2888)) ([dce9deb](https://github.com/newrelic/node-newrelic/commit/dce9debeda6c5ed30c0ed6dbc00f73cf11c8f40f))
+
+#### Miscellaneous chores
+
+* Replaced backtracking regex with new algorithm ([#2887](https://github.com/newrelic/node-newrelic/pull/2887)) ([46462d0](https://github.com/newrelic/node-newrelic/commit/46462d00b68c4a4cedd60d46d531b2f31800df98))
+
+#### Tests
+
+* Improved test coverage of normalizing claude 3 messages ([#2893](https://github.com/newrelic/node-newrelic/pull/2893)) ([cc65763](https://github.com/newrelic/node-newrelic/commit/cc657633b81daf4b372e5715e696ed3c23ecb678))
+
+### v12.11.1 (2025-01-16)
+
+#### Bug fixes
+
+* Updated undici instrumentation to fix crash with trying to calculate exclusive duration on a segment that no longer exists ([#2884](https://github.com/newrelic/node-newrelic/pull/2884)) ([3b7e4bf](https://github.com/newrelic/node-newrelic/commit/3b7e4bf0a40b21f16b11e7761809cbaa83c02515))
+
+#### Documentation
+
+* Updated compatibility report ([#2878](https://github.com/newrelic/node-newrelic/pull/2878)) ([e784f84](https://github.com/newrelic/node-newrelic/commit/e784f8427bd49852f0ed7a15d6025ea8dfc73c72))
+
+#### Miscellaneous chores
+
+* Fixed dns integration tests ([#2883](https://github.com/newrelic/node-newrelic/pull/2883)) ([dd30ad7](https://github.com/newrelic/node-newrelic/commit/dd30ad71f07233682da39ca41f452a55c6798a15))
+
+#### Tests
+
+* Restored the branch to test apollo-server-plugin to main ([#2879](https://github.com/newrelic/node-newrelic/pull/2879)) ([978faab](https://github.com/newrelic/node-newrelic/commit/978faab59f5378e26cb8f5e584a3c9e684e7bbb1))
+
 ### v12.11.0 (2025-01-14)
 
 #### Features

package/lib/feature_flags.js

@@ -13,7 +13,6 @@ exports.prerelease = {
 
   promise_segments: false,
   reverse_naming_rules: false,
-  undici_async_tracking: true,
   unresolved_promise_cleanup: true,
   kafkajs_instrumentation: false
 }
@@ -36,6 +35,7 @@ exports.released = [
   'await_support',
   'certificate_bundle',
   'async_local_context',
+  'undici_async_tracking',
   'undici_instrumentation',
   'aws_bedrock_instrumentation',
   'langchain_instrumentation'

package/lib/header-attributes.js

@@ -95,10 +95,10 @@ function _headerToCamelCase(header) {
   const newHeader = header.charAt(0).toLowerCase() + header.slice(1)
 
   // Converts headers in the form 'header-name' to be in the form 'headerName'
-  // eslint-disable-next-line sonarjs/slow-regex
-  return newHeader.replace(/[\W_]+(\w)/g, function capitalize(m, $1) {
-    return $1.toUpperCase()
-  })
+  return newHeader.split(/[\W_]/).map((ele, i) => {
+    if (i === 0) return ele
+    return ele.slice(0, 1).toUpperCase() + ele.slice(1)
+  }).join('')
 }
 
 function _collectHeaders(headers, nameMap, prefix, transaction) {

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

@@ -118,18 +118,24 @@ function recordChatCompletionMessages({
     isError: err !== null
   })
 
-  const msg = new LlmChatCompletionMessage({
-    agent,
-    segment,
-    bedrockCommand,
-    bedrockResponse,
-    transaction,
-    index: 0,
-    completionId: summary.id
+  // Record context message(s)
+  const promptContextMessages = bedrockCommand.prompt
+  promptContextMessages.forEach((contextMessage, promptIndex) => {
+    const msg = new LlmChatCompletionMessage({
+      agent,
+      segment,
+      transaction,
+      bedrockCommand,
+      content: contextMessage.content,
+      role: contextMessage.role,
+      bedrockResponse,
+      index: promptIndex,
+      completionId: summary.id
+    })
+    recordEvent({ agent, type: 'LlmChatCompletionMessage', msg })
   })
-  recordEvent({ agent, type: 'LlmChatCompletionMessage', msg })
 
-  bedrockResponse.completions.forEach((content, index) => {
+  bedrockResponse.completions.forEach((content, completionIndex) => {
     const chatCompletionMessage = new LlmChatCompletionMessage({
       agent,
       segment,
@@ -137,8 +143,9 @@ function recordChatCompletionMessages({
       bedrockCommand,
       bedrockResponse,
       isResponse: true,
-      index: index + 1,
+      index: promptContextMessages.length + completionIndex,
       content,
+      role: 'assistant',
       completionId: summary.id
     })
     recordEvent({ agent, type: 'LlmChatCompletionMessage', msg: chatCompletionMessage })
@@ -179,18 +186,22 @@ function recordEmbeddingMessage({
     return
   }
 
-  const embedding = new LlmEmbedding({
+  const embeddings = bedrockCommand.prompt.map(prompt => new LlmEmbedding({
     agent,
     segment,
     transaction,
     bedrockCommand,
+    input: prompt.content,
     bedrockResponse,
     isError: err !== null
+  }))
+
+  embeddings.forEach(embedding => {
+    recordEvent({ agent, type: 'LlmEmbedding', msg: embedding })
   })
 
-  recordEvent({ agent, type: 'LlmEmbedding', msg: embedding })
   if (err) {
-    const llmError = new LlmError({ bedrockResponse, err, embedding })
+    const llmError = new LlmError({ bedrockResponse, err, embedding: embeddings.length === 1 ? embeddings[0] : undefined })
     agent.errors.add(transaction, err, llmError)
   }
 }

package/lib/instrumentation/undici.js

@@ -11,8 +11,6 @@ const logger = require('../logger').child({ component: 'undici' })
 const NAMES = require('../metrics/names')
 const symbols = require('../symbols')
 // eslint-disable-next-line n/no-unsupported-features/node-builtins
-const { executionAsyncResource } = require('async_hooks')
-// eslint-disable-next-line n/no-unsupported-features/node-builtins
 const diagnosticsChannel = require('diagnostics_channel')
 const synthetics = require('../synthetics')
 const urltils = require('../util/urltils')
@@ -49,42 +47,6 @@ module.exports.unsubscribe = function unsubscribe() {
   })
 }
 
-/**
- * Retrieves the current segment(parent in our context) and transaction from executionAsyncResource
- * or from context manager then adds to the executionAsyncResource for future
- * undici requests within same async context.
- *
- * It was found that when running concurrent undici requests
- * within a transaction that the parent segment would get out of sync
- * depending on the async context of the transaction.  By using
- * `async_hooks.executionResource` it is more reliable.
- *
- * Note: However, if you have concurrent undici requests in a transaction
- * and the request to the transaction is using a keep alive there is a chance the
- * executionAsyncResource may be incorrect because of shared connections.  To revert to a more
- * naive tracking of parent set `config.feature_flag.undici_async_tracking: false` and
- * it will just get the segment and transaction from the context manager.
- *
- * @param {Shim} shim instance of shim
- * @returns {TraceSegment} parent segment
- */
-function getParentContext(shim) {
-  const { config } = shim.agent
-  if (config.feature_flag.undici_async_tracking) {
-    const resource = executionAsyncResource()
-
-    if (!resource[symbols.parentSegment]) {
-      const parent = shim.getSegment()
-      resource[symbols.parentSegment] = parent
-      const tx = shim.tracer.getTransaction()
-      resource[symbols.transaction] = tx
-    }
-    return { segment: resource[symbols.parentSegment], transaction: resource[symbols.transaction] }
-  }
-
-  return shim.tracer.getContext()
-}
-
 /**
  * Injects relevant DT headers for the external request
  *
@@ -160,7 +122,7 @@ function createExternalSegment({ shim, request, segment }) {
  */
 function requestCreateHook(shim, { request }) {
   const { config } = shim.agent
-  const { transaction, segment } = getParentContext(shim)
+  const { transaction, segment } = shim.tracer.getContext()
   request[symbols.parentSegment] = segment
   request[symbols.transaction] = transaction
   if (!(segment || transaction) || segment?.opaque) {
@@ -221,9 +183,8 @@ function requestHeadersHook(shim, { request, response }) {
 }
 
 /**
- * Gets the active and parent from given ctx(request, client connector)
- * and ends active and restores parent to active.  If an error exists
- * it will add the error to the transaction
+ * Gets the active segment, parent segment and transaction from given ctx(request, client connector)
+ * and ends segment and sets the previous parent segment as the active segment.  If an error exists it will add the error to the transaction
  *
  * @param {Shim} shim instance of shim
  * @param {object} params object from undici hook
@@ -236,14 +197,14 @@ function endAndRestoreSegment(shim, { request, error }) {
   const tx = request[symbols.transaction]
   if (activeSegment) {
     activeSegment.end()
+  }
 
-    if (error) {
-      handleError(shim, tx, error)
-    }
+  if (error && tx) {
+    handleError(shim, tx, error)
+  }
 
-    if (parentSegment) {
-      shim.setActiveSegment(parentSegment)
-    }
+  if (parentSegment) {
+    shim.setActiveSegment(parentSegment)
   }
 }
 

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

@@ -5,6 +5,8 @@
 
 'use strict'
 
+const { stringifyClaudeChunkedMessage } = require('./utils')
+
 /**
  * Parses an AWS invoke command instance into a re-usable entity.
  */
@@ -68,37 +70,34 @@ class BedrockCommand {
   /**
    * The question posed to the LLM.
    *
-   * @returns {string|string[]|undefined}
+   * @returns {object[]} The array of context messages passed to the LLM (or a single user prompt for legacy "non-chat" models)
    */
   get prompt() {
-    let result
     if (this.isTitan() === true || this.isTitanEmbed() === true) {
-      result = this.#body.inputText
+      return [
+        {
+          role: 'user',
+          content: this.#body.inputText
+        }
+      ]
     } else if (this.isCohereEmbed() === true) {
-      result = this.#body.texts.join(' ')
+      return [
+        {
+          role: 'user',
+          content: this.#body.texts.join(' ')
+        }
+      ]
     } else if (
-      this.isClaude() === true ||
+      this.isClaudeTextCompletionApi() === true ||
       this.isAi21() === true ||
       this.isCohere() === true ||
       this.isLlama() === true
     ) {
-      result = this.#body.prompt
-    } else if (this.isClaude3() === true) {
-      const collected = []
-      for (const message of this.#body?.messages) {
-        if (message?.role === 'assistant') {
-          continue
-        }
-        if (typeof message?.content === 'string') {
-          collected.push(message?.content)
-          continue
-        }
-        const mappedMsgObj = message?.content.map((msgContent) => msgContent.text)
-        collected.push(mappedMsgObj)
-      }
-      result = collected.join(' ')
+      return [{ role: 'user', content: this.#body.prompt }]
+    } else if (this.isClaudeMessagesApi() === true) {
+      return normalizeClaude3Messages(this.#body?.messages)
     }
-    return result
+    return []
   }
 
   /**
@@ -151,6 +150,41 @@ class BedrockCommand {
   isTitanEmbed() {
     return this.#modelId.startsWith('amazon.titan-embed')
   }
+
+  isClaudeMessagesApi() {
+    return (this.isClaude3() === true || this.isClaude() === true) && 'messages' in this.#body
+  }
+
+  isClaudeTextCompletionApi() {
+    return this.isClaude() === true && 'prompt' in this.#body
+  }
+}
+
+/**
+ * Claude v3 requests in Bedrock can have two different "chat" flavors. This function normalizes them into a consistent
+ * format per the AIM agent spec
+ *
+ * @param messages - The raw array of messages passed to the invoke API
+ * @returns {number|undefined} - The normalized messages
+ */
+function normalizeClaude3Messages(messages) {
+  const result = []
+  for (const message of messages ?? []) {
+    if (message == null) {
+      continue
+    }
+    if (typeof message.content === 'string') {
+      // Messages can be specified with plain string content
+      result.push({ role: message.role, content: message.content })
+    } else if (Array.isArray(message.content)) {
+      // Or in a "chunked" format for multi-modal support
+      result.push({
+        role: message.role,
+        content: stringifyClaudeChunkedMessage(message.content)
+      })
+    }
+  }
+  return result
 }
 
 module.exports = BedrockCommand

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

@@ -5,6 +5,8 @@
 
 'use strict'
 
+const { stringifyClaudeChunkedMessage } = require('./utils')
+
 /**
  * @typedef {object} AwsBedrockMiddlewareResponse
  * @property {object} response Has a `body` property that is an IncomingMessage,
@@ -63,7 +65,7 @@ class BedrockResponse {
         // Streamed response
         this.#completions = body.completions
       } else {
-        this.#completions = body?.content?.map((c) => c.text)
+        this.#completions = [stringifyClaudeChunkedMessage(body?.content)]
       }
       this.#id = body.id
     } else if (cmd.isCohere() === true) {

package/lib/llm-events/aws-bedrock/chat-completion-message.js

@@ -39,7 +39,7 @@ class LlmChatCompletionMessage extends LlmEvent {
     params = Object.assign({}, defaultParams, params)
     super(params)
 
-    const { agent, content, isResponse, index, completionId } = params
+    const { agent, content, isResponse, index, completionId, role } = params
     const recordContent = agent.config?.ai_monitoring?.record_content?.enabled
     const tokenCB = agent?.llm?.tokenCountCallback
 
@@ -47,20 +47,11 @@ class LlmChatCompletionMessage extends LlmEvent {
     this.completion_id = completionId
     this.sequence = index
     this.content = recordContent === true ? content : undefined
-    this.role = ''
+    this.role = role
 
     this.#setId(index)
-    if (this.is_response === true) {
-      this.role = 'assistant'
-      if (typeof tokenCB === 'function') {
-        this.token_count = tokenCB(this.bedrockCommand.modelId, content)
-      }
-    } else {
-      this.role = 'user'
-      this.content = recordContent === true ? this.bedrockCommand.prompt : undefined
-      if (typeof tokenCB === 'function') {
-        this.token_count = tokenCB(this.bedrockCommand.modelId, this.bedrockCommand.prompt)
-      }
+    if (typeof tokenCB === 'function') {
+      this.token_count = tokenCB(this.bedrockCommand.modelId, content)
     }
   }
 

package/lib/llm-events/aws-bedrock/chat-completion-summary.js

@@ -36,7 +36,7 @@ class LlmChatCompletionSummary extends LlmEvent {
     const cmd = this.bedrockCommand
     this[cfr] = this.bedrockResponse.finishReason
     this[rt] = cmd.temperature
-    this[nm] = 1 + this.bedrockResponse.completions.length
+    this[nm] = (this.bedrockCommand.prompt.length) + this.bedrockResponse.completions.length
   }
 }
 

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

@@ -10,7 +10,7 @@ const LlmEvent = require('./event')
 /**
  * @typedef {object} LlmEmbeddingParams
  * @augments LlmEventParams
- * @property
+ * @property {string} input - The input message for the embedding call
  */
 /**
  * @type {LlmEmbeddingParams}
@@ -20,16 +20,18 @@ const defaultParams = {}
 class LlmEmbedding extends LlmEvent {
   constructor(params = defaultParams) {
     super(params)
-    const { agent } = params
+    const { agent, input } = params
     const tokenCb = agent?.llm?.tokenCountCallback
 
     this.input = agent.config?.ai_monitoring?.record_content?.enabled
-      ? this.bedrockCommand.prompt
+      ? input
       : undefined
     this.error = params.isError
     this.duration = params.segment.getDurationInMillis()
+
+    // Even if not recording content, we should use the local token counting callback to record token usage
     if (typeof tokenCb === 'function') {
-      this.token_count = tokenCb(this.bedrockCommand.modelId, this.bedrockCommand.prompt)
+      this.token_count = tokenCb(this.bedrockCommand.modelId, input)
     }
   }
 }

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

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2024 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+
+/**
+ *
+ * @param {object[]} chunks - The "chunks" that make up a single conceptual message. In a multi-modal scenario, a single message
+ * might have a number of different-typed chunks interspersed
+ * @returns {string} - A stringified version of the message. We make a best-effort effort attempt to represent non-text chunks. In the future
+ * we may want to extend the agent to support these non-text chunks in a richer way. Placeholders are represented in an XML-like format but
+ * are NOT intended to be parsed as valid XML
+ */
+function stringifyClaudeChunkedMessage(chunks) {
+  const stringifiedChunks = chunks.map((msgContent) => {
+    switch (msgContent.type) {
+      case 'text':
+        return msgContent.text
+      case 'image':
+        return '<image>'
+      case 'tool_use':
+        return `<tool_use>${msgContent.name}</tool_use>`
+      case 'tool_result':
+        return `<tool_result>${msgContent.content}</tool_result>`
+      default:
+        return '<unknown_chunk>'
+    }
+  })
+  return stringifiedChunks.join('\n\n')
+}
+
+module.exports = {
+  stringifyClaudeChunkedMessage
+}

package/lib/shim/shim.js

@@ -677,7 +677,7 @@ function recordWrapper({ shim, fn, name, recordNamer }) {
       return fnApply.call(fn, this, args)
     }
 
-    // middleweare recorders pass in parent segment
+    // middleware recorders pass in parent segment
     // we need to destructure this as it is not needed past this function
     // and will overwhelm trace level loggers with logging the entire spec
     const { parent: specParent, ...segDesc } = spec
@@ -686,7 +686,7 @@ function recordWrapper({ shim, fn, name, recordNamer }) {
     const transaction = context.transaction
     const parent = transaction?.isActive() && specParent ? specParent : context.segment
 
-    if (!transaction?.isActive()) {
+    if (!transaction?.isActive() || !parent) {
       shim.logger.debug('Not recording function %s, not in a transaction.', name)
       return fnApply.call(fn, this, arguments)
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "newrelic",
-  "version": "12.11.0",
+  "version": "12.11.2",
   "author": "New Relic Node.js agent team <nodejs@newrelic.com>",
   "license": "Apache-2.0",
   "contributors": [