dd-trace 5.102.0 → 5.104.0

package/packages/dd-trace/src/aiguard/sdk.js

@@ -11,23 +11,23 @@ const { keepTrace } = require('../priority_sampler')
 const { AI_GUARD } = require('../standalone/product')
 const NoopAIGuard = require('./noop')
 const executeRequest = require('./client')
-const {
-  AI_GUARD_RESOURCE,
-  AI_GUARD_TARGET_TAG_KEY,
-  AI_GUARD_REASON_TAG_KEY,
-  AI_GUARD_ACTION_TAG_KEY,
-  AI_GUARD_EVENT_TAG_KEY,
-  AI_GUARD_BLOCKED_TAG_KEY,
-  AI_GUARD_META_STRUCT_KEY,
-  AI_GUARD_TOOL_NAME_TAG_KEY,
-  AI_GUARD_TELEMETRY_REQUESTS,
-  AI_GUARD_TELEMETRY_TRUNCATED,
-} = require('./tags')
+const TAGS = require('./tags')
 
-const appsecMetrics = telemetryMetrics.manager.namespace('appsec')
+const aiguardMetrics = telemetryMetrics.manager.namespace('ai_guard')
 
 const ALLOW = 'ALLOW'
 
+/**
+ * Reports a telemetry error
+ *
+ * @param {string} errorType - The error type constant (client_error, bad_status, bad_response)
+ * @param {{ source: string, integration: string }} telemetryTags - Source and integration tags
+ */
+function reportTelemetryError (errorType, telemetryTags) {
+  aiguardMetrics.count(TAGS.TELEMETRY_REQUESTS, { error: true, ...telemetryTags }).inc(1)
+  aiguardMetrics.count(TAGS.TELEMETRY_ERROR, { type: errorType, ...telemetryTags }).inc(1)
+}
+
 class AIGuardAbortError extends Error {
   constructor (reason, tags, tagProbs, sds) {
     super(reason)
@@ -99,10 +99,10 @@ class AIGuard extends NoopAIGuard {
    * - Clones each message so callers cannot mutate the data set in the meta struct.
    * - Truncates the list of messages and `content` fields emitting metrics accordingly.
    */
-  #buildMessagesForMetaStruct (messages) {
+  #buildMessagesForMetaStruct (messages, telemetryTags) {
     const size = Math.min(messages.length, this.#maxMessagesLength)
     if (messages.length > size) {
-      appsecMetrics.count(AI_GUARD_TELEMETRY_TRUNCATED, { type: 'messages' }).inc(1)
+      aiguardMetrics.count(TAGS.TELEMETRY_TRUNCATED, { type: 'messages', ...telemetryTags }).inc(1)
     }
     const result = []
     let contentTruncated = false
@@ -115,7 +115,7 @@ class AIGuard extends NoopAIGuard {
       result.push(message)
     }
     if (contentTruncated) {
-      appsecMetrics.count(AI_GUARD_TELEMETRY_TRUNCATED, { type: 'content' }).inc(1)
+      aiguardMetrics.count(TAGS.TELEMETRY_TRUNCATED, { type: 'content', ...telemetryTags }).inc(1)
     }
     return result
   }
@@ -185,22 +185,23 @@ class AIGuard extends NoopAIGuard {
     if (!this.#initialized) {
       return super.evaluate(messages, opts)
     }
-    const { block = true } = opts ?? {}
-    return this.#tracer.trace(AI_GUARD_RESOURCE, {}, async (span) => {
+    const { block = true, source = TAGS.SOURCE_SDK, integration = TAGS.INTEGRATION_NONE } = opts ?? {}
+    const telemetryTags = { source, integration }
+    return this.#tracer.trace(TAGS.RESOURCE, {}, async (span) => {
       const last = messages[messages.length - 1]
       const target = this.#isToolCall(last) ? 'tool' : 'prompt'
-      span.setTag(AI_GUARD_TARGET_TAG_KEY, target)
+      span.setTag(TAGS.TARGET_TAG_KEY, target)
       if (target === 'tool') {
         const name = this.#getToolName(last, messages)
         if (name) {
-          span.setTag(AI_GUARD_TOOL_NAME_TAG_KEY, name)
+          span.setTag(TAGS.TOOL_NAME_TAG_KEY, name)
         }
       }
       const metaStruct = {
-        messages: this.#buildMessagesForMetaStruct(messages),
+        messages: this.#buildMessagesForMetaStruct(messages, telemetryTags),
       }
       span.meta_struct = {
-        [AI_GUARD_META_STRUCT_KEY]: metaStruct,
+        [TAGS.META_STRUCT_KEY]: metaStruct,
       }
       const rootSpan = span.context()?._trace?.started?.[0]
       if (rootSpan) {
@@ -208,7 +209,7 @@ class AIGuard extends NoopAIGuard {
         // keepTrace must be called before executeRequest so the sampling decision
         // is propagated correctly to outgoing HTTP client calls.
         keepTrace(rootSpan, AI_GUARD)
-        rootSpan.setTag(AI_GUARD_EVENT_TAG_KEY, 'true')
+        rootSpan.setTag(TAGS.EVENT_TAG_KEY, 'true')
       }
       let response
       try {
@@ -224,18 +225,18 @@ class AIGuard extends NoopAIGuard {
           payload,
           { url: this.#evaluateUrl, headers: this.#headers, timeout: this.#timeout })
       } catch (e) {
-        appsecMetrics.count(AI_GUARD_TELEMETRY_REQUESTS, { error: true }).inc(1)
+        reportTelemetryError(TAGS.ERROR_TYPE_CLIENT, telemetryTags)
         throw new AIGuardClientError(`Unexpected error calling AI Guard service: ${e.message}`, { cause: e })
       }
       if (response.status !== 200) {
-        appsecMetrics.count(AI_GUARD_TELEMETRY_REQUESTS, { error: true }).inc(1)
+        reportTelemetryError(TAGS.ERROR_TYPE_STATUS, telemetryTags)
         throw new AIGuardClientError(
           `AI Guard service call failed, status ${response.status}`,
           { errors: response.body?.errors })
       }
       const attr = response.body?.data?.attributes
       if (!attr?.action) {
-        appsecMetrics.count(AI_GUARD_TELEMETRY_REQUESTS, { error: true }).inc(1)
+        reportTelemetryError(TAGS.ERROR_TYPE_RESPONSE, telemetryTags)
         throw new AIGuardClientError(`AI Guard service returned unexpected response : ${response.body}`)
       }
       const action = attr.action
@@ -254,13 +255,18 @@ class AIGuard extends NoopAIGuard {
       }
       const blockingEnabled = attr.is_blocking_enabled ?? false
       const shouldBlock = block && blockingEnabled && action !== ALLOW
-      appsecMetrics.count(AI_GUARD_TELEMETRY_REQUESTS, { action, error: false, block: shouldBlock }).inc(1)
-      span.setTag(AI_GUARD_ACTION_TAG_KEY, action)
+      aiguardMetrics.count(TAGS.TELEMETRY_REQUESTS, {
+        action,
+        error: false,
+        block: shouldBlock,
+        ...telemetryTags,
+      }).inc(1)
+      span.setTag(TAGS.ACTION_TAG_KEY, action)
       if (reason) {
-        span.setTag(AI_GUARD_REASON_TAG_KEY, reason)
+        span.setTag(TAGS.REASON_TAG_KEY, reason)
       }
       if (shouldBlock) {
-        span.setTag(AI_GUARD_BLOCKED_TAG_KEY, 'true')
+        span.setTag(TAGS.BLOCKED_TAG_KEY, 'true')
         throw new AIGuardAbortError(reason, tags, tagProbabilities, sdsFindings)
       }
       return { action, reason, tags, tagProbabilities, sds: sdsFindings }

package/packages/dd-trace/src/aiguard/tags.js

@@ -1,15 +1,24 @@
 'use strict'
 
 module.exports = {
-  AI_GUARD_RESOURCE: 'ai_guard',
-  AI_GUARD_TARGET_TAG_KEY: 'ai_guard.target',
-  AI_GUARD_TOOL_NAME_TAG_KEY: 'ai_guard.tool_name',
-  AI_GUARD_ACTION_TAG_KEY: 'ai_guard.action',
-  AI_GUARD_REASON_TAG_KEY: 'ai_guard.reason',
-  AI_GUARD_BLOCKED_TAG_KEY: 'ai_guard.blocked',
-  AI_GUARD_EVENT_TAG_KEY: 'ai_guard.event',
-  AI_GUARD_META_STRUCT_KEY: 'ai_guard',
-
-  AI_GUARD_TELEMETRY_REQUESTS: 'ai_guard.requests',
-  AI_GUARD_TELEMETRY_TRUNCATED: 'ai_guard.truncated',
+  RESOURCE: 'ai_guard',
+  TARGET_TAG_KEY: 'ai_guard.target',
+  TOOL_NAME_TAG_KEY: 'ai_guard.tool_name',
+  ACTION_TAG_KEY: 'ai_guard.action',
+  REASON_TAG_KEY: 'ai_guard.reason',
+  BLOCKED_TAG_KEY: 'ai_guard.blocked',
+  EVENT_TAG_KEY: 'ai_guard.event',
+  META_STRUCT_KEY: 'ai_guard',
+
+  TELEMETRY_REQUESTS: 'requests',
+  TELEMETRY_TRUNCATED: 'truncated',
+  TELEMETRY_ERROR: 'error',
+
+  SOURCE_SDK: 'sdk',
+  SOURCE_AUTO: 'auto',
+  INTEGRATION_NONE: 'none',
+
+  ERROR_TYPE_CLIENT: 'client_error',
+  ERROR_TYPE_STATUS: 'bad_status',
+  ERROR_TYPE_RESPONSE: 'bad_response',
 }

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

@@ -104,8 +104,8 @@ function getBlockWithContentData (req, specificType, actionParameters) {
   const statusCode = actionParameters?.status_code || 403
 
   const headers = {
-    'Content-Type': type,
-    'Content-Length': Buffer.byteLength(body),
+    'content-type': type,
+    'content-length': Buffer.byteLength(body),
   }
 
   return { body, statusCode, headers }

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

@@ -208,8 +208,8 @@ let enableEsmRewriter = function (telemetryVerbosity) {
       }
     })
 
-    port1.unref()
-    port2.unref()
+    port1.unref?.()
+    port2.unref?.()
 
     try {
       Module.register('./rewriter-esm.mjs', {

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

@@ -100,7 +100,7 @@ function clearCache () { // only for test purposes
 
 function startClearCacheTimer () {
   resetVulnerabilityCacheTimer = setInterval(clearCache, RESET_VULNERABILITY_CACHE_INTERVAL)
-  resetVulnerabilityCacheTimer.unref()
+  resetVulnerabilityCacheTimer.unref?.()
 }
 
 function stopClearCacheTimer () {

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

@@ -350,8 +350,15 @@ function onResponseBody ({ req, res, body }) {
 }
 
 function onResponseWriteHead ({ req, res, abortController, statusCode, responseHeaders }) {
-  if (!isEmpty(responseHeaders)) {
-    storedResponseHeaders.set(req, responseHeaders)
+  // Normalize header names to lowercase so downstream consumers see the same shape
+  // regardless of how the caller wrote them.
+  const normalizedResponseHeaders = {}
+  for (const [key, value] of Object.entries(responseHeaders)) {
+    normalizedResponseHeaders[key.toLowerCase()] = value
+  }
+
+  if (!isEmpty(normalizedResponseHeaders)) {
+    storedResponseHeaders.set(req, normalizedResponseHeaders)
   }
 
   // TODO: do not call waf if inside block()
@@ -376,7 +383,7 @@ function onResponseWriteHead ({ req, res, abortController, statusCode, responseH
   const results = waf.run({
     persistent: {
       [addresses.HTTP_INCOMING_RESPONSE_CODE]: String(statusCode),
-      [addresses.HTTP_INCOMING_RESPONSE_HEADERS]: copyHeadersOmitting(responseHeaders, 'set-cookie'),
+      [addresses.HTTP_INCOMING_RESPONSE_HEADERS]: copyHeadersOmitting(normalizedResponseHeaders, 'set-cookie'),
     },
   }, req)
 

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

@@ -50,6 +50,11 @@ const contentHeaderList = [
   'content-language',
 ]
 
+const mandatoryResponseHeaderList = [
+  'content-type',
+  'content-length',
+]
+
 const responseHeaderList = [
   ...contentHeaderList,
   'content-type',
@@ -102,6 +107,8 @@ const EVENT_HEADERS_MAP = mapHeaderAndTags(eventHeadersList, REQUEST_HEADER_TAG_
 
 const RESPONSE_HEADERS_MAP = mapHeaderAndTags(responseHeaderList, RESPONSE_HEADER_TAG_PREFIX)
 
+const MANDATORY_RESPONSE_HEADERS_MAP = mapHeaderAndTags(mandatoryResponseHeaderList, RESPONSE_HEADER_TAG_PREFIX)
+
 const NON_EXTENDED_REQUEST_HEADERS = new Set([...requestHeadersList, ...eventHeadersList])
 const NON_EXTENDED_RESPONSE_HEADERS = new Set(responseHeaderList)
 const REDACTED_HEADERS = new Set(redactedHeadersList)
@@ -168,14 +175,21 @@ function getCollectedHeaders (req, res, shouldCollectEventHeaders, storedRespons
   // Mandatory
   const mandatoryCollectedHeaders = filterHeaders(req.headers, REQUEST_HEADERS_MAP)
 
-  // Basic collection
-  if (!shouldCollectEventHeaders) return mandatoryCollectedHeaders
-
   // Skip the spread when the stored side is empty -- common during the early
   // request lifecycle when no upstream response headers have been captured.
+  const liveResponseHeaders = res?.getHeaders?.()
   const responseHeaders = isEmpty(storedResponseHeaders)
-    ? res.getHeaders()
-    : { ...storedResponseHeaders, ...res.getHeaders() }
+    ? (liveResponseHeaders ?? {})
+    : (liveResponseHeaders ? { ...storedResponseHeaders, ...liveResponseHeaders } : storedResponseHeaders)
+
+  // content-type and content-length are always reported when appsec is enabled,
+  // even without a security event.
+  if (!shouldCollectEventHeaders) {
+    return Object.assign(
+      mandatoryCollectedHeaders,
+      filterHeaders(responseHeaders, MANDATORY_RESPONSE_HEADERS_MAP)
+    )
+  }
 
   const requestEventCollectedHeaders = filterHeaders(req.headers, EVENT_HEADERS_MAP)
   const responseEventCollectedHeaders = filterHeaders(responseHeaders, RESPONSE_HEADERS_MAP)

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

@@ -3,10 +3,8 @@
 // Modeled after https://github.com/DataDog/libdatadog/blob/f3994857a59bb5679a65967138c5a3aec418a65f/ddcommon/src/azure_app_services.rs
 
 const os = require('os')
-const {
-  getEnvironmentVariable,
-  getValueFromEnvSources,
-} = require('./config/helper')
+const getConfig = require('./config')
+const { getEnvironmentVariable } = require('./config/helper')
 const { getIsAzureFunction } = require('./serverless')
 
 function extractSubscriptionID (ownerName) {
@@ -19,7 +17,20 @@ function extractSubscriptionID (ownerName) {
 }
 
 function extractResourceGroup (ownerName) {
-  return /.+\+(.+)-.+webspace(-Linux)?/.exec(ownerName)?.[1]
+  // WEBSITE_OWNER_NAME format: `<sub-id>+<rg>-<region>webspace[-Linux]`. Region
+  // names have no `-`; resource groups can. Plain string ops read more directly
+  // than `/.+\+(.+)-.+webspace(-Linux)?/` and avoid the engine backtracking
+  // through three `.+` quantifiers to land on the right `-`.
+  if (typeof ownerName !== 'string') return
+  const plusIdx = ownerName.indexOf('+')
+  if (plusIdx === -1) return
+  let rest = ownerName.slice(plusIdx + 1)
+  if (rest.endsWith('-Linux')) rest = rest.slice(0, -'-Linux'.length)
+  if (!rest.endsWith('webspace')) return
+  rest = rest.slice(0, -'webspace'.length)
+  const lastDash = rest.lastIndexOf('-')
+  if (lastDash === -1) return
+  return rest.slice(0, lastDash)
 }
 
 function buildResourceID (subscriptionID, siteName, resourceGroup) {
@@ -56,7 +67,7 @@ function buildMetadata () {
   const WEBSITE_SITE_NAME = getEnvironmentVariable('WEBSITE_SITE_NAME')
   const WEBSITE_SKU = getEnvironmentVariable('WEBSITE_SKU')
 
-  const DD_AZURE_RESOURCE_GROUP = getValueFromEnvSources('DD_AZURE_RESOURCE_GROUP')
+  const { DD_AZURE_RESOURCE_GROUP } = getConfig()
   const isAzureFunction = FUNCTIONS_EXTENSION_VERSION !== undefined && FUNCTIONS_WORKER_RUNTIME !== undefined
   const isFlexConsumptionAzureFunction = isAzureFunction && WEBSITE_SKU === 'FlexConsumption'
 

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

@@ -120,7 +120,7 @@ class TestVisDynamicInstrumentation {
     })
 
     // Allow the parent to exit even if the worker is still running
-    this.worker.unref()
+    this.worker.unref?.()
 
     this.breakpointSetChannel.port2.on('message', (probeId) => {
       const resolve = probeIdToResolveBreakpointSet.get(probeId)
@@ -128,7 +128,7 @@ class TestVisDynamicInstrumentation {
         resolve()
         probeIdToResolveBreakpointSet.delete(probeId)
       }
-    }).unref()
+    }).unref?.()
 
     this.breakpointHitChannel.port2.on('message', ({ snapshot }) => {
       const { probe: { id: probeId } } = snapshot
@@ -138,7 +138,7 @@ class TestVisDynamicInstrumentation {
       } else {
         log.warn('Received a breakpoint hit for an unknown probe')
       }
-    }).unref()
+    }).unref?.()
 
     this.breakpointRemoveChannel.port2.on('message', (probeId) => {
       const resolve = probeIdToResolveBreakpointRemove.get(probeId)
@@ -146,7 +146,7 @@ class TestVisDynamicInstrumentation {
         resolve()
         probeIdToResolveBreakpointRemove.delete(probeId)
       }
-    }).unref()
+    }).unref?.()
   }
 }
 

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

@@ -48,11 +48,13 @@ class CiVisibilityExporter extends BufferingExporter {
 
     const gitUploadTimeoutId = setTimeout(() => {
       this._resolveGit(new Error('Timeout while uploading git metadata'))
-    }, GIT_UPLOAD_TIMEOUT).unref()
+    }, GIT_UPLOAD_TIMEOUT)
+    gitUploadTimeoutId.unref?.()
 
     const canUseCiVisProtocolTimeoutId = setTimeout(() => {
       this._resolveCanUseCiVisProtocol(false)
-    }, CAN_USE_CI_VIS_PROTOCOL_TIMEOUT).unref()
+    }, CAN_USE_CI_VIS_PROTOCOL_TIMEOUT)
+    canUseCiVisProtocolTimeoutId.unref?.()
 
     this._gitUploadPromise = new Promise(resolve => {
       this._resolveGit = (err) => {

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

@@ -11,10 +11,12 @@ const {
   VITEST_WORKER_TRACE_PAYLOAD_CODE,
   VITEST_WORKER_LOGS_PAYLOAD_CODE,
 } = require('../../../plugins/util/test')
-const { getEnvironmentVariable, getValueFromEnvSources } = require('../../../config/helper')
+const getConfig = require('../../../config')
+const { getEnvironmentVariable } = require('../../../config/helper')
 const Writer = require('./writer')
 
 function getInterprocessTraceCode () {
+  const { DD_PLAYWRIGHT_WORKER, DD_VITEST_WORKER } = getConfig()
   if (getEnvironmentVariable('JEST_WORKER_ID')) {
     return JEST_WORKER_TRACE_PAYLOAD_CODE
   }
@@ -24,13 +26,13 @@ function getInterprocessTraceCode () {
   if (getEnvironmentVariable('MOCHA_WORKER_ID')) {
     return MOCHA_WORKER_TRACE_PAYLOAD_CODE
   }
-  if (getValueFromEnvSources('DD_PLAYWRIGHT_WORKER')) {
+  if (DD_PLAYWRIGHT_WORKER) {
     return PLAYWRIGHT_WORKER_TRACE_PAYLOAD_CODE
   }
   if (getEnvironmentVariable('TINYPOOL_WORKER_ID')) {
     return VITEST_WORKER_TRACE_PAYLOAD_CODE
   }
-  if (getValueFromEnvSources('DD_VITEST_WORKER')) {
+  if (DD_VITEST_WORKER) {
     return VITEST_WORKER_TRACE_PAYLOAD_CODE
   }
   return null
@@ -51,7 +53,7 @@ function getInterprocessLogsCode () {
   if (getEnvironmentVariable('TINYPOOL_WORKER_ID')) {
     return VITEST_WORKER_LOGS_PAYLOAD_CODE
   }
-  if (getValueFromEnvSources('DD_VITEST_WORKER')) {
+  if (getConfig().DD_VITEST_WORKER) {
     return VITEST_WORKER_LOGS_PAYLOAD_CODE
   }
   return null

package/packages/dd-trace/src/ci-visibility/requests/fs-cache.js

@@ -149,7 +149,7 @@ function touchLock (cacheKey) {
  */
 function startLockHeartbeat (cacheKey) {
   const interval = setInterval(() => touchLock(cacheKey), CACHE_LOCK_HEARTBEAT_MS)
-  interval.unref()
+  interval.unref?.()
   return () => {
     clearInterval(interval)
     try { fs.unlinkSync(getLockPath(cacheKey)) } catch { /* ignore */ }

package/packages/dd-trace/src/ci-visibility/requests/request.js

@@ -14,6 +14,8 @@ const {
 } = require('../../exporters/common/retry')
 const { urlToHttpOptions } = require('../../exporters/common/url-to-http-options-polyfill')
 
+const legacyStorage = storage('legacy')
+
 function parseUrl (urlObjOrString) {
   if (urlObjOrString !== null && typeof urlObjOrString === 'object') {
     return urlToHttpOptions(urlObjOrString)
@@ -75,7 +77,7 @@ function request (data, options, callback) {
   let firstStatusCode = null
 
   const makeRequest = () => {
-    storage('legacy').run({ noop: true }, () => {
+    legacyStorage.run({ noop: true }, () => {
       const req = client.request(opts, (res) => {
         // Capture non-2xx status code as soon as we see it so telemetry preserves it if the retry
         // fails with a network error (no HTTP response) before 'end' fires

package/packages/dd-trace/src/ci-visibility/test-api-manual/test-api-manual-plugin.js

@@ -8,6 +8,8 @@ const {
 } = require('../../plugins/util/test')
 const { storage } = require('../../../../datadog-core')
 
+const legacyStorage = storage('legacy')
+
 class TestApiManualPlugin extends CiPlugin {
   static id = 'test-api-manual'
 
@@ -17,13 +19,13 @@ class TestApiManualPlugin extends CiPlugin {
     this.sourceRoot = process.cwd()
 
     this.unconfiguredAddSub('dd-trace:ci:manual:test:start', ({ testName, testSuite }) => {
-      const store = storage('legacy').getStore()
+      const store = legacyStorage.getStore()
       const testSuiteRelative = getTestSuitePath(testSuite, this.sourceRoot)
       const testSpan = this.startTestSpan(testName, testSuiteRelative)
       this.enter(testSpan, store)
     })
     this.unconfiguredAddSub('dd-trace:ci:manual:test:finish', ({ status, error }) => {
-      const store = storage('legacy').getStore()
+      const store = legacyStorage.getStore()
       const testSpan = store && store.span
       if (testSpan) {
         testSpan.setTag(TEST_STATUS, status)
@@ -35,7 +37,7 @@ class TestApiManualPlugin extends CiPlugin {
       }
     })
     this.unconfiguredAddSub('dd-trace:ci:manual:test:addTags', (tags) => {
-      const store = storage('legacy').getStore()
+      const store = legacyStorage.getStore()
       const testSpan = store && store.span
       if (testSpan) {
         testSpan.addTags(tags)

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

@@ -5,29 +5,18 @@ const util = require('util')
 
 const { DD_MAJOR } = require('../../../../version')
 const { parsers, transformers, telemetryTransformers, setWarnInvalidValue } = require('./parsers')
+const applyMajorOverrides = require('./major-overrides')
 const {
   supportedConfigurations,
 } = /** @type {import('./helper').SupportedConfigurationsJson} */ (require('./supported-configurations.json'))
 
+applyMajorOverrides(supportedConfigurations, DD_MAJOR)
+
 let log
 let seqId = 0
 const configWithOrigin = new Map()
 const parseErrors = new Map()
 
-if (DD_MAJOR >= 6) {
-  // Programmatic configuration of DD_IAST_SECURITY_CONTROLS_CONFIGURATION is not supported
-  // in newer major versions. This is special handled here until a better solution is found.
-  // TODO: Remove the programmatic configuration from supported-configurations.json once v5 is not supported anymore.
-  supportedConfigurations.DD_IAST_SECURITY_CONTROLS_CONFIGURATION[0].internalPropertyName =
-    supportedConfigurations.DD_IAST_SECURITY_CONTROLS_CONFIGURATION[0].configurationNames?.[0]
-  delete supportedConfigurations.DD_IAST_SECURITY_CONTROLS_CONFIGURATION[0].configurationNames
-} else {
-  // Default value for DD_TRACE_STARTUP_LOGS is 'false' in older major versions.
-  // This is special handled here until a better solution is found.
-  // TODO: Remove this here once v5 is not supported anymore.
-  supportedConfigurations.DD_TRACE_STARTUP_LOGS[0].default = 'false'
-}
-
 /**
  * Warns about an invalid value for an option and adds the error to the last telemetry entry if it is not already set.
  * Logging happens only if the error is not already set or the option name is different from the last telemetry entry.

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

@@ -85,11 +85,12 @@ export interface GeneratedConfig {
   DD_CIVISIBILITY_TEST_MODULE_ID: string | undefined;
   DD_CIVISIBILITY_TEST_SESSION_ID: string | undefined;
   DD_CRASHTRACKING_ENABLED: boolean;
+  DD_CUSTOM_PARENT_ID: string | undefined;
   DD_CUSTOM_TRACE_ID: string | undefined;
   DD_ENABLE_LAGE_PACKAGE_NAME: boolean;
   DD_ENABLE_NX_SERVICE_NAME: boolean;
   DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED: boolean;
-  DD_EXPERIMENTAL_TEST_OPT_GIT_CACHE_DIR: string;
+  DD_EXPERIMENTAL_TEST_OPT_GIT_CACHE_DIR: string | undefined;
   DD_EXPERIMENTAL_TEST_OPT_GIT_CACHE_ENABLED: boolean;
   DD_EXPERIMENTAL_TEST_OPT_SETTINGS_CACHE: string;
   DD_EXPERIMENTAL_TEST_REQUESTS_FS_CACHE: boolean;
@@ -243,6 +244,7 @@ export interface GeneratedConfig {
   DD_TRACE_ELASTIC_ELASTICSEARCH_ENABLED: boolean;
   DD_TRACE_ELASTIC_TRANSPORT_ENABLED: boolean;
   DD_TRACE_ELASTICSEARCH_ENABLED: boolean;
+  DD_TRACE_ELECTRON_ENABLED: boolean;
   DD_TRACE_ENCODING_DEBUG: boolean;
   DD_TRACE_EXPERIMENTAL_RUNTIME_ID_ENABLED: boolean;
   DD_TRACE_EXPERIMENTAL_SPAN_COUNTS: boolean;
@@ -322,6 +324,7 @@ export interface GeneratedConfig {
   DD_TRACE_MONGODB_CORE_ENABLED: boolean;
   DD_TRACE_MONGODB_ENABLED: boolean;
   DD_TRACE_MONGODB_HEARTBEAT_ENABLED: boolean;
+  DD_TRACE_MONGODB_OBFUSCATE_QUERY: "none" | "types" | "redact";
   DD_TRACE_MONGOOSE_ENABLED: boolean;
   DD_TRACE_MQUERY_ENABLED: boolean;
   DD_TRACE_MULTER_ENABLED: boolean;

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

@@ -21,10 +21,14 @@
  */
 
 const { deprecate } = require('util')
+const { DD_MAJOR } = require('../../../../version')
+const applyMajorOverrides = require('./major-overrides')
 const {
   supportedConfigurations,
 } = /** @type {SupportedConfigurationsJson} */ (require('./supported-configurations.json'))
 
+applyMajorOverrides(supportedConfigurations, DD_MAJOR)
+
 /**
  * Types for environment variable handling.
  *

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

@@ -165,7 +165,7 @@ class Config extends ConfigBase {
   }
 
   /**
-   * @param {TracerOptions} [options={}]
+   * @param {TracerOptions} [options]
    */
   constructor (options = {}) {
     super()
@@ -357,7 +357,7 @@ class Config extends ConfigBase {
       setAndTrack(this, 'DD_METRICS_OTEL_ENABLED', false)
     }
 
-    if (this.OTEL_TRACES_EXPORTER === 'otlp' && this.protocolVersion && this.protocolVersion !== '0.4') {
+    if (this.OTEL_TRACES_EXPORTER === 'otlp' && trackedConfigOrigins.has('protocolVersion')) {
       log.warn('DD_TRACE_AGENT_PROTOCOL_VERSION is set, disabling OTLP traces export')
       setAndTrack(this, 'OTEL_TRACES_EXPORTER', 'none')
     }