diff --git a/core/Cargo.lock b/core/Cargo.lock index c739af59d5ed..457528b48bc8 100644 --- a/core/Cargo.lock +++ b/core/Cargo.lock @@ -4383,7 +4383,6 @@ dependencies = [ "tokio", "tokio-rustls 0.26.4", "tower-service", - "webpki-roots 1.0.6", ] [[package]] @@ -4411,22 +4410,6 @@ dependencies = [ "tower-service", ] -[[package]] -name = "hyper-tls" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" -dependencies = [ - "bytes", - "http-body-util", - "hyper 1.8.1", - "hyper-util", - "native-tls", - "tokio", - "tokio-native-tls", - "tower-service", -] - [[package]] name = "hyper-util" version = "0.1.20" @@ -6179,7 +6162,7 @@ dependencies = [ "opendal-service-yandex-disk", "opendal-testkit", "rand 0.8.5", - "reqwest 0.12.28", + "reqwest", "sha2", "size", "tokio", @@ -6233,7 +6216,7 @@ dependencies = [ "quick-xml 0.38.4", "rand 0.8.5", "reqsign-core", - "reqwest 0.12.28", + "reqwest", "serde", "serde_json", "sha2", @@ -6905,7 +6888,7 @@ dependencies = [ "log", "opendal-core", "percent-encoding", - "reqwest 0.12.28", + "reqwest", "serde", "serde_json", "tokio", @@ -7556,19 +7539,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "opentelemetry-http" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7a6d09a73194e6b66df7c8f1b680f156d916a1a942abf2de06823dd02b7855d" -dependencies = [ - "async-trait", - "bytes", - "http 1.4.0", - "opentelemetry", - "reqwest 0.12.28", -] - [[package]] name = "opentelemetry-otlp" version = "0.31.1" @@ -7577,15 +7547,12 @@ checksum = "1f69cd6acbb9af919df949cd1ec9e5e7fdc2ef15d234b6b795aaa525cc02f71f" dependencies = [ "http 1.4.0", "opentelemetry", - "opentelemetry-http", "opentelemetry-proto", "opentelemetry_sdk", "prost 0.14.3", - "reqwest 0.12.28", "thiserror 2.0.18", "tokio", "tonic 0.14.5", - "tracing", ] [[package]] @@ -9074,14 +9041,13 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.28" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" +checksum = "ab3f43e3283ab1488b624b44b0e988d0acea0b3214e694730a055cb6b2efa801" dependencies = [ "base64 0.22.1", "bytes", "encoding_rs", - "futures-channel", "futures-core", "futures-util", "h2 0.4.13", @@ -9090,54 +9056,10 @@ dependencies = [ "http-body-util", "hyper 1.8.1", "hyper-rustls 0.27.7", - "hyper-tls", "hyper-util", "js-sys", "log", "mime", - "native-tls", - "percent-encoding", - "pin-project-lite", - "quinn", - "rustls 0.23.37", - "rustls-pki-types", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper 1.0.2", - "tokio", - "tokio-native-tls", - "tokio-rustls 0.26.4", - "tokio-util", - "tower 0.5.3", - "tower-http", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-streams 0.4.2", - "web-sys", - "webpki-roots 1.0.6", -] - -[[package]] -name = "reqwest" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3f43e3283ab1488b624b44b0e988d0acea0b3214e694730a055cb6b2efa801" -dependencies = [ - "base64 0.22.1", - "bytes", - "futures-core", - "futures-util", - "http 1.4.0", - "http-body 1.0.1", - "http-body-util", - "hyper 1.8.1", - "hyper-rustls 0.27.7", - "hyper-util", - "js-sys", - "log", "mime_guess", "percent-encoding", "pin-project-lite", @@ -9157,7 +9079,7 @@ dependencies = [ "url", "wasm-bindgen", "wasm-bindgen-futures", - "wasm-streams 0.5.0", + "wasm-streams", "web-sys", ] @@ -9170,7 +9092,7 @@ dependencies = [ "anyhow", "async-trait", "http 1.4.0", - "reqwest 0.13.2", + "reqwest", "thiserror 2.0.18", "tower-service", ] @@ -9187,7 +9109,7 @@ dependencies = [ "getrandom 0.2.17", "http 1.4.0", "hyper 1.8.1", - "reqwest 0.13.2", + "reqwest", "reqwest-middleware", "retry-policies", "thiserror 2.0.18", @@ -10612,7 +10534,7 @@ dependencies = [ "indexmap 2.13.0", "js-sys", "path-clean", - "reqwest 0.13.2", + "reqwest", "ring", "rustls 0.23.37", "rustls-pki-types", @@ -12201,19 +12123,6 @@ dependencies = [ "wasmparser", ] -[[package]] -name = "wasm-streams" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65" -dependencies = [ - "futures-util", - "js-sys", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - [[package]] name = "wasm-streams" version = "0.5.0" @@ -13049,7 +12958,7 @@ dependencies = [ "more-asserts", "rand 0.9.2", "redb 3.1.3", - "reqwest 0.13.2", + "reqwest", "reqwest-middleware", "reqwest-retry", "serde", @@ -13163,7 +13072,7 @@ dependencies = [ "oneshot", "pin-project", "rand 0.9.2", - "reqwest 0.13.2", + "reqwest", "serde", "serde_json", "shellexpand", diff --git a/core/Cargo.toml b/core/Cargo.toml index a8f05cb0f778..0b551e7b6893 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -315,7 +315,7 @@ libtest-mimic = "0.8" log = { workspace = true } logforth = { workspace = true } rand = { workspace = true } -reqwest = "0.12.24" +reqwest = "0.13.2" sha2 = { workspace = true } size = "0.5" tokio = { workspace = true, features = ["fs", "macros", "rt-multi-thread"] } diff --git a/core/core/Cargo.toml b/core/core/Cargo.toml index 922ffd3c06fa..62d531609101 100644 --- a/core/core/Cargo.toml +++ b/core/core/Cargo.toml @@ -40,7 +40,7 @@ all-features = true default = ["reqwest-rustls-tls", "executors-tokio"] # Enable reqwest rustls tls support. -reqwest-rustls-tls = ["reqwest/rustls-tls"] +reqwest-rustls-tls = ["reqwest/rustls"] # Enable opendal's blocking support. blocking = ["internal-tokio-rt"] @@ -76,7 +76,7 @@ mea = { workspace = true } percent-encoding = "2" quick-xml = { workspace = true, features = ["serialize", "overlapped-lists"] } reqsign-core = { version = "3.0.0", default-features = false } -reqwest = { version = "0.12.24", features = [ +reqwest = { version = "0.13.2", features = [ "stream", ], default-features = false } serde = { workspace = true, features = ["derive"] } diff --git a/core/core/src/docs/performance/http_optimization.md b/core/core/src/docs/performance/http_optimization.md index 67313bdb8519..89bea9915f59 100644 --- a/core/core/src/docs/performance/http_optimization.md +++ b/core/core/src/docs/performance/http_optimization.md @@ -122,5 +122,5 @@ By default, the connection pool is unlimited, allowing `reqwest` to open as many You can tune those settings via: -- [pool_idle_timeout](https://docs.rs/reqwest/0.12.15/reqwest/struct.ClientBuilder.html#method.pool_idle_timeout): Set an optional timeout for idle sockets being kept-alive. -- [pool_max_idle_per_host](https://docs.rs/reqwest/0.12.15/reqwest/struct.ClientBuilder.html#method.pool_max_idle_per_host): Sets the maximum idle connection per host allowed in the pool. +- [pool_idle_timeout](https://docs.rs/reqwest/0.13.2/reqwest/struct.ClientBuilder.html#method.pool_idle_timeout): Set an optional timeout for idle sockets being kept-alive. +- [pool_max_idle_per_host](https://docs.rs/reqwest/0.13.2/reqwest/struct.ClientBuilder.html#method.pool_max_idle_per_host): Sets the maximum idle connection per host allowed in the pool. diff --git a/core/layers/tracing/Cargo.toml b/core/layers/tracing/Cargo.toml index 2c44057318db..93cb81bc702c 100644 --- a/core/layers/tracing/Cargo.toml +++ b/core/layers/tracing/Cargo.toml @@ -43,7 +43,10 @@ opendal-core = { path = "../../core", version = "0.55.0" } opentelemetry = { version = "0.31.0", default-features = false, features = [ "trace", ] } -opentelemetry-otlp = { version = "0.31.0", features = ["grpc-tonic"] } +opentelemetry-otlp = { version = "0.31.0", default-features = false, features = [ + "grpc-tonic", + "trace", +] } opentelemetry_sdk = { version = "0.31.0", features = ["rt-tokio"] } tokio = { workspace = true, features = ["macros", "rt-multi-thread"] } tracing-opentelemetry = "0.32.0" diff --git a/core/services/hf/Cargo.toml b/core/services/hf/Cargo.toml index c4565c130b97..b31856f0d963 100644 --- a/core/services/hf/Cargo.toml +++ b/core/services/hf/Cargo.toml @@ -37,8 +37,8 @@ http = { workspace = true } log = { workspace = true } opendal-core = { path = "../../core", version = "0.55.0", default-features = false } percent-encoding = "2" -reqwest = { version = "0.12", default-features = false, features = [ - "rustls-tls", +reqwest = { version = "0.13.2", default-features = false, features = [ + "rustls", ] } serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true }