refactor: move all config related code under config directory

.gitlab-ci.yml

@@ -11,13 +11,13 @@ stages:
 validate_supported_configurations_local_file:
   extends: .validate_supported_configurations_local_file
   variables:
-    LOCAL_JSON_PATH: "packages/dd-trace/src/supported-configurations.json"
+    LOCAL_JSON_PATH: "packages/dd-trace/src/config/supported-configurations.json"
 
 update_central_configurations_version_range:
   extends: .update_central_configurations_version_range
   variables:
     LOCAL_REPO_NAME: "dd-trace-js"
-    LOCAL_JSON_PATH: "packages/dd-trace/src/supported-configurations.json"
+    LOCAL_JSON_PATH: "packages/dd-trace/src/config/supported-configurations.json"
     LANGUAGE_NAME: "nodejs"
     MULTIPLE_RELEASE_LINES: "true"
 

AGENTS.md

@@ -229,13 +229,13 @@ Avoid try/catch in hot paths - validate inputs early
 
 ## Adding New Configuration Options
 
-1. **Add default value** in `packages/dd-trace/src/config_defaults.js`
-2. **Map environment variable** in `packages/dd-trace/src/config.js` (`#applyEnvironment()` method)
+1. **Add default value** in `packages/dd-trace/src/config/defaults.js`
+2. **Map environment variable** in `packages/dd-trace/src/config/index.js` (`#applyEnvironment()` method)
 3. **Add TypeScript definitions** in `index.d.ts`
 4. **Add to telemetry name mapping** (if applicable) in `packages/dd-trace/src/telemetry/telemetry.js`
-5. **Update** `packages/dd-trace/src/supported-configurations.json`
+5. **Update** `packages/dd-trace/src/config/supported-configurations.json`
 6. **Document** in `docs/API.md` (non-internal/experimental options only)
-7. **Add tests** in `packages/dd-trace/test/config.spec.js`
+7. **Add tests** in `packages/dd-trace/test/config/index.spec.js`
 
 **Naming Convention:** Size/time-based config options should have unit suffixes (e.g., `timeoutMs`, `maxBytes`, `intervalSeconds`).
 

CODEOWNERS

@@ -86,8 +86,8 @@
 # API SDK
 /packages/dd-trace/src/telemetry/ @DataDog/apm-sdk-capabilities-js
 /packages/dd-trace/test/telemetry/ @DataDog/apm-sdk-capabilities-js
-/packages/dd-trace/src/config.js @DataDog/apm-sdk-capabilities-js
-/packages/dd-trace/test/config.spec.js @DataDog/apm-sdk-capabilities-js
+/packages/dd-trace/src/config/ @DataDog/apm-sdk-capabilities-js
+/packages/dd-trace/test/config/ @DataDog/apm-sdk-capabilities-js
 /packages/dd-trace/src/opentelemetry/ @DataDog/apm-sdk-capabilities-js
 /packages/dd-trace/test/opentelemetry/ @DataDog/apm-sdk-capabilities-js
 /packages/dd-trace/src/opentracing/ @DataDog/apm-sdk-capabilities-js

CONTRIBUTING.md

@@ -250,13 +250,13 @@ Never use the type `any` - be specific.
 
 To add a new configuration option:
 
-1. **Add the default value** in `packages/dd-trace/src/config_defaults.js`
-2. **Map the environment variable** in `packages/dd-trace/src/config.js` (add to destructuring in `#applyEnvironment()` method)
+1. **Add the default value** in `packages/dd-trace/src/config/defaults.js`
+2. **Map the environment variable** in `packages/dd-trace/src/config/index.js` (add to destructuring in `#applyEnvironment()` method)
 3. **Add TypeScript definitions** in `index.d.ts`
 4. **Add to telemetry name mapping** (if applicable) in `packages/dd-trace/src/telemetry/telemetry.js`
-5. **Update supported configurations** in `packages/dd-trace/src/supported-configurations.json`
+5. **Update supported configurations** in `packages/dd-trace/src/config/supported-configurations.json`
 6. **Document the option** in `docs/API.md` (for non-internal/experimental options)
-7. **Add tests** in `packages/dd-trace/test/config.spec.js`
+7. **Add tests** in `packages/dd-trace/test/config/index.spec.js`
 
 **Naming Convention:** Size/time-based config options should have unit suffixes (e.g., `timeoutMs`, `maxBytes`, `intervalSeconds`).
 

benchmark/sirun/exporting-pipeline/index.js

@@ -7,7 +7,7 @@ const SpanProcessor = require('../../../packages/dd-trace/src/span_processor')
 const Exporter = require('../../../packages/dd-trace/src/exporters/agent/index')
 const PrioritySampler = require('../../../packages/dd-trace/src/priority_sampler')
 const id = require('../../../packages/dd-trace/src/id')
-const defaults = require('../../../packages/dd-trace/src/config_defaults')
+const defaults = require('../../../packages/dd-trace/src/config/defaults')
 
 const config = {
   url: `http://${defaults.hostname}:${defaults.port}`,

benchmark/sirun/statsd.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const dgram = require('dgram')
-const defaults = require('../../../packages/dd-trace/src/config_defaults')
+const defaults = require('../../packages/dd-trace/src/config/defaults')
 const port = process.env.SIRUN_STATSD_PORT || defaults['dogstatsd.port']
 
 class StatsD {

ci/init.js

@@ -4,7 +4,7 @@
 const tracer = require('../packages/dd-trace')
 const { isTrue, isFalse } = require('../packages/dd-trace/src/util')
 const log = require('../packages/dd-trace/src/log')
-const { getEnvironmentVariable } = require('../packages/dd-trace/src/config-helper')
+const { getEnvironmentVariable } = require('../packages/dd-trace/src/config/helper')
 
 const PACKAGE_MANAGERS = ['npm', 'yarn', 'pnpm']
 const DEFAULT_FLUSH_INTERVAL = 5000

eslint-rules/eslint-env-aliases.mjs

@@ -6,7 +6,7 @@ const __filename = fileURLToPath(import.meta.url)
 
 const supportedConfigsPath = path.resolve(
   path.dirname(__filename),
-  '../packages/dd-trace/src/supported-configurations.json'
+  '../packages/dd-trace/src/config/supported-configurations.json'
 )
 const { aliases } = JSON.parse(fs.readFileSync(supportedConfigsPath, 'utf8'))
 

loader-hook.mjs

@@ -1,7 +1,7 @@
 import * as iitm from 'import-in-the-middle/hook.mjs'
 import regexpEscapeModule from './vendor/dist/escape-string-regexp/index.js'
 import hooks from './packages/datadog-instrumentations/src/helpers/hooks.js'
-import configHelper from './packages/dd-trace/src/config-helper.js'
+import configHelper from './packages/dd-trace/src/config/helper.js'
 import * as rewriterLoader from './packages/datadog-instrumentations/src/helpers/rewriter/loader.mjs'
 import { isRelativeRequire } from './packages/datadog-instrumentations/src/helpers/shared-utils.js'
 

packages/datadog-instrumentations/src/cucumber.js

@@ -3,7 +3,7 @@
 const { createCoverageMap } = require('../../../vendor/dist/istanbul-lib-coverage')
 const shimmer = require('../../datadog-shimmer')
 const log = require('../../dd-trace/src/log')
-const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
+const { getEnvironmentVariable } = require('../../dd-trace/src/config/helper')
 const {
   getCoveredFilenamesFromCoverage,
   resetCoverage,

packages/datadog-instrumentations/src/helpers/register.js

@@ -7,7 +7,7 @@ const requirePackageJson = require('../../../dd-trace/src/require-package-json')
 const log = require('../../../dd-trace/src/log')
 const telemetry = require('../../../dd-trace/src/guardrails/telemetry')
 const { isInServerlessEnvironment } = require('../../../dd-trace/src/serverless')
-const { getEnvironmentVariables } = require('../../../dd-trace/src/config-helper')
+const { getEnvironmentVariables } = require('../../../dd-trace/src/config/helper')
 const checkRequireCache = require('./check-require-cache')
 const Hook = require('./hook')
 const { isRelativeRequire } = require('./shared-utils')

packages/datadog-instrumentations/src/helpers/rewriter/index.js

@@ -35,7 +35,7 @@ const { readFileSync } = require('fs')
 const { join } = require('path')
 const semifies = require('../../../../../vendor/dist/semifies')
 const log = require('../../../../dd-trace/src/log')
-const { getEnvironmentVariable } = require('../../../../dd-trace/src/config-helper')
+const { getEnvironmentVariable } = require('../../../../dd-trace/src/config/helper')
 const transforms = require('./transforms')
 const { generate, parse, traverse } = require('./compiler')
 const instrumentations = require('./instrumentations')

packages/datadog-instrumentations/src/mocha.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
+const { getEnvironmentVariable } = require('../../dd-trace/src/config/helper')
 
 if (getEnvironmentVariable('MOCHA_WORKER_ID')) {
   require('./mocha/worker')

packages/datadog-instrumentations/src/mocha/main.js

@@ -5,7 +5,7 @@ const { addHook, channel } = require('../helpers/instrument')
 const shimmer = require('../../../datadog-shimmer')
 const { isMarkedAsUnskippable } = require('../../../datadog-plugin-jest/src/util')
 const log = require('../../../dd-trace/src/log')
-const { getEnvironmentVariable } = require('../../../dd-trace/src/config-helper')
+const { getEnvironmentVariable } = require('../../../dd-trace/src/config/helper')
 const {
   getTestSuitePath,
   MOCHA_WORKER_TRACE_PAYLOAD_CODE,

packages/datadog-instrumentations/src/nyc.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const shimmer = require('../../datadog-shimmer')
-const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
+const { getEnvironmentVariable } = require('../../dd-trace/src/config/helper')
 const { addHook, channel } = require('./helpers/instrument')
 
 const codeCoverageWrapCh = channel('ci:nyc:wrap')

packages/datadog-instrumentations/src/otel-sdk-trace.js

@@ -2,7 +2,7 @@
 
 const shimmer = require('../../datadog-shimmer')
 const tracer = require('../../dd-trace')
-const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
+const { getEnvironmentVariable } = require('../../dd-trace/src/config/helper')
 const { addHook } = require('./helpers/instrument')
 
 const otelSdkEnabled = getEnvironmentVariable('DD_TRACE_OTEL_ENABLED') ||

packages/datadog-instrumentations/src/playwright.js

@@ -12,7 +12,7 @@ const {
 const log = require('../../dd-trace/src/log')
 const {
   getEnvironmentVariable
-} = require('../../dd-trace/src/config-helper')
+} = require('../../dd-trace/src/config/helper')
 const { DD_MAJOR } = require('../../../version')
 const { addHook, channel } = require('./helpers/instrument')
 

packages/datadog-instrumentations/src/selenium.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const shimmer = require('../../datadog-shimmer')
-const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
+const { getEnvironmentVariable } = require('../../dd-trace/src/config/helper')
 const { addHook, channel } = require('./helpers/instrument')
 
 const ciSeleniumDriverGetStartCh = channel('ci:selenium:driver:get')

packages/datadog-plugin-aws-sdk/src/base.js

@@ -5,7 +5,7 @@ const ClientPlugin = require('../../dd-trace/src/plugins/client')
 const { storage } = require('../../datadog-core')
 const { isTrue } = require('../../dd-trace/src/util')
 const { tagsFromRequest, tagsFromResponse } = require('../../dd-trace/src/payload-tagging')
-const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
+const { getEnvironmentVariable } = require('../../dd-trace/src/config/helper')
 
 class BaseAwsSdkPlugin extends ClientPlugin {
   static id = 'aws'

packages/datadog-plugin-azure-event-hubs/src/producer.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
+const { getEnvironmentVariable } = require('../../dd-trace/src/config/helper')
 const ProducerPlugin = require('../../dd-trace/src/plugins/producer')
 
 const spanContexts = new WeakMap()

packages/datadog-plugin-azure-service-bus/src/producer.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
+const { getEnvironmentVariable } = require('../../dd-trace/src/config/helper')
 const ProducerPlugin = require('../../dd-trace/src/plugins/producer')
 const spanContexts = new WeakMap()
 

packages/datadog-plugin-cucumber/src/index.js

@@ -2,7 +2,7 @@
 
 const CiPlugin = require('../../dd-trace/src/plugins/ci_plugin')
 const { storage } = require('../../datadog-core')
-const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
+const { getEnvironmentVariable } = require('../../dd-trace/src/config/helper')
 
 const {
   TEST_SKIP_REASON,

packages/datadog-plugin-cypress/src/cypress-plugin.js

@@ -51,7 +51,7 @@ const {
 } = require('../../dd-trace/src/plugins/util/test')
 const { isMarkedAsUnskippable } = require('../../datadog-plugin-jest/src/util')
 const { ORIGIN_KEY, COMPONENT } = require('../../dd-trace/src/constants')
-const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
+const { getEnvironmentVariable } = require('../../dd-trace/src/config/helper')
 const { appClosing: appClosingTelemetry } = require('../../dd-trace/src/telemetry')
 const log = require('../../dd-trace/src/log')
 

packages/datadog-plugin-dd-trace-api/src/index.js

@@ -3,7 +3,7 @@
 const Plugin = require('../../dd-trace/src/plugins/plugin')
 const telemetryMetrics = require('../../dd-trace/src/telemetry/metrics')
 const apiMetrics = telemetryMetrics.manager.namespace('tracers')
-const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
+const { getEnvironmentVariable } = require('../../dd-trace/src/config/helper')
 
 // api ==> here
 const objectMap = new WeakMap()

packages/datadog-plugin-jest/src/index.js

@@ -2,7 +2,7 @@
 
 const CiPlugin = require('../../dd-trace/src/plugins/ci_plugin')
 const { storage } = require('../../datadog-core')
-const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
+const { getEnvironmentVariable } = require('../../dd-trace/src/config/helper')
 
 const {
   TEST_STATUS,

packages/datadog-plugin-mocha/src/index.js

@@ -2,7 +2,7 @@
 
 const CiPlugin = require('../../dd-trace/src/plugins/ci_plugin')
 const { storage } = require('../../datadog-core')
-const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
+const { getEnvironmentVariable } = require('../../dd-trace/src/config/helper')
 
 const {
   TEST_STATUS,

packages/datadog-plugin-mongodb-core/src/index.js

@@ -2,7 +2,7 @@
 
 const { isTrue } = require('../../dd-trace/src/util')
 const DatabasePlugin = require('../../dd-trace/src/plugins/database')
-const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
+const { getEnvironmentVariable } = require('../../dd-trace/src/config/helper')
 
 class MongodbCorePlugin extends DatabasePlugin {
   static id = 'mongodb-core'

packages/datadog-plugin-playwright/src/index.js

@@ -3,7 +3,7 @@
 const { storage } = require('../../datadog-core')
 const id = require('../../dd-trace/src/id')
 const CiPlugin = require('../../dd-trace/src/plugins/ci_plugin')
-const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
+const { getEnvironmentVariable } = require('../../dd-trace/src/config/helper')
 
 const {
   TEST_STATUS,

packages/datadog-plugin-vitest/src/index.js

@@ -2,7 +2,7 @@
 
 const CiPlugin = require('../../dd-trace/src/plugins/ci_plugin')
 const { storage } = require('../../datadog-core')
-const { getEnvironmentVariable } = require('../../dd-trace/src/config-helper')
+const { getEnvironmentVariable } = require('../../dd-trace/src/config/helper')
 
 const {
   TEST_STATUS,

packages/dd-trace/src/appsec/iast/taint-tracking/rewriter.js

@@ -12,7 +12,7 @@ const { getName } = require('../telemetry/verbosity')
 const telemetry = require('../telemetry')
 const log = require('../../../log')
 const orchestrionConfig = require('../../../../../datadog-instrumentations/src/orchestrion-config')
-const { getEnvironmentVariable } = require('../../../config-helper')
+const { getEnvironmentVariable } = require('../../../config/helper')
 const { LOG_MESSAGE, REWRITTEN_MESSAGE } = require('./constants')
 const { incrementTelemetryIfNeeded } = require('./rewriter-telemetry')
 const { csiMethods } = require('./csi-methods')

packages/dd-trace/src/azure_metadata.js

@@ -3,7 +3,7 @@
 // Modeled after https://github.com/DataDog/libdatadog/blob/f3994857a59bb5679a65967138c5a3aec418a65f/ddcommon/src/azure_app_services.rs
 
 const os = require('os')
-const { getEnvironmentVariable, getEnvironmentVariables } = require('../../dd-trace/src/config-helper')
+const { getEnvironmentVariable, getEnvironmentVariables } = require('../../dd-trace/src/config/helper')
 const { getIsAzureFunction, getIsFlexConsumptionAzureFunction } = require('./serverless')
 
 function extractSubscriptionID (ownerName) {

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()

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 { getEnvironmentVariable } = require('../../config/helper')
 
 const {
   incrementCountMetric,

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 { getEnvironmentVariable } = require('../../../config/helper')
 
 const { CoverageCIVisibilityEncoder } = require('../../../encode/coverage-ci-visibility')
 const BaseWriter = require('../../../exporters/common/writer')

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 { getEnvironmentVariable } = require('../../../config/helper')
 
 const BaseWriter = require('../../../exporters/common/writer')
 

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 { getEnvironmentVariable } = require('../../../config/helper')
 
 const { AgentlessCiVisibilityEncoder } = require('../../../encode/agentless-ci-visibility')
 const BaseWriter = require('../../../exporters/common/writer')

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 { getEnvironmentVariable } = require('../../../config/helper')
 
 const log = require('../../../log')
 const { isFalse } = require('../../../util')

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 } = require('../../../config/helper')
 const Writer = require('./writer')
 
 function getInterprocessTraceCode () {

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,

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 { getEnvironmentVariable } = require('../../config/helper')
 const {
   incrementCountMetric,
   distributionMetric,

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 { getEnvironmentVariable } = require('../../config/helper')
 
 function getWinstonLogSubmissionParameters (config) {
   const { site, service } = config