Fix empty shotover_chain_latency metric

shotover · Dec 22, 2022 · 4b3fe52 · 4b3fe52
1 parent 771c96f
commit 4b3fe52
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 17 deletions.
diff --git a/shotover-proxy/src/server.rs b/shotover-proxy/src/server.rs
@@ -569,7 +569,9 @@ impl<C: Codec + 'static> Handler<C> {
             );
 
             let modified_messages = if reverse_chain {
-                self.chain.process_request_rev(wrapper).await
+                self.chain
+                    .process_request_rev(wrapper, self.client_details.clone())
+                    .await
             } else {
                 self.chain
                     .process_request(wrapper, self.client_details.clone())

diff --git a/shotover-proxy/src/transforms/chain.rs b/shotover-proxy/src/transforms/chain.rs
@@ -189,7 +189,11 @@ impl TransformChain {
         result
     }
 
-    pub async fn process_request_rev(&mut self, mut wrapper: Wrapper<'_>) -> ChainResponse {
+    pub async fn process_request_rev(
+        &mut self,
+        mut wrapper: Wrapper<'_>,
+        client_details: String,
+    ) -> ChainResponse {
         let start = Instant::now();
         wrapper.reset_rev(&mut self.chain);
 
@@ -199,7 +203,7 @@ impl TransformChain {
             self.chain_failures.increment(1);
         }
 
-        histogram!("shotover_chain_latency", start.elapsed(),  "chain" => self.name.clone());
+        histogram!("shotover_chain_latency", start.elapsed(),  "chain" => self.name.clone(), "client_details" => client_details);
         result
     }
 }
@@ -226,7 +230,7 @@ impl TransformChainBuilder {
 
         let chain_total = register_counter!("shotover_chain_total", "chain" => name.clone());
         let chain_failures = register_counter!("shotover_chain_failures", "chain" => name.clone());
-        register_histogram!("shotover_chain_latency", "chain" => name.clone());
+        // Cant register shotover_chain_latency because a unique one is created for each client ip address
 
         TransformChainBuilder {
             name,

diff --git a/shotover-proxy/tests/runner/observability_int_tests.rs b/shotover-proxy/tests/runner/observability_int_tests.rs
@@ -1,7 +1,6 @@
-use crate::helpers::ShotoverManager;
 use itertools::Itertools;
 use serial_test::serial;
-use test_helpers::connection::redis_connection;
+use test_helpers::{connection::redis_connection, shotover_process::shotover_from_topology_file};
 
 async fn http_request_metrics() -> String {
     let url = "http://localhost:9001/metrics";
@@ -65,8 +64,7 @@ async fn assert_metrics_key_value(key: &str, value: &str) {
 #[tokio::test(flavor = "multi_thread")]
 #[serial]
 async fn test_metrics() {
-    let _shotover_manager =
-        ShotoverManager::from_topology_file("example-configs/null-redis/topology.yaml");
+    let shotover = shotover_from_topology_file("example-configs/null-redis/topology.yaml").await;
     let mut connection = redis_connection::new_async(6379).await;
 
     // Expected string looks unnatural because it is sorted in alphabetical order to make it match the sorted error output
@@ -83,23 +81,14 @@ query_count{name="redis-chain"}
 shotover_available_connections{source="RedisSource"}
 shotover_chain_failures{chain="redis_chain"}
 shotover_chain_latency_count{chain="redis_chain",client_details="127.0.0.1"}
-shotover_chain_latency_count{chain="redis_chain"}
 shotover_chain_latency_sum{chain="redis_chain",client_details="127.0.0.1"}
-shotover_chain_latency_sum{chain="redis_chain"}
 shotover_chain_latency{chain="redis_chain",client_details="127.0.0.1",quantile="0"}
 shotover_chain_latency{chain="redis_chain",client_details="127.0.0.1",quantile="0.5"}
 shotover_chain_latency{chain="redis_chain",client_details="127.0.0.1",quantile="0.9"}
 shotover_chain_latency{chain="redis_chain",client_details="127.0.0.1",quantile="0.95"}
 shotover_chain_latency{chain="redis_chain",client_details="127.0.0.1",quantile="0.99"}
 shotover_chain_latency{chain="redis_chain",client_details="127.0.0.1",quantile="0.999"}
 shotover_chain_latency{chain="redis_chain",client_details="127.0.0.1",quantile="1"}
-shotover_chain_latency{chain="redis_chain",quantile="0"}
-shotover_chain_latency{chain="redis_chain",quantile="0.5"}
-shotover_chain_latency{chain="redis_chain",quantile="0.9"}
-shotover_chain_latency{chain="redis_chain",quantile="0.95"}
-shotover_chain_latency{chain="redis_chain",quantile="0.99"}
-shotover_chain_latency{chain="redis_chain",quantile="0.999"}
-shotover_chain_latency{chain="redis_chain",quantile="1"}
 shotover_chain_total{chain="redis_chain"}
 shotover_transform_failures{transform="Null"}
 shotover_transform_failures{transform="QueryCounter"}
@@ -163,4 +152,6 @@ query_count{name="redis-chain",query="SET",type="redis"}
         "2",
     )
     .await;
+
+    shotover.shutdown_and_then_consume_events(&[]).await;
 }