dd-trace 5.45.0 → 5.47.0

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

@@ -15,6 +15,7 @@ const { GIT_REPOSITORY_URL, GIT_COMMIT_SHA } = require('../plugins/util/tags')
 const { tagger } = require('./tagger')
 const { isFalse, isTrue } = require('../util')
 const { getAzureTagsFromMetadata, getAzureAppMetadata } = require('../azure_metadata')
+const satisfies = require('semifies')
 
 class Config {
   constructor (options = {}) {
@@ -22,6 +23,7 @@ class Config {
       DD_AGENT_HOST,
       DD_ENV,
       DD_INTERNAL_PROFILING_TIMELINE_SAMPLING_ENABLED, // used for testing
+      DD_PROFILING_ASYNC_ID_ENABLED,
       DD_PROFILING_CODEHOTSPOTS_ENABLED,
       DD_PROFILING_CPU_ENABLED,
       DD_PROFILING_DEBUG_SOURCE_MAPS,
@@ -179,6 +181,10 @@ class Config {
     this.timelineSamplingEnabled = isTrue(coalesce(options.timelineSamplingEnabled,
       DD_INTERNAL_PROFILING_TIMELINE_SAMPLING_ENABLED, true))
 
+    // Async ID gathering only works reliably on Node >= 22.10.0
+    this.asyncIdEnabled = isTrue(coalesce(options.asyncIdEnabled,
+      DD_PROFILING_ASYNC_ID_ENABLED, this.timelineEnabled && satisfies(process.versions.node, '>=22.10.0')))
+
     this.codeHotspotsEnabled = isTrue(coalesce(options.codeHotspotsEnabled,
       DD_PROFILING_CODEHOTSPOTS_ENABLED,
       DD_PROFILING_EXPERIMENTAL_CODEHOTSPOTS_ENABLED, samplingContextsAvailable))

package/packages/dd-trace/src/profiling/exporters/agent.js

@@ -16,8 +16,6 @@ const perf = require('perf_hooks').performance
 const telemetryMetrics = require('../../telemetry/metrics')
 const profilersNamespace = telemetryMetrics.manager.namespace('profilers')
 
-const containerId = docker.id()
-
 const statusCodeCounters = []
 const requestCounter = profilersNamespace.count('profile_api.requests', [])
 const sizeDistribution = profilersNamespace.distribution('profile_api.bytes', [])
@@ -155,9 +153,7 @@ class AgentExporter extends EventSerializer {
           timeout: this._backoffTime * Math.pow(2, attempt)
         }
 
-        if (containerId) {
-          options.headers['Datadog-Container-ID'] = containerId
-        }
+        docker.inject(options.headers)
 
         if (this._url.protocol === 'unix:') {
           options.socketPath = this._url.pathname

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

@@ -18,9 +18,9 @@ function maybeSourceMap (sourceMap, SourceMapper, debug) {
   ], debug)
 }
 
-function logError (logger, err) {
+function logError (logger, ...args) {
   if (logger) {
-    logger.error(err)
+    logger.error(...args)
   }
 }
 
@@ -52,7 +52,8 @@ class Profiler extends EventEmitter {
 
   start (options) {
     return this._start(options).catch((err) => {
-      logError(options.logger, err)
+      logError(options.logger, 'Error starting profiler. For troubleshooting tips, see ' +
+        '<https://dtdg.co/nodejs-profiler-troubleshooting>', err)
       return false
     })
   }

package/packages/dd-trace/src/profiling/profilers/wall.js

@@ -70,12 +70,16 @@ function ensureChannelsActivated () {
 class NativeWallProfiler {
   constructor (options = {}) {
     this.type = 'wall'
-    this._samplingIntervalMicros = options.samplingInterval || 1e6 / 99 // 99hz
-    this._flushIntervalMillis = options.flushInterval || 60 * 1e3 // 60 seconds
+    // Currently there's a crash sometimes on worker threads trying to collect async IDs so for the
+    // time being we'll constrain it to only the main thread.
+    this._asyncIdEnabled = !!options.asyncIdEnabled && require('worker_threads').isMainThread
     this._codeHotspotsEnabled = !!options.codeHotspotsEnabled
+    this._cpuProfilingEnabled = !!options.cpuProfilingEnabled
     this._endpointCollectionEnabled = !!options.endpointCollectionEnabled
+    this._flushIntervalMillis = options.flushInterval || 60 * 1e3 // 60 seconds
+    this._samplingIntervalMicros = options.samplingInterval || 1e6 / 99 // 99hz
     this._timelineEnabled = !!options.timelineEnabled
-    this._cpuProfilingEnabled = !!options.cpuProfilingEnabled
+    this._v8ProfilerBugWorkaroundEnabled = !!options.v8ProfilerBugWorkaroundEnabled
     // We need to capture span data into the sample context for either code hotspots
     // or endpoint collection.
     this._captureSpanData = this._codeHotspotsEnabled || this._endpointCollectionEnabled
@@ -84,7 +88,6 @@ class NativeWallProfiler {
     // timestamps require the sample contexts feature in the pprof wall profiler), or
     // cpu profiling is enabled.
     this._withContexts = this._captureSpanData || this._timelineEnabled || this._cpuProfilingEnabled
-    this._v8ProfilerBugWorkaroundEnabled = !!options.v8ProfilerBugWorkaroundEnabled
     this._mapper = undefined
     this._pprof = undefined
 
@@ -127,13 +130,14 @@ class NativeWallProfiler {
     }
 
     this._pprof.time.start({
-      intervalMicros: this._samplingIntervalMicros,
+      collectAsyncId: this._asyncIdEnabled,
+      collectCpuTime: this._cpuProfilingEnabled,
       durationMillis: this._flushIntervalMillis,
+      intervalMicros: this._samplingIntervalMicros,
+      lineNumbers: false,
       sourceMapper: this._mapper,
       withContexts: this._withContexts,
-      lineNumbers: false,
-      workaroundV8Bug: this._v8ProfilerBugWorkaroundEnabled,
-      collectCpuTime: this._cpuProfilingEnabled
+      workaroundV8Bug: this._v8ProfilerBugWorkaroundEnabled
     })
 
     if (this._withContexts) {

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

@@ -70,7 +70,8 @@ class Tracer extends NoopProxy {
     this._modules = {
       appsec: new LazyModule(() => require('./appsec')),
       iast: new LazyModule(() => require('./appsec/iast')),
-      llmobs: new LazyModule(() => require('./llmobs'))
+      llmobs: new LazyModule(() => require('./llmobs')),
+      rewriter: new LazyModule(() => require('./appsec/iast/taint-tracking/rewriter'))
     }
   }
 
@@ -178,6 +179,8 @@ class Tracer extends NoopProxy {
 
       this._enableOrDisableTracing(config)
 
+      this._modules.rewriter.enable(config)
+
       if (config.tracing) {
         if (config.isManualApiEnabled) {
           const TestApiManualPlugin = require('./ci-visibility/test-api-manual/test-api-manual-plugin')
@@ -247,6 +250,7 @@ class Tracer extends NoopProxy {
       if (config.iast.enabled) {
         this._modules.iast.enable(config, this._tracer)
       }
+      // This needs to be after the IAST module is enabled
     } else if (this._tracingInitialized) {
       this._modules.appsec.disable()
       this._modules.iast.disable()

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

@@ -1,43 +1,55 @@
 'use strict'
 
-const constants = require('./constants')
 const log = require('./log')
-const ERROR_MESSAGE = constants.ERROR_MESSAGE
-const ERROR_STACK = constants.ERROR_STACK
-const ERROR_TYPE = constants.ERROR_TYPE
+
+function addNonEmpty (carrier, key, value) {
+  if (key !== '') {
+    carrier[key] = value
+  }
+}
 
 function add (carrier, keyValuePairs) {
-  if (!carrier || !keyValuePairs) return
+  if (!carrier) return
 
-  if (Array.isArray(keyValuePairs)) {
-    return keyValuePairs.forEach(tags => add(carrier, tags))
-  }
   try {
     if (typeof keyValuePairs === 'string') {
-      const segments = keyValuePairs.split(',')
-      for (const segment of segments) {
-        const separatorIndex = segment.indexOf(':')
-
-        let value = ''
-        let key = segment
-        if (separatorIndex !== -1) {
-          key = segment.slice(0, separatorIndex)
-          value = segment.slice(separatorIndex + 1)
+      let valueStart = 0
+      let keyStart = 0
+
+      for (let i = 0; i < keyValuePairs.length; i++) {
+        const char = keyValuePairs[i]
+
+        if (char === ':') {
+          if (valueStart === 0) {
+            valueStart = i
+          }
+        } else if (char === ',') {
+          valueStart ||= i
+          addNonEmpty(
+            carrier,
+            keyValuePairs.slice(keyStart, valueStart).trim(),
+            keyValuePairs.slice(valueStart + 1, i).trim()
+          )
+          keyStart = i + 1
+          valueStart = 0
         }
+      }
 
-        carrier[key.trim()] = value.trim()
+      if (keyValuePairs.at(-1) !== ',') {
+        valueStart ||= keyValuePairs.length
+        addNonEmpty(
+          carrier,
+          keyValuePairs.slice(keyStart, valueStart).trim(),
+          keyValuePairs.slice(valueStart + 1).trim()
+        )
       }
+    } else if (Array.isArray(keyValuePairs)) {
+      return keyValuePairs.forEach(tags => add(carrier, tags))
     } else {
-      // HACK: to ensure otel.recordException does not influence trace.error
-      if (ERROR_MESSAGE in keyValuePairs || ERROR_STACK in keyValuePairs || ERROR_TYPE in keyValuePairs) {
-        if (!('doNotSetTraceError' in keyValuePairs)) {
-          carrier.setTraceError = true
-        }
-      }
       Object.assign(carrier, keyValuePairs)
     }
-  } catch (e) {
-    log.error('Error adding tags', e)
+  } catch (error) {
+    log.error('Error adding tags', error)
   }
 }
 

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

@@ -13,13 +13,7 @@ function isFalse (str) {
 }
 
 function isError (value) {
-  if (value instanceof Error) {
-    return true
-  }
-  if (value && value.message) {
-    return true
-  }
-  return false
+  return Boolean(value?.message || value instanceof Error)
 }
 
 // Matches a glob pattern to a given subject string