Merge pull request #51 from Roblox/fix-double-metrics

Fix metrics being emitted more than once.
Roblox · Nov 23, 2024 · 33a3428 · 33a3428
2 parents bf854b9 + 17350f2
commit 33a3428
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## Unreleased
 
+## 0.8.2 - 2024-11-22
+
+- Fix metrics being emitted more than once.
+
 ## 0.8.1 - 2024-11-20
 
 ### Changed

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rs-consul"
-version = "0.8.1"
+version = "0.8.2"
 authors = ["Roblox"]
 edition = "2021"
 description = "This crate provides access to a set of strongly typed apis to interact with consul (https://www.consul.io/)"

diff --git a/src/lib.rs b/src/lib.rs
@@ -420,7 +420,7 @@ impl Consul {
                 #[cfg(feature = "metrics")]
                 {
                     metrics_info_wrapper.set_status(code);
-                    drop(metrics_info_wrapper.clone());
+                    metrics_info_wrapper.emit_metrics();
                 }
                 ConsulError::UnexpectedResponseCode(
                     code,
@@ -438,7 +438,7 @@ impl Consul {
             #[cfg(feature = "metrics")]
             {
                 metrics_info_wrapper.set_status(StatusCode::OK);
-                drop(metrics_info_wrapper.clone());
+                metrics_info_wrapper.emit_metrics();
             }
             return Ok(response);
         }
@@ -822,7 +822,7 @@ impl Consul {
                     #[cfg(feature = "metrics")]
                     {
                         metrics_info_wrapper.set_status(StatusCode::REQUEST_TIMEOUT);
-                        drop(metrics_info_wrapper.clone());
+                        metrics_info_wrapper.emit_metrics();
                     }
                     Err(ConsulError::TimeoutExceeded(dur))
                 }
@@ -833,7 +833,7 @@ impl Consul {
 
         let response = response.inspect_err(|_| {
             #[cfg(feature = "metrics")]
-            drop(metrics_info_wrapper.clone());
+            metrics_info_wrapper.emit_metrics();
         })?;
 
         #[cfg(feature = "trace")]
@@ -844,7 +844,7 @@ impl Consul {
             #[cfg(feature = "metrics")]
             {
                 metrics_info_wrapper.set_status(status);
-                drop(metrics_info_wrapper);
+                metrics_info_wrapper.emit_metrics();
             }
 
             let mut response_body = response

diff --git a/src/metrics.rs b/src/metrics.rs
@@ -65,19 +65,23 @@ impl MetricInfoWrapper {
     pub fn set_status(&mut self, status: StatusCode) {
         self.metrics.status = Some(status);
     }
-}
 
-#[cfg(feature = "metrics")]
-impl Drop for MetricInfoWrapper {
-    fn drop(&mut self) {
+    pub fn emit_metrics(&mut self) {
         if let Some(sender) = self.sender.take() {
             let mut metrics = self.metrics;
             metrics.duration = Some(self.start.elapsed());
-            let _ = sender.send(self.metrics);
+            let _ = sender.send(metrics);
         }
     }
 }
 
+#[cfg(feature = "metrics")]
+impl Drop for MetricInfoWrapper {
+    fn drop(&mut self) {
+        self.emit_metrics();
+    }
+}
+
 /// The HTTP methods supported by the consul API.
 #[derive(Debug, Clone, Copy)]
 pub enum HttpMethod {