dd-trace 5.53.0 → 5.54.0

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

@@ -26,7 +26,7 @@ function getWinstonLogSubmissionParameters (config) {
       path: defaultParameters.path,
       headers: defaultParameters.headers
     }
-  } catch (e) {
+  } catch {
     log.error('Could not parse DD_AGENTLESS_LOG_SUBMISSION_URL')
     return defaultParameters
   }

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

@@ -28,7 +28,8 @@ function getLibraryConfiguration ({
   runtimeVersion,
   branch,
   testLevel = 'suite',
-  custom
+  custom,
+  tag
 }, done) {
   const options = {
     path: '/api/v2/libraries/tests/services/setting',
@@ -37,7 +38,7 @@ function getLibraryConfiguration ({
       'Content-Type': 'application/json'
     },
     url,
-    timeout: 20000
+    timeout: 20_000
   }
 
   if (isEvpProxy) {
@@ -69,7 +70,7 @@ function getLibraryConfiguration ({
         env,
         repository_url: repositoryUrl,
         sha,
-        branch
+        branch: branch || tag
       }
     }
   })
@@ -95,7 +96,8 @@ function getLibraryConfiguration ({
               flaky_test_retries_enabled: isFlakyTestRetriesEnabled,
               di_enabled: isDiEnabled,
               known_tests_enabled: isKnownTestsEnabled,
-              test_management: testManagementConfig
+              test_management: testManagementConfig,
+              impacted_tests_enabled: isImpactedTestsEnabled
             }
           }
         } = JSON.parse(res)
@@ -115,7 +117,8 @@ function getLibraryConfiguration ({
           isKnownTestsEnabled,
           isTestManagementEnabled: (testManagementConfig?.enabled ?? false),
           testManagementAttemptToFixRetries:
-            testManagementConfig?.attempt_to_fix_retries
+            testManagementConfig?.attempt_to_fix_retries,
+          isImpactedTestsEnabled
         }
 
         log.debug(() => `Remote settings: ${JSON.stringify(settings)}`)

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

@@ -81,6 +81,8 @@ const TELEMETRY_GIT_REQUESTS_SETTINGS = 'git_requests.settings'
 const TELEMETRY_GIT_REQUESTS_SETTINGS_MS = 'git_requests.settings_ms'
 const TELEMETRY_GIT_REQUESTS_SETTINGS_ERRORS = 'git_requests.settings_errors'
 const TELEMETRY_GIT_REQUESTS_SETTINGS_RESPONSE = 'git_requests.settings_response'
+const TELEMETRY_GIT_SHA_MATCH = 'git.commit_sha_match'
+const TELEMETRY_GIT_COMMIT_SHA_DISCREPANCY = 'git.commit_sha_discrepancy'
 const TELEMETRY_ITR_SKIPPABLE_TESTS = 'itr_skippable_tests.request'
 const TELEMETRY_ITR_SKIPPABLE_TESTS_MS = 'itr_skippable_tests.request_ms'
 const TELEMETRY_ITR_SKIPPABLE_TESTS_ERRORS = 'itr_skippable_tests.request_errors'
@@ -144,6 +146,8 @@ module.exports = {
   TELEMETRY_GIT_REQUESTS_SETTINGS_MS,
   TELEMETRY_GIT_REQUESTS_SETTINGS_ERRORS,
   TELEMETRY_GIT_REQUESTS_SETTINGS_RESPONSE,
+  TELEMETRY_GIT_SHA_MATCH,
+  TELEMETRY_GIT_COMMIT_SHA_DISCREPANCY,
   TELEMETRY_ITR_SKIPPABLE_TESTS,
   TELEMETRY_ITR_SKIPPABLE_TESTS_MS,
   TELEMETRY_ITR_SKIPPABLE_TESTS_ERRORS,

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

@@ -16,7 +16,7 @@ function getTestManagementTests ({
     headers: {
       'Content-Type': 'application/json'
     },
-    timeout: 20000,
+    timeout: 20_000,
     url
   }
 

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

@@ -105,7 +105,7 @@ function validateEnvVarType (envVar) {
     case 'OTEL_TRACES_SAMPLER':
       return getFromOtelSamplerMap(value, process.env.OTEL_TRACES_SAMPLER_ARG) !== undefined
     case 'OTEL_TRACES_SAMPLER_ARG':
-      return !isNaN(parseFloat(value))
+      return !Number.isNaN(Number.parseFloat(value))
     case 'OTEL_SDK_DISABLED':
       return value.toLowerCase() === 'true' || value.toLowerCase() === 'false'
     case 'OTEL_TRACES_EXPORTER':
@@ -131,15 +131,12 @@ function checkIfBothOtelAndDdEnvVarSet () {
   }
 }
 
-const fromEntries = Object.fromEntries || (entries =>
-  entries.reduce((obj, [k, v]) => Object.assign(obj, { [k]: v }), {}))
-
-// eslint-disable-next-line @stylistic/js/max-len
-const qsRegex = '(?: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,}'
-// eslint-disable-next-line @stylistic/js/max-len
-const defaultWafObfuscatorKeyRegex = '(?i)pass|pw(?:or)?d|secret|(?:api|private|public|access)[_-]?key|token|consumer[_-]?(?:id|key|secret)|sign(?:ed|ature)|bearer|authorization|jsessionid|phpsessid|asp\\.net[_-]sessionid|sid|jwt'
-// eslint-disable-next-line @stylistic/js/max-len
-const defaultWafObfuscatorValueRegex = '(?i)(?:p(?:ass)?w(?:or)?d|pass(?:[_-]?phrase)?|secret(?:[_-]?key)?|(?:(?:api|private|public|access)[_-]?)key(?:[_-]?id)?|(?:(?:auth|access|id|refresh)[_-]?)?token|consumer[_-]?(?:id|key|secret)|sign(?:ed|ature)?|auth(?:entication|orization)?|jsessionid|phpsessid|asp\\.net(?:[_-]|-)sessionid|sid|jwt)(?:\\s*=([^;&]+)|"\\s*:\\s*("[^"]+"|\\d+))|bearer\\s+([a-z0-9\\._\\-]+)|token\\s*:\\s*([a-z0-9]{13})|gh[opsu]_([0-9a-zA-Z]{36})|ey[I-L][\\w=-]+\\.(ey[I-L][\\w=-]+(?:\\.[\\w.+\\/=-]+)?)|[\\-]{5}BEGIN[a-z\\s]+PRIVATE\\sKEY[\\-]{5}([^\\-]+)[\\-]{5}END[a-z\\s]+PRIVATE\\sKEY|ssh-rsa\\s*([a-z0-9\\/\\.+]{100,})'
+// 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,}`
+// eslint-disable-next-line @stylistic/max-len
+const defaultWafObfuscatorKeyRegex = String.raw`(?i)pass|pw(?:or)?d|secret|(?:api|private|public|access)[_-]?key|token|consumer[_-]?(?:id|key|secret)|sign(?:ed|ature)|bearer|authorization|jsessionid|phpsessid|asp\.net[_-]sessionid|sid|jwt`
+// eslint-disable-next-line @stylistic/max-len
+const defaultWafObfuscatorValueRegex = String.raw`(?i)(?:p(?:ass)?w(?:or)?d|pass(?:[_-]?phrase)?|secret(?:[_-]?key)?|(?:(?:api|private|public|access)[_-]?)key(?:[_-]?id)?|(?:(?:auth|access|id|refresh)[_-]?)?token|consumer[_-]?(?:id|key|secret)|sign(?:ed|ature)?|auth(?:entication|orization)?|jsessionid|phpsessid|asp\.net(?:[_-]|-)sessionid|sid|jwt)(?:\s*=([^;&]+)|"\s*:\s*("[^"]+"|\d+))|bearer\s+([a-z0-9\._\-]+)|token\s*:\s*([a-z0-9]{13})|gh[opsu]_([0-9a-zA-Z]{36})|ey[I-L][\w=-]+\.(ey[I-L][\w=-]+(?:\.[\w.+\/=-]+)?)|[\-]{5}BEGIN[a-z\s]+PRIVATE\sKEY[\-]{5}([^\-]+)[\-]{5}END[a-z\s]+PRIVATE\sKEY|ssh-rsa\s*([a-z0-9\/\.+]{100,})`
 const runtimeId = uuid()
 
 function maybeFile (filepath) {
@@ -148,26 +145,23 @@ function maybeFile (filepath) {
     return fs.readFileSync(filepath, 'utf8')
   } catch (e) {
     log.error('Error reading file %s', filepath, e)
-    return undefined
   }
 }
 
 function safeJsonParse (input) {
   try {
     return JSON.parse(input)
-  } catch (err) {
-    return undefined
-  }
+  } catch {}
 }
 
-const namingVersions = ['v0', 'v1']
+const namingVersions = new Set(['v0', 'v1'])
 const defaultNamingVersion = 'v0'
 
 function validateNamingVersion (versionString) {
   if (!versionString) {
     return defaultNamingVersion
   }
-  if (!namingVersions.includes(versionString)) {
+  if (!namingVersions.has(versionString)) {
     log.warn(
       `Unexpected input for config.spanAttributeSchema, picked default ${defaultNamingVersion}`
     )
@@ -245,8 +239,8 @@ class Config {
 
     options = {
       ...options,
-      appsec: options.appsec != null ? options.appsec : options.experimental?.appsec,
-      iast: options.iast != null ? options.iast : options.experimental?.iast
+      appsec: options.appsec == null ? options.experimental?.appsec : options.appsec,
+      iast: options.iast == null ? options.experimental?.iast : options.iast
     }
 
     // Configure the logger first so it can be used to warn about other configs
@@ -429,8 +423,7 @@ class Config {
     )
     const defaultPropagationStyle = ['datadog', 'tracecontext']
     if (isTrue(DD_TRACE_B3_ENABLED)) {
-      defaultPropagationStyle.push('b3')
-      defaultPropagationStyle.push('b3 single header')
+      defaultPropagationStyle.push('b3', 'b3 single header')
     }
     return defaultPropagationStyle
   }
@@ -460,16 +453,20 @@ class Config {
     this._setBoolean(defaults, 'apmTracingEnabled', true)
     this._setValue(defaults, 'appsec.apiSecurity.enabled', true)
     this._setValue(defaults, 'appsec.apiSecurity.sampleDelay', 30)
-    this._setValue(defaults, 'appsec.blockedTemplateGraphql', undefined)
-    this._setValue(defaults, 'appsec.blockedTemplateHtml', undefined)
-    this._setValue(defaults, 'appsec.blockedTemplateJson', undefined)
-    this._setValue(defaults, 'appsec.enabled', undefined)
+    this._setValue(defaults, 'appsec.blockedTemplateGraphql')
+    this._setValue(defaults, 'appsec.blockedTemplateHtml')
+    this._setValue(defaults, 'appsec.blockedTemplateJson')
+    this._setValue(defaults, 'appsec.enabled')
     this._setValue(defaults, 'appsec.eventTracking.mode', 'identification')
+    this._setValue(defaults, 'appsec.extendedHeadersCollection.enabled', false)
+    this._setValue(defaults, 'appsec.extendedHeadersCollection.redaction', true)
+    this._setValue(defaults, 'appsec.extendedHeadersCollection.maxHeaders', 50)
     this._setValue(defaults, 'appsec.obfuscatorKeyRegex', defaultWafObfuscatorKeyRegex)
     this._setValue(defaults, 'appsec.obfuscatorValueRegex', defaultWafObfuscatorValueRegex)
     this._setValue(defaults, 'appsec.rasp.enabled', true)
+    this._setValue(defaults, 'appsec.rasp.bodyCollection', false)
     this._setValue(defaults, 'appsec.rateLimit', 100)
-    this._setValue(defaults, 'appsec.rules', undefined)
+    this._setValue(defaults, 'appsec.rules')
     this._setValue(defaults, 'appsec.sca.enabled', null)
     this._setValue(defaults, 'appsec.stackTrace.enabled', true)
     this._setValue(defaults, 'appsec.stackTrace.maxDepth', 32)
@@ -477,6 +474,7 @@ class Config {
     this._setValue(defaults, 'appsec.wafTimeout', 5e3) // µs
     this._setValue(defaults, 'baggageMaxBytes', 8192)
     this._setValue(defaults, 'baggageMaxItems', 64)
+    this._setValue(defaults, 'baggageTagKeys', 'user.id,session.id,account.id')
     this._setValue(defaults, 'ciVisibilityTestSessionName', '')
     this._setValue(defaults, 'clientIpEnabled', false)
     this._setValue(defaults, 'clientIpHeader', null)
@@ -490,9 +488,9 @@ class Config {
     this._setValue(defaults, 'dynamicInstrumentation.enabled', false)
     this._setValue(defaults, 'dynamicInstrumentation.redactedIdentifiers', [])
     this._setValue(defaults, 'dynamicInstrumentation.redactionExcludedIdentifiers', [])
-    this._setValue(defaults, 'env', undefined)
+    this._setValue(defaults, 'env')
     this._setValue(defaults, 'experimental.enableGetRumData', false)
-    this._setValue(defaults, 'experimental.exporter', undefined)
+    this._setValue(defaults, 'experimental.exporter')
     this._setValue(defaults, 'experimental.runtimeId', false)
     this._setValue(defaults, 'flushInterval', 2000)
     this._setValue(defaults, 'flushMinSpans', 1000)
@@ -525,10 +523,10 @@ class Config {
     this._setValue(defaults, 'isIntelligentTestRunnerEnabled', false)
     this._setValue(defaults, 'isManualApiEnabled', false)
     this._setValue(defaults, 'langchain.spanCharLimit', 128)
-    this._setValue(defaults, 'langchain.spanPromptCompletionSampleRate', 1.0)
-    this._setValue(defaults, 'llmobs.agentlessEnabled', undefined)
+    this._setValue(defaults, 'langchain.spanPromptCompletionSampleRate', 1)
+    this._setValue(defaults, 'llmobs.agentlessEnabled')
     this._setValue(defaults, 'llmobs.enabled', false)
-    this._setValue(defaults, 'llmobs.mlApp', undefined)
+    this._setValue(defaults, 'llmobs.mlApp')
     this._setValue(defaults, 'ciVisibilityTestSessionName', '')
     this._setValue(defaults, 'ciVisAgentlessLogSubmissionEnabled', false)
     this._setValue(defaults, 'legacyBaggageEnabled', true)
@@ -536,8 +534,9 @@ class Config {
     this._setValue(defaults, 'isServiceUserProvided', false)
     this._setValue(defaults, 'testManagementAttemptToFixRetries', 20)
     this._setValue(defaults, 'isTestManagementEnabled', false)
+    this._setValue(defaults, 'isImpactedTestsEnabled', false)
     this._setValue(defaults, 'logInjection', false)
-    this._setValue(defaults, 'lookup', undefined)
+    this._setValue(defaults, 'lookup')
     this._setValue(defaults, 'inferredProxyServicesEnabled', false)
     this._setValue(defaults, 'memcachedCommandEnabled', false)
     this._setValue(defaults, 'middlewareTracingEnabled', true)
@@ -546,21 +545,21 @@ class Config {
     this._setValue(defaults, 'peerServiceMapping', {})
     this._setValue(defaults, 'plugins', true)
     this._setValue(defaults, 'port', '8126')
-    this._setValue(defaults, 'profiling.enabled', undefined)
+    this._setValue(defaults, 'profiling.enabled')
     this._setValue(defaults, 'profiling.exporters', 'agent')
     this._setValue(defaults, 'profiling.sourceMap', true)
-    this._setValue(defaults, 'profiling.longLivedThreshold', undefined)
+    this._setValue(defaults, 'profiling.longLivedThreshold')
     this._setValue(defaults, 'protocolVersion', '0.4')
     this._setValue(defaults, 'queryStringObfuscation', qsRegex)
     this._setValue(defaults, 'remoteConfig.enabled', true)
     this._setValue(defaults, 'remoteConfig.pollInterval', 5) // seconds
     this._setValue(defaults, 'reportHostname', false)
     this._setValue(defaults, 'runtimeMetrics', false)
-    this._setValue(defaults, 'sampleRate', undefined)
+    this._setValue(defaults, 'sampleRate')
     this._setValue(defaults, 'sampler.rateLimit', 100)
     this._setValue(defaults, 'sampler.rules', [])
     this._setValue(defaults, 'sampler.spanSamplingRules', [])
-    this._setValue(defaults, 'scope', undefined)
+    this._setValue(defaults, 'scope')
     this._setValue(defaults, 'service', service)
     this._setValue(defaults, 'serviceMapping', {})
     this._setValue(defaults, 'site', 'datadoghq.com')
@@ -575,7 +574,7 @@ class Config {
     this._setValue(defaults, 'telemetry.debug', false)
     this._setValue(defaults, 'telemetry.dependencyCollection', true)
     this._setValue(defaults, 'telemetry.enabled', true)
-    this._setValue(defaults, 'telemetry.heartbeatInterval', 60000)
+    this._setValue(defaults, 'telemetry.heartbeatInterval', 60_000)
     this._setValue(defaults, 'telemetry.logCollection', true)
     this._setValue(defaults, 'telemetry.metrics', true)
     this._setValue(defaults, 'traceEnabled', true)
@@ -587,13 +586,13 @@ class Config {
     this._setValue(defaults, 'tracePropagationStyle.extract', ['datadog', 'tracecontext', 'baggage'])
     this._setValue(defaults, 'tracePropagationStyle.otelPropagators', false)
     this._setValue(defaults, 'tracing', true)
-    this._setValue(defaults, 'url', undefined)
+    this._setValue(defaults, 'url')
     this._setValue(defaults, 'version', pkg.version)
-    this._setValue(defaults, 'instrumentation_config_id', undefined)
+    this._setValue(defaults, 'instrumentation_config_id')
     this._setValue(defaults, 'vertexai.spanCharLimit', 128)
-    this._setValue(defaults, 'vertexai.spanPromptCompletionSampleRate', 1.0)
+    this._setValue(defaults, 'vertexai.spanPromptCompletionSampleRate', 1)
     this._setValue(defaults, 'trace.aws.addSpanPointers', true)
-    this._setValue(defaults, 'trace.dynamoDb.tablePrimaryKeys', undefined)
+    this._setValue(defaults, 'trace.dynamoDb.tablePrimaryKeys')
     this._setValue(defaults, 'trace.nativeSpanEvents', false)
   }
 
@@ -645,10 +644,13 @@ class Config {
       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,
+      DD_APPSEC_HEADER_COLLECTION_REDACTION_ENABLED,
       DD_APPSEC_HTTP_BLOCKED_TEMPLATE_HTML,
       DD_APPSEC_HTTP_BLOCKED_TEMPLATE_JSON,
+      DD_APPSEC_MAX_COLLECTED_HEADERS,
       DD_APPSEC_MAX_STACK_TRACES,
       DD_APPSEC_MAX_STACK_TRACE_DEPTH,
       DD_APPSEC_OBFUSCATION_PARAMETER_KEY_REGEXP,
@@ -657,6 +659,7 @@ class Config {
       DD_APPSEC_SCA_ENABLED,
       DD_APPSEC_STACK_TRACE_ENABLED,
       DD_APPSEC_RASP_ENABLED,
+      DD_APPSEC_RASP_COLLECT_REQUEST_BODY,
       DD_APPSEC_TRACE_RATE_LIMIT,
       DD_APPSEC_WAF_TIMEOUT,
       DD_CRASHTRACKING_ENABLED,
@@ -727,6 +730,7 @@ class Config {
       DD_TRACE_AWS_ADD_SPAN_POINTERS,
       DD_TRACE_BAGGAGE_MAX_BYTES,
       DD_TRACE_BAGGAGE_MAX_ITEMS,
+      DD_TRACE_BAGGAGE_TAG_KEYS,
       DD_TRACE_CLIENT_IP_ENABLED,
       DD_TRACE_CLIENT_IP_HEADER,
       DD_TRACE_DYNAMODB_TABLE_PRIMARY_KEYS,
@@ -803,9 +807,18 @@ class Config {
       DD_APPSEC_AUTO_USER_INSTRUMENTATION_MODE,
       DD_APPSEC_AUTOMATED_USER_EVENTS_TRACKING // TODO: remove in next major
     ))
+    this._setBoolean(env, 'appsec.extendedHeadersCollection.enabled', DD_APPSEC_COLLECT_ALL_HEADERS)
+    this._setBoolean(
+      env,
+      'appsec.extendedHeadersCollection.redaction',
+      DD_APPSEC_HEADER_COLLECTION_REDACTION_ENABLED
+    )
+    this._setValue(env, 'appsec.extendedHeadersCollection.maxHeaders', maybeInt(DD_APPSEC_MAX_COLLECTED_HEADERS))
+    this._envUnprocessed['appsec.extendedHeadersCollection.maxHeaders'] = DD_APPSEC_MAX_COLLECTED_HEADERS
     this._setString(env, 'appsec.obfuscatorKeyRegex', DD_APPSEC_OBFUSCATION_PARAMETER_KEY_REGEXP)
     this._setString(env, 'appsec.obfuscatorValueRegex', DD_APPSEC_OBFUSCATION_PARAMETER_VALUE_REGEXP)
     this._setBoolean(env, 'appsec.rasp.enabled', DD_APPSEC_RASP_ENABLED)
+    this._setBoolean(env, 'appsec.rasp.bodyCollection', DD_APPSEC_RASP_COLLECT_REQUEST_BODY)
     this._setValue(env, 'appsec.rateLimit', maybeInt(DD_APPSEC_TRACE_RATE_LIMIT))
     this._envUnprocessed['appsec.rateLimit'] = DD_APPSEC_TRACE_RATE_LIMIT
     this._setString(env, 'appsec.rules', DD_APPSEC_RULES)
@@ -820,6 +833,7 @@ class Config {
     this._envUnprocessed['appsec.wafTimeout'] = DD_APPSEC_WAF_TIMEOUT
     this._setValue(env, 'baggageMaxBytes', DD_TRACE_BAGGAGE_MAX_BYTES)
     this._setValue(env, 'baggageMaxItems', DD_TRACE_BAGGAGE_MAX_ITEMS)
+    this._setValue(env, 'baggageTagKeys', DD_TRACE_BAGGAGE_TAG_KEYS)
     this._setBoolean(env, 'clientIpEnabled', DD_TRACE_CLIENT_IP_ENABLED)
     this._setString(env, 'clientIpHeader', DD_TRACE_CLIENT_IP_HEADER?.toLowerCase())
     this._setBoolean(env, 'crashtracking.enabled', coalesce(
@@ -893,7 +907,7 @@ class Config {
     this._setValue(env, 'openai.spanCharLimit', maybeInt(DD_OPENAI_SPAN_CHAR_LIMIT))
     this._envUnprocessed.openaiSpanCharLimit = DD_OPENAI_SPAN_CHAR_LIMIT
     if (DD_TRACE_PEER_SERVICE_MAPPING) {
-      this._setValue(env, 'peerServiceMapping', fromEntries(
+      this._setValue(env, 'peerServiceMapping', Object.fromEntries(
         DD_TRACE_PEER_SERVICE_MAPPING.split(',').map(x => x.trim().split(':'))
       ))
       this._envUnprocessed.peerServiceMapping = DD_TRACE_PEER_SERVICE_MAPPING
@@ -941,7 +955,7 @@ class Config {
     this._setString(env, 'scope', DD_TRACE_SCOPE)
     this._setString(env, 'service', DD_SERVICE || DD_SERVICE_NAME || tags.service || OTEL_SERVICE_NAME)
     if (DD_SERVICE_MAPPING) {
-      this._setValue(env, 'serviceMapping', fromEntries(
+      this._setValue(env, 'serviceMapping', Object.fromEntries(
         process.env.DD_SERVICE_MAPPING.split(',').map(x => x.trim().split(':'))
       ))
     }
@@ -1018,9 +1032,24 @@ class Config {
     this._optsUnprocessed['appsec.blockedTemplateJson'] = options.appsec?.blockedTemplateJson
     this._setBoolean(opts, 'appsec.enabled', options.appsec?.enabled)
     this._setString(opts, 'appsec.eventTracking.mode', options.appsec?.eventTracking?.mode)
+    this._setBoolean(
+      opts,
+      'appsec.extendedHeadersCollection.enabled',
+      options.appsec?.extendedHeadersCollection?.enabled
+    )
+    this._setBoolean(
+      opts,
+      'appsec.extendedHeadersCollection.redaction',
+      options.appsec?.extendedHeadersCollection?.redaction
+    )
+    this._setValue(opts,
+      'appsec.extendedHeadersCollection.maxHeaders',
+      options.appsec?.extendedHeadersCollection?.maxHeaders
+    )
     this._setString(opts, 'appsec.obfuscatorKeyRegex', options.appsec?.obfuscatorKeyRegex)
     this._setString(opts, 'appsec.obfuscatorValueRegex', options.appsec?.obfuscatorValueRegex)
     this._setBoolean(opts, 'appsec.rasp.enabled', options.appsec?.rasp?.enabled)
+    this._setBoolean(opts, 'appsec.rasp.bodyCollection', options.appsec?.rasp?.bodyCollection)
     this._setValue(opts, 'appsec.rateLimit', maybeInt(options.appsec?.rateLimit))
     this._optsUnprocessed['appsec.rateLimit'] = options.appsec?.rateLimit
     this._setString(opts, 'appsec.rules', options.appsec?.rules)
@@ -1035,6 +1064,7 @@ class Config {
     this._setString(opts, 'clientIpHeader', options.clientIpHeader?.toLowerCase())
     this._setValue(opts, 'baggageMaxBytes', options.baggageMaxBytes)
     this._setValue(opts, 'baggageMaxItems', options.baggageMaxItems)
+    this._setValue(opts, 'baggageTagKeys', options.baggageTagKeys)
     this._setBoolean(opts, 'codeOriginForSpans.enabled', options.codeOriginForSpans?.enabled)
     this._setBoolean(
       opts,
@@ -1245,7 +1275,8 @@ class Config {
       DD_AGENTLESS_LOG_SUBMISSION_ENABLED,
       DD_TEST_FAILED_TEST_REPLAY_ENABLED,
       DD_TEST_MANAGEMENT_ENABLED,
-      DD_TEST_MANAGEMENT_ATTEMPT_TO_FIX_RETRIES
+      DD_TEST_MANAGEMENT_ATTEMPT_TO_FIX_RETRIES,
+      DD_CIVISIBILITY_IMPACTED_TESTS_DETECTION_ENABLED
     } = process.env
 
     if (DD_CIVISIBILITY_AGENTLESS_URL) {
@@ -1270,6 +1301,7 @@ class Config {
         'testManagementAttemptToFixRetries',
         coalesce(maybeInt(DD_TEST_MANAGEMENT_ATTEMPT_TO_FIX_RETRIES), 20)
       )
+      this._setBoolean(calc, 'isImpactedTestsEnabled', !isFalse(DD_CIVISIBILITY_IMPACTED_TESTS_DETECTION_ENABLED))
     }
     this._setString(calc, 'dogstatsd.hostname', this._getHostname())
     this._setBoolean(calc, 'isGitUploadEnabled',
@@ -1341,9 +1373,9 @@ class Config {
       return this._setValue(obj, name, value)
     }
 
-    value = parseFloat(value)
+    value = Number.parseFloat(value)
 
-    if (!isNaN(value)) {
+    if (!Number.isNaN(value)) {
       // TODO: Ignore out of range values instead of normalizing them.
       this._setValue(obj, name, Math.min(Math.max(value, 0), 1))
     }
@@ -1358,7 +1390,7 @@ class Config {
       value = value.split(',').map(item => {
         // Trim each item and remove whitespace around the colon
         const [key, val] = item.split(':').map(part => part.trim())
-        return val !== undefined ? `${key}:${val}` : key
+        return val === undefined ? key : `${key}:${val}`
       })
     }
 
@@ -1426,7 +1458,6 @@ class Config {
   // TODO: Deeply merge configurations.
   // TODO: Move change tracking to telemetry.
   // for telemetry reporting, `name`s in `containers` need to be keys from:
-  // eslint-disable-next-line @stylistic/js/max-len
   // https://github.com/DataDog/dd-go/blob/prod/trace/apps/tracer-telemetry-intake/telemetry-payload/static/config_norm_rules.json
   _merge () {
     const containers = [
@@ -1516,13 +1547,13 @@ function parseSpaceSeparatedTags (tagString) {
 }
 
 function maybeInt (number) {
-  const parsed = parseInt(number)
-  return isNaN(parsed) ? undefined : parsed
+  const parsed = Number.parseInt(number)
+  return Number.isNaN(parsed) ? undefined : parsed
 }
 
 function maybeFloat (number) {
-  const parsed = parseFloat(number)
-  return isNaN(parsed) ? undefined : parsed
+  const parsed = Number.parseFloat(number)
+  return Number.isNaN(parsed) ? undefined : parsed
 }
 
 function getAgentUrl (url, options) {

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

@@ -27,7 +27,7 @@ class StableConfig {
     try {
       libdatadog = require('@datadog/libdatadog')
       this.wasm_loaded = true
-    } catch (e) {
+    } catch {
       this.warnings.push('Can\'t load libdatadog library')
       return
     }
@@ -78,8 +78,8 @@ class StableConfig {
         fleetConfigPath = '/opt/datadog-agent/etc/managed/datadog-agent/stable/application_monitoring.yaml'
         break
       case 'win32':
-        localConfigPath = 'C:\\ProgramData\\Datadog\\application_monitoring.yaml'
-        fleetConfigPath = 'C:\\ProgramData\\Datadog\\managed\\datadog-agent\\stable\\application_monitoring.yaml'
+        localConfigPath = String.raw`C:\ProgramData\Datadog\application_monitoring.yaml`
+        fleetConfigPath = String.raw`C:\ProgramData\Datadog\managed\datadog-agent\stable\application_monitoring.yaml`
         break
       default:
         break

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

@@ -6,10 +6,10 @@ function encodeVarint (v) {
   // we leave the least significant bit for the sign.
   const double = Math.abs(v) * 2
   if (double > Number.MAX_SAFE_INTEGER) {
-    return undefined
+    return
   }
-  const high = Math.floor(double / 0x100000000)
-  const low = (double & 0xffffffff) | sign
+  const high = Math.floor(double / 0x1_00_00_00_00)
+  const low = (double & 0xFF_FF_FF_FF) | sign
   return encodeUvarint64(low, high)
 }
 
@@ -21,7 +21,7 @@ function decodeVarint (b) {
     return [undefined, bytes]
   }
   const positive = (low & 1) === 0
-  const abs = (low >>> 1) + high * 0x80000000
+  const abs = (low >>> 1) + high * 0x80_00_00_00
   return [positive ? abs : -abs, bytes]
 }
 
@@ -32,13 +32,13 @@ function encodeUvarint64 (low, high) {
   let i = 0
   // if first byte is 1, the number is negative in javascript, but we want to interpret it as positive
   while ((high !== 0 || low < 0 || low > 0x80) && i < maxVarLen64 - 1) {
-    result[i] = (low & 0x7f) | 0x80
+    result[i] = (low & 0x7F) | 0x80
     low >>>= 7
-    low |= (high & 0x7f) << 25
+    low |= (high & 0x7F) << 25
     high >>>= 7
     i++
   }
-  result[i] = low & 0x7f
+  result[i] = low & 0x7F
   return result.slice(0, i + 1)
 }
 
@@ -64,11 +64,11 @@ function decodeUvarint64 (
       return [low, high, bytes]
     }
     if (s < 32) {
-      low |= (n & 0x7f) << s
+      low |= (n & 0x7F) << s
     }
     if (s > 0) {
       high |=
-        s - 32 > 0 ? (n & 0x7f) << (s - 32) : (n & 0x7f) >> (32 - s)
+        s - 32 > 0 ? (n & 0x7F) << (s - 32) : (n & 0x7F) >> (32 - s)
     }
     s += 7
   }

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

@@ -12,7 +12,7 @@ function fnv (data, hvalInit, fnvPrime, fnvSize) {
 
 function fnv64 (data) {
   if (!Buffer.isBuffer(data)) {
-    data = Buffer.from(data, 'utf-8')
+    data = Buffer.from(data, 'utf8')
   }
   const byteArray = new Uint8Array(data)
   return fnv(byteArray, FNV1_64_INIT, FNV_64_PRIME, 2n ** 64n)

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

@@ -77,19 +77,19 @@ function decodePathwayContextBase64 (pathwayContext) {
   return decodePathwayContext(encodedPathway)
 }
 
-class DsmPathwayCodec {
+const DsmPathwayCodec = {
   // we use a class for encoding / decoding in case we update our encoding/decoding. A class will make updates easier
   // instead of using individual functions.
-  static encode (dataStreamsContext, carrier) {
+  encode (dataStreamsContext, carrier) {
     if (!dataStreamsContext || !dataStreamsContext.hash) {
       return
     }
     carrier[CONTEXT_PROPAGATION_KEY_BASE64] = encodePathwayContextBase64(dataStreamsContext)
 
     log.debug(() => `Injected into DSM carrier: ${JSON.stringify(pick(carrier, logKeys))}.`)
-  }
+  },
 
-  static decode (carrier) {
+  decode (carrier) {
     log.debug(() => `Attempting extract from DSM carrier: ${JSON.stringify(pick(carrier, logKeys))}.`)
 
     if (carrier == null) return

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

@@ -103,10 +103,8 @@ class StatsBucket {
   forBacklog (backlogData) {
     const backlog = new Backlog(backlogData)
     const existingBacklog = this._backlogs.get(backlog.hash)
-    if (existingBacklog !== undefined) {
-      if (existingBacklog.offset > backlog.offset) {
-        return existingBacklog
-      }
+    if (existingBacklog !== undefined && existingBacklog.offset > backlog.offset) {
+      return existingBacklog
     }
     this._backlogs.set(backlog.hash, backlog)
     return backlog
@@ -205,7 +203,9 @@ class DataStreamsProcessor {
     let parentHash = ENTRY_PARENT_HASH
     let closestOppositeDirectionHash = ENTRY_PARENT_HASH
     let closestOppositeDirectionEdgeStart = nowNs
-    if (ctx != null) {
+    if (ctx == null) {
+      log.debug(() => 'Setting DSM Checkpoint with empty parent context.')
+    } else {
       pathwayStartNs = ctx.pathwayStartNs
       edgeStartNs = ctx.edgeStartNs
       parentHash = ctx.hash
@@ -229,8 +229,6 @@ class DataStreamsProcessor {
       log.debug(
         () => `Setting DSM Checkpoint from extracted parent context with hash: ${parentHash} and edge tags: ${edgeTags}`
       )
-    } else {
-      log.debug(() => 'Setting DSM Checkpoint with empty parent context.')
     }
     const hash = computePathwayHash(this.service, this.env, edgeTags, parentHash)
     const edgeLatencyNs = nowNs - edgeStartNs

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

@@ -20,7 +20,7 @@ class SchemaBuilder {
   static getSchemaDefinition (schema) {
     const noNones = convertToJsonCompatible(schema)
     const definition = jsonStringify(noNones)
-    const id = fnv64(Buffer.from(definition, 'utf-8')).toString()
+    const id = fnv64(Buffer.from(definition, 'utf8')).toString()
     return new Schema(definition, id)
   }
 

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

@@ -8,12 +8,10 @@ class SchemaSampler {
 
   trySample (currentTimeMs) {
     if (currentTimeMs >= this.lastSampleMs + SAMPLE_INTERVAL_MILLIS) {
-      if (currentTimeMs >= this.lastSampleMs + SAMPLE_INTERVAL_MILLIS) {
-        this.lastSampleMs = currentTimeMs
-        const weight = this.weight
-        this.weight = 0
-        return weight
-      }
+      this.lastSampleMs = currentTimeMs
+      const weight = this.weight
+      this.weight = 0
+      return weight
     }
     return 0
   }

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

@@ -4,7 +4,7 @@ const { types } = require('util')
 
 function getSizeOrZero (obj) {
   if (typeof obj === 'string') {
-    return Buffer.from(obj, 'utf-8').length
+    return Buffer.from(obj, 'utf8').length
   }
   if (types.isArrayBuffer(obj)) {
     return obj.byteLength