chore(deps): bump metrics to 0.22 (#8517)

Cargo.toml

@@ -361,8 +361,6 @@ strum = "0.26"
 rayon = "1.7"
 itertools = "0.12"
 parking_lot = "0.12"
-# Needed for `metrics-macro` to resolve the crate using `::metrics` notation
-metrics = "0.21.1"
 modular-bitfield = "0.11.2"
 once_cell = "1.17"
 syn = "2.0"
@@ -373,6 +371,12 @@ sha2 = { version = "0.10", default-features = false }
 paste = "1.0"
 url = "2.3"
 
+# metrics
+metrics = "0.22.0"
+metrics-exporter-prometheus = { version = "0.14.0", default-features = false }
+metrics-util = "0.16.0"
+metrics-process = "2.0.0"
+
 # proc-macros
 proc-macro2 = "1.0"
 quote = "1.0"

bin/reth/Cargo.toml

@@ -75,7 +75,7 @@ confy.workspace = true
 toml = { workspace = true, features = ["display"] }
 
 # metrics
-metrics-process = "=1.0.14"
+metrics-process.workspace = true
 
 # test vectors generation
 proptest.workspace = true

crates/metrics/metrics-derive/src/lib.rs

@@ -58,10 +58,10 @@ mod with_attrs;
 /// impl Default for CustomMetrics {
 ///     fn default() -> Self {
 ///         Self {
-///             gauge: metrics::register_gauge!("metrics_custom_gauge"),
-///             gauge2: metrics::register_gauge!("metrics_custom_second_gauge"),
-///             counter: metrics::register_counter!("metrics_custom_counter"),
-///             histo: metrics::register_histogram!("metrics_custom_histogram"),
+///             gauge: metrics::gauge!("metrics_custom_gauge"),
+///             gauge2: metrics::gauge!("metrics_custom_second_gauge"),
+///             counter: metrics::counter!("metrics_custom_counter"),
+///             histo: metrics::histogram!("metrics_custom_histogram"),
 ///         }
 ///     }
 /// }
@@ -115,7 +115,7 @@ mod with_attrs;
 ///
 /// impl DynamicScopeMetrics {
 ///     pub fn new(scope: &str) -> Self {
-///         Self { gauge: metrics::register_gauge!(format!("{}{}{}", scope, "_", "gauge")) }
+///         Self { gauge: metrics::gauge!(format!("{}{}{}", scope, "_", "gauge")) }
 ///     }
 ///
 ///     pub fn describe(scope: &str) {

crates/metrics/metrics-derive/src/metric.rs

@@ -27,9 +27,9 @@ impl<'a> Metric<'a> {
         if let Type::Path(ref path_ty) = self.field.ty {
             if let Some(last) = path_ty.path.segments.last() {
                 let registrar = match last.ident.to_string().as_str() {
-                    COUNTER_TY => quote! { metrics::register_counter! },
-                    HISTOGRAM_TY => quote! { metrics::register_histogram! },
-                    GAUGE_TY => quote! { metrics::register_gauge! },
+                    COUNTER_TY => quote! { metrics::counter! },
+                    HISTOGRAM_TY => quote! { metrics::histogram! },
+                    GAUGE_TY => quote! { metrics::gauge! },
                     _ => return Err(Error::new_spanned(path_ty, "Unsupported metric type")),
                 };