diff --git a/Cargo.lock b/Cargo.lock index c5180b899..c8961c6b4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -117,15 +117,6 @@ dependencies = [ "autocfg", ] -[[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" @@ -242,16 +233,16 @@ dependencies = [ [[package]] name = "cached" -version = "0.36.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d9447b2a367383a918fbbe62f6892da68000170c7331003d132b4805b63214" +checksum = "1fb357e6e99f5d293f67f492dd3eb7f8c4d5ed7c48d22129f3464e57c9dd5394" dependencies = [ "async-trait", "async_once", "cached_proc_macro", "cached_proc_macro_types", "futures", - "hashbrown 0.12.1", + "hashbrown", "instant", "lazy_static", "once_cell", @@ -261,9 +252,9 @@ dependencies = [ [[package]] name = "cached_proc_macro" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4797df465f7409b55bab9ccd1edbf1d279ffdf763772c2804b96740ee72f3b82" +checksum = "b01c8c46a3494c931456ad652aaab219cccd2785bdf3efbc00f733849d00df03" dependencies = [ "cached_proc_macro_types", "darling", @@ -285,7 +276,7 @@ checksum = "cfa5d9e96a365aa8c025dd5a0c90179de277b76f9494d8dea956bcd6241bae6c" dependencies = [ "cassandra-cpp-sys", "error-chain", - "parking_lot 0.12.1", + "parking_lot", "slog", "uuid 0.8.2", ] @@ -1015,8 +1006,8 @@ dependencies = [ "futures-timer", "no-std-compat", "nonzero_ext", - "parking_lot 0.12.1", - "quanta", + "parking_lot", + "quanta 0.9.3", "rand", "smallvec", ] @@ -1052,16 +1043,7 @@ version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce69ed202df415a3d4a01e6f3341320ca88b9bd4f0bf37be6fa239cdea06d9bf" dependencies = [ - "hashbrown 0.12.1", -] - -[[package]] -name = "hashbrown" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" -dependencies = [ - "ahash", + "hashbrown", ] [[package]] @@ -1214,7 +1196,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" dependencies = [ "autocfg", - "hashbrown 0.12.1", + "hashbrown", ] [[package]] @@ -1382,27 +1364,29 @@ dependencies = [ [[package]] name = "metrics" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "142c53885123b68d94108295a09d4afe1a1388ed95b54d5dacd9a454753030f2" +checksum = "94a70dc6c8179c4e889928dffb92336b821462c7b7613de91304fe80040fec12" dependencies = [ "ahash", "metrics-macros", + "portable-atomic", ] [[package]] name = "metrics-exporter-prometheus" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953cbbb6f9ba4b9304f4df79b98cdc9d14071ed93065a9fca11c00c5d9181b66" +checksum = "8603921e1f54ef386189335f288441af761e0fc61bcb552168d9cedfe63ebc70" dependencies = [ "hyper", "indexmap", "ipnet", "metrics", "metrics-util", - "parking_lot 0.11.2", - "quanta", + "parking_lot", + "portable-atomic", + "quanta 0.10.1", "thiserror", "tokio", "tracing", @@ -1421,21 +1405,21 @@ dependencies = [ [[package]] name = "metrics-util" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd1f4b69bef1e2b392b2d4a12902f2af90bb438ba4a66aa222d1023fa6561b50" +checksum = "f7d24dc2dbae22bff6f1f9326ffce828c9f07ef9cc1e8002e5279f845432a30a" dependencies = [ "aho-corasick", - "atomic-shim", "crossbeam-epoch", "crossbeam-utils", - "hashbrown 0.11.2", + "hashbrown", "indexmap", "metrics", "num_cpus", "ordered-float 2.10.0", - "parking_lot 0.11.2", - "quanta", + "parking_lot", + "portable-atomic", + "quanta 0.10.1", "radix_trie", "sketches-ddsketch", ] @@ -1771,17 +1755,6 @@ version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21326818e99cfe6ce1e524c2a805c189a99b5ae555a35d19f9a284b427d86afa" -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.5", -] - [[package]] name = "parking_lot" version = "0.12.1" @@ -1789,21 +1762,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.3", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall", - "smallvec", - "winapi", + "parking_lot_core", ] [[package]] @@ -1953,6 +1912,12 @@ dependencies = [ "universal-hash", ] +[[package]] +name = "portable-atomic" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "763095e04dcbeb889b2ab35296ecb18a20fe16b4e9877ce64aab73d8fd05a8c3" + [[package]] name = "ppv-lite86" version = "0.2.16" @@ -2014,6 +1979,22 @@ dependencies = [ "winapi", ] +[[package]] +name = "quanta" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7e31331286705f455e56cca62e0e717158474ff02b7936c1fa596d983f4ae27" +dependencies = [ + "crossbeam-utils", + "libc", + "mach", + "once_cell", + "raw-cpuid", + "wasi 0.10.0+wasi-snapshot-preview1", + "web-sys", + "winapi", +] + [[package]] name = "quick-error" version = "1.2.3" @@ -2514,7 +2495,7 @@ dependencies = [ "futures", "lazy_static", "log", - "parking_lot 0.12.1", + "parking_lot", "serial_test_derive", ] @@ -2663,9 +2644,9 @@ checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" [[package]] name = "sketches-ddsketch" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04d2ecae5fcf33b122e2e6bd520a57ccf152d2dde3b38c71039df1a6867264ee" +checksum = "ceb945e54128e09c43d8e4f1277851bd5044c6fc540bbaa2ad888f60b3da9ae7" [[package]] name = "slab" @@ -2918,7 +2899,7 @@ dependencies = [ "mio", "num_cpus", "once_cell", - "parking_lot 0.12.1", + "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2", @@ -3005,7 +2986,7 @@ dependencies = [ "futures-io", "futures-sink", "futures-util", - "hashbrown 0.12.1", + "hashbrown", "pin-project-lite", "slab", "tokio", diff --git a/shotover-proxy/Cargo.toml b/shotover-proxy/Cargo.toml index ef37445a0..cee02fb4c 100644 --- a/shotover-proxy/Cargo.toml +++ b/shotover-proxy/Cargo.toml @@ -28,7 +28,7 @@ derivative = "2.1.1" itertools = "0.10.1" rand = { version = "0.8.4" } rand_distr = "0.4.1" -cached = "0.36" +cached = "0.37" pin-project-lite = "0.2" tokio-openssl = "0.6.2" openssl = { version = "0.10.36", features = ["vendored"] } @@ -52,8 +52,8 @@ bigdecimal = {version ="0.3.0", features = ["serde"] } base64 = "0.13.0" #Observability -metrics = "0.19.0" -metrics-exporter-prometheus = "0.10.0" +metrics = "0.20.0" +metrics-exporter-prometheus = "0.11.0" tracing = { version = "0.1.15", features = ["release_max_level_info"] } tracing-subscriber = { version = "0.3.1", features = ["env-filter"] } tracing-log = { version = "0.1.1", features = ["env_logger"] } @@ -89,7 +89,7 @@ test-helpers = { path = "../test-helpers" } hex-literal = "0.3.3" nix = "0.24.0" reqwest = "0.11.6" -metrics-util = "0.13.0" +metrics-util = "0.14.0" cdrs-tokio = { git = "https://github.com/krojew/cdrs-tokio" } [[bench]]