chore(metrics): improve compaction group label and grafana dashboard (#4258)

* chore(metrics): improve compaction group label and grafana dashboard

* fix

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

Author: hzxa21

Cargo.lock

@@ -16,8 +16,10 @@ use std::sync::atomic::Ordering;
 use std::time::{SystemTime, UNIX_EPOCH};
 
 use itertools::enumerate;
+use num_traits::FromPrimitive;
 use prost::Message;
 use risingwave_hummock_sdk::compaction_group::hummock_version_ext::HummockVersionExt;
+use risingwave_hummock_sdk::compaction_group::StaticCompactionGroupId;
 use risingwave_hummock_sdk::CompactionGroupId;
 use risingwave_pb::hummock::HummockVersion;
 
@@ -46,7 +48,11 @@ pub fn trigger_sst_stat(
     for (idx, level_handler) in enumerate(compact_status.level_handlers.iter()) {
         let sst_num = level_sst_cnt(idx);
         let compact_cnt = level_handler.get_pending_file_count();
-        let level_label = format!("cg{}_level{}", compaction_group_id, idx);
+        let level_label = format!(
+            "{}_{}",
+            idx,
+            StaticCompactionGroupId::from_u64(compaction_group_id).unwrap(),
+        );
         metrics
             .level_sst_num
             .with_label_values(&[&level_label])

grafana/risingwave-dashboard.json

@@ -9,6 +9,8 @@ hex = "0.4"
 itertools = "0.10"
 log = "0.4"
 madsim = "=0.2.0-alpha.5"
+num-derive = "0.3"
+num-traits = "0.2"
 prost = "0.10"
 risingwave_common = { path = "../../common" }
 risingwave_pb = { path = "../../prost" }

grafana/risingwave-dashboard.py

@@ -14,12 +14,15 @@
 
 pub mod hummock_version_ext;
 
+use std::fmt::Display;
+
 use crate::CompactionGroupId;
 
 pub type StateTableId = u32;
 
 /// A compaction task's `StaticCompactionGroupId` indicates the compaction group that all its input
 /// SSTs belong to.
+#[derive(FromPrimitive)]
 pub enum StaticCompactionGroupId {
     /// All shared buffer local compaction task goes to here. Meta service will never see this
     /// value. Note that currently we've restricted the compaction task's input by `via
@@ -36,3 +39,13 @@ impl From<StaticCompactionGroupId> for CompactionGroupId {
         cg as CompactionGroupId
     }
 }
+
+impl Display for StaticCompactionGroupId {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            StaticCompactionGroupId::SharedBuffer => write!(f, "SharedBufferGroup"),
+            StaticCompactionGroupId::StateDefault => write!(f, "StateGroup"),
+            StaticCompactionGroupId::MaterializedView => write!(f, "MVGroup"),
+        }
+    }
+}

src/meta/src/hummock/metrics_utils.rs

@@ -16,6 +16,9 @@
 
 mod version_cmp;
 
+#[macro_use]
+extern crate num_derive;
+
 use risingwave_pb::hummock::SstableInfo;
 pub use version_cmp::*;
 pub mod compact;

src/storage/hummock_sdk/Cargo.toml

@@ -57,7 +57,6 @@ macro_rules! for_all_metrics {
             write_build_l0_bytes: GenericCounter<AtomicU64>,
 
             iter_merge_sstable_counts: HistogramVec,
-            iter_merge_seek_duration: Histogram,
 
             sst_store_block_request_counts: GenericCounterVec<AtomicU64>,
 
@@ -274,13 +273,6 @@ impl StateStoreMetrics {
         let iter_merge_sstable_counts =
             register_histogram_vec_with_registry!(opts, &["type"], registry).unwrap();
 
-        let opts = histogram_opts!(
-            "state_store_iter_merge_seek_duration",
-            "Seek() time conducted by MergeIterators",
-            exponential_buckets(1.0, 2.0, 17).unwrap() // max 65536 times
-        );
-        let iter_merge_seek_duration = register_histogram_with_registry!(opts, registry).unwrap();
-
         // ----- sst store -----
         let sst_store_block_request_counts = register_int_counter_vec_with_registry!(
             "state_store_sst_store_block_request_counts",
@@ -410,7 +402,6 @@ impl StateStoreMetrics {
             write_build_l0_sst_duration,
             write_build_l0_bytes,
             iter_merge_sstable_counts,
-            iter_merge_seek_duration,
             sst_store_block_request_counts,
             shared_buffer_to_l0_duration,
             shared_buffer_to_sstable_size,