Skip to content

chore: bump metrics #4265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shekhirin merged 4 commits into from
Aug 18, 2023
Merged

chore: bump metrics #4265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1f24609
feat(bin): reth_ prefix for process metrics
shekhirin Aug 18, 2023
f9dfcc9
revert prefix, upgrade metrics
shekhirin Aug 18, 2023
773f9c9
Merge remote-tracking branch 'origin/main' into alexey/process-metric…
shekhirin Aug 18, 2023
7a32e44
revert full node bail removal
shekhirin Aug 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 34 additions & 68 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions bin/reth/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ reth-net-nat = { path = "../../crates/net/nat" }
reth-payload-builder.workspace = true
reth-basic-payload-builder = { path = "../../crates/payload/basic" }
reth-discv4 = { path = "../../crates/net/discv4" }
reth-metrics.workspace = true
reth-prune = { path = "../../crates/prune" }
reth-trie = { path = "../../crates/trie" }

Expand All @@ -58,9 +57,11 @@ confy = "0.5"
toml = { version = "0.7", features = ["display"] }

# metrics
metrics-exporter-prometheus = "0.11.0"
metrics-util = "0.14.0"
metrics-exporter-prometheus = "0.12.1"
metrics-util = "0.15.0"
metrics-process = "1.0.9"
reth-metrics.workspace = true
metrics = "0.21.1" # Needed for `metrics-macro` to resolve the crate using `::metrics` notation

# test vectors generation
proptest.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion bin/reth/src/prometheus_exporter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use hyper::{
use metrics_exporter_prometheus::{PrometheusBuilder, PrometheusHandle};
use metrics_util::layers::{PrefixLayer, Stack};
use reth_db::{database::Database, tables, DatabaseEnv};
use reth_metrics::metrics::{self, absolute_counter, describe_counter, Unit};
use reth_metrics::metrics::{absolute_counter, describe_counter, Unit};
use std::{convert::Infallible, net::SocketAddr, sync::Arc};

pub(crate) trait Hook: Fn() + Send + Sync {}
Expand Down
7 changes: 5 additions & 2 deletions crates/blockchain-tree/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ normal = [
reth-primitives.workspace = true
reth-interfaces.workspace = true
reth-db = { path = "../storage/db" }
reth-metrics = { workspace = true, features = ["common"] }
reth-provider.workspace = true
reth-stages = { path = "../stages" }

Expand All @@ -27,7 +26,11 @@ parking_lot.workspace = true
lru = "0.10"
tracing.workspace = true

# mics
# metrics
reth-metrics = { workspace = true, features = ["common"] }
metrics = "0.21.1" # Needed for `metrics-macro` to resolve the crate using `::metrics` notation

# misc
aquamarine = "0.3.0"
linked_hash_set = "0.1.4"

Expand Down
2 changes: 1 addition & 1 deletion crates/blockchain-tree/src/metrics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use reth_metrics::{
metrics::{self, Counter, Gauge},
metrics::{Counter, Gauge},
Metrics,
};

Expand Down
5 changes: 4 additions & 1 deletion crates/consensus/beacon/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,17 @@ reth-provider.workspace = true
reth-rpc-types.workspace = true
reth-tasks.workspace = true
reth-payload-builder.workspace = true
reth-metrics.workspace = true
reth-prune = { path = "../../prune" }

# async
tokio = { workspace = true, features = ["sync"] }
tokio-stream.workspace = true
futures.workspace = true

# metrics
reth-metrics.workspace = true
metrics = "0.21.1" # Needed for `metrics-macro` to resolve the crate using `::metrics` notation

# misc
tracing.workspace = true
thiserror.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion crates/consensus/beacon/src/engine/invalid_headers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use reth_metrics::{
metrics::{self, Counter, Gauge},
metrics::{Counter, Gauge},
Metrics,
};
use reth_primitives::{Header, SealedHeader, H256};
Expand Down
Loading