merge main

crates/event-notifier/Cargo.toml

@@ -37,7 +37,7 @@ tokio = { workspace = true, features = ["test-util"] }
 tracing-subscriber = { workspace = true }
 http = { workspace = true }
 axum = { workspace = true }
-dotenvy = "0.15.7"
+dotenvy = { workspace = true }
 
 [lints]
 workspace = true

crates/obs/Cargo.toml

@@ -27,7 +27,7 @@ opentelemetry = { workspace = true }
 opentelemetry-appender-tracing = { workspace = true, features = ["experimental_use_tracing_span_context", "experimental_metadata_attributes"] }
 opentelemetry_sdk = { workspace = true, features = ["rt-tokio"] }
 opentelemetry-stdout = { workspace = true }
-opentelemetry-otlp = { workspace = true, features = ["grpc-tonic", "gzip-tonic"] }
+opentelemetry-otlp = { workspace = true, features = ["grpc-tonic", "gzip-tonic", "trace", "metrics", "logs", "internal-logs"] }
 opentelemetry-semantic-conventions = { workspace = true, features = ["semconv_experimental"] }
 rustfs-utils = { workspace = true, features = ["ip"] }
 serde = { workspace = true }

crates/obs/src/telemetry.rs

@@ -332,7 +332,7 @@ pub(crate) fn init_telemetry(config: &OtelConfig) -> OtelGuard {
         let flexi_logger_result = flexi_logger::Logger::try_with_env_or_str(logger_level)
             .unwrap_or_else(|e| {
                 eprintln!(
-                    "Invalid logger level: {}, using default: {},failed error:{}",
+                    "Invalid logger level: {}, using default: {}, failed error: {:?}",
                     logger_level, DEFAULT_LOG_LEVEL, e
                 );
                 flexi_logger::Logger::with(log_spec.clone())

crates/rio/src/compress_reader.rs

@@ -434,7 +434,7 @@ mod tests {
         use rand::Rng;
         // Generate 1MB of random bytes
         let mut data = vec![0u8; 1024 * 1024];
-        rand::thread_rng().fill(&mut data[..]);
+        rand::rng().fill(&mut data[..]);
         let reader = Cursor::new(data.clone());
         let mut compress_reader = CompressReader::new(reader, CompressionAlgorithm::Gzip);
 
@@ -453,7 +453,7 @@ mod tests {
         use rand::Rng;
         // Generate 1MB of random bytes
         let mut data = vec![0u8; 1024 * 1024];
-        rand::thread_rng().fill(&mut data[..]);
+        rand::rng().fill(&mut data[..]);
         let reader = Cursor::new(data.clone());
         let mut compress_reader = CompressReader::new(reader, CompressionAlgorithm::Deflate);
 

crates/rio/src/encrypt_reader.rs

@@ -348,8 +348,8 @@ mod tests {
         let data = b"hello sse encrypt";
         let mut key = [0u8; 32];
         let mut nonce = [0u8; 12];
-        rand::thread_rng().fill_bytes(&mut key);
-        rand::thread_rng().fill_bytes(&mut nonce);
+        rand::rng().fill_bytes(&mut key);
+        rand::rng().fill_bytes(&mut nonce);
 
         let reader = BufReader::new(&data[..]);
         let encrypt_reader = EncryptReader::new(reader, key, nonce);
@@ -375,8 +375,8 @@ mod tests {
         let data = b"test decrypt only";
         let mut key = [0u8; 32];
         let mut nonce = [0u8; 12];
-        rand::thread_rng().fill_bytes(&mut key);
-        rand::thread_rng().fill_bytes(&mut nonce);
+        rand::rng().fill_bytes(&mut key);
+        rand::rng().fill_bytes(&mut nonce);
 
         // Encrypt
         let reader = BufReader::new(&data[..]);
@@ -401,11 +401,11 @@ mod tests {
         use rand::Rng;
         let size = 1024 * 1024;
         let mut data = vec![0u8; size];
-        rand::thread_rng().fill(&mut data[..]);
+        rand::rng().fill(&mut data[..]);
         let mut key = [0u8; 32];
         let mut nonce = [0u8; 12];
-        rand::thread_rng().fill_bytes(&mut key);
-        rand::thread_rng().fill_bytes(&mut nonce);
+        rand::rng().fill_bytes(&mut key);
+        rand::rng().fill_bytes(&mut nonce);
 
         let reader = std::io::Cursor::new(data.clone());
         let encrypt_reader = EncryptReader::new(reader, key, nonce);

crates/rio/src/etag_reader.rs

@@ -165,7 +165,7 @@ mod tests {
         // Generate 3MB random data
         let size = 3 * 1024 * 1024;
         let mut data = vec![0u8; size];
-        rand::thread_rng().fill(&mut data[..]);
+        rand::rng().fill(&mut data[..]);
         let mut hasher = Md5::new();
         hasher.update(&data);
 

crates/rio/src/hash_reader.rs

@@ -378,7 +378,7 @@ mod tests {
         // Generate 1MB random data
         let size = 1024 * 1024;
         let mut data = vec![0u8; size];
-        rand::thread_rng().fill(&mut data[..]);
+        rand::rng().fill(&mut data[..]);
 
         let mut hasher = Md5::new();
         hasher.update(&data);
@@ -418,8 +418,8 @@ mod tests {
 
         let mut key = [0u8; 32];
         let mut nonce = [0u8; 12];
-        rand::thread_rng().fill_bytes(&mut key);
-        rand::thread_rng().fill_bytes(&mut nonce);
+        rand::rng().fill_bytes(&mut key);
+        rand::rng().fill_bytes(&mut nonce);
 
         let is_encrypt = true;
 

crates/rio/src/limit_reader.rs

@@ -174,7 +174,7 @@ mod tests {
         // Generate a 3MB random byte array for testing
         let size = 3 * 1024 * 1024;
         let mut data = vec![0u8; size];
-        rand::thread_rng().fill(&mut data[..]);
+        rand::rng().fill(&mut data[..]);
         let reader = Cursor::new(data.clone());
         let mut limit_reader = LimitReader::new(reader, size as u64);
 

crates/zip/Cargo.toml

@@ -18,8 +18,8 @@ async-compression = { version = "0.4.0", features = [
 ] }
 async_zip = { version = "0.0.17", features = ["tokio"] }
 zip = "2.2.0"
-tokio = { version = "1.45.0", features = ["full"] }
-tokio-stream = "0.1.17"
+tokio = { workspace = true, features = ["full"] }
+tokio-stream = { workspace = true }
 tokio-tar = { workspace = true }
 xz2 = { version = "0.1", optional = true, features = ["static"] }