dd-trace 5.103.0 → 5.105.0

package/packages/dd-trace/src/plugins/index.js

@@ -4,6 +4,7 @@ const plugins = {
   get '@anthropic-ai/sdk' () { return require('../../../datadog-plugin-anthropic/src') },
   get '@apollo/gateway' () { return require('../../../datadog-plugin-apollo/src') },
   get '@aws-sdk/smithy-client' () { return require('../../../datadog-plugin-aws-sdk/src') },
+  get '@azure/cosmos' () { return require('../../../datadog-plugin-azure-cosmos/src') },
   get '@azure/event-hubs' () { return require('../../../datadog-plugin-azure-event-hubs/src') },
   get '@azure/functions' () { return require('../../../datadog-plugin-azure-functions/src') },
   get '@modelcontextprotocol/sdk' () { return require('../../../datadog-plugin-modelcontextprotocol-sdk/src') },
@@ -30,6 +31,7 @@ const plugins = {
   get '@prisma/client' () { return require('../../../datadog-plugin-prisma/src') },
   get './runtime/library.js' () { return require('../../../datadog-plugin-prisma/src') },
   get '@redis/client' () { return require('../../../datadog-plugin-redis/src') },
+  get '@smithy/core' () { return require('../../../datadog-plugin-aws-sdk/src') },
   get '@smithy/smithy-client' () { return require('../../../datadog-plugin-aws-sdk/src') },
   get '@vitest/runner' () { return require('../../../datadog-plugin-vitest/src') },
   get '@langchain/langgraph' () { return require('../../../datadog-plugin-langgraph/src') },
@@ -90,6 +92,8 @@ const plugins = {
   get mongoose () { return require('../../../datadog-plugin-mongoose/src') },
   get mysql () { return require('../../../datadog-plugin-mysql/src') },
   get mysql2 () { return require('../../../datadog-plugin-mysql2/src') },
+  get '@nats-io/nats-core' () { return require('../../../datadog-plugin-nats/src') },
+  get '@nats-io/transport-node' () { return require('../../../datadog-plugin-nats/src') },
   get net () { return require('../../../datadog-plugin-net/src') },
   get next () { return require('../../../datadog-plugin-next/src') },
   get 'node:dns' () { return require('../../../datadog-plugin-dns/src') },

package/packages/dd-trace/src/plugins/log_injection.js

@@ -0,0 +1,56 @@
+'use strict'
+
+const { LOG } = require('../../../../ext/formats')
+const { storage } = require('../../../datadog-core')
+
+const legacyStorage = storage('legacy')
+
+/**
+ * Runs the tracer's log injector and returns the populated log holder, or
+ * `undefined` when the propagator emitted no `dd` field (no span, no
+ * service / version / env). Hot-path callers gate on the return.
+ *
+ * @param {object} tracer
+ * @returns {{ dd: object } | undefined}
+ */
+function buildLogHolder (tracer) {
+  const logHolder = {}
+  tracer.inject(legacyStorage.getStore()?.span, LOG, logHolder)
+  return logHolder.dd ? logHolder : undefined
+}
+
+/**
+ * @param {object} message Caller-owned log record; never mutated.
+ * @param {{ dd: object }} logHolder Holds the dd fields injected by the tracer.
+ */
+function messageProxy (message, logHolder) {
+  return new Proxy(message, {
+    get (target, key) {
+      if (shouldOverride(target, key)) return logHolder.dd
+      return target[key]
+    },
+    set (target, key, value) {
+      return Reflect.set(target, key, value)
+    },
+    ownKeys (target) {
+      const ownKeys = Reflect.ownKeys(target)
+      if (!Object.hasOwn(target, 'dd') && Reflect.isExtensible(target)) {
+        ownKeys.push('dd')
+      }
+      return ownKeys
+    },
+    getOwnPropertyDescriptor (target, p) {
+      return Reflect.getOwnPropertyDescriptor(shouldOverride(target, p) ? logHolder : target, p)
+    },
+  })
+}
+
+/**
+ * @param {object} target
+ * @param {string | symbol} p
+ */
+function shouldOverride (target, p) {
+  return p === 'dd' && !Object.hasOwn(target, p) && Reflect.isExtensible(target)
+}
+
+module.exports = { buildLogHolder, messageProxy }

package/packages/dd-trace/src/plugins/log_plugin.js

@@ -1,53 +1,8 @@
 'use strict'
 
-const { LOG } = require('../../../../ext/formats')
-const { storage } = require('../../../datadog-core')
 const Plugin = require('./plugin')
 
-function messageProxy (message, holder) {
-  return new Proxy(message, {
-    get (target, key) {
-      if (shouldOverride(target, key)) {
-        return holder.dd
-      }
-
-      return target[key]
-    },
-    set (target, key, value) {
-      return Reflect.set(target, key, value)
-    },
-    ownKeys (target) {
-      const ownKeys = Reflect.ownKeys(target)
-      if (!Object.hasOwn(target, 'dd') && Reflect.isExtensible(target)) {
-        ownKeys.push('dd')
-      }
-      return ownKeys
-    },
-    getOwnPropertyDescriptor (target, p) {
-      return Reflect.getOwnPropertyDescriptor(shouldOverride(target, p) ? holder : target, p)
-    },
-  })
-}
-
-function shouldOverride (target, p) {
-  return p === 'dd' && !Object.hasOwn(target, p) && Reflect.isExtensible(target)
-}
-
-module.exports = class LogPlugin extends Plugin {
-  constructor (...args) {
-    super(...args)
-
-    this.addSub(`apm:${this.constructor.id}:log`, (arg) => {
-      const span = storage('legacy').getStore()?.span
-
-      // NOTE: This needs to run whether or not there is a span
-      // so service, version, and env will always get injected.
-      const holder = {}
-      this.tracer.inject(span, LOG, holder)
-      arg.message = messageProxy(arg.message, holder)
-    })
-  }
-
+class LogPlugin extends Plugin {
   configure (config) {
     return super.configure({
       ...config,
@@ -55,3 +10,5 @@ module.exports = class LogPlugin extends Plugin {
     })
   }
 }
+
+module.exports = LogPlugin

package/packages/dd-trace/src/plugins/outbound.js

@@ -125,7 +125,7 @@ class OutboundPlugin extends TracingPlugin {
    */
   tagPeerService (span) {
     if (this._tracerConfig.spanComputePeerService) {
-      const peerData = this.getPeerService(span.context()._tags)
+      const peerData = this.getPeerService(span.context().getTags())
       if (peerData !== undefined) {
         span.addTags(this.getPeerServiceRemap(peerData))
       }

package/packages/dd-trace/src/plugins/plugin.js

@@ -6,6 +6,8 @@ const dc = require('dc-polyfill')
 const logger = require('../log')
 const { storage } = require('../../../datadog-core')
 
+const legacyStorage = storage('legacy')
+
 /**
  * Base class for all Datadog plugins.
  *
@@ -28,8 +30,7 @@ class Subscription {
   constructor (event, handler) {
     this._channel = dc.channel(event)
     this._handler = (message, name) => {
-      const store = storage('legacy').getStore()
-      if (!store || !store.noop) {
+      if (!legacyStorage.getHandle()?.noop) {
         handler(message, name)
       }
     }
@@ -50,20 +51,20 @@ class StoreBinding {
   constructor (event, transform) {
     this._channel = dc.channel(event)
     this._transform = data => {
-      const store = storage('legacy').getStore()
+      const handle = legacyStorage.getHandle()
 
-      return !store || !store.noop || (data && Object.hasOwn(data, 'currentStore'))
+      return !handle?.noop || (data && Object.hasOwn(data, 'currentStore'))
         ? transform(data)
-        : store
+        : legacyStorage.getStore()
     }
   }
 
   enable () {
-    this._channel.bindStore(storage('legacy'), this._transform)
+    this._channel.bindStore(legacyStorage, this._transform)
   }
 
   disable () {
-    this._channel.unbindStore(storage('legacy'))
+    this._channel.unbindStore(legacyStorage)
   }
 }
 
@@ -102,24 +103,21 @@ module.exports = class Plugin {
    * @returns {void}
    */
   enter (span, store) {
-    store = store || storage('legacy').getStore()
-    storage('legacy').enterWith({ ...store, span })
+    store = store || legacyStorage.getStore()
+    legacyStorage.enterWith({ ...store, span })
   }
 
   /**
    * Subscribe to a diagnostic channel with automatic error handling and enable/disable lifecycle.
    *
    * @param {string} channelName Diagnostic channel name.
-   * @param {(...args: unknown[]) => unknown} handler Handler invoked on messages.
+   * @param {(message: unknown, name: string) => unknown} handler Handler invoked on messages.
    * @returns {void}
    */
   addSub (channelName, handler) {
-    /**
-     * @type {typeof handler}
-     */
-    const wrappedHandler = (...args) => {
+    const wrappedHandler = (message, name) => {
       try {
-        return handler.apply(this, args)
+        return handler.call(this, message, name)
       } catch (error) {
         logger.error('Error in plugin handler:', error)
         logger.info('Disabling plugin: %s', this.constructor.name)
@@ -147,12 +145,12 @@ module.exports = class Plugin {
    * @returns {void}
    */
   addError (error) {
-    const store = storage('legacy').getStore()
+    const store = legacyStorage.getStore()
 
     if (!store || !store.span) return
 
     const span = /** @type {import('../opentracing/span')} */ (store.span)
-    if (!span._spanContext._tags.error) {
+    if (!span.context().getTag('error')) {
       span.setTag('error', error || 1)
     }
   }

package/packages/dd-trace/src/plugins/tracing.js

@@ -3,8 +3,11 @@
 const { storage } = require('../../../datadog-core')
 const analyticsSampler = require('../analytics_sampler')
 const { COMPONENT, SVC_SRC_KEY } = require('../constants')
+const { INTEGRATION_SERVICE } = require('../service-naming/source-resolver')
 const Plugin = require('./plugin')
 
+const legacyStorage = storage('legacy')
+
 class TracingPlugin extends Plugin {
   constructor (...args) {
     super(...args)
@@ -16,7 +19,7 @@ class TracingPlugin extends Plugin {
   }
 
   get activeSpan () {
-    const store = /** @type {{ span?: import('../../../..').Span }} */ (storage('legacy').getStore())
+    const store = /** @type {{ span?: import('../../../..').Span }} */ (legacyStorage.getStore())
 
     return store?.span
   }
@@ -97,13 +100,11 @@ class TracingPlugin extends Plugin {
       const bindName = `bind${event.charAt(0).toUpperCase()}${event.slice(1)}`
 
       if (this[event]) {
-        this.addTraceSub(event, message => {
-          this[event](message)
-        })
+        this.addTraceSub(event, this[event].bind(this))
       }
 
       if (this[bindName]) {
-        this.addTraceBind(event, message => this[bindName](message))
+        this.addTraceBind(event, this[bindName].bind(this))
       }
     }
   }
@@ -126,12 +127,49 @@ class TracingPlugin extends Plugin {
     this.addBind(`${prefix}:${eventName}`, transform)
   }
 
+  /**
+   * Record the integration's intended `service.name` on a span without writing the tag.
+   *
+   * Use this when the plugin has already set `service.name` directly on the span (e.g. via
+   * the `tracer.startSpan` tags object) and only needs to stamp the marker so
+   * `Span#finish` can later detect user overrides and re-attribute the source.
+   *
+   * Prefer {@link TracingPlugin#setServiceName} when the tag itself also needs to be written.
+   *
+   * No-op when there is nothing meaningful to record
+   *
+   * @param {import('../opentracing/span')} span Internal DatadogSpan instance.
+   * @param {string|undefined} name Service name the integration is claiming.
+   */
+  stampIntegrationService (span, name) {
+    if (name === undefined) return
+    span[INTEGRATION_SERVICE] = name
+  }
+
+  /**
+   * Set `service.name` on a span on behalf of this integration and stamp the marker.
+   *
+   * Use this for late-binding cases where the service is not known at startSpan time
+   * (e.g. web framework config applied after the span is already open).
+   *
+   * For spans started via {@link TracingPlugin#startSpan}, pass `service` as an option
+   * instead — it sets the tag and stamps the marker in one step.
+   *
+   * @param {import('../opentracing/span')} span Internal DatadogSpan instance.
+   * @param {string} name Service name the integration is claiming.
+   */
+  setServiceName (span, name) {
+    // eslint-disable-next-line eslint-rules/eslint-prefer-set-service-name -- this is the implementation
+    span._spanContext.setTag('service.name', name)
+    this.stampIntegrationService(span, name)
+  }
+
   /**
    * @param {unknown} error
    * @param {import('../../../..').Span} [span]
    */
   addError (error, span = this.activeSpan) {
-    if (span && !span._spanContext._tags.error) {
+    if (span && !span.context().getTag('error')) {
       // Errors may be wrapped in a context.
       span.setTag('error', error?.error || error || 1)
     }
@@ -193,7 +231,7 @@ class TracingPlugin extends Plugin {
       serviceSource = service ? 'opt.plugin' : undefined
     }
 
-    const store = storage('legacy').getStore()
+    const store = legacyStorage.getStore()
     if (store && childOf === undefined) {
       childOf = /** @type {import('../opentracing/span') | undefined} */ (store.span)
     }
@@ -222,11 +260,13 @@ class TracingPlugin extends Plugin {
       links: childOf?._links,
     })
 
+    this.stampIntegrationService(span, serviceName)
+
     analyticsSampler.sample(span, config.measured)
 
     // TODO: Remove this after migration to TracingChannel is done.
     if (enterOrCtx === true) {
-      storage('legacy').enterWith({ ...store, span })
+      legacyStorage.enterWith({ ...store, span })
     } else if (enterOrCtx) {
       enterOrCtx.parentStore = store
       enterOrCtx.currentStore = { ...store, span }

package/packages/dd-trace/src/plugins/util/git.js

@@ -37,6 +37,8 @@ const {
 const { filterSensitiveInfoFromRepository } = require('./url')
 const { cachedExec } = require('./git-cache')
 
+const legacyStorage = storage('legacy')
+
 const GIT_REV_LIST_MAX_BUFFER = 12 * 1024 * 1024 // 12MB
 
 function sanitizedExec (
@@ -47,7 +49,7 @@ function sanitizedExec (
   errorMetric,
   shouldTrim = true
 ) {
-  return storage('legacy').run({ noop: true }, () => {
+  return legacyStorage.run({ noop: true }, () => {
     let startTime
     if (operationMetric) {
       incrementCountMetric(operationMetric.name, operationMetric.tags)