dd-trace 5.67.0 → 5.68.0

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

@@ -1,6 +1,5 @@
 'use strict'
 
-const cp = require('child_process')
 const os = require('os')
 const path = require('path')
 const fs = require('fs')
@@ -36,6 +35,7 @@ const {
 } = require('../../ci-visibility/telemetry')
 const { filterSensitiveInfoFromRepository } = require('./url')
 const { storage } = require('../../../../datadog-core')
+const { cachedExec } = require('./git-cache')
 
 const GIT_REV_LIST_MAX_BUFFER = 12 * 1024 * 1024 // 12MB
 
@@ -58,10 +58,12 @@ function sanitizedExec (
     startTime = Date.now()
   }
   try {
-    let result = cp.execFileSync(cmd, flags, { stdio: 'pipe' }).toString()
+    let result = cachedExec(cmd, flags, { stdio: 'pipe' }).toString()
+
     if (shouldTrim) {
       result = result.replaceAll(/(\r\n|\n|\r)/gm, '')
     }
+
     if (durationMetric) {
       distributionMetric(durationMetric.name, durationMetric.tags, Date.now() - startTime)
     }
@@ -94,7 +96,7 @@ function isGitAvailable () {
   const isWindows = os.platform() === 'win32'
   const command = isWindows ? 'where' : 'which'
   try {
-    cp.execFileSync(command, ['git'], { stdio: 'pipe' })
+    cachedExec(command, ['git'])
     return true
   } catch {
     incrementCountMetric(TELEMETRY_GIT_COMMAND_ERRORS, { command: 'check_git', exitCode: 'missing' })
@@ -150,27 +152,32 @@ function unshallowRepository (parentOnly = false) {
 
   incrementCountMetric(TELEMETRY_GIT_COMMAND, { command: 'unshallow' })
   const start = Date.now()
+  let flags = [
+    ...baseGitOptions,
+    revParseHead
+  ]
   try {
-    cp.execFileSync('git', [
-      ...baseGitOptions,
-      revParseHead
-    ], { stdio: 'pipe' })
+    cachedExec('git', flags)
   } catch (err) {
     // If the local HEAD is a commit that has not been pushed to the remote, the above command will fail.
-    log.error('Git plugin error executing git command', err)
+    log.warn(`Git unshallow failed: ${flags.join(' ')}`)
     incrementCountMetric(
       TELEMETRY_GIT_COMMAND_ERRORS,
       { command: 'unshallow', errorType: err.code, exitCode: err.status || err.errno }
     )
-    const upstreamRemote = sanitizedExec('git', ['rev-parse', '--abbrev-ref', '--symbolic-full-name', '@{upstream}'])
+    const upstreamRemote = sanitizedExec(
+      'git',
+      ['rev-parse', '--abbrev-ref', '--symbolic-full-name', '@{upstream}']
+    )
+    flags = [
+      ...baseGitOptions,
+      upstreamRemote
+    ]
     try {
-      cp.execFileSync('git', [
-        ...baseGitOptions,
-        upstreamRemote
-      ], { stdio: 'pipe' })
+      cachedExec('git', flags)
     } catch (err) {
-      // If the CI is working on a detached HEAD or branch tracking hasn’t been set up, the above command will fail.
-      log.error('Git plugin error executing fallback git command', err)
+      // If the CI is working on a detached HEAD or branch tracking hasn't been set up, the above command will fail.
+      log.warn(`Git unshallow failed again: ${flags.join(' ')}`)
       incrementCountMetric(
         TELEMETRY_GIT_COMMAND_ERRORS,
         { command: 'unshallow', errorType: err.code, exitCode: err.status || err.errno }
@@ -202,7 +209,7 @@ function getLatestCommits () {
   incrementCountMetric(TELEMETRY_GIT_COMMAND, { command: 'get_local_commits' })
   const startTime = Date.now()
   try {
-    const result = cp.execFileSync('git', ['log', '--format=%H', '-n 1000', '--since="1 month ago"'], { stdio: 'pipe' })
+    const result = cachedExec('git', ['log', '--format=%H', '-n 1000', '--since="1 month ago"'])
       .toString()
       .split('\n')
       .filter(Boolean)
@@ -272,10 +279,9 @@ function checkAndFetchBranch (branch, remoteName) {
   try {
     // `git show-ref --verify --quiet refs/remotes/${remoteName}/${branch}` will exit 0 if the branch exists
     // Otherwise it will exit 1
-    cp.execFileSync(
+    cachedExec(
       'git',
       ['show-ref', '--verify', '--quiet', `refs/remotes/${remoteName}/${branch}`],
-      { stdio: 'pipe' }
     )
     // branch exists locally, so we finish
   } catch {
@@ -285,22 +291,22 @@ function checkAndFetchBranch (branch, remoteName) {
       // `git ls-remote --heads origin my-branch` will exit 0 even if the branch doesn't exist.
       // The piece of information we need is whether the command outputs anything.
       // `git ls-remote --heads origin my-branch` could exit an error code if the remote does not exist.
-      const remoteHeads = cp.execFileSync(
+      const remoteHeads = cachedExec(
         'git',
         ['ls-remote', '--heads', remoteName, branch],
         { stdio: 'pipe', timeout: 2000 }
       )
       if (remoteHeads) {
         // branch exists, so we'll fetch it
-        cp.execFileSync(
+        cachedExec(
           'git',
           ['fetch', '--depth', '1', remoteName, branch],
           { stdio: 'pipe', timeout: 5000 }
         )
       }
-    } catch (e) {
+    } catch (err) {
       // branch does not exist or couldn't be fetched, so we can't do anything
-      log.error('Git plugin error checking and fetching branch', e)
+      log.debug('Git plugin error checking and fetching branch', err)
     }
   }
 }
@@ -358,7 +364,7 @@ function getCommitsRevList (commitsToExclude, commitsToInclude) {
   incrementCountMetric(TELEMETRY_GIT_COMMAND, { command: 'get_objects' })
   const startTime = Date.now()
   try {
-    result = cp.execFileSync(
+    result = cachedExec(
       'git',
       [
         'rev-list',
@@ -403,7 +409,7 @@ function generatePackFilesForCommits (commitsToUpload) {
   // Generates pack files to upload and
   // returns the ordered list of packfiles' paths
   function execGitPackObjects (targetPath) {
-    return cp.execFileSync(
+    return cachedExec(
       'git',
       [
         'pack-objects',
@@ -450,6 +456,13 @@ function generatePackFilesForCommits (commitsToUpload) {
   return result
 }
 
+function getRepositoryRoot () {
+  return sanitizedExec(
+    'git',
+    ['rev-parse', '--show-toplevel']
+  )
+}
+
 // If there is ciMetadata, it takes precedence.
 function getGitMetadata (ciMetadata) {
   const {
@@ -480,7 +493,7 @@ function getGitMetadata (ciMetadata) {
       commitMessage || sanitizedExec('git', ['show', '-s', '--format=%B'], null, null, null, false),
     [GIT_BRANCH]: branch || sanitizedExec('git', ['rev-parse', '--abbrev-ref', 'HEAD']),
     [GIT_COMMIT_SHA]: commitSHA || sanitizedExec('git', ['rev-parse', 'HEAD']),
-    [CI_WORKSPACE_PATH]: ciWorkspacePath || sanitizedExec('git', ['rev-parse', '--show-toplevel']),
+    [CI_WORKSPACE_PATH]: ciWorkspacePath || getRepositoryRoot(),
   }
 
   if (headCommitSha) {
@@ -596,5 +609,6 @@ module.exports = {
   getLocalBranches,
   getMergeBase,
   getCounts,
-  fetchHeadCommitSha
+  fetchHeadCommitSha,
+  getRepositoryRoot
 }

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

@@ -119,6 +119,10 @@ const MOCHA_WORKER_TRACE_PAYLOAD_CODE = 80
 // playwright worker variables
 const PLAYWRIGHT_WORKER_TRACE_PAYLOAD_CODE = 90
 
+// vitest worker variables
+const VITEST_WORKER_TRACE_PAYLOAD_CODE = 100
+const VITEST_WORKER_LOGS_PAYLOAD_CODE = 102
+
 // Early flake detection util strings
 const EFD_STRING = "Retried by Datadog's Early Flake Detection"
 const EFD_TEST_NAME_REGEX = new RegExp(EFD_STRING + String.raw` \(#\d+\): `, 'g')
@@ -218,6 +222,8 @@ module.exports = {
   CUCUMBER_WORKER_TRACE_PAYLOAD_CODE,
   MOCHA_WORKER_TRACE_PAYLOAD_CODE,
   PLAYWRIGHT_WORKER_TRACE_PAYLOAD_CODE,
+  VITEST_WORKER_TRACE_PAYLOAD_CODE,
+  VITEST_WORKER_LOGS_PAYLOAD_CODE,
   TEST_SOURCE_START,
   TEST_SKIPPED_BY_ITR,
   TEST_IS_NEW,
@@ -438,36 +444,40 @@ function checkShaDiscrepancies (ciMetadata, userProvidedGitMetadata) {
   )
 }
 
-function getTestEnvironmentMetadata (testFramework, config) {
-  // TODO: eventually these will come from the tracer (generally available)
+function getTestEnvironmentMetadata (testFramework, config, shouldSkipGitMetadataExtraction = false) {
   const ciMetadata = getCIMetadata()
-  const {
-    [GIT_COMMIT_SHA]: commitSHA,
-    [GIT_BRANCH]: branch,
-    [GIT_REPOSITORY_URL]: repositoryUrl,
-    [GIT_TAG]: tag,
-    [GIT_COMMIT_AUTHOR_NAME]: authorName,
-    [GIT_COMMIT_AUTHOR_EMAIL]: authorEmail,
-    [GIT_COMMIT_MESSAGE]: commitMessage,
-    [CI_WORKSPACE_PATH]: ciWorkspacePath,
-    [GIT_COMMIT_HEAD_SHA]: headCommitSha
-  } = ciMetadata
-
-  const gitMetadata = getGitMetadata({
-    commitSHA,
-    branch,
-    repositoryUrl,
-    tag,
-    authorName,
-    authorEmail,
-    commitMessage,
-    ciWorkspacePath,
-    headCommitSha
-  })
-
   const userProvidedGitMetadata = getUserProviderGitMetadata()
 
-  checkShaDiscrepancies(ciMetadata, userProvidedGitMetadata)
+  let gitMetadata = {}
+
+  // We don't execute git in test framework workers since the information is in the parent process
+  // and git metadata does not affect the execution of the tests
+  if (!shouldSkipGitMetadataExtraction) {
+    checkShaDiscrepancies(ciMetadata, userProvidedGitMetadata)
+
+    const {
+      [GIT_COMMIT_SHA]: commitSHA,
+      [GIT_BRANCH]: branch,
+      [GIT_REPOSITORY_URL]: repositoryUrl,
+      [GIT_TAG]: tag,
+      [GIT_COMMIT_AUTHOR_NAME]: authorName,
+      [GIT_COMMIT_AUTHOR_EMAIL]: authorEmail,
+      [GIT_COMMIT_MESSAGE]: commitMessage,
+      [CI_WORKSPACE_PATH]: ciWorkspacePath,
+      [GIT_COMMIT_HEAD_SHA]: headCommitSha
+    } = ciMetadata
+    gitMetadata = getGitMetadata({
+      commitSHA,
+      branch,
+      repositoryUrl,
+      tag,
+      authorName,
+      authorEmail,
+      commitMessage,
+      ciWorkspacePath,
+      headCommitSha
+    })
+  }
 
   const runtimeAndOSMetadata = getRuntimeAndOSMetadata()
 

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

@@ -387,7 +387,7 @@ const web = {
 
     return function (statusCode, statusMessage, headers) {
       headers = typeof statusMessage === 'string' ? headers : statusMessage
-      headers = Object.assign(res.getHeaders(), headers)
+      headers = { ...res.getHeaders(), ...headers }
 
       if (req.method.toLowerCase() === 'options' && isOriginAllowed(req, headers)) {
         addAllowHeaders(req, res, headers)

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

@@ -10,6 +10,8 @@ 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),
@@ -39,7 +41,8 @@ module.exports = {
       repositoryUrl,
       commitSHA,
       libraryInjected,
-      activation
+      activation,
+      heartbeatInterval
     })
   },
 

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

@@ -1,9 +1,9 @@
 'use strict'
 
-const coalesce = require('koalas')
 const os = require('os')
 const path = require('path')
 const { URL, format, pathToFileURL } = require('url')
+const satisfies = require('semifies')
 const { AgentExporter } = require('./exporters/agent')
 const { FileExporter } = require('./exporters/file')
 const { ConsoleLogger } = require('./loggers/console')
@@ -16,6 +16,7 @@ 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 = {}) {
@@ -41,27 +42,26 @@ class Config {
       DD_PROFILING_TIMELINE_ENABLED,
       DD_PROFILING_UPLOAD_PERIOD,
       DD_PROFILING_UPLOAD_TIMEOUT,
+      DD_PROFILING_ASYNC_CONTEXT_FRAME_ENABLED,
       DD_PROFILING_V8_PROFILER_BUG_WORKAROUND,
       DD_PROFILING_WALLTIME_ENABLED,
       DD_SERVICE,
       DD_TAGS,
       DD_TRACE_AGENT_PORT,
       DD_TRACE_AGENT_URL,
-      DD_VERSION
+      DD_VERSION,
+      NODE_OPTIONS
     } = getEnvironmentVariables()
 
-    const env = coalesce(options.env, DD_ENV)
+    const env = options.env ?? DD_ENV
     const service = options.service || DD_SERVICE || 'node'
     const host = os.hostname()
-    const version = coalesce(options.version, DD_VERSION)
+    const version = options.version ?? DD_VERSION
     // Must be longer than one minute so pad with five seconds
-    const flushInterval = coalesce(options.interval, Number(DD_PROFILING_UPLOAD_PERIOD) * 1000, 65 * 1000)
-    const uploadTimeout = coalesce(options.uploadTimeout,
-      Number(DD_PROFILING_UPLOAD_TIMEOUT), 60 * 1000)
-    const sourceMap = coalesce(options.sourceMap,
-      DD_PROFILING_SOURCE_MAP, true)
-    const pprofPrefix = coalesce(options.pprofPrefix,
-      DD_PROFILING_PPROF_PREFIX, '')
+    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
@@ -104,21 +104,21 @@ class Config {
     this.flushInterval = flushInterval
     this.uploadTimeout = uploadTimeout
     this.sourceMap = sourceMap
-    this.debugSourceMaps = isTrue(coalesce(options.debugSourceMaps, DD_PROFILING_DEBUG_SOURCE_MAPS, false))
-    this.endpointCollectionEnabled = isTrue(coalesce(options.endpointCollection,
-      DD_PROFILING_ENDPOINT_COLLECTION_ENABLED, samplingContextsAvailable))
+    this.debugSourceMaps = isTrue(options.debugSourceMaps ?? DD_PROFILING_DEBUG_SOURCE_MAPS)
+    this.endpointCollectionEnabled = isTrue(options.endpointCollection ??
+      DD_PROFILING_ENDPOINT_COLLECTION_ENABLED ?? samplingContextsAvailable)
     checkOptionWithSamplingContextAllowed(this.endpointCollectionEnabled, 'Endpoint collection')
 
     this.pprofPrefix = pprofPrefix
-    this.v8ProfilerBugWorkaroundEnabled = isTrue(coalesce(options.v8ProfilerBugWorkaround,
-      DD_PROFILING_V8_PROFILER_BUG_WORKAROUND, true))
-    const hostname = coalesce(options.hostname, DD_AGENT_HOST) || 'localhost'
-    const port = coalesce(options.port, DD_TRACE_AGENT_PORT) || 8126
-    this.url = new URL(coalesce(options.url, DD_TRACE_AGENT_URL, format({
+    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({
       protocol: 'http:',
       hostname,
       port
-    })))
+    }))
 
     this.libraryInjected = options.libraryInjected
     this.activation = options.activation
@@ -129,17 +129,17 @@ class Config {
     // OOM monitoring does not work well on Windows, so it is disabled by default.
     const oomMonitoringSupported = process.platform !== 'win32'
 
-    const oomMonitoringEnabled = isTrue(coalesce(options.oomMonitoring,
-      DD_PROFILING_EXPERIMENTAL_OOM_MONITORING_ENABLED, oomMonitoringSupported))
+    const oomMonitoringEnabled = isTrue(options.oomMonitoring ??
+      DD_PROFILING_EXPERIMENTAL_OOM_MONITORING_ENABLED ?? oomMonitoringSupported)
     checkOptionAllowed(oomMonitoringEnabled, 'OOM monitoring', oomMonitoringSupported)
 
-    const heapLimitExtensionSize = coalesce(options.oomHeapLimitExtensionSize,
-      Number(DD_PROFILING_EXPERIMENTAL_OOM_HEAP_LIMIT_EXTENSION_SIZE), 0)
-    const maxHeapExtensionCount = coalesce(options.oomMaxHeapExtensionCount,
-      Number(DD_PROFILING_EXPERIMENTAL_OOM_MAX_HEAP_EXTENSION_COUNT), 0)
+    const heapLimitExtensionSize = options.oomHeapLimitExtensionSize ??
+      (Number(DD_PROFILING_EXPERIMENTAL_OOM_HEAP_LIMIT_EXTENSION_SIZE) || 0)
+    const maxHeapExtensionCount = options.oomMaxHeapExtensionCount ??
+      (Number(DD_PROFILING_EXPERIMENTAL_OOM_MAX_HEAP_EXTENSION_COUNT) || 0)
     const exportStrategies = oomMonitoringEnabled
-      ? ensureOOMExportStrategies(coalesce(options.oomExportStrategies, DD_PROFILING_EXPERIMENTAL_OOM_EXPORT_STRATEGIES,
-        [oomExportStrategies.PROCESS]), this)
+      ? ensureOOMExportStrategies(options.oomExportStrategies ?? DD_PROFILING_EXPERIMENTAL_OOM_EXPORT_STRATEGIES ??
+        [oomExportStrategies.PROCESS], this)
       : []
     const exportCommand = oomMonitoringEnabled ? buildExportCommand(this) : undefined
     this.oomMonitoring = {
@@ -156,26 +156,29 @@ class Config {
       DD_PROFILING_PROFILERS
     })
 
-    this.timelineEnabled = isTrue(coalesce(options.timelineEnabled,
-      DD_PROFILING_TIMELINE_ENABLED, samplingContextsAvailable))
+    this.timelineEnabled = isTrue(
+      options.timelineEnabled ?? DD_PROFILING_TIMELINE_ENABLED ?? samplingContextsAvailable
+    )
     checkOptionWithSamplingContextAllowed(this.timelineEnabled, 'Timeline view')
-    this.timelineSamplingEnabled = isTrue(coalesce(options.timelineSamplingEnabled,
-      DD_INTERNAL_PROFILING_TIMELINE_SAMPLING_ENABLED, true))
+    this.timelineSamplingEnabled = isTrue(
+      options.timelineSamplingEnabled ?? DD_INTERNAL_PROFILING_TIMELINE_SAMPLING_ENABLED ?? true
+    )
 
-    this.codeHotspotsEnabled = isTrue(coalesce(options.codeHotspotsEnabled,
-      DD_PROFILING_CODEHOTSPOTS_ENABLED, samplingContextsAvailable))
+    this.codeHotspotsEnabled = isTrue(
+      options.codeHotspotsEnabled ?? DD_PROFILING_CODEHOTSPOTS_ENABLED ?? samplingContextsAvailable
+    )
     checkOptionWithSamplingContextAllowed(this.codeHotspotsEnabled, 'Code hotspots')
 
-    this.cpuProfilingEnabled = isTrue(coalesce(options.cpuProfilingEnabled,
-      DD_PROFILING_CPU_ENABLED,
-      samplingContextsAvailable))
+    this.cpuProfilingEnabled = isTrue(
+      options.cpuProfilingEnabled ?? DD_PROFILING_CPU_ENABLED ?? samplingContextsAvailable
+    )
     checkOptionWithSamplingContextAllowed(this.cpuProfilingEnabled, 'CPU profiling')
 
-    this.samplingInterval = coalesce(options.samplingInterval, 1e3 / 99) // 99hz in millis
+    this.samplingInterval = options.samplingInterval || 1e3 / 99 // 99hz in millis
 
-    this.heapSamplingInterval = coalesce(options.heapSamplingInterval,
-      Number(DD_PROFILING_HEAP_SAMPLING_INTERVAL))
-    const uploadCompression0 = coalesce(options.uploadCompression, DD_PROFILING_DEBUG_UPLOAD_COMPRESSION, 'on')
+    this.heapSamplingInterval = options.heapSamplingInterval ??
+      (Number(DD_PROFILING_HEAP_SAMPLING_INTERVAL) || 512 * 1024)
+    const uploadCompression0 = options.uploadCompression ?? DD_PROFILING_DEBUG_UPLOAD_COMPRESSION ?? 'on'
     let [uploadCompression, level0] = uploadCompression0.split('-')
     if (!['on', 'off', 'gzip', 'zstd'].includes(uploadCompression)) {
       this.logger.warn(`Invalid profile upload compression method "${uploadCompression0}". Will use "on".`)
@@ -209,6 +212,34 @@ class Config {
 
     this.uploadCompression = { method: uploadCompression, level }
 
+    const that = this
+    function turnOffAsyncContextFrame (msg) {
+      that.logger.warn(
+        `DD_PROFILING_ASYNC_CONTEXT_FRAME_ENABLED was set ${msg}, it will have no effect.`)
+      that.asyncContextFrameEnabled = false
+    }
+
+    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')
+        }
+      } 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')
+      }
+    }
+
+    this.heartbeatInterval = options.heartbeatInterval || 60 * 1000 // 1 minute
+
     this.profilers = ensureProfilers(profilers, this)
   }
 }
@@ -220,7 +251,7 @@ function getProfilers ({
 }) {
   // First consider "legacy" DD_PROFILING_PROFILERS env variable, defaulting to wall + space
   // Use a Set to avoid duplicates
-  const profilers = new Set(coalesce(DD_PROFILING_PROFILERS, 'wall,space').split(','))
+  const profilers = new Set((DD_PROFILING_PROFILERS ?? 'wall,space').split(','))
 
   // Add/remove wall depending on the value of DD_PROFILING_WALLTIME_ENABLED
   if (DD_PROFILING_WALLTIME_ENABLED != null) {

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

@@ -110,11 +110,13 @@ class Profiler extends EventEmitter {
           }
           break
         case 'zstd':
-          if (typeof zlib.zstdCompress === 'function') {
+          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
                 }
               }

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

@@ -41,14 +41,9 @@ function labelFromStrStr (stringTable, keyStr, valStr) {
   return labelFromStr(stringTable, stringTable.dedup(keyStr), valStr)
 }
 
-function getSamplingIntervalMillis (options) {
-  return (options.samplingInterval || 1e3 / 99) // 99Hz
-}
-
 function getMaxSamples (options) {
-  const cpuSamplingInterval = getSamplingIntervalMillis(options)
-  const flushInterval = options.flushInterval || 65 * 1e3 // 60 seconds
-  const maxCpuSamples = flushInterval / cpuSamplingInterval
+  const flushInterval = options.flushInterval || 65 * 1e3 // 65 seconds
+  const maxCpuSamples = flushInterval / options.samplingInterval
 
   // The lesser of max parallelism and libuv thread pool size, plus one so we can detect
   // oversubscription on libuv thread pool, plus another one for GC.
@@ -399,7 +394,7 @@ class EventsProfiler {
 
     const eventHandler = event => this.#eventSerializer.addEvent(event)
     const eventFilter = options.timelineSamplingEnabled
-      ? createPoissonProcessSamplingFilter(getSamplingIntervalMillis(options))
+      ? createPoissonProcessSamplingFilter(options.samplingInterval)
       : () => true
     const filteringEventHandler = event => {
       if (eventFilter(event)) {

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

@@ -13,6 +13,7 @@ class NativeSpaceProfiler {
   _started = false
 
   constructor (options = {}) {
+    // TODO: Remove default value. It is only used in testing.
     this._samplingInterval = options.heapSamplingInterval || 512 * 1024
     this._stackDepth = options.stackDepth || 64
     this._oomMonitoring = options.oomMonitoring || {}