dd-trace 5.101.0 → 5.103.0

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

@@ -4,8 +4,8 @@ const fs = require('fs')
 const path = require('path')
 
 const gitPropertiesCommitSHARegex = /git\.commit\.sha=([a-f\d]{40})/
-const gitPropertiesRepositoryUrlRegex = /git\.repository_url=([\w\d:@/.-]+)/
-const repositoryUrlRegex = /^([\w\d:@/.-]+)$/
+const gitPropertiesRepositoryUrlRegex = /git\.repository_url=([\w:@/.-]+)/
+const repositoryUrlRegex = /^([\w:@/.-]+)$/
 const remoteOriginRegex = /^\[remote\s+"origin"\]/i
 const gitHeadRefRegex = /ref:\s+(refs\/[A-Za-z0-9._/-]+)/
 const commitSHARegex = /^[0-9a-f]{40}$/

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')
     }

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

@@ -0,0 +1,98 @@
+'use strict'
+
+/**
+ * @typedef {import('./helper').SupportedConfigurationsJson['supportedConfigurations']} SupportedConfigurations
+ */
+
+const EXPERIMENTAL_APPSEC_PREFIX = 'experimental.appsec'
+const EXPERIMENTAL_IAST_PREFIX = 'experimental.iast'
+const INGESTION_PREFIX = 'ingestion.'
+
+/**
+ * @param {SupportedConfigurations} supportedConfigurations Mutated in place.
+ * @param {number} majorVersion
+ */
+function applyMajorOverrides (supportedConfigurations, majorVersion) {
+  if (majorVersion < 6) {
+    applyV5Overrides(supportedConfigurations)
+    return
+  }
+
+  for (const entries of Object.values(supportedConfigurations)) {
+    for (const entry of entries) {
+      if (Array.isArray(entry.configurationNames)) {
+        entry.configurationNames = entry.configurationNames.filter(
+          (name) =>
+            name !== EXPERIMENTAL_APPSEC_PREFIX &&
+            name !== EXPERIMENTAL_IAST_PREFIX &&
+            !name.startsWith(`${EXPERIMENTAL_APPSEC_PREFIX}.`) &&
+            !name.startsWith(`${EXPERIMENTAL_IAST_PREFIX}.`) &&
+            !name.startsWith(INGESTION_PREFIX)
+        )
+        if (entry.configurationNames.length === 0) delete entry.configurationNames
+      }
+    }
+  }
+  delete supportedConfigurations.DD_EXPERIMENTAL_APPSEC_STANDALONE_ENABLED
+  delete supportedConfigurations.DD_TRACE_EXPERIMENTAL_B3_ENABLED
+
+  /* eslint-disable eslint-rules/eslint-env-aliases */
+  for (const name of [
+    'DD_PROFILING_EXPERIMENTAL_CODEHOTSPOTS_ENABLED',
+    'DD_PROFILING_EXPERIMENTAL_CPU_ENABLED',
+    'DD_PROFILING_EXPERIMENTAL_ENDPOINT_COLLECTION_ENABLED',
+    'DD_PROFILING_EXPERIMENTAL_TIMELINE_ENABLED',
+  ]) {
+    delete supportedConfigurations[name]
+  }
+  /* eslint-enable eslint-rules/eslint-env-aliases */
+  for (const canonical of [
+    'DD_PROFILING_CODEHOTSPOTS_ENABLED',
+    'DD_PROFILING_CPU_ENABLED',
+    'DD_PROFILING_ENDPOINT_COLLECTION_ENABLED',
+    'DD_PROFILING_TIMELINE_ENABLED',
+  ]) {
+    dropAlias(supportedConfigurations[canonical], (alias) => alias.startsWith('DD_PROFILING_EXPERIMENTAL_'))
+  }
+
+  delete supportedConfigurations.DD_TRACE_EXPERIMENTAL_RUNTIME_ID_ENABLED
+  // eslint-disable-next-line eslint-rules/eslint-env-aliases
+  dropAlias(supportedConfigurations.DD_RUNTIME_METRICS_RUNTIME_ID_ENABLED, 'DD_TRACE_EXPERIMENTAL_RUNTIME_ID_ENABLED')
+}
+
+/**
+ * @param {SupportedConfigurations} supportedConfigurations Mutated in place.
+ */
+function applyV5Overrides (supportedConfigurations) {
+  const startupLogsEntry = supportedConfigurations.DD_TRACE_STARTUP_LOGS?.[0]
+  if (startupLogsEntry) {
+    startupLogsEntry.default = 'false'
+  }
+
+  const iastEntry = supportedConfigurations.DD_IAST_SECURITY_CONTROLS_CONFIGURATION?.[0]
+  if (!iastEntry) return
+
+  iastEntry.configurationNames = [
+    iastEntry.internalPropertyName || iastEntry.configurationNames?.[0],
+    `${EXPERIMENTAL_IAST_PREFIX}.securityControlsConfiguration`,
+  ]
+  delete iastEntry.internalPropertyName
+}
+
+/**
+ * @param {import('./helper').SupportedConfigurationEntry[] | undefined} entries
+ * @param {string | ((alias: string) => boolean)} dropPredicate
+ */
+function dropAlias (entries, dropPredicate) {
+  const entry = entries?.[0]
+  if (entry?.aliases === undefined) return
+  const matches = typeof dropPredicate === 'string'
+    ? (alias) => alias === dropPredicate
+    : dropPredicate
+  entry.aliases = entry.aliases.filter((alias) => !matches(alias))
+  if (entry.aliases.length === 0) {
+    delete entry.aliases
+  }
+}
+
+module.exports = applyMajorOverrides

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

@@ -2,6 +2,7 @@
 
 const fs = require('fs')
 
+const { DD_MAJOR } = require('../../../../version')
 const tagger = require('../tagger')
 
 let warnInvalidValue
@@ -9,6 +10,7 @@ function setWarnInvalidValue (fn) {
   warnInvalidValue = fn
 }
 
+// `'b3 single header'` is the legacy spelling of `'b3'`; on v6 it is normalised below.
 const VALID_PROPAGATION_STYLES = new Set([
   'datadog', 'tracecontext', 'b3', 'b3 single header', 'b3multi', 'baggage', 'none',
 ])
@@ -145,11 +147,15 @@ const transformers = {
   },
   validatePropagationStyles (value, optionName) {
     value = transformers.toLowerCase(value)
-    for (const propagator of value) {
+    for (let index = 0; index < value.length; index++) {
+      const propagator = value[index]
       if (!VALID_PROPAGATION_STYLES.has(propagator)) {
         warnInvalidValue(propagator, optionName, optionName, 'Invalid propagator')
         return
       }
+      if (DD_MAJOR >= 6 && propagator === 'b3 single header') {
+        value[index] = 'b3'
+      }
     }
     return value
   },

package/packages/dd-trace/src/config/supported-configurations.json

@@ -254,7 +254,8 @@
           "appsec.extendedHeadersCollection.redaction",
           "experimental.appsec.extendedHeadersCollection.redaction"
         ],
-        "default": "true"
+        "default": "true",
+        "deprecated": true
       }
     ],
     "DD_APPSEC_HTTP_BLOCKED_TEMPLATE_HTML": [
@@ -289,7 +290,8 @@
           "appsec.extendedHeadersCollection.maxHeaders",
           "experimental.appsec.extendedHeadersCollection.maxHeaders"
         ],
-        "default": "50"
+        "default": "50",
+        "deprecated": true
       }
     ],
     "DD_APPSEC_MAX_STACK_TRACES": [
@@ -597,6 +599,13 @@
         "default": "true"
       }
     ],
+    "DD_CUSTOM_PARENT_ID": [
+      {
+        "implementation": "A",
+        "type": "string",
+        "default": null
+      }
+    ],
     "DD_CUSTOM_TRACE_ID": [
       {
         "implementation": "A",
@@ -780,9 +789,9 @@
     ],
     "DD_EXPERIMENTAL_TEST_OPT_GIT_CACHE_DIR": [
       {
-        "implementation": "A",
+        "implementation": "B",
         "type": "string",
-        "default": "${os.tmpdir()}/dd-trace-git-cache"
+        "default": null
       }
     ],
     "DD_EXPERIMENTAL_TEST_OPT_GIT_CACHE_ENABLED": [
@@ -1062,10 +1071,7 @@
       {
         "implementation": "B",
         "type": "string",
-        "configurationNames": [
-          "iast.securityControlsConfiguration",
-          "experimental.iast.securityControlsConfiguration"
-        ],
+        "internalPropertyName": "iast.securityControlsConfiguration",
         "default": null
       }
     ],
@@ -1934,9 +1940,9 @@
     ],
     "DD_TRACE_AWS_SDK_AWS_BATCH_PROPAGATION_ENABLED": [
       {
-        "implementation": "A",
+        "implementation": "B",
         "type": "boolean",
-        "default": "true"
+        "default": "false"
       }
     ],
     "DD_TRACE_AWS_SDK_AWS_ENABLED": [
@@ -1948,16 +1954,16 @@
     ],
     "DD_TRACE_AWS_SDK_BATCH_PROPAGATION_ENABLED": [
       {
-        "implementation": "A",
+        "implementation": "B",
         "type": "boolean",
-        "default": "true"
+        "default": "false"
       }
     ],
     "DD_TRACE_AWS_SDK_BEDROCKRUNTIME_BATCH_PROPAGATION_ENABLED": [
       {
-        "implementation": "A",
+        "implementation": "B",
         "type": "boolean",
-        "default": "true"
+        "default": "false"
       }
     ],
     "DD_TRACE_AWS_SDK_BEDROCKRUNTIME_ENABLED": [
@@ -1969,9 +1975,9 @@
     ],
     "DD_TRACE_AWS_SDK_CLOUDWATCHLOGS_BATCH_PROPAGATION_ENABLED": [
       {
-        "implementation": "A",
+        "implementation": "B",
         "type": "boolean",
-        "default": "true"
+        "default": "false"
       }
     ],
     "DD_TRACE_AWS_SDK_CLOUDWATCHLOGS_ENABLED": [
@@ -1983,9 +1989,9 @@
     ],
     "DD_TRACE_AWS_SDK_DYNAMODB_BATCH_PROPAGATION_ENABLED": [
       {
-        "implementation": "A",
+        "implementation": "B",
         "type": "boolean",
-        "default": "true"
+        "default": "false"
       }
     ],
     "DD_TRACE_AWS_SDK_DYNAMODB_ENABLED": [
@@ -2004,9 +2010,9 @@
     ],
     "DD_TRACE_AWS_SDK_EVENTBRIDGE_BATCH_PROPAGATION_ENABLED": [
       {
-        "implementation": "A",
+        "implementation": "B",
         "type": "boolean",
-        "default": "true"
+        "default": "false"
       }
     ],
     "DD_TRACE_AWS_SDK_EVENTBRIDGE_ENABLED": [
@@ -2018,9 +2024,9 @@
     ],
     "DD_TRACE_AWS_SDK_KINESIS_BATCH_PROPAGATION_ENABLED": [
       {
-        "implementation": "A",
+        "implementation": "B",
         "type": "boolean",
-        "default": "true"
+        "default": "false"
       }
     ],
     "DD_TRACE_AWS_SDK_KINESIS_ENABLED": [
@@ -2032,9 +2038,9 @@
     ],
     "DD_TRACE_AWS_SDK_LAMBDA_BATCH_PROPAGATION_ENABLED": [
       {
-        "implementation": "A",
+        "implementation": "B",
         "type": "boolean",
-        "default": "true"
+        "default": "false"
       }
     ],
     "DD_TRACE_AWS_SDK_LAMBDA_ENABLED": [
@@ -2053,9 +2059,9 @@
     ],
     "DD_TRACE_AWS_SDK_REDSHIFT_BATCH_PROPAGATION_ENABLED": [
       {
-        "implementation": "A",
+        "implementation": "B",
         "type": "boolean",
-        "default": "true"
+        "default": "false"
       }
     ],
     "DD_TRACE_AWS_SDK_REDSHIFT_ENABLED": [
@@ -2067,9 +2073,9 @@
     ],
     "DD_TRACE_AWS_SDK_S3_BATCH_PROPAGATION_ENABLED": [
       {
-        "implementation": "A",
+        "implementation": "B",
         "type": "boolean",
-        "default": "true"
+        "default": "false"
       }
     ],
     "DD_TRACE_AWS_SDK_S3_ENABLED": [
@@ -2081,9 +2087,9 @@
     ],
     "DD_TRACE_AWS_SDK_SFN_BATCH_PROPAGATION_ENABLED": [
       {
-        "implementation": "A",
+        "implementation": "B",
         "type": "boolean",
-        "default": "true"
+        "default": "false"
       }
     ],
     "DD_TRACE_AWS_SDK_SFN_CLIENT_ENABLED": [
@@ -2109,9 +2115,9 @@
     ],
     "DD_TRACE_AWS_SDK_SNS_BATCH_PROPAGATION_ENABLED": [
       {
-        "implementation": "A",
+        "implementation": "B",
         "type": "boolean",
-        "default": "true"
+        "default": "false"
       }
     ],
     "DD_TRACE_AWS_SDK_SNS_ENABLED": [
@@ -2123,9 +2129,9 @@
     ],
     "DD_TRACE_AWS_SDK_SQS_BATCH_PROPAGATION_ENABLED": [
       {
-        "implementation": "A",
+        "implementation": "B",
         "type": "boolean",
-        "default": "true"
+        "default": "false"
       }
     ],
     "DD_TRACE_AWS_SDK_SQS_ENABLED": [
@@ -2137,9 +2143,9 @@
     ],
     "DD_TRACE_AWS_SDK_STATES_BATCH_PROPAGATION_ENABLED": [
       {
-        "implementation": "A",
+        "implementation": "B",
         "type": "boolean",
-        "default": "true"
+        "default": "false"
       }
     ],
     "DD_TRACE_AWS_SDK_STATES_ENABLED": [
@@ -2151,9 +2157,9 @@
     ],
     "DD_TRACE_AWS_SDK_STEPFUNCTIONS_BATCH_PROPAGATION_ENABLED": [
       {
-        "implementation": "A",
+        "implementation": "B",
         "type": "boolean",
-        "default": "true"
+        "default": "false"
       }
     ],
     "DD_TRACE_AWS_SDK_STEPFUNCTIONS_ENABLED": [
@@ -2485,6 +2491,13 @@
         "default": "true"
       }
     ],
+    "DD_TRACE_ELECTRON_ENABLED": [
+      {
+        "implementation": "A",
+        "type": "boolean",
+        "default": "true"
+      }
+    ],
     "DD_TRACE_ENABLED": [
       {
         "implementation": "A",

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

@@ -33,7 +33,7 @@ class DataStreamsCheckpointer {
    *                       Examples include kafka, kinesis, sns etc.
    * @param {string} source - The source of data. This can be a topic, exchange or stream name.
    * @param {object} carrier - The carrier object to extract context from.
-   * @param {boolean} [manualCheckpoint=true] - Whether this checkpoint was manually set. Keep true if manually
+   * @param {boolean} [manualCheckpoint] - Whether this checkpoint was manually set. Keep true if manually
    *                                           instrumenting. Manual instrumentation always overrides automatic
    *                                           instrumentation in the case a call is both manually and automatically
    *                                           instrumented.
@@ -60,7 +60,7 @@ class DataStreamsCheckpointer {
    * Tags the active span (or the provided span) with the transaction ID and checkpoint name.
    * @param {string} transactionId - The transaction identifier to track.
    * @param {string} checkpointName - The logical checkpoint name.
-   * @param {object|null} [span=null] - Span to tag. Defaults to the currently active span.
+   * @param {object|null} [span] - Span to tag. Defaults to the currently active span.
    */
   trackTransaction (transactionId, checkpointName, span = null) {
     if (!this.config.dsmEnabled) return

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

@@ -28,7 +28,8 @@ function lazyClass (classGetter, methods = [], staticMethods = []) {
   }
 
   const activate = () => {
-    return (ActiveClass = ActiveClass || classGetter())
+    ActiveClass ??= classGetter()
+    return ActiveClass
   }
 
   for (const method of methods) {

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

@@ -26,7 +26,7 @@ class DataStreamsManager {
   /**
    * @param {string} transactionId
    * @param {string} checkpointName
-   * @param {object|null} [span=null]
+   * @param {object|null} [span]
    */
   trackTransaction (transactionId, checkpointName, span = null) {
     this._dataStreamsProcessor.trackTransaction(transactionId, checkpointName, span)

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

@@ -237,7 +237,7 @@ class DataStreamsProcessor {
 
     if (this.enabled) {
       this.timer = setInterval(this.onInterval.bind(this), flushInterval)
-      this.timer.unref()
+      this.timer.unref?.()
     }
     globalThis[Symbol.for('dd-trace')].beforeExitHandlers.add(this.onInterval.bind(this))
   }
@@ -271,8 +271,7 @@ class DataStreamsProcessor {
    */
   bucketFromTimestamp (timestamp) {
     const bucketTime = Math.round(timestamp - (timestamp % this.bucketSizeNs))
-    const bucket = this.buckets.forTime(bucketTime)
-    return bucket
+    return this.buckets.forTime(bucketTime)
   }
 
   recordCheckpoint (checkpoint, span = null) {
@@ -378,7 +377,7 @@ class DataStreamsProcessor {
    *
    * @param {string} transactionId - Truncated to 255 UTF-8 bytes.
    * @param {string} checkpointName - Mapped to a stable 1-byte ID; silently dropped if registry full.
-   * @param {import('../opentelemetry/span').Span|null} [span=null] - Active span to tag with DSM transaction metadata.
+   * @param {import('../opentelemetry/span').Span|null} [span] - Active span to tag with DSM transaction metadata.
    */
   trackTransaction (transactionId, checkpointName, span = null) {
     if (!this.enabled) {

package/packages/dd-trace/src/debugger/devtools_client/snapshot/collector.js

@@ -72,9 +72,9 @@ module.exports = {
  * @param {string} objectId - The ID of the object to get the properties of
  * @param {GetObjectOptions} opts - The options for the snapshot. Also used to track the deadline and communicate the
  *   deadline overrun to the caller using the `deadlineReached` flag.
- * @param {number} [depth=0] - The depth of the object. Only used internally by this module to track the current depth
+ * @param {number} [depth] - The depth of the object. Only used internally by this module to track the current depth
  *   and should not be set by the caller.
- * @param {boolean} [collection=false] - Whether the object is a collection. Only used internally by this module to
+ * @param {boolean} [collection] - Whether the object is a collection. Only used internally by this module to
  *   track the current object type and should not be set by the caller.
  * @returns {Promise<object[]>} The properties of the object
  */

package/packages/dd-trace/src/debugger/devtools_client/snapshot-pruner.js

@@ -175,6 +175,7 @@ function parseJsonToTree (json) {
     switch (json.charCodeAt(index)) {
       case 34: { // 34: double quote
         const stringStart = index + 1
+        // eslint-disable-next-line sonarjs/updated-loop-counter -- skip past the string token
         index = skipString(json, index)
         const stringLength = index - stringStart
 

package/packages/dd-trace/src/debugger/devtools_client/source-maps.js

@@ -63,7 +63,7 @@ function setCacheTTL () {
       // Clear cache a few seconds after it was last used
       cache.clear()
     }
-  }, 5000).unref()
+  }, 5000).unref?.()
 }
 
 function loadInlineSourceMap (data) {

package/packages/dd-trace/src/debugger/devtools_client/state.js

@@ -230,7 +230,8 @@ session.on('Debugger.scriptParsed', ({ params }) => {
     if (reEvaluateProbesTimer === null) {
       reEvaluateProbesTimer = setTimeout(() => {
         session.emit('scriptLoadingStabilized')
-      }, 500).unref()
+      }, 500)
+      reEvaluateProbesTimer.unref?.()
     } else {
       reEvaluateProbesTimer.refresh()
     }

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

@@ -132,13 +132,13 @@ function start (config, rcInstance) {
       cleanup(error) // Be nice, clean up now that the worker thread encountered an issue and we can't continue
     })
 
-    worker.unref()
-    probeChannel.port1.unref()
-    probeChannel.port2.unref()
-    logChannel.port1.unref()
-    logChannel.port2.unref()
-    configChannel.port1.unref()
-    configChannel.port2.unref()
+    worker.unref?.()
+    probeChannel.port1.unref?.()
+    probeChannel.port2.unref?.()
+    logChannel.port1.unref?.()
+    logChannel.port2.unref?.()
+    configChannel.port1.unref?.()
+    configChannel.port2.unref?.()
   })
 }
 

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

@@ -161,7 +161,7 @@ class DogStatsDClient {
     const socket = dgram.createSocket(type)
 
     socket.on('error', () => {})
-    socket.unref()
+    socket.unref?.()
 
     return socket
   }
@@ -361,7 +361,7 @@ class CustomMetrics {
     const flush = this.flush.bind(this)
 
     // TODO(bengl) this magic number should be configurable
-    setInterval(flush, 10 * 1000).unref()
+    setInterval(flush, 10 * 1000).unref?.()
 
     globalThis[Symbol.for('dd-trace')].beforeExitHandlers.add(flush)
   }