build: Consolidate workspace dependencies and pin explicit versions

Cargo.toml

@@ -28,32 +28,67 @@ objectstore-server = { path = "objectstore-server" }
 objectstore-service = { path = "objectstore-service" }
 objectstore-test = { path = "objectstore-test" }
 objectstore-types = { path = "objectstore-types", version = "0.1.12" }
-percent-encoding = "2.3"
 stresstest = { path = "stresstest" }
 
-anyhow = "1.0.69"
-async-trait = "0.1.88"
-bytes = "1.11.1"
-futures = "0.3.31"
-futures-util = "0.3.31"
-http = "1.3.1"
-humantime = "2.2.0"
+anyhow = "1.0.102"
+argh = "0.1.19"
+async-compression = "0.4.42"
+async-stream = "0.3.6"
+async-trait = "0.1.89"
+axum = "0.8.9"
+base64 = "0.22.1"
+bigtable_rs = { git = "https://github.com/getsentry/bigtable_rs.git", rev = "4cb75bc5e5f87204363973f6302107768e64972e" }
+bytes = "1.12.0"
+bytesize = "2.4.0"
+chrono = "0.4.45"
+console = "0.16.3"
+elegant-departure = "0.3.2"
+figment = "0.10.19"
+futures = "0.3.32"
+futures-util = "0.3.32"
+gcp_auth = "0.12.6"
+globset = "0.4.18"
+http = "1.4.2"
+humantime = "2.3.0"
 humantime-serde = "1.1.1"
-jsonwebtoken = { version = "10.3.0", features = ["rust_crypto"] }
-rand = "0.9.3"
-regex = "1.12.3"
-# Same as default features on 0.12.x (0.13.x uses rustls by default)
-reqwest = { version = "0.13.4", default-features = false, features = ["charset", "http2", "system-proxy", "native-tls-no-alpn"] }
-sentry = { version = "0.45.0" }
-serde = { version = "1.0.219", features = ["derive"] }
-serde_json = "1.0.140"
-tempfile = "3.20.0"
-thiserror = "2.0.17"
+indicatif = "0.18.4"
+infer = { version = "0.19.0", default-features = false }
+insta = "1.48.0"
+jsonwebtoken = { version = "10.4.0", features = ["rust_crypto"] }
+mediatype = "0.21.0"
+metrics = "0.24.6"
+metrics-exporter-dogstatsd = "0.9.8"
+multer = "3.1.0"
+nix = "0.31.3"
+num_cpus = "1.17.0"
+papaya = "0.2.4"
+percent-encoding = "2.3.2"
+quick-xml = "0.40.1"
+rand = "0.10.1"
+rand_distr = "0.6.0"
+regex = "1.12.4"
+reqwest = { version = "0.13.4", default-features = false }
+rustls = { version = "0.23.40", default-features = false }
+secrecy = "0.10.3"
+sentry = { version = "0.48.2" }
+sentry-core = "0.48.2"
+serde = { version = "1.0.228", features = ["derive"] }
+serde_json = "1.0.150"
+serde_yaml = "0.9.34-deprecated"
+sketches-ddsketch = "0.3.1"
+tempfile = "3.27.0"
+thiserror = "2.0.18"
 tikv-jemallocator = { version = "0.7.0", features = ["background_threads", "override_allocator_on_supported_platforms"] }
 tikv-jemalloc-ctl = { version = "0.7.0", features = ["stats"] }
-tokio = "1.47.0"
-tokio-util = { version = "0.7.15", features = ["rt"] }
-tracing = "0.1.41"
-tracing-subscriber = { version = "0.3.19", features = ["env-filter", "json"] }
-uuid = { version = "1.17.0", features = ["v4"] }
-sentry-options = "1.0.1"
+tokio = "1.52.3"
+tokio-util = "0.7.18"
+tonic = { version = "0.14.6", default-features = false }
+tower = "0.5.3"
+tower-http = { version = "0.7.0", default-features = false }
+tracing = "0.1.44"
+tracing-subscriber = "0.3.23"
+url = "2.5.8"
+uuid = { version = "1.23.3", features = ["v4"] }
+yansi = "1.0.1"
+zstd = "0.13.3"
+zstd-safe = "7.2.4"

bigtable-bench/Cargo.toml

@@ -11,17 +11,16 @@ publish = false
 
 [dependencies]
 anyhow = { workspace = true }
-argh = "0.1.13"
+argh = { workspace = true }
 bytes = { workspace = true }
-bytesize = "2.0.1"
-futures-util = { workspace = true }
+bytesize = { workspace = true }
 objectstore-service = { workspace = true }
 objectstore-types = { workspace = true }
-rand = { workspace = true, features = ["small_rng"] }
-rand_distr = "0.5.1"
-rustls = { version = "0.23", default-features = false }
-sketches-ddsketch = "0.3.0"
+rand = { workspace = true }
+rand_distr = { workspace = true }
+rustls = { workspace = true }
+sketches-ddsketch = { workspace = true }
 tikv-jemallocator = { workspace = true }
 tokio = { workspace = true, features = ["rt-multi-thread", "sync", "macros", "signal"] }
 tokio-util = { workspace = true }
-yansi = "1.0.1"
+yansi = { workspace = true }

bigtable-bench/src/main.rs

@@ -11,8 +11,8 @@ use std::time::{Duration, Instant};
 use anyhow::Context;
 use argh::FromArgs;
 use bytesize::ByteSize;
+use rand::RngExt;
 use rand::rngs::SmallRng;
-use rand::{Rng, SeedableRng};
 use rand_distr::{Distribution, LogNormal};
 use sketches_ddsketch::DDSketch;
 use tokio::sync::Semaphore;
@@ -212,7 +212,7 @@ async fn main() -> anyhow::Result<()> {
             tokio::spawn(async move {
                 let _permit = permit;
 
-                let mut rng = SmallRng::from_os_rng();
+                let mut rng: SmallRng = rand::make_rng();
                 let object_size = (size_dist.sample(&mut rng) as u64).min(MAX_OBJECT_SIZE) as usize;
                 let mut buf = vec![0u8; object_size];
                 rng.fill(&mut buf[..]);

clients/rust/Cargo.toml

@@ -11,24 +11,25 @@ rust-version = "1.89"
 publish = true
 
 [dependencies]
-async-compression = { version = "0.4.27", features = ["tokio", "zstd"] }
-base64 = { version = "0.22.1", optional = true }
-percent-encoding = { workspace = true }
+async-compression = { workspace = true, features = ["tokio", "zstd"] }
+base64 = { workspace = true, optional = true }
 bytes = { workspace = true }
 futures-util = { workspace = true }
-infer = { version = "0.19.0", default-features = false }
+infer = { workspace = true }
 jsonwebtoken = { workspace = true }
-multer = "3.1.0"
+multer = { workspace = true }
 objectstore-types = { workspace = true }
+percent-encoding = { workspace = true }
+# Pinned below workspace version for MSRV compatibility
 reqwest = { version = "0.13.1", default-features = false, features = ["charset", "http2", "system-proxy", "json", "stream", "multipart"] }
-sentry-core = { version = ">=0.41", features = ["client"] }
+sentry-core = { version = ">=0.41", default-features = false, features = ["client"] }
 serde = { workspace = true }
 thiserror = { workspace = true }
 # See https://github.com/getsentry/relay/blob/9c491a185a289e09ee9d3f56d89bd9d1fa71d815/Cargo.toml#L211
 tokio = { version = "1.45.0", default-features = false, features = ["fs"] }
 tokio-util = { workspace = true, features = ["io"] }
-url = "2.5.7"
-zstd-safe = "7.2.4"
+url = { workspace = true }
+zstd-safe = { workspace = true }
 
 [dev-dependencies]
 futures-util = { workspace = true }
@@ -37,7 +38,7 @@ objectstore-test = { workspace = true }
 serde = { workspace = true }
 tempfile = { workspace = true }
 tokio = { workspace = true, features = ["macros", "rt"] }
-zstd = "0.13.3"
+zstd = { workspace = true }
 
 [features]
 default = ["native-tls", "hickory-dns"]

objectstore-log/Cargo.toml

@@ -17,8 +17,8 @@ sentry = ["init", "dep:sentry"]
 
 [dependencies]
 anyhow = { workspace = true }
-console = { version = "0.16.1", optional = true }
+console = { workspace = true, optional = true }
 sentry = { workspace = true, features = ["tracing"], optional = true }
 serde = { workspace = true }
 tracing = { workspace = true }
-tracing-subscriber = { workspace = true, optional = true }
+tracing-subscriber = { workspace = true, features = ["env-filter", "json"], optional = true }

objectstore-metrics/Cargo.toml

@@ -10,8 +10,8 @@ edition = "2024"
 publish = false
 
 [dependencies]
-metrics = "0.24.3"
-metrics-exporter-dogstatsd = "0.9.6"
+metrics = { workspace = true }
+metrics-exporter-dogstatsd = { workspace = true }
 objectstore-log = { workspace = true }
 serde = { workspace = true }
 thiserror = { workspace = true }

objectstore-server/Cargo.toml

@@ -12,51 +12,42 @@ publish = false
 
 [dependencies]
 anyhow = { workspace = true }
-argh = "0.1.13"
-async-stream = "0.3.6"
-axum = { version = "0.8.4", features = ["multipart"] }
-percent-encoding = { workspace = true }
+argh = { workspace = true }
+async-stream = { workspace = true }
+axum = { workspace = true, features = ["multipart"] }
 bytes = { workspace = true }
-elegant-departure = { version = "0.3.2", features = ["tokio"] }
-figment = { version = "0.10.19", features = ["env", "test", "yaml"] }
+elegant-departure = { workspace = true, features = ["tokio"] }
+figment = { workspace = true, features = ["env", "test", "yaml"] }
 futures = { workspace = true }
 futures-util = { workspace = true }
-globset = "0.4.15"
+globset = { workspace = true }
 http = { workspace = true }
 humantime = { workspace = true }
 humantime-serde = { workspace = true }
 jsonwebtoken = { workspace = true }
-num_cpus = "1.17.0"
+num_cpus = { workspace = true }
 objectstore-log = { workspace = true, features = ["init", "sentry"] }
 objectstore-metrics = { workspace = true }
 objectstore-service = { workspace = true }
 objectstore-types = { workspace = true }
+papaya = { workspace = true }
+percent-encoding = { workspace = true }
 rand = { workspace = true }
-reqwest = { workspace = true }
-rustls = { version = "0.23.31", default-features = false }
-sentry = { workspace = true, features = [
-    "tower-axum-matched-path",
-    "tracing",
-    "logs",
-] }
-secrecy = { version = "0.10.3", features = ["serde"] }
+reqwest = { workspace = true, features = ["charset", "http2", "system-proxy", "native-tls-no-alpn"] }
+rustls = { workspace = true }
+secrecy = { workspace = true, features = ["serde"] }
+sentry = { workspace = true, features = ["tower-axum-matched-path", "tracing", "logs"] }
 serde = { workspace = true }
 serde_json = { workspace = true }
 thiserror = { workspace = true }
 tikv-jemallocator = { workspace = true }
 tikv-jemalloc-ctl = { workspace = true }
-tokio = { workspace = true, features = ["full"] }
-tower = { version = "0.5.2" }
-tower-http = { version = "0.6.6", default-features = false, features = [
-    "catch-panic",
-    "metrics",
-    "set-header",
-    "trace",
-] }
-papaya = "0.2.3"
+tokio = { workspace = true, features = ["fs", "macros", "net", "rt-multi-thread", "signal", "sync", "time"] }
+tower = { workspace = true }
+tower-http = { workspace = true, features = ["catch-panic", "metrics", "set-header", "trace"] }
 
 [dev-dependencies]
-nix = { version = "0.30.1", features = ["signal"] }
+nix = { workspace = true, features = ["signal"] }
 objectstore-test = { workspace = true }
 stresstest = { workspace = true }
 tempfile = { workspace = true }

objectstore-service/Cargo.toml

@@ -12,37 +12,32 @@ publish = false
 [dependencies]
 anyhow = { workspace = true }
 async-trait = { workspace = true }
-base64 = "0.22"
-bigtable_rs = { git = "https://github.com/getsentry/bigtable_rs.git", rev = "4cb75bc5e5f87204363973f6302107768e64972e" }
-chrono = "0.4"
+base64 = { workspace = true }
+bigtable_rs = { workspace = true }
 bytes = { workspace = true }
+chrono = { workspace = true }
 futures-util = { workspace = true }
-gcp_auth = "0.12.3"
+gcp_auth = { workspace = true }
 humantime = { workspace = true }
 humantime-serde = { workspace = true }
 objectstore-log = { workspace = true }
 objectstore-metrics = { workspace = true }
 objectstore-types = { workspace = true }
-quick-xml = { version = "0.38.4", features = ["serialize"] }
+quick-xml = { workspace = true, features = ["serialize"] }
 regex = { workspace = true }
-reqwest = { workspace = true, features = [
-    "hickory-dns",
-    "stream",
-    "multipart",
-    "json",
-] }
+reqwest = { workspace = true, features = ["charset", "http2", "hickory-dns", "json", "multipart", "native-tls-no-alpn", "stream", "system-proxy"] }
 sentry = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true }
-tokio-util = { workspace = true }
-tonic = { version = "0.14.5", default-features = false }
+tokio-util = { workspace = true, features = ["io", "rt"] }
+tonic = { workspace = true }
 tracing = { workspace = true }
 uuid = { workspace = true, features = ["v7"] }
 
 [dev-dependencies]
 futures = { workspace = true }
 tempfile = { workspace = true }
 tokio = { workspace = true, features = ["test-util"] }
-zstd = "0.13"
+zstd = { workspace = true }

objectstore-test/Cargo.toml

@@ -14,4 +14,4 @@ objectstore-server = { workspace = true }
 objectstore-types = { workspace = true }
 tempfile = { workspace = true }
 tokio = { workspace = true }
-tracing-subscriber = { workspace = true }
+tracing-subscriber = { workspace = true, features = ["env-filter", "json"] }

objectstore-types/Cargo.toml

@@ -13,10 +13,10 @@ publish = true
 http = { workspace = true }
 humantime = { workspace = true }
 humantime-serde = { workspace = true }
-mediatype = "0.21.0"
+mediatype = { workspace = true }
 serde = { workspace = true }
 thiserror = { workspace = true }
 
 [dev-dependencies]
-insta = "1"
-serde_json = "1"
+insta = { workspace = true }
+serde_json = { workspace = true }

stresstest/Cargo.toml

@@ -11,19 +11,19 @@ publish = false
 
 [dependencies]
 anyhow = { workspace = true }
-argh = "0.1.13"
-bytesize = { version = "2.0.1", features = ["serde"] }
+argh = { workspace = true }
+bytes = { workspace = true }
+bytesize = { workspace = true, features = ["serde"] }
 futures = { workspace = true }
 humantime-serde = { workspace = true }
-indicatif = "0.18.0"
-bytes = { workspace = true }
+indicatif = { workspace = true }
 objectstore-client = { workspace = true, features = ["multipart"] }
-rand = { workspace = true, features = ["small_rng"] }
-rand_distr = "0.5.1"
+rand = { workspace = true }
+rand_distr = { workspace = true }
 serde = { workspace = true }
-serde_yaml = "0.9.34-deprecated"
-sketches-ddsketch = "0.3.0"
+serde_yaml = { workspace = true }
+sketches-ddsketch = { workspace = true }
 tikv-jemallocator = { workspace = true }
 tokio = { workspace = true, features = ["rt-multi-thread", "sync", "macros"] }
-tokio-util = { workspace = true }
-yansi = "1.0.1"
+tokio-util = { workspace = true, features = ["io"] }
+yansi = { workspace = true }

stresstest/src/workload.rs

@@ -7,7 +7,7 @@ use std::{fmt, io, task};
 
 use objectstore_client::Usecase;
 use rand::rngs::SmallRng;
-use rand::{Rng, RngCore, SeedableRng};
+use rand::{Rng, RngExt, SeedableRng};
 use rand_distr::weighted::WeightedIndex;
 use rand_distr::{Distribution, LogNormal, Zipf};
 use serde::Deserialize;