dd-trace 5.98.0 → 5.99.1

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

@@ -48,8 +48,6 @@ export interface GeneratedConfig {
   baggageMaxBytes: number;
   baggageMaxItems: number;
   baggageTagKeys: string[];
-  ciVisAgentlessLogSubmissionEnabled: boolean;
-  ciVisibilityTestSessionName: string | undefined;
   clientIpEnabled: boolean;
   clientIpHeader: string | undefined;
   cloudPayloadTagging: {
@@ -73,16 +71,18 @@ export interface GeneratedConfig {
   };
   dbmPropagationMode: string;
   DD_ACTION_EXECUTION_ID: string | undefined;
+  DD_AGENTLESS_LOG_SUBMISSION_ENABLED: boolean;
   DD_AGENTLESS_LOG_SUBMISSION_URL: string | undefined;
   DD_APM_FLUSH_DEADLINE_MILLISECONDS: number;
   DD_AZURE_RESOURCE_GROUP: string | undefined;
   DD_CIVISIBILITY_AGENTLESS_ENABLED: boolean;
   DD_CIVISIBILITY_AGENTLESS_URL: string | undefined;
-  DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER: boolean;
+  DD_CIVISIBILITY_AUTO_INSTRUMENTATION_PROVIDER: string | undefined;
   DD_CIVISIBILITY_DANGEROUSLY_FORCE_COVERAGE: boolean;
   DD_CIVISIBILITY_DANGEROUSLY_FORCE_TEST_SKIPPING: boolean;
   DD_CIVISIBILITY_ENABLED: boolean;
   DD_CIVISIBILITY_GIT_UNSHALLOW_ENABLED: boolean;
+  DD_CIVISIBILITY_MANUAL_API_ENABLED: boolean;
   DD_CIVISIBILITY_RUM_FLUSH_WAIT_MILLIS: number;
   DD_CIVISIBILITY_TEST_COMMAND: string | undefined;
   DD_CIVISIBILITY_TEST_MODULE_ID: string | undefined;
@@ -111,8 +111,12 @@ export interface GeneratedConfig {
   DD_GIT_PULL_REQUEST_BASE_BRANCH_SHA: string | undefined;
   DD_GIT_REPOSITORY_URL: string | undefined;
   DD_GIT_TAG: string | undefined;
+  DD_INJECT_FORCE: boolean;
+  DD_INJECTION_ENABLED: string | undefined;
+  DD_INSTRUMENTATION_CONFIG_ID: string | undefined;
   DD_INTERNAL_PROFILING_TIMELINE_SAMPLING_ENABLED: boolean;
   DD_LAMBDA_HANDLER: string | undefined;
+  DD_LOGS_OTEL_ENABLED: boolean;
   DD_MINI_AGENT_PATH: string | undefined;
   DD_PIPELINE_EXECUTION_ID: string | undefined;
   DD_PLAYWRIGHT_WORKER: string | undefined;
@@ -147,6 +151,8 @@ export interface GeneratedConfig {
   DD_TELEMETRY_FORWARDER_PATH: string | undefined;
   DD_TEST_FLEET_CONFIG_PATH: string | undefined;
   DD_TEST_LOCAL_CONFIG_PATH: string | undefined;
+  DD_TEST_SESSION_NAME: string | undefined;
+  DD_TEST_TIA_KEEP_COV_CONFIG: boolean;
   DD_TRACE_AEROSPIKE_ENABLED: boolean;
   DD_TRACE_AI_ENABLED: boolean;
   DD_TRACE_AMQP10_ENABLED: boolean;
@@ -239,11 +245,13 @@ export interface GeneratedConfig {
   DD_TRACE_FS_ENABLED: boolean;
   DD_TRACE_GCP_PUBSUB_PUSH_ENABLED: boolean;
   DD_TRACE_GENERIC_POOL_ENABLED: boolean;
+  DD_TRACE_GIT_METADATA_ENABLED: boolean;
   DD_TRACE_GOOGLE_CLOUD_PUBSUB_ENABLED: boolean;
   DD_TRACE_GOOGLE_CLOUD_VERTEXAI_ENABLED: boolean;
   DD_TRACE_GOOGLE_GAX_ENABLED: boolean;
   DD_TRACE_GOOGLE_GENAI_ENABLED: boolean;
   DD_TRACE_GRAPHQL_ENABLED: boolean;
+  DD_TRACE_GRAPHQL_ERROR_EXTENSIONS: string[];
   DD_TRACE_GRAPHQL_TAG_ENABLED: boolean;
   DD_TRACE_GRAPHQL_TOOLS_ENABLED: boolean;
   DD_TRACE_GRAPHQL_TOOLS_EXECUTOR_ENABLED: boolean;
@@ -292,11 +300,13 @@ export interface GeneratedConfig {
   DD_TRACE_LODASH_ENABLED: boolean;
   DD_TRACE_LOOPBACK_ENABLED: boolean;
   DD_TRACE_MARIADB_ENABLED: boolean;
+  DD_TRACE_MEMCACHED_COMMAND_ENABLED: boolean;
   DD_TRACE_MEMCACHED_ENABLED: boolean;
   DD_TRACE_MICROGATEWAY_CORE_ENABLED: boolean;
   DD_TRACE_MIDDIE_ENABLED: boolean;
   DD_TRACE_MOCHA_EACH_ENABLED: boolean;
   DD_TRACE_MOCHA_ENABLED: boolean;
+  DD_TRACE_MODELCONTEXTPROTOCOL_SDK_ENABLED: boolean;
   DD_TRACE_MOLECULER_ENABLED: boolean;
   DD_TRACE_MONGODB_CORE_ENABLED: boolean;
   DD_TRACE_MONGODB_ENABLED: boolean;
@@ -334,6 +344,7 @@ export interface GeneratedConfig {
   DD_TRACE_PROCESS_ENABLED: boolean;
   DD_TRACE_PROMISE_ENABLED: boolean;
   DD_TRACE_PROMISE_JS_ENABLED: boolean;
+  DD_TRACE_PROPAGATION_EXTRACT_FIRST: boolean;
   DD_TRACE_PROPAGATION_STYLE: string[];
   DD_TRACE_PROTOBUFJS_ENABLED: boolean;
   DD_TRACE_PUG_ENABLED: boolean;
@@ -351,6 +362,7 @@ export interface GeneratedConfig {
   DD_TRACE_SEQUELIZE_ENABLED: boolean;
   DD_TRACE_SHAREDB_ENABLED: boolean;
   DD_TRACE_SMITHY_SMITHY_CLIENT_ENABLED: boolean;
+  DD_TRACE_SPAN_LEAK_DEBUG: number;
   DD_TRACE_SQLITE3_ENABLED: boolean;
   DD_TRACE_SUFFIXPLUGIN_ENABLED: boolean;
   DD_TRACE_TAGS: Record<string, string> | undefined;
@@ -364,6 +376,7 @@ export interface GeneratedConfig {
   DD_TRACE_WINSTON_ENABLED: boolean;
   DD_TRACE_WORKERPOOL_ENABLED: boolean;
   DD_TRACE_WS_ENABLED: boolean;
+  DD_TRACE_X_DATADOG_TAGS_MAX_LENGTH: number;
   DD_VITEST_WORKER: string | undefined;
   dogstatsd: {
     hostname: string;
@@ -404,8 +417,6 @@ export interface GeneratedConfig {
   flakyTestRetriesCount: number;
   flushInterval: number;
   flushMinSpans: number;
-  gitMetadataEnabled: boolean;
-  graphqlErrorExtensions: string[];
   grpc: {
     client: {
       error: {
@@ -442,21 +453,16 @@ export interface GeneratedConfig {
     telemetryVerbosity: string;
   };
   inferredProxyServicesEnabled: boolean;
-  injectForce: boolean;
-  injectionEnabled: string | undefined;
   installSignature: {
     id: string | undefined;
     time: string | undefined;
     type: string | undefined;
   };
-  instrumentation_config_id: string | undefined;
   isEarlyFlakeDetectionEnabled: boolean;
   isFlakyTestRetriesEnabled: boolean;
   isGitUploadEnabled: boolean;
   isImpactedTestsEnabled: boolean;
   isIntelligentTestRunnerEnabled: boolean;
-  isKeepingCoverageConfiguration: boolean;
-  isManualApiEnabled: boolean;
   isTestDynamicInstrumentationEnabled: boolean;
   isTestManagementEnabled: boolean;
   langchain: {
@@ -471,43 +477,41 @@ export interface GeneratedConfig {
   };
   logInjection: boolean;
   logLevel: "debug" | "info" | "warn" | "error";
-  memcachedCommandEnabled: boolean;
   middlewareTracingEnabled: boolean;
   openai: {
     spanCharLimit: number;
   };
   openAiLogsEnabled: boolean;
+  OTEL_BSP_MAX_EXPORT_BATCH_SIZE: number;
+  OTEL_BSP_MAX_QUEUE_SIZE: number;
+  OTEL_BSP_SCHEDULE_DELAY: number;
   OTEL_EXPORTER_OTLP_ENDPOINT: string | undefined;
+  OTEL_EXPORTER_OTLP_HEADERS: Record<string, string> | undefined;
+  OTEL_EXPORTER_OTLP_LOGS_ENDPOINT: string;
+  OTEL_EXPORTER_OTLP_LOGS_HEADERS: Record<string, string> | undefined;
+  OTEL_EXPORTER_OTLP_LOGS_PROTOCOL: string;
+  OTEL_EXPORTER_OTLP_LOGS_TIMEOUT: number;
+  OTEL_EXPORTER_OTLP_METRICS_ENDPOINT: string;
+  OTEL_EXPORTER_OTLP_METRICS_HEADERS: Record<string, string> | undefined;
+  OTEL_EXPORTER_OTLP_METRICS_PROTOCOL: string;
+  OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE: "DELTA" | "CUMULATIVE" | "LOWMEMORY";
+  OTEL_EXPORTER_OTLP_METRICS_TIMEOUT: number;
+  OTEL_EXPORTER_OTLP_PROTOCOL: string;
+  OTEL_EXPORTER_OTLP_TIMEOUT: number;
+  OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: string;
+  OTEL_EXPORTER_OTLP_TRACES_HEADERS: Record<string, string> | undefined;
+  OTEL_EXPORTER_OTLP_TRACES_PROTOCOL: "http/json";
+  OTEL_EXPORTER_OTLP_TRACES_TIMEOUT: number;
   OTEL_LOGS_EXPORTER: "none" | "otlp" | undefined;
+  OTEL_METRIC_EXPORT_INTERVAL: number;
+  OTEL_METRIC_EXPORT_TIMEOUT: number;
   OTEL_METRICS_EXPORTER: "none" | "otlp" | undefined;
   OTEL_RESOURCE_ATTRIBUTES: Record<string, string>;
   OTEL_SDK_DISABLED: boolean;
-  OTEL_TRACES_EXPORTER: "none" | "otlp";
+  OTEL_TRACES_EXPORTER: "none" | "otlp" | undefined;
   OTEL_TRACES_SAMPLER: "always_on" | "always_off" | "traceidratio" | "parentbased_always_on" | "parentbased_always_off" | "parentbased_traceidratio";
   OTEL_TRACES_SAMPLER_ARG: number | undefined;
-  otelBatchTimeout: number;
-  otelHeaders: string | undefined;
-  otelLogsEnabled: boolean;
-  otelLogsHeaders: string | undefined;
-  otelLogsProtocol: string;
-  otelLogsTimeout: number;
-  otelLogsUrl: string | undefined;
-  otelMaxExportBatchSize: number;
-  otelMaxQueueSize: number;
   otelMetricsEnabled: boolean;
-  otelMetricsExportInterval: number;
-  otelMetricsExportTimeout: number;
-  otelMetricsHeaders: string | undefined;
-  otelMetricsProtocol: string;
-  otelMetricsTemporalityPreference: "DELTA" | "CUMULATIVE" | "LOWMEMORY";
-  otelMetricsTimeout: number;
-  otelMetricsUrl: string | undefined;
-  otelProtocol: string;
-  otelTimeout: number;
-  otelTracesHeaders: Record<string, string> | undefined;
-  otelTracesProtocol: string;
-  otelTracesTimeout: number;
-  otelTracesUrl: string | undefined;
   peerServiceMapping: Record<string, string>;
   port: string | number;
   profiling: {
@@ -536,12 +540,11 @@ export interface GeneratedConfig {
   sampleRate: number | undefined;
   samplingRules: import('../../../../index').SamplingRule[];
   scope: string | undefined;
-  service: string | undefined;
+  service: string;
   serviceMapping: Record<string, string>;
   site: string;
   spanAttributeSchema: "v0" | "v1";
   spanComputePeerService: boolean;
-  spanLeakDebug: number;
   spanRemoveIntegrationFromService: boolean;
   spanSamplingRules: import('../../../../index').SpanSamplingRule[] | undefined;
   startupLogs: boolean;
@@ -549,7 +552,6 @@ export interface GeneratedConfig {
     enabled: boolean;
   };
   tags: Record<string, string>;
-  tagsHeaderMaxLength: number;
   telemetry: {
     debug: boolean;
     dependencyCollection: boolean;
@@ -572,7 +574,6 @@ export interface GeneratedConfig {
   traceId128BitGenerationEnabled: boolean;
   traceId128BitLoggingEnabled: boolean;
   tracePropagationBehaviorExtract: "continue" | "restart" | "ignore";
-  tracePropagationExtractFirst: boolean;
   tracePropagationStyle: {
     extract: string[];
     inject: string[];

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

@@ -131,7 +131,13 @@ function setAndTrack (config, name, value, rawValue = value, source = 'calculate
     }
     changeTracker[source].add(name)
   } else {
-    const copy = typeof value === 'object' && value !== null ? rfdc(value) : value
+    // Programmatic-only options (e.g. logger, lookup, plugins) have no row in
+    // `configurationsTable` and hold opaque user-supplied references that may
+    // carry cycles or non-plain prototypes — for example a winston Logger
+    // extends a Transform stream. Use a reference for these instead of cloning.
+    const copy = typeof value === 'object' && value !== null && name in configurationsTable
+      ? rfdc(value)
+      : value
     changeTracker.baseValuesByPath[name] = { value: copy, source }
   }
   set(config, name, value)
@@ -208,7 +214,7 @@ class Config extends ConfigBase {
 
     warnWrongOtelSettings()
 
-    if (this.gitMetadataEnabled) {
+    if (this.DD_TRACE_GIT_METADATA_ENABLED) {
       this.#loadGitMetadata()
     }
 
@@ -349,7 +355,7 @@ class Config extends ConfigBase {
     }
     // Disable log injection when OTEL logs are enabled
     // OTEL logs and DD log injection are mutually exclusive
-    if (this.otelLogsEnabled) {
+    if (this.DD_LOGS_OTEL_ENABLED) {
       setAndTrack(this, 'logInjection', false)
     }
     if (this.otelMetricsEnabled &&
@@ -358,21 +364,9 @@ class Config extends ConfigBase {
       setAndTrack(this, 'otelMetricsEnabled', false)
     }
 
-    const otelTracesEnabled = trackedConfigOrigins.has('OTEL_TRACES_EXPORTER') &&
-      this.OTEL_TRACES_EXPORTER === 'otlp'
-    if (this.protocolVersion && this.protocolVersion !== '0.4' && otelTracesEnabled) {
+    if (this.OTEL_TRACES_EXPORTER === 'otlp' && this.protocolVersion && this.protocolVersion !== '0.4') {
       log.warn('DD_TRACE_AGENT_PROTOCOL_VERSION is set, disabling OTLP traces export')
-      setAndTrack(this, 'otelTracesEnabled', false)
-    } else {
-      setAndTrack(this, 'otelTracesEnabled', otelTracesEnabled)
-    }
-
-    if (this.otelTracesProtocol && this.otelTracesProtocol !== 'http/json') {
-      log.warn(
-        'OTEL_EXPORTER_OTLP_TRACES_PROTOCOL=%s is not yet supported; only http/json is currently implemented',
-        this.otelTracesProtocol
-      )
-      setAndTrack(this, 'otelTracesProtocol', 'http/json')
+      setAndTrack(this, 'OTEL_TRACES_EXPORTER', 'none')
     }
 
     if (this.telemetry.heartbeatInterval) {
@@ -433,7 +427,7 @@ class Config extends ConfigBase {
       ))
     }
 
-    if (this.injectionEnabled) {
+    if (this.DD_INJECTION_ENABLED) {
       setAndTrack(this, 'instrumentationSource', 'ssi')
     }
 
@@ -441,16 +435,13 @@ class Config extends ConfigBase {
       setAndTrack(this, 'runtimeMetrics.enabled', false)
     }
 
-    if (!trackedConfigOrigins.has('sampleRate')) {
-      const effectiveSampler = (trackedConfigOrigins.has('OTEL_TRACES_EXPORTER') &&
-        this.OTEL_TRACES_EXPORTER === 'otlp' &&
-        !trackedConfigOrigins.has('OTEL_TRACES_SAMPLER'))
-        ? 'parentbased_always_on'
-        : this.OTEL_TRACES_SAMPLER
-      if (effectiveSampler && (trackedConfigOrigins.has('OTEL_TRACES_SAMPLER') ||
-          trackedConfigOrigins.has('OTEL_TRACES_EXPORTER'))) {
-        setAndTrack(this, 'sampleRate', getFromOtelSamplerMap(effectiveSampler, this.OTEL_TRACES_SAMPLER_ARG))
-      }
+    // Apply the OTel sampler when the user opted into OTel traces or explicitly set the sampler.
+    // OTEL_TRACES_SAMPLER has `default: parentbased_always_on` (per OTel spec), so opt-in users
+    // that don't set the sampler still get parent-based sampling.
+    if (!trackedConfigOrigins.has('sampleRate') &&
+        (trackedConfigOrigins.has('OTEL_TRACES_SAMPLER') || this.OTEL_TRACES_EXPORTER === 'otlp')) {
+      setAndTrack(this, 'sampleRate',
+        getFromOtelSamplerMap(this.OTEL_TRACES_SAMPLER, this.OTEL_TRACES_SAMPLER_ARG))
     }
 
     if (this.DD_SPAN_SAMPLING_RULES_FILE) {
@@ -605,19 +596,18 @@ class Config extends ConfigBase {
       }
     }
 
-    const DEFAULT_OTLP_PORT = '4318'
-    if (!this.otelLogsUrl) {
-      setAndTrack(this, 'otelLogsUrl', `http://${agentHostname}:${DEFAULT_OTLP_PORT}`)
+    // TODO: This could likely be moved to the base class and allow easier GRPC handling
+    // Default OTLP endpoints follow the configured agent host so users who point DD at a custom
+    // agent (DD_AGENT_HOST / DD_TRACE_AGENT_URL) also reach OTLP on that host.
+    const defaultOtlpBase = this.OTEL_EXPORTER_OTLP_ENDPOINT?.replace(/\/$/, '') ?? `http://${agentHostname}:4318`
+    if (!this.OTEL_EXPORTER_OTLP_LOGS_ENDPOINT) {
+      setAndTrack(this, 'OTEL_EXPORTER_OTLP_LOGS_ENDPOINT', `${defaultOtlpBase}/v1/logs`)
     }
-    if (!this.otelMetricsUrl) {
-      setAndTrack(this, 'otelMetricsUrl', `http://${agentHostname}:${DEFAULT_OTLP_PORT}/v1/metrics`)
+    if (!this.OTEL_EXPORTER_OTLP_METRICS_ENDPOINT) {
+      setAndTrack(this, 'OTEL_EXPORTER_OTLP_METRICS_ENDPOINT', `${defaultOtlpBase}/v1/metrics`)
     }
-    if (!trackedConfigOrigins.has('otelTracesUrl') && this.OTEL_EXPORTER_OTLP_ENDPOINT) {
-      // Generic OTLP endpoint: per spec, append /v1/traces signal-specific subpath
-      setAndTrack(this, 'otelTracesUrl', this.OTEL_EXPORTER_OTLP_ENDPOINT.replace(/\/$/, '') + '/v1/traces')
-    } else if (!this.otelTracesUrl) {
-      const tracesHostname = agentHostname === '127.0.0.1' ? 'localhost' : agentHostname
-      setAndTrack(this, 'otelTracesUrl', `http://${tracesHostname}:${DEFAULT_OTLP_PORT}/v1/traces`)
+    if (!this.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT) {
+      setAndTrack(this, 'OTEL_EXPORTER_OTLP_TRACES_ENDPOINT', `${defaultOtlpBase}/v1/traces`)
     }
 
     if (process.platform === 'win32') {

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

@@ -13,6 +13,15 @@ const VALID_PROPAGATION_STYLES = new Set([
   'datadog', 'tracecontext', 'b3', 'b3 single header', 'b3multi', 'baggage', 'none',
 ])
 
+const RENAMED_OTEL_TAGS = new Map(
+  [
+    ['deployment.environment.name', 'env'],
+    ['deployment.environment', 'env'],
+    ['service.name', 'service'],
+    ['service.version', 'version'],
+  ]
+)
+
 function toCase (value, methodName) {
   if (Array.isArray(value)) {
     return value.map(item => {
@@ -66,12 +75,12 @@ const transformers = {
     }
     return value
   },
-  parseOtelTags (value, optionName) {
-    return parsers.MAP(value
-      ?.replace(/(^|,)deployment\.environment=/, '$1env:')
-      .replace(/(^|,)service\.name=/, '$1service:')
-      .replace(/(^|,)service\.version=/, '$1version:')
-      .replaceAll('=', ':'), optionName)
+  parseOtelTags (object) {
+    const tags = {}
+    for (const [key, value] of Object.entries(object)) {
+      tags[RENAMED_OTEL_TAGS.get(key) ?? key] = value
+    }
+    return tags
   },
   normalizeProfilingEnabled (configValue) {
     if (configValue == null) {
@@ -225,11 +234,19 @@ const parsers = {
     if (!raw) {
       return entries
     }
-    // DD_TAGS is a special case. It may be a map of key-value pairs separated by spaces.
-    if (optionName === 'DD_TAGS' && !raw.includes(',')) {
+    let valueSeparator = ':'
+    if (optionName.startsWith('OTEL_')) {
+      // OTEL spec uses `key=value,key=value`
+      // (https://opentelemetry.io/docs/specs/otel/protocol/exporter/#specifying-headers-via-environment-variables),
+      // while DD uses `key:value,key:value`. Parse OTEL-prefixed options with `=` so downstream code
+      // receives a proper map and telemetry reports the parsed entries. The char-by-char loop
+      // avoids the allocations that `split(',')` + `indexOf('=')` do per pair.
+      valueSeparator = '='
+    } else if (optionName === 'DD_TAGS' && !raw.includes(',')) {
+      // DD_TAGS is a special case. It may be a map of key-value pairs separated by spaces.
       raw = raw.replaceAll(/\s+/g, ',')
     }
-    tagger.add(entries, raw)
+    tagger.add(entries, raw, valueSeparator)
     return entries
   },
   JSON (raw) {