Fix current OTLP traces correctness test errors

Author: rayz

bin/correctness/ground-truth/src/analysis/traces/mod.rs

@@ -18,6 +18,9 @@ static IGNORED_FIELDS_DIFF: &[&str] = &[
     "meta._dd.install.id",
     "meta._dd.install.time",
     "meta._dd.install.type",
+    "agent_metadata.agent_version",
+    // Deprecated
+    "metrics._sampling_priority_rate_v1",
 ];
 
 static CUSTOM_FIELD_COMPARATORS: &[(&str, &dyn FieldComparator)] = &[("start", &check_start_diff)];

lib/saluki-components/src/common/datadog/apm.rs

@@ -0,0 +1,52 @@
+use saluki_config::GenericConfiguration;
+use saluki_error::GenericError;
+use serde::Deserialize;
+
+const fn default_target_traces_per_second() -> f64 {
+    10.0
+}
+
+const fn default_errors_per_second() -> f64 {
+    10.0
+}
+
+/// APM configuration.
+///
+/// This configuration mirrors the Agent's trace agent configuration..
+#[derive(Clone, Debug, Deserialize)]
+struct ApmConfiguration {
+    #[serde(default)]
+    apm_config: ApmConfig,
+}
+
+#[derive(Clone, Debug, Deserialize, Default)]
+pub struct ApmConfig {
+    /// Target traces per second for priority sampling.
+    ///
+    /// Defaults to 10.0.
+    #[serde(default = "default_target_traces_per_second")]
+    target_traces_per_second: f64,
+
+    /// Target traces per second for error sampling.
+    ///
+    /// Defaults to 10.0.
+    #[serde(default = "default_errors_per_second")]
+    errors_per_second: f64,
+}
+
+impl ApmConfig {
+    pub fn from_configuration(config: &GenericConfiguration) -> Result<Self, GenericError> {
+        let wrapper = config.as_typed::<ApmConfiguration>()?;
+        Ok(wrapper.apm_config.clone())
+    }
+
+    /// Returns the target traces per second for priority sampling.
+    pub const fn target_traces_per_second(&self) -> f64 {
+        self.target_traces_per_second
+    }
+
+    /// Returns the target traces per second for error sampling.
+    pub const fn errors_per_second(&self) -> f64 {
+        self.errors_per_second
+    }
+}

lib/saluki-components/src/common/datadog/mod.rs

@@ -1,3 +1,4 @@
+pub mod apm;
 pub mod config;
 pub mod endpoints;
 pub mod io;

lib/saluki-components/src/common/otlp/config.rs

@@ -96,3 +96,153 @@ impl Default for HttpConfig {
         }
     }
 }
+
+/// OTLP configuration.
+///
+/// This mirrors the Agent's `otlp_config` and contains configuration for
+/// the OTLP receiver as well as signal-specific settings (metrics, logs, traces).
+#[derive(Deserialize, Debug, Default)]
+pub struct OtlpConfig {
+    /// OTLP receiver configuration.
+    #[serde(default)]
+    pub receiver: Receiver,
+
+    /// Metrics-specific OTLP configuration.
+    #[serde(default)]
+    pub metrics: MetricsConfig,
+
+    /// Logs-specific OTLP configuration.
+    #[serde(default)]
+    pub logs: LogsConfig,
+
+    /// Traces-specific OTLP configuration.
+    #[serde(default)]
+    pub traces: TracesConfig,
+}
+
+/// Configuration for OTLP logs processing.
+#[derive(Deserialize, Debug)]
+pub struct LogsConfig {
+    /// Whether to enable OTLP logs support.
+    ///
+    /// Defaults to true.
+    #[serde(default = "default_logs_enabled")]
+    pub enabled: bool,
+}
+
+fn default_logs_enabled() -> bool {
+    true
+}
+
+impl Default for LogsConfig {
+    fn default() -> Self {
+        Self {
+            enabled: default_logs_enabled(),
+        }
+    }
+}
+
+/// Configuration for OTLP metrics processing.
+#[derive(Deserialize, Debug)]
+pub struct MetricsConfig {
+    /// Whether to enable OTLP metrics support.
+    ///
+    /// Defaults to true.
+    #[serde(default = "default_metrics_enabled")]
+    pub enabled: bool,
+}
+
+fn default_metrics_enabled() -> bool {
+    true
+}
+
+impl Default for MetricsConfig {
+    fn default() -> Self {
+        Self {
+            enabled: default_metrics_enabled(),
+        }
+    }
+}
+
+/// Configuration for OTLP traces processing.
+///
+/// Mirrors the Agent's `otlp_config.traces` configuration.
+#[derive(Clone, Deserialize, Debug)]
+pub struct TracesConfig {
+    /// Whether to enable OTLP traces support.
+    ///
+    /// Defaults to true.
+    #[serde(default = "default_traces_enabled")]
+    pub enabled: bool,
+
+    /// Whether to skip deriving Datadog fields from standard OTLP attributes.
+    ///
+    /// When true, only uses explicit `datadog.*` prefixed attributes and skips
+    /// fallback resolution from OTLP semantic conventions.
+    ///
+    /// Corresponds to `otlp_config.traces.ignore_missing_datadog_fields` in the Agent.
+    ///
+    /// Defaults to false.
+    #[serde(default)]
+    pub ignore_missing_datadog_fields: bool,
+
+    /// When true, `_top_level` and `_dd.measured` are derived using the OTLP span kind.
+    ///
+    /// Corresponds to the `enable_otlp_compute_top_level_by_span_kind` feature flag
+    /// in the Agent's `apm_config.features`.
+    ///
+    /// Defaults to false.
+    #[serde(default = "default_enable_otlp_compute_top_level_by_span_kind")]
+    pub enable_otlp_compute_top_level_by_span_kind: bool,
+
+    /// Probabilistic sampler configuration for OTLP traces.
+    ///
+    /// Corresponds to `otlp_config.traces.probabilistic_sampler` in the Agent.
+    #[serde(default)]
+    pub probabilistic_sampler: ProbabilisticSampler,
+}
+
+/// Configuration for OTLP traces probabilistic sampling.
+#[derive(Clone, Deserialize, Debug)]
+pub struct ProbabilisticSampler {
+    /// Percentage of traces to ingest (0, 100].
+    ///
+    /// Invalid values (<= 0 || > 100) are disconsidered and the default is used.
+    ///
+    /// Corresponds to `otlp_config.traces.probabilistic_sampler.sampling_percentage` in the Agent.
+    ///
+    /// Defaults to 100.0 (100% sampling).
+    #[serde(default = "default_sampling_percentage")]
+    pub sampling_percentage: f64,
+}
+
+const fn default_sampling_percentage() -> f64 {
+    100.0
+}
+
+impl Default for ProbabilisticSampler {
+    fn default() -> Self {
+        Self {
+            sampling_percentage: default_sampling_percentage(),
+        }
+    }
+}
+
+const fn default_enable_otlp_compute_top_level_by_span_kind() -> bool {
+    false
+}
+
+fn default_traces_enabled() -> bool {
+    true
+}
+
+impl Default for TracesConfig {
+    fn default() -> Self {
+        Self {
+            enabled: default_traces_enabled(),
+            ignore_missing_datadog_fields: false,
+            enable_otlp_compute_top_level_by_span_kind: default_enable_otlp_compute_top_level_by_span_kind(),
+            probabilistic_sampler: ProbabilisticSampler::default(),
+        }
+    }
+}