diff --git a/Cargo.lock b/Cargo.lock index fe04907..b640c93 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -418,9 +418,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bitflags" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +checksum = "1be3f42a67d6d345ecd59f675f3f012d6974981560836e938c22b424b85ce1be" [[package]] name = "block-buffer" @@ -1970,18 +1970,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.92" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" +checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99" dependencies = [ "unicode-ident", ] [[package]] name = "prometheus-client" -version = "0.22.3" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504ee9ff529add891127c4827eb481bd69dc0ebc72e9a682e187db4caa60c3ca" +checksum = "cf41c1a7c32ed72abe5082fb19505b969095c12da9f5732a4bc9878757fd087c" dependencies = [ "dtoa", "itoa", @@ -2025,9 +2025,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -2495,9 +2495,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.90" +version = "2.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" +checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 9b02372..044dc3c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -43,7 +43,7 @@ opentelemetry-otlp = { version = "0.27.0", optional = true } opentelemetry_sdk = { version = "0.27.1", features = ["rt-tokio"] } thiserror = "2.0.11" anyhow = "1.0.95" -prometheus-client = "0.22.2" +prometheus-client = "0.23.1" [dev-dependencies] assert-json-diff = "2.0.2" diff --git a/src/metrics.rs b/src/metrics.rs index 62e69aa..a96f59c 100644 --- a/src/metrics.rs +++ b/src/metrics.rs @@ -45,7 +45,7 @@ impl TryFrom<&TraceId> for TraceLabel { #[derive(Clone)] pub struct ReconcileMetrics { - pub runs: Family<(), Counter>, + pub runs: Counter, pub failures: Family, pub duration: HistogramWithExemplars, } @@ -53,7 +53,7 @@ pub struct ReconcileMetrics { impl Default for ReconcileMetrics { fn default() -> Self { Self { - runs: Family::<(), Counter>::default(), + runs: Counter::default(), failures: Family::::default(), duration: HistogramWithExemplars::new([0.01, 0.1, 0.25, 0.5, 1., 5., 15., 60.].into_iter()), } @@ -90,7 +90,7 @@ impl ReconcileMetrics { } pub fn count_and_measure(&self, trace_id: &TraceId) -> ReconcileMeasurer { - self.runs.get_or_create(&()).inc(); + self.runs.inc(); ReconcileMeasurer { start: Instant::now(), labels: trace_id.try_into().ok(),