dd-trace 6.21.0 → 6.22.0

package/packages/dd-trace/src/appsec/reporter.js

@@ -8,7 +8,7 @@ const web = require('../plugins/util/web')
 const { ipHeaderList } = require('../plugins/util/ip_extractor')
 const { keepTrace } = require('../priority_sampler')
 const { ASM } = require('../standalone/product')
-const { isEmpty, truncateString } = require('../util')
+const { isEmpty, truncateString, typedArrayLength } = require('../util')
 const { getActiveRequest } = require('./store')
 const {
   incrementWafInitMetric,
@@ -431,6 +431,20 @@ function reportAttack ({ events: attackData, actions }, req, rootSpan) {
   }
 }
 
+/**
+ * Copies the first elements by index, the one typed array access that user code cannot override, unlike `subarray`,
+ * `toJSON` or their species constructors. The result keeps the shape `Buffer#toJSON` and `Object.keys` produce.
+ *
+ * @param {import('../util').BinaryView} view
+ */
+function truncateTypedArray (view) {
+  const data = new Array(COLLECTED_REQUEST_BODY_MAX_ELEMENTS_PER_NODE)
+  for (let i = 0; i < COLLECTED_REQUEST_BODY_MAX_ELEMENTS_PER_NODE; i++) {
+    data[i] = view[i]
+  }
+  return Buffer.isBuffer(view) ? { type: 'Buffer', data } : { ...data }
+}
+
 function truncateRequestBody (target, depth = 0) {
   switch (typeof target) {
     case 'string':
@@ -447,6 +461,12 @@ function truncateRequestBody (target, depth = 0) {
         return { truncated: true }
       }
 
+      // `Buffer#toJSON` and `Object.keys` both materialize one entry per byte, so cut large binary views down
+      // before they are serialized.
+      if (ArrayBuffer.isView(target) && typedArrayLength(target) > COLLECTED_REQUEST_BODY_MAX_ELEMENTS_PER_NODE) {
+        return { value: truncateTypedArray(target), truncated: true }
+      }
+
       if (typeof target.toJSON === 'function') {
         try {
           return truncateRequestBody(target.toJSON(), depth + 1)

package/packages/dd-trace/src/appsec/stack_trace.js

@@ -81,8 +81,7 @@ function getCallsiteFrames (maxDepth = 32, constructorOpt = getCallsiteFrames, c
 }
 
 function reportStackTrace (rootSpan, stackId, frames, namespace = STACK_TRACE_NAMESPACES.RASP) {
-  if (!rootSpan) return
-  if (!Array.isArray(frames)) return
+  if (!rootSpan || !Array.isArray(frames)) return
 
   if (!rootSpan.meta_struct) {
     rootSpan.meta_struct = {}

package/packages/dd-trace/src/ci-visibility/dynamic-atr-retries.js

@@ -86,12 +86,9 @@ function getDynamicAtrBuckets (value) {
  * @param {number[] | null} customBuckets
  */
 function getDynamicAtrRetryCount (durationMs, efdRetryPolicy, customBuckets) {
-  let retryCount
-  if (customBuckets) {
-    retryCount = customBuckets[retryBucketIndexForDuration(durationMs)]
-  } else {
-    retryCount = retriesForDuration(durationMs, efdRetryPolicy)
-  }
+  const retryCount = customBuckets
+    ? customBuckets[retryBucketIndexForDuration(durationMs)]
+    : retriesForDuration(durationMs, efdRetryPolicy)
   return Math.max(1, retryCount)
 }
 

package/packages/dd-trace/src/ci-visibility/exporters/ci-validation/msgpack-to-json.js

@@ -224,7 +224,7 @@ class MsgpackJsonConverter {
    * @param {number} value decoded floating-point value
    */
   #writeFloat (value) {
-    if (!Number.isFinite(value)) throw new Error('MessagePack validation payload contains a non-finite number.')
+    if (!Number.isFinite(value)) throw new TypeError('MessagePack validation payload contains a non-finite number.')
     this.#writer.write(Object.is(value, -0) ? '-0' : String(value))
   }
 

package/packages/dd-trace/src/ci-visibility/exporters/ci-visibility-exporter.js

@@ -114,10 +114,14 @@ function isValidRetryCount (value) {
  * @param {unknown} retryPolicy - Candidate retry policy.
  */
 function isValidCachedEfdRetryPolicy (retryPolicy) {
-  if (retryPolicy === null || typeof retryPolicy !== 'object' || Array.isArray(retryPolicy)) return false
-  if (!isValidRetryCount(retryPolicy.schedulingRetryCount)) return false
-  if (!Array.isArray(retryPolicy.durationRetryCounts) ||
-    retryPolicy.durationRetryCounts.length !== EMPTY_EFD_RETRY_POLICY.durationRetryCounts.length) {
+  if (
+    retryPolicy === null ||
+    typeof retryPolicy !== 'object' ||
+    Array.isArray(retryPolicy) ||
+    !isValidRetryCount(retryPolicy.schedulingRetryCount) ||
+    !Array.isArray(retryPolicy.durationRetryCounts) ||
+    retryPolicy.durationRetryCounts.length !== EMPTY_EFD_RETRY_POLICY.durationRetryCounts.length
+  ) {
     return false
   }
 
@@ -152,9 +156,11 @@ function isValidCachedSettings (settings) {
   }
   if (settings.isDiEnabled && !settings.isFlakyTestRetriesEnabled) return false
   if (settings.isEarlyFlakeDetectionEnabled && !settings.isKnownTestsEnabled) return false
-  if (!isValidCachedEfdRetryPolicy(settings.earlyFlakeDetectionRetryPolicy)) return false
-  if (!isNonNegativeSafeInteger(settings.earlyFlakeDetectionFaultyThreshold) ||
-    settings.earlyFlakeDetectionFaultyThreshold > 100) {
+  if (
+    !isValidCachedEfdRetryPolicy(settings.earlyFlakeDetectionRetryPolicy) ||
+    !isNonNegativeSafeInteger(settings.earlyFlakeDetectionFaultyThreshold) ||
+    settings.earlyFlakeDetectionFaultyThreshold > 100
+  ) {
     return false
   }
   return settings.testManagementAttemptToFixRetries === undefined ||

package/packages/dd-trace/src/ci-visibility/exporters/settings-cache-key.js

@@ -12,8 +12,7 @@ const getConfig = require('../../config')
  * @param {object} configuration - Request configuration for the settings endpoint.
  */
 function buildSettingsCacheKey (configuration) {
-  const config = getConfig()
-  const { testOptimization } = config
+  const { testOptimization } = getConfig()
   return buildCacheKey('settings', [
     tracerVersion,
     configuration.url?.href,

package/packages/dd-trace/src/ci-visibility/exporters/test-worker/index.js

@@ -35,10 +35,7 @@ function getInterprocessTraceCode () {
   if (DD_PLAYWRIGHT_WORKER) {
     return PLAYWRIGHT_WORKER_TRACE_PAYLOAD_CODE
   }
-  if (getEnvironmentVariable('TINYPOOL_WORKER_ID')) {
-    return VITEST_WORKER_TRACE_PAYLOAD_CODE
-  }
-  if (DD_VITEST_WORKER) {
+  if (getEnvironmentVariable('TINYPOOL_WORKER_ID') || DD_VITEST_WORKER) {
     return VITEST_WORKER_TRACE_PAYLOAD_CODE
   }
   return null
@@ -62,10 +59,7 @@ function getInterprocessLogsCode () {
   if (getEnvironmentVariable('MOCHA_WORKER_ID') === 'webdriverio') {
     return MOCHA_WORKER_LOGS_PAYLOAD_CODE
   }
-  if (getEnvironmentVariable('TINYPOOL_WORKER_ID')) {
-    return VITEST_WORKER_LOGS_PAYLOAD_CODE
-  }
-  if (getConfig().DD_VITEST_WORKER) {
+  if (getEnvironmentVariable('TINYPOOL_WORKER_ID') || getConfig().DD_VITEST_WORKER) {
     return VITEST_WORKER_LOGS_PAYLOAD_CODE
   }
   return null

package/packages/dd-trace/src/ci-visibility/resolve-runfile-path.js

@@ -0,0 +1,54 @@
+'use strict'
+
+const fs = require('node:fs')
+const path = require('node:path')
+
+const log = require('../log')
+
+/**
+ * @param {string} filePath
+ * @param {Record<string, string | undefined>} env
+ */
+function resolveRunfilePath (filePath, env) {
+  if (fs.existsSync(filePath)) return filePath
+
+  const runfilesDir = env.RUNFILES_DIR
+  if (runfilesDir) {
+    const candidate = path.join(runfilesDir, filePath)
+    if (fs.existsSync(candidate)) return candidate
+  }
+
+  const manifestCandidate = resolveFromManifest(filePath, env.RUNFILES_MANIFEST_FILE)
+  if (manifestCandidate) return manifestCandidate
+
+  const testSrcdir = env.TEST_SRCDIR
+  if (testSrcdir) {
+    const candidate = path.join(testSrcdir, filePath)
+    if (fs.existsSync(candidate)) return candidate
+  }
+
+  return filePath
+}
+
+/**
+ * @param {string} filePath
+ * @param {string | undefined} runfilesManifest
+ */
+function resolveFromManifest (filePath, runfilesManifest) {
+  if (!runfilesManifest || !fs.existsSync(runfilesManifest)) return
+
+  try {
+    const lines = fs.readFileSync(runfilesManifest, 'utf8').split('\n')
+    for (const line of lines) {
+      const separatorIndex = line.indexOf(' ')
+      if (separatorIndex <= 0 || line.slice(0, separatorIndex) !== filePath) continue
+
+      const resolvedPath = line.slice(separatorIndex + 1).trim()
+      if (resolvedPath) return resolvedPath
+    }
+  } catch (err) {
+    log.debug('Failed to resolve Test Optimization runfile from %s: %s', runfilesManifest, err.message)
+  }
+}
+
+module.exports = resolveRunfilePath

package/packages/dd-trace/src/ci-visibility/test-optimization-http-cache-schema.js

@@ -75,14 +75,12 @@ function validateSettingsResponse (response, options = {}) {
   assertBooleanFields(attributes.test_management, ['enabled'], 'settings test_management')
   assertOptionalBoundedNumber(
     attributes.early_flake_detection.faulty_session_threshold,
-    'settings early_flake_detection faulty_session_threshold',
-    { integer: true }
+    'settings early_flake_detection faulty_session_threshold'
   )
   assertRetryMap(attributes.early_flake_detection.slow_test_retries)
   assertOptionalBoundedNumber(
     attributes.test_management.attempt_to_fix_retries,
-    'settings test_management attempt_to_fix_retries',
-    { integer: true }
+    'settings test_management attempt_to_fix_retries'
   )
 }
 
@@ -214,10 +212,9 @@ function assertBooleanFields (object, keys, endpoint) {
   }
 }
 
-function assertOptionalBoundedNumber (value, endpoint, { integer = false } = {}) {
+function assertOptionalBoundedNumber (value, endpoint) {
   if (value === undefined) return
-  if (!Number.isFinite(value) || (integer && !Number.isInteger(value)) ||
-    value < 0 || value > MAX_RETRIES) {
+  if (!Number.isFinite(value) || !Number.isInteger(value) || value < 0 || value > MAX_RETRIES) {
     throw new TypeError(`Invalid ${endpoint}: value must be between 0 and ${MAX_RETRIES}`)
   }
 }
@@ -230,7 +227,7 @@ function assertRetryMap (retries) {
     if (!RETRY_THRESHOLD_PATTERN.test(threshold)) {
       throw new TypeError('Invalid early flake detection retry threshold: expected a duration such as 5s')
     }
-    assertOptionalBoundedNumber(count, `early flake detection retry count ${threshold}`, { integer: true })
+    assertOptionalBoundedNumber(count, `early flake detection retry count ${threshold}`)
   }
 }
 

package/packages/dd-trace/src/ci-visibility/test-optimization-http-cache.js

@@ -5,6 +5,7 @@ const path = require('node:path')
 
 const log = require('../log')
 const { getNumFromKnownTests } = require('../plugins/util/test')
+const resolveRunfilePath = require('./resolve-runfile-path')
 const { parseKnownTestsResponse } = require('./early-flake-detection/get-known-tests')
 const {
   logSkippableSuitesResponse,
@@ -38,16 +39,12 @@ const HTTP_CACHE_FOLDER_NAME = 'http'
 
 const ENV_MANIFEST_FILE = 'TEST_OPTIMIZATION_MANIFEST_FILE'
 const ENV_MANIFEST_FILE_ALIAS = 'DD_TEST_OPTIMIZATION_MANIFEST_FILE'
-const ENV_RUNFILES_DIR = 'RUNFILES_DIR'
-const ENV_RUNFILES_MANIFEST_FILE = 'RUNFILES_MANIFEST_FILE'
-const ENV_TEST_SRCDIR = 'TEST_SRCDIR'
 
 const SETTINGS_FILE_NAME = 'settings.json'
 const KNOWN_TESTS_FILE_NAME = 'known_tests.json'
 const SKIPPABLE_TESTS_FILE_NAME = 'skippable_tests.json'
 const TEST_MANAGEMENT_FILE_NAME = 'test_management.json'
 
-const RUNFILES_MANIFEST_SEPARATOR = ' '
 const DEFAULT_VALIDATION_MAX_FILE_BYTES = 1024 * 1024
 const DEFAULT_VALIDATION_MAX_ENTRIES = 100_000
 const DEFAULT_VALIDATION_MAX_NESTING_DEPTH = 32
@@ -250,7 +247,7 @@ class TestOptimizationHttpCache {
     const manifestFile = this._env[ENV_MANIFEST_FILE] || this._env[ENV_MANIFEST_FILE_ALIAS]
     if (!manifestFile) return
 
-    const resolvedManifestPath = this._resolveRunfilePath(manifestFile)
+    const resolvedManifestPath = resolveRunfilePath(manifestFile, this._env)
     if (fs.existsSync(resolvedManifestPath)) {
       return resolvedManifestPath
     }
@@ -280,54 +277,6 @@ class TestOptimizationHttpCache {
     }
   }
 
-  _resolveRunfilePath (manifestFile) {
-    if (fs.existsSync(manifestFile)) {
-      return manifestFile
-    }
-
-    const runfilesDir = this._env[ENV_RUNFILES_DIR]
-    if (runfilesDir) {
-      const candidate = path.join(runfilesDir, manifestFile)
-      if (fs.existsSync(candidate)) {
-        return candidate
-      }
-    }
-
-    const runfilesManifestCandidate = this._resolveRunfilePathFromManifest(manifestFile)
-    if (runfilesManifestCandidate) {
-      return runfilesManifestCandidate
-    }
-
-    const testSrcdir = this._env[ENV_TEST_SRCDIR]
-    if (testSrcdir) {
-      const candidate = path.join(testSrcdir, manifestFile)
-      if (fs.existsSync(candidate)) {
-        return candidate
-      }
-    }
-
-    return manifestFile
-  }
-
-  _resolveRunfilePathFromManifest (manifestFile) {
-    const runfilesManifest = this._env[ENV_RUNFILES_MANIFEST_FILE]
-    if (!runfilesManifest || !fs.existsSync(runfilesManifest)) return
-
-    try {
-      const lines = fs.readFileSync(runfilesManifest, 'utf8').split('\n')
-      for (const line of lines) {
-        const separatorIndex = line.indexOf(RUNFILES_MANIFEST_SEPARATOR)
-        if (separatorIndex <= 0) continue
-        if (line.slice(0, separatorIndex) !== manifestFile) continue
-
-        const resolvedPath = line.slice(separatorIndex + 1).trim()
-        if (resolvedPath) return resolvedPath
-      }
-    } catch (err) {
-      log.debug('Failed to resolve Test Optimization HTTP cache manifest from %s: %s', runfilesManifest, err.message)
-    }
-  }
-
   _readManifestVersion (manifestPath) {
     try {
       this._assertValidationFixtureFile(manifestPath)

package/packages/dd-trace/src/config/config-types.d.ts

@@ -72,9 +72,9 @@ export type ConfigPathValue<TPath extends ConfigPath> = ConfigPathValueFor<Confi
 export type ConfigDefaults = Partial<{ [TPath in ConfigPath]: ConfigPathValue<TPath> }>
 export type ConfigurationOption = {
   property?: string
-  parser?: (value: unknown, optionName: string, source: string) => unknown
+  parser?: (value: unknown, optionName: string, source: string, reportInvalid?: boolean) => unknown
   type: string
   canonicalName?: string
-  transformer?: (value: unknown, optionName: string, source: string) => unknown
+  transformer?: (value: unknown, optionName: string, source: string, reportInvalid?: boolean) => unknown
   telemetryTransformer?: (value: unknown) => unknown
 }

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

@@ -191,10 +191,10 @@ const optionsTable = {
   },
 }
 
-const parser = (value, optionName, source) => {
+const parser = (value, optionName, source, reportInvalid = true) => {
   const { type, canonicalName = optionName } = configurationsTable[optionName]
   const parsed = parsers[type](value, canonicalName)
-  if (parsed === undefined) {
+  if (parsed === undefined && reportInvalid) {
     warnInvalidValue(value, optionName, source, `Invalid ${type} input`)
   }
   return parsed
@@ -249,13 +249,13 @@ for (const [canonicalName, entries] of Object.entries(supportedConfigurations))
       regExps[entry.allowed] ??= new RegExp(`^(${entry.allowed})$`, 'i')
       const allowed = regExps[entry.allowed]
       const originalTransform = transformer
-      transformer = (value, optionName, source) => {
+      transformer = (value, optionName, source, reportInvalid = true) => {
         if (!allowed.test(value)) {
-          warnInvalidValue(value, optionName, source, 'Invalid value')
+          if (reportInvalid) warnInvalidValue(value, optionName, source, 'Invalid value')
           return
         }
         if (originalTransform) {
-          value = originalTransform(value)
+          value = originalTransform(value, optionName, source, reportInvalid)
         }
         return value
       }

package/packages/dd-trace/src/config/generated-config-types.d.ts

@@ -3,6 +3,8 @@
 
 export interface GeneratedConfig {
   _DD_APM_TRACING_AGENTLESS_ENABLED: boolean;
+  _DD_TEST_PARALLELIZATION_ENABLED: boolean | undefined;
+  _DD_TEST_PARALLELIZATION_METADATA_FILE: string | undefined;
   _DD_TRACE_METRICS_OTEL_FLUSH_INTERVAL: number;
   aiguard: {
     DD_AI_GUARD_ANALYZE_STREAM_RESPONSES_ENABLED: boolean;
@@ -75,6 +77,7 @@ export interface GeneratedConfig {
   DD_APM_FLUSH_DEADLINE_MILLISECONDS: number;
   DD_APP_KEY: string | undefined;
   DD_AZURE_RESOURCE_GROUP: string | undefined;
+  DD_BUNDLER_INJECT_GIT_METADATA: boolean;
   DD_CRASHTRACKING_ENABLED: boolean;
   DD_CUSTOM_PARENT_ID: string | undefined;
   DD_CUSTOM_TRACE_ID: string | undefined;
@@ -435,6 +438,7 @@ export interface GeneratedConfig {
     DD_FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_POLL_INTERVAL_SECONDS: number;
     DD_FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_REQUEST_TIMEOUT_SECONDS: number;
     DD_FEATURE_FLAGS_ENABLED: boolean;
+    DD_FEATURE_FLAGS_EVALUATION_TELEMETRY_PER_SUBJECT_OPT_OUT_ENABLED: boolean;
     DD_FLAGGING_EVALUATION_COUNTS_ENABLED: boolean;
   };
   flushInterval: number;
@@ -606,6 +610,8 @@ export interface GeneratedConfig {
 
 export interface GeneratedEnvVarConfig {
   _DD_APM_TRACING_AGENTLESS_ENABLED: boolean;
+  _DD_TEST_PARALLELIZATION_ENABLED: boolean | undefined;
+  _DD_TEST_PARALLELIZATION_METADATA_FILE: string | undefined;
   _DD_TRACE_METRICS_OTEL_FLUSH_INTERVAL: number;
   DATADOG_API_KEY: string | undefined;
   DD_ACTION_EXECUTION_ID: string | undefined;
@@ -656,6 +662,7 @@ export interface GeneratedEnvVarConfig {
   DD_APPSEC_TRACE_RATE_LIMIT: number;
   DD_APPSEC_WAF_TIMEOUT: number;
   DD_AZURE_RESOURCE_GROUP: string | undefined;
+  DD_BUNDLER_INJECT_GIT_METADATA: boolean;
   DD_CIVISIBILITY_AGENTLESS_ENABLED: boolean;
   DD_CIVISIBILITY_AGENTLESS_URL: URL | undefined;
   DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER: string | undefined;
@@ -718,6 +725,7 @@ export interface GeneratedEnvVarConfig {
   DD_FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_POLL_INTERVAL_SECONDS: number;
   DD_FEATURE_FLAGS_CONFIGURATION_SOURCE_AGENTLESS_REQUEST_TIMEOUT_SECONDS: number;
   DD_FEATURE_FLAGS_ENABLED: boolean;
+  DD_FEATURE_FLAGS_EVALUATION_TELEMETRY_PER_SUBJECT_OPT_OUT_ENABLED: boolean;
   DD_FLAGGING_EVALUATION_COUNTS_ENABLED: boolean;
   DD_GIT_BRANCH: string | undefined;
   DD_GIT_COMMIT_AUTHOR_DATE: string | undefined;

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

@@ -180,14 +180,17 @@ function loadConfigurationsTable () {
  * @param {string} name Canonical or alias environment variable name.
  * @param {string} value Raw value read from an environment source.
  * @param {'env_var'|'fleet_stable_config'|'local_stable_config'} source Source the value was read from.
+ * @param {boolean} [reportInvalid] Whether invalid values should produce configuration diagnostics.
  * @returns {string | number | boolean | object | undefined}
  */
-function parseConfigurationValue (name, value, source) {
+function parseConfigurationValue (name, value, source, reportInvalid = true) {
   loadConfigurationsTable()
   const canonical = aliasToCanonical[name] ?? name
   const entry = configurationsTable[canonical]
-  const parsed = entry.parser(value, canonical, source)
-  return parsed !== undefined && entry.transformer ? entry.transformer(parsed, canonical, source) : parsed
+  const parsed = entry.parser(value, canonical, source, reportInvalid)
+  return parsed !== undefined && entry.transformer
+    ? entry.transformer(parsed, canonical, source, reportInvalid)
+    : parsed
 }
 
 /**
@@ -376,4 +379,32 @@ module.exports = {
       }
     }
   },
+
+  /**
+   * Returns the environment variable name from the highest-priority source whose value is valid.
+   *
+   * @param {string} name Environment variable name
+   */
+  getValidatedConfiguredEnvName (name) {
+    validateAccess(name)
+
+    if (!stableConfigLoaded) {
+      loadStableConfig()
+    }
+
+    const sources = [
+      [fleetStableConfig, 'fleet_stable_config'],
+      [process.env, 'env_var'],
+      [localStableConfig, 'local_stable_config'],
+    ]
+    for (const [source, sourceName] of sources) {
+      if (source !== undefined) {
+        const fromSource = getEnvNameFromSource(name, source)
+        if (fromSource !== undefined &&
+          parseConfigurationValue(fromSource, source[fromSource], sourceName, false) !== undefined) {
+          return fromSource
+        }
+      }
+    }
+  },
 }

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

@@ -124,6 +124,8 @@ const changeTracker = {
  */
 function undo (config, source) {
   for (const name of changeTracker[source]) {
+    if (trackedConfigOrigins.get(name) !== source) continue
+
     const entry = changeTracker.baseValuesByPath[name] ?? { source: 'default', value: defaults[name] }
     setAndTrack(config, name, entry.value, undefined, entry.source)
   }
@@ -248,9 +250,9 @@ class Config extends ConfigBase {
     const { experimental, ...rest } = options
     if (experimental) {
       // @ts-expect-error - Difficult to type this correctly.
-      this.#applyOptions(experimental, 'code', 'experimental')
+      this.#applyOptions(experimental, 'experimental')
     }
-    this.#applyOptions(rest, 'code')
+    this.#applyOptions(rest)
     this.#applyCalculated()
 
     warnWrongOtelSettings()
@@ -280,10 +282,9 @@ class Config extends ConfigBase {
 
   /**
    * @param {TracerOptions} options
-   * @param {'code'} source
    * @param {string} [root]
    */
-  #applyOptions (options, source, root = '') {
+  #applyOptions (options, root = '') {
     for (const [name, value] of Object.entries(options)) {
       const fullName = root ? `${root}.${name}` : name
       let entry = optionsTable[fullName]
@@ -300,7 +301,7 @@ class Config extends ConfigBase {
             // Defining an option that receives an object as value may not contain a property that is also
             // potentially a nested property!
             if (Object.hasOwn(value, nestedProperty)) {
-              this.#applyOptions(value, source, fullName)
+              this.#applyOptions(value, fullName)
               matched = true
               break
             }
@@ -316,7 +317,7 @@ class Config extends ConfigBase {
             // TracePropagationStyle is special. It is a single option that is used to set both inject and extract.
             // TODO: Consider what to do with this later
             // @ts-expect-error - Difficult to type this correctly.
-            this.#applyOptions({ inject: value, extract: value }, source, 'tracePropagationStyle')
+            this.#applyOptions({ inject: value, extract: value }, 'tracePropagationStyle')
           } else {
             log.warn('Unknown option %s with value %o', fullName, value)
           }
@@ -325,12 +326,12 @@ class Config extends ConfigBase {
       }
       const coerced = programmaticTypeCoercions[entry.type](value)
       if (coerced === undefined && value !== undefined) {
-        warnInvalidValue(value, fullName, source, `Invalid ${entry.type} input`)
+        warnInvalidValue(value, fullName, 'code', `Invalid ${entry.type} input`)
       }
       const transformed = coerced !== undefined && entry.transformer
-        ? entry.transformer(coerced, fullName, source)
+        ? entry.transformer(coerced, fullName, 'code')
         : coerced
-      setAndTrack(this, entry.property ?? name, transformed, value, source)
+      setAndTrack(this, entry.property ?? name, transformed, value, 'code')
     }
   }
 

package/packages/dd-trace/src/config/normalize-service.js

@@ -11,7 +11,7 @@ const MAX_SERVICE_LENGTH = 100
  * `_scope/name` in runtime metrics. Pre-normalizing pins both consumers
  * (and telemetry / process tags) to the same value.
  *
- * @see https://github.com/DataDog/datadog-agent/blob/main/pkg/trace/traceutil/normalize.go
+ * @see https://github.com/DataDog/datadog-agent/blob/main/pkg/trace/traceutil/normalize/normalize.go
  * @param {string | undefined} name
  */
 function normalizeService (name) {

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

@@ -227,12 +227,12 @@ const transformers = {
     if (url?.protocol === 'http:' || url?.protocol === 'https:') return value
     warnInvalidValue(value, optionName, source, 'Invalid HTTP URL')
   },
-  validatePropagationStyles (value, optionName) {
+  validatePropagationStyles (value, optionName, _source, reportInvalid = true) {
     value = transformers.toLowerCase(value)
     for (let index = 0; index < value.length; index++) {
       const propagator = value[index]
       if (!VALID_PROPAGATION_STYLES.has(propagator)) {
-        warnInvalidValue(propagator, optionName, optionName, 'Invalid propagator')
+        if (reportInvalid) warnInvalidValue(propagator, optionName, optionName, 'Invalid propagator')
         return
       }
       if (DD_MAJOR >= 6 && propagator === 'b3 single header') {

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

@@ -508,6 +508,14 @@
         "default": null
       }
     ],
+    "DD_BUNDLER_INJECT_GIT_METADATA": [
+      {
+        "implementation": "A",
+        "type": "boolean",
+        "default": "true",
+        "description": "When using the Datadog esbuild or webpack plugin, inject DD_GIT_COMMIT_SHA and DD_GIT_REPOSITORY_URL into the bundle. Set to false for stable artifact hashes across commits."
+      }
+    ],
     "DD_CIVISIBILITY_AGENTLESS_ENABLED": [
       {
         "implementation": "A",
@@ -937,6 +945,17 @@
         "default": "false"
       }
     ],
+    "DD_FEATURE_FLAGS_EVALUATION_TELEMETRY_PER_SUBJECT_OPT_OUT_ENABLED": [
+      {
+        "implementation": "A",
+        "type": "boolean",
+        "namespace": "featureFlags",
+        "configurationNames": [
+          "featureFlags.enableEvaluationTelemetryOptOutParameter"
+        ],
+        "default": "false"
+      }
+    ],
     "DD_FEATURE_FLAGS_CONFIGURATION_SOURCE": [
       {
         "implementation": "A",
@@ -2130,6 +2149,22 @@
         "namespace": "testOptimization"
       }
     ],
+    "_DD_TEST_PARALLELIZATION_ENABLED": [
+      {
+        "implementation": "A",
+        "type": "boolean",
+        "default": null,
+        "description": "Internal: Identifies test processes started by ddtest run."
+      }
+    ],
+    "_DD_TEST_PARALLELIZATION_METADATA_FILE": [
+      {
+        "implementation": "A",
+        "type": "string",
+        "default": null,
+        "description": "Internal: Absolute path to planning metadata supplied by ddtest run."
+      }
+    ],
     "DD_TEST_SESSION_NAME": [
       {
         "implementation": "A",

package/packages/dd-trace/src/datastreams/processor.js

@@ -28,8 +28,9 @@ class StatsPoint {
   }
 
   addLatencies (checkpoint) {
-    const edgeLatencySec = checkpoint.edgeLatencyNs / 1e9
-    const pathwayLatencySec = checkpoint.pathwayLatencyNs / 1e9
+    // Start times can come from another host's clock, so skew can make these negative.
+    const edgeLatencySec = Math.max(0, checkpoint.edgeLatencyNs / 1e9)
+    const pathwayLatencySec = Math.max(0, checkpoint.pathwayLatencyNs / 1e9)
     this.edgeLatency.accept(edgeLatencySec)
     this.pathwayLatency.accept(pathwayLatencySec)
     this.payloadSize.accept(checkpoint.payloadSize)

package/packages/dd-trace/src/datastreams/schemas/schema_builder.js

@@ -54,10 +54,7 @@ class SchemaBuilder {
   }
 
   shouldExtractSchema (schemaName, depth) {
-    if (depth > maxDepth) {
-      return false
-    }
-    if (schemaName in this.schema.components.schemas) {
+    if (depth > maxDepth || schemaName in this.schema.components.schemas) {
       return false
     }
     this.schema.components.schemas[schemaName] = new OpenApiSchema.SCHEMA()

package/packages/dd-trace/src/debugger/devtools_client/send.js

@@ -61,6 +61,7 @@ function send (message, logger, dd, snapshot, processTags, eventType, incomplete
     ddsource,
     hostname,
     service,
+    timestamp: snapshot.timestamp,
     message,
     logger,
     dd,