dd-trace 5.51.0 → 5.53.0

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

@@ -48,6 +48,7 @@ module.exports = {
   get http2 () { return require('../../../datadog-plugin-http2/src') },
   get https () { return require('../../../datadog-plugin-http/src') },
   get ioredis () { return require('../../../datadog-plugin-ioredis/src') },
+  get iovalkey () { return require('../../../datadog-plugin-iovalkey/src') },
   get 'jest-circus' () { return require('../../../datadog-plugin-jest/src') },
   get 'jest-config' () { return require('../../../datadog-plugin-jest/src') },
   get 'jest-environment-node' () { return require('../../../datadog-plugin-jest/src') },
@@ -57,6 +58,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 = {
@@ -140,10 +152,6 @@ class Tracer extends NoopProxy {
         }
       }
 
-      if (config.isGCPFunction || config.isAzureFunction) {
-        require('./serverless').maybeStartServerlessMiniAgent(config)
-      }
-
       if (config.profiling.enabled !== 'false') {
         const { SSIHeuristics } = require('./profiling/ssi-heuristics')
         const ssiHeuristics = new SSIHeuristics(config)

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

@@ -1,51 +1,5 @@
 'use strict'
 
-const log = require('./log')
-
-function maybeStartServerlessMiniAgent (config) {
-  if (process.platform !== 'win32' && process.platform !== 'linux') {
-    log.error('Serverless Mini Agent is only supported on Windows and Linux.')
-    return
-  }
-
-  const rustBinaryPath = getRustBinaryPath(config)
-
-  const fs = require('fs')
-
-  log.debug(`Trying to spawn the Serverless Mini Agent at path: ${rustBinaryPath}`)
-
-  // trying to spawn with an invalid path will return a non-descriptive error, so we want to catch
-  // invalid paths and log our own error.
-  if (!fs.existsSync(rustBinaryPath)) {
-    log.error('Serverless Mini Agent did not start. Could not find mini agent binary.')
-    return
-  }
-  try {
-    require('child_process').spawn(rustBinaryPath, { stdio: 'inherit' })
-  } catch (err) {
-    log.error('Error spawning mini agent process: %s', err.message)
-  }
-}
-
-function getRustBinaryPath (config) {
-  if (process.env.DD_MINI_AGENT_PATH !== undefined) {
-    return process.env.DD_MINI_AGENT_PATH
-  }
-
-  const rustBinaryPathRoot = config.isGCPFunction ? '/workspace' : '/home/site/wwwroot'
-  const rustBinaryPathOsFolder = process.platform === 'win32'
-    ? 'datadog-serverless-agent-windows-amd64'
-    : 'datadog-serverless-agent-linux-amd64'
-
-  const rustBinaryExtension = process.platform === 'win32' ? '.exe' : ''
-
-  const rustBinaryPath =
-    `${rustBinaryPathRoot}/node_modules/@datadog/sma/${rustBinaryPathOsFolder}/\
-datadog-serverless-trace-mini-agent${rustBinaryExtension}`
-
-  return rustBinaryPath
-}
-
 function getIsGCPFunction () {
   const isDeprecatedGCPFunction = process.env.FUNCTION_NAME !== undefined && process.env.GCP_PROJECT !== undefined
   const isNewerGCPFunction = process.env.K_SERVICE !== undefined && process.env.FUNCTION_TARGET !== undefined
@@ -69,9 +23,7 @@ function isInServerlessEnvironment () {
 }
 
 module.exports = {
-  maybeStartServerlessMiniAgent,
   getIsGCPFunction,
   getIsAzureFunction,
-  getRustBinaryPath,
   isInServerlessEnvironment
 }

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/v0/storage.js

@@ -35,6 +35,13 @@ const redisConfig = {
   }
 }
 
+const valkeyConfig = {
+  opName: () => 'valkey.command',
+  serviceName: ({ tracerService, pluginConfig, system, connectionName }) => {
+    return getRedisService(pluginConfig, connectionName) || fromSystem(tracerService, system)
+  }
+}
+
 const storage = {
   client: {
     aerospike: {
@@ -57,6 +64,7 @@ const storage = {
         pluginConfig.service || `${tracerService}-elasticsearch`
     },
     ioredis: redisConfig,
+    iovalkey: valkeyConfig,
     mariadb: {
       opName: () => 'mariadb.query',
       serviceName: mysqlServiceName

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/service-naming/schemas/v1/storage.js

@@ -38,6 +38,10 @@ const storage = {
       serviceName: configWithFallback
     },
     ioredis: redisNaming,
+    iovalkey: {
+      opName: () => 'valkey.command',
+      serviceName: configWithFallback
+    },
     mariadb: {
       opName: () => 'mariadb.query',
       serviceName: withFunction

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 = {