diff --git a/Cargo.lock b/Cargo.lock index b68539b5..6ca4cd85 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -267,15 +267,6 @@ dependencies = [ "autocfg 1.1.0", ] -[[package]] -name = "atomic-shim" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67cd4b51d303cf3501c301e8125df442128d3c6d7c69f71b27833d253de47e77" -dependencies = [ - "crossbeam-utils", -] - [[package]] name = "atty" version = "0.2.14" @@ -2023,6 +2014,9 @@ name = "hashbrown" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3" +dependencies = [ + "ahash", +] [[package]] name = "hashlink" @@ -2718,26 +2712,28 @@ dependencies = [ [[package]] name = "metrics" -version = "0.18.1" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e52eb6380b6d2a10eb3434aec0885374490f5b82c8aaf5cd487a183c98be834" +checksum = "7b9b8653cec6897f73b519a43fba5ee3d50f62fe9af80b428accdcc093b4a849" dependencies = [ "ahash", "metrics-macros", + "portable-atomic", ] [[package]] name = "metrics-exporter-prometheus" -version = "0.9.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b93b470b04c005178058e18ac8bb2eb3fda562cf87af5ea05ba8d44190d458c" +checksum = "8603921e1f54ef386189335f288441af761e0fc61bcb552168d9cedfe63ebc70" dependencies = [ "hyper", "indexmap", "ipnet", "metrics", "metrics-util", - "parking_lot 0.11.2", + "parking_lot 0.12.0", + "portable-atomic", "quanta", "thiserror", "tokio", @@ -2745,9 +2741,9 @@ dependencies = [ [[package]] name = "metrics-macros" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49e30813093f757be5cf21e50389a24dc7dbb22c49f23b7e8f51d69b508a5ffa" +checksum = "731f8ecebd9f3a4aa847dfe75455e4757a45da40a7793d2f0b1f9b6ed18b23f3" dependencies = [ "proc-macro2 1.0.42", "quote 1.0.20", @@ -2756,17 +2752,17 @@ dependencies = [ [[package]] name = "metrics-util" -version = "0.12.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65a9e83b833e1d2e07010a386b197c13aa199bbd0fca5cf69bfa147972db890a" +checksum = "f7d24dc2dbae22bff6f1f9326ffce828c9f07ef9cc1e8002e5279f845432a30a" dependencies = [ - "atomic-shim", "crossbeam-epoch", "crossbeam-utils", - "hashbrown 0.11.2", + "hashbrown 0.12.1", "metrics", "num_cpus", - "parking_lot 0.11.2", + "parking_lot 0.12.0", + "portable-atomic", "quanta", "sketches-ddsketch", ] @@ -3454,6 +3450,12 @@ dependencies = [ "universal-hash", ] +[[package]] +name = "portable-atomic" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15eb2c6e362923af47e13c23ca5afb859e83d54452c55b0b9ac763b8f7c1ac16" + [[package]] name = "postage" version = "0.4.1" @@ -3648,9 +3650,9 @@ dependencies = [ [[package]] name = "quanta" -version = "0.9.3" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20afe714292d5e879d8b12740aa223c6a88f118af41870e8b6196e39a02238a8" +checksum = "b7e31331286705f455e56cca62e0e717158474ff02b7936c1fa596d983f4ae27" dependencies = [ "crossbeam-utils", "libc", @@ -4563,9 +4565,9 @@ checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" [[package]] name = "sketches-ddsketch" -version = "0.1.2" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a77a8fd93886010f05e7ea0720e569d6d16c65329dbe3ec033bbbccccb017b" +checksum = "ceb945e54128e09c43d8e4f1277851bd5044c6fc540bbaa2ad888f60b3da9ae7" [[package]] name = "slab" diff --git a/zebra-consensus/Cargo.toml b/zebra-consensus/Cargo.toml index f1cae215..4f3d936b 100644 --- a/zebra-consensus/Cargo.toml +++ b/zebra-consensus/Cargo.toml @@ -27,7 +27,7 @@ serde = { version = "1.0.145", features = ["serde_derive"] } futures = "0.3.24" futures-util = "0.3.24" -metrics = "0.18.1" +metrics = "0.20.1" thiserror = "1.0.35" tokio = { version = "1.21.1", features = ["time", "sync", "tracing", "rt-multi-thread"] } tower = { version = "0.4.13", features = ["timeout", "util", "buffer"] } diff --git a/zebra-network/Cargo.toml b/zebra-network/Cargo.toml index 49c83f52..53a737eb 100644 --- a/zebra-network/Cargo.toml +++ b/zebra-network/Cargo.toml @@ -35,7 +35,7 @@ tokio-stream = { version = "0.1.10", features = ["sync", "time"] } tokio-util = { version = "0.7.4", features = ["codec"] } tower = { version = "0.4.13", features = ["retry", "discover", "load", "load-shed", "timeout", "util", "buffer"] } -metrics = "0.18.1" +metrics = "0.20.1" tracing-futures = "0.2.5" tracing-error = { version = "0.2.0", features = ["traced-error"] } tracing = "0.1.35" diff --git a/zebra-state/Cargo.toml b/zebra-state/Cargo.toml index c02e45a7..29105b2c 100644 --- a/zebra-state/Cargo.toml +++ b/zebra-state/Cargo.toml @@ -17,7 +17,7 @@ futures = "0.3.24" hex = "0.4.3" itertools = "0.10.5" lazy_static = "1.4.0" -metrics = "0.18.1" +metrics = "0.20.1" mset = "0.1.0" regex = "1.6.0" rlimit = "0.8.3" diff --git a/zebrad/Cargo.toml b/zebrad/Cargo.toml index 3efbc2a6..0b8c1afe 100644 --- a/zebrad/Cargo.toml +++ b/zebrad/Cargo.toml @@ -104,7 +104,7 @@ tracing-error = "0.2.0" tracing-futures = "0.2.5" tracing = "0.1.35" -metrics = "0.18.1" +metrics = "0.20.1" dirs = "4.0.0" atty = "0.2.14" @@ -127,7 +127,7 @@ tracing-journald = { version = "0.3.0", optional = true } hyper = { version = "0.14.20", features = ["http1", "http2", "server"], optional = true } # prod feature prometheus -metrics-exporter-prometheus = { version = "0.9.0", default-features = false, features = ["http-listener"], optional = true } +metrics-exporter-prometheus = { version = "0.11.0", default-features = false, features = ["http-listener"], optional = true } # prod feature release_max_level_info #