diff --git a/Cargo.lock b/Cargo.lock index 20836d38..e894b40d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1285,7 +1285,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c24f403d068ad0b359e577a77f92392118be3f3c927538f2bb544a5ecd828c6" dependencies = [ "curve25519-dalek", - "hashbrown", + "hashbrown 0.12.3", "hex", "rand_core 0.6.4", "serde", @@ -1894,6 +1894,15 @@ dependencies = [ "ahash 0.7.6", ] +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +dependencies = [ + "ahash 0.8.3", +] + [[package]] name = "hdrhistogram" version = "7.5.2" @@ -2202,7 +2211,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.3", "serde", ] @@ -2214,7 +2223,7 @@ checksum = "cef509aa9bc73864d6756f0d34d35504af3cf0844373afe9b8669a5b8005a729" dependencies = [ "console", "number_prefix", - "portable-atomic", + "portable-atomic 0.3.19", "unicode-width", ] @@ -2554,10 +2563,10 @@ dependencies = [ ] [[package]] -name = "mach" -version = "0.3.2" +name = "mach2" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" +checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8" dependencies = [ "libc", ] @@ -2634,28 +2643,26 @@ dependencies = [ [[package]] name = "metrics" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b9b8653cec6897f73b519a43fba5ee3d50f62fe9af80b428accdcc093b4a849" +checksum = "aa8ebbd1a9e57bbab77b9facae7f5136aea44c356943bf9a198f647da64285d6" dependencies = [ - "ahash 0.7.6", + "ahash 0.8.3", "metrics-macros", - "portable-atomic", + "portable-atomic 1.2.0", ] [[package]] name = "metrics-exporter-prometheus" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8603921e1f54ef386189335f288441af761e0fc61bcb552168d9cedfe63ebc70" +checksum = "5142a593c2be0cf5c2ac5b22ec7a4f74477b851efb6238236af26c6b5ca6e98e" dependencies = [ "hyper", "indexmap", "ipnet", "metrics", "metrics-util", - "parking_lot 0.12.1", - "portable-atomic", "quanta", "thiserror", "tokio", @@ -2663,28 +2670,26 @@ dependencies = [ [[package]] name = "metrics-macros" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "731f8ecebd9f3a4aa847dfe75455e4757a45da40a7793d2f0b1f9b6ed18b23f3" +checksum = "ddece26afd34c31585c74a4db0630c376df271c285d682d1e55012197830b6df" dependencies = [ "proc-macro2 1.0.53", "quote 1.0.26", - "syn 1.0.109", + "syn 2.0.8", ] [[package]] name = "metrics-util" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d24dc2dbae22bff6f1f9326ffce828c9f07ef9cc1e8002e5279f845432a30a" +checksum = "111cb375987443c3de8d503580b536f77dc8416d32db62d9456db5d93bd7ac47" dependencies = [ "crossbeam-epoch", "crossbeam-utils", - "hashbrown", + "hashbrown 0.13.2", "metrics", "num_cpus", - "parking_lot 0.12.1", - "portable-atomic", "quanta", "sketches-ddsketch", ] @@ -3346,6 +3351,12 @@ version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26f6a7b87c2e435a3241addceeeff740ff8b7e76b74c13bf9acb17fa454ea00b" +[[package]] +name = "portable-atomic" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f602a0d1e09a48e4f8e8b4d4042e32807c3676da31f2ecabeac9f96226ec6c45" + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -3522,16 +3533,16 @@ dependencies = [ [[package]] name = "quanta" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e31331286705f455e56cca62e0e717158474ff02b7936c1fa596d983f4ae27" +checksum = "8cc73c42f9314c4bdce450c77e6f09ecbddefbeddb1b5979ded332a3913ded33" dependencies = [ "crossbeam-utils", "libc", - "mach", + "mach2", "once_cell", "raw-cpuid", - "wasi 0.10.2+wasi-snapshot-preview1", + "wasi 0.11.0+wasi-snapshot-preview1", "web-sys", "winapi", ] @@ -5418,12 +5429,6 @@ version = "0.9.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" -[[package]] -name = "wasi" -version = "0.10.2+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" diff --git a/deny.toml b/deny.toml index 8efe32ca..c4cd26dc 100644 --- a/deny.toml +++ b/deny.toml @@ -100,6 +100,11 @@ skip-tree = [ # wait for elasticsearch to update base64, darling, rustc_version, serde_with { name = "elasticsearch", version = "=8.5.0-alpha.1" }, + # Progress bar dependencies + + # wait for indicatif to update + { name = "portable-atomic", version = "=0.3.19" }, + # Unused dependencies # we don't support Windows at the moment (#3801) diff --git a/zebra-consensus/Cargo.toml b/zebra-consensus/Cargo.toml index 3a96555c..0c142e4d 100644 --- a/zebra-consensus/Cargo.toml +++ b/zebra-consensus/Cargo.toml @@ -42,7 +42,7 @@ serde = { version = "1.0.160", features = ["serde_derive"] } futures = "0.3.28" futures-util = "0.3.28" -metrics = "0.20.1" +metrics = "0.21.0" thiserror = "1.0.40" tokio = { version = "1.27.0", 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 64597af8..e0622653 100644 --- a/zebra-network/Cargo.toml +++ b/zebra-network/Cargo.toml @@ -45,7 +45,7 @@ tokio-stream = { version = "0.1.12", features = ["sync", "time"] } tokio-util = { version = "0.7.7", features = ["codec"] } tower = { version = "0.4.13", features = ["retry", "discover", "load", "load-shed", "timeout", "util", "buffer"] } -metrics = "0.20.1" +metrics = "0.21.0" tracing-futures = "0.2.5" tracing-error = { version = "0.2.0", features = ["traced-error"] } tracing = "0.1.37" diff --git a/zebra-state/Cargo.toml b/zebra-state/Cargo.toml index f942498b..5c0f6068 100644 --- a/zebra-state/Cargo.toml +++ b/zebra-state/Cargo.toml @@ -41,7 +41,7 @@ hex = "0.4.3" indexmap = "1.9.3" itertools = "0.10.5" lazy_static = "1.4.0" -metrics = "0.20.1" +metrics = "0.21.0" mset = "0.1.1" regex = "1.7.3" rlimit = "0.9.1" diff --git a/zebrad/Cargo.toml b/zebrad/Cargo.toml index 33bf0cef..230efc9a 100644 --- a/zebrad/Cargo.toml +++ b/zebrad/Cargo.toml @@ -138,7 +138,7 @@ tracing-error = "0.2.0" tracing-futures = "0.2.5" tracing = "0.1.37" -metrics = "0.20.1" +metrics = "0.21.0" dirs = "5.0.0" atty = "0.2.14" @@ -160,7 +160,7 @@ tracing-journald = { version = "0.3.0", optional = true } hyper = { version = "0.14.26", features = ["http1", "http2", "server"], optional = true } # prod feature prometheus -metrics-exporter-prometheus = { version = "0.11.0", default-features = false, features = ["http-listener"], optional = true } +metrics-exporter-prometheus = { version = "0.12.0", default-features = false, features = ["http-listener"], optional = true } # prod feature release_max_level_info #