Fix for deadlock

Cargo.toml

@@ -12,12 +12,13 @@ members = [
 [workspace.dependencies]
 bytes = { version = "1.7", default-features = false, features = ["std"] }
 byte-unit = { version = "4.0", features = ["serde"] }
-metrics = { version = "0.23.0" }
-metrics-util = { version = "0.17.0" }
-metrics-exporter-prometheus = { version = "0.15.3", default-features = false, features = [
-  "http-listener",
-  "uds-listener",
-] }
+
+# Metrics-rs crates are pinned to 6e40d6c08f4d3a2059a0a7577a6e11930acb52ee until
+# a release is cut that contains https://github.com/metrics-rs/metrics/pull/522
+metrics = { git = "https://github.com/scottopell/metrics.git", rev = "6e40d6c08f4d3a2059a0a7577a6e11930acb52ee" }
+metrics-util = { git = "https://github.com/scottopell/metrics.git", rev = "6e40d6c08f4d3a2059a0a7577a6e11930acb52ee" }
+metrics-exporter-prometheus = { git = "https://github.com/scottopell/metrics.git", rev = "6e40d6c08f4d3a2059a0a7577a6e11930acb52ee", default-features = false, features = ["http-listener", "uds-listener"]}
+
 prost = "0.11"
 rand = { version = "0.8", default-features = false }
 rustc-hash = { version = "1.1" }

lading/src/captures.rs

@@ -131,11 +131,12 @@ impl CaptureManager {
             .registry
             .visit_counters(|key: &metrics::Key, counter| {
                 let gen = counter.get_generation();
-
-                if !self
+                let should_store = self
                     .inner
                     .recency
-                    .should_store_counter(key, gen, &self.inner.registry)
+                    .has_counter_expired(key, gen, &self.inner.registry);
+
+                if !should_store
                 {
                     // Skip this metric, its too old
                     return;
@@ -161,11 +162,12 @@ impl CaptureManager {
             .registry
             .visit_gauges(|key: &metrics::Key, gauge| {
                 let gen = gauge.get_generation();
-
-                if !self
+                let should_store = self
                     .inner
                     .recency
-                    .should_store_gauge(key, gen, &self.inner.registry)
+                    .has_gauge_expired(key, gen, &self.inner.registry);
+
+                if !should_store
                 {
                     // Skip this metric, its too old
                     return;