chore: bump metrics (#4265)

crates/net/downloaders/Cargo.toml

@@ -14,7 +14,6 @@ reth-interfaces.workspace = true
 reth-primitives.workspace = true
 reth-db = { path = "../../storage/db" }
 reth-tasks.workspace = true
-reth-metrics.workspace = true
 
 # async
 futures.workspace = true
@@ -24,6 +23,10 @@ tokio = { workspace = true, features = ["sync"] }
 tokio-stream.workspace = true
 tokio-util = { workspace = true, features = ["codec"] }
 
+# metrics
+reth-metrics.workspace = true
+metrics = "0.21.1" # Needed for `metrics-macro` to resolve the crate using `::metrics` notation
+
 # misc
 tracing.workspace = true
 rayon.workspace = true

crates/net/downloaders/src/metrics.rs

@@ -1,6 +1,6 @@
 use reth_interfaces::p2p::error::DownloadError;
 use reth_metrics::{
-    metrics::{self, Counter, Gauge},
+    metrics::{Counter, Gauge},
     Metrics,
 };
 

crates/net/eth-wire/Cargo.toml

@@ -24,7 +24,10 @@ reth-rlp = { workspace = true, features = [
     "ethereum-types",
     "smol_str",
 ] }
+
+# metrics
 reth-metrics.workspace = true
+metrics = "0.21.1" # Needed for `metrics-macro` to resolve the crate using `::metrics` notation
 
 # used for Chain and builders
 ethers-core = { workspace = true, default-features = false }

crates/net/eth-wire/src/p2pstream.rs

@@ -9,7 +9,7 @@ use crate::{
 use futures::{Sink, SinkExt, StreamExt};
 use pin_project::pin_project;
 use reth_codecs::derive_arbitrary;
-use reth_metrics::metrics::{self, counter};
+use reth_metrics::metrics::counter;
 use reth_primitives::{
     bytes::{Buf, BufMut, Bytes, BytesMut},
     hex,

crates/net/network/Cargo.toml

@@ -31,7 +31,6 @@ reth-rlp-derive = { path = "../../rlp/rlp-derive" }
 reth-tasks.workspace = true
 reth-transaction-pool.workspace = true
 reth-provider.workspace = true
-reth-metrics = { workspace = true, features = ["common"] }
 reth-rpc-types.workspace = true
 
 # async/futures
@@ -46,6 +45,10 @@ serde = { workspace = true, optional = true }
 humantime-serde = { version = "1.1", optional = true }
 serde_json = { workspace = true, optional = true }
 
+# metrics
+reth-metrics = { workspace = true, features = ["common"] }
+metrics = "0.21.1" # Needed for `metrics-macro` to resolve the crate using `::metrics` notation
+
 # misc
 auto_impl = "1"
 aquamarine = "0.3.0"

crates/net/network/src/metrics.rs

@@ -1,6 +1,6 @@
 use reth_eth_wire::DisconnectReason;
 use reth_metrics::{
-    metrics::{self, Counter, Gauge},
+    metrics::{Counter, Gauge},
     Metrics,
 };