dd-trace 5.84.0 → 5.86.0

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

@@ -14,7 +14,7 @@ const id = require('../../id')
 const {
   incrementCountMetric,
   TELEMETRY_GIT_COMMIT_SHA_DISCREPANCY,
-  TELEMETRY_GIT_SHA_MATCH
+  TELEMETRY_GIT_SHA_MATCH,
 } = require('../../ci-visibility/telemetry')
 
 const { SPAN_TYPE, RESOURCE_NAME, SAMPLING_PRIORITY } = require('../../../../../ext/tags')
@@ -32,7 +32,7 @@ const {
   CI_WORKSPACE_PATH,
   CI_PIPELINE_URL,
   CI_JOB_NAME,
-  GIT_COMMIT_HEAD_SHA
+  GIT_COMMIT_HEAD_SHA,
 } = require('./tags')
 const { getRuntimeAndOSMetadata } = require('./env')
 const { getCIMetadata } = require('./ci')
@@ -46,7 +46,7 @@ const {
   checkAndFetchBranch,
   getLocalBranches,
   getMergeBase,
-  getCounts
+  getCounts,
 } = require('./git')
 
 /**
@@ -65,6 +65,7 @@ const TEST_TYPE = 'test.type'
 const TEST_NAME = 'test.name'
 const TEST_SUITE = 'test.suite'
 const TEST_STATUS = 'test.status'
+const TEST_FINAL_STATUS = 'test.final_status'
 const TEST_PARAMETERS = 'test.parameters'
 const TEST_SKIP_REASON = 'test.skip_reason'
 const TEST_IS_RUM_ACTIVE = 'test.is_rum_active'
@@ -118,6 +119,7 @@ const TEST_BROWSER_VERSION = 'test.browser.version'
 const JEST_WORKER_TRACE_PAYLOAD_CODE = 60
 const JEST_WORKER_COVERAGE_PAYLOAD_CODE = 61
 const JEST_WORKER_LOGS_PAYLOAD_CODE = 62
+const JEST_WORKER_TELEMETRY_PAYLOAD_CODE = 63
 
 // cucumber worker variables
 const CUCUMBER_WORKER_TRACE_PAYLOAD_CODE = 70
@@ -146,22 +148,22 @@ const DD_CAPABILITIES_FAILED_TEST_REPLAY = '_dd.library_capabilities.failed_test
 const UNSUPPORTED_TIA_FRAMEWORKS = new Set(['playwright', 'vitest'])
 const UNSUPPORTED_TIA_FRAMEWORKS_PARALLEL_MODE = new Set(['cucumber', 'mocha'])
 const MINIMUM_FRAMEWORK_VERSION_FOR_EFD = {
-  playwright: '>=1.38.0'
+  playwright: '>=1.38.0',
 }
 const MINIMUM_FRAMEWORK_VERSION_FOR_IMPACTED_TESTS = {
-  playwright: '>=1.38.0'
+  playwright: '>=1.38.0',
 }
 const MINIMUM_FRAMEWORK_VERSION_FOR_QUARANTINE = {
-  playwright: '>=1.38.0'
+  playwright: '>=1.38.0',
 }
 const MINIMUM_FRAMEWORK_VERSION_FOR_DISABLE = {
-  playwright: '>=1.38.0'
+  playwright: '>=1.38.0',
 }
 const MINIMUM_FRAMEWORK_VERSION_FOR_ATTEMPT_TO_FIX = {
-  playwright: '>=1.38.0'
+  playwright: '>=1.38.0',
 }
 const MINIMUM_FRAMEWORK_VERSION_FOR_FAILED_TEST_REPLAY = {
-  playwright: '>=1.38.0'
+  playwright: '>=1.38.0',
 }
 
 const UNSUPPORTED_ATTEMPT_TO_FIX_FRAMEWORKS_PARALLEL_MODE = new Set(['mocha'])
@@ -171,13 +173,13 @@ const TEST_LEVEL_EVENT_TYPES = [
   'test',
   'test_suite_end',
   'test_module_end',
-  'test_session_end'
+  'test_session_end',
 ]
 const TEST_RETRY_REASON_TYPES = {
   efd: 'early_flake_detection',
   atr: 'auto_test_retry',
   atf: 'attempt_to_fix',
-  ext: 'external'
+  ext: 'external',
 }
 
 const DD_TEST_IS_USER_PROVIDED_SERVICE = '_dd.test.is_user_provided_service'
@@ -214,6 +216,7 @@ module.exports = {
   TEST_NAME,
   TEST_SUITE,
   TEST_STATUS,
+  TEST_FINAL_STATUS,
   TEST_PARAMETERS,
   TEST_SKIP_REASON,
   TEST_IS_RUM_ACTIVE,
@@ -223,6 +226,7 @@ module.exports = {
   JEST_WORKER_TRACE_PAYLOAD_CODE,
   JEST_WORKER_COVERAGE_PAYLOAD_CODE,
   JEST_WORKER_LOGS_PAYLOAD_CODE,
+  JEST_WORKER_TELEMETRY_PAYLOAD_CODE,
   CUCUMBER_WORKER_TRACE_PAYLOAD_CODE,
   MOCHA_WORKER_TRACE_PAYLOAD_CODE,
   PLAYWRIGHT_WORKER_TRACE_PAYLOAD_CODE,
@@ -309,7 +313,9 @@ module.exports = {
   getPullRequestBaseBranch,
   getModifiedFilesFromDiff,
   isModifiedTest,
-  POSSIBLE_BASE_BRANCHES
+  POSSIBLE_BASE_BRANCHES,
+  GIT_COMMIT_SHA,
+  GIT_REPOSITORY_URL,
 }
 
 // Returns pkg manager and its version, separated by '-', e.g. npm-8.15.0 or yarn-1.22.19
@@ -355,11 +361,11 @@ function removeInvalidMetadata (metadata) {
 function checkShaDiscrepancies (ciMetadata, userProvidedGitMetadata) {
   const {
     [GIT_COMMIT_SHA]: ciCommitSHA,
-    [GIT_REPOSITORY_URL]: ciRepositoryUrl
+    [GIT_REPOSITORY_URL]: ciRepositoryUrl,
   } = ciMetadata
   const {
     [GIT_COMMIT_SHA]: userProvidedCommitSHA,
-    [GIT_REPOSITORY_URL]: userProvidedRepositoryUrl
+    [GIT_REPOSITORY_URL]: userProvidedRepositoryUrl,
   } = userProvidedGitMetadata
   const { gitRepositoryUrl, gitCommitSHA } = getGitInformationDiscrepancy()
 
@@ -376,7 +382,7 @@ function checkShaDiscrepancies (ciMetadata, userProvidedGitMetadata) {
         {
           type: discrepancyType,
           expected_provider: expectedProvider,
-          discrepant_provider: discrepantProvider
+          discrepant_provider: discrepantProvider,
         }
       )
       return true
@@ -391,14 +397,14 @@ function checkShaDiscrepancies (ciMetadata, userProvidedGitMetadata) {
       v2: gitRepositoryUrl,
       type: 'repository_discrepancy',
       expected: 'user_supplied',
-      discrepant: 'git_client'
+      discrepant: 'git_client',
     },
     {
       v1: userProvidedCommitSHA,
       v2: gitCommitSHA,
       type: 'commit_discrepancy',
       expected: 'user_supplied',
-      discrepant: 'git_client'
+      discrepant: 'git_client',
     },
     // User provided vs CI metadata
     {
@@ -406,14 +412,14 @@ function checkShaDiscrepancies (ciMetadata, userProvidedGitMetadata) {
       v2: ciRepositoryUrl,
       type: 'repository_discrepancy',
       expected: 'user_supplied',
-      discrepant: 'ci_provider'
+      discrepant: 'ci_provider',
     },
     {
       v1: userProvidedCommitSHA,
       v2: ciCommitSHA,
       type: 'commit_discrepancy',
       expected: 'user_supplied',
-      discrepant: 'ci_provider'
+      discrepant: 'ci_provider',
     },
     // CI metadata vs Git metadata
     {
@@ -421,15 +427,15 @@ function checkShaDiscrepancies (ciMetadata, userProvidedGitMetadata) {
       v2: gitRepositoryUrl,
       type: 'repository_discrepancy',
       expected: 'ci_provider',
-      discrepant: 'git_client'
+      discrepant: 'git_client',
     },
     {
       v1: ciCommitSHA,
       v2: gitCommitSHA,
       type: 'commit_discrepancy',
       expected: 'ci_provider',
-      discrepant: 'git_client'
-    }
+      discrepant: 'git_client',
+    },
   ]
 
   let gitCommitShaMatch = true
@@ -474,7 +480,7 @@ function getTestEnvironmentMetadata (testFramework, config, shouldSkipGitMetadat
       [GIT_COMMIT_AUTHOR_EMAIL]: authorEmail,
       [GIT_COMMIT_MESSAGE]: commitMessage,
       [CI_WORKSPACE_PATH]: ciWorkspacePath,
-      [GIT_COMMIT_HEAD_SHA]: headCommitSha
+      [GIT_COMMIT_HEAD_SHA]: headCommitSha,
     } = ciMetadata
     gitMetadata = getGitMetadata({
       commitSHA,
@@ -485,7 +491,7 @@ function getTestEnvironmentMetadata (testFramework, config, shouldSkipGitMetadat
       authorEmail,
       commitMessage,
       ciWorkspacePath,
-      headCommitSha
+      headCommitSha,
     })
   }
 
@@ -498,7 +504,7 @@ function getTestEnvironmentMetadata (testFramework, config, shouldSkipGitMetadat
     ...gitMetadata,
     ...ciMetadata,
     ...userProvidedGitMetadata,
-    ...runtimeAndOSMetadata
+    ...runtimeAndOSMetadata,
   }
   if (config && config.service) {
     metadata['service.name'] = config.service
@@ -529,17 +535,17 @@ function getTestTypeFromFramework (testFramework) {
 }
 
 function finishAllTraceSpans (span) {
-  span.context()._trace.started.forEach(traceSpan => {
+  for (const traceSpan of span.context()._trace.started) {
     if (traceSpan !== span) {
       traceSpan.finish()
     }
-  })
+  }
 }
 
 function getTestParentSpan (tracer) {
   return tracer.extract('text_map', {
     'x-datadog-trace-id': id().toString(10),
-    'x-datadog-parent-id': '0000000000000000'
+    'x-datadog-parent-id': '0000000000000000',
   })
 }
 
@@ -553,7 +559,7 @@ function getTestCommonTags (name, suite, version, testFramework) {
     [TEST_SUITE]: suite,
     [RESOURCE_NAME]: `${suite}.${name}`,
     [TEST_FRAMEWORK_VERSION]: version,
-    [LIBRARY_VERSION]: ddTraceVersion
+    [LIBRARY_VERSION]: ddTraceVersion,
   }
 }
 
@@ -569,14 +575,14 @@ function getTestSuitePath (testSuiteAbsolutePath, sourceRoot) {
     ? testSuiteAbsolutePath
     : path.relative(sourceRoot, testSuiteAbsolutePath)
 
-  return testSuitePath.replace(path.sep, '/')
+  return testSuitePath.replaceAll(path.sep, '/')
 }
 
 const POSSIBLE_CODEOWNERS_LOCATIONS = [
   'CODEOWNERS',
   '.github/CODEOWNERS',
   'docs/CODEOWNERS',
-  '.gitlab/CODEOWNERS'
+  '.gitlab/CODEOWNERS',
 ]
 
 function readCodeOwners (rootDir) {
@@ -658,7 +664,7 @@ function getTestLevelCommonTags (command, testFrameworkVersion, testFramework) {
     [TEST_FRAMEWORK_VERSION]: testFrameworkVersion,
     [LIBRARY_VERSION]: ddTraceVersion,
     [TEST_COMMAND]: command,
-    [TEST_TYPE]: getTestTypeFromFramework(testFramework)
+    [TEST_TYPE]: getTestTypeFromFramework(testFramework),
   }
 }
 
@@ -668,7 +674,7 @@ function getTestSessionCommonTags (command, testFrameworkVersion, testFramework)
     [RESOURCE_NAME]: `test_session.${command}`,
     [TEST_MODULE]: testFramework,
     [TEST_TOOLCHAIN]: getPkgManager(),
-    ...getTestLevelCommonTags(command, testFrameworkVersion, testFramework)
+    ...getTestLevelCommonTags(command, testFrameworkVersion, testFramework),
   }
 }
 
@@ -677,7 +683,7 @@ function getTestModuleCommonTags (command, testFrameworkVersion, testFramework)
     [SPAN_TYPE]: 'test_module_end',
     [RESOURCE_NAME]: `test_module.${command}`,
     [TEST_MODULE]: testFramework,
-    ...getTestLevelCommonTags(command, testFrameworkVersion, testFramework)
+    ...getTestLevelCommonTags(command, testFrameworkVersion, testFramework),
   }
 }
 
@@ -687,7 +693,7 @@ function getTestSuiteCommonTags (command, testFrameworkVersion, testSuite, testF
     [RESOURCE_NAME]: `test_suite.${testSuite}`,
     [TEST_MODULE]: testFramework,
     [TEST_SUITE]: testSuite,
-    ...getTestLevelCommonTags(command, testFrameworkVersion, testFramework)
+    ...getTestLevelCommonTags(command, testFrameworkVersion, testFramework),
   }
 }
 
@@ -702,7 +708,7 @@ function addIntelligentTestRunnerSpanTags (
     skippingCount,
     skippingType = 'suite',
     hasUnskippableSuites,
-    hasForcedToRunSuites
+    hasForcedToRunSuites,
   }
 ) {
   testSessionSpan.setTag(TEST_ITR_TESTS_SKIPPED, isSuitesSkipped ? 'true' : 'false')
@@ -753,6 +759,7 @@ function resetCoverage (coverage) {
 
   return coverageMap
     .files()
+    // eslint-disable-next-line unicorn/no-array-for-each
     .forEach(filename => {
       const fileCoverage = coverageMap.fileCoverageFor(filename)
       fileCoverage.resetHits()
@@ -763,6 +770,7 @@ function mergeCoverage (coverage, targetCoverage) {
   const coverageMap = istanbul.createCoverageMap(coverage)
   return coverageMap
     .files()
+    // eslint-disable-next-line unicorn/no-array-for-each
     .forEach(filename => {
       const fileCoverage = coverageMap.fileCoverageFor(filename)
 
@@ -776,9 +784,9 @@ function mergeCoverage (coverage, targetCoverage) {
       const targetFileCoverage = targetCoverage.fileCoverageFor(filename)
 
       // branches (.b) are copied by reference, so `resetHits` affects the copy, so we need to copy it manually
-      Object.entries(targetFileCoverage.data.b).forEach(([key, value]) => {
+      for (const [key, value] of Object.entries(targetFileCoverage.data.b)) {
         targetFileCoverage.data.b[key] = [...value]
-      })
+      }
     })
 }
 
@@ -889,7 +897,7 @@ const DEPENDENCY_FOLDERS = [
   'node:',
   '.pnpm',
   '.yarn',
-  '.pnp'
+  '.pnp',
 ]
 
 function getFileAndLineNumberFromError (error, repositoryRoot) {
@@ -998,7 +1006,7 @@ function getLibraryCapabilitiesTags (testFramework, isParallel, frameworkVersion
         : undefined,
     [DD_CAPABILITIES_FAILED_TEST_REPLAY]: isFailedTestReplaySupported(testFramework, frameworkVersion)
       ? '1'
-      : undefined
+      : undefined,
   }
 }
 
@@ -1048,7 +1056,7 @@ function getPullRequestBaseBranch (pullRequestBaseBranch) {
     metrics[candidate] = {
       behind,
       ahead,
-      baseSha
+      baseSha,
     }
   }
 

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

@@ -142,5 +142,5 @@ module.exports = {
   obfuscateQs,
   calculateHttpEndpoint,
   filterSensitiveInfoFromRepository,
-  extractPathFromUrl // test only
+  extractPathFromUrl, // test only
 }

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

@@ -26,7 +26,7 @@ const urlFilter = {
     const blocklist = config.blocklist || config.blacklist || []
 
     return uri => applyFilter(allowlist, uri) && !applyFilter(blocklist, uri)
-  }
+  },
 }
 
 module.exports = urlFilter

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

@@ -15,7 +15,7 @@ const {
   GIT_COMMIT_AUTHOR_NAME,
   GIT_PULL_REQUEST_BASE_BRANCH,
   GIT_PULL_REQUEST_BASE_BRANCH_SHA,
-  GIT_COMMIT_HEAD_SHA
+  GIT_COMMIT_HEAD_SHA,
 } = require('./tags')
 
 const { normalizeRef } = require('./ci')
@@ -84,7 +84,7 @@ function getUserProviderGitMetadata () {
     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
+    GIT_COMMIT_HEAD_SHA, DD_GIT_COMMIT_HEAD_SHA,
   ])
 }
 

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

@@ -54,6 +54,7 @@ function startSpanHelper (tracer, name, options, traceCtx, config = {}) {
 
 const web = {
   TYPE: WEB,
+  /** @type {TracingPlugin | null} */
   plugin: null,
 
   // Ensure the configuration has the correct structure and defaults.
@@ -74,7 +75,7 @@ const web = {
       hooks,
       filter,
       middleware,
-      queryStringObfuscation
+      queryStringObfuscation,
     }
   },
 
@@ -188,7 +189,7 @@ const web = {
     analyticsSampler.sample(span, config.measured)
 
     span.addTags({
-      [RESOURCE_NAME]: middleware._name || middleware.name || '<anonymous>'
+      [RESOURCE_NAME]: middleware._name || middleware.name || '<anonymous>',
     })
 
     context.middleware.push(span)
@@ -218,7 +219,7 @@ const web = {
         span.addTags({
           [ERROR_TYPE]: error.name,
           [ERROR_MESSAGE]: error.message,
-          [ERROR_STACK]: error.stack
+          [ERROR_STACK]: error.stack,
         })
       }
 
@@ -250,7 +251,7 @@ const web = {
       paths: [],
       middleware: [],
       beforeEnd: [],
-      config: {}
+      config: {},
     }
 
     contexts.set(req, context)
@@ -406,9 +407,9 @@ const web = {
       },
       set (value) {
         ends.set(this, scope.bind(value, context.span))
-      }
+      },
     })
-  }
+  },
 }
 
 function addAllowHeaders (req, res, headers) {
@@ -420,7 +421,7 @@ function addAllowHeaders (req, res, headers) {
     'x-datadog-sampled', // Deprecated, but still accept it in case it's sent.
     'x-datadog-sampling-priority',
     'x-datadog-trace-id',
-    'x-datadog-tags'
+    'x-datadog-tags',
   ]
 
   for (const header of contextHeaders) {
@@ -462,7 +463,7 @@ function addRequestTags (context, spanType) {
     [HTTP_METHOD]: req.method,
     [SPAN_KIND]: SERVER,
     [SPAN_TYPE]: spanType,
-    [HTTP_USERAGENT]: req.headers['user-agent']
+    [HTTP_USERAGENT]: req.headers['user-agent'],
   })
 
   // if client ip has already been set by appsec, no need to run it again
@@ -493,10 +494,10 @@ function addResponseTags (context) {
   }
 
   span.addTags({
-    [HTTP_STATUS_CODE]: res.statusCode
+    [HTTP_STATUS_CODE]: res.statusCode,
   })
   inferredProxySpan?.addTags({
-    [HTTP_STATUS_CODE]: res.statusCode
+    [HTTP_STATUS_CODE]: res.statusCode,
   })
 
   web.addStatusError(req, res.statusCode)
@@ -518,7 +519,7 @@ function addResourceTag (context) {
 function addHeaders (context) {
   const { req, res, config, span, inferredProxySpan } = context
 
-  config.headers.forEach(([key, tag]) => {
+  for (const [key, tag] of config.headers) {
     const reqHeader = req.headers[key]
     const resHeader = res.getHeader(key)
 
@@ -531,7 +532,7 @@ function addHeaders (context) {
       span.setTag(tag || `${HTTP_RESPONSE_HEADERS}.${key}`, resHeader)
       inferredProxySpan?.setTag(tag || `${HTTP_RESPONSE_HEADERS}.${key}`, resHeader)
     }
-  })
+  }
 }
 
 function getHeadersToRecord (config) {

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

@@ -5,14 +5,14 @@ const {
     MANUAL_KEEP,
     MANUAL_DROP,
     SAMPLING_PRIORITY,
-    SERVICE_NAME
+    SERVICE_NAME,
   },
   priority: {
     AUTO_REJECT,
     AUTO_KEEP,
     USER_REJECT,
-    USER_KEEP
-  }
+    USER_KEEP,
+  },
 } = require('../../../ext')
 const log = require('./log')
 const RateLimiter = require('./rate_limiter')
@@ -30,7 +30,7 @@ const {
   SAMPLING_RULE_DECISION,
   SAMPLING_LIMIT_DECISION,
   SAMPLING_AGENT_DECISION,
-  DECISION_MAKER_KEY
+  DECISION_MAKER_KEY,
 } = require('./constants')
 
 const DEFAULT_KEY = 'service:,env:'

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

@@ -32,7 +32,7 @@ function getProcessTags () {
     ['entrypoint.workdir', path.basename(CURRENT_WORKING_DIRECTORY) || undefined],
 
     // the .name field from the application's package.json
-    ['package.json.name', pkg.name || undefined]
+    ['package.json.name', pkg.name || undefined],
   ]
 
   const tagsArray = []
@@ -52,7 +52,7 @@ function getProcessTags () {
     tags,
     serialized,
     tagsObject,
-    tagsArray
+    tagsArray,
   }
 }
 

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

@@ -13,5 +13,5 @@ module.exports = {
 
   stop: () => {
     profiler.stop()
-  }
+  },
 }

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

@@ -1,8 +1,8 @@
 'use strict'
 
-const os = require('os')
 const path = require('path')
 const { pathToFileURL } = require('url')
+
 const satisfies = require('../../../../vendor/dist/semifies')
 const { GIT_REPOSITORY_URL, GIT_COMMIT_SHA } = require('../plugins/util/tags')
 const { getIsAzureFunction } = require('../serverless')
@@ -10,6 +10,8 @@ const { isFalse, isTrue } = require('../util')
 const { getAzureTagsFromMetadata, getAzureAppMetadata, getAzureFunctionMetadata } = require('../azure_metadata')
 const { getEnvironmentVariable, getValueFromEnvSources } = require('../config/helper')
 const { getAgentUrl } = require('../agent/url')
+const { isACFActive } = require('../../../datadog-core/src/storage')
+
 const { AgentExporter } = require('./exporters/agent')
 const { FileExporter } = require('./exporters/file')
 const { ConsoleLogger } = require('./loggers/console')
@@ -18,12 +20,12 @@ const SpaceProfiler = require('./profilers/space')
 const EventsProfiler = require('./profilers/events')
 const { oomExportStrategies, snapshotKinds } = require('./constants')
 const { tagger } = require('./tagger')
+
 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 {
@@ -47,10 +49,9 @@ class Config {
       DD_PROFILING_UPLOAD_TIMEOUT,
       DD_PROFILING_V8_PROFILER_BUG_WORKAROUND,
       DD_PROFILING_WALLTIME_ENABLED,
-      DD_TAGS
+      DD_TAGS,
     } = getProfilingEnvValues()
 
-    const host = os.hostname()
     // 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)
@@ -59,7 +60,6 @@ class Config {
     // 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 = AWS_LAMBDA_FUNCTION_NAME
 
     this.version = options.version
@@ -68,10 +68,10 @@ class Config {
       tagger.parse(options.tags),
       tagger.parse({
         env: options.env,
-        host,
+        host: options.reportHostname ? require('os').hostname() : undefined,
         service: this.service,
         version: this.version,
-        functionname: AWS_LAMBDA_FUNCTION_NAME
+        functionname: AWS_LAMBDA_FUNCTION_NAME,
       }),
       getAzureTagsFromMetadata(getIsAzureFunction() ? getAzureFunctionMetadata() : getAzureAppMetadata())
     )
@@ -117,7 +117,7 @@ class Config {
     this.libraryInjected = options.libraryInjected
     this.activation = options.activation
     this.exporters = ensureExporters(options.exporters || [
-      new AgentExporter(this)
+      new AgentExporter(this),
     ], this)
 
     // OOM monitoring does not work well on Windows, so it is disabled by default.
@@ -141,13 +141,13 @@ class Config {
       heapLimitExtensionSize,
       maxHeapExtensionCount,
       exportStrategies,
-      exportCommand
+      exportCommand,
     }
 
     const profilers = options.profilers || getProfilers({
       DD_PROFILING_HEAP_ENABLED,
       DD_PROFILING_WALLTIME_ENABLED,
-      DD_PROFILING_PROFILERS
+      DD_PROFILING_PROFILERS,
     })
 
     this.timelineEnabled = isTrue(
@@ -219,16 +219,8 @@ class Config {
       that.asyncContextFrameEnabled = false
     }
 
-    const hasExecArg = (arg) => process.execArgv.includes(arg) || String(NODE_OPTIONS).includes(arg)
+    const canUseAsyncContextFrame = samplingContextsAvailable && isACFActive
 
-    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) {
@@ -261,7 +253,7 @@ class Config {
       timelineEnabled: this.timelineEnabled,
       timelineSamplingEnabled: this.timelineSamplingEnabled,
       uploadCompression: { ...this.uploadCompression },
-      v8ProfilerBugWorkaroundEnabled: this.v8ProfilerBugWorkaroundEnabled
+      v8ProfilerBugWorkaroundEnabled: this.v8ProfilerBugWorkaroundEnabled,
     }
     delete report.oomMonitoring.exportCommand
     return report
@@ -271,7 +263,7 @@ class Config {
 module.exports = { Config }
 
 function getProfilers ({
-  DD_PROFILING_HEAP_ENABLED, DD_PROFILING_WALLTIME_ENABLED, DD_PROFILING_PROFILERS
+  DD_PROFILING_HEAP_ENABLED, DD_PROFILING_WALLTIME_ENABLED, DD_PROFILING_PROFILERS,
 }) {
   // First consider "legacy" DD_PROFILING_PROFILERS env variable, defaulting to space + wall
   // Use a Set to avoid duplicates
@@ -476,6 +468,6 @@ function getProfilingEnvValues () {
     DD_PROFILING_WALLTIME_ENABLED:
       getValueFromEnvSources('DD_PROFILING_WALLTIME_ENABLED'),
     DD_TAGS:
-      getValueFromEnvSources('DD_TAGS')
+      getValueFromEnvSources('DD_TAGS'),
   }
 }