dd-trace 5.54.0 → 5.56.0

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

@@ -8,8 +8,6 @@ const log = require('./log')
 const pkg = require('./pkg')
 const coalesce = require('koalas')
 const tagger = require('./tagger')
-const get = require('../../datadog-core/src/utils/src/get')
-const has = require('../../datadog-core/src/utils/src/has')
 const set = require('../../datadog-core/src/utils/src/set')
 const { isTrue, isFalse, normalizeProfilingEnabledValue } = require('./util')
 const { GIT_REPOSITORY_URL, GIT_COMMIT_SHA } = require('./plugins/util/tags')
@@ -19,9 +17,12 @@ const telemetryMetrics = require('./telemetry/metrics')
 const { isInServerlessEnvironment, getIsGCPFunction, getIsAzureFunction } = require('./serverless')
 const { ORIGIN_KEY, GRPC_CLIENT_ERROR_STATUSES, GRPC_SERVER_ERROR_STATUSES } = require('./constants')
 const { appendRules } = require('./payload-tagging/config')
+const { getEnvironmentVariable, getEnvironmentVariables } = require('./config-helper')
 
 const tracerMetrics = telemetryMetrics.manager.namespace('tracers')
 
+const changeTracker = {}
+
 const telemetryCounters = {
   'otel.env.hiding': {},
   'otel.env.invalid': {}
@@ -80,10 +81,10 @@ function getFromOtelSamplerMap (otelTracesSampler, otelTracesSamplerArg) {
 }
 
 function validateOtelPropagators (propagators) {
-  if (!process.env.PROPAGATION_STYLE_EXTRACT &&
-    !process.env.PROPAGATION_STYLE_INJECT &&
-    !process.env.DD_TRACE_PROPAGATION_STYLE &&
-    process.env.OTEL_PROPAGATORS) {
+  if (!getEnvironmentVariable('PROPAGATION_STYLE_EXTRACT') &&
+    !getEnvironmentVariable('PROPAGATION_STYLE_INJECT') &&
+    !getEnvironmentVariable('DD_TRACE_PROPAGATION_STYLE') &&
+    getEnvironmentVariable('OTEL_PROPAGATORS')) {
     for (const style in propagators) {
       if (!VALID_PROPAGATION_STYLES.has(style)) {
         log.warn('unexpected value for OTEL_PROPAGATORS environment variable')
@@ -94,7 +95,7 @@ function validateOtelPropagators (propagators) {
 }
 
 function validateEnvVarType (envVar) {
-  const value = process.env[envVar]
+  const value = getEnvironmentVariable(envVar)
   switch (envVar) {
     case 'OTEL_LOG_LEVEL':
       return VALID_LOG_LEVELS.has(value)
@@ -103,7 +104,7 @@ function validateEnvVarType (envVar) {
     case 'OTEL_SERVICE_NAME':
       return typeof value === 'string'
     case 'OTEL_TRACES_SAMPLER':
-      return getFromOtelSamplerMap(value, process.env.OTEL_TRACES_SAMPLER_ARG) !== undefined
+      return getFromOtelSamplerMap(value, getEnvironmentVariable('OTEL_TRACES_SAMPLER_ARG')) !== undefined
     case 'OTEL_TRACES_SAMPLER_ARG':
       return !Number.isNaN(Number.parseFloat(value))
     case 'OTEL_SDK_DISABLED':
@@ -119,12 +120,12 @@ function validateEnvVarType (envVar) {
 
 function checkIfBothOtelAndDdEnvVarSet () {
   for (const [otelEnvVar, ddEnvVar] of Object.entries(otelDdEnvMapping)) {
-    if (ddEnvVar && process.env[ddEnvVar] && process.env[otelEnvVar]) {
+    if (ddEnvVar && getEnvironmentVariable(ddEnvVar) && getEnvironmentVariable(otelEnvVar)) {
       log.warn(`both ${ddEnvVar} and ${otelEnvVar} environment variables are set`)
       getCounter('otel.env.hiding', ddEnvVar, otelEnvVar).inc()
     }
 
-    if (process.env[otelEnvVar] && !validateEnvVarType(otelEnvVar)) {
+    if (getEnvironmentVariable(otelEnvVar) && !validateEnvVarType(otelEnvVar)) {
       log.warn(`unexpected value for ${otelEnvVar} environment variable`)
       getCounter('otel.env.invalid', ddEnvVar, otelEnvVar).inc()
     }
@@ -178,7 +179,7 @@ function validateNamingVersion (versionString) {
  * @param {string | string[]} input
  */
 function splitJSONPathRules (input) {
-  if (!input) return null
+  if (!input) return
   if (Array.isArray(input)) return input
   if (input === 'all') return []
   return input.split(',')
@@ -211,7 +212,8 @@ function propagationStyle (key, option) {
   // Otherwise, fallback to env var parsing
   const envKey = `DD_TRACE_PROPAGATION_STYLE_${key.toUpperCase()}`
 
-  const envVar = coalesce(process.env[envKey], process.env.DD_TRACE_PROPAGATION_STYLE, process.env.OTEL_PROPAGATORS)
+  const envVar = coalesce(getEnvironmentVariable(envKey),
+    getEnvironmentVariable('DD_TRACE_PROPAGATION_STYLE'), getEnvironmentVariable('OTEL_PROPAGATORS'))
   if (envVar !== undefined) {
     return envVar.split(',')
       .filter(v => v !== '')
@@ -229,6 +231,16 @@ function reformatSpanSamplingRules (rules) {
   })
 }
 
+const sourcesOrder = [
+  { containerProperty: '_remote', origin: 'remote_config', unprocessedProperty: '_remoteUnprocessed' },
+  { containerProperty: '_options', origin: 'code', unprocessedProperty: '_optsUnprocessed' },
+  { containerProperty: '_fleetStableConfig', origin: 'fleet_stable_config' },
+  { containerProperty: '_env', origin: 'env_var', unprocessedProperty: '_envUnprocessed' },
+  { containerProperty: '_localStableConfig', origin: 'local_stable_config' },
+  { containerProperty: '_calculated', origin: 'calculated' },
+  { containerProperty: '_defaults', origin: 'default' }
+]
+
 class Config {
   constructor (options = {}) {
     if (!isInServerlessEnvironment()) {
@@ -265,14 +277,11 @@ class Config {
 
     checkIfBothOtelAndDdEnvVarSet()
 
-    const DD_API_KEY = coalesce(
-      process.env.DATADOG_API_KEY,
-      process.env.DD_API_KEY
-    )
+    const DD_API_KEY = getEnvironmentVariable('DD_API_KEY')
 
-    if (process.env.DD_TRACE_PROPAGATION_STYLE && (
-      process.env.DD_TRACE_PROPAGATION_STYLE_INJECT ||
-      process.env.DD_TRACE_PROPAGATION_STYLE_EXTRACT
+    if (getEnvironmentVariable('DD_TRACE_PROPAGATION_STYLE') && (
+      getEnvironmentVariable('DD_TRACE_PROPAGATION_STYLE_INJECT') ||
+      getEnvironmentVariable('DD_TRACE_PROPAGATION_STYLE_EXTRACT')
     )) {
       log.warn(
         'Use either the DD_TRACE_PROPAGATION_STYLE environment variable or separate ' +
@@ -294,34 +303,34 @@ class Config {
     }
 
     const DD_INSTRUMENTATION_INSTALL_ID = coalesce(
-      process.env.DD_INSTRUMENTATION_INSTALL_ID,
+      getEnvironmentVariable('DD_INSTRUMENTATION_INSTALL_ID'),
       null
     )
     const DD_INSTRUMENTATION_INSTALL_TIME = coalesce(
-      process.env.DD_INSTRUMENTATION_INSTALL_TIME,
+      getEnvironmentVariable('DD_INSTRUMENTATION_INSTALL_TIME'),
       null
     )
     const DD_INSTRUMENTATION_INSTALL_TYPE = coalesce(
-      process.env.DD_INSTRUMENTATION_INSTALL_TYPE,
+      getEnvironmentVariable('DD_INSTRUMENTATION_INSTALL_TYPE'),
       null
     )
 
     const DD_TRACE_CLOUD_REQUEST_PAYLOAD_TAGGING = splitJSONPathRules(
       coalesce(
-        process.env.DD_TRACE_CLOUD_REQUEST_PAYLOAD_TAGGING,
+        getEnvironmentVariable('DD_TRACE_CLOUD_REQUEST_PAYLOAD_TAGGING'),
         options.cloudPayloadTagging?.request,
         ''
       ))
 
     const DD_TRACE_CLOUD_RESPONSE_PAYLOAD_TAGGING = splitJSONPathRules(
       coalesce(
-        process.env.DD_TRACE_CLOUD_RESPONSE_PAYLOAD_TAGGING,
+        getEnvironmentVariable('DD_TRACE_CLOUD_RESPONSE_PAYLOAD_TAGGING'),
         options.cloudPayloadTagging?.response,
         ''
       ))
 
     const DD_TRACE_CLOUD_PAYLOAD_TAGGING_MAX_DEPTH = coalesce(
-      process.env.DD_TRACE_CLOUD_PAYLOAD_TAGGING_MAX_DEPTH,
+      getEnvironmentVariable('DD_TRACE_CLOUD_PAYLOAD_TAGGING_MAX_DEPTH'),
       options.cloudPayloadTagging?.maxDepth,
       10
     )
@@ -370,17 +379,17 @@ class Config {
     if (this.gitMetadataEnabled) {
       this.repositoryUrl = removeUserSensitiveInfo(
         coalesce(
-          process.env.DD_GIT_REPOSITORY_URL,
+          getEnvironmentVariable('DD_GIT_REPOSITORY_URL'),
           this.tags[GIT_REPOSITORY_URL]
         )
       )
       this.commitSHA = coalesce(
-        process.env.DD_GIT_COMMIT_SHA,
+        getEnvironmentVariable('DD_GIT_COMMIT_SHA'),
         this.tags[GIT_COMMIT_SHA]
       )
       if (!this.repositoryUrl || !this.commitSHA) {
         const DD_GIT_PROPERTIES_FILE = coalesce(
-          process.env.DD_GIT_PROPERTIES_FILE,
+          getEnvironmentVariable('DD_GIT_PROPERTIES_FILE'),
           `${process.cwd()}/git.properties`
         )
         let gitPropertiesString
@@ -388,7 +397,7 @@ class Config {
           gitPropertiesString = fs.readFileSync(DD_GIT_PROPERTIES_FILE, 'utf8')
         } catch (e) {
           // Only log error if the user has set a git.properties path
-          if (process.env.DD_GIT_PROPERTIES_FILE) {
+          if (getEnvironmentVariable('DD_GIT_PROPERTIES_FILE')) {
             log.error('Error reading DD_GIT_PROPERTIES_FILE: %s', DD_GIT_PROPERTIES_FILE, e)
           }
         }
@@ -418,7 +427,7 @@ class Config {
     // TODO: Remove the experimental env vars as a major?
     const DD_TRACE_B3_ENABLED = coalesce(
       options.experimental && options.experimental.b3,
-      process.env.DD_TRACE_EXPERIMENTAL_B3_ENABLED,
+      getEnvironmentVariable('DD_TRACE_EXPERIMENTAL_B3_ENABLED'),
       false
     )
     const defaultPropagationStyle = ['datadog', 'tracecontext']
@@ -439,7 +448,7 @@ class Config {
       FUNCTION_NAME,
       K_SERVICE,
       WEBSITE_SITE_NAME
-    } = process.env
+    } = getEnvironmentVariables()
 
     const service = AWS_LAMBDA_FUNCTION_NAME ||
       FUNCTION_NAME || // Google Cloud Function Name set by deprecated runtimes
@@ -488,6 +497,7 @@ class Config {
     this._setValue(defaults, 'dynamicInstrumentation.enabled', false)
     this._setValue(defaults, 'dynamicInstrumentation.redactedIdentifiers', [])
     this._setValue(defaults, 'dynamicInstrumentation.redactionExcludedIdentifiers', [])
+    this._setValue(defaults, 'dynamicInstrumentation.uploadIntervalSeconds', 1)
     this._setValue(defaults, 'env')
     this._setValue(defaults, 'experimental.enableGetRumData', false)
     this._setValue(defaults, 'experimental.exporter')
@@ -643,7 +653,6 @@ class Config {
       DD_API_SECURITY_SAMPLE_DELAY,
       DD_APM_TRACING_ENABLED,
       DD_APPSEC_AUTO_USER_INSTRUMENTATION_MODE,
-      DD_APPSEC_AUTOMATED_USER_EVENTS_TRACKING,
       DD_APPSEC_COLLECT_ALL_HEADERS,
       DD_APPSEC_ENABLED,
       DD_APPSEC_GRAPHQL_BLOCKED_TEMPLATE_JSON,
@@ -667,16 +676,15 @@ class Config {
       DD_CODE_ORIGIN_FOR_SPANS_EXPERIMENTAL_EXIT_SPANS_ENABLED,
       DD_DATA_STREAMS_ENABLED,
       DD_DBM_PROPAGATION_MODE,
-      DD_DOGSTATSD_HOSTNAME,
       DD_DOGSTATSD_HOST,
       DD_DOGSTATSD_PORT,
       DD_DYNAMIC_INSTRUMENTATION_ENABLED,
       DD_DYNAMIC_INSTRUMENTATION_REDACTED_IDENTIFIERS,
       DD_DYNAMIC_INSTRUMENTATION_REDACTION_EXCLUDED_IDENTIFIERS,
+      DD_DYNAMIC_INSTRUMENTATION_UPLOAD_INTERVAL_SECONDS,
       DD_ENV,
-      DD_EXPERIMENTAL_API_SECURITY_ENABLED,
       DD_EXPERIMENTAL_APPSEC_STANDALONE_ENABLED,
-      DD_EXPERIMENTAL_PROFILING_ENABLED,
+      DD_PROFILING_ENABLED,
       DD_GRPC_CLIENT_ERROR_STATUSES,
       DD_GRPC_SERVER_ERROR_STATUSES,
       JEST_WORKER_ID,
@@ -703,7 +711,6 @@ class Config {
       DD_LLMOBS_ML_APP,
       DD_OPENAI_LOGS_ENABLED,
       DD_OPENAI_SPAN_CHAR_LIMIT,
-      DD_PROFILING_ENABLED,
       DD_PROFILING_EXPORTERS,
       DD_PROFILING_SOURCE_MAP,
       DD_INTERNAL_PROFILING_LONG_LIVED_THRESHOLD,
@@ -712,7 +719,6 @@ class Config {
       DD_RUNTIME_METRICS_ENABLED,
       DD_SERVICE,
       DD_SERVICE_MAPPING,
-      DD_SERVICE_NAME,
       DD_SITE,
       DD_SPAN_SAMPLING_RULES,
       DD_SPAN_SAMPLING_RULES_FILE,
@@ -724,7 +730,6 @@ class Config {
       DD_TELEMETRY_METRICS_ENABLED,
       DD_TRACE_128_BIT_TRACEID_GENERATION_ENABLED,
       DD_TRACE_128_BIT_TRACEID_LOGGING_ENABLED,
-      DD_TRACE_AGENT_HOSTNAME,
       DD_TRACE_AGENT_PORT,
       DD_TRACE_AGENT_PROTOCOL_VERSION,
       DD_TRACE_AWS_ADD_SPAN_POINTERS,
@@ -763,7 +768,6 @@ class Config {
       DD_TRACE_SPAN_LEAK_DEBUG,
       DD_TRACE_STARTUP_LOGS,
       DD_TRACE_TAGS,
-      DD_TRACE_TELEMETRY_ENABLED,
       DD_TRACE_X_DATADOG_TAGS_MAX_LENGTH,
       DD_TRACING_ENABLED,
       DD_VERSION,
@@ -777,7 +781,7 @@ class Config {
       OTEL_SERVICE_NAME,
       OTEL_TRACES_SAMPLER,
       OTEL_TRACES_SAMPLER_ARG
-    } = process.env
+    } = getEnvironmentVariables()
 
     const tags = {}
     const env = setHiddenProperty(this, '_env', {})
@@ -792,10 +796,7 @@ class Config {
       DD_APM_TRACING_ENABLED,
       DD_EXPERIMENTAL_APPSEC_STANDALONE_ENABLED && isFalse(DD_EXPERIMENTAL_APPSEC_STANDALONE_ENABLED)
     ))
-    this._setBoolean(env, 'appsec.apiSecurity.enabled', coalesce(
-      DD_API_SECURITY_ENABLED && isTrue(DD_API_SECURITY_ENABLED),
-      DD_EXPERIMENTAL_API_SECURITY_ENABLED && isTrue(DD_EXPERIMENTAL_API_SECURITY_ENABLED)
-    ))
+    this._setBoolean(env, 'appsec.apiSecurity.enabled', DD_API_SECURITY_ENABLED && isTrue(DD_API_SECURITY_ENABLED))
     this._setValue(env, 'appsec.apiSecurity.sampleDelay', maybeFloat(DD_API_SECURITY_SAMPLE_DELAY))
     this._setValue(env, 'appsec.blockedTemplateGraphql', maybeFile(DD_APPSEC_GRAPHQL_BLOCKED_TEMPLATE_JSON))
     this._setValue(env, 'appsec.blockedTemplateHtml', maybeFile(DD_APPSEC_HTTP_BLOCKED_TEMPLATE_HTML))
@@ -803,10 +804,7 @@ class Config {
     this._setValue(env, 'appsec.blockedTemplateJson', maybeFile(DD_APPSEC_HTTP_BLOCKED_TEMPLATE_JSON))
     this._envUnprocessed['appsec.blockedTemplateJson'] = DD_APPSEC_HTTP_BLOCKED_TEMPLATE_JSON
     this._setBoolean(env, 'appsec.enabled', DD_APPSEC_ENABLED)
-    this._setString(env, 'appsec.eventTracking.mode', coalesce(
-      DD_APPSEC_AUTO_USER_INSTRUMENTATION_MODE,
-      DD_APPSEC_AUTOMATED_USER_EVENTS_TRACKING // TODO: remove in next major
-    ))
+    this._setString(env, 'appsec.eventTracking.mode', DD_APPSEC_AUTO_USER_INSTRUMENTATION_MODE)
     this._setBoolean(env, 'appsec.extendedHeadersCollection.enabled', DD_APPSEC_COLLECT_ALL_HEADERS)
     this._setBoolean(
       env,
@@ -847,7 +845,7 @@ class Config {
       DD_CODE_ORIGIN_FOR_SPANS_EXPERIMENTAL_EXIT_SPANS_ENABLED
     )
     this._setString(env, 'dbmPropagationMode', DD_DBM_PROPAGATION_MODE)
-    this._setString(env, 'dogstatsd.hostname', DD_DOGSTATSD_HOST || DD_DOGSTATSD_HOSTNAME)
+    this._setString(env, 'dogstatsd.hostname', DD_DOGSTATSD_HOST)
     this._setString(env, 'dogstatsd.port', DD_DOGSTATSD_PORT)
     this._setBoolean(env, 'dsmEnabled', DD_DATA_STREAMS_ENABLED)
     this._setBoolean(env, 'dynamicInstrumentation.enabled', DD_DYNAMIC_INSTRUMENTATION_ENABLED)
@@ -857,6 +855,12 @@ class Config {
       'dynamicInstrumentation.redactionExcludedIdentifiers',
       DD_DYNAMIC_INSTRUMENTATION_REDACTION_EXCLUDED_IDENTIFIERS
     )
+    this._setValue(
+      env,
+      'dynamicInstrumentation.uploadIntervalSeconds',
+      maybeFloat(DD_DYNAMIC_INSTRUMENTATION_UPLOAD_INTERVAL_SECONDS)
+    )
+    this._envUnprocessed['dynamicInstrumentation.uploadInterval'] = DD_DYNAMIC_INSTRUMENTATION_UPLOAD_INTERVAL_SECONDS
     this._setString(env, 'env', DD_ENV || tags.env)
     this._setBoolean(env, 'traceEnabled', DD_TRACE_ENABLED)
     this._setBoolean(env, 'experimental.enableGetRumData', DD_TRACE_EXPERIMENTAL_GET_RUM_DATA_ENABLED)
@@ -869,7 +873,7 @@ class Config {
     this._setIntegerRangeSet(env, 'grpc.client.error.statuses', DD_GRPC_CLIENT_ERROR_STATUSES)
     this._setIntegerRangeSet(env, 'grpc.server.error.statuses', DD_GRPC_SERVER_ERROR_STATUSES)
     this._setArray(env, 'headerTags', DD_TRACE_HEADER_TAGS)
-    this._setString(env, 'hostname', coalesce(DD_AGENT_HOST, DD_TRACE_AGENT_HOSTNAME))
+    this._setString(env, 'hostname', DD_AGENT_HOST)
     this._setValue(env, 'iast.dbRowsToTaint', maybeInt(DD_IAST_DB_ROWS_TO_TAINT))
     this._setBoolean(env, 'iast.deduplicationEnabled', DD_IAST_DEDUPLICATION_ENABLED)
     this._setBoolean(env, 'iast.enabled', DD_IAST_ENABLED)
@@ -915,7 +919,6 @@ class Config {
     this._setString(env, 'port', DD_TRACE_AGENT_PORT)
     const profilingEnabled = normalizeProfilingEnabledValue(
       coalesce(
-        DD_EXPERIMENTAL_PROFILING_ENABLED,
         DD_PROFILING_ENABLED,
         this._isInServerlessEnvironment() ? 'false' : undefined
       )
@@ -953,10 +956,10 @@ class Config {
     this._setSamplingRule(env, 'sampler.rules', safeJsonParse(DD_TRACE_SAMPLING_RULES))
     this._envUnprocessed['sampler.rules'] = DD_TRACE_SAMPLING_RULES
     this._setString(env, 'scope', DD_TRACE_SCOPE)
-    this._setString(env, 'service', DD_SERVICE || DD_SERVICE_NAME || tags.service || OTEL_SERVICE_NAME)
+    this._setString(env, 'service', DD_SERVICE || tags.service || OTEL_SERVICE_NAME)
     if (DD_SERVICE_MAPPING) {
       this._setValue(env, 'serviceMapping', Object.fromEntries(
-        process.env.DD_SERVICE_MAPPING.split(',').map(x => x.trim().split(':'))
+        DD_SERVICE_MAPPING.split(',').map(x => x.trim().split(':'))
       ))
     }
     this._setString(env, 'site', DD_SITE)
@@ -971,8 +974,7 @@ class Config {
     this._setTags(env, 'tags', tags)
     this._setValue(env, 'tagsHeaderMaxLength', DD_TRACE_X_DATADOG_TAGS_MAX_LENGTH)
     this._setBoolean(env, 'telemetry.enabled', coalesce(
-      DD_TRACE_TELEMETRY_ENABLED, // for backward compatibility
-      DD_INSTRUMENTATION_TELEMETRY_ENABLED, // to comply with instrumentation telemetry specs
+      DD_INSTRUMENTATION_TELEMETRY_ENABLED,
       !(this._isInServerlessEnvironment() || JEST_WORKER_ID)
     ))
     this._setString(env, 'instrumentation_config_id', DD_INSTRUMENTATION_CONFIG_ID)
@@ -1016,7 +1018,7 @@ class Config {
     const tags = {}
     setHiddenProperty(this, '_optsUnprocessed', {})
 
-    options = setHiddenProperty(this, '_optionsArg', Object.assign({ ingestion: {} }, options, opts))
+    options = setHiddenProperty(this, '_optionsArg', { ingestion: {}, ...options, ...opts })
 
     tagger.add(tags, options.tags)
 
@@ -1088,6 +1090,13 @@ class Config {
       'dynamicInstrumentation.redactionExcludedIdentifiers',
       options.dynamicInstrumentation?.redactionExcludedIdentifiers
     )
+    this._setValue(
+      opts,
+      'dynamicInstrumentation.uploadIntervalSeconds',
+      maybeFloat(options.dynamicInstrumentation?.uploadIntervalSeconds)
+    )
+    this._optsUnprocessed['dynamicInstrumentation.uploadIntervalSeconds'] =
+      options.dynamicInstrumentation?.uploadIntervalSeconds
     this._setString(opts, 'env', options.env || tags.env)
     this._setBoolean(opts, 'experimental.enableGetRumData', options.experimental?.enableGetRumData)
     this._setString(opts, 'experimental.exporter', options.experimental?.exporter)
@@ -1181,20 +1190,19 @@ class Config {
 
   _isCiVisibilityItrEnabled () {
     return coalesce(
-      process.env.DD_CIVISIBILITY_ITR_ENABLED,
+      getEnvironmentVariable('DD_CIVISIBILITY_ITR_ENABLED'),
       true
     )
   }
 
   _getHostname () {
-    const DD_CIVISIBILITY_AGENTLESS_URL = process.env.DD_CIVISIBILITY_AGENTLESS_URL
+    const DD_CIVISIBILITY_AGENTLESS_URL = getEnvironmentVariable('DD_CIVISIBILITY_AGENTLESS_URL')
     const url = DD_CIVISIBILITY_AGENTLESS_URL
       ? new URL(DD_CIVISIBILITY_AGENTLESS_URL)
       : getAgentUrl(this._getTraceAgentUrl(), this._optionsArg)
     const DD_AGENT_HOST = coalesce(
       this._optionsArg.hostname,
-      process.env.DD_AGENT_HOST,
-      process.env.DD_TRACE_AGENT_HOSTNAME,
+      getEnvironmentVariable('DD_AGENT_HOST'),
       '127.0.0.1'
     )
     return DD_AGENT_HOST || (url && url.hostname)
@@ -1204,17 +1212,17 @@ class Config {
     const DD_TRACE_SPAN_ATTRIBUTE_SCHEMA = validateNamingVersion(
       coalesce(
         this._optionsArg.spanAttributeSchema,
-        process.env.DD_TRACE_SPAN_ATTRIBUTE_SCHEMA
+        getEnvironmentVariable('DD_TRACE_SPAN_ATTRIBUTE_SCHEMA')
       )
     )
 
     const peerServiceSet = (
       this._optionsArg.hasOwnProperty('spanComputePeerService') ||
-      process.env.hasOwnProperty('DD_TRACE_PEER_SERVICE_DEFAULTS_ENABLED')
+      getEnvironmentVariables().hasOwnProperty('DD_TRACE_PEER_SERVICE_DEFAULTS_ENABLED')
     )
     const peerServiceValue = coalesce(
       this._optionsArg.spanComputePeerService,
-      process.env.DD_TRACE_PEER_SERVICE_DEFAULTS_ENABLED
+      getEnvironmentVariable('DD_TRACE_PEER_SERVICE_DEFAULTS_ENABLED')
     )
 
     const spanComputePeerService = (
@@ -1230,14 +1238,14 @@ class Config {
 
   _isCiVisibilityGitUploadEnabled () {
     return coalesce(
-      process.env.DD_CIVISIBILITY_GIT_UPLOAD_ENABLED,
+      getEnvironmentVariable('DD_CIVISIBILITY_GIT_UPLOAD_ENABLED'),
       true
     )
   }
 
   _isCiVisibilityManualApiEnabled () {
     return coalesce(
-      process.env.DD_CIVISIBILITY_MANUAL_API_ENABLED,
+      getEnvironmentVariable('DD_CIVISIBILITY_MANUAL_API_ENABLED'),
       true
     )
   }
@@ -1248,7 +1256,7 @@ class Config {
 
     return apmTracingEnabled && coalesce(
       this._optionsArg.stats,
-      process.env.DD_TRACE_STATS_COMPUTATION_ENABLED,
+      getEnvironmentVariable('DD_TRACE_STATS_COMPUTATION_ENABLED'),
       getIsGCPFunction() || getIsAzureFunction()
     )
   }
@@ -1256,8 +1264,7 @@ class Config {
   _getTraceAgentUrl () {
     return coalesce(
       this._optionsArg.url,
-      process.env.DD_TRACE_AGENT_URL,
-      process.env.DD_TRACE_URL,
+      getEnvironmentVariable('DD_TRACE_AGENT_URL'),
       null
     )
   }
@@ -1277,7 +1284,7 @@ class Config {
       DD_TEST_MANAGEMENT_ENABLED,
       DD_TEST_MANAGEMENT_ATTEMPT_TO_FIX_RETRIES,
       DD_CIVISIBILITY_IMPACTED_TESTS_DETECTION_ENABLED
-    } = process.env
+    } = getEnvironmentVariables()
 
     if (DD_CIVISIBILITY_AGENTLESS_URL) {
       this._setValue(calc, 'url', new URL(DD_CIVISIBILITY_AGENTLESS_URL))
@@ -1454,66 +1461,65 @@ class Config {
     obj[name] = value
   }
 
+  _setAndTrackChange ({ name, value, origin, unprocessedValue, changes }) {
+    set(this, name, value)
+
+    if (!changeTracker[name]) {
+      changeTracker[name] = {}
+    }
+
+    const originExists = origin in changeTracker[name]
+    const oldValue = changeTracker[name][origin]
+
+    if (!originExists || oldValue !== value) {
+      changeTracker[name][origin] = value
+      changes.push({
+        name,
+        value: unprocessedValue || value,
+        origin
+      })
+    }
+  }
+
   // TODO: Report origin changes and errors to telemetry.
   // TODO: Deeply merge configurations.
   // TODO: Move change tracking to telemetry.
   // for telemetry reporting, `name`s in `containers` need to be keys from:
   // https://github.com/DataDog/dd-go/blob/prod/trace/apps/tracer-telemetry-intake/telemetry-payload/static/config_norm_rules.json
   _merge () {
-    const containers = [
-      this._remote,
-      this._options,
-      this._fleetStableConfig,
-      this._env,
-      this._localStableConfig,
-      this._calculated,
-      this._defaults
-    ]
-    const origins = [
-      'remote_config',
-      'code',
-      'fleet_stable_config',
-      'env_var',
-      'local_stable_config',
-      'calculated',
-      'default'
-    ]
-    const unprocessedValues = [
-      this._remoteUnprocessed,
-      this._optsUnprocessed,
-      {},
-      this._envUnprocessed,
-      {},
-      {},
-      {}
-    ]
     const changes = []
 
     for (const name in this._defaults) {
-      for (let i = 0; i < containers.length; i++) {
-        const container = containers[i]
+      // Use reverse order for merge (lowest priority first)
+      for (let i = sourcesOrder.length - 1; i >= 0; i--) {
+        const { containerProperty, origin, unprocessedProperty } = sourcesOrder[i]
+        const container = this[containerProperty]
         const value = container[name]
-
-        if ((value !== null && value !== undefined) || container === this._defaults) {
-          if (get(this, name) === value && has(this, name)) break
-
-          set(this, name, value)
-
-          changes.push({
+        if (value != null || container === this._defaults) {
+          this._setAndTrackChange({
             name,
-            value: unprocessedValues[i][name] || value,
-            origin: origins[i]
+            value,
+            origin,
+            unprocessedValue: unprocessedProperty === undefined ? undefined : this[unprocessedProperty][name],
+            changes
           })
-
-          break
         }
       }
     }
-
     this.sampler.sampleRate = this.sampleRate
     updateConfig(changes, this)
   }
 
+  getOrigin (name) {
+    for (const { containerProperty, origin } of sourcesOrder) {
+      const container = this[containerProperty]
+      const value = container[name]
+      if (value != null || container === this._defaults) {
+        return origin
+      }
+    }
+  }
+
   // TODO: Refactor the Config class so it never produces any config objects that are incompatible with MessageChannel
   /**
    * Serializes the config object so it can be passed over a Worker Thread MessageChannel.
@@ -1536,12 +1542,12 @@ function handleOtel (tagString) {
     ?.replace(/(^|,)deployment\.environment=/, '$1env:')
     .replace(/(^|,)service\.name=/, '$1service:')
     .replace(/(^|,)service\.version=/, '$1version:')
-    .replace(/=/g, ':')
+    .replaceAll('=', ':')
 }
 
 function parseSpaceSeparatedTags (tagString) {
   if (tagString && !tagString.includes(',')) {
-    tagString = tagString.replace(/\s+/g, ',')
+    tagString = tagString.replaceAll(/\s+/g, ',')
   }
   return tagString
 }
@@ -1564,9 +1570,8 @@ function getAgentUrl (url, options) {
   if (
     !options.hostname &&
     !options.port &&
-    !process.env.DD_AGENT_HOST &&
-    !process.env.DD_TRACE_AGENT_HOSTNAME &&
-    !process.env.DD_TRACE_AGENT_PORT &&
+    !getEnvironmentVariable('DD_AGENT_HOST') &&
+    !getEnvironmentVariable('DD_TRACE_AGENT_PORT') &&
     fs.existsSync('/var/run/datadog/apm.socket')
   ) {
     return new URL('unix:///var/run/datadog/apm.socket')

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

@@ -1,5 +1,6 @@
 const os = require('os')
 const fs = require('fs')
+const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
 
 class StableConfig {
   constructor () {
@@ -40,6 +41,8 @@ class StableConfig {
 
     try {
       const configurator = new libconfig.JsConfigurator()
+      // Intentionally pass through the raw environment variables for reporting.
+      // eslint-disable-next-line eslint-rules/eslint-process-env
       configurator.set_envp(Object.entries(process.env).map(([key, value]) => `${key}=${value}`))
       configurator.set_args(process.argv)
       configurator.get_configuration(localConfig.toString(), fleetConfig.toString()).forEach((entry) => {
@@ -86,11 +89,11 @@ class StableConfig {
     }
 
     // Allow overriding the paths for testing
-    if (process.env.DD_TEST_LOCAL_CONFIG_PATH !== undefined) {
-      localConfigPath = process.env.DD_TEST_LOCAL_CONFIG_PATH
+    if (getEnvironmentVariable('DD_TEST_LOCAL_CONFIG_PATH') !== undefined) {
+      localConfigPath = getEnvironmentVariable('DD_TEST_LOCAL_CONFIG_PATH')
     }
-    if (process.env.DD_TEST_FLEET_CONFIG_PATH !== undefined) {
-      fleetConfigPath = process.env.DD_TEST_FLEET_CONFIG_PATH
+    if (getEnvironmentVariable('DD_TEST_FLEET_CONFIG_PATH') !== undefined) {
+      fleetConfigPath = getEnvironmentVariable('DD_TEST_FLEET_CONFIG_PATH')
     }
 
     return { localConfigPath, fleetConfigPath }

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

@@ -5,7 +5,7 @@ function fnv (data, hvalInit, fnvPrime, fnvSize) {
   let hval = hvalInit
   for (const byte of data) {
     hval = (hval * fnvPrime) % fnvSize
-    hval = hval ^ BigInt(byte)
+    hval ^= BigInt(byte)
   }
   return hval
 }

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

@@ -117,12 +117,12 @@ function convertKey (key) {
 function jsonStringify (obj, indent = 2) {
   // made to stringify json exactly similar to python / java in order for hashing to be the same
   const jsonString = JSON.stringify(obj, (_, value) => value, indent)
-  return jsonString.replace(/^ +/gm, ' ') // Replace leading spaces with single space
-    .replace(/\n/g, '') // Remove newlines
-    .replace(/{ /g, '{') // Remove space after '{'
-    .replace(/ }/g, '}') // Remove space before '}'
-    .replace(/\[ /g, '[') // Remove space after '['
-    .replace(/ \]/g, ']') // Remove space before ']'
+  return jsonString.replaceAll(/^ +/gm, ' ') // Replace leading spaces with single space
+    .replaceAll('\n', '') // Remove newlines
+    .replaceAll('{ ', '{') // Remove space after '{'
+    .replaceAll(' }', '}') // Remove space before '}'
+    .replaceAll('[ ', '[') // Remove space after '['
+    .replaceAll(' ]', ']') // Remove space before ']'
 }
 
 module.exports = {