Upgrade hyper and tonic except for aws-sdk and server.

quickwit/Cargo.toml

@@ -120,18 +120,18 @@ heck = "0.4.1"
 hex = "0.4.3"
 home = "0.5.4"
 hostname = "0.3"
-http = "0.2.9"
-http-serde = "1.1.2"
+http = "1.1.0"
+http-body-util = "0.1.2"
+http-serde = "2.1.1"
 humantime = "2.1.0"
-hyper = { version = "0.14", features = [
+hyper = { version = "1.4.1", features = [
   "client",
   "http1",
   "http2",
-  "server",
-  "stream",
-  "tcp",
+  "server"
 ] }
-hyper-rustls = "0.24"
+hyper-rustls = "0.27.2"
+hyper-util = "0.1.6"
 indexmap = { version = "2.1.0", features = ["serde"] }
 indicatif = "0.17.3"
 itertools = "0.13"
@@ -175,11 +175,11 @@ pprof = { version = "0.13", features = ["flamegraph"] }
 proc-macro2 = "1.0.50"
 prometheus = { version = "0.13", features = ["process"] }
 proptest = "1"
-prost = { version = "0.11.6", default-features = false, features = [
+prost = { version = "0.13.1", default-features = false, features = [
   "prost-derive",
 ] }
-prost-build = "0.11.6"
-prost-types = "0.11.6"
+prost-build = "0.13.1"
+prost-types = "0.13.1"
 pulsar = { git = "https://github.com/quickwit-oss/pulsar-rs.git", rev = "f9eff04", default-features = false, features = [
   "auth-oauth2",
   "compression",
@@ -237,8 +237,8 @@ tokio-metrics = { version = "0.3.1", features = ["rt"] }
 tokio-stream = { version = "0.1", features = ["sync"] }
 tokio-util = { version = "0.7", features = ["full"] }
 toml = "0.7.6"
-tonic = { version = "0.9.0", features = ["gzip"] }
-tonic-build = "0.9.0"
+tonic = { version = "0.12.1", features = ["gzip"] }
+tonic-build = "0.12.1"
 tower = { version = "0.4.13", features = [
   "balance",
   "buffer",
@@ -281,7 +281,7 @@ aws-sdk-kinesis = "1.36"
 aws-sdk-s3 = "1.42"
 aws-smithy-async = "1.2"
 aws-smithy-runtime = "1.6.2"
-aws-smithy-types = { version = "1.2", features = ["byte-stream-poll-next"] }
+aws-smithy-types = { version = "1.2", features = ["byte-stream-poll-next", "http-body-1-x"] }
 aws-types = "1.3.3"
 
 azure_core = { version = "0.13.0", features = ["enable_reqwest_rustls"] }

quickwit/quickwit-aws/Cargo.toml

@@ -19,8 +19,13 @@ aws-smithy-runtime = { workspace = true }
 aws-types = { workspace = true }
 
 futures = { workspace = true }
-hyper = { workspace = true }
-hyper-rustls = { workspace = true }
+# AWS SDK still relies on hyper 0.14
+hyper = { version = "0.14", features = [
+  "client",
+  "http1",
+  "http2"
+] }
+hyper-rustls = "0.24"
 tokio = { workspace = true }
 
 quickwit-common = { workspace = true }

quickwit/quickwit-common/Cargo.toml

@@ -23,7 +23,9 @@ futures = { workspace = true }
 home = { workspace = true }
 hostname = { workspace = true }
 http = { workspace = true }
+http-body-util = { workspace = true }
 hyper = { workspace = true }
+hyper-util = { workspace = true }
 itertools = { workspace = true }
 once_cell = { workspace = true }
 pin-project = { workspace = true }

quickwit/quickwit-common/src/test_utils.rs

@@ -21,9 +21,9 @@ use std::net::SocketAddr;
 use std::time::Duration;
 
 use futures::Future;
-use hyper::service::Service;
 use hyper::Uri;
 use tokio::time::error::Elapsed;
+use tower::Service;
 
 pub async fn wait_until_predicate<Fut>(
     predicate: impl Fn() -> Fut,
@@ -58,7 +58,7 @@ pub async fn wait_for_server_ready(socket_addr: SocketAddr) -> anyhow::Result<()
         .build()?;
     while num_attempts < max_num_attempts {
         tokio::time::sleep(Duration::from_millis(50 * (num_attempts + 1))).await;
-        let mut http = hyper::client::connect::HttpConnector::new();
+        let mut http = hyper_util::client::legacy::connect::HttpConnector::new();
         match http.call(uri.clone()).await {
             Ok(_) => break,
             Err(_) => {

quickwit/quickwit-common/src/tower/transport.rs

@@ -83,7 +83,7 @@ where K: Hash + Eq + Clone
 impl<K> Unpin for ChangeStreamAdapter<K> where K: Hash + Eq + Clone {}
 
 type HttpRequest = http::Request<tonic::body::BoxBody>;
-type HttpResponse = http::Response<hyper::Body>;
+type HttpResponse = http::Response<tonic::body::BoxBody>;
 type ChangeStream<K> = UnboundedReceiverStream<Result<TowerChange<K, Channel>, Infallible>>;
 type Discover<K> = PendingRequestsDiscover<ChangeStream<K>, CompleteOnResponse>;
 type ChannelImpl<K> = Buffer<Balance<Discover<K>, HttpRequest>, HttpRequest>;

quickwit/quickwit-integration-tests/Cargo.toml

@@ -15,7 +15,10 @@ license.workspace = true
 [dev-dependencies]
 anyhow = { workspace = true }
 futures-util = { workspace = true }
+http-body-util = { workspace = true }
+http-serde = { workspace = true }
 hyper = { workspace = true }
+hyper-util = { workspace = true }
 itertools = { workspace = true }
 reqwest = { workspace = true }
 serde_json = { workspace = true }