dd-trace 5.81.0 → 5.83.0

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

@@ -1,5 +1,6 @@
 'use strict'
 
+const { getValueFromEnvSources } = require('../../config/helper')
 const {
   GIT_COMMIT_SHA,
   GIT_BRANCH,
@@ -19,18 +20,16 @@ const {
 
 const { normalizeRef } = require('./ci')
 const { filterSensitiveInfoFromRepository } = require('./url')
-const { getEnvironmentVariables } = require('../../config-helper')
 
-function removeEmptyValues (tags) {
-  return Object.keys(tags).reduce((filteredTags, tag) => {
-    if (!tags[tag]) {
-      return filteredTags
+function removeEmptyValues (tagsAndValues) {
+  const filteredTags = {}
+  for (let i = 0; i < tagsAndValues.length; i += 2) {
+    const value = tagsAndValues[i + 1]
+    if (value) {
+      filteredTags[tagsAndValues[i]] = value
     }
-    return {
-      ...filteredTags,
-      [tag]: tags[tag]
-    }
-  }, {})
+  }
+  return filteredTags
 }
 
 // The regex is inspired by
@@ -47,47 +46,46 @@ function validateGitCommitSha (gitCommitSha) {
 }
 
 function getUserProviderGitMetadata () {
-  const {
-    DD_GIT_COMMIT_SHA,
-    DD_GIT_BRANCH,
-    DD_GIT_REPOSITORY_URL,
-    DD_GIT_TAG,
-    DD_GIT_COMMIT_MESSAGE,
-    DD_GIT_COMMIT_COMMITTER_NAME,
-    DD_GIT_COMMIT_COMMITTER_EMAIL,
-    DD_GIT_COMMIT_COMMITTER_DATE,
-    DD_GIT_COMMIT_AUTHOR_NAME,
-    DD_GIT_COMMIT_AUTHOR_EMAIL,
-    DD_GIT_COMMIT_AUTHOR_DATE,
-    DD_GIT_PULL_REQUEST_BASE_BRANCH,
-    DD_GIT_PULL_REQUEST_BASE_BRANCH_SHA,
-    DD_GIT_COMMIT_HEAD_SHA
-  } = getEnvironmentVariables()
+  const DD_GIT_COMMIT_SHA = getValueFromEnvSources('DD_GIT_COMMIT_SHA')
+  const DD_GIT_BRANCH = getValueFromEnvSources('DD_GIT_BRANCH')
+  const DD_GIT_REPOSITORY_URL = getValueFromEnvSources('DD_GIT_REPOSITORY_URL')
+  const DD_GIT_TAG = getValueFromEnvSources('DD_GIT_TAG')
+  const DD_GIT_COMMIT_MESSAGE = getValueFromEnvSources('DD_GIT_COMMIT_MESSAGE')
+  const DD_GIT_COMMIT_COMMITTER_NAME = getValueFromEnvSources('DD_GIT_COMMIT_COMMITTER_NAME')
+  const DD_GIT_COMMIT_COMMITTER_EMAIL = getValueFromEnvSources('DD_GIT_COMMIT_COMMITTER_EMAIL')
+  const DD_GIT_COMMIT_COMMITTER_DATE = getValueFromEnvSources('DD_GIT_COMMIT_COMMITTER_DATE')
+  const DD_GIT_COMMIT_AUTHOR_NAME = getValueFromEnvSources('DD_GIT_COMMIT_AUTHOR_NAME')
+  const DD_GIT_COMMIT_AUTHOR_EMAIL = getValueFromEnvSources('DD_GIT_COMMIT_AUTHOR_EMAIL')
+  const DD_GIT_COMMIT_AUTHOR_DATE = getValueFromEnvSources('DD_GIT_COMMIT_AUTHOR_DATE')
+  const DD_GIT_PULL_REQUEST_BASE_BRANCH = getValueFromEnvSources('DD_GIT_PULL_REQUEST_BASE_BRANCH')
+  const DD_GIT_PULL_REQUEST_BASE_BRANCH_SHA = getValueFromEnvSources('DD_GIT_PULL_REQUEST_BASE_BRANCH_SHA')
+  const DD_GIT_COMMIT_HEAD_SHA = getValueFromEnvSources('DD_GIT_COMMIT_HEAD_SHA')
 
   const branch = normalizeRef(DD_GIT_BRANCH)
   let tag = normalizeRef(DD_GIT_TAG)
 
   // if DD_GIT_BRANCH is a tag, we associate its value to TAG too
-  if ((DD_GIT_BRANCH || '').includes('origin/tags') || (DD_GIT_BRANCH || '').includes('refs/heads/tags')) {
+  if ((DD_GIT_BRANCH ?? '').includes('origin/tags') || (DD_GIT_BRANCH ?? '').includes('refs/heads/tags')) {
     tag = normalizeRef(DD_GIT_BRANCH)
   }
 
-  return removeEmptyValues({
-    [GIT_COMMIT_SHA]: DD_GIT_COMMIT_SHA,
-    [GIT_BRANCH]: branch,
-    [GIT_REPOSITORY_URL]: filterSensitiveInfoFromRepository(DD_GIT_REPOSITORY_URL),
-    [GIT_TAG]: tag,
-    [GIT_COMMIT_MESSAGE]: DD_GIT_COMMIT_MESSAGE,
-    [GIT_COMMIT_COMMITTER_NAME]: DD_GIT_COMMIT_COMMITTER_NAME,
-    [GIT_COMMIT_COMMITTER_DATE]: DD_GIT_COMMIT_COMMITTER_DATE,
-    [GIT_COMMIT_COMMITTER_EMAIL]: DD_GIT_COMMIT_COMMITTER_EMAIL,
-    [GIT_COMMIT_AUTHOR_NAME]: DD_GIT_COMMIT_AUTHOR_NAME,
-    [GIT_COMMIT_AUTHOR_EMAIL]: DD_GIT_COMMIT_AUTHOR_EMAIL,
-    [GIT_COMMIT_AUTHOR_DATE]: DD_GIT_COMMIT_AUTHOR_DATE,
-    [GIT_PULL_REQUEST_BASE_BRANCH]: DD_GIT_PULL_REQUEST_BASE_BRANCH,
-    [GIT_PULL_REQUEST_BASE_BRANCH_SHA]: DD_GIT_PULL_REQUEST_BASE_BRANCH_SHA,
-    [GIT_COMMIT_HEAD_SHA]: DD_GIT_COMMIT_HEAD_SHA
-  })
+  // Key value pairs are grouped in pairs of two
+  return removeEmptyValues([
+    GIT_COMMIT_SHA, DD_GIT_COMMIT_SHA,
+    GIT_BRANCH, branch,
+    GIT_REPOSITORY_URL, filterSensitiveInfoFromRepository(DD_GIT_REPOSITORY_URL),
+    GIT_TAG, tag,
+    GIT_COMMIT_MESSAGE, DD_GIT_COMMIT_MESSAGE,
+    GIT_COMMIT_COMMITTER_NAME, DD_GIT_COMMIT_COMMITTER_NAME,
+    GIT_COMMIT_COMMITTER_DATE, DD_GIT_COMMIT_COMMITTER_DATE,
+    GIT_COMMIT_COMMITTER_EMAIL, DD_GIT_COMMIT_COMMITTER_EMAIL,
+    GIT_COMMIT_AUTHOR_NAME, DD_GIT_COMMIT_AUTHOR_NAME,
+    GIT_COMMIT_AUTHOR_EMAIL, DD_GIT_COMMIT_AUTHOR_EMAIL,
+    GIT_COMMIT_AUTHOR_DATE, DD_GIT_COMMIT_AUTHOR_DATE,
+    GIT_PULL_REQUEST_BASE_BRANCH, DD_GIT_PULL_REQUEST_BASE_BRANCH,
+    GIT_PULL_REQUEST_BASE_BRANCH_SHA, DD_GIT_PULL_REQUEST_BASE_BRANCH_SHA,
+    GIT_COMMIT_HEAD_SHA, DD_GIT_COMMIT_HEAD_SHA
+  ])
 }
 
 module.exports = { getUserProviderGitMetadata, validateGitRepositoryUrl, validateGitCommitSha }

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

@@ -7,10 +7,10 @@ const log = require('../../log')
 const tags = require('../../../../../ext/tags')
 const types = require('../../../../../ext/types')
 const kinds = require('../../../../../ext/kinds')
-const urlFilter = require('./urlfilter')
 const { ERROR_MESSAGE, ERROR_TYPE, ERROR_STACK } = require('../../constants')
-const { createInferredProxySpan, finishInferredProxySpan } = require('./inferred_proxy')
 const TracingPlugin = require('../tracing')
+const urlFilter = require('./urlfilter')
+const { createInferredProxySpan, finishInferredProxySpan } = require('./inferred_proxy')
 const { extractURL, obfuscateQs, calculateHttpEndpoint } = require('./url')
 
 let extractIp
@@ -274,11 +274,14 @@ const web = {
     return context.middleware.at(-1)
   },
 
-  // Extract the parent span from the headers and start a new span as its child
   startChildSpan (tracer, config, name, req, traceCtx) {
     const headers = req.headers
     const reqCtx = contexts.get(req)
-    let childOf = tracer.extract(FORMAT_HTTP_HEADERS, headers)
+    const { storage } = require('../../../../datadog-core')
+    const store = storage('legacy').getStore()
+    const pubsubSpan = store?.span?._name === 'pubsub.push.receive' ? store.span : null
+
+    let childOf = pubsubSpan || tracer.extract(FORMAT_HTTP_HEADERS, headers)
 
     // we may have headers signaling a router proxy span should be created (such as for AWS API Gateway)
     if (tracer._config?.inferredProxyServicesEnabled) {
@@ -503,7 +506,7 @@ function addResourceTag (context) {
   const { req, span } = context
   const tags = span.context()._tags
 
-  if (tags['resource.name']) return
+  if (tags[RESOURCE_NAME]) return
 
   const resource = [req.method, tags[HTTP_ROUTE]]
     .filter(Boolean)

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

@@ -1,5 +1,19 @@
 'use strict'
 
+const {
+  tags: {
+    MANUAL_KEEP,
+    MANUAL_DROP,
+    SAMPLING_PRIORITY,
+    SERVICE_NAME
+  },
+  priority: {
+    AUTO_REJECT,
+    AUTO_KEEP,
+    USER_REJECT,
+    USER_KEEP
+  }
+} = require('../../../ext')
 const log = require('./log')
 const RateLimiter = require('./rate_limiter')
 const Sampler = require('./sampler')
@@ -19,21 +33,6 @@ const {
   DECISION_MAKER_KEY
 } = require('./constants')
 
-const {
-  tags: {
-    MANUAL_KEEP,
-    MANUAL_DROP,
-    SAMPLING_PRIORITY,
-    SERVICE_NAME
-  },
-  priority: {
-    AUTO_REJECT,
-    AUTO_KEEP,
-    USER_REJECT,
-    USER_KEEP
-  }
-} = require('../../../ext')
-
 const DEFAULT_KEY = 'service:,env:'
 
 const defaultSampler = new Sampler(AUTO_KEEP)
@@ -54,7 +53,7 @@ class PrioritySampler {
   /**
    * Creates an instance of PrioritySampler.
    *
-   * @typedef {Object} SamplingConfig
+   * @typedef {object} SamplingConfig
    * @property {number} [sampleRate] - The default sample rate for traces.
    * @property {string} [provenance] - Optional rule provenance ("customer" or "dynamic").
    * @property {number} [rateLimit=100] - The maximum number of traces to sample per second.

package/packages/dd-trace/src/process-tags/index.js

@@ -1,25 +1,10 @@
 'use strict'
 
 const path = require('node:path')
-const pkg = require('../pkg')
 
 const CURRENT_WORKING_DIRECTORY = process.cwd()
 const ENTRYPOINT_PATH = require.main?.filename || ''
 
-const TRACING_FIELD_NAME = '_dd.tags.process'
-const DSM_FIELD_NAME = 'ProcessTags'
-const PROFILING_FIELD_NAME = 'process_tags'
-
-module.exports.TRACING_FIELD_NAME = TRACING_FIELD_NAME
-module.exports.DSM_FIELD_NAME = DSM_FIELD_NAME
-module.exports.PROFILING_FIELD_NAME = PROFILING_FIELD_NAME
-
-// TODO CRASH_TRACKING_FIELD_NAME /process_tags /application/process_tags
-// TODO: TELEMETRY_FIELD_NAME /application/process_tags
-// TODO: DYNAMIC_INSTRUMENTATION_FIELD_NAME process_tags
-// TODO: CLIENT_TRACE_STATISTICS_FIELD_NAME process_tags
-// TODO: REMOTE_CONFIG_FIELD_NAME process_tags
-
 // $ cd /foo/bar && node baz/banana.js
 // entrypoint.workdir = bar
 // entrypoint.name = banana
@@ -27,7 +12,11 @@ module.exports.PROFILING_FIELD_NAME = PROFILING_FIELD_NAME
 // entrypoint.basedir = baz
 // package.json.name = <from package.json>
 
-module.exports = function getProcessTags () {
+// process tags are constant throughout the lifetime of a process
+function getProcessTags () {
+  // Lazy load pkg to avoid issues with require.main during test initialization
+  const pkg = require('../pkg')
+
   // this list is sorted alphabetically for consistent serialization
   const tags = [
     // the parent directory name of the entrypoint script, e.g. /foo/bar/baz/banana.js -> baz
@@ -46,25 +35,38 @@ module.exports = function getProcessTags () {
     ['package.json.name', pkg.name || undefined]
   ]
 
-  const serialized = serialize(tags)
+  const tagsArray = []
+  const tagsObject = {}
 
-  return {
-    tags,
-    serialized
+  for (const [key, value] of tags) {
+    if (value !== undefined) {
+      const sanitizedValue = sanitize(value)
+      tagsArray.push(`${key}:${sanitizedValue}`)
+      tagsObject[key] = sanitizedValue
+    }
   }
-}
 
-function serialize (tags) {
-  const intermediary = []
-  for (const [name, value] of tags) {
-    // if we don't have a value we should send nothing at all
-    if (value === undefined) continue
-    intermediary.push(`${name}:${sanitize(value)}`)
+  const serialized = tagsArray.join(',')
+
+  return {
+    tags,
+    serialized,
+    tagsObject,
+    tagsArray
   }
-  return intermediary.join(',')
 }
 
-module.exports.serialize = serialize
+// Export the singleton
+module.exports = getProcessTags()
+
+module.exports.TRACING_FIELD_NAME = '_dd.tags.process'
+module.exports.DSM_FIELD_NAME = 'ProcessTags'
+module.exports.PROFILING_FIELD_NAME = 'process_tags'
+module.exports.DYNAMIC_INSTRUMENTATION_FIELD_NAME = 'process_tags'
+module.exports.TELEMETRY_FIELD_NAME = 'process_tags'
+module.exports.REMOTE_CONFIG_FIELD_NAME = 'process_tags'
+module.exports.CRASH_TRACKING_FIELD_NAME = 'process_tags'
+module.exports.CLIENT_TRACE_STATISTICS_FIELD_NAME = 'ProcessTags'
 
 /**
  * Sanitize a process tag value

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

@@ -1,49 +1,14 @@
 'use strict'
 
-const log = require('./log')
 const { profiler } = require('./profiling')
 
-// Stop profiler upon exit in order to collect and export the current profile
-process.once('beforeExit', () => { profiler.stop() })
+globalThis[Symbol.for('dd-trace')].beforeExitHandlers.add(() => { profiler.stop() })
 
 module.exports = {
   start: config => {
-    const { service, version, env, url, hostname, port, tags, repositoryUrl, commitSHA, injectionEnabled } = config
-    const { enabled, sourceMap, exporters } = config.profiling
-    const { heartbeatInterval } = config.telemetry
-
-    const logger = {
-      debug: (message) => log.debug(message),
-      info: (message) => log.info(message),
-      warn: (message) => log.warn(message),
-      error: (...args) => log.error(...args)
-    }
-
-    const libraryInjected = injectionEnabled.length > 0
-    let activation
-    if (enabled === 'auto') {
-      activation = 'auto'
-    } else if (enabled === 'true') {
-      activation = 'manual'
-    } // else activation = undefined
-
-    return profiler.start({
-      service,
-      version,
-      env,
-      logger,
-      sourceMap,
-      exporters,
-      url,
-      hostname,
-      port,
-      tags,
-      repositoryUrl,
-      commitSHA,
-      libraryInjected,
-      activation,
-      heartbeatInterval
-    })
+    // Forward the full tracer config to the profiling layer.
+    // Profiling code is responsible for deriving the specific options it needs.
+    return profiler.start(config)
   },
 
   stop: () => {

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

@@ -4,6 +4,11 @@ const os = require('os')
 const path = require('path')
 const { URL, format, pathToFileURL } = require('url')
 const satisfies = require('../../../../vendor/dist/semifies')
+const { GIT_REPOSITORY_URL, GIT_COMMIT_SHA } = require('../plugins/util/tags')
+const { getIsAzureFunction } = require('../serverless')
+const { isFalse, isTrue } = require('../util')
+const { getAzureTagsFromMetadata, getAzureAppMetadata, getAzureFunctionMetadata } = require('../azure_metadata')
+const { getEnvironmentVariable, getValueFromEnvSources } = require('../config/helper')
 const { AgentExporter } = require('./exporters/agent')
 const { FileExporter } = require('./exporters/file')
 const { ConsoleLogger } = require('./loggers/console')
@@ -11,20 +16,17 @@ const WallProfiler = require('./profilers/wall')
 const SpaceProfiler = require('./profilers/space')
 const EventsProfiler = require('./profilers/events')
 const { oomExportStrategies, snapshotKinds } = require('./constants')
-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 { getEnvironmentVariables } = require('../config-helper')
-const defaults = require('../config_defaults')
-
 class Config {
   constructor (options = {}) {
+    // TODO: Remove entries that were already resolved in config.
+    // For the others, move them over to config.
+    const AWS_LAMBDA_FUNCTION_NAME = getEnvironmentVariable('AWS_LAMBDA_FUNCTION_NAME')
+    const NODE_OPTIONS = getEnvironmentVariable('NODE_OPTIONS')
+
+    // TODO: Move initialization of these values to packages/dd-trace/src/config/index.js, and just read from config
     const {
-      AWS_LAMBDA_FUNCTION_NAME: functionname,
-      DD_AGENT_HOST,
-      DD_ENV,
-      DD_INTERNAL_PROFILING_TIMELINE_SAMPLING_ENABLED, // used for testing
+      DD_INTERNAL_PROFILING_TIMELINE_SAMPLING_ENABLED,
       DD_PROFILING_ASYNC_CONTEXT_FRAME_ENABLED,
       DD_PROFILING_CODEHOTSPOTS_ENABLED,
       DD_PROFILING_CPU_ENABLED,
@@ -39,41 +41,38 @@ class Config {
       DD_PROFILING_HEAP_SAMPLING_INTERVAL,
       DD_PROFILING_PPROF_PREFIX,
       DD_PROFILING_PROFILERS,
-      DD_PROFILING_SOURCE_MAP,
       DD_PROFILING_TIMELINE_ENABLED,
       DD_PROFILING_UPLOAD_PERIOD,
       DD_PROFILING_UPLOAD_TIMEOUT,
       DD_PROFILING_V8_PROFILER_BUG_WORKAROUND,
       DD_PROFILING_WALLTIME_ENABLED,
-      DD_SERVICE,
-      DD_TAGS,
-      DD_TRACE_AGENT_PORT,
-      DD_TRACE_AGENT_URL,
-      DD_VERSION,
-      NODE_OPTIONS
-    } = getEnvironmentVariables()
-
-    const env = options.env ?? DD_ENV
-    const service = options.service || DD_SERVICE || 'node'
+      DD_TAGS
+    } = getProfilingEnvValues()
+
     const host = os.hostname()
-    const version = options.version ?? DD_VERSION
     // Must be longer than one minute so pad with five seconds
     const flushInterval = options.interval ?? (Number(DD_PROFILING_UPLOAD_PERIOD) * 1000 || 65 * 1000)
     const uploadTimeout = options.uploadTimeout ?? (Number(DD_PROFILING_UPLOAD_TIMEOUT) || 60 * 1000)
-    const sourceMap = options.sourceMap ?? DD_PROFILING_SOURCE_MAP ?? true
     const pprofPrefix = options.pprofPrefix ?? DD_PROFILING_PPROF_PREFIX ?? ''
 
-    this.service = service
-    this.env = env
+    // TODO: Remove the fallback. Just use the value from the config.
+    this.service = options.service || 'node'
+    this.env = options.env
     this.host = host
-    this.functionname = functionname
+    this.functionname = AWS_LAMBDA_FUNCTION_NAME
 
-    this.version = version
+    this.version = options.version
     this.tags = Object.assign(
       tagger.parse(DD_TAGS),
       tagger.parse(options.tags),
-      tagger.parse({ env, host, service, version, functionname }),
-      getAzureTagsFromMetadata(getAzureAppMetadata())
+      tagger.parse({
+        env: options.env,
+        host,
+        service: this.service,
+        version: this.version,
+        functionname: AWS_LAMBDA_FUNCTION_NAME
+      }),
+      getAzureTagsFromMetadata(getIsAzureFunction() ? getAzureFunctionMetadata() : getAzureAppMetadata())
     )
 
     // Add source code integration tags if available
@@ -103,7 +102,7 @@ class Config {
 
     this.flushInterval = flushInterval
     this.uploadTimeout = uploadTimeout
-    this.sourceMap = sourceMap
+    this.sourceMap = options.sourceMap
     this.debugSourceMaps = isTrue(options.debugSourceMaps ?? DD_PROFILING_DEBUG_SOURCE_MAPS)
     this.endpointCollectionEnabled = isTrue(options.endpointCollection ??
       DD_PROFILING_ENDPOINT_COLLECTION_ENABLED ?? samplingContextsAvailable)
@@ -112,12 +111,10 @@ class Config {
     this.pprofPrefix = pprofPrefix
     this.v8ProfilerBugWorkaroundEnabled = isTrue(options.v8ProfilerBugWorkaround ??
       DD_PROFILING_V8_PROFILER_BUG_WORKAROUND ?? true)
-    const hostname = (options.hostname ?? DD_AGENT_HOST) || defaults.hostname
-    const port = (options.port ?? DD_TRACE_AGENT_PORT) || defaults.port
-    this.url = new URL(options.url ?? DD_TRACE_AGENT_URL ?? format({
+    this.url = new URL(options.url || format({
       protocol: 'http:',
-      hostname,
-      port
+      hostname: options.hostname,
+      port: options.port
     }))
 
     this.libraryInjected = options.libraryInjected
@@ -178,6 +175,9 @@ class Config {
 
     this.heapSamplingInterval = options.heapSamplingInterval ??
       (Number(DD_PROFILING_HEAP_SAMPLING_INTERVAL) || 512 * 1024)
+
+    const isAtLeast24 = satisfies(process.versions.node, '>=24.0.0')
+
     const uploadCompression0 = options.uploadCompression ?? DD_PROFILING_DEBUG_UPLOAD_COMPRESSION ?? 'on'
     let [uploadCompression, level0] = uploadCompression0.split('-')
     if (!['on', 'off', 'gzip', 'zstd'].includes(uploadCompression)) {
@@ -205,9 +205,12 @@ class Config {
       }
     }
 
-    // Default to gzip
+    // Default to either zstd (on Node.js 24+) or gzip (earlier Node.js). We could default to ztsd
+    // everywhere as we ship a Rust zstd compressor for older Node.js versions, but on 24+ we use
+    // the built-in one that runs asynchronously on libuv worker threads, just as gzip does. This is
+    // the least disruptive choice.
     if (uploadCompression === 'on') {
-      uploadCompression = 'gzip'
+      uploadCompression = isAtLeast24 ? 'zstd' : 'gzip'
     }
 
     this.uploadCompression = { method: uploadCompression, level }
@@ -221,20 +224,24 @@ class Config {
 
     const hasExecArg = (arg) => process.execArgv.includes(arg) || String(NODE_OPTIONS).includes(arg)
 
-    this.asyncContextFrameEnabled = isTrue(options.useAsyncContextFrame ?? DD_PROFILING_ASYNC_CONTEXT_FRAME_ENABLED)
-    if (this.asyncContextFrameEnabled) {
-      if (satisfies(process.versions.node, '>=24.0.0')) {
-        if (hasExecArg('--no-async-context-frame')) {
-          turnOffAsyncContextFrame('with --no-async-context-frame')
-        }
-      } else if (satisfies(process.versions.node, '>=23.0.0')) {
-        if (!hasExecArg('--experimental-async-context-frame')) {
-          turnOffAsyncContextFrame('without --experimental-async-context-frame')
-        }
+    let canUseAsyncContextFrame = false
+    if (samplingContextsAvailable) {
+      if (isAtLeast24) {
+        canUseAsyncContextFrame = !hasExecArg('--no-async-context-frame')
+      } else if (satisfies(process.versions.node, '>=22.9.0')) {
+        canUseAsyncContextFrame = hasExecArg('--experimental-async-context-frame')
+      }
+    }
+    this.asyncContextFrameEnabled = isTrue(DD_PROFILING_ASYNC_CONTEXT_FRAME_ENABLED ?? canUseAsyncContextFrame)
+    if (this.asyncContextFrameEnabled && !canUseAsyncContextFrame) {
+      if (!samplingContextsAvailable) {
+        turnOffAsyncContextFrame(`on ${process.platform}`)
+      } else if (isAtLeast24) {
+        turnOffAsyncContextFrame('with --no-async-context-frame')
+      } else if (satisfies(process.versions.node, '>=22.9.0')) {
+        turnOffAsyncContextFrame('without --experimental-async-context-frame')
       } else {
-        // NOTE: technically, this should work starting with 22.7.0 which is when
-        // AsyncContextFrame debuted, but it would require a change in pprof-nodejs too.
-        turnOffAsyncContextFrame('but it requires at least Node.js 23')
+        turnOffAsyncContextFrame('but it requires at least Node.js 22.9.0')
       }
     }
 
@@ -428,3 +435,50 @@ function buildExportCommand (options) {
     path.join(__dirname, 'exporter_cli.js'),
     urls.join(','), tags, 'space']
 }
+
+function getProfilingEnvValues () {
+  return {
+    DD_INTERNAL_PROFILING_TIMELINE_SAMPLING_ENABLED:
+      getValueFromEnvSources('DD_INTERNAL_PROFILING_TIMELINE_SAMPLING_ENABLED'),
+    DD_PROFILING_ASYNC_CONTEXT_FRAME_ENABLED:
+      getValueFromEnvSources('DD_PROFILING_ASYNC_CONTEXT_FRAME_ENABLED'),
+    DD_PROFILING_CODEHOTSPOTS_ENABLED:
+      getValueFromEnvSources('DD_PROFILING_CODEHOTSPOTS_ENABLED'),
+    DD_PROFILING_CPU_ENABLED:
+      getValueFromEnvSources('DD_PROFILING_CPU_ENABLED'),
+    DD_PROFILING_DEBUG_SOURCE_MAPS:
+      getValueFromEnvSources('DD_PROFILING_DEBUG_SOURCE_MAPS'),
+    DD_PROFILING_DEBUG_UPLOAD_COMPRESSION:
+      getValueFromEnvSources('DD_PROFILING_DEBUG_UPLOAD_COMPRESSION'),
+    DD_PROFILING_ENDPOINT_COLLECTION_ENABLED:
+      getValueFromEnvSources('DD_PROFILING_ENDPOINT_COLLECTION_ENABLED'),
+    DD_PROFILING_EXPERIMENTAL_OOM_EXPORT_STRATEGIES:
+      getValueFromEnvSources('DD_PROFILING_EXPERIMENTAL_OOM_EXPORT_STRATEGIES'),
+    DD_PROFILING_EXPERIMENTAL_OOM_HEAP_LIMIT_EXTENSION_SIZE:
+      getValueFromEnvSources('DD_PROFILING_EXPERIMENTAL_OOM_HEAP_LIMIT_EXTENSION_SIZE'),
+    DD_PROFILING_EXPERIMENTAL_OOM_MAX_HEAP_EXTENSION_COUNT:
+      getValueFromEnvSources('DD_PROFILING_EXPERIMENTAL_OOM_MAX_HEAP_EXTENSION_COUNT'),
+    DD_PROFILING_EXPERIMENTAL_OOM_MONITORING_ENABLED:
+      getValueFromEnvSources('DD_PROFILING_EXPERIMENTAL_OOM_MONITORING_ENABLED'),
+    DD_PROFILING_HEAP_ENABLED:
+      getValueFromEnvSources('DD_PROFILING_HEAP_ENABLED'),
+    DD_PROFILING_HEAP_SAMPLING_INTERVAL:
+      getValueFromEnvSources('DD_PROFILING_HEAP_SAMPLING_INTERVAL'),
+    DD_PROFILING_PPROF_PREFIX:
+      getValueFromEnvSources('DD_PROFILING_PPROF_PREFIX'),
+    DD_PROFILING_PROFILERS:
+      getValueFromEnvSources('DD_PROFILING_PROFILERS'),
+    DD_PROFILING_TIMELINE_ENABLED:
+      getValueFromEnvSources('DD_PROFILING_TIMELINE_ENABLED'),
+    DD_PROFILING_UPLOAD_PERIOD:
+      getValueFromEnvSources('DD_PROFILING_UPLOAD_PERIOD'),
+    DD_PROFILING_UPLOAD_TIMEOUT:
+      getValueFromEnvSources('DD_PROFILING_UPLOAD_TIMEOUT'),
+    DD_PROFILING_V8_PROFILER_BUG_WORKAROUND:
+      getValueFromEnvSources('DD_PROFILING_V8_PROFILER_BUG_WORKAROUND'),
+    DD_PROFILING_WALLTIME_ENABLED:
+      getValueFromEnvSources('DD_PROFILING_WALLTIME_ENABLED'),
+    DD_TAGS:
+      getValueFromEnvSources('DD_TAGS')
+  }
+}

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

@@ -1,14 +1,14 @@
 'use strict'
 
+const fs = require('fs')
+const { fileURLToPath } = require('url')
+const { SourceMapper, heap, encode } = require('@datadog/pprof')
+const { getValueFromEnvSources } = require('../config/helper')
 const { AgentExporter } = require('./exporters/agent')
 const { FileExporter } = require('./exporters/file')
 
-const { SourceMapper, heap, encode } = require('@datadog/pprof')
 const { ConsoleLogger } = require('./loggers/console')
 const { tagger } = require('./tagger')
-const fs = require('fs')
-const { fileURLToPath } = require('url')
-const { getEnvironmentVariable } = require('../config-helper')
 
 const logger = new ConsoleLogger()
 const timeoutMs = 15 * 1000
@@ -17,9 +17,9 @@ function exporterFromURL (url) {
   if (url.protocol === 'file:') {
     return new FileExporter({ pprofPrefix: fileURLToPath(url) })
   }
-  const injectionEnabled = (getEnvironmentVariable('DD_INJECTION_ENABLED') ?? '').split(',')
+  const injectionEnabled = (getValueFromEnvSources('DD_INJECTION_ENABLED') ?? '').split(',')
   const libraryInjected = injectionEnabled.length > 0
-  const profilingEnabled = (getEnvironmentVariable('DD_PROFILING_ENABLED') ?? '').toLowerCase()
+  const profilingEnabled = (getValueFromEnvSources('DD_PROFILING_ENABLED') ?? '').toLowerCase()
   const activation = ['true', '1'].includes(profilingEnabled)
     ? 'manual'
     : profilingEnabled === 'auto'
@@ -62,12 +62,12 @@ async function exportProfile (urls, tags, profileType, profile) {
  * Expected command line arguments are:
  * - Comma separated list of URLs (eg. "http://127.0.0.1:8126/,file:///tmp/foo.pprof")
  * - Tags (eg. "service:nodejs_oom_test,version:1.0.0")
- * - Profiletype (eg. space,wall,cpu)
+ * - Profile type (eg. space,wall,cpu)
  * - JSON profile filepath
  */
 const urls = process.argv[2].split(',').map(s => new URL(s))
 const tags = tagger.parse(process.argv[3])
 const profileType = process.argv[4]
-const profile = JSON.parse(fs.readFileSync(process.argv[5]))
+const profile = JSON.parse(fs.readFileSync(process.argv[5], 'utf8'))
 
 exportProfile(urls, tags, profileType, profile)

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

@@ -1,19 +1,19 @@
 'use strict'
 
-const retry = require('../../../../../vendor/dist/retry')
 const { request: httpRequest } = require('http')
 const { request: httpsRequest } = require('https')
-const { EventSerializer } = require('./event_serializer')
+const perf = require('perf_hooks').performance
+const { urlToHttpOptions } = require('url')
 
+const retry = require('../../../../../vendor/dist/retry')
 // TODO: avoid using dd-trace internals. Make this a separate module?
 const docker = require('../../exporters/common/docker')
 const FormData = require('../../exporters/common/form-data')
 const { storage } = require('../../../../datadog-core')
 const version = require('../../../../../package.json').version
-const { urlToHttpOptions } = require('url')
-const perf = require('perf_hooks').performance
-
 const telemetryMetrics = require('../../telemetry/metrics')
+const { EventSerializer } = require('./event_serializer')
+
 const profilersNamespace = telemetryMetrics.manager.namespace('profilers')
 
 const statusCodeCounters = []
@@ -73,7 +73,7 @@ function getBody (stream, callback) {
     callback(err)
   })
   stream.on('data', chunk => chunks.push(chunk))
-  stream.on('end', () => {
+  stream.once('end', () => {
     callback(null, Buffer.concat(chunks))
   })
 }