dd-trace 5.98.0 → 5.99.1

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

@@ -12,8 +12,7 @@
       {
         "implementation": "A",
         "type": "boolean",
-        "default": "false",
-        "internalPropertyName": "ciVisAgentlessLogSubmissionEnabled"
+        "default": "false"
       }
     ],
     "DD_AGENTLESS_LOG_SUBMISSION_URL": [
@@ -179,7 +178,8 @@
       {
         "implementation": "A",
         "type": "int",
-        "default": "100"
+        "default": "100",
+        "allowed": "\\d+"
       }
     ],
     "DD_APM_TRACING_ENABLED": [
@@ -189,7 +189,10 @@
         "configurationNames": [
           "apmTracingEnabled"
         ],
-        "default": "true"
+        "default": "true",
+        "aliases": [
+          "DD_TRACING_ENABLED"
+        ]
       }
     ],
     "DD_APPSEC_AUTO_USER_INSTRUMENTATION_MODE": [
@@ -445,9 +448,9 @@
     ],
     "DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER": [
       {
-        "implementation": "B",
-        "type": "boolean",
-        "default": "false"
+        "implementation": "A",
+        "type": "string",
+        "default": null
       }
     ],
     "DD_CIVISIBILITY_DANGEROUSLY_FORCE_COVERAGE": [
@@ -537,8 +540,7 @@
       {
         "implementation": "A",
         "type": "boolean",
-        "default": "true",
-        "internalPropertyName": "isManualApiEnabled"
+        "default": "true"
       }
     ],
     "DD_CIVISIBILITY_RUM_FLUSH_WAIT_MILLIS": [
@@ -1101,24 +1103,21 @@
       {
         "implementation": "C",
         "type": "string",
-        "default": null,
-        "internalPropertyName": "injectionEnabled"
+        "default": null
       }
     ],
     "DD_INJECT_FORCE": [
       {
         "implementation": "A",
         "type": "boolean",
-        "default": "false",
-        "internalPropertyName": "injectForce"
+        "default": "false"
       }
     ],
     "DD_INSTRUMENTATION_CONFIG_ID": [
       {
         "implementation": "A",
         "type": "string",
-        "default": null,
-        "internalPropertyName": "instrumentation_config_id"
+        "default": null
       }
     ],
     "DD_INSTRUMENTATION_INSTALL_ID": [
@@ -1236,8 +1235,7 @@
       {
         "implementation": "A",
         "type": "boolean",
-        "default": "false",
-        "internalPropertyName": "otelLogsEnabled"
+        "default": "false"
       }
     ],
     "DD_TRACE_LOG_LEVEL": [
@@ -1786,16 +1784,14 @@
       {
         "implementation": "A",
         "type": "boolean",
-        "default": "false",
-        "internalPropertyName": "isKeepingCoverageConfiguration"
+        "default": "false"
       }
     ],
     "DD_TEST_SESSION_NAME": [
       {
         "implementation": "A",
         "type": "string",
-        "default": null,
-        "internalPropertyName": "ciVisibilityTestSessionName"
+        "default": null
       }
     ],
     "DD_TRACE_128_BIT_TRACEID_GENERATION_ENABLED": [
@@ -2509,10 +2505,7 @@
         "implementation": "A",
         "type": "boolean",
         "default": "true",
-        "internalPropertyName": "tracing",
-        "aliases": [
-          "DD_TRACING_ENABLED"
-        ]
+        "internalPropertyName": "tracing"
       }
     ],
     "DD_TRACE_ENCODING_DEBUG": [
@@ -2643,8 +2636,7 @@
       {
         "implementation": "A",
         "type": "boolean",
-        "default": "true",
-        "internalPropertyName": "gitMetadataEnabled"
+        "default": "true"
       }
     ],
     "DD_TRACE_GOOGLE_CLOUD_PUBSUB_ENABLED": [
@@ -2686,8 +2678,7 @@
       {
         "implementation": "A",
         "type": "array",
-        "default": "",
-        "internalPropertyName": "graphqlErrorExtensions"
+        "default": ""
       }
     ],
     "DD_TRACE_GRAPHQL_TAG_ENABLED": [
@@ -3061,8 +3052,7 @@
       {
         "implementation": "A",
         "type": "boolean",
-        "default": "false",
-        "internalPropertyName": "memcachedCommandEnabled"
+        "default": "false"
       }
     ],
     "DD_TRACE_MEMCACHED_ENABLED": [
@@ -3110,6 +3100,13 @@
         "default": "true"
       }
     ],
+    "DD_TRACE_MODELCONTEXTPROTOCOL_SDK_ENABLED": [
+      {
+        "implementation": "A",
+        "type": "boolean",
+        "default": "true"
+      }
+    ],
     "DD_TRACE_MOLECULER_ENABLED": [
       {
         "implementation": "A",
@@ -3429,8 +3426,7 @@
       {
         "implementation": "A",
         "type": "boolean",
-        "default": "false",
-        "internalPropertyName": "tracePropagationExtractFirst"
+        "default": "false"
       }
     ],
     "DD_TRACE_PROPAGATION_STYLE": [
@@ -3670,7 +3666,6 @@
       {
         "implementation": "A",
         "type": "int",
-        "internalPropertyName": "spanLeakDebug",
         "default": "0"
       }
     ],
@@ -3823,8 +3818,7 @@
       {
         "implementation": "A",
         "type": "int",
-        "default": "512",
-        "internalPropertyName": "tagsHeaderMaxLength"
+        "default": "512"
       }
     ],
     "DD_VERSION": [
@@ -3864,7 +3858,6 @@
       {
         "implementation": "A",
         "type": "int",
-        "internalPropertyName": "otelMaxExportBatchSize",
         "default": "512",
         "allowed": "[1-9]\\d*"
       }
@@ -3873,7 +3866,6 @@
       {
         "implementation": "A",
         "type": "int",
-        "internalPropertyName": "otelMaxQueueSize",
         "default": "2048",
         "allowed": "[1-9]\\d*"
       }
@@ -3882,7 +3874,6 @@
       {
         "implementation": "A",
         "type": "int",
-        "internalPropertyName": "otelBatchTimeout",
         "default": "5000",
         "allowed": "[1-9]\\d*"
       }
@@ -3896,18 +3887,16 @@
     ],
     "OTEL_EXPORTER_OTLP_HEADERS": [
       {
-        "implementation": "C",
-        "type": "string",
-        "default": null,
-        "internalPropertyName": "otelHeaders"
+        "implementation": "B",
+        "type": "map",
+        "default": null
       }
     ],
     "OTEL_EXPORTER_OTLP_TRACES_ENDPOINT": [
       {
         "implementation": "A",
         "type": "string",
-        "default": null,
-        "internalPropertyName": "otelTracesUrl"
+        "default": null
       }
     ],
     "OTEL_EXPORTER_OTLP_TRACES_HEADERS": [
@@ -3915,7 +3904,6 @@
         "implementation": "B",
         "type": "map",
         "default": null,
-        "internalPropertyName": "otelTracesHeaders",
         "aliases": [
           "OTEL_EXPORTER_OTLP_HEADERS"
         ]
@@ -3926,7 +3914,7 @@
         "implementation": "B",
         "type": "string",
         "default": "http/json",
-        "internalPropertyName": "otelTracesProtocol",
+        "allowed": "http/json",
         "aliases": [
           "OTEL_EXPORTER_OTLP_PROTOCOL"
         ]
@@ -3936,7 +3924,6 @@
       {
         "implementation": "B",
         "type": "int",
-        "internalPropertyName": "otelTracesTimeout",
         "default": "10000",
         "aliases": [
           "OTEL_EXPORTER_OTLP_TIMEOUT"
@@ -3947,19 +3934,14 @@
       {
         "implementation": "A",
         "type": "string",
-        "default": null,
-        "internalPropertyName": "otelLogsUrl",
-        "aliases": [
-          "OTEL_EXPORTER_OTLP_ENDPOINT"
-        ]
+        "default": null
       }
     ],
     "OTEL_EXPORTER_OTLP_LOGS_HEADERS": [
       {
-        "implementation": "A",
-        "type": "string",
+        "implementation": "B",
+        "type": "map",
         "default": null,
-        "internalPropertyName": "otelLogsHeaders",
         "aliases": [
           "OTEL_EXPORTER_OTLP_HEADERS"
         ]
@@ -3970,7 +3952,6 @@
         "implementation": "D",
         "type": "string",
         "default": "http/protobuf",
-        "internalPropertyName": "otelLogsProtocol",
         "aliases": [
           "OTEL_EXPORTER_OTLP_PROTOCOL"
         ]
@@ -3980,7 +3961,6 @@
       {
         "implementation": "A",
         "type": "int",
-        "internalPropertyName": "otelLogsTimeout",
         "default": "10000",
         "allowed": "[1-9]\\d*",
         "aliases": [
@@ -3992,19 +3972,14 @@
       {
         "implementation": "A",
         "type": "string",
-        "default": null,
-        "internalPropertyName": "otelMetricsUrl",
-        "aliases": [
-          "OTEL_EXPORTER_OTLP_ENDPOINT"
-        ]
+        "default": null
       }
     ],
     "OTEL_EXPORTER_OTLP_METRICS_HEADERS": [
       {
-        "implementation": "B",
-        "type": "string",
+        "implementation": "C",
+        "type": "map",
         "default": null,
-        "internalPropertyName": "otelMetricsHeaders",
         "aliases": [
           "OTEL_EXPORTER_OTLP_HEADERS"
         ]
@@ -4015,7 +3990,6 @@
         "implementation": "B",
         "type": "string",
         "default": "http/protobuf",
-        "internalPropertyName": "otelMetricsProtocol",
         "aliases": [
           "OTEL_EXPORTER_OTLP_PROTOCOL"
         ]
@@ -4027,7 +4001,6 @@
         "type": "string",
         "allowed": "Delta|Cumulative|LowMemory",
         "transform": "toUpperCase",
-        "internalPropertyName": "otelMetricsTemporalityPreference",
         "default": "delta"
       }
     ],
@@ -4036,7 +4009,6 @@
         "implementation": "B",
         "type": "int",
         "allowed": "[1-9]\\d*",
-        "internalPropertyName": "otelMetricsTimeout",
         "default": "10000",
         "aliases": [
           "OTEL_EXPORTER_OTLP_TIMEOUT"
@@ -4047,8 +4019,7 @@
       {
         "implementation": "A",
         "type": "string",
-        "default": "http/protobuf",
-        "internalPropertyName": "otelProtocol"
+        "default": "http/protobuf"
       }
     ],
     "OTEL_EXPORTER_OTLP_TIMEOUT": [
@@ -4056,7 +4027,6 @@
         "implementation": "A",
         "type": "int",
         "allowed": "[1-9]\\d*",
-        "internalPropertyName": "otelTimeout",
         "default": "10000"
       }
     ],
@@ -4083,7 +4053,6 @@
         "implementation": "A",
         "type": "int",
         "allowed": "[1-9]\\d*",
-        "internalPropertyName": "otelMetricsExportInterval",
         "default": "10000"
       }
     ],
@@ -4092,14 +4061,13 @@
         "implementation": "A",
         "type": "int",
         "allowed": "[1-9]\\d*",
-        "internalPropertyName": "otelMetricsExportTimeout",
         "default": "7500"
       }
     ],
     "OTEL_RESOURCE_ATTRIBUTES": [
       {
-        "implementation": "B",
-        "type": "string",
+        "implementation": "A",
+        "type": "map",
         "default": "",
         "transform": "parseOtelTags"
       }
@@ -4113,9 +4081,9 @@
     ],
     "OTEL_TRACES_EXPORTER": [
       {
-        "implementation": "F",
+        "implementation": "H",
         "type": "string",
-        "default": "otlp",
+        "default": null,
         "allowed": "none|otlp",
         "transform": "toLowerCase"
       }

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

@@ -5,6 +5,7 @@ module.exports = function getDebuggerConfig (config, inputPath) {
     commitSHA: config.commitSHA,
     debug: config.debug,
     dynamicInstrumentation: config.dynamicInstrumentation,
+    env: config.env,
     hostname: config.hostname,
     logLevel: config.logLevel,
     port: config.port,
@@ -13,6 +14,7 @@ module.exports = function getDebuggerConfig (config, inputPath) {
     runtimeId: config.tags['runtime-id'],
     service: config.service,
     url: config.url?.toString(),
+    version: config.version,
     inputPath,
   }
 }

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

@@ -6,7 +6,6 @@ const { stringify } = require('querystring')
 const { version } = require('../../../../../package.json')
 const request = require('../../exporters/common/request')
 const { GIT_COMMIT_SHA, GIT_REPOSITORY_URL } = require('../../plugins/util/tags')
-const { getValueFromEnvSources } = require('../../config/helper')
 const { DEBUGGER_DIAGNOSTICS_V1, DEBUGGER_INPUT_V2 } = require('../constants')
 const log = require('./log')
 const JSONBuffer = require('./json-buffer')
@@ -23,14 +22,14 @@ const ddsource = 'dd_debugger'
 const hostname = getHostname()
 const service = config.service
 
-const ddtags = [
-  ['env', getValueFromEnvSources('DD_ENV')],
-  ['version', getValueFromEnvSources('DD_VERSION')],
+const ddtags = buildTags([
+  ['env', config.env],
+  ['version', config.version],
   ['debugger_version', version],
   ['host_name', hostname],
   [GIT_COMMIT_SHA, config.commitSHA],
   [GIT_REPOSITORY_URL, config.repositoryUrl],
-].filter(([, value]) => value !== undefined).map((pair) => pair.join(':')).join(',')
+])
 
 let path
 setInputPath(config.inputPath)
@@ -136,3 +135,24 @@ function setInputPath (newPath) {
   config.inputPath = newPath
   path = `${newPath}?${stringify({ ddtags })}`
 }
+
+/**
+ * @param {Array<[string, unknown]>} tags - The tags to serialize.
+ * @returns {string} The serialized tags.
+ */
+function buildTags (tags) {
+  const serializedTags = []
+
+  for (const [key, rawValue] of tags) {
+    if (rawValue === undefined) continue
+
+    if (String(rawValue).includes(',')) {
+      log.warn('[debugger:devtools_client] Skipping invalid tag value for %s', key)
+      continue
+    }
+
+    serializedTags.push(`${key}:${rawValue}`)
+  }
+
+  return serializedTags.join(',')
+}

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

@@ -266,6 +266,8 @@ class MetricsAggregationClient {
     this._captureTree(this._gauges, (node, name, tags) => {
       this._client.gauge(name, node.value, tags)
     })
+
+    this._gauges.clear()
   }
 
   _captureCounters () {
@@ -278,12 +280,7 @@ class MetricsAggregationClient {
 
   _captureHistograms () {
     this._captureTree(this._histograms, (node, name, tags) => {
-      let stats = node.value
-
-      // Stats can contain garbage data when a value was never recorded.
-      if (stats.count === 0) {
-        stats = { max: 0, min: 0, sum: 0, avg: 0, median: 0, p95: 0, count: 0 }
-      }
+      const stats = node.value
 
       this._client.gauge(`${name}.min`, stats.min, tags)
       this._client.gauge(`${name}.max`, stats.max, tags)
@@ -293,9 +290,9 @@ class MetricsAggregationClient {
       this._client.increment(`${name}.count`, stats.count, tags)
       this._client.gauge(`${name}.median`, stats.median, tags)
       this._client.gauge(`${name}.95percentile`, stats.p95, tags)
-
-      node.value.reset()
     })
+
+    this._histograms.clear()
   }
 
   _captureTree (tree, fn) {

package/packages/dd-trace/src/encode/0.4.js

@@ -1,9 +1,8 @@
 'use strict'
 
+const getConfig = require('../config')
 const { MsgpackChunk, MsgpackEncoder } = require('../msgpack')
 const log = require('../log')
-const { isTrue } = require('../util')
-const { getValueFromEnvSources } = require('../config/helper')
 const { truncateSpan, normalizeSpan } = require('./tags-processors')
 
 const SOFT_LIMIT = 8 * 1024 * 1024 // 8MB
@@ -12,7 +11,7 @@ function formatSpan (span, config) {
   span = normalizeSpan(truncateSpan(span, false))
   if (span.span_events) {
     // ensure span events are encoded as tags if agent doesn't support native top level span events
-    if (config?.trace?.nativeSpanEvents) {
+    if (config.trace.nativeSpanEvents) {
       formatSpanEvents(span)
     } else {
       span.meta.events = JSON.stringify(span.span_events)
@@ -30,8 +29,8 @@ class AgentEncoder {
     this._stringBytes = new MsgpackChunk()
     this._writer = writer
     this._reset()
-    this._debugEncoding = isTrue(getValueFromEnvSources('DD_TRACE_ENCODING_DEBUG'))
-    this._config = this._writer?._config
+    this._config = getConfig()
+    this._debugEncoding = this._config.DD_TRACE_ENCODING_DEBUG
   }
 
   count () {

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

@@ -29,7 +29,7 @@ module.exports = function getExporter (name) {
         fs.existsSync(constants.DATADOG_LAMBDA_EXTENSION_PATH) ||
         fs.existsSync(constants.DATADOG_MINI_AGENT_PATH)
       )
-      return require(inAWSLambda && !usingAgent ? './exporters/log' : './exporters/agent')
+      return inAWSLambda && !usingAgent ? require('./exporters/log') : require('./exporters/agent')
     }
   }
 }

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

@@ -24,7 +24,6 @@ class AgentExporter {
       lookup,
       protocolVersion,
       headers,
-      config,
     })
 
     globalThis[Symbol.for('dd-trace')].beforeExitHandlers.add(this.flush.bind(this))

package/packages/dd-trace/src/exporters/agent/writer.js

@@ -20,14 +20,13 @@ class AgentWriter extends BaseWriter {
       ...args[0],
       beforeFirstFlush: () => firstFlushChannel.publish(),
     })
-    const { prioritySampler, lookup, protocolVersion, headers, config = {} } = args[0]
+    const { prioritySampler, lookup, protocolVersion, headers } = args[0]
     const AgentEncoder = getEncoder(protocolVersion)
 
     this._prioritySampler = prioritySampler
     this._lookup = lookup
     this._protocolVersion = protocolVersion
     this._headers = headers
-    this._config = config
     this._encoder = new AgentEncoder(this)
   }
 

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

@@ -1,6 +1,6 @@
 'use strict'
 
-const { getValueFromEnvSources } = require('../../config/helper')
+const getConfig = require('../../config')
 const log = require('../../log')
 const request = require('../common/request')
 const tracerVersion = require('../../../../../package.json').version
@@ -39,7 +39,7 @@ class AgentlessWriter extends BaseWriter {
       }
     }
 
-    if (!getValueFromEnvSources('DD_API_KEY')) {
+    if (!getConfig().apiKey) {
       this.#apiKeyMissing = true
       log.error('DD_API_KEY is required for agentless trace intake. Set DD_API_KEY. Traces will not be sent.')
     }
@@ -108,7 +108,7 @@ class AgentlessWriter extends BaseWriter {
       return
     }
 
-    const apiKey = getValueFromEnvSources('DD_API_KEY')
+    const apiKey = getConfig().apiKey
     if (!apiKey) {
       if (!this.#apiKeyMissing) {
         this.#apiKeyMissing = true

package/packages/dd-trace/src/exporters/common/util.js

@@ -1,12 +1,12 @@
 'use strict'
 
-const { getValueFromEnvSources } = require('../../config/helper')
+const getConfig = require('../../config')
 
 function safeJSONStringify (value) {
   return JSON.stringify(
     value,
     (key, value) => key === 'dd-api-key' ? undefined : value,
-    getValueFromEnvSources('DD_TRACE_BEAUTIFUL_LOGS') ? 2 : undefined
+    getConfig().DD_TRACE_BEAUTIFUL_LOGS ? 2 : undefined
   )
 }
 

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

@@ -8,7 +8,7 @@ class GitMetadataTagger {
   }
 
   tagGitMetadata (spanContext) {
-    if (this._config.gitMetadataEnabled) {
+    if (this._config.DD_TRACE_GIT_METADATA_ENABLED) {
       // These tags are added only to the local root span
       spanContext._trace.tags[SCI_COMMIT_SHA] = this._config.commitSHA
       spanContext._trace.tags[SCI_REPOSITORY_URL] = this._config.repositoryUrl

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

@@ -245,3 +245,5 @@ function writeUInt32BE (buffer, value, offset) {
 module.exports = function createIdentifier (value, radix) {
   return new Identifier(value ?? '', radix)
 }
+
+module.exports.Identifier = Identifier

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

@@ -1,7 +1,7 @@
 'use strict'
 
 const { getValueFromEnvSources } = require('./config/helper')
-const { isFalse, isTrue } = require('./util')
+const { isFalse } = require('./util')
 
 // Global `jest` is only present in Jest workers.
 const inJestWorker = typeof jest !== 'undefined'
@@ -9,10 +9,7 @@ const inJestWorker = typeof jest !== 'undefined'
 const ddTraceDisabled = getValueFromEnvSources('DD_TRACE_ENABLED')
   ? isFalse(getValueFromEnvSources('DD_TRACE_ENABLED'))
   : String(getValueFromEnvSources('OTEL_TRACES_EXPORTER')).toLowerCase() === 'none'
-const shouldUseProxyWhenTracingDisabled =
-  isTrue(getValueFromEnvSources('DD_DYNAMIC_INSTRUMENTATION_ENABLED')) ||
-  isTrue(getValueFromEnvSources('DD_EXPERIMENTAL_APPSEC_STANDALONE_ENABLED'))
 
-module.exports = (ddTraceDisabled && !shouldUseProxyWhenTracingDisabled) || inJestWorker
+module.exports = ddTraceDisabled || inJestWorker
   ? require('./noop/proxy')
   : require('./proxy')

package/packages/dd-trace/src/lambda/handler.js

@@ -3,7 +3,6 @@
 const log = require('../log')
 const { channel } = require('../../../datadog-instrumentations/src/helpers/instrument')
 const { ERROR_MESSAGE, ERROR_TYPE } = require('../constants')
-const { getValueFromEnvSources } = require('../config/helper')
 const { ImpendingTimeout } = require('./runtime/errors')
 const { extractContext } = require('./context')
 
@@ -27,8 +26,7 @@ let __lambdaTimeout
 function checkTimeout (context) {
   const remainingTimeInMillis = context.getRemainingTimeInMillis()
 
-  let apmFlushDeadline = Number.parseInt(getValueFromEnvSources('DD_APM_FLUSH_DEADLINE_MILLISECONDS')) || 100
-  apmFlushDeadline = apmFlushDeadline < 0 ? 100 : apmFlushDeadline
+  const apmFlushDeadline = tracer._config.DD_APM_FLUSH_DEADLINE_MILLISECONDS
 
   __lambdaTimeout = setTimeout(() => {
     timeoutChannel.publish()

package/packages/dd-trace/src/llmobs/constants/tags.js

@@ -16,6 +16,9 @@ module.exports = {
   NAME: '_ml_obs.name',
   TRACE_ID: '_ml_obs.trace_id',
   PROPAGATED_TRACE_ID_KEY: '_dd.p.llmobs_trace_id',
+  LLMOBS_TRACE_ID_BRIDGE_KEY: 'llmobs_trace_id',
+  LLMOBS_PARENT_ID_BRIDGE_KEY: 'llmobs_parent_id',
+  LLMOBS_SUBMITTED_TAG_KEY: '_dd.llmobs.submitted',
   ROOT_PARENT_ID: 'undefined',
   DEFAULT_PROMPT_NAME: 'unnamed-prompt',
   INTERNAL_CONTEXT_VARIABLE_KEYS: '_dd_context_variable_keys',