Feature/node 4876 - using both chains in some tests ( adapt end user to support pkps in both chains )

rust/lit-core/lit-observability/src/net.rs

@@ -176,12 +176,30 @@ pub mod grpc {
                 propagator.extract(&HttpMetadataMap(req.headers_mut()))
             });
 
-            // Initialize a new span with the extracted tracing context as the parent.
-            let info_span = info_span!(
-                "handle_grpc_request",
-                method = %req.method(),
-                path = %req.uri().path(),
-            );
+            // Extract correlation ID header (matches lit-api-core's extract_correlation_id implementation).
+            // Priority: x-correlation-id > x-request-id
+            let correlation_id = req
+                .headers()
+                .get("x-correlation-id")
+                .or_else(|| req.headers().get("x-request-id"))
+                .and_then(|h| h.to_str().ok())
+                .filter(|s| !s.is_empty());
+
+            // Initialize a new span with the propagated context as the parent.
+            let info_span = match correlation_id {
+                Some(id) => info_span!(
+                    "handle_grpc_request",
+                    method = %req.method(),
+                    path = %req.uri().path(),
+                    correlation_id = %id,
+                ),
+                None => info_span!(
+                    "handle_grpc_request",
+                    method = %req.method(),
+                    path = %req.uri().path(),
+                ),
+            };
+
             info_span.set_parent(parent_cx);
 
             service.call(req).instrument(info_span).await

rust/lit-core/lit-os-metrics-internal/Cargo.toml

@@ -9,6 +9,9 @@ osquery-rs = "0.1"
 serde.workspace = true
 serde_json.workspace = true
 
+[dependencies.lit-observability]
+path = "../../lit-core/lit-observability"
+
 [dependencies.lit-core]
 path = "../../lit-core/lit-core"
 

rust/lit-core/lit-os-metrics-internal/src/models.rs

@@ -1,7 +1,40 @@
+use lit_observability::opentelemetry::KeyValue;
+
 pub trait OsMetric {
     const NAME: &'static str;
 }
 
+/// Trait for metrics that have meaningful numeric values.
+/// Implementing this trait allows the metric to be emitted as a gauge with a proper numeric value,
+/// rather than a counter with an enumeration value.
+pub trait GaugeMetric: OsMetric {
+    /// Returns the primary gauge value for this metric.
+    /// This should be the most important numeric value that represents the metric.
+    fn gauge_value(&self) -> Option<f64>;
+
+    /// Returns labels (key-value pairs) for this metric.
+    /// These provide dimensional breakdown of the metric.
+    fn gauge_labels(&self) -> Vec<KeyValue>;
+}
+
+/// Trait for metrics that represent metadata/attributes without meaningful numeric values.
+/// Implementing this trait allows the metric to be emitted as an OpenTelemetry Non-Monotonic Sum
+/// (Prometheus Info metric) with value 1 to indicate the presence/existence of a system with
+/// these attributes.
+///
+/// This follows the [OpenTelemetry Prometheus compatibility specification](https://opentelemetry.io/docs/specs/otel/compatibility/prometheus_and_openmetrics/#info):
+/// - Info metrics are converted to OTLP Non-Monotonic Sum (not Gauge)
+/// - The value of 1 is intended to be viewed as a count, which should be summed together
+///   when aggregating away labels
+/// - Metric names MUST have the `_info` suffix to comply with the specification
+///
+/// The actual information is conveyed through the metric attributes/labels, not the numeric value.
+pub trait InfoMetric: OsMetric {
+    /// Returns labels (key-value pairs) for this metric.
+    /// These provide dimensional breakdown of the metric and contain the actual information.
+    fn info_labels(&self) -> Vec<KeyValue>;
+}
+
 mod cpu_info;
 mod cron_job;
 mod debian_package;

rust/lit-core/lit-os-metrics-internal/src/models/cpu_info.rs

@@ -1,4 +1,5 @@
-use super::OsMetric;
+use super::{GaugeMetric, OsMetric};
+use lit_observability::opentelemetry::KeyValue;
 use serde::{Deserialize, Serialize};
 use std::collections::BTreeMap;
 
@@ -120,3 +121,24 @@ impl From<&CpuInfo> for BTreeMap<String, String> {
 impl OsMetric for CpuInfo {
     const NAME: &'static str = "os.cpu_info";
 }
+
+impl GaugeMetric for CpuInfo {
+    fn gauge_value(&self) -> Option<f64> {
+        self.load_percentage.map(|v| v as f64)
+    }
+
+    fn gauge_labels(&self) -> Vec<KeyValue> {
+        vec![
+            KeyValue::new("device_id", self.device_id.clone()),
+            KeyValue::new("model", self.model.clone()),
+            KeyValue::new("manufacturer", self.manufacturer.clone()),
+            KeyValue::new("processor_type", self.processor_type.clone()),
+            KeyValue::new("number_of_cores", self.number_of_cores.clone()),
+            KeyValue::new(
+                "logical_processors",
+                self.logical_processors.map(|v| v.to_string()).unwrap_or_default(),
+            ),
+            KeyValue::new("socket_designation", self.socket_designation.clone()),
+        ]
+    }
+}

rust/lit-core/lit-os-metrics-internal/src/models/cron_job.rs

@@ -1,4 +1,5 @@
-use super::OsMetric;
+use super::{InfoMetric, OsMetric};
+use lit_observability::opentelemetry::KeyValue;
 use serde::{Deserialize, Serialize};
 use std::collections::BTreeMap;
 
@@ -28,6 +29,25 @@ pub struct CronJob {
     pub query_time: Option<usize>,
 }
 
+impl OsMetric for CronJob {
+    const NAME: &'static str = "os.cron_jobs_info";
+}
+
+impl InfoMetric for CronJob {
+    fn info_labels(&self) -> Vec<KeyValue> {
+        vec![
+            KeyValue::new("command", self.command.clone()),
+            KeyValue::new("cron_file", self.cron_file.clone()),
+            KeyValue::new("day_of_month", self.day_of_month.clone()),
+            KeyValue::new("day_of_week", self.day_of_week.clone()),
+            KeyValue::new("event", self.event.clone()),
+            KeyValue::new("hour", self.hour.clone()),
+            KeyValue::new("minute", self.minute.clone()),
+            KeyValue::new("month", self.month.clone()),
+        ]
+    }
+}
+
 impl TryFrom<&BTreeMap<String, String>> for CronJob {
     type Error = String;
 
@@ -75,7 +95,3 @@ impl From<&CronJob> for BTreeMap<String, String> {
         map
     }
 }
-
-impl OsMetric for CronJob {
-    const NAME: &'static str = "os.cron_jobs";
-}

rust/lit-core/lit-os-metrics-internal/src/models/debian_package.rs

@@ -1,4 +1,5 @@
-use super::OsMetric;
+use super::{InfoMetric, OsMetric};
+use lit_observability::opentelemetry::KeyValue;
 use serde::{Deserialize, Serialize};
 use std::collections::BTreeMap;
 
@@ -27,6 +28,25 @@ pub struct DebianPackage {
     pub version: String,
 }
 
+impl OsMetric for DebianPackage {
+    const NAME: &'static str = "os.installed_debian_packages_info";
+}
+
+impl InfoMetric for DebianPackage {
+    fn info_labels(&self) -> Vec<KeyValue> {
+        vec![
+            KeyValue::new("arch", self.arch.clone()),
+            KeyValue::new("name", self.name.clone()),
+            KeyValue::new("package_source", self.package_source.clone()),
+            KeyValue::new("priority", self.priority.clone()),
+            KeyValue::new("revision", self.revision.clone()),
+            KeyValue::new("section", self.section.clone()),
+            KeyValue::new("version", self.version.clone()),
+            KeyValue::new("size", self.size.map(|v| v.to_string()).unwrap_or_default()),
+        ]
+    }
+}
+
 impl TryFrom<&BTreeMap<String, String>> for DebianPackage {
     type Error = String;
 
@@ -74,7 +94,3 @@ impl From<&DebianPackage> for BTreeMap<String, String> {
         map
     }
 }
-
-impl OsMetric for DebianPackage {
-    const NAME: &'static str = "os.installed_debian_packages";
-}

rust/lit-core/lit-os-metrics-internal/src/models/disk_info.rs

@@ -1,4 +1,5 @@
-use crate::OsMetric;
+use crate::{GaugeMetric, OsMetric};
+use lit_observability::opentelemetry::KeyValue;
 use serde::{Deserialize, Serialize};
 use std::collections::BTreeMap;
 
@@ -85,3 +86,27 @@ impl From<&DiskInfo> for BTreeMap<String, String> {
 impl OsMetric for DiskInfo {
     const NAME: &'static str = "os.disk_info";
 }
+
+impl GaugeMetric for DiskInfo {
+    fn gauge_value(&self) -> Option<f64> {
+        self.free_percent
+    }
+
+    fn gauge_labels(&self) -> Vec<KeyValue> {
+        vec![
+            KeyValue::new("device", self.device.clone()),
+            KeyValue::new("path", self.path.clone()),
+            KeyValue::new("encrypted", self.encrypted.clone()),
+            KeyValue::new("encryption_status", self.encryption_status.clone()),
+            KeyValue::new("free_gb", self.free_gb.map(|v| v.to_string()).unwrap_or_default()),
+            KeyValue::new(
+                "disk_gb_read",
+                self.disk_gb_read.map(|v| v.to_string()).unwrap_or_default(),
+            ),
+            KeyValue::new(
+                "disk_gb_written",
+                self.disk_gb_written.map(|v| v.to_string()).unwrap_or_default(),
+            ),
+        ]
+    }
+}

rust/lit-core/lit-os-metrics-internal/src/models/docker.rs

@@ -1,4 +1,5 @@
-use super::OsMetric;
+use super::{InfoMetric, OsMetric};
+use lit_observability::opentelemetry::KeyValue;
 use serde::{Deserialize, Serialize};
 use std::collections::BTreeMap;
 
@@ -145,7 +146,18 @@ impl From<&DockerRunningContainers> for BTreeMap<String, String> {
 }
 
 impl OsMetric for DockerRunningContainers {
-    const NAME: &'static str = "os.running_containers";
+    const NAME: &'static str = "os.running_containers_info";
+}
+
+impl InfoMetric for DockerRunningContainers {
+    fn info_labels(&self) -> Vec<KeyValue> {
+        vec![
+            KeyValue::new("container_name", self.container_name.clone()),
+            KeyValue::new("image_name", self.image_name.clone()),
+            KeyValue::new("status", self.status.clone()),
+            KeyValue::new("container_state", self.container_state.clone()),
+        ]
+    }
 }
 
 /// The structure of a docker container label

rust/lit-core/lit-os-metrics-internal/src/models/established_outbound.rs

@@ -1,4 +1,5 @@
-use super::OsMetric;
+use super::{InfoMetric, OsMetric};
+use lit_observability::opentelemetry::KeyValue;
 use serde::{Deserialize, Serialize};
 use std::collections::BTreeMap;
 
@@ -161,5 +162,26 @@ impl From<&EstablishedOutbound> for BTreeMap<String, String> {
 }
 
 impl OsMetric for EstablishedOutbound {
-    const NAME: &'static str = "os.established_outbound";
+    const NAME: &'static str = "os.established_outbound_info";
+}
+
+impl InfoMetric for EstablishedOutbound {
+    fn info_labels(&self) -> Vec<KeyValue> {
+        vec![
+            KeyValue::new("dest_connection_ip", self.dest_connection_ip.clone()),
+            KeyValue::new(
+                "dest_connection_port",
+                self.dest_connection_port.map(|v| v.to_string()).unwrap_or_default(),
+            ),
+            KeyValue::new("src_connection_ip", self.src_connection_ip.clone()),
+            KeyValue::new(
+                "src_connection_port",
+                self.src_connection_port.map(|v| v.to_string()).unwrap_or_default(),
+            ),
+            KeyValue::new("transport", self.transport.clone()),
+            KeyValue::new("family", self.family.clone()),
+            KeyValue::new("username", self.username.clone()),
+            KeyValue::new("name", self.name.clone()),
+        ]
+    }
 }

rust/lit-core/lit-os-metrics-internal/src/models/interface_address.rs

@@ -1,4 +1,5 @@
-use super::OsMetric;
+use super::{InfoMetric, OsMetric};
+use lit_observability::opentelemetry::KeyValue;
 use serde::{Deserialize, Serialize};
 use std::collections::BTreeMap;
 
@@ -18,6 +19,20 @@ pub struct InterfaceAddress {
     pub query_time: Option<usize>,
 }
 
+impl OsMetric for InterfaceAddress {
+    const NAME: &'static str = "os.interface_addresses_info";
+}
+
+impl InfoMetric for InterfaceAddress {
+    fn info_labels(&self) -> Vec<KeyValue> {
+        vec![
+            KeyValue::new("address", self.address.clone()),
+            KeyValue::new("interface", self.interface.clone()),
+            KeyValue::new("mac", self.mac.clone()),
+        ]
+    }
+}
+
 impl TryFrom<&BTreeMap<String, String>> for InterfaceAddress {
     type Error = String;
 
@@ -55,7 +70,3 @@ impl From<&InterfaceAddress> for BTreeMap<String, String> {
         map
     }
 }
-
-impl OsMetric for InterfaceAddress {
-    const NAME: &'static str = "os.interface_addresses";
-}

rust/lit-core/lit-os-metrics-internal/src/models/iptables.rs

@@ -1,4 +1,5 @@
-use crate::models::OsMetric;
+use crate::models::{InfoMetric, OsMetric};
+use lit_observability::opentelemetry::KeyValue;
 use serde::Serialize;
 use std::collections::BTreeMap;
 
@@ -47,7 +48,22 @@ pub struct IptablesRule {
 }
 
 impl OsMetric for IptablesRule {
-    const NAME: &'static str = "iptables";
+    const NAME: &'static str = "iptables_info";
+}
+
+impl InfoMetric for IptablesRule {
+    fn info_labels(&self) -> Vec<KeyValue> {
+        vec![
+            KeyValue::new("filter_chain", self.filter_chain.clone()),
+            KeyValue::new("filter_policy", self.filter_policy.clone()),
+            KeyValue::new("filter_target", self.filter_target.clone()),
+            KeyValue::new("filter_protocol", self.filter_protocol.clone()),
+            KeyValue::new("nat_chain", self.nat_chain.clone()),
+            KeyValue::new("nat_policy", self.nat_policy.clone()),
+            KeyValue::new("nat_target", self.nat_target.clone()),
+            KeyValue::new("nat_protocol", self.nat_protocol.clone()),
+        ]
+    }
 }
 
 impl TryFrom<&BTreeMap<String, String>> for IptablesRule {