refactor(dependencies): update dependency versions and improve random number generation

Author: zhu327

Cargo.toml

@@ -5,38 +5,38 @@ edition = "2021"
 
 [dependencies]
 arc-swap = "1.7.1"
-async-trait = "0.1.83"
+async-trait = "0.1.42"
 base64 = "0.22.1"
-bytes = "1.8.0"
-dashmap = "6.1.0"
+bytes = "1.0"
+dashmap = "5"
 env_logger = { version = "0.11.5", features = ["unstable-kv"] }
-etcd-client = "0.16.1"
-futures = "0.3.31"
-hex = "0.4.3"
+etcd-client = "0.18.0"
+futures = "0.3"
+hex = "0.4"
 hickory-resolver = "0.25.2"
-http = "1.1.0"
+http = "1"
 ipnetwork = { version = "0.21.1", features = ["serde"] }
 jsonwebtoken = "9.3.1"
-log = { version = "0.4.22", features = ["kv"] }
+log = { version = "0.4", features = ["kv"] }
 matchit = "0.8.4"
-once_cell = "1.20.2"
-pingora = { version = "0.6.0", features = ["openssl", "sentry"] }
-pingora-cache = "0.6.0"
-pingora-core = "0.6.0"
-pingora-error = "0.6.0"
-pingora-http = "0.6.0"
-pingora-limits = "0.6.0"
-pingora-load-balancing = "0.6.0"
-pingora-proxy = "0.6.0"
-pingora-runtime = "0.6.0"
-prometheus = "0.13.4"
-rand = "0.9.2"
+once_cell = "1"
+pingora = { version = "0.7.0", features = ["openssl", "sentry"] }
+pingora-cache = "0.7.0"
+pingora-core = "0.7.0"
+pingora-error = "0.7.0"
+pingora-http = "0.7.0"
+pingora-limits = "0.7.0"
+pingora-load-balancing = "0.7.0"
+pingora-proxy = "0.7.0"
+pingora-runtime = "0.7.0"
+prometheus = "0.13"
+rand = "0.8"
 regex = "1.11.1"
 sentry = "0.36"
-serde = { version = "1.0.197", features = ["derive"] }
-serde_json = "1.0.133"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
 serde_with = "3.12.0"
-serde_yaml = "0.9.34"
+serde_yaml = "0.9"
 sha2 = "0.10.9"
 tokio = { version = "1.41.1", features = ["fs"] }
 uuid = { version = "1.16.0", features = ["v4"] }

src/config/etcd.rs

@@ -85,18 +85,13 @@ impl EtcdConfigSync {
 
         let client = self.get_client().await?;
 
-        let (mut watcher, mut stream) = client
+        let mut stream = client
             .watch(prefix.as_str(), Some(options))
             .await
             .map_err(|e| {
                 ProxyError::etcd_error_with_cause(format!("Failed to watch key '{prefix}'"), e)
             })?;
 
-        watcher
-            .request_progress()
-            .await
-            .map_err(|e| ProxyError::etcd_error_with_cause("Failed to request progress", e))?;
-
         while let Some(response) = stream
             .message()
             .await

src/plugins/csrf.rs

@@ -87,9 +87,9 @@ impl PluginCsrf {
     ///
     /// Returns None if system time is unavailable (should never happen in practice)
     fn gen_token_string(&self) -> Option<String> {
-        let mut rng = rand::rng();
+        let mut rng = rand::thread_rng();
         // Generate 16 random bytes for better entropy than f64
-        let random_bytes: [u8; 16] = rng.random();
+        let random_bytes: [u8; 16] = rng.gen();
         let random = hex::encode(random_bytes);
 
         // Get current timestamp, handle potential system time errors gracefully

src/plugins/fault_injection.rs

@@ -103,8 +103,8 @@ impl PluginFaultInjection {
         match percentage {
             None => true, // If no percentage is set, always apply
             Some(pct) => {
-                let mut rng = rand::rng();
-                rng.random_range(1..=100) <= pct
+                let mut rng = rand::thread_rng();
+                rng.gen_range(1..=100) <= pct
             }
         }
     }

src/plugins/request_id.rs

@@ -131,7 +131,7 @@ impl PluginRequestID {
             return Uuid::new_v4().to_string();
         }
 
-        let mut rng = rand::rng();
+        let mut rng = rand::thread_rng();
         (0..self.config.range_id.length)
             .map(|_| {
                 chars

src/plugins/traffic_split.rs

@@ -1,6 +1,7 @@
 use async_trait::async_trait;
 use pingora_error::Result;
 use pingora_proxy::Session;
+use rand::Rng;
 use serde::{Deserialize, Serialize};
 use serde_json::Value as JsonValue;
 use std::sync::Arc;
@@ -115,7 +116,8 @@ impl PluginTrafficSplit {
             return None;
         }
 
-        let mut n = rand::random_range(0..total_weight);
+        let mut rng = rand::thread_rng();
+        let mut n = rng.gen_range(0..total_weight);
 
         for (i, ups_cfg) in upstreams.iter().enumerate() {
             if n < ups_cfg.weight {