From 3cad55d0d806f9b3664279f8c4049ef2f3937141 Mon Sep 17 00:00:00 2001
From: Balaji Arun <balaji@aptoslabs.com>
Date: Fri, 1 Nov 2024 16:51:21 -0700
Subject: [PATCH] [consensus] record timeout author with reason in metrics
 (#15157)

---
 consensus/src/counters.rs      |  2 +-
 consensus/src/round_manager.rs | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/consensus/src/counters.rs b/consensus/src/counters.rs
index 4086c4352adb0..f2dcb3797b794 100644
--- a/consensus/src/counters.rs
+++ b/consensus/src/counters.rs
@@ -597,7 +597,7 @@ pub static AGGREGATED_ROUND_TIMEOUT_REASON: Lazy<IntCounterVec> = Lazy::new(|| {
     register_int_counter_vec!(
         "aptos_consensus_agg_round_timeout_reason",
         "Count of round timeouts by reason",
-        &["reason", "is_next_proposer"],
+        &["reason", "author", "is_next_proposer"],
     )
     .unwrap()
 });
diff --git a/consensus/src/round_manager.rs b/consensus/src/round_manager.rs
index 5a090d426c547..675e61bbeeb50 100644
--- a/consensus/src/round_manager.rs
+++ b/consensus/src/round_manager.rs
@@ -355,9 +355,13 @@ impl RoundManager {
         &mut self,
         new_round_event: NewRoundEvent,
     ) -> anyhow::Result<()> {
+        let new_round = new_round_event.round;
         let is_current_proposer = self
             .proposer_election
-            .is_valid_proposer(self.proposal_generator.author(), new_round_event.round);
+            .is_valid_proposer(self.proposal_generator.author(), new_round);
+        let prev_proposer = self
+            .proposer_election
+            .get_valid_proposer(new_round.saturating_sub(1));
 
         counters::CURRENT_ROUND.set(new_round_event.round as i64);
         counters::ROUND_TIMEOUT_MS.set(new_round_event.timeout.as_millis() as i64);
@@ -368,7 +372,11 @@ impl RoundManager {
             NewRoundReason::Timeout(ref reason) => {
                 counters::TIMEOUT_ROUNDS_COUNT.inc();
                 counters::AGGREGATED_ROUND_TIMEOUT_REASON
-                    .with_label_values(&[&reason.to_string(), &is_current_proposer.to_string()])
+                    .with_label_values(&[
+                        &reason.to_string(),
+                        prev_proposer.short_str().as_str(),
+                        &is_current_proposer.to_string(),
+                    ])
                     .inc();
                 if is_current_proposer {
                     if let RoundTimeoutReason::PayloadUnavailable { missing_authors } = reason {