Merge pull request #2307 from joske/fix/metrics-api-changes

Fix/metrics api changes

metrics/Cargo.toml

@@ -24,7 +24,7 @@ license = "Apache-2.0"
 edition = "2021"
 
 [dependencies.metrics]
-version = "0.21"
+version = "0.22"
 
 [dependencies.metrics-exporter-prometheus]
-version = "0.12"
+version = "0.13"

metrics/src/lib.rs

@@ -31,64 +31,70 @@ pub fn register_metrics() {
 
 /// Registers a counter with the given name.
 pub fn register_counter(name: &'static str) {
-    ::metrics::register_counter!(name);
+    let _counter = ::metrics::counter!(name);
 }
 
 /// Updates a counter with the given name to the given value.
 ///
 /// Counters represent a single monotonic value, which means the value can only be incremented,
 /// not decremented, and always starts out with an initial value of zero.
 pub fn counter<V: Into<u64>>(name: &'static str, value: V) {
-    ::metrics::counter!(name, value.into());
+    let counter = ::metrics::counter!(name);
+    counter.absolute(value.into());
 }
 
 /// Increments a counter with the given name by one.
 ///
 /// Counters represent a single monotonic value, which means the value can only be incremented,
 /// not decremented, and always starts out with an initial value of zero.
 pub fn increment_counter(name: &'static str) {
-    ::metrics::increment_counter!(name);
+    let counter = ::metrics::counter!(name);
+    counter.increment(1);
 }
 
 /******** Gauge ********/
 
 /// Registers a gauge with the given name.
 pub fn register_gauge(name: &'static str) {
-    ::metrics::register_gauge!(name);
+    let _gauge = ::metrics::gauge!(name);
 }
 
 /// Updates a gauge with the given name to the given value.
 ///
 /// Gauges represent a single value that can go up or down over time,
 /// and always starts out with an initial value of zero.
 pub fn gauge<V: Into<f64>>(name: &'static str, value: V) {
-    ::metrics::gauge!(name, value.into());
+    let gauge = ::metrics::gauge!(name);
+    gauge.set(value.into());
 }
 
 /// Increments a gauge with the given name by the given value.
 ///
 /// Gauges represent a single value that can go up or down over time,
 /// and always starts out with an initial value of zero.
 pub fn increment_gauge<V: Into<f64>>(name: &'static str, value: V) {
-    ::metrics::increment_gauge!(name, value.into());
+    let gauge = ::metrics::gauge!(name);
+    gauge.increment(value.into());
 }
 
 /// Decrements a gauge with the given name by the given value.
 ///
 /// Gauges represent a single value that can go up or down over time,
 /// and always starts out with an initial value of zero.
 pub fn decrement_gauge<V: Into<f64>>(name: &'static str, value: V) {
-    ::metrics::decrement_gauge!(name, value.into());
+    let gauge = ::metrics::gauge!(name);
+    gauge.decrement(value.into());
 }
 
 /******** Histogram ********/
 
 /// Registers a histogram with the given name.
 pub fn register_histogram(name: &'static str) {
-    ::metrics::register_histogram!(name);
+    let _histogram = ::metrics::histogram!(name);
 }
 
 /// Updates a histogram with the given name to the given value.
 pub fn histogram<V: Into<f64>>(name: &'static str, value: V) {
-    ::metrics::histogram!(name, value.into());
+    let histogram = ::metrics::histogram!(name);
+    histogram.record(value.into());
 }