dd-trace 5.99.0 → 5.100.0

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

@@ -5,7 +5,6 @@ export interface GeneratedConfig {
   _DD_APM_TRACING_AGENTLESS_ENABLED: boolean;
   apiKey: string | undefined;
   apmTracingEnabled: boolean;
-  appKey: string | undefined;
   appsec: {
     apiSecurity: {
       downstreamBodyAnalysisSampleRate: number;
@@ -48,8 +47,6 @@ export interface GeneratedConfig {
   baggageMaxBytes: number;
   baggageMaxItems: number;
   baggageTagKeys: string[];
-  ciVisAgentlessLogSubmissionEnabled: boolean;
-  ciVisibilityTestSessionName: string | undefined;
   clientIpEnabled: boolean;
   clientIpHeader: string | undefined;
   cloudPayloadTagging: {
@@ -65,16 +62,15 @@ export interface GeneratedConfig {
       };
     };
   };
-  crashtracking: {
-    enabled: boolean;
-  };
   dbm: {
     injectSqlBaseHash: boolean;
   };
   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_APP_KEY: string | undefined;
   DD_AZURE_RESOURCE_GROUP: string | undefined;
   DD_CIVISIBILITY_AGENTLESS_ENABLED: boolean;
   DD_CIVISIBILITY_AGENTLESS_URL: string | undefined;
@@ -83,13 +79,16 @@ export interface GeneratedConfig {
   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;
   DD_CIVISIBILITY_TEST_SESSION_ID: string | undefined;
+  DD_CRASHTRACKING_ENABLED: boolean;
   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_ENABLED: boolean;
   DD_EXPERIMENTAL_TEST_OPT_SETTINGS_CACHE: string;
@@ -111,8 +110,22 @@ export interface GeneratedConfig {
   DD_GIT_PULL_REQUEST_BASE_BRANCH_SHA: string | undefined;
   DD_GIT_REPOSITORY_URL: string | undefined;
   DD_GIT_TAG: string | undefined;
+  DD_GRPC_CLIENT_ERROR_STATUSES: number[];
+  DD_GRPC_SERVER_ERROR_STATUSES: number[];
+  DD_HEAP_SNAPSHOT_COUNT: number;
+  DD_HEAP_SNAPSHOT_DESTINATION: string;
+  DD_HEAP_SNAPSHOT_INTERVAL: number;
+  DD_INJECT_FORCE: boolean;
+  DD_INJECTION_ENABLED: string | undefined;
+  DD_INSTRUMENTATION_CONFIG_ID: string | undefined;
+  DD_INSTRUMENTATION_INSTALL_ID: string | undefined;
+  DD_INSTRUMENTATION_INSTALL_TIME: string | undefined;
+  DD_INSTRUMENTATION_INSTALL_TYPE: string | undefined;
+  DD_INTERNAL_PROFILING_LONG_LIVED_THRESHOLD: number;
   DD_INTERNAL_PROFILING_TIMELINE_SAMPLING_ENABLED: boolean;
   DD_LAMBDA_HANDLER: string | undefined;
+  DD_LOGS_OTEL_ENABLED: boolean;
+  DD_METRICS_OTEL_ENABLED: boolean;
   DD_MINI_AGENT_PATH: string | undefined;
   DD_PIPELINE_EXECUTION_ID: string | undefined;
   DD_PLAYWRIGHT_WORKER: string | undefined;
@@ -147,6 +160,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;
@@ -160,6 +175,7 @@ export interface GeneratedConfig {
   DD_TRACE_APOLLO_SERVER_FASTIFY_ENABLED: boolean;
   DD_TRACE_APOLLO_SUBGRAPH_ENABLED: boolean;
   DD_TRACE_AVSC_ENABLED: boolean;
+  DD_TRACE_AWS_ADD_SPAN_POINTERS: boolean;
   DD_TRACE_AWS_SDK_AWS_BATCH_PROPAGATION_ENABLED: boolean;
   DD_TRACE_AWS_SDK_AWS_ENABLED: boolean;
   DD_TRACE_AWS_SDK_BATCH_PROPAGATION_ENABLED: boolean;
@@ -223,6 +239,7 @@ export interface GeneratedConfig {
   DD_TRACE_DISABLED_INSTRUMENTATIONS: string;
   DD_TRACE_DISABLED_PLUGINS: string | undefined;
   DD_TRACE_DNS_ENABLED: boolean;
+  DD_TRACE_DYNAMODB_TABLE_PRIMARY_KEYS: string | undefined;
   DD_TRACE_ELASTIC_ELASTICSEARCH_ENABLED: boolean;
   DD_TRACE_ELASTIC_TRANSPORT_ENABLED: boolean;
   DD_TRACE_ELASTICSEARCH_ENABLED: boolean;
@@ -239,11 +256,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,6 +311,7 @@ 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;
@@ -307,6 +327,7 @@ export interface GeneratedConfig {
   DD_TRACE_MULTER_ENABLED: boolean;
   DD_TRACE_MYSQL_ENABLED: boolean;
   DD_TRACE_MYSQL2_ENABLED: boolean;
+  DD_TRACE_NATIVE_SPAN_EVENTS: boolean;
   DD_TRACE_NET_ENABLED: boolean;
   DD_TRACE_NEXT_ENABLED: boolean;
   DD_TRACE_NODE_CHILD_PROCESS_ENABLED: boolean;
@@ -335,6 +356,8 @@ export interface GeneratedConfig {
   DD_TRACE_PROCESS_ENABLED: boolean;
   DD_TRACE_PROMISE_ENABLED: boolean;
   DD_TRACE_PROMISE_JS_ENABLED: boolean;
+  DD_TRACE_PROPAGATION_BEHAVIOR_EXTRACT: "continue" | "restart" | "ignore";
+  DD_TRACE_PROPAGATION_EXTRACT_FIRST: boolean;
   DD_TRACE_PROPAGATION_STYLE: string[];
   DD_TRACE_PROTOBUFJS_ENABLED: boolean;
   DD_TRACE_PUG_ENABLED: boolean;
@@ -352,6 +375,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;
@@ -365,6 +389,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;
@@ -405,26 +430,7 @@ export interface GeneratedConfig {
   flakyTestRetriesCount: number;
   flushInterval: number;
   flushMinSpans: number;
-  gitMetadataEnabled: boolean;
-  graphqlErrorExtensions: string[];
-  grpc: {
-    client: {
-      error: {
-        statuses: number[];
-      };
-    };
-    server: {
-      error: {
-        statuses: number[];
-      };
-    };
-  };
   headerTags: string[];
-  heapSnapshot: {
-    count: number;
-    destination: string;
-    interval: number;
-  };
   hostname: string;
   iast: {
     dbRowsToTaint: number;
@@ -443,21 +449,11 @@ 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: {
@@ -472,51 +468,44 @@ 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" | 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;
-  otelLogsEnabled: boolean;
-  otelLogsProtocol: string;
-  otelLogsTimeout: number;
-  otelLogsUrl: string;
-  otelMaxExportBatchSize: number;
-  otelMaxQueueSize: number;
-  otelMetricsEnabled: boolean;
-  otelMetricsExportInterval: number;
-  otelMetricsExportTimeout: number;
-  otelMetricsProtocol: string;
-  otelMetricsTemporalityPreference: "DELTA" | "CUMULATIVE" | "LOWMEMORY";
-  otelMetricsTimeout: number;
-  otelMetricsUrl: string;
-  otelProtocol: string;
-  otelTimeout: number;
   peerServiceMapping: Record<string, string>;
   port: string | number;
   profiling: {
     enabled: 'true' | 'false' | 'auto';
-    longLivedThreshold: number;
-  };
-  propagateProcessTags: {
-    enabled: boolean;
   };
   protocolVersion: string;
   queryStringObfuscation: string;
@@ -542,7 +531,6 @@ export interface GeneratedConfig {
   site: string;
   spanAttributeSchema: "v0" | "v1";
   spanComputePeerService: boolean;
-  spanLeakDebug: number;
   spanRemoveIntegrationFromService: boolean;
   spanSamplingRules: import('../../../../index').SpanSamplingRule[] | undefined;
   startupLogs: boolean;
@@ -550,7 +538,6 @@ export interface GeneratedConfig {
     enabled: boolean;
   };
   tags: Record<string, string>;
-  tagsHeaderMaxLength: number;
   telemetry: {
     debug: boolean;
     dependencyCollection: boolean;
@@ -561,19 +548,8 @@ export interface GeneratedConfig {
     metrics: boolean;
   };
   testManagementAttemptToFixRetries: number;
-  trace: {
-    aws: {
-      addSpanPointers: boolean;
-    };
-    dynamoDb: {
-      tablePrimaryKeys: string | undefined;
-    };
-    nativeSpanEvents: boolean;
-  };
   traceId128BitGenerationEnabled: boolean;
   traceId128BitLoggingEnabled: boolean;
-  tracePropagationBehaviorExtract: "continue" | "restart" | "ignore";
-  tracePropagationExtractFirst: boolean;
   tracePropagationStyle: {
     extract: string[];
     inject: string[];

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

@@ -39,6 +39,7 @@ const {
   parseErrors,
   generateTelemetry,
 } = require('./defaults')
+const { normalizeService } = require('./normalize-service')
 const { transformers } = require('./parsers')
 
 const RUNTIME_ID = uuid()
@@ -214,7 +215,7 @@ class Config extends ConfigBase {
 
     warnWrongOtelSettings()
 
-    if (this.gitMetadataEnabled) {
+    if (this.DD_TRACE_GIT_METADATA_ENABLED) {
       this.#loadGitMetadata()
     }
 
@@ -355,13 +356,13 @@ 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 &&
+    if (this.DD_METRICS_OTEL_ENABLED &&
         trackedConfigOrigins.has('OTEL_METRICS_EXPORTER') &&
         this.OTEL_METRICS_EXPORTER === 'none') {
-      setAndTrack(this, 'otelMetricsEnabled', false)
+      setAndTrack(this, 'DD_METRICS_OTEL_ENABLED', false)
     }
 
     if (this.OTEL_TRACES_EXPORTER === 'otlp' && this.protocolVersion && this.protocolVersion !== '0.4') {
@@ -427,7 +428,7 @@ class Config extends ConfigBase {
       ))
     }
 
-    if (this.injectionEnabled) {
+    if (this.DD_INJECTION_ENABLED) {
       setAndTrack(this, 'instrumentationSource', 'ssi')
     }
 
@@ -513,7 +514,7 @@ class Config extends ConfigBase {
         const NX_TASK_TARGET_PROJECT = getEnvironmentVariable('NX_TASK_TARGET_PROJECT')
         if (NX_TASK_TARGET_PROJECT) {
           if (this.DD_ENABLE_NX_SERVICE_NAME) {
-            setAndTrack(this, 'service', NX_TASK_TARGET_PROJECT)
+            setAndTrack(this, 'service', normalizeService(NX_TASK_TARGET_PROJECT) || 'node')
             isServiceNameInferred = true
           } else if (DD_MAJOR < 6) {
             log.warn(
@@ -536,7 +537,7 @@ class Config extends ConfigBase {
             )
           : undefined
 
-        setAndTrack(this, 'service', serverlessName || pkg.name || 'node')
+        setAndTrack(this, 'service', normalizeService(serverlessName) || normalizeService(pkg.name) || 'node')
         this.tags.service ??= /** @type {string} */ (this.service)
         isServiceNameInferred = true
       }
@@ -560,7 +561,7 @@ class Config extends ConfigBase {
 
     if (IS_SERVERLESS) {
       setAndTrack(this, 'telemetry.enabled', false)
-      setAndTrack(this, 'crashtracking.enabled', false)
+      setAndTrack(this, 'DD_CRASHTRACKING_ENABLED', false)
       setAndTrack(this, 'remoteConfig.enabled', false)
     }
 
@@ -600,11 +601,11 @@ class Config extends ConfigBase {
     // 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.otelLogsUrl) {
-      setAndTrack(this, 'otelLogsUrl', `${defaultOtlpBase}/v1/logs`)
+    if (!this.OTEL_EXPORTER_OTLP_LOGS_ENDPOINT) {
+      setAndTrack(this, 'OTEL_EXPORTER_OTLP_LOGS_ENDPOINT', `${defaultOtlpBase}/v1/logs`)
     }
-    if (!this.otelMetricsUrl) {
-      setAndTrack(this, 'otelMetricsUrl', `${defaultOtlpBase}/v1/metrics`)
+    if (!this.OTEL_EXPORTER_OTLP_METRICS_ENDPOINT) {
+      setAndTrack(this, 'OTEL_EXPORTER_OTLP_METRICS_ENDPOINT', `${defaultOtlpBase}/v1/metrics`)
     }
     if (!this.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT) {
       setAndTrack(this, 'OTEL_EXPORTER_OTLP_TRACES_ENDPOINT', `${defaultOtlpBase}/v1/traces`)

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

@@ -0,0 +1,31 @@
+'use strict'
+
+const MAX_SERVICE_LENGTH = 100
+
+/**
+ * Normalize an inferred service name so APM and runtime metrics agree.
+ *
+ * The trace agent normalizes span service names on the wire, but the
+ * DogStatsD client uses a different tag-value sanitizer, so an inferred
+ * `@scope/name` package name appears as `scope/name` in APM and
+ * `_scope/name` in runtime metrics. Pre-normalizing pins both consumers
+ * (and telemetry / process tags) to the same value.
+ *
+ * @see https://github.com/DataDog/datadog-agent/blob/main/pkg/trace/traceutil/normalize.go
+ * @param {string | undefined} name
+ */
+function normalizeService (name) {
+  if (!name) return
+
+  let normalized = name.toLowerCase()
+    .replaceAll(/[^a-z0-9_:./-]/g, '_')
+    .replace(/^[^a-z0-9]+/, '')
+
+  if (normalized.length > MAX_SERVICE_LENGTH) {
+    normalized = normalized.slice(0, MAX_SERVICE_LENGTH)
+  }
+
+  return normalized
+}
+
+module.exports = { normalizeService }