Remove action digest and worker id from analytics.

Author: dkostyrev

nativelink-scheduler/src/memory_awaited_action_db.rs

@@ -660,7 +660,6 @@ impl<I: InstantWrapper, NowFn: Fn() -> I + Clone + Send + Sync> AwaitedActionDbI
                 // Track stage transitions
                 let base_attrs = make_execution_attributes(
                     "unknown",
-                    None,
                     Some(old_awaited_action.action_info().priority),
                 );
                 metrics.execution_stage_transitions.add(1, &base_attrs);
@@ -691,10 +690,6 @@ impl<I: InstantWrapper, NowFn: Fn() -> I + Clone + Send + Sync> AwaitedActionDbI
                                 ExecutionResult::Failure
                             },
                         ),
-                        opentelemetry::KeyValue::new(
-                            nativelink_util::metrics::EXECUTION_ACTION_DIGEST,
-                            action_digest,
-                        ),
                     ];
                     metrics.execution_completed_count.add(1, &result_attrs);
                 } else if let ActionStage::CompletedFromCache(_) = new_stage {
@@ -703,10 +698,6 @@ impl<I: InstantWrapper, NowFn: Fn() -> I + Clone + Send + Sync> AwaitedActionDbI
                             nativelink_util::metrics::EXECUTION_RESULT,
                             ExecutionResult::CacheHit,
                         ),
-                        opentelemetry::KeyValue::new(
-                            nativelink_util::metrics::EXECUTION_ACTION_DIGEST,
-                            action_digest,
-                        ),
                     ];
                     metrics.execution_completed_count.add(1, &result_attrs);
                 }
@@ -817,7 +808,7 @@ impl<I: InstantWrapper, NowFn: Fn() -> I + Clone + Send + Sync> AwaitedActionDbI
 
         // Record metric for new action entering the queue
         let metrics = &*EXECUTION_METRICS;
-        let _base_attrs = make_execution_attributes("unknown", None, Some(action_info.priority));
+        let _base_attrs = make_execution_attributes("unknown", Some(action_info.priority));
         let queued_attrs = vec![opentelemetry::KeyValue::new(
             nativelink_util::metrics::EXECUTION_STAGE,
             ExecutionStage::Queued,

nativelink-scheduler/src/simple_scheduler_state_manager.rs

@@ -156,18 +156,11 @@ impl SchedulerMetrics {
     }
 
     #[must_use]
-    pub fn make_worker_attrs(&self, worker_id: Option<&WorkerId>) -> Vec<KeyValue> {
-        let mut attrs = vec![KeyValue::new(
+    pub fn make_worker_attrs(&self) -> Vec<KeyValue> {
+        vec![KeyValue::new(
             EXECUTION_INSTANCE,
             self.instance_name.clone(),
-        )];
-        if let Some(worker_id) = worker_id {
-            attrs.push(KeyValue::new(
-                nativelink_util::metrics::EXECUTION_WORKER_ID,
-                worker_id.to_string(),
-            ));
-        }
-        attrs
+        )]
     }
 
     #[must_use]
@@ -1203,7 +1196,6 @@ where
             // Build base attributes for metrics
             let mut attrs = nativelink_util::metrics::make_execution_attributes(
                 instance_name,
-                worker_id.as_deref(),
                 priority,
             );
 

nativelink-util/src/metrics.rs

@@ -17,10 +17,8 @@
 use std::fmt::{Display, Formatter};
 use std::sync::{LazyLock, OnceLock};
 
-use opentelemetry::{InstrumentationScope, KeyValue, Value, global, metrics};
-use tokio::time::Instant;
 use crate::action_messages::ActionStage;
-use crate::metrics_utils::Counter;
+use opentelemetry::{global, metrics, InstrumentationScope, KeyValue, Value};
 
 /// Callback type for observable gauges that report queued action counts.
 /// The callback receives an `Observer` that should be used to record values with attributes.
@@ -67,9 +65,7 @@ pub const EXECUTION_STAGE: &str = "execution_stage";
 pub const EXECUTION_RESULT: &str = "execution_result";
 pub const EXECUTION_INSTANCE: &str = "execution_instance";
 pub const EXECUTION_PRIORITY: &str = "execution_priority";
-pub const EXECUTION_WORKER_ID: &str = "execution_worker_id";
 pub const EXECUTION_EXIT_CODE: &str = "execution_exit_code";
-pub const EXECUTION_ACTION_DIGEST: &str = "execution_action_digest";
 
 /// Cache operation types for metrics classification.
 #[derive(Debug, Clone, Copy)]
@@ -690,15 +686,10 @@ pub struct ExecutionMetrics {
 #[must_use]
 pub fn make_execution_attributes(
     instance_name: &str,
-    worker_id: Option<&str>,
     priority: Option<i32>,
 ) -> Vec<KeyValue> {
     let mut attrs = vec![KeyValue::new(EXECUTION_INSTANCE, instance_name.to_string())];
 
-    if let Some(worker_id) = worker_id {
-        attrs.push(KeyValue::new(EXECUTION_WORKER_ID, worker_id.to_string()));
-    }
-
     if let Some(priority) = priority {
         attrs.push(KeyValue::new(EXECUTION_PRIORITY, i64::from(priority)));
     }