diff --git a/Cargo.lock b/Cargo.lock index d48a154..ed8168c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2111,7 +2111,7 @@ dependencies = [ "axum", "chrono", "dotenvy", - "metrics", + "metrics 0.23.1", "proptest", "serde", "serde_json", @@ -2162,7 +2162,7 @@ dependencies = [ "dpp-domain", "dpp-types", "hex", - "metrics", + "metrics 0.23.1", "serde", "serde_json", "sha2 0.10.9", @@ -2259,7 +2259,7 @@ dependencies = [ "dpp-common", "dpp-domain", "futures", - "metrics", + "metrics 0.23.1", "proptest", "quick-xml", "reqwest", @@ -2307,7 +2307,7 @@ dependencies = [ "futures", "hex", "hmac 0.12.1", - "metrics", + "metrics 0.23.1", "metrics-exporter-prometheus", "reqwest", "serde", @@ -2340,7 +2340,7 @@ dependencies = [ "dpp-domain", "dpp-plugin-traits", "ed25519-dalek 2.2.0", - "metrics", + "metrics 0.23.1", "serde", "serde_json", "sha2 0.10.9", @@ -2413,7 +2413,7 @@ dependencies = [ "dpp-vc", "ed25519-dalek 2.2.0", "image 0.24.9", - "metrics", + "metrics 0.23.1", "metrics-exporter-prometheus", "qrcode", "rand 0.8.7", @@ -2507,7 +2507,7 @@ dependencies = [ "flate2", "futures", "hex", - "metrics", + "metrics 0.23.1", "proptest", "rand 0.8.7", "reqwest", @@ -2761,6 +2761,17 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "evmap" +version = "11.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b8874945f036109c72242964c1174cf99434e30cfa45bf45fedc983f50046f8" +dependencies = [ + "hashbag", + "left-right", + "smallvec", +] + [[package]] name = "fancy-regex" version = "0.19.0" @@ -3034,6 +3045,21 @@ dependencies = [ "thread_local", ] +[[package]] +name = "generator" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3b854b0e584ead1a33f18b2fcad7cf7be18b3875c78816b753639aa501513ae" +dependencies = [ + "cc", + "cfg-if", + "libc", + "log", + "rustversion", + "windows-link", + "windows-result", +] + [[package]] name = "generic-array" version = "0.14.7" @@ -3149,19 +3175,16 @@ dependencies = [ ] [[package]] -name = "hashbrown" -version = "0.12.3" +name = "hashbag" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +checksum = "7040a10f52cba493ddb09926e15d10a9d8a28043708a405931fe4c6f19fac064" [[package]] name = "hashbrown" -version = "0.14.5" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" -dependencies = [ - "ahash", -] +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" @@ -3371,7 +3394,6 @@ dependencies = [ "http 1.5.0", "hyper", "hyper-util", - "log", "rustls", "rustls-native-certs", "tokio", @@ -3855,6 +3877,17 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" +[[package]] +name = "left-right" +version = "0.11.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bc015ded5d9b3054dbbdb63332cdd6ee42352ccef19e911e25117490e2f48ee" +dependencies = [ + "crossbeam-utils", + "loom", + "slab", +] + [[package]] name = "libc" version = "0.2.189" @@ -3919,6 +3952,19 @@ version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad" +[[package]] +name = "loom" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "419e0dc8046cb947daa77eb95ae174acfbddb7673b4151f56d1eed8e93fbfaca" +dependencies = [ + "cfg-if", + "generator", + "scoped-tls", + "tracing", + "tracing-subscriber", +] + [[package]] name = "lru" version = "0.16.4" @@ -4005,39 +4051,53 @@ dependencies = [ "portable-atomic", ] +[[package]] +name = "metrics" +version = "0.24.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89550ee9f79e88fef3119de263694973a8adb26c21d75322164fb8c493039fe2" +dependencies = [ + "portable-atomic", + "rapidhash", +] + [[package]] name = "metrics-exporter-prometheus" -version = "0.15.3" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f0c8427b39666bf970460908b213ec09b3b350f20c0c2eabcbba51704a08e6" +checksum = "1db0d8f1fc9e62caebd0319e11eaec5822b0186c171568f0480b46a0137f9108" dependencies = [ "base64 0.22.1", + "evmap", "http-body-util", "hyper", "hyper-rustls", "hyper-util", "indexmap 2.14.0", "ipnet", - "metrics", + "metrics 0.24.6", "metrics-util", "quanta", - "thiserror 1.0.69", + "rustls", + "thiserror 2.0.19", "tokio", "tracing", ] [[package]] name = "metrics-util" -version = "0.17.0" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4259040465c955f9f2f1a4a8a16dc46726169bca0f88e8fb2dbeced487c3e828" +checksum = "96f8722f8562635f92f8ed992f26df0532266eb03d5202607c20c0d7e9745e13" dependencies = [ "crossbeam-epoch", "crossbeam-utils", - "hashbrown 0.14.5", - "metrics", - "num_cpus", + "hashbrown 0.16.1", + "metrics 0.24.6", "quanta", + "rand 0.9.5", + "rand_xoshiro", + "rapidhash", "sketches-ddsketch", ] @@ -4911,6 +4971,24 @@ dependencies = [ "rand_core 0.9.5", ] +[[package]] +name = "rand_xoshiro" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f703f4665700daf5512dcca5f43afa6af89f09db47fb56be587f80636bda2d41" +dependencies = [ + "rand_core 0.9.5", +] + +[[package]] +name = "rapidhash" +version = "4.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5da7e78a036ce858e8d55b7e7dc8ba3a88b78350fd2155d3591bbd966b58589e" +dependencies = [ + "rustversion", +] + [[package]] name = "raw-cpuid" version = "11.6.0" @@ -5366,6 +5444,12 @@ dependencies = [ "serde_json", ] +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + [[package]] name = "scopeguard" version = "1.2.0" @@ -5733,9 +5817,9 @@ checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" [[package]] name = "sketches-ddsketch" -version = "0.2.2" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85636c14b73d81f541e525f585c0a2109e6744e1565b5c1668e31c70c10ed65c" +checksum = "0c6f73aeb92d671e0cc4dca167e59b2deb6387c375391bc99ee743f326994a2b" [[package]] name = "slab" diff --git a/Cargo.toml b/Cargo.toml index 2ccc52e..02c89af 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -130,7 +130,7 @@ deadpool-redis = "0.23" tracing = "0.1" tracing-subscriber = { version = "0.3", features = ["env-filter", "json"] } metrics = "0.23" -metrics-exporter-prometheus = "0.15" +metrics-exporter-prometheus = "0.18" # Benchmarking criterion = { version = "0.8", features = ["html_reports"] }