diff --git a/Cargo.lock b/Cargo.lock index 6820ed5864af3..d4fae6381059d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2818,9 +2818,9 @@ checksum = "396de984970346b0d9e93d1415082923c679e5ae5c3ee3dcbd104f5610af126b" [[package]] name = "cookie_store" -version = "0.21.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eac901828f88a5241ee0600950ab981148a18f2f756900ffba1b125ca6a3ef9" +checksum = "3fc4bff745c9b4c7fb1e97b25d13153da2bc7796260141df62378998d070207f" dependencies = [ "cookie", "document-features", @@ -3281,7 +3281,7 @@ dependencies = [ "once_cell", "parking_lot 0.12.4", "percent-encoding", - "reqwest 0.12.24", + "reqwest 0.12.28", "semver", "serde", "serde_json", @@ -4506,7 +4506,7 @@ dependencies = [ "arc-swap", "futures 0.3.31", "log", - "reqwest 0.12.24", + "reqwest 0.12.28", "serde", "serde_derive", "serde_json", @@ -5343,19 +5343,6 @@ dependencies = [ "tower-service", ] -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes 1.10.1", - "hyper 0.14.32", - "native-tls", - "tokio", - "tokio-native-tls", -] - [[package]] name = "hyper-tls" version = "0.6.0" @@ -5960,7 +5947,7 @@ dependencies = [ "k8s-test-framework", "rand 0.9.2", "regex", - "reqwest 0.11.26", + "reqwest 0.12.28", "serde_json", "tokio", "tracing 0.1.41", @@ -7588,7 +7575,7 @@ dependencies = [ "md-5", "percent-encoding", "quick-xml 0.37.4", - "reqwest 0.12.24", + "reqwest 0.12.28", "serde", "serde_json", "tokio", @@ -9243,12 +9230,10 @@ dependencies = [ "http-body 0.4.6", "hyper 0.14.32", "hyper-rustls 0.24.2", - "hyper-tls 0.5.0", "ipnet", "js-sys", "log", "mime", - "native-tls", "once_cell", "percent-encoding", "pin-project-lite", @@ -9260,7 +9245,6 @@ dependencies = [ "sync_wrapper 0.1.2", "system-configuration 0.5.1", "tokio", - "tokio-native-tls", "tokio-rustls 0.24.1", "tower-service", "url", @@ -9273,9 +9257,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.24" +version = "0.12.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0946410b9f7b082a427e4ef5c8ff541a88b357bc6c637c40db3a68ac70a36f" +checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" dependencies = [ "base64 0.22.1", "bytes 1.10.1", @@ -9291,7 +9275,7 @@ dependencies = [ "http-body-util", "hyper 1.7.0", "hyper-rustls 0.27.5", - "hyper-tls 0.6.0", + "hyper-tls", "hyper-util", "js-sys", "log", @@ -9313,7 +9297,7 @@ dependencies = [ "tokio-rustls 0.26.2", "tokio-util", "tower 0.5.2", - "tower-http 0.6.6", + "tower-http 0.6.8", "tower-service", "url", "wasm-bindgen", @@ -9332,7 +9316,7 @@ dependencies = [ "anyhow", "async-trait", "http 1.3.1", - "reqwest 0.12.24", + "reqwest 0.12.28", "serde", "thiserror 1.0.68", "tower-service", @@ -9351,7 +9335,7 @@ dependencies = [ "http 1.3.1", "hyper 1.7.0", "parking_lot 0.11.2", - "reqwest 0.12.24", + "reqwest 0.12.28", "reqwest-middleware", "retry-policies", "thiserror 1.0.68", @@ -11788,9 +11772,9 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2" +checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8" dependencies = [ "bitflags 2.9.0", "bytes 1.10.1", @@ -12140,7 +12124,7 @@ dependencies = [ "getrandom 0.3.4", "pin-project", "rand 0.9.2", - "reqwest 0.12.24", + "reqwest 0.12.28", "serde", "serde_json", "time", @@ -12440,7 +12424,7 @@ dependencies = [ "owo-colors", "paste", "regex", - "reqwest 0.11.26", + "reqwest 0.12.28", "semver", "serde", "serde_json", @@ -12593,8 +12577,7 @@ dependencies = [ "rdkafka", "redis", "regex", - "reqwest 0.11.26", - "reqwest 0.12.24", + "reqwest 0.12.28", "rmp-serde", "rmpv", "roaring", @@ -13143,7 +13126,7 @@ dependencies = [ "quoted_printable", "rand 0.8.5", "regex", - "reqwest 0.12.24", + "reqwest 0.12.28", "reqwest-middleware", "reqwest-retry", "roxmltree", diff --git a/Cargo.toml b/Cargo.toml index 0b0e5ae29ff99..5590d6ae2313c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -180,7 +180,7 @@ prost-types = { version = "0.12", default-features = false } rand = { version = "0.9.2", default-features = false, features = ["small_rng", "thread_rng"] } rand_distr = { version = "0.5.1", default-features = false } regex = { version = "1.11.2", default-features = false, features = ["std", "perf"] } -reqwest = { version = "0.11.26", features = ["json"] } +reqwest = { version = "0.12", features = ["json"] } rust_decimal = { version = "1.37.0", default-features = false, features = ["std"] } semver = { version = "1.0.26", default-features = false, features = ["serde", "std"] } serde = { version = "1.0.219", default-features = false, features = ["alloc", "derive", "rc"] } @@ -209,7 +209,7 @@ serial_test = { version = "3.2" } [dependencies] cfg-if.workspace = true -reqwest_0_12_24 = { package = "reqwest", version = "0.12.24", features = ["json"] } +reqwest.workspace = true clap.workspace = true indoc.workspace = true paste.workspace = true diff --git a/src/sinks/azure_common/config.rs b/src/sinks/azure_common/config.rs index 8792e7b2d51ce..5fcd5a520ee8e 100644 --- a/src/sinks/azure_common/config.rs +++ b/src/sinks/azure_common/config.rs @@ -163,11 +163,11 @@ pub fn build_client( } } - // Force Azure SDK to use reqwest_0_12_24 transport to avoid affecting global reqwest + // Use reqwest v0.12 since Azure SDK only implements HttpClient for reqwest::Client v0.12. options.client_options.transport = Some(azure_core::http::Transport::new(std::sync::Arc::new( - reqwest_0_12_24::ClientBuilder::new() + reqwest::ClientBuilder::new() .build() - .map_err(|e| format!("Failed to build reqwest_0_12_24 client: {e}"))?, + .map_err(|e| format!("Failed to build reqwest client: {e}"))?, ))); let client = BlobContainerClient::from_url(url, None, Some(options)).map_err(|e| format!("{e}"))?;