dd-trace 5.51.0 → 5.52.0

package/packages/dd-trace/src/exporters/common/docker.js

@@ -10,43 +10,25 @@ const uuidSource =
 '[0-9a-f]{8}[-_][0-9a-f]{4}[-_][0-9a-f]{4}[-_][0-9a-f]{4}[-_][0-9a-f]{12}|[0-9a-f]{8}(?:-[0-9a-f]{4}){4}$'
 const containerSource = '[0-9a-f]{64}'
 const taskSource = '[0-9a-f]{32}-\\d+'
-const lineReg = /^(\d+):([^:]*):(.+)$/
+const lineReg = /^(\d+):([^:]*):(.+)$/m
 const entityReg = new RegExp(`.*(${uuidSource}|${containerSource}|${taskSource})(?:\\.scope)?$`, 'm')
 
-const cgroup = readControlGroup()
-const entityId = getEntityId()
-const inode = getInode()
+let inode = 0
+let cgroup = ''
+let entityId
 
-function getEntityId () {
-  const match = cgroup.match(entityReg) || []
+try {
+  cgroup = fs.readFileSync('/proc/self/cgroup', 'utf8').trim()
+  entityId = cgroup.match(entityReg)?.[1]
+} catch { /* Ignore error */ }
 
-  return match[1]
-}
-
-function getInode () {
-  const match = cgroup.match(lineReg) || []
-
-  return readInode(match[3])
-}
+const inodePath = cgroup.match(lineReg)?.[3]
+if (inodePath) {
+  const strippedPath = inodePath.replace(/^\/|\/$/g, '')
 
-function readControlGroup () {
   try {
-    return fs.readFileSync('/proc/self/cgroup').toString().trim()
-  } catch (err) {
-    return ''
-  }
-}
-
-function readInode (path) {
-  if (!path) return 0
-
-  const strippedPath = path.replace(/^\//, '').replace(/\/$/, '')
-
-  try {
-    return fs.statSync(`/sys/fs/cgroup/${strippedPath}`).ino
-  } catch (err) {
-    return 0
-  }
+    inode = fs.statSync(`/sys/fs/cgroup/${strippedPath}`).ino
+  } catch { /* Ignore error */ }
 }
 
 module.exports = {

package/packages/dd-trace/src/guardrails/telemetry.js

@@ -14,11 +14,8 @@ if (!process.env.DD_INJECTION_ENABLED) {
   module.exports = function () {}
 }
 
-if (!process.env.DD_TELEMETRY_FORWARDER_PATH) {
-  module.exports = function () {}
-}
-
-if (!fs.existsSync(process.env.DD_TELEMETRY_FORWARDER_PATH)) {
+var telemetryForwarderPath = process.env.DD_TELEMETRY_FORWARDER_PATH
+if (typeof telemetryForwarderPath !== 'string' || !fs.existsSync(telemetryForwarderPath)) {
   module.exports = function () {}
 }
 

package/packages/dd-trace/src/llmobs/writers/base.js

@@ -41,6 +41,18 @@ class BaseLLMObsWriter {
     this._destroyed = false
   }
 
+  get url () {
+    if (this._agentless == null) return null
+
+    const baseUrl = this._baseUrl.href
+    const endpoint = this._endpoint
+
+    // Split on protocol separator to preserve it
+    // path.join will remove some slashes unnecessarily
+    const [protocol, rest] = baseUrl.split('://')
+    return protocol + '://' + path.join(rest, endpoint)
+  }
+
   append (event, byteLength) {
     if (this._buffer.length >= this._bufferLimit) {
       logger.warn(`${this.constructor.name} event buffer full (limit is ${this._bufferLimit}), dropping event`)
@@ -69,7 +81,7 @@ class BaseLLMObsWriter {
     const options = this._getOptions()
 
     request(payload, options, (err, resp, code) => {
-      parseResponseAndLog(err, code, events.length, options.url.href, this._eventType)
+      parseResponseAndLog(err, code, events.length, this.url, this._eventType)
     })
   }
 
@@ -87,17 +99,23 @@ class BaseLLMObsWriter {
 
   setAgentless (agentless) {
     this._agentless = agentless
-    this._url = this._getUrl()
-    logger.debug(`Configuring ${this.constructor.name} to ${this._url.href}`)
+    const { url, endpoint } = this._getUrlAndPath()
+
+    this._baseUrl = url
+    this._endpoint = endpoint
+
+    logger.debug(`Configuring ${this.constructor.name} to ${this.url}`)
   }
 
-  _getUrl () {
+  _getUrlAndPath () {
     if (this._agentless) {
-      return new URL(format({
-        protocol: 'https:',
-        hostname: `${this._intake}.${this._config.site}`,
-        pathname: this._endpoint
-      }))
+      return {
+        url: new URL(format({
+          protocol: 'https:',
+          hostname: `${this._intake}.${this._config.site}`
+        })),
+        endpoint: this._endpoint
+      }
     }
 
     const { hostname, port } = this._config
@@ -107,8 +125,10 @@ class BaseLLMObsWriter {
       port
     }))
 
-    const proxyPath = path.join(EVP_PROXY_AGENT_BASE_PATH, this._endpoint)
-    return new URL(proxyPath, base)
+    return {
+      url: base,
+      endpoint: path.join(EVP_PROXY_AGENT_BASE_PATH, this._endpoint)
+    }
   }
 
   _getOptions () {
@@ -118,7 +138,8 @@ class BaseLLMObsWriter {
       },
       method: 'POST',
       timeout: this._timeout,
-      url: this._url
+      url: this._baseUrl,
+      path: this._endpoint
     }
 
     if (this._agentless) {

package/packages/dd-trace/src/noop/proxy.js

@@ -16,6 +16,11 @@ class NoopProxy {
     this.appsec = noopAppsec
     this.dogstatsd = noopDogStatsDClient
     this.llmobs = noopLLMObs
+    this.setBaggageItem = () => {}
+    this.getBaggageItem = () => {}
+    this.getAllBaggageItems = () => {}
+    this.removeBaggageItem = () => {}
+    this.removeAllBaggageItems = () => {}
   }
 
   init () {

package/packages/dd-trace/src/opentelemetry/context_manager.js

@@ -12,6 +12,7 @@ class ContextManager {
     this._store = storage('opentelemetry')
   }
 
+  // converts dd to otel
   active () {
     const activeSpan = tracer.scope().active()
     const store = this._store.getStore()
@@ -54,6 +55,7 @@ class ContextManager {
       : wrappedContext
   }
 
+  // converts otel to dd
   with (context, fn, thisArg, ...args) {
     const span = trace.getSpan(context)
     const ddScope = tracer.scope()

package/packages/dd-trace/src/opentracing/propagation/text_map.js

@@ -7,6 +7,7 @@ const log = require('../../log')
 const TraceState = require('./tracestate')
 const tags = require('../../../../../ext/tags')
 const { channel } = require('dc-polyfill')
+const { setBaggageItem, getAllBaggageItems, removeAllBaggageItems } = require('../../baggage')
 
 const { AUTO_KEEP, AUTO_REJECT, USER_KEEP } = require('../../../../../ext/priority')
 
@@ -55,9 +56,10 @@ class TextMapPropagator {
   }
 
   inject (spanContext, carrier) {
-    if (!spanContext || !carrier) return
-
+    if (!carrier) return
     this._injectBaggageItems(spanContext, carrier)
+    if (!spanContext) return
+
     this._injectDatadog(spanContext, carrier)
     this._injectB3MultipleHeaders(spanContext, carrier)
     this._injectB3SingleHeader(spanContext, carrier)
@@ -125,7 +127,7 @@ class TextMapPropagator {
 
   _injectBaggageItems (spanContext, carrier) {
     if (this._config.legacyBaggageEnabled) {
-      spanContext._baggageItems && Object.keys(spanContext._baggageItems).forEach(key => {
+      spanContext?._baggageItems && Object.keys(spanContext._baggageItems).forEach(key => {
         carrier[baggagePrefix + key] = String(spanContext._baggageItems[key])
       })
     }
@@ -134,7 +136,9 @@ class TextMapPropagator {
       let itemCounter = 0
       let byteCounter = 0
 
-      for (const [key, value] of Object.entries(spanContext._baggageItems)) {
+      const baggageItems = spanContext ? spanContext._baggageItems : getAllBaggageItems()
+      if (!baggageItems) return
+      for (const [key, value] of Object.entries(baggageItems)) {
         const item = `${this._encodeOtelBaggageKey(String(key).trim())}=${encodeURIComponent(String(value).trim())},`
         itemCounter += 1
         byteCounter += item.length
@@ -627,23 +631,27 @@ class TextMapPropagator {
   _extractBaggageItems (carrier, spanContext) {
     if (!this._hasPropagationStyle('extract', 'baggage')) return
     if (!carrier || !carrier.baggage) return
-    if (!spanContext) return
+    if (!spanContext) removeAllBaggageItems()
     const baggages = carrier.baggage.split(',')
     for (const keyValue of baggages) {
       if (!keyValue.includes('=')) {
-        spanContext._baggageItems = {}
+        if (spanContext) spanContext._baggageItems = {}
         return
       }
       let [key, value] = keyValue.split('=')
       key = this._decodeOtelBaggageKey(key.trim())
       value = decodeURIComponent(value.trim())
       if (!key || !value) {
-        spanContext._baggageItems = {}
+        if (spanContext) spanContext._baggageItems = {}
         return
       }
       // the current code assumes precedence of ot-baggage- (legacy opentracing baggage) over baggage
-      if (key in spanContext._baggageItems) return
-      spanContext._baggageItems[key] = value
+      if (spanContext) {
+        if (key in spanContext._baggageItems) return
+        spanContext._baggageItems[key] = value
+      } else {
+        setBaggageItem(key, value)
+      }
     }
   }
 

package/packages/dd-trace/src/plugin_manager.js

@@ -130,6 +130,7 @@ module.exports = class PluginManager {
       site,
       url,
       headerTags,
+      codeOriginForSpans,
       dbmPropagationMode,
       dsmEnabled,
       clientIpEnabled,
@@ -143,6 +144,7 @@ module.exports = class PluginManager {
     } = this._tracerConfig
 
     const sharedConfig = {
+      codeOriginForSpans,
       dbmPropagationMode,
       dsmEnabled,
       memcachedCommandEnabled,

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

@@ -57,6 +57,9 @@ module.exports = {
   get koa () { return require('../../../datadog-plugin-koa/src') },
   get 'koa-router' () { return require('../../../datadog-plugin-koa/src') },
   get kafkajs () { return require('../../../datadog-plugin-kafkajs/src') },
+  get '@confluentinc/kafka-javascript' () {
+    return require('../../../datadog-plugin-confluentinc-kafka-javascript/src')
+  },
   get langchain () { return require('../../../datadog-plugin-langchain/src') },
   get mariadb () { return require('../../../datadog-plugin-mariadb/src') },
   get memcached () { return require('../../../datadog-plugin-memcached/src') },

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

@@ -4,31 +4,21 @@ const { LOG } = require('../../../../ext/formats')
 const Plugin = require('./plugin')
 const { storage } = require('../../../datadog-core')
 
-const hasOwn = (obj, prop) => Object.prototype.hasOwnProperty.call(obj, prop)
-
 function messageProxy (message, holder) {
   return new Proxy(message, {
-    get (target, p, receiver) {
-      if (p === Symbol.toStringTag) {
-        return Object.prototype.toString.call(target).slice(8, -1)
-      }
-
-      if (shouldOverride(target, p)) {
+    get (target, key) {
+      if (shouldOverride(target, key)) {
         return holder.dd
       }
 
-      // This is a workaround for a V8 bug that surfaced in Node.js 22
-      if (p === 'stack') {
-        return target.stack
-      }
-
-      return Reflect.get(target, p, receiver)
+      return target[key]
     },
     ownKeys (target) {
       const ownKeys = Reflect.ownKeys(target)
-      return hasOwn(target, 'dd') || !Reflect.isExtensible(target)
-        ? ownKeys
-        : ['dd', ...ownKeys]
+      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)
@@ -37,7 +27,7 @@ function messageProxy (message, holder) {
 }
 
 function shouldOverride (target, p) {
-  return p === 'dd' && !Reflect.has(target, p) && Reflect.isExtensible(target)
+  return p === 'dd' && !Object.hasOwn(target, p) && Reflect.isExtensible(target)
 }
 
 module.exports = class LogPlugin extends Plugin {
@@ -45,8 +35,7 @@ module.exports = class LogPlugin extends Plugin {
     super(...args)
 
     this.addSub(`apm:${this.constructor.id}:log`, (arg) => {
-      const store = storage('legacy').getStore()
-      const span = store && store.span
+      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.

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

@@ -28,7 +28,10 @@ class OutboundPlugin extends TracingPlugin {
 
   startSpan (...args) {
     const span = super.startSpan(...args)
-    if (this._tracerConfig.codeOriginForSpans.enabled) {
+    if (
+      this._tracerConfig.codeOriginForSpans.enabled &&
+      this._tracerConfig.codeOriginForSpans.experimental.exit_spans.enabled
+    ) {
       span.addTags(exitTags(this.startSpan))
     }
     return span
@@ -84,8 +87,13 @@ class OutboundPlugin extends TracingPlugin {
     return peerData
   }
 
-  finish () {
-    this.tagPeerService(this.activeSpan)
+  bindFinish (ctx) {
+    return ctx.parentStore
+  }
+
+  finish (ctx) {
+    const span = ctx?.currentStore?.span || this.activeSpan
+    this.tagPeerService(span)
     super.finish(...arguments)
   }
 

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

@@ -53,8 +53,9 @@ class TracingPlugin extends Plugin {
 
   start () {} // implemented by individual plugins
 
-  finish () {
-    this.activeSpan?.finish()
+  finish (ctx) {
+    const span = ctx?.currentStore?.span || this.activeSpan
+    span?.finish()
   }
 
   error (ctxOrError) {
@@ -101,7 +102,7 @@ class TracingPlugin extends Plugin {
     }
   }
 
-  startSpan (name, { childOf, kind, meta, metrics, service, resource, type } = {}, enter = true) {
+  startSpan (name, { childOf, kind, meta, metrics, service, resource, type } = {}, enterOrCtx = true) {
     const store = storage('legacy').getStore()
     if (store && childOf === undefined) {
       childOf = store.span
@@ -125,8 +126,11 @@ class TracingPlugin extends Plugin {
     analyticsSampler.sample(span, this.config.measured)
 
     // TODO: Remove this after migration to TracingChannel is done.
-    if (enter) {
+    if (enterOrCtx === true) {
       storage('legacy').enterWith({ ...store, span })
+    } else if (enterOrCtx) {
+      enterOrCtx.parentStore = store
+      enterOrCtx.currentStore = { ...store, span }
     }
 
     return span

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

@@ -786,7 +786,7 @@ function getLibraryCapabilitiesTags (testFramework, isParallel) {
     [DD_CAPABILITIES_TEST_MANAGEMENT_QUARANTINE]: '1',
     [DD_CAPABILITIES_TEST_MANAGEMENT_DISABLE]: '1',
     [DD_CAPABILITIES_TEST_MANAGEMENT_ATTEMPT_TO_FIX]: isAttemptToFixSupported(testFramework, isParallel)
-      ? '2'
+      ? '4'
       : undefined
   }
 }

package/packages/dd-trace/src/profiling/exporter_cli.js

@@ -10,7 +10,7 @@ const fs = require('fs')
 const { fileURLToPath } = require('url')
 
 const logger = new ConsoleLogger()
-const timeoutMs = 10 * 1000
+const timeoutMs = 15 * 1000
 
 function exporterFromURL (url) {
   if (url.protocol === 'file:') {

package/packages/dd-trace/src/profiling/profilers/event_plugins/dns_lookup.js

@@ -7,7 +7,7 @@ class DNSLookupPlugin extends DNSPlugin {
 
   extendEvent (event, startEvent) {
     event.name = 'lookup'
-    event.detail = { hostname: startEvent[0] }
+    event.detail = { hostname: startEvent.args[0] }
 
     return event
   }

package/packages/dd-trace/src/profiling/profilers/event_plugins/dns_lookupservice.js

@@ -7,7 +7,7 @@ class DNSLookupServicePlugin extends DNSPlugin {
 
   extendEvent (event, startEvent) {
     event.name = 'lookupService'
-    event.detail = { host: startEvent[0], port: startEvent[1] }
+    event.detail = { host: startEvent.args[0], port: startEvent.args[1] }
 
     return event
   }

package/packages/dd-trace/src/profiling/profilers/event_plugins/dns_resolve.js

@@ -8,14 +8,14 @@ class DNSResolvePlugin extends DNSPlugin {
   }
 
   extendEvent (event, startEvent) {
-    const rrtype = startEvent[1]
+    const rrtype = startEvent.args[1]
     let name = queryNames.get(rrtype)
     if (!name) {
       name = `query${rrtype}`
       queryNames.set(rrtype, name)
     }
     event.name = name
-    event.detail = { host: startEvent[0] }
+    event.detail = { host: startEvent.args[0] }
 
     return event
   }

package/packages/dd-trace/src/profiling/profilers/event_plugins/dns_reverse.js

@@ -7,7 +7,7 @@ class DNSReversePlugin extends DNSPlugin {
 
   extendEvent (event, startEvent) {
     event.name = 'getHostByAddr'
-    event.detail = { host: startEvent[0] }
+    event.detail = { host: startEvent.args[0] }
 
     return event
   }

package/packages/dd-trace/src/profiling/profilers/event_plugins/event.js

@@ -1,37 +1,38 @@
-const { storage } = require('../../../../../datadog-core')
 const TracingPlugin = require('../../../plugins/tracing')
 const { performance } = require('perf_hooks')
 
 // We are leveraging the TracingPlugin class for its functionality to bind
 // start/error/finish methods to the appropriate diagnostic channels.
+// TODO: Decouple this from TracingPlugin.
 class EventPlugin extends TracingPlugin {
   constructor (eventHandler, eventFilter) {
     super()
     this.eventHandler = eventHandler
     this.eventFilter = eventFilter
-    this.store = storage('profiling')
+    this.contextData = new WeakMap()
     this.entryType = this.constructor.entryType
   }
 
-  start (startEvent) {
-    this.store.enterWith({
-      startEvent,
+  start (ctx) {
+    this.contextData.set(ctx, {
+      startEvent: ctx,
       startTime: performance.now()
     })
   }
 
-  error () {
-    const store = this.store.getStore()
-    if (store) {
-      store.error = true
+  error (ctx) {
+    const data = this.contextData.get(ctx)
+    if (data) {
+      data.error = true
     }
   }
 
-  finish () {
-    const store = this.store.getStore()
-    if (!store) return
+  finish (ctx) {
+    const data = this.contextData.get(ctx)
 
-    const { startEvent, startTime, error } = store
+    if (!data) return
+
+    const { startEvent, startTime, error } = data
     if (error || this.ignoreEvent(startEvent)) {
       return // don't emit perf events for failed operations or ignored events
     }
@@ -47,7 +48,7 @@ class EventPlugin extends TracingPlugin {
       return
     }
 
-    const context = this.activeSpan?.context()
+    const context = (ctx.currentStore?.span || this.activeSpan)?.context()
     event._ddSpanId = context?.toSpanId()
     event._ddRootSpanId = context?._trace.started[0]?.context().toSpanId() || event._ddSpanId
 

package/packages/dd-trace/src/proxy.js

@@ -10,6 +10,13 @@ const telemetry = require('./telemetry')
 const nomenclature = require('./service-naming')
 const PluginManager = require('./plugin_manager')
 const NoopDogStatsDClient = require('./noop/dogstatsd')
+const {
+  setBaggageItem,
+  getBaggageItem,
+  getAllBaggageItems,
+  removeBaggageItem,
+  removeAllBaggageItems
+} = require('./baggage')
 
 class LazyModule {
   constructor (provider) {
@@ -65,6 +72,11 @@ class Tracer extends NoopProxy {
     this.dogstatsd = new NoopDogStatsDClient()
     this._tracingInitialized = false
     this._flare = new LazyModule(() => require('./flare'))
+    this.setBaggageItem = setBaggageItem
+    this.getBaggageItem = getBaggageItem
+    this.getAllBaggageItems = getAllBaggageItems
+    this.removeBaggageItem = removeBaggageItem
+    this.removeAllBaggageItems = removeAllBaggageItems
 
     // these requires must work with esm bundler
     this._modules = {

package/packages/dd-trace/src/service-naming/schemas/v0/messaging.js

@@ -22,6 +22,10 @@ const messaging = {
       opName: () => 'kafka.produce',
       serviceName: ({ tracerService }) => `${tracerService}-kafka`
     },
+    '@confluentinc/kafka-javascript': {
+      opName: () => 'kafka.produce',
+      serviceName: ({ tracerService }) => `${tracerService}-kafka`
+    },
     rhea: {
       opName: () => 'amqp.send',
       serviceName: ({ tracerService }) => `${tracerService}-amqp-producer`
@@ -52,6 +56,10 @@ const messaging = {
       opName: () => 'kafka.consume',
       serviceName: ({ tracerService }) => `${tracerService}-kafka`
     },
+    '@confluentinc/kafka-javascript': {
+      opName: () => 'kafka.consume',
+      serviceName: ({ tracerService }) => `${tracerService}-kafka`
+    },
     rhea: {
       opName: () => 'amqp.receive',
       serviceName: identityService

package/packages/dd-trace/src/service-naming/schemas/v1/messaging.js

@@ -22,6 +22,10 @@ const messaging = {
       opName: () => 'kafka.send',
       serviceName: identityService
     },
+    '@confluentinc/kafka-javascript': {
+      opName: () => 'kafka.send',
+      serviceName: identityService
+    },
     rhea: amqpOutbound,
     sqs: {
       opName: () => 'aws.sqs.send',
@@ -43,6 +47,10 @@ const messaging = {
       opName: () => 'kafka.process',
       serviceName: identityService
     },
+    '@confluentinc/kafka-javascript': {
+      opName: () => 'kafka.process',
+      serviceName: identityService
+    },
     rhea: amqpInbound,
     sqs: {
       opName: () => 'aws.sqs.process',

package/packages/dd-trace/src/standalone/product.js

@@ -3,14 +3,12 @@
 const { SAMPLING_MECHANISM_APPSEC } = require('../constants')
 const RateLimiter = require('../rate_limiter')
 
-const dropAll = new RateLimiter(0)
-const onePerMinute = new RateLimiter(1, 'minute')
-
 function getProductRateLimiter (config) {
   if (config?.appsec?.enabled || config?.iast?.enabled) {
-    return onePerMinute
+    return new RateLimiter(1, 'minute') // onePerMinute
   }
-  return dropAll
+
+  return new RateLimiter(0) // dropAll
 }
 
 const PRODUCTS = {