refactor ⚙: Refactored small things on dashboards

Author: lorenzoronzani

src/ic-websocket-gateway/src/client_session_handler.rs

@@ -193,9 +193,9 @@ impl ClientSessionHandler {
                         let client_key = self.get_client_key(&client_session);
 
                         // Clients connection metrics
-                        let clients_connected_count = self.gateway_state.get_clients_count(canister_id);
-                        debug!("Clients connected: {}", clients_connected_count.to_string());
-                        gauge!("clients_connected_count", "canister_id" => canister_id.to_string()).set(clients_connected_count as f64);
+                        let clients_connected = self.gateway_state.get_clients_count(canister_id);
+                        debug!("Clients connected: {}", clients_connected.to_string());
+                        gauge!("clients_connected", "canister_id" => canister_id.to_string()).set(clients_connected as f64);
 
                         // Calculate the time it took to open the connection and record it using the timer started in ws_listener.rs
                         let delta = self.start_connection_time.elapsed();
@@ -218,9 +218,9 @@ impl ClientSessionHandler {
                     debug!("Client removed from gateway state");
 
                     // Clients connection metrics
-                    let clients_connected_count = self.gateway_state.get_clients_count(canister_id);
-                    debug!("Clients connected: {}", clients_connected_count.to_string());
-                    gauge!("clients_connected_count", "canister_id" => canister_id.to_string()).set(clients_connected_count as f64);
+                    let clients_connected = self.gateway_state.get_clients_count(canister_id);
+                    debug!("Clients connected: {}", clients_connected.to_string());
+                    gauge!("clients_connected", "canister_id" => canister_id.to_string()).set(clients_connected as f64);
 
                     let delta = client_start_session_time.elapsed();
                     histogram!("connection_duration", "client_key" => client_key.to_string()).record(delta);
@@ -257,9 +257,9 @@ impl ClientSessionHandler {
                         debug!("Client removed from gateway state");
 
                         // Clients connection metrics
-                        let clients_connected_count = self.gateway_state.get_clients_count(canister_id);
-                        debug!("Clients connected: {}", clients_connected_count.to_string());
-                        gauge!("clients_connected_count", "canister_id" => canister_id.to_string()).set(clients_connected_count as f64);
+                        let clients_connected = self.gateway_state.get_clients_count(canister_id);
+                        debug!("Clients connected: {}", clients_connected.to_string());
+                        gauge!("clients_connected", "canister_id" => canister_id.to_string()).set(clients_connected as f64);
 
                         let delta = client_start_session_time.elapsed();
                         histogram!("connection_duration", "client_key" => client_key.to_string()).record(delta);

src/ic-websocket-gateway/src/gateway_metrics.rs

@@ -9,20 +9,16 @@ pub fn init_metrics(port: Option<u16>) -> Result<(), Box<dyn Error>> {
     let builder = PrometheusBuilder::new()
         .with_http_listener(SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), port.unwrap_or(9000)));
 
-    // Set the idle timeout for counters and histograms to 10 seconds then the metrics are removed from the registry
+    // Set the idle timeout for counters and histograms to 30 seconds then the metrics are removed from the registry
     builder
         .idle_timeout(
-            MetricKindMask::COUNTER | MetricKindMask::HISTOGRAM,
-            Some(Duration::from_secs(10)),
-        )
-        .idle_timeout(
-            MetricKindMask::GAUGE,
+            MetricKindMask::ALL,
             Some(Duration::from_secs(30)),
         )
         .install()
         .expect("failed to install Prometheus recorder");
 
-    describe_gauge!("clients_connected_count", "The number of clients currently connected");
+    describe_gauge!("clients_connected", "The number of clients currently connected");
     describe_gauge!("active_pollers", "The number of pollers currently connected");
     describe_histogram!(
         "connection_duration",