chore(kms-connector): more granular metrics

Author: eudelins-zama

kms-connector/.sqlx/query-05f22646520c5835fc3235aa6378dccd4436ca4a07ab25a9c8abe21760d5b202.json

@@ -18,7 +18,7 @@ gw-listener.path = "crates/gw-listener"
 kms-worker.path = "crates/kms-worker"
 tx-sender.path = "crates/tx-sender"
 connector-utils.path = "crates/utils"
-fhevm_gateway_bindings = { git = "https://github.com/zama-ai/fhevm.git", tag = "v0.10.0-2", default-features = false }
+fhevm_gateway_bindings = { git = "https://github.com/zama-ai/fhevm.git", tag = "v0.10.0", default-features = false }
 kms-grpc = { git = "https://github.com/zama-ai/kms.git", tag = "v0.12.4", default-features = true }
 bc2wrap = { git = "https://github.com/zama-ai/kms.git", tag = "v0.12.4", default-features = true }
 tfhe = "=1.4.0-alpha.3"

kms-connector/.sqlx/query-17db0e005e1367157721bf62877d735a9fb755f5d9afe72f069a1872ff1b7fd6.json

@@ -3,7 +3,7 @@ use crate::{
     core::{publish::update_last_block_polled, publish_event},
     monitoring::{
         health::State,
-        metrics::{EVENT_RECEIVED_COUNTER, EVENT_RECEIVED_ERRORS, EVENT_STORAGE_ERRORS},
+        metrics::{EVENT_RECEIVED_COUNTER, EVENT_RECEIVED_ERRORS},
     },
 };
 use alloy::{
@@ -198,14 +198,19 @@ where
             match events.next().await {
                 Some(Ok((event, log))) => {
                     *last_block = log.block_number;
-                    EVENT_RECEIVED_COUNTER.inc();
+                    EVENT_RECEIVED_COUNTER
+                        .with_label_values(&[event_type.as_str()])
+                        .inc();
+
                     let db = self.db_pool.clone();
                     spawn_with_limit(handle_gateway_event(db, event.into(), log.block_number))
                         .await;
                 }
                 Some(Err(err)) => {
                     error!("Error while listening for {event_type} events: {err}");
-                    EVENT_RECEIVED_ERRORS.inc();
+                    EVENT_RECEIVED_ERRORS
+                        .with_label_values(&[event_type.as_str()])
+                        .inc();
                     continue;
                 }
                 None => break error!("Alloy Provider was dropped for {event_type}"),
@@ -274,7 +279,6 @@ async fn handle_gateway_event(
     );
     if let Err(err) = publish_event(&db_pool, event, block_number).await {
         error!("Failed to publish event: {err}");
-        EVENT_STORAGE_ERRORS.inc();
     }
 }
 

kms-connector/.sqlx/query-a70444056f27bd68660c86bade10eccfac9cb5fd677de32dcc7bea043d3ca237.json

@@ -1,4 +1,3 @@
-use crate::monitoring::metrics::EVENT_STORED_COUNTER;
 use alloy::primitives::U256;
 use anyhow::anyhow;
 use connector_utils::{
@@ -44,7 +43,6 @@ pub async fn publish_event(
 
     if query_result.rows_affected() == 1 {
         info!("Event successfully stored in DB!");
-        EVENT_STORED_COUNTER.inc();
     } else {
         warn!("Unexpected query result while publishing event: {query_result:?}");
     }

kms-connector/.sqlx/query-f4cec78c0611edc0cf747320db7f0fb1c9eaec89303c3f3e45617b155fa9aed8.json

@@ -1,34 +1,20 @@
-use prometheus::{IntCounter, register_int_counter};
+use prometheus::{IntCounterVec, register_int_counter_vec};
 use std::sync::LazyLock;
 
-pub static EVENT_RECEIVED_COUNTER: LazyLock<IntCounter> = LazyLock::new(|| {
-    register_int_counter!(
+pub static EVENT_RECEIVED_COUNTER: LazyLock<IntCounterVec> = LazyLock::new(|| {
+    register_int_counter_vec!(
         "kms_connector_gw_listener_event_received_counter",
-        "Number of events received by the GatewayListener"
+        "Number of events received by the GatewayListener",
+        &["event_type"]
     )
     .unwrap()
 });
 
-pub static EVENT_RECEIVED_ERRORS: LazyLock<IntCounter> = LazyLock::new(|| {
-    register_int_counter!(
-        "kms_connector_gw_listener_event_received_errors",
-        "Number of errors encountered by the GatewayListener while receiving events"
-    )
-    .unwrap()
-});
-
-pub static EVENT_STORED_COUNTER: LazyLock<IntCounter> = LazyLock::new(|| {
-    register_int_counter!(
-        "kms_connector_gw_listener_event_stored_counter",
-        "Number of events stored in DB by the GatewayListener"
-    )
-    .unwrap()
-});
-
-pub static EVENT_STORAGE_ERRORS: LazyLock<IntCounter> = LazyLock::new(|| {
-    register_int_counter!(
+pub static EVENT_RECEIVED_ERRORS: LazyLock<IntCounterVec> = LazyLock::new(|| {
+    register_int_counter_vec!(
         "kms_connector_gw_listener_event_storage_errors",
-        "Number of errors encountered by the GatewayListener while trying to store events in DB"
+        "Number of errors encountered by the GatewayListener while trying to store events in DB",
+        &["event_type"]
     )
     .unwrap()
 });