newrelic 12.13.0 → 12.14.0

package/NEWS.md

@@ -1,3 +1,22 @@
+### v12.14.0 (2025-02-18)
+
+#### Features
+
+* Added support for region-prefixed Bedrock models ([#2947](https://github.com/newrelic/node-newrelic/pull/2947)) ([6acf535](https://github.com/newrelic/node-newrelic/commit/6acf5354d1e7f6786da88c0078699e82a714551d))
+* Added attribute reconciliation for message producer spans ([#2942](https://github.com/newrelic/node-newrelic/pull/2942)) ([a9ba396](https://github.com/newrelic/node-newrelic/commit/a9ba39613c78b89c047ca35a218c2eedbb01e3d2))
+* Added timeslice metrics for synthesized consumer segments ([#2938](https://github.com/newrelic/node-newrelic/pull/2938)) ([acfe953](https://github.com/newrelic/node-newrelic/commit/acfe953cf7a656fafb69104384c72f94ddc13000))
+
+#### Bug fixes
+
+* Fixed queueing of logs from child loggers ([#2945](https://github.com/newrelic/node-newrelic/pull/2945)) ([888cfe8](https://github.com/newrelic/node-newrelic/commit/888cfe84a1ffaf0287682cc9099a2fa762f7a37f))
+* Fixed undici/fetch instrumentation to properly assign the parent-id portion of the `traceparent` header on outgoing requests to the active http external span id ([#2951](https://github.com/newrelic/node-newrelic/pull/2951)) ([bc714cf](https://github.com/newrelic/node-newrelic/commit/bc714cfa8fe6754abf25eb556b8f804c9982f986))
+* Updated `api.recordLogEvent` to no longer truncate the message key in log event ([#2949](https://github.com/newrelic/node-newrelic/pull/2949)) ([8dd557b](https://github.com/newrelic/node-newrelic/commit/8dd557b4dfca2505b7e9f7f030ab094a6ae8019a))
+    * Thanks for your contribution @rChaoz 🎉 
+
+#### Documentation
+
+* Updated compatibility report ([#2948](https://github.com/newrelic/node-newrelic/pull/2948)) ([8e32ed7](https://github.com/newrelic/node-newrelic/commit/8e32ed7d7bc456a0693485e7bdef955c25ead29a))
+
 ### v12.13.0 (2025-02-12)
 
 #### Features

package/api.js

@@ -513,7 +513,6 @@ API.prototype.recordLogEvent = function recordLogEvent(logEvent = {}) {
     )
     return
   }
-  logEvent.message = applicationLogging.truncate(logEvent.message)
 
   if (!logEvent.level) {
     logger.debug('no log level set, setting it to UNKNOWN')

package/lib/instrumentation/undici.js

@@ -136,8 +136,8 @@ function requestCreateHook(shim, { request }) {
   }
 
   try {
-    addDTHeaders({ transaction, config, request })
     createExternalSegment({ shim, request, segment })
+    addDTHeaders({ transaction, config, request })
   } catch (err) {
     logger.warn(err, 'Unable to create external segment')
   }

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

@@ -124,11 +124,11 @@ class BedrockCommand {
   }
 
   isClaude() {
-    return this.#modelId.startsWith('anthropic.claude-v')
+    return this.#modelId.split('.').slice(-2).join('.').startsWith('anthropic.claude-v')
   }
 
   isClaude3() {
-    return this.#modelId.startsWith('anthropic.claude-3')
+    return this.#modelId.split('.').slice(-2).join('.').startsWith('anthropic.claude-3')
   }
 
   isCohere() {

package/lib/metrics/recorders/message-transaction.js

@@ -7,6 +7,11 @@
 
 const NAMES = require('../../metrics/names.js')
 
+/**
+ * @param {TraceSegment} segment
+ * @param {object} scope
+ * @param {Transaction} tx
+ */
 function recordMessageTransaction(segment, scope, tx) {
   if (tx.type !== 'message' || tx.baseSegment !== segment) {
     return

package/lib/otel/constants.js

@@ -120,6 +120,13 @@ module.exports = {
    */
   ATTR_HTTP_STATUS_TEXT: 'http.status_text',
 
+  /**
+   * The correlation id
+   *
+   * @example MyConversationId
+   */
+  ATTR_MESSAGING_MESSAGE_CONVERSATION_ID: 'messaging.message.conversation_id',
+
   /**
    * The message destination name.
    *
@@ -141,6 +148,29 @@ module.exports = {
    */
   ATTR_MESSAGING_DESTINATION_NAME: 'messaging.destination.name',
 
+  /**
+   * Identifies the type of messaging consumer operation.
+   *
+   * {@link ATTR_MESSAGING_OPERATION_NAME} is newer and should be used.
+   */
+  ATTR_MESSAGING_OPERATION: 'messaging.operation',
+
+  /**
+   * Name of the operation being performed. Value is specific to the
+   * target messaging system.
+   *
+   * @example ack
+   * @example send
+   */
+  ATTR_MESSAGING_OPERATION_NAME: 'messaging.operation.name',
+
+  /**
+   * RabbitMQ message routing key
+   *
+   * @example myKey
+   */
+  ATTR_MESSAGING_RABBITMQ_DESTINATION_ROUTING_KEY: 'messaging.rabbitmq.destination.routing_key',
+
   /**
    * Target messaging system name.
    *

package/lib/otel/segments/consumer.js

@@ -13,6 +13,7 @@ module.exports = createConsumerSegment
 // attributes according to our own internal specs.
 
 const Transaction = require('../../transaction/')
+const recorder = require('../../metrics/recorders/message-transaction')
 const { DESTINATIONS, TYPES } = Transaction
 
 const {
@@ -23,12 +24,12 @@ const {
 
 function createConsumerSegment(agent, otelSpan) {
   const transaction = new Transaction(agent)
-  transaction.type = TYPES.BG
+  transaction.type = TYPES.MESSAGE
 
   const system = otelSpan.attributes[ATTR_MESSAGING_SYSTEM] ?? 'unknown'
   const destination = otelSpan.attributes[ATTR_MESSAGING_DESTINATION] ?? 'unknown'
   const destKind = otelSpan.attributes[ATTR_MESSAGING_DESTINATION_KIND] ?? 'unknown'
-  const segmentName = `OtherTransaction/Message/${system}/${destKind}/Named/${destination}`
+  const segmentName = `${system}/${destKind}/Named/${destination}`
 
   const txAttrs = transaction.trace.attributes
   txAttrs.addAttribute(DESTINATIONS.TRANS_SCOPE, 'message.queueName', destination)
@@ -37,10 +38,11 @@ function createConsumerSegment(agent, otelSpan) {
   //   'host',
   //
   // )
-  transaction.name = segmentName
+  transaction.setPartialName(segmentName)
 
   const segment = agent.tracer.createSegment({
-    name: segmentName,
+    recorder,
+    name: transaction.getFullName(),
     parent: transaction.trace.root,
     transaction
   })

package/lib/otel/span-processor.js

@@ -17,6 +17,8 @@ const {
   ATTR_HTTP_ROUTE,
   ATTR_HTTP_STATUS_CODE,
   ATTR_HTTP_STATUS_TEXT,
+  ATTR_MESSAGING_MESSAGE_CONVERSATION_ID,
+  ATTR_MESSAGING_RABBITMQ_DESTINATION_ROUTING_KEY,
   ATTR_NET_PEER_NAME,
   ATTR_NET_PEER_PORT,
   ATTR_NET_HOST_NAME,
@@ -69,6 +71,8 @@ module.exports = class NrSpanProcessor {
       this.reconcileServerAttributes({ segment, span, transaction })
     } else if (span.kind === SpanKind.CLIENT && span.attributes[ATTR_DB_SYSTEM]) {
       this.reconcileDbAttributes({ segment, span })
+    } else if (span.kind === SpanKind.PRODUCER) {
+      this.reconcileProducerAttributes({ segment, span })
     }
     // TODO: add http external checks
   }
@@ -159,4 +163,26 @@ module.exports = class NrSpanProcessor {
       segment.addAttribute(key, sanitized)
     }
   }
+
+  reconcileProducerAttributes({ segment, span }) {
+    for (const [prop, value] of Object.entries(span.attributes)) {
+      let key = prop
+      let sanitized = value
+
+      if (prop === ATTR_SERVER_ADDRESS) {
+        key = 'host'
+        if (urltils.isLocalhost(sanitized)) {
+          sanitized = this.agent.config.getHostnameSafe(sanitized)
+        }
+      } else if (prop === ATTR_SERVER_PORT) {
+        key = 'port'
+      } else if (prop === ATTR_MESSAGING_MESSAGE_CONVERSATION_ID) {
+        key = 'correlation_id'
+      } else if (prop === ATTR_MESSAGING_RABBITMQ_DESTINATION_ROUTING_KEY) {
+        key = 'routing_key'
+      }
+
+      segment.addAttribute(key, sanitized)
+    }
+  }
 }

package/lib/util/logger.js

@@ -94,7 +94,8 @@ Object.keys(LEVELS).forEach(function buildLevel(_level) {
 
   function log(extra) {
     if (!this.options.configured) {
-      this.logQueue.unshift({ level: _level, args: arguments })
+      // queue a log line with level, args passed to logger and their respective extras
+      this.logQueue.unshift({ level: _level, args: arguments, extra: this.extra })
       return
     }
 
@@ -175,8 +176,9 @@ Object.keys(LEVELS).forEach(function buildLevel(_level) {
 
 Logger.prototype._flushQueuedLogs = function _flushQueuedLogs() {
   while (this.logQueue.length) {
-    const { level, args } = this.logQueue.shift()
-    this[level].apply(this, args)
+    const { level, args, extra } = this.logQueue.shift()
+    // log an entry now that the logger has been configured
+    this[level](extra, ...args)
   }
 }
 
@@ -188,6 +190,7 @@ Logger.prototype.child = function child(extra) {
   childLogger.extra = Object.assign(Object.create(null), this.extra, extra)
 
   const parent = this
+  childLogger.logQueue = parent.logQueue
   childLogger.options = parent.options
 
   childLogger.write = function write(level, args, _extra) {

package/package.json

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