newrelic 12.13.0 → 12.15.0

package/NEWS.md

@@ -1,27 +1,71 @@
-### v12.13.0 (2025-02-12)
-
-#### Features
-
-* Added timeslice metrics for synthesized server segments ([#2924](https://github.com/newrelic/node-newrelic/pull/2924)) ([f404585](https://github.com/newrelic/node-newrelic/commit/f4045855a1cdbfb74e3217daf8bfa125aa6fe2e4))
-* Added timeslice metrics for synthesized producer segments ([#2939](https://github.com/newrelic/node-newrelic/pull/2939)) ([6832637](https://github.com/newrelic/node-newrelic/commit/68326377dcd23b574abae7c323ff93bc05c525ed))
-* Added timeslice metrics for synthesized database segments ([#2922](https://github.com/newrelic/node-newrelic/pull/2922)) ([8606f78](https://github.com/newrelic/node-newrelic/commit/8606f789772b7651d0c46ad50dad3a1da74e5e9c))
-* Propagate agent root context when opentelemetry `ROOT_CONTEXT` is passed in to trace propagator.([#2940](https://github.com/newrelic/node-newrelic/pull/2940)) ([b85111c](https://github.com/newrelic/node-newrelic/commit/b85111c46797dfbf399faf973e7a3e0ea6bbdc28)) 
-  * Added logic to handle properly naming and ending transactions for server spans. 
-* Provided ability to disable instrumentation for core Node.js libraries ([#2927](https://github.com/newrelic/node-newrelic/pull/2927)) ([2d232f1](https://github.com/newrelic/node-newrelic/commit/2d232f16c167e5f84b7b7898a6c5410d9cece55e))
-
-#### Bug fixes
-
-* Fixed `api.getTraceMetadata` to handle when there is an active transaction but not active segment ([#2944](https://github.com/newrelic/node-newrelic/pull/2944)) ([6db3b4d](https://github.com/newrelic/node-newrelic/commit/6db3b4d53a077a9738dd72d46e1ba1cee0d6af3f))
-
-#### Documentation
-
-* Updated compatibility report ([#2920](https://github.com/newrelic/node-newrelic/pull/2920)) ([c7ae8be](https://github.com/newrelic/node-newrelic/commit/c7ae8befafa4c91fab6804cd95e20f5a93546ea4))
-
-#### Miscellaneous chores
-
-* Localized OTEL attribute constants ([#2928](https://github.com/newrelic/node-newrelic/pull/2928)) ([965c41b](https://github.com/newrelic/node-newrelic/commit/965c41b3e64805ac14ae4dd36120b018ec5899f4))
-* Updated import-in-the-middle version ([#2923](https://github.com/newrelic/node-newrelic/pull/2923)) ([aa2781f](https://github.com/newrelic/node-newrelic/commit/aa2781fd9c7bed08d590e33682729a92f21f43a5))
-
+### v12.15.0 (2025-03-03)
+
+#### Features
+
+* Allowed undici error reporting to be disabled with feature flag `undici_error_tracking` ([#2956](https://github.com/newrelic/node-newrelic/pull/2956)) ([6278107](https://github.com/newrelic/node-newrelic/commit/6278107727678c8b45769190c6972c33057067e5))
+     * Thanks for your contribution @Voziv :tada:
+* Added ability to propagate traceparent and tracestate on incoming server/consumer spans and outgoing client http and producer spans ([#2958](https://github.com/newrelic/node-newrelic/pull/2958)) ([258ad7d](https://github.com/newrelic/node-newrelic/commit/258ad7de7751df59cf6d68334e342f751bb3a934))
+* Added server span transaction naming fallback to the url.path ([#2966](https://github.com/newrelic/node-newrelic/pull/2966)) ([770bf6f](https://github.com/newrelic/node-newrelic/commit/770bf6fd6ce26642e3fe08b2c1557dd826270516))
+* Updated Context class to ensure bi-directional context propagation with opentelemetry bridge ([#2962](https://github.com/newrelic/node-newrelic/pull/2962)) ([dfeec5a](https://github.com/newrelic/node-newrelic/commit/dfeec5a0443723e7f799db4b9ea7bf4aed5b3bcc))
+
+#### Code refactoring
+
+* Separated context classes for agent in standard and opentelemetry bridge mode ([#2967](https://github.com/newrelic/node-newrelic/pull/2967)) ([d11c071](https://github.com/newrelic/node-newrelic/commit/d11c071be2504ef442e5aa19fed769ca7a20ceb5))
+
+#### Documentation
+
+* Updated compatibility report ([#2973](https://github.com/newrelic/node-newrelic/pull/2973)) ([7106c81](https://github.com/newrelic/node-newrelic/commit/7106c818b7add3220d256646cd816dee64efb80a))
+
+#### Miscellaneous chores
+
+* Added consumer attribute reconciliation ([#2957](https://github.com/newrelic/node-newrelic/pull/2957)) ([8943672](https://github.com/newrelic/node-newrelic/commit/894367239e5e8050da0a38347b81d7186cac0a1f))
+* Added http external span attributes ([#2955](https://github.com/newrelic/node-newrelic/pull/2955)) ([ef697a5](https://github.com/newrelic/node-newrelic/commit/ef697a505ee23f5c2fb2bbe306e90561e66d75c1))
+* Limit nestjs to enable successful CI ([#2972](https://github.com/newrelic/node-newrelic/pull/2972)) ([e9699cf](https://github.com/newrelic/node-newrelic/commit/e9699cf31ff758ff79f44c470bc5f11630117f1c))
+* Refactored otel attribute reconciling ([#2964](https://github.com/newrelic/node-newrelic/pull/2964)) ([1b5ed2c](https://github.com/newrelic/node-newrelic/commit/1b5ed2c2f7c78cb413603124757b9b1c3412ab0a))
+
+### 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
+
+* Added timeslice metrics for synthesized server segments ([#2924](https://github.com/newrelic/node-newrelic/pull/2924)) ([f404585](https://github.com/newrelic/node-newrelic/commit/f4045855a1cdbfb74e3217daf8bfa125aa6fe2e4))
+* Added timeslice metrics for synthesized producer segments ([#2939](https://github.com/newrelic/node-newrelic/pull/2939)) ([6832637](https://github.com/newrelic/node-newrelic/commit/68326377dcd23b574abae7c323ff93bc05c525ed))
+* Added timeslice metrics for synthesized database segments ([#2922](https://github.com/newrelic/node-newrelic/pull/2922)) ([8606f78](https://github.com/newrelic/node-newrelic/commit/8606f789772b7651d0c46ad50dad3a1da74e5e9c))
+* Propagate agent root context when opentelemetry `ROOT_CONTEXT` is passed in to trace propagator.([#2940](https://github.com/newrelic/node-newrelic/pull/2940)) ([b85111c](https://github.com/newrelic/node-newrelic/commit/b85111c46797dfbf399faf973e7a3e0ea6bbdc28)) 
+  * Added logic to handle properly naming and ending transactions for server spans. 
+* Provided ability to disable instrumentation for core Node.js libraries ([#2927](https://github.com/newrelic/node-newrelic/pull/2927)) ([2d232f1](https://github.com/newrelic/node-newrelic/commit/2d232f16c167e5f84b7b7898a6c5410d9cece55e))
+
+#### Bug fixes
+
+* Fixed `api.getTraceMetadata` to handle when there is an active transaction but not active segment ([#2944](https://github.com/newrelic/node-newrelic/pull/2944)) ([6db3b4d](https://github.com/newrelic/node-newrelic/commit/6db3b4d53a077a9738dd72d46e1ba1cee0d6af3f))
+
+#### Documentation
+
+* Updated compatibility report ([#2920](https://github.com/newrelic/node-newrelic/pull/2920)) ([c7ae8be](https://github.com/newrelic/node-newrelic/commit/c7ae8befafa4c91fab6804cd95e20f5a93546ea4))
+
+#### Miscellaneous chores
+
+* Localized OTEL attribute constants ([#2928](https://github.com/newrelic/node-newrelic/pull/2928)) ([965c41b](https://github.com/newrelic/node-newrelic/commit/965c41b3e64805ac14ae4dd36120b018ec5899f4))
+* Updated import-in-the-middle version ([#2923](https://github.com/newrelic/node-newrelic/pull/2923)) ([aa2781f](https://github.com/newrelic/node-newrelic/commit/aa2781fd9c7bed08d590e33682729a92f21f43a5))
+
 ### v12.12.0 (2025-02-05)
 
 #### 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/context-manager/async-local-context-manager.js

@@ -7,6 +7,7 @@
 
 const { AsyncLocalStorage } = require('async_hooks')
 const Context = require('./context')
+const OtelContext = require('../otel/context')
 
 /**
  * Class for managing state in the agent.
@@ -18,7 +19,8 @@ const Context = require('./context')
  * @class
  */
 class AsyncLocalContextManager {
-  constructor() {
+  constructor(isOtelBridgeMode) {
+    this.isOtelBridgeMode = isOtelBridgeMode
     this._asyncLocalStorage = new AsyncLocalStorage()
   }
 
@@ -28,7 +30,7 @@ class AsyncLocalContextManager {
    * @returns {object} The current active context.
    */
   getContext() {
-    return this._asyncLocalStorage.getStore() || new Context()
+    return this._asyncLocalStorage.getStore() || (this.isOtelBridgeMode ? new OtelContext() : new Context())
   }
 
   /**

package/lib/context-manager/context.js

@@ -4,13 +4,11 @@
  */
 
 'use strict'
-const { otelSynthesis } = require('../symbols')
 
 module.exports = class Context {
-  constructor(transaction, segment, parentContext) {
+  constructor(transaction, segment) {
     this._transaction = transaction
     this._segment = segment
-    this._otelCtx = parentContext ? new Map(parentContext) : new Map()
   }
 
   get segment() {
@@ -21,58 +19,27 @@ module.exports = class Context {
     return this._transaction
   }
 
-  enterSegment({ segment, transaction = this._transaction }) {
-    return new this.constructor(transaction, segment)
-  }
-
-  enterTransaction(transaction) {
-    return new this.constructor(transaction, transaction.trace.root)
-  }
-
-  /**
-   * Required for bridging OTEL data into the agent.
-   *
-   * @param {string} key Stored entity name to retrieve.
-   *
-   * @returns {*} The stored value.
-   */
-  getValue(key) {
-    return this._otelCtx.get(key)
-  }
-
   /**
-   * Required for bridging OTEL data into the agent.
+   * Constructs a new context from segment about to be bound to context manager
+   * along with the current transaction.
    *
-   * @param {string} key Name for stored value.
-   * @param {*} value Value to store.
-   *
-   * @returns {object} The context manager object.
+   * @param {object} params to function
+   * @param {TraceSegment} params.segment segment to bind to context
+   * @param {Transaction} params.transaction active transaction
+   * @returns {Context} a newly constructed context
    */
-  setValue(key, value) {
-    let ctx
-
-    if (value[otelSynthesis] && value[otelSynthesis].segment && value[otelSynthesis].transaction) {
-      const { segment, transaction } = value[otelSynthesis]
-      segment.start()
-      ctx = new this.constructor(transaction, segment, this._otelCtx)
-    } else {
-      ctx = new this.constructor(this._transaction, this._segment, this._otelCtx)
-    }
-
-    ctx._otelCtx.set(key, value)
-    return ctx
+  enterSegment({ segment, transaction = this._transaction }) {
+    return new this.constructor(transaction, segment, this._otelCtx)
   }
 
   /**
-   * Required for bridging OTEL data into the agent.
-   *
-   * @param {string} key Named value to remove from the store.
+   * Constructs a new context from transaction about to be bound to context manager.
+   * It uses the trace root segment as the segment in context.
    *
-   * @returns {object} The context manager object.
+   * @param {Transaction} transaction transaction to bind to context
+   * @returns {Context} a newly constructed context
    */
-  deleteValue(key) {
-    const ctx = new this.constructor(this._transaction, this._segment, this._otelCtx)
-    ctx._otelCtx.delete(key)
-    return ctx
+  enterTransaction(transaction) {
+    return new this.constructor(transaction, transaction.trace.root)
   }
 }

package/lib/feature_flags.js

@@ -14,7 +14,8 @@ exports.prerelease = {
   promise_segments: false,
   reverse_naming_rules: false,
   unresolved_promise_cleanup: true,
-  kafkajs_instrumentation: false
+  kafkajs_instrumentation: false,
+  undici_error_tracking: true
 }
 
 // flags that are no longer used for released features

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')
   }
@@ -192,6 +192,7 @@ function requestHeadersHook(shim, { request, response }) {
  * @param {Error} params.error error from undici request
  */
 function endAndRestoreSegment(shim, { request, error }) {
+  const { config } = shim.agent
   const activeSegment = request[symbols.segment]
   const parentSegment = request[symbols.parentSegment]
   const tx = request[symbols.transaction]
@@ -199,7 +200,7 @@ function endAndRestoreSegment(shim, { request, error }) {
     activeSegment.end()
   }
 
-  if (error && tx) {
+  if (error && tx && config.feature_flag.undici_error_tracking === true) {
     handleError(shim, tx, error)
   }
 

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/attr-reconciler.js

@@ -0,0 +1,52 @@
+/*
+ * Copyright 2025 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+
+const urltils = require('../util/urltils')
+const constants = require('./constants')
+
+const hostKeys = [
+  constants.ATTR_NET_HOST_NAME,
+  constants.ATTR_NET_PEER_NAME,
+  constants.ATTR_SERVER_ADDRESS
+]
+
+class AttributeReconciler {
+  #agent
+
+  constructor({ agent }) {
+    this.#agent = agent
+  }
+
+  #resolveHost(hostname) {
+    if (urltils.isLocalhost(hostname)) {
+      return this.#agent.config.getHostnameSafe(hostname)
+    }
+    return hostname
+  }
+
+  #isHostnameKey(key) {
+    return hostKeys.includes(key)
+  }
+
+  reconcile({ segment, otelSpan, mapper = {} }) {
+    for (const [key, srcValue] of Object.entries(otelSpan.attributes)) {
+      let value = srcValue
+
+      if (this.#isHostnameKey(key) === true) {
+        value = this.#resolveHost(srcValue)
+      }
+
+      if (Object.prototype.hasOwnProperty.call(mapper, key) === true) {
+        mapper[key](value)
+      } else {
+        segment.addAttribute(key, value)
+      }
+    }
+  }
+}
+
+module.exports = AttributeReconciler

package/lib/otel/constants.js

@@ -111,7 +111,14 @@ module.exports = {
    *
    * @example 200
    */
-  ATTR_HTTP_STATUS_CODE: 'http.response.status_code',
+  ATTR_HTTP_RES_STATUS_CODE: 'http.response.status_code',
+
+  /**
+   * The http response status code
+   *
+   * {@link ATTR_HTTP_RES_STATUS_CODE} is new and should be used instead.
+   */
+  ATTR_HTTP_STATUS_CODE: 'http.status_code',
 
   /**
    * The http response status text
@@ -120,6 +127,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 +155,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.
    *
@@ -222,6 +259,13 @@ module.exports = {
    */
   ATTR_URL_SCHEME: 'url.scheme',
 
+  /**
+   * The URI query string.
+   *
+   * @example q=foo
+   */
+  ATTR_URL_QUERY: 'url.query',
+
   /* !!! Miscellaneous !!! */
   /**
    * Database system names.

package/lib/otel/context.js

@@ -0,0 +1,89 @@
+/*
+ * Copyright 2025 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+const { otelSynthesis } = require('../symbols')
+const FakeSpan = require('./fake-span')
+const Context = require('../context-manager/context')
+
+module.exports = class OtelContext extends Context {
+  constructor(transaction, segment, parentContext) {
+    super(transaction, segment)
+    this._otelCtx = parentContext ? new Map(parentContext) : new Map()
+  }
+
+  /**
+   * Constructs a new context from segment about to be bound to context manager
+   * along with the current transaction. It will also bind a FakeSpan to the `_otelCtx`
+   *
+   * @param {object} params to function
+   * @param {TraceSegment} params.segment segment to bind to context
+   * @param {Transaction} params.transaction active transaction
+   * @returns {OtelContext} a newly constructed context
+   */
+  enterSegment({ segment, transaction = this._transaction }) {
+    this._otelCtx.set(transaction.agent.otelSpanKey, new FakeSpan(segment, transaction))
+    return new this.constructor(transaction, segment, this._otelCtx)
+  }
+
+  /**
+   * Constructs a new context from transaction about to be bound to context manager.
+   * It uses the trace root segment as the segment in context. It will also bind a FakeSpan to the `_otelCtx`.
+   *
+   * @param {Transaction} transaction transaction to bind to context
+   * @returns {OtelContext} a newly constructed context
+   */
+  enterTransaction(transaction) {
+    this._otelCtx.set(transaction.agent.otelSpanKey, new FakeSpan(transaction.trace.root, transaction))
+    return new this.constructor(transaction, transaction.trace.root, this._otelCtx)
+  }
+
+  /**
+   * Used to retrieve data from `_otelCtx`
+   *
+   * @param {string} key Stored entity name to retrieve.
+   *
+   * @returns {*} The stored value.
+   */
+  getValue(key) {
+    return this._otelCtx.get(key)
+  }
+
+  /**
+   * Used to set data on `_otelCtx`
+   *
+   * @param {string} key Name for stored value.
+   * @param {*} value Value to store.
+   *
+   * @returns {OtelContext} The context object.
+   */
+  setValue(key, value) {
+    let ctx
+
+    if (value[otelSynthesis] && value[otelSynthesis].segment && value[otelSynthesis].transaction) {
+      const { segment, transaction } = value[otelSynthesis]
+      segment.start()
+      ctx = new this.constructor(transaction, segment, this._otelCtx)
+    } else {
+      ctx = new this.constructor(this._transaction, this._segment, this._otelCtx)
+    }
+
+    ctx._otelCtx.set(key, value)
+    return ctx
+  }
+
+  /**
+   * Used to remove data from `_otelCtx`
+   *
+   * @param {string} key Named value to remove from the store.
+   *
+   * @returns {OtelContext} The context object.
+   */
+  deleteValue(key) {
+    const ctx = new this.constructor(this._transaction, this._segment, this._otelCtx)
+    ctx._otelCtx.delete(key)
+    return ctx
+  }
+}

package/lib/otel/fake-span.js

@@ -0,0 +1,28 @@
+/*
+ * Copyright 2025 New Relic Corporation. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+'use strict'
+
+/**
+ * In order to be able to return the appropriate span context
+ * wihtin otel bridge. We have to create fake spans for new relic
+ * segments.  The only thing needed is a method for `spanContext`
+ * which should return the spanId(segment id) and traceId(transaction trace id).
+ * We hardcode traceFlags to 1.
+ */
+module.exports = class FakeSpan {
+  constructor(segment, transaction) {
+    this.segment = segment
+    this.transaction = transaction
+  }
+
+  spanContext() {
+    return {
+      spanId: this.segment.id,
+      traceId: this.transaction.traceId,
+      traceFlags: 1
+    }
+  }
+}

package/lib/otel/segments/consumer.js

@@ -13,34 +13,36 @@ module.exports = createConsumerSegment
 // attributes according to our own internal specs.
 
 const Transaction = require('../../transaction/')
-const { DESTINATIONS, TYPES } = Transaction
+const recorder = require('../../metrics/recorders/message-transaction')
+const { TYPES } = Transaction
+const { propagateTraceContext } = require('./utils')
 
 const {
   ATTR_MESSAGING_DESTINATION,
   ATTR_MESSAGING_DESTINATION_KIND,
+  ATTR_MESSAGING_DESTINATION_NAME,
   ATTR_MESSAGING_SYSTEM
 } = require('../constants')
 
 function createConsumerSegment(agent, otelSpan) {
-  const transaction = new Transaction(agent)
-  transaction.type = TYPES.BG
-
-  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 txAttrs = transaction.trace.attributes
-  txAttrs.addAttribute(DESTINATIONS.TRANS_SCOPE, 'message.queueName', destination)
-  // txAttrs.addAttribute(
-  //   DESTINATIONS.TRANS_SCOPE,
-  //   'host',
-  //
-  // )
-  transaction.name = segmentName
+  const attrs = otelSpan.attributes
+  const spanContext = otelSpan.spanContext()
+  const transaction = new Transaction(agent, spanContext?.traceId)
+  transaction.type = TYPES.MESSAGE
+
+  const system = attrs[ATTR_MESSAGING_SYSTEM] ?? 'unknown'
+  // _NAME is the current preferred attribute with semantic conventions >=1.3.0.
+  const destination = attrs[ATTR_MESSAGING_DESTINATION_NAME] ?? attrs[ATTR_MESSAGING_DESTINATION] ?? 'unknown'
+  const destKind = attrs[ATTR_MESSAGING_DESTINATION_KIND] ?? 'unknown'
+  const segmentName = `${system}/${destKind}/Named/${destination}`
+
+  transaction.setPartialName(segmentName)
+  propagateTraceContext({ transaction, otelSpan, transport: system })
 
   const segment = agent.tracer.createSegment({
-    name: segmentName,
+    id: spanContext?.spanId,
+    recorder,
+    name: transaction.getFullName(),
     parent: transaction.trace.root,
     transaction
   })

package/lib/otel/segments/database.js

@@ -29,6 +29,7 @@ module.exports = function createDbSegment(agent, otelSpan) {
   const parsed = parseStatement(agent.config, otelSpan, system)
   const { name, operation } = setName(parsed)
   const segment = agent.tracer.createSegment({
+    id: otelSpan?.spanContext()?.spanId,
     name,
     recorder: getRecorder({ operation, parsed, system }),
     parent: context.segment,

package/lib/otel/segments/http-external.js

@@ -7,20 +7,50 @@
 
 const NAMES = require('../../metrics/names')
 const recordExternal = require('../../metrics/recorders/http_external')
+const urltils = require('../../util/urltils')
 
 const {
-  ATTR_HTTP_HOST
+  ATTR_FULL_URL,
+  ATTR_HTTP_URL,
+  ATTR_HTTP_METHOD,
+  ATTR_HTTP_REQUEST_METHOD,
+  ATTR_NET_PEER_NAME,
+  ATTR_SERVER_ADDRESS
 } = require('../constants')
 
 module.exports = function createHttpExternalSegment(agent, otelSpan) {
   const context = agent.tracer.getContext()
-  const host = otelSpan.attributes[ATTR_HTTP_HOST] || 'Unknown'
-  const name = NAMES.EXTERNAL.PREFIX + host
+  const method = otelSpan.attributes[ATTR_HTTP_REQUEST_METHOD] || otelSpan.attributes[ATTR_HTTP_METHOD]
+  const host = otelSpan.attributes[ATTR_SERVER_ADDRESS] || otelSpan.attributes[ATTR_NET_PEER_NAME] || 'Unknown'
+
+  const url = otelSpan.attributes[ATTR_FULL_URL] || otelSpan.attributes[ATTR_HTTP_URL]
+  let name = NAMES.EXTERNAL.PREFIX + host
+  let parsedUrl
+  let obfuscatedPath
+  if (url) {
+    parsedUrl = new URL(url)
+    obfuscatedPath = urltils.obfuscatePath(agent.config, parsedUrl.pathname)
+    name += obfuscatedPath
+  }
+
   const segment = agent.tracer.createSegment({
+    id: otelSpan?.spanContext()?.spanId,
     name,
     recorder: recordExternal(host, 'http'),
     parent: context.segment,
     transaction: context.transaction
   })
+
+  if (parsedUrl && segment) {
+    segment.captureExternalAttributes({
+      protocol: parsedUrl.protocol,
+      hostname: parsedUrl.hostname,
+      host: parsedUrl.host,
+      method,
+      port: parsedUrl.port,
+      path: obfuscatedPath,
+      queryParams: Object.fromEntries(parsedUrl.searchParams.entries())
+    })
+  }
   return { segment, transaction: context.transaction }
 }

package/lib/otel/segments/internal.js

@@ -10,6 +10,7 @@ module.exports = function createInternalSegment(agent, otelSpan) {
   const context = agent.tracer.getContext()
   const name = otelSpan.name
   const segment = agent.tracer.createSegment({
+    id: otelSpan?.spanContext()?.spanId,
     name,
     parent: context.segment,
     recorder: customRecorder,