dd-trace 5.91.0 → 5.93.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dd-trace",
-  "version": "5.91.0",
+  "version": "5.93.0",
   "description": "Datadog APM tracing client for JavaScript",
   "main": "index.js",
   "typings": "index.d.ts",
@@ -138,12 +138,12 @@
     "import-in-the-middle": "^3.0.0"
   },
   "optionalDependencies": {
-    "@datadog/libdatadog": "0.8.1",
+    "@datadog/libdatadog": "0.9.2",
     "@datadog/native-appsec": "11.0.1",
     "@datadog/native-iast-taint-tracking": "4.1.0",
     "@datadog/native-metrics": "3.1.1",
     "@datadog/openfeature-node-server": "^1.1.0",
-    "@datadog/pprof": "5.13.5",
+    "@datadog/pprof": "5.14.0",
     "@datadog/wasm-js-rewriter": "5.0.1",
     "@opentelemetry/api": ">=1.0.0 <1.10.0",
     "@opentelemetry/api-logs": "<1.0.0",

package/packages/datadog-instrumentations/src/child_process.js

@@ -12,7 +12,7 @@ const {
 const childProcessChannel = dc.tracingChannel('datadog:child_process:execution')
 
 // ignored exec method because it calls to execFile directly
-const execAsyncMethods = ['execFile', 'spawn']
+const execAsyncMethods = ['execFile', 'spawn', 'fork']
 
 const names = ['child_process', 'node:child_process']
 
@@ -97,8 +97,10 @@ function wrapChildProcessSyncMethod (returnError, shell = false) {
         return childProcessMethod.apply(this, arguments)
       }
 
-      const childProcessInfo = normalizeArgs(arguments, shell)
+      const callArgs = [...arguments]
+      const childProcessInfo = normalizeArgs(callArgs, shell)
       const context = createContextFromChildProcessInfo(childProcessInfo)
+      context.callArgs = callArgs
 
       return childProcessChannel.start.runStores(context, () => {
         try {
@@ -108,7 +110,7 @@ function wrapChildProcessSyncMethod (returnError, shell = false) {
             return returnError(error, context)
           }
 
-          const result = childProcessMethod.apply(this, arguments)
+          const result = childProcessMethod.apply(this, context.callArgs)
           context.result = result
 
           return result
@@ -131,9 +133,11 @@ function wrapChildProcessCustomPromisifyMethod (customPromisifyMethod, shell) {
       return customPromisifyMethod.apply(this, arguments)
     }
 
-    const childProcessInfo = normalizeArgs(arguments, shell)
+    const callArgs = [...arguments]
+    const childProcessInfo = normalizeArgs(callArgs, shell)
 
     const context = createContextFromChildProcessInfo(childProcessInfo)
+    context.callArgs = callArgs
 
     const { start, end, asyncStart, asyncEnd, error } = childProcessChannel
     start.publish(context)
@@ -143,7 +147,7 @@ function wrapChildProcessCustomPromisifyMethod (customPromisifyMethod, shell) {
       result = Promise.reject(context.abortController.signal.reason || new Error('Aborted'))
     } else {
       try {
-        result = customPromisifyMethod.apply(this, arguments)
+        result = customPromisifyMethod.apply(this, context.callArgs)
       } catch (error) {
         context.error = error
         error.publish(context)
@@ -181,9 +185,11 @@ function wrapChildProcessAsyncMethod (ChildProcess, shell = false) {
         return childProcessMethod.apply(this, arguments)
       }
 
-      const childProcessInfo = normalizeArgs(arguments, shell)
+      const callArgs = [...arguments]
+      const childProcessInfo = normalizeArgs(callArgs, shell)
 
       const context = createContextFromChildProcessInfo(childProcessInfo)
+      context.callArgs = callArgs
       return childProcessChannel.start.runStores(context, () => {
         let childProcess
         if (context.abortController.signal.aborted) {
@@ -194,7 +200,7 @@ function wrapChildProcessAsyncMethod (ChildProcess, shell = false) {
             const error = context.abortController.signal.reason || new Error('Aborted')
             childProcess.emit('error', error)
 
-            const cb = arguments[arguments.length - 1]
+            const cb = context.callArgs[context.callArgs.length - 1]
             if (typeof cb === 'function') {
               cb(error)
             }
@@ -202,7 +208,7 @@ function wrapChildProcessAsyncMethod (ChildProcess, shell = false) {
             childProcess.emit('close')
           })
         } else {
-          childProcess = childProcessMethod.apply(this, arguments)
+          childProcess = childProcessMethod.apply(this, context.callArgs)
         }
 
         if (childProcess) {

package/packages/datadog-instrumentations/src/graphql.js

@@ -277,7 +277,7 @@ function assertField (rootCtx, info, args) {
   let field = fields[pathString]
 
   if (!field) {
-    const fieldCtx = { info, rootCtx, args }
+    const fieldCtx = { info, rootCtx, args, path, pathString }
     startResolveCh.publish(fieldCtx)
     field = fields[pathString] = {
       error: null,

package/packages/datadog-plugin-aws-sdk/src/base.js

@@ -154,6 +154,11 @@ class BaseAwsSdkPlugin extends ClientPlugin {
       })
 
       this.finish(ctx)
+
+      if (IS_SERVERLESS) {
+        const peerStore = storage('peerServerless').getStore()
+        if (peerStore) delete peerStore.peerHostname
+      }
     })
 
     this.addBind(`apm:aws:response:start:${this.serviceIdentifier}`, ctx => {

package/packages/datadog-plugin-graphql/src/execute.js

@@ -58,8 +58,8 @@ function addVariableTags (config, span, variableValues) {
 
   if (variableValues && config.variables) {
     const variables = config.variables(variableValues)
-    for (const param in variables) {
-      tags[`graphql.variables.${param}`] = variables[param]
+    for (const [param, value] of Object.entries(variables)) {
+      tags[`graphql.variables.${param}`] = value
     }
   }
 

package/packages/datadog-plugin-graphql/src/resolve.js

@@ -10,13 +10,13 @@ class GraphQLResolvePlugin extends TracingPlugin {
   static operation = 'resolve'
 
   start (fieldCtx) {
-    const { info, rootCtx, args } = fieldCtx
+    const { info, rootCtx, args, path: pathAsArray, pathString } = fieldCtx
 
-    const path = getPath(info, this.config)
+    const path = getPath(this.config, pathAsArray)
 
     // we need to get the parent span to the field if it exists for correct span parenting
     // of nested fields
-    const parentField = getParentField(rootCtx, pathToArray(info && info.path))
+    const parentField = getParentField(rootCtx, pathString)
     const childOf = parentField?.ctx?.currentStore?.span
 
     fieldCtx.parent = parentField
@@ -76,9 +76,9 @@ class GraphQLResolvePlugin extends TracingPlugin {
     super(...args)
 
     this.addTraceSub('updateField', (ctx) => {
-      const { field, info, error } = ctx
+      const { field, error, path: pathAsArray } = ctx
 
-      const path = getPath(info, this.config)
+      const path = getPath(this.config, pathAsArray)
 
       if (!shouldInstrument(this.config, path)) return
 
@@ -118,28 +118,14 @@ function shouldInstrument (config, path) {
   return config.depth < 0 || config.depth >= depth
 }
 
-function getPath (info, config) {
-  const responsePathAsArray = config.collapse
-    ? withCollapse(pathToArray)
-    : pathToArray
-  return responsePathAsArray(info && info.path)
+function getPath (config, pathAsArray) {
+  return config.collapse
+    ? withCollapse(pathAsArray)
+    : pathAsArray
 }
 
-function pathToArray (path) {
-  const flattened = []
-  let curr = path
-  while (curr) {
-    flattened.push(curr.key)
-    curr = curr.prev
-  }
-  return flattened.reverse()
-}
-
-function withCollapse (responsePathAsArray) {
-  return function () {
-    return responsePathAsArray.apply(this, arguments)
-      .map(segment => typeof segment === 'number' ? '*' : segment)
-  }
+function withCollapse (pathAsArray) {
+  return pathAsArray.map(segment => typeof segment === 'number' ? '*' : segment)
 }
 
 function getResolverInfo (info, args) {
@@ -173,19 +159,20 @@ function getResolverInfo (info, args) {
   return resolverInfo
 }
 
-function getParentField (parentCtx, path) {
-  for (let i = path.length - 1; i > 0; i--) {
-    const field = getField(parentCtx, path.slice(0, i))
-    if (field) {
-      return field
-    }
+function getParentField (parentCtx, pathToString) {
+  let current = pathToString
+
+  while (current) {
+    const lastJoin = current.lastIndexOf('.')
+    if (lastJoin === -1) break
+
+    current = current.slice(0, lastJoin)
+    const field = parentCtx.fields[current]
+
+    if (field) return field
   }
 
   return null
 }
 
-function getField (parentCtx, path) {
-  return parentCtx.fields[path.join('.')]
-}
-
 module.exports = GraphQLResolvePlugin

package/packages/datadog-plugin-http/src/client.js

@@ -211,7 +211,7 @@ function getHeaders (config) {
     if (typeof header === 'string') {
       const separatorIndex = header.indexOf(':')
       result.push(separatorIndex === -1
-        ? [header, undefined]
+        ? [header.toLowerCase(), undefined]
         : [
             header.slice(0, separatorIndex).toLowerCase(),
             header.slice(separatorIndex + 1),

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

@@ -2,6 +2,7 @@
 
 const pkg = require('../pkg')
 const { isFalse, isTrue } = require('../util')
+const { DD_MAJOR } = require('../../../../version')
 const { getEnvironmentVariable: getEnv } = require('./helper')
 
 const {
@@ -117,6 +118,7 @@ const defaultsWithoutSupportedConfigurationEntry = {
 // TODO: These entries should be removed. They are off by default
 // because they rely on other configs.
 const defaultsWithConditionalRuntimeBehavior = {
+  startupLogs: DD_MAJOR >= 6,
   isGitUploadEnabled: false,
   isImpactedTestsEnabled: false,
   isIntelligentTestRunnerEnabled: false,

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

@@ -49,6 +49,8 @@ const VALID_PROPAGATION_BEHAVIOR_EXTRACT = new Set(['continue', 'restart', 'igno
 const VALID_LOG_LEVELS = new Set(['debug', 'info', 'warn', 'error'])
 const DEFAULT_OTLP_PORT = 4318
 const RUNTIME_ID = uuid()
+// eslint-disable-next-line eslint-rules/eslint-process-env -- internal propagation, not user config
+const ROOT_SESSION_ID = process.env.DD_ROOT_JS_SESSION_ID || RUNTIME_ID
 const NAMING_VERSIONS = new Set(['v0', 'v1'])
 const DEFAULT_NAMING_VERSION = 'v0'
 
@@ -145,6 +147,8 @@ class Config {
       'runtime-id': RUNTIME_ID,
     })
 
+    this.rootSessionId = ROOT_SESSION_ID
+
     if (this.isCiVisibility) {
       tagger.add(this.tags, {
         [ORIGIN_KEY]: 'ciapp-test',
@@ -1125,6 +1129,8 @@ class Config {
       setBoolean(calc, 'reportHostname', true)
       // Clear sampling rules - server-side sampling handles this
       calc['sampler.rules'] = []
+      // Agentless intake only accepts 64-bit trace IDs; disable 128-bit generation
+      setBoolean(calc, 'traceId128BitGenerationEnabled', false)
     }
 
     if (this.#isCiVisibility()) {

package/packages/dd-trace/src/config/supported-configurations.json

@@ -744,9 +744,9 @@
     ],
     "DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED": [
       {
-        "implementation": "A",
+        "implementation": "B",
         "type": "boolean",
-        "default": "false",
+        "default": "true",
         "configurationNames": [
           "propagateProcessTags.enabled"
         ]

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

@@ -1,9 +1,15 @@
 'use strict'
 
+const { existsSync } = require('node:fs')
 const { isMainThread } = require('worker_threads')
 const log = require('../log')
 
-if (isMainThread) {
+// libdatadog v29 crashtracker segfaults during init on ARM64 musl (Alpine).
+// The segfault bypasses JS try/catch so we must avoid loading it entirely.
+// See: https://github.com/DataDog/libdatadog-nodejs/issues/114
+const isArm64Musl = process.arch === 'arm64' && existsSync('/etc/alpine-release')
+
+if (isMainThread && !isArm64Musl) {
   try {
     module.exports = require('./crashtracker')
   } catch (e) {

package/packages/dd-trace/src/encode/agentless-json.js

@@ -16,6 +16,9 @@ const SOFT_LIMIT = 8 * 1024 * 1024 // 8MB
 function formatSpan (span, isFirstSpan) {
   span = normalizeSpan(truncateSpan(span, false))
 
+  // Remove _dd.p.tid (the upper 64 bits of a 128-bit trace ID) since trace_id is truncated to lower 64 bits
+  delete span.meta['_dd.p.tid']
+
   if (span.span_events) {
     span.meta.events = JSON.stringify(span.span_events)
     delete span.span_events
@@ -45,7 +48,7 @@ function formatSpan (span, isFirstSpan) {
  */
 function spanToJSON (span) {
   const result = {
-    trace_id: span.trace_id.toString(16).toLowerCase(),
+    trace_id: span.trace_id.toString(16).toLowerCase().slice(-16),
     span_id: span.span_id.toString(16).toLowerCase(),
     parent_id: span.parent_id.toString(16).toLowerCase(),
     name: span.name,

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

@@ -35,6 +35,7 @@ if (inodePath) {
 const entityId = containerId ? `ci-${containerId}` : inode && `in-${inode}`
 
 module.exports = {
+  containerId,
   entityId,
 
   inject (carrier) {

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

@@ -14,9 +14,9 @@ const { urlToHttpOptions } = require('./url-to-http-options-polyfill')
 const docker = require('./docker')
 const { httpAgent, httpsAgent } = require('./agents')
 
-const maxActiveRequests = 8
+const maxActiveBufferSize = 1024 * 1024 * 64
 
-let activeRequests = 0
+let activeBufferSize = 0
 
 function parseUrl (urlObjOrString) {
   if (urlObjOrString !== null && typeof urlObjOrString === 'object') return urlToHttpOptions(urlObjOrString)
@@ -50,7 +50,22 @@ function request (data, options, callback) {
     }
   }
 
-  const isReadable = data instanceof Readable
+  if (data instanceof Readable) {
+    const chunks = []
+
+    data
+      .on('data', (data) => {
+        chunks.push(data)
+      })
+      .on('end', () => {
+        request(Buffer.concat(chunks), options, callback)
+      })
+      .on('error', (err) => {
+        callback(err)
+      })
+
+    return
+  }
 
   // The timeout should be kept low to avoid excessive queueing.
   const timeout = options.timeout || 2000
@@ -58,12 +73,10 @@ function request (data, options, callback) {
   const client = isSecure ? https : http
   let dataArray = data
 
-  if (!isReadable) {
-    if (!Array.isArray(data)) {
-      dataArray = [data]
-    }
-    options.headers['Content-Length'] = byteLength(dataArray)
+  if (!Array.isArray(data)) {
+    dataArray = [data]
   }
+  options.headers['Content-Length'] = byteLength(dataArray)
 
   docker.inject(options.headers)
 
@@ -126,14 +139,14 @@ function request (data, options, callback) {
       return callback(null)
     }
 
-    activeRequests++
+    activeBufferSize += options.headers['Content-Length'] ?? 0
 
     storage('legacy').run({ noop: true }, () => {
       let finished = false
       const finalize = () => {
         if (finished) return
         finished = true
-        activeRequests--
+        activeBufferSize -= options.headers['Content-Length'] ?? 0
       }
 
       const req = client.request(options, (res) => onResponse(res, finalize))
@@ -158,12 +171,8 @@ function request (data, options, callback) {
         }
       })
 
-      if (isReadable) {
-        data.pipe(req) // TODO: Validate whether this is actually retriable.
-      } else {
-        for (const buffer of dataArray) req.write(buffer)
-        req.end()
-      }
+      for (const buffer of dataArray) req.write(buffer)
+      req.end()
     })
   }
 
@@ -183,7 +192,7 @@ function byteLength (data) {
 
 Object.defineProperty(request, 'writable', {
   get () {
-    return activeRequests < maxActiveRequests
+    return activeBufferSize < maxActiveBufferSize
   },
 })
 

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

@@ -37,13 +37,16 @@ const {
 const DEFAULT_KEY = 'service:,env:'
 
 /**
- * Formats a sampling rate as a string with up to 6 significant digits and no trailing zeros.
+ * Formats a sampling rate as a string with up to 6 decimal digits and no trailing zeros.
  *
  * @param {number} rate
- * @returns {string}
  */
 function formatKnuthRate (rate) {
-  return Number(rate.toPrecision(6)).toString()
+  const string = Number(rate).toFixed(6)
+  for (let i = string.length - 1; i > 0; i--) {
+    if (string[i] === '0') continue
+    return string.slice(0, i + (string[i] === '.' ? 0 : 1))
+  }
 }
 
 const defaultSampler = new Sampler(AUTO_KEEP)

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

@@ -1,8 +1,6 @@
 'use strict'
 
 const { EventEmitter } = require('events')
-const { promisify } = require('util')
-const zlib = require('zlib')
 const dc = require('dc-polyfill')
 const crashtracker = require('../crashtracking')
 const log = require('../log')
@@ -34,6 +32,14 @@ function findWebSpan (startedSpans, spanId) {
   return false
 }
 
+const MISSING_SOURCE_MAPS_TOKEN = 'dd:has-missing-map-files'
+
+function profileHasMissingSourceMaps (profile) {
+  const strings = profile?.stringTable?.strings
+  if (!strings) return false
+  return profile.comment?.some(idx => strings[idx] === MISSING_SOURCE_MAPS_TOKEN) ?? false
+}
+
 function processInfo (infos, info, type) {
   if (Object.keys(info).length > 0) {
     infos[type] = info
@@ -42,6 +48,7 @@ function processInfo (infos, info, type) {
 
 class Profiler extends EventEmitter {
   #compressionFn
+  #compressionFnInitialized = false
   #compressionOptions
   #config
   #enabled = false
@@ -50,7 +57,6 @@ class Profiler extends EventEmitter {
   #logger
   #profileSeq = 0
   #spanFinishListener
-  #sourceMapCount = 0
   #timer
 
   constructor () {
@@ -116,11 +122,13 @@ class Profiler extends EventEmitter {
       reportHostname,
     }
 
-    return this._start(options).catch((err) => {
+    try {
+      return this._start(options)
+    } catch (err) {
       logError(logger, 'Error starting profiler. For troubleshooting tips, see ' +
         '<https://dtdg.co/nodejs-profiler-troubleshooting>', err)
       return false
-    })
+    }
   }
 
   get enabled () {
@@ -131,7 +139,50 @@ class Profiler extends EventEmitter {
     logError(this.#logger, err)
   }
 
-  async _start (options) {
+  #getCompressionFn () {
+    if (!this.#compressionFnInitialized) {
+      this.#compressionFnInitialized = true
+      try {
+        const { promisify } = require('util')
+        const zlib = require('zlib')
+        const { method, level: clevel } = this.#config.uploadCompression
+        switch (method) {
+          case 'gzip':
+            this.#compressionFn = promisify(zlib.gzip)
+            if (clevel !== undefined) {
+              this.#compressionOptions = {
+                level: clevel,
+              }
+            }
+            break
+          case 'zstd':
+            // eslint-disable-next-line n/no-unsupported-features/node-builtins
+            if (typeof zlib.zstdCompress === 'function') {
+              // eslint-disable-next-line n/no-unsupported-features/node-builtins
+              this.#compressionFn = promisify(zlib.zstdCompress)
+              if (clevel !== undefined) {
+                this.#compressionOptions = {
+                  params: {
+                    // eslint-disable-next-line n/no-unsupported-features/node-builtins
+                    [zlib.constants.ZSTD_c_compressionLevel]: clevel,
+                  },
+                }
+              }
+            } else {
+              const zstdCompress = require('@datadog/libdatadog').load('datadog-js-zstd').zstd_compress
+              const level = clevel ?? 0 // 0 is zstd default compression level
+              this.#compressionFn = (buffer) => Promise.resolve(Buffer.from(zstdCompress(buffer, level)))
+            }
+            break
+        }
+      } catch (err) {
+        this.#logError(err)
+      }
+    }
+    return this.#compressionFn
+  }
+
+  _start (options) {
     if (this.enabled) return true
 
     const config = this.#config = new Config(options)
@@ -148,45 +199,21 @@ class Profiler extends EventEmitter {
       setLogger(config.logger)
 
       if (config.sourceMap) {
-        mapper = await SourceMapper.create([process.cwd()], config.debugSourceMaps)
-        this.#sourceMapCount = mapper.infoMap.size
-        if (config.debugSourceMaps) {
-          this.#logger.debug(() => {
-            return this.#sourceMapCount === 0
-              ? 'Found no source maps'
-              : `Found source maps for following files: [${[...mapper.infoMap.keys()].join(', ')}]`
-          })
-        }
-      }
-
-      const clevel = config.uploadCompression.level
-      switch (config.uploadCompression.method) {
-        case 'gzip':
-          this.#compressionFn = promisify(zlib.gzip)
-          if (clevel !== undefined) {
-            this.#compressionOptions = {
-              level: clevel,
-            }
-          }
-          break
-        case 'zstd':
-          if (typeof zlib.zstdCompress === 'function') { // eslint-disable-line n/no-unsupported-features/node-builtins
-            // eslint-disable-next-line n/no-unsupported-features/node-builtins
-            this.#compressionFn = promisify(zlib.zstdCompress)
-            if (clevel !== undefined) {
-              this.#compressionOptions = {
-                params: {
-                  // eslint-disable-next-line n/no-unsupported-features/node-builtins
-                  [zlib.constants.ZSTD_c_compressionLevel]: clevel,
-                },
-              }
+        mapper = new SourceMapper(config.debugSourceMaps)
+        mapper.loadDirectory(process.cwd())
+          .then(() => {
+            if (config.debugSourceMaps) {
+              const count = mapper.infoMap.size
+              this.#logger.debug(() => {
+                return count === 0
+                  ? 'Found no source maps'
+                  : `Found source maps for following files: [${[...mapper.infoMap.keys()].join(', ')}]`
+              })
             }
-          } else {
-            const zstdCompress = require('@datadog/libdatadog').load('datadog-js-zstd').zstd_compress
-            const level = clevel ?? 0 // 0 is zstd default compression level
-            this.#compressionFn = (buffer) => Promise.resolve(Buffer.from(zstdCompress(buffer, level)))
-          }
-          break
+          })
+          .catch((err) => {
+            this.#logError(err)
+          })
       }
     } catch (err) {
       this.#logError(err)
@@ -295,7 +322,7 @@ class Profiler extends EventEmitter {
     return {
       serverless: this.serverless,
       settings: this.#config.systemInfoReport,
-      sourceMapCount: this.#sourceMapCount,
+      hasMissingSourceMaps: false,
     }
   }
 
@@ -332,15 +359,19 @@ class Profiler extends EventEmitter {
 
       const encodedProfiles = {}
       const infos = this.#createInitialInfos()
+      const compressionFn = this.#getCompressionFn()
 
       // encode and export asynchronously
       await Promise.all(profiles.map(async ({ profiler, profile, info }) => {
         try {
           const encoded = await profiler.encode(profile)
-          const compressed = encoded instanceof Buffer && this.#compressionFn !== undefined
-            ? await this.#compressionFn(encoded, this.#compressionOptions)
+          const compressed = encoded instanceof Buffer && compressionFn !== undefined
+            ? await compressionFn(encoded, this.#compressionOptions)
             : encoded
           encodedProfiles[profiler.type] = compressed
+          if (profileHasMissingSourceMaps(profile)) {
+            infos.hasMissingSourceMaps = true
+          }
           processInfo(infos, info, profiler.type)
           this.#logger.debug(() => {
             const profileJson = JSON.stringify(profile, (_, value) => {

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

@@ -180,7 +180,7 @@ class Tracer extends NoopProxy {
       if (config.profiling.enabled === 'true') {
         this._profilerStarted = this._startProfiler(config)
       } else {
-        this._profilerStarted = Promise.resolve(false)
+        this._profilerStarted = false
         if (config.profiling.enabled === 'auto') {
           const { SSIHeuristics } = require('./profiling/ssi-heuristics')
           const ssiHeuristics = new SSIHeuristics(config)
@@ -252,6 +252,7 @@ class Tracer extends NoopProxy {
         'Error starting profiler. For troubleshooting tips, see <https://dtdg.co/nodejs-profiler-troubleshooting>',
         e
       )
+      return false
     }
   }
 
@@ -329,11 +330,11 @@ class Tracer extends NoopProxy {
    * @override
    */
   profilerStarted () {
-    if (!this._profilerStarted) {
+    if (this._profilerStarted === undefined) {
       // injection hardening: this is only ever invoked from tests.
       throw new Error('profilerStarted() must be called after init()')
     }
-    return this._profilerStarted
+    return Promise.resolve(this._profilerStarted)
   }
 
   /**

package/packages/dd-trace/src/telemetry/send-data.js

@@ -91,12 +91,17 @@ let agentTelemetry = true
  * @returns {Record<string, string>}
  */
 function getHeaders (config, application, reqType) {
+  const sessionId = config.tags['runtime-id']
   const headers = {
     'content-type': 'application/json',
     'dd-telemetry-api-version': 'v2',
     'dd-telemetry-request-type': reqType,
     'dd-client-library-language': application.language_name,
     'dd-client-library-version': application.tracer_version,
+    'dd-session-id': sessionId,
+  }
+  if (config.rootSessionId && config.rootSessionId !== sessionId) {
+    headers['dd-root-session-id'] = config.rootSessionId
   }
   const debug = config.telemetry && config.telemetry.debug
   if (debug) {

package/packages/dd-trace/src/telemetry/session-propagation.js

@@ -0,0 +1,78 @@
+'use strict'
+
+const dc = require('dc-polyfill')
+
+const childProcessChannel = dc.tracingChannel('datadog:child_process:execution')
+
+let subscribed = false
+let rootSessionId
+let runtimeId
+
+function injectSessionEnv (existingEnv) {
+  // eslint-disable-next-line eslint-rules/eslint-process-env -- not in supported-configurations.json
+  const base = existingEnv == null ? process.env : existingEnv
+  return {
+    ...base,
+    DD_ROOT_JS_SESSION_ID: rootSessionId,
+    DD_PARENT_JS_SESSION_ID: runtimeId,
+  }
+}
+
+function findOptionsIndex (args, shell) {
+  if (Array.isArray(args[1])) {
+    return { index: 2, exists: args[2] != null && typeof args[2] === 'object' }
+  }
+  if (args[1] != null && typeof args[1] === 'object') {
+    return { index: 1, exists: true }
+  }
+  if (!shell && args[2] != null && typeof args[2] === 'object') {
+    return { index: 2, exists: true }
+  }
+  return { index: shell ? 1 : 2, exists: false }
+}
+
+function onChildProcessStart (context) {
+  if (!context.callArgs) return
+
+  const args = context.callArgs
+  const { index, exists } = findOptionsIndex(args, context.shell)
+
+  if (exists) {
+    args[index] = { ...args[index], env: injectSessionEnv(args[index].env) }
+    return
+  }
+
+  const opts = { env: injectSessionEnv(null) }
+
+  if (!context.shell && !Array.isArray(args[1])) {
+    args.splice(1, 0, [])
+  }
+
+  if (typeof args[index] === 'function') {
+    args.splice(index, 0, opts)
+  } else {
+    args[index] = opts
+  }
+}
+
+const handler = { start: onChildProcessStart }
+
+function start (config) {
+  if (!config.telemetry?.enabled || subscribed) return
+  subscribed = true
+
+  rootSessionId = config.rootSessionId
+  runtimeId = config.tags['runtime-id']
+
+  childProcessChannel.subscribe(handler)
+}
+
+function stop () {
+  if (!subscribed) return
+  childProcessChannel.unsubscribe(handler)
+  subscribed = false
+  rootSessionId = undefined
+  runtimeId = undefined
+}
+
+module.exports = { start, stop, _onChildProcessStart: onChildProcessStart }

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

@@ -12,6 +12,7 @@ const endpoints = require('./endpoints')
 const { sendData } = require('./send-data')
 const { manager: metricsManager } = require('./metrics')
 const telemetryLogger = require('./logs')
+const sessionPropagation = require('./session-propagation')
 
 /**
  * @typedef {Record<string, unknown>} TelemetryPayloadObject
@@ -370,6 +371,7 @@ function start (aConfig, thePluginManager) {
   dependencies.start(config, application, host, getRetryData, updateRetryData)
   telemetryLogger.start(config)
   endpoints.start(config, application, host, getRetryData, updateRetryData)
+  sessionPropagation.start(config)
 
   sendData(config, application, host, 'app-started', appStarted(config))
 
@@ -397,6 +399,7 @@ function stop () {
   telemetryStopChannel.publish(getTelemetryData())
 
   endpoints.stop()
+  sessionPropagation.stop()
   config = undefined
 }
 

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

@@ -11,13 +11,22 @@ function storeConfig (config) {
       return
     }
 
+    const { containerId } = require('./exporters/common/docker')
+    const processTags = require('./process-tags')
+
+    const processTagsSerialized = config.propagateProcessTags?.enabled
+      ? (processTags.serialized || null)
+      : null
+
     const metadata = new processDiscovery.TracerMetadata(
       config.tags['runtime-id'],
       tracerVersion,
       config.hostname,
       config.service || null,
       config.env || null,
-      config.version || null
+      config.version || null,
+      processTagsSerialized,
+      containerId || null
     )
 
     return processDiscovery.storeMetadata(metadata)