dd-trace 5.82.0 → 5.84.0

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

@@ -1,41 +1,66 @@
 'use strict'
 
 const { storage } = require('../../datadog-core')
-const baggageStorage = storage('baggage')
 
+/**
+ * Spec (API semantics):
+ * - OpenTelemetry Baggage API: https://opentelemetry.io/docs/specs/otel/baggage/api/
+ *
+ * In-process baggage is a string->string map stored in async local storage.
+ * @typedef {import('../../datadog-core/src/storage').Store<string>} BaggageStore
+ */
+
+/**
+ * @type {{ enterWith: (store?: BaggageStore) => void, getStore: () => (BaggageStore | undefined) }}
+ */
+const baggageStorage =
+  /** @type {{ enterWith: (store?: BaggageStore) => void, getStore: () => (BaggageStore | undefined) }} */ (
+    /** @type {unknown} */ (storage('baggage'))
+  )
+
+// TODO: Implement metadata https://opentelemetry.io/docs/specs/otel/baggage/api/#set-value
 /**
  * @param {string} key
  * @param {string} value
+ * @param {object} [metadata] Not used yet
  */
-function setBaggageItem (key, value) {
-  storage('baggage').enterWith({ ...baggageStorage.getStore(), [key]: value })
-  return storage('baggage').getStore()
+function setBaggageItem (key, value, metadata) {
+  if (typeof key !== 'string' || typeof value !== 'string' || key === '') {
+    return baggageStorage.getStore() ?? {}
+  }
+
+  const store = baggageStorage.getStore()
+  const newStore = { ...store, [key]: value }
+  baggageStorage.enterWith(newStore)
+  return newStore
 }
 
 /**
  * @param {string} key
+ * @returns {string | undefined}
  */
 function getBaggageItem (key) {
-  return storage('baggage').getStore()?.[key]
+  return baggageStorage.getStore()?.[key]
 }
 
 function getAllBaggageItems () {
-  return storage('baggage').getStore() ?? {}
+  return baggageStorage.getStore() ?? {}
 }
 
 /**
  * @param {string} keyToRemove
- * @returns {Record<string, unknown>}
  */
 function removeBaggageItem (keyToRemove) {
-  const { [keyToRemove]: _, ...newBaggage } = storage('baggage').getStore()
-  storage('baggage').enterWith(newBaggage)
+  const store = baggageStorage.getStore() ?? {}
+  const { [keyToRemove]: _, ...newBaggage } = store
+  baggageStorage.enterWith(newBaggage)
   return newBaggage
 }
 
 function removeAllBaggageItems () {
-  storage('baggage').enterWith()
-  return storage('baggage').getStore()
+  const newContext = /** @type {BaggageStore} */ ({})
+  baggageStorage.enterWith(newContext)
+  return newContext
 }
 
 module.exports = {

package/packages/dd-trace/src/ci-visibility/dynamic-instrumentation/index.js

@@ -4,7 +4,7 @@ const { join } = require('path')
 const { Worker, threadId: parentThreadId } = require('worker_threads')
 const { randomUUID } = require('crypto')
 const log = require('../../log')
-const { getEnvironmentVariables } = require('../../config-helper')
+const { getEnvironmentVariables } = require('../../config/helper')
 const getDebuggerConfig = require('../../debugger/config')
 
 const probeIdToResolveBreakpointSet = new Map()
@@ -74,6 +74,10 @@ class TestVisDynamicInstrumentation {
         // for PnP support, hence why we deviate from the DI pattern here.
         // To avoid infinite initialization loops, we're disabling DI and tracing in the worker.
         env: {
+          // NOTE: We intentionally use `getEnvironmentVariables()` here (raw env)
+          // instead of stable-config resolution helpers. The DI worker is a forked
+          // process that should see exactly the parent process's environment, and
+          // we explicitly override a few DD_ vars below to disable tracing/DI there.
           ...getEnvironmentVariables(),
           DD_CIVISIBILITY_ENABLED: 'false',
           DD_TRACE_ENABLED: 'false',

package/packages/dd-trace/src/ci-visibility/early-flake-detection/get-known-tests.js

@@ -3,7 +3,7 @@
 const request = require('../../exporters/common/request')
 const id = require('../../id')
 const log = require('../../log')
-const { getEnvironmentVariable } = require('../../config-helper')
+const { getValueFromEnvSources } = require('../../config/helper')
 
 const {
   incrementCountMetric,
@@ -51,7 +51,7 @@ function getKnownTests ({
     options.path = `${evpProxyPrefix}/api/v2/ci/libraries/tests`
     options.headers['X-Datadog-EVP-Subdomain'] = 'api'
   } else {
-    const apiKey = getEnvironmentVariable('DD_API_KEY')
+    const apiKey = getValueFromEnvSources('DD_API_KEY')
     if (!apiKey) {
       return done(new Error('Known tests were not fetched because Datadog API key is not defined.'))
     }

package/packages/dd-trace/src/ci-visibility/exporters/agent-proxy/index.js

@@ -4,6 +4,7 @@ const AgentWriter = require('../../../exporters/agent/writer')
 const AgentlessWriter = require('../agentless/writer')
 const CoverageWriter = require('../agentless/coverage-writer')
 const CiVisibilityExporter = require('../ci-visibility-exporter')
+const { fetchAgentInfo } = require('../../../agent/info')
 
 const AGENT_EVP_PROXY_PATH_PREFIX = '/evp_proxy/v'
 const AGENT_EVP_PROXY_PATH_REGEX = /\/evp_proxy\/v(\d+)\/?/
@@ -42,11 +43,11 @@ class AgentProxyCiVisibilityExporter extends CiVisibilityExporter {
       isTestDynamicInstrumentationEnabled
     } = config
 
-    this.getAgentInfo((err, agentInfo) => {
+    fetchAgentInfo(this._url, (err, agentInfo) => {
       this._isInitialized = true
       let latestEvpProxyVersion = getLatestEvpProxyVersion(err, agentInfo)
       const isEvpCompatible = latestEvpProxyVersion >= 2
-      const isGzipCompatible = latestEvpProxyVersion >= 4
+      this._isGzipCompatible = latestEvpProxyVersion >= 4
 
       // v3 does not work well citestcycle, so we downgrade to v2
       if (latestEvpProxyVersion === 3) {
@@ -72,7 +73,6 @@ class AgentProxyCiVisibilityExporter extends CiVisibilityExporter {
             const DynamicInstrumentationLogsWriter = require('../agentless/di-logs-writer')
             this._logsWriter = new DynamicInstrumentationLogsWriter({
               url: this._url,
-              tags,
               isAgentProxy: true
             })
             this._canForwardLogs = true
@@ -92,7 +92,6 @@ class AgentProxyCiVisibilityExporter extends CiVisibilityExporter {
       this._resolveCanUseCiVisProtocol(isEvpCompatible)
       this.exportUncodedTraces()
       this.exportUncodedCoverages()
-      this._isGzipCompatible = isGzipCompatible
     })
   }
 

package/packages/dd-trace/src/ci-visibility/exporters/agentless/coverage-writer.js

@@ -2,7 +2,7 @@
 const request = require('../../../exporters/common/request')
 const log = require('../../../log')
 const { safeJSONStringify } = require('../../../exporters/common/util')
-const { getEnvironmentVariable } = require('../../../config-helper')
+const { getValueFromEnvSources } = require('../../../config/helper')
 
 const { CoverageCIVisibilityEncoder } = require('../../../encode/coverage-ci-visibility')
 const BaseWriter = require('../../../exporters/common/writer')
@@ -29,7 +29,7 @@ class Writer extends BaseWriter {
       path: '/api/v2/citestcov',
       method: 'POST',
       headers: {
-        'dd-api-key': getEnvironmentVariable('DD_API_KEY'),
+        'dd-api-key': getValueFromEnvSources('DD_API_KEY'),
         ...form.getHeaders()
       },
       timeout: 15_000,

package/packages/dd-trace/src/ci-visibility/exporters/agentless/di-logs-writer.js

@@ -3,7 +3,7 @@ const request = require('../../../exporters/common/request')
 const log = require('../../../log')
 const { safeJSONStringify } = require('../../../exporters/common/util')
 const { JSONEncoder } = require('../../encode/json-encoder')
-const { getEnvironmentVariable } = require('../../../config-helper')
+const { getValueFromEnvSources } = require('../../../config/helper')
 
 const BaseWriter = require('../../../exporters/common/writer')
 
@@ -11,7 +11,8 @@ const BaseWriter = require('../../../exporters/common/writer')
 // It is used to encode and send logs to both the logs intake directly and the
 // `/debugger/v1/input` endpoint in the agent, which is a proxy to the logs intake.
 class DynamicInstrumentationLogsWriter extends BaseWriter {
-  constructor ({ url, timeout, isAgentProxy = false }) {
+  // TODO: what's a good value for timeout for the logs intake?
+  constructor ({ url, timeout = 15_000, isAgentProxy = false }) {
     super(...arguments)
     this._url = url
     this._encoder = new JSONEncoder()
@@ -24,11 +25,10 @@ class DynamicInstrumentationLogsWriter extends BaseWriter {
       path: '/api/v2/logs',
       method: 'POST',
       headers: {
-        'dd-api-key': getEnvironmentVariable('DD_API_KEY'),
+        'dd-api-key': getValueFromEnvSources('DD_API_KEY'),
         'Content-Type': 'application/json'
       },
-      // TODO: what's a good value for timeout for the logs intake?
-      timeout: this.timeout || 15_000,
+      timeout: this.timeout,
       url: this._url
     }
 

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

@@ -2,7 +2,7 @@
 const request = require('../../../exporters/common/request')
 const { safeJSONStringify } = require('../../../exporters/common/util')
 const log = require('../../../log')
-const { getEnvironmentVariable } = require('../../../config-helper')
+const { getValueFromEnvSources } = require('../../../config/helper')
 
 const { AgentlessCiVisibilityEncoder } = require('../../../encode/agentless-ci-visibility')
 const BaseWriter = require('../../../exporters/common/writer')
@@ -30,7 +30,7 @@ class Writer extends BaseWriter {
       path: '/api/v2/citestcycle',
       method: 'POST',
       headers: {
-        'dd-api-key': getEnvironmentVariable('DD_API_KEY'),
+        'dd-api-key': getValueFromEnvSources('DD_API_KEY'),
         'Content-Type': 'application/msgpack'
       },
       timeout: 15_000,

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

@@ -8,7 +8,7 @@ const { getKnownTests: getKnownTestsRequest } = require('../early-flake-detectio
 const { getTestManagementTests: getTestManagementTestsRequest } =
   require('../test-management/get-test-management-tests')
 const log = require('../../log')
-const AgentInfoExporter = require('../../exporters/common/agent-info-exporter')
+const BufferingExporter = require('../../exporters/common/buffering-exporter')
 const { GIT_REPOSITORY_URL, GIT_COMMIT_SHA } = require('../../plugins/util/tags')
 const { sendGitMetadata: sendGitMetadataRequest } = require('./git/git_metadata')
 
@@ -34,7 +34,7 @@ function getIsTestSessionTrace (trace) {
 const GIT_UPLOAD_TIMEOUT = 60_000 // 60 seconds
 const CAN_USE_CI_VIS_PROTOCOL_TIMEOUT = GIT_UPLOAD_TIMEOUT
 
-class CiVisibilityExporter extends AgentInfoExporter {
+class CiVisibilityExporter extends BufferingExporter {
   constructor (config) {
     super(config)
     this._timer = undefined
@@ -68,7 +68,7 @@ class CiVisibilityExporter extends AgentInfoExporter {
       }
     })
 
-    process.once('beforeExit', () => {
+    const flush = () => {
       if (this._writer) {
         this._writer.flush()
       }
@@ -78,7 +78,8 @@ class CiVisibilityExporter extends AgentInfoExporter {
       if (this._logsWriter) {
         this._logsWriter.flush()
       }
-    })
+    }
+    globalThis[Symbol.for('dd-trace')].beforeExitHandlers.add(flush.bind(this))
   }
 
   shouldRequestSkippableSuites () {
@@ -102,10 +103,6 @@ class CiVisibilityExporter extends AgentInfoExporter {
     )
   }
 
-  shouldRequestLibraryConfiguration () {
-    return this._config.isIntelligentTestRunnerEnabled
-  }
-
   canReportSessionTraces () {
     return this._canUseCiVisProtocol
   }
@@ -162,9 +159,6 @@ class CiVisibilityExporter extends AgentInfoExporter {
   getLibraryConfiguration (testConfiguration, callback) {
     const { repositoryUrl } = testConfiguration
     this.sendGitMetadata(repositoryUrl)
-    if (!this.shouldRequestLibraryConfiguration()) {
-      return callback(null, {})
-    }
     this._canUseCiVisProtocolPromise.then((canUseCiVisProtocol) => {
       if (!canUseCiVisProtocol) {
         return callback(null, {})

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

@@ -5,7 +5,7 @@ const path = require('path')
 
 const FormData = require('../../../exporters/common/form-data')
 const request = require('../../../exporters/common/request')
-const { getEnvironmentVariable } = require('../../../config-helper')
+const { getValueFromEnvSources } = require('../../../config/helper')
 
 const log = require('../../../log')
 const { isFalse } = require('../../../util')
@@ -51,7 +51,7 @@ function getCommonRequestOptions (url) {
   return {
     method: 'POST',
     headers: {
-      'dd-api-key': getEnvironmentVariable('DD_API_KEY')
+      'dd-api-key': getValueFromEnvSources('DD_API_KEY')
     },
     timeout: 15_000,
     url
@@ -288,7 +288,7 @@ function sendGitMetadata (url, { isEvpProxy, evpProxyPrefix }, configRepositoryU
     }
     // Otherwise we unshallow and get commits to upload again
     log.debug('It is shallow clone, unshallowing...')
-    if (!isFalse(getEnvironmentVariable('DD_CIVISIBILITY_GIT_UNSHALLOW_ENABLED'))) {
+    if (!isFalse(getValueFromEnvSources('DD_CIVISIBILITY_GIT_UNSHALLOW_ENABLED'))) {
       unshallowRepository(false)
     }
 

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

@@ -10,7 +10,7 @@ const {
   VITEST_WORKER_TRACE_PAYLOAD_CODE,
   VITEST_WORKER_LOGS_PAYLOAD_CODE
 } = require('../../../plugins/util/test')
-const { getEnvironmentVariable } = require('../../../config-helper')
+const { getEnvironmentVariable, getValueFromEnvSources } = require('../../../config/helper')
 const Writer = require('./writer')
 
 function getInterprocessTraceCode () {
@@ -23,13 +23,13 @@ function getInterprocessTraceCode () {
   if (getEnvironmentVariable('MOCHA_WORKER_ID')) {
     return MOCHA_WORKER_TRACE_PAYLOAD_CODE
   }
-  if (getEnvironmentVariable('DD_PLAYWRIGHT_WORKER')) {
+  if (getValueFromEnvSources('DD_PLAYWRIGHT_WORKER')) {
     return PLAYWRIGHT_WORKER_TRACE_PAYLOAD_CODE
   }
   if (getEnvironmentVariable('TINYPOOL_WORKER_ID')) {
     return VITEST_WORKER_TRACE_PAYLOAD_CODE
   }
-  if (getEnvironmentVariable('DD_VITEST_WORKER')) {
+  if (getValueFromEnvSources('DD_VITEST_WORKER')) {
     return VITEST_WORKER_TRACE_PAYLOAD_CODE
   }
   return null
@@ -50,7 +50,7 @@ function getInterprocessLogsCode () {
   if (getEnvironmentVariable('TINYPOOL_WORKER_ID')) {
     return VITEST_WORKER_LOGS_PAYLOAD_CODE
   }
-  if (getEnvironmentVariable('DD_VITEST_WORKER')) {
+  if (getValueFromEnvSources('DD_VITEST_WORKER')) {
     return VITEST_WORKER_LOGS_PAYLOAD_CODE
   }
   return null

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

@@ -1,6 +1,6 @@
 'use strict'
 const { JSONEncoder } = require('../../encode/json-encoder')
-const { getEnvironmentVariable } = require('../../../config-helper')
+const { getEnvironmentVariable } = require('../../../config/helper')
 const log = require('../../../log')
 const {
   VITEST_WORKER_TRACE_PAYLOAD_CODE,

package/packages/dd-trace/src/ci-visibility/intelligent-test-runner/get-skippable-suites.js

@@ -2,7 +2,7 @@
 
 const request = require('../../exporters/common/request')
 const log = require('../../log')
-const { getEnvironmentVariable } = require('../../config-helper')
+const { getValueFromEnvSources } = require('../../config/helper')
 const {
   incrementCountMetric,
   distributionMetric,
@@ -49,7 +49,7 @@ function getSkippableSuites ({
     options.path = `${evpProxyPrefix}/api/v2/ci/tests/skippable`
     options.headers['X-Datadog-EVP-Subdomain'] = 'api'
   } else {
-    const apiKey = getEnvironmentVariable('DD_API_KEY')
+    const apiKey = getValueFromEnvSources('DD_API_KEY')
     if (!apiKey) {
       return done(new Error('Skippable suites were not fetched because Datadog API key is not defined.'))
     }

package/packages/dd-trace/src/ci-visibility/log-submission/log-submission-plugin.js

@@ -2,7 +2,7 @@
 
 const Plugin = require('../../plugins/plugin')
 const log = require('../../log')
-const { getEnvironmentVariable } = require('../../config-helper')
+const { getValueFromEnvSources } = require('../../config/helper')
 
 function getWinstonLogSubmissionParameters (config) {
   const { site, service } = config
@@ -12,16 +12,16 @@ function getWinstonLogSubmissionParameters (config) {
     path: `/api/v2/logs?ddsource=winston&service=${service}`,
     ssl: true,
     headers: {
-      'DD-API-KEY': getEnvironmentVariable('DD_API_KEY')
+      'DD-API-KEY': getValueFromEnvSources('DD_API_KEY')
     }
   }
 
-  if (!getEnvironmentVariable('DD_AGENTLESS_LOG_SUBMISSION_URL')) {
+  if (!getValueFromEnvSources('DD_AGENTLESS_LOG_SUBMISSION_URL')) {
     return defaultParameters
   }
 
   try {
-    const url = new URL(getEnvironmentVariable('DD_AGENTLESS_LOG_SUBMISSION_URL'))
+    const url = new URL(getValueFromEnvSources('DD_AGENTLESS_LOG_SUBMISSION_URL'))
     return {
       host: url.hostname,
       port: url.port,

package/packages/dd-trace/src/ci-visibility/requests/get-library-configuration.js

@@ -3,7 +3,7 @@
 const request = require('../../exporters/common/request')
 const id = require('../../id')
 const log = require('../../log')
-const { getEnvironmentVariable } = require('../../config-helper')
+const { getValueFromEnvSources } = require('../../config/helper')
 const {
   incrementCountMetric,
   distributionMetric,
@@ -48,7 +48,7 @@ function getLibraryConfiguration ({
     options.path = `${evpProxyPrefix}/api/v2/libraries/tests/services/setting`
     options.headers['X-Datadog-EVP-Subdomain'] = 'api'
   } else {
-    const apiKey = getEnvironmentVariable('DD_API_KEY')
+    const apiKey = getValueFromEnvSources('DD_API_KEY')
     if (!apiKey) {
       return done(new Error('Request to settings endpoint was not done because Datadog API key is not defined.'))
     }
@@ -126,11 +126,11 @@ function getLibraryConfiguration ({
 
         log.debug('Remote settings: %j', settings)
 
-        if (getEnvironmentVariable('DD_CIVISIBILITY_DANGEROUSLY_FORCE_COVERAGE')) {
+        if (getValueFromEnvSources('DD_CIVISIBILITY_DANGEROUSLY_FORCE_COVERAGE')) {
           settings.isCodeCoverageEnabled = true
           log.debug('Dangerously set code coverage to true')
         }
-        if (getEnvironmentVariable('DD_CIVISIBILITY_DANGEROUSLY_FORCE_TEST_SKIPPING')) {
+        if (getValueFromEnvSources('DD_CIVISIBILITY_DANGEROUSLY_FORCE_TEST_SKIPPING')) {
           settings.isSuitesSkippingEnabled = true
           log.debug('Dangerously set test skipping to true')
         }

package/packages/dd-trace/src/ci-visibility/telemetry.js

@@ -21,8 +21,12 @@ const formattedTags = {
 
 // Transform tags dictionary to array of strings.
 // If tag value is true, then only tag key is added to the array.
+/**
+ * @param {Record<string, unknown>} tagsDictionary
+ * @returns {string[]}
+ */
 function formatMetricTags (tagsDictionary) {
-  return Object.keys(tagsDictionary).reduce((acc, tagKey) => {
+  return Object.keys(tagsDictionary).reduce((/** @type {string[]} */ acc, tagKey) => {
     if (tagKey === 'statusCode') {
       const statusCode = tagsDictionary[tagKey]
       if (isStatusCode400(statusCode)) {
@@ -31,7 +35,7 @@ function formatMetricTags (tagsDictionary) {
       acc.push(`error_type:${getErrorTypeFromStatusCode(statusCode)}`)
       return acc
     }
-    const formattedTagKey = formattedTags[tagKey] || tagKey
+    const formattedTagKey = /** @type {string} */(formattedTags[tagKey] || tagKey)
     if (tagsDictionary[tagKey] === true) {
       acc.push(formattedTagKey)
     } else if (tagsDictionary[tagKey] !== undefined && tagsDictionary[tagKey] !== null) {

package/packages/dd-trace/src/ci-visibility/test-management/get-test-management-tests.js

@@ -2,7 +2,7 @@
 
 const request = require('../../exporters/common/request')
 const id = require('../../id')
-const { getEnvironmentVariable } = require('../../config-helper')
+const { getValueFromEnvSources } = require('../../config/helper')
 const log = require('../../log')
 
 function getTestManagementTests ({
@@ -35,7 +35,7 @@ function getTestManagementTests ({
     options.path = `${evpProxyPrefix}/api/v2/test/libraries/test-management/tests`
     options.headers['X-Datadog-EVP-Subdomain'] = 'api'
   } else {
-    const apiKey = getEnvironmentVariable('DD_API_KEY')
+    const apiKey = getValueFromEnvSources('DD_API_KEY')
     if (!apiKey) {
       return done(new Error('Test management tests were not fetched because Datadog API key is not defined.'))
     }

package/packages/dd-trace/src/{config_defaults.js → config/defaults.js}

@@ -1,8 +1,8 @@
 'use strict'
 
-const pkg = require('./pkg')
-const { GRPC_CLIENT_ERROR_STATUSES, GRPC_SERVER_ERROR_STATUSES } = require('./constants')
-const { getEnvironmentVariable: getEnv } = require('./config-helper')
+const pkg = require('../pkg')
+const { GRPC_CLIENT_ERROR_STATUSES, GRPC_SERVER_ERROR_STATUSES } = require('../constants')
+const { getEnvironmentVariable: getEnv } = require('./helper')
 
 // eslint-disable-next-line @stylistic/max-len
 const qsRegex = String.raw`(?:p(?:ass)?w(?:or)?d|pass(?:_?phrase)?|secret|(?:api_?|private_?|public_?|access_?|secret_?)key(?:_?id)?|token|consumer_?(?:id|key|secret)|sign(?:ed|ature)?|auth(?:entication|orization)?)(?:(?:\s|%20)*(?:=|%3D)[^&]+|(?:"|%22)(?:\s|%20)*(?::|%3A)(?:\s|%20)*(?:"|%22)(?:%2[^2]|%[^2]|[^"%])+(?:"|%22))|bearer(?:\s|%20)+[a-z0-9\._\-]+|token(?::|%3A)[a-z0-9]{13}|gh[opsu]_[0-9a-zA-Z]{36}|ey[I-L](?:[\w=-]|%3D)+\.ey[I-L](?:[\w=-]|%3D)+(?:\.(?:[\w.+\/=-]|%3D|%2F|%2B)+)?|[\-]{5}BEGIN(?:[a-z\s]|%20)+PRIVATE(?:\s|%20)KEY[\-]{5}[^\-]+[\-]{5}END(?:[a-z\s]|%20)+PRIVATE(?:\s|%20)KEY|ssh-rsa(?:\s|%20)*(?:[a-z0-9\/\.+]|%2F|%5C|%2B){100,}`

package/packages/dd-trace/src/{config-helper.js → config/helper.js}

@@ -34,7 +34,66 @@ for (const deprecation of Object.keys(deprecations)) {
   )
 }
 
+let localStableConfig
+let fleetStableConfig
+let stableConfigWarnings
+let stableConfigLoaded = false
+
+function loadStableConfig () {
+  stableConfigLoaded = true
+
+  // Lazy require to avoid circular dependency at module load time.
+  const { isInServerlessEnvironment } = require('../serverless')
+  if (isInServerlessEnvironment()) {
+    // Stable config is not supported in serverless environments.
+    return
+  }
+
+  const StableConfig = require('./stable')
+  const instance = new StableConfig()
+  localStableConfig = instance.localEntries
+  fleetStableConfig = instance.fleetEntries
+  stableConfigWarnings = instance.warnings
+}
+
+function getValueFromSource (name, source) {
+  const value = source[name]
+
+  if (value === undefined && aliases[name]) {
+    for (const alias of aliases[name]) {
+      if (source[alias] !== undefined) {
+        return source[alias]
+      }
+    }
+  }
+
+  return value
+}
+
+function validateAccess (name) {
+  if ((name.startsWith('DD_') || name.startsWith('OTEL_') || aliasToCanonical[name]) &&
+    !supportedConfigurations[name]) {
+    throw new Error(`Missing ${name} env/configuration in "supported-configurations.json" file.`)
+  }
+}
+
 module.exports = {
+  /**
+   * Expose raw stable config maps and warnings for consumers that need
+   * per-source access (e.g. telemetry in Config).
+   *
+   * @returns {{ localStableConfig: object, fleetStableConfig: object, stableConfigWarnings: string[] }}
+   */
+  getStableConfigSources () {
+    if (!stableConfigLoaded) {
+      loadStableConfig()
+    }
+    return {
+      localStableConfig,
+      fleetStableConfig,
+      stableConfigWarnings,
+    }
+  },
   /**
    * Returns the environment variables that are supported by the tracer
    * (including all non-Datadog/OTEL specific environment variables).
@@ -46,6 +105,7 @@ module.exports = {
   getEnvironmentVariables () {
     const configs = {}
     for (const [key, value] of Object.entries(process.env)) {
+      // TODO(BridgeAR): Handle telemetry reporting for aliases.
       if (key.startsWith('DD_') || key.startsWith('OTEL_') || aliasToCanonical[key]) {
         if (supportedConfigurations[key]) {
           configs[key] = value
@@ -72,28 +132,41 @@ module.exports = {
     return configs
   },
 
+  getEnvironmentVariable (name) {
+    validateAccess(name)
+    return getValueFromSource(name, process.env)
+  },
+
   /**
-   * Returns the environment variable, if it's supported or a non Datadog
-   * configuration. Otherwise, it throws an error.
+   * Returns the value stored at the given name, assumed to be in environment variable format,
+   * from the supported env sources (process.env, local stable config, fleet stable config).
+   * Falls back to aliases if the canonical name is not set.
    *
    * @param {string} name Environment variable name
    * @returns {string|undefined}
    * @throws {Error} if the configuration is not supported
    */
-  // This method, and callers of this method, need to be updated to check for declarative config sources as well.
-  getEnvironmentVariable (name) {
-    if ((name.startsWith('DD_') || name.startsWith('OTEL_') || aliasToCanonical[name]) &&
-        !supportedConfigurations[name]) {
-      throw new Error(`Missing ${name} env/configuration in "supported-configurations.json" file.`)
+  getValueFromEnvSources (name) {
+    validateAccess(name)
+
+    if (!stableConfigLoaded) {
+      loadStableConfig()
     }
-    const config = process.env[name]
-    if (config === undefined && aliases[name]) {
-      for (const alias of aliases[name]) {
-        if (process.env[alias] !== undefined) {
-          return process.env[alias]
-        }
+
+    if (fleetStableConfig !== undefined) {
+      const fromFleet = getValueFromSource(name, fleetStableConfig)
+      if (fromFleet !== undefined) {
+        return fromFleet
       }
     }
-    return config
-  }
+
+    const fromEnv = getValueFromSource(name, process.env)
+    if (fromEnv !== undefined) {
+      return fromEnv
+    }
+
+    if (localStableConfig !== undefined) {
+      return getValueFromSource(name, localStableConfig)
+    }
+  },
 }