From e6bc1b8042e5bd00bf699456ba04db98c4dc4c10 Mon Sep 17 00:00:00 2001 From: Ara Sadoyan Date: Tue, 8 Apr 2025 11:42:01 +0200 Subject: [PATCH] Dependency upgrade --- Cargo.lock | 186 +++++--------------------------------------- Cargo.toml | 16 ++-- etc/upstreams.yaml | 2 +- src/utils/consul.rs | 2 +- 4 files changed, 31 insertions(+), 175 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7d98932..a84ac1b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -122,17 +122,6 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" -[[package]] -name = "async-recursion" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.100", -] - [[package]] name = "async-stream" version = "0.3.6" @@ -175,14 +164,13 @@ dependencies = [ "dashmap", "env_logger", "futures", - "hickory-client", "log", "notify", "pingora", "pingora-core", "pingora-http", "pingora-proxy", - "rand 0.8.5", + "rand 0.9.0", "reqwest", "serde", "serde_yaml", @@ -214,9 +202,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "axum" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d6fd624c75e18b3b4c6b9caf42b1afe24437daaee904069137d8bab077be8b8" +checksum = "de45108900e1f9b9242f7f2e254aa3e2c029c921c258fe9e6b4217eeebd54288" dependencies = [ "axum-core", "bytes", @@ -248,12 +236,12 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.5.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df1362f362fd16024ae199c1970ce98f9661bf5ef94b9808fee734bc3698b733" +checksum = "68464cd0412f486726fb3373129ef5d2993f90c34bc2bc1c1e9943b2f4fc7ca6" dependencies = [ "bytes", - "futures-util", + "futures-core", "http", "http-body", "http-body-util", @@ -461,12 +449,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "critical-section" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b" - [[package]] name = "crossbeam-channel" version = "0.5.14" @@ -512,15 +494,15 @@ dependencies = [ [[package]] name = "dashmap" -version = "6.1.0" +version = "7.0.0-rc2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" +checksum = "e4a1e35a65fe0538a60167f0ada6e195ad5d477f6ddae273943596d4a1a5730b" dependencies = [ "cfg-if", "crossbeam-utils", - "hashbrown 0.14.5", + "equivalent", + "hashbrown 0.15.2", "lock_api", - "once_cell", "parking_lot_core", ] @@ -572,24 +554,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "endian-type" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" - -[[package]] -name = "enum-as-inner" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc" -dependencies = [ - "heck 0.5.0", - "proc-macro2", - "quote", - "syn 2.0.100", -] - [[package]] name = "env_filter" version = "0.1.3" @@ -602,9 +566,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.7" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3716d7a920fb4fac5d84e9d4bce8ceb321e9414b4409da61b07b75c1e3d0697" +checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f" dependencies = [ "anstream", "anstyle", @@ -856,12 +820,6 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -[[package]] -name = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" - [[package]] name = "hashbrown" version = "0.15.2" @@ -900,52 +858,6 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -[[package]] -name = "hickory-client" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bbd1b5def7a1b77783366577e86cb51172196f689823b0f8107da9391ba183f" -dependencies = [ - "cfg-if", - "data-encoding", - "futures-channel", - "futures-util", - "hickory-proto", - "once_cell", - "radix_trie", - "rand 0.9.0", - "thiserror 2.0.12", - "tokio", - "tracing", -] - -[[package]] -name = "hickory-proto" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d844af74f7b799e41c78221be863bade11c430d46042c3b49ca8ae0c6d27287" -dependencies = [ - "async-recursion", - "async-trait", - "cfg-if", - "critical-section", - "data-encoding", - "enum-as-inner", - "futures-channel", - "futures-io", - "futures-util", - "idna", - "ipnet", - "once_cell", - "rand 0.9.0", - "ring", - "thiserror 2.0.12", - "tinyvec", - "tokio", - "tracing", - "url", -] - [[package]] name = "hostname" version = "0.3.1" @@ -1399,9 +1311,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.26" +version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e" +checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" [[package]] name = "lru" @@ -1483,15 +1395,6 @@ dependencies = [ "tempfile", ] -[[package]] -name = "nibble_vec" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43" -dependencies = [ - "smallvec", -] - [[package]] name = "nix" version = "0.24.3" @@ -1552,10 +1455,6 @@ name = "once_cell" version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" -dependencies = [ - "critical-section", - "portable-atomic", -] [[package]] name = "openssl" @@ -1823,7 +1722,7 @@ dependencies = [ "pingora-http", "pingora-ketama", "pingora-runtime", - "rand 0.8.5", + "rand 0.9.0", "tokio", ] @@ -1836,7 +1735,7 @@ dependencies = [ "arrayvec", "hashbrown 0.15.2", "parking_lot", - "rand 0.8.5", + "rand 0.9.0", ] [[package]] @@ -1991,7 +1890,7 @@ dependencies = [ "memchr", "parking_lot", "protobuf", - "thiserror 1.0.69", + "thiserror", ] [[package]] @@ -2009,16 +1908,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "radix_trie" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c069c179fcdc6a2fe24d8d18305cf085fdbd4f922c041943e203685d6a1c58fd" -dependencies = [ - "endian-type", - "nibble_vec", -] - [[package]] name = "rand" version = "0.8.5" @@ -2606,16 +2495,7 @@ version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "thiserror-impl 1.0.69", -] - -[[package]] -name = "thiserror" -version = "2.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" -dependencies = [ - "thiserror-impl 2.0.12", + "thiserror-impl", ] [[package]] @@ -2629,17 +2509,6 @@ dependencies = [ "syn 2.0.100", ] -[[package]] -name = "thiserror-impl" -version = "2.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.100", -] - [[package]] name = "thread_local" version = "1.1.8" @@ -2670,26 +2539,11 @@ dependencies = [ "zerovec", ] -[[package]] -name = "tinyvec" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - [[package]] name = "tokio" -version = "1.44.1" +version = "1.44.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f382da615b842244d4b8738c82ed1275e6c5dd90c459a30941cd07080b06c91a" +checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48" dependencies = [ "backtrace", "bytes", diff --git a/Cargo.toml b/Cargo.toml index 126c200..2dbcce5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,21 +4,23 @@ version = "0.1.0" edition = "2021" [dependencies] -tokio = { version = "1.44.1", features = ["full"] } +tokio = { version = "1.44.2", features = ["full"] } pingora = { version = "0.4.0", features = ["lb", "openssl"] } # openssl, rustls, boringssl serde = { version = "1.0.219", features = ["derive"] } -dashmap = "6.1.0" +dashmap = "7.0.0-rc2" pingora-core = "0.4.0" pingora-proxy = "0.4.0" pingora-http = "0.4.0" async-trait = "0.1.88" -env_logger = "0.11.7" -log = "0.4.26" +env_logger = "0.11.8" +log = "0.4.27" futures = "0.3.31" notify = "8.0.0" -axum = "0.8.1" +axum = { version = "0.8.3" } +#axum-server = { version = "0.8.3", features = ["tls-rustls"] } + reqwest = { version = "0.12.15", features = ["json"] } serde_yaml = "0.8.26" -hickory-client = "0.25.1" -rand = "0.8.5" +#hickory-client = "0.25.1" +rand = "0.9.0" diff --git a/etc/upstreams.yaml b/etc/upstreams.yaml index a7a538b..c03116d 100644 --- a/etc/upstreams.yaml +++ b/etc/upstreams.yaml @@ -1,4 +1,4 @@ -provider: "consul" +provider: "file" globals: headers: - "Access-Control-Allow-Origin:*" diff --git a/src/utils/consul.rs b/src/utils/consul.rs index a217c62..1fc29b0 100644 --- a/src/utils/consul.rs +++ b/src/utils/consul.rs @@ -55,7 +55,7 @@ pub async fn start(fp: String, mut toreturn: Sender<(UpstreamsDashMap, Headers)> loop { // println!(" ==> {:?}", consul.services); - let num = rand::thread_rng().gen_range(1..end); + let num = rand::rng().random_range(1..end); headers.clear(); for (k, v) in config.headers.clone() { headers.insert(k.to_string(), v);