From f043db9f166ffffd2eebb180b79317a2532335c0 Mon Sep 17 00:00:00 2001
From: Kirill Fomichev <fanatid@ya.ru>
Date: Mon, 28 Oct 2024 22:00:37 +0400
Subject: [PATCH] change metrics visibility

---
 yellowstone-grpc-geyser/src/grpc.rs    |  2 +-
 yellowstone-grpc-geyser/src/metrics.rs | 27 +++++++++++++++++++-------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/yellowstone-grpc-geyser/src/grpc.rs b/yellowstone-grpc-geyser/src/grpc.rs
index 87361fea..2804ccb4 100644
--- a/yellowstone-grpc-geyser/src/grpc.rs
+++ b/yellowstone-grpc-geyser/src/grpc.rs
@@ -1057,7 +1057,7 @@ impl GrpcService {
                                     parent: entry.parent_slot,
                                     status,
                                 })));
-                                metrics::MISSED_STATUS_MESSAGE.inc();
+                                metrics::missed_status_message_inc(status);
                             }
                         }
                     }
diff --git a/yellowstone-grpc-geyser/src/metrics.rs b/yellowstone-grpc-geyser/src/metrics.rs
index 0c6d5c9f..35026241 100644
--- a/yellowstone-grpc-geyser/src/metrics.rs
+++ b/yellowstone-grpc-geyser/src/metrics.rs
@@ -12,7 +12,7 @@ use {
         server::conn::auto::Builder as ServerBuilder,
     },
     log::{error, info},
-    prometheus::{IntCounter, IntCounterVec, IntGauge, IntGaugeVec, Opts, Registry, TextEncoder},
+    prometheus::{IntCounterVec, IntGauge, IntGaugeVec, Opts, Registry, TextEncoder},
     solana_sdk::clock::Slot,
     std::{
         collections::{hash_map::Entry as HashMapEntry, HashMap},
@@ -63,7 +63,10 @@ lazy_static::lazy_static! {
         &["endpoint", "subscription"]
     ).unwrap();
 
-    pub static ref MISSED_STATUS_MESSAGE: IntCounter = IntCounter::new("missed_status_message_total", "Number of missed messages").unwrap();
+    static ref MISSED_STATUS_MESSAGE: IntCounterVec = IntCounterVec::new(
+        Opts::new("missed_status_message_total", "Number of missed messages by commitment"),
+        &["status"]
+    ).unwrap();
 }
 
 #[derive(Debug)]
@@ -323,11 +326,7 @@ pub fn update_slot_status(status: SlotStatus, slot: u64) {
 
 pub fn update_slot_plugin_status(status: CommitmentLevel, slot: u64) {
     SLOT_STATUS_PLUGIN
-        .with_label_values(&[match status {
-            CommitmentLevel::Processed => "processed",
-            CommitmentLevel::Confirmed => "confirmed",
-            CommitmentLevel::Finalized => "finalized",
-        }])
+        .with_label_values(&[commitment_level_as_str(status)])
         .set(slot as i64);
 }
 
@@ -353,3 +352,17 @@ pub fn update_subscriptions(endpoint: &str, old: Option<&Filter>, new: Option<&F
         }
     }
 }
+
+pub fn missed_status_message_inc(status: CommitmentLevel) {
+    MISSED_STATUS_MESSAGE
+        .with_label_values(&[commitment_level_as_str(status)])
+        .inc()
+}
+
+const fn commitment_level_as_str(commitment: CommitmentLevel) -> &'static str {
+    match commitment {
+        CommitmentLevel::Processed => "processed",
+        CommitmentLevel::Confirmed => "confirmed",
+        CommitmentLevel::Finalized => "finalized",
+    }
+}