Switch to Hyper 1

cloudflare · Nov 22, 2024 · be7257c · be7257c
1 parent e1d1a5a
commit be7257c
Show file tree

Hide file tree

Showing 8 changed files with 187 additions and 68 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -36,12 +36,14 @@ darling = "0.20.10"
 erased-serde = "0.3.28"
 futures-util = "0.3.28"
 governor = "0.6"
-hyper = { version = "0.14", default-features = false }
+http-body-util = "0.1"
+hyper = { version = "1", default-features = false }
+hyper-util = { version = "0.1", default-features = false }
 indexmap = "2.0.0"
 ipnetwork = "0.20"
 once_cell = "1.5"
-tonic = { version = "0.11.0", default-features = false }
-opentelemetry-proto = "0.5.0"
+tonic = { version = "0.12", default-features = false }
+opentelemetry-proto = "0.7"
 parking_lot = "0.12.1"
 proc-macro2 = { version = "1", default-features = false }
 prometheus = { version = "0.13.3", default-features = false }
@@ -68,6 +70,7 @@ tokio = "1.41.0"
 thread_local = "1.1"
 tikv-jemallocator = "0.5"
 tikv-jemalloc-ctl = "0.5"
+tower-service = "0.3"
 yaml-merge-keys = "0.5"
 
 # needed for minver

diff --git a/examples/Cargo.toml b/examples/Cargo.toml
@@ -9,7 +9,9 @@ publish = false
 anyhow = { workspace = true }
 foundations = { workspace = true }
 futures-util = { workspace = true }
+http-body-util = { workspace = true }
 hyper = { workspace = true }
+hyper-util = { workspace = true, features = ["server", "tokio"] }
 tokio = { workspace = true, features = ["full"]}
 
 [[example]]

diff --git a/examples/http_server/main.rs b/examples/http_server/main.rs
@@ -18,9 +18,11 @@ use foundations::settings::collections::Map;
 use foundations::telemetry::{self, log, tracing, TelemetryConfig, TelemetryContext};
 use foundations::BootstrapResult;
 use futures_util::stream::{FuturesUnordered, StreamExt};
-use hyper::server::conn::Http;
+use http_body_util::Full;
+use hyper::body::{Bytes, Incoming};
 use hyper::service::service_fn;
-use hyper::{Body, Request, Response};
+use hyper::{Request, Response};
+use hyper_util::rt::{TokioExecutor, TokioIo};
 use std::convert::Infallible;
 use std::net::{SocketAddr, TcpListener as StdTcpListener};
 use std::sync::Arc;
@@ -193,7 +195,10 @@ async fn serve_connection(
         }
     });
 
-    if let Err(e) = Http::new().serve_connection(conn, on_request).await {
+    if let Err(e) = hyper_util::server::conn::auto::Builder::new(TokioExecutor::new())
+        .serve_connection(TokioIo::new(conn), on_request)
+        .await
+    {
         log::error!("failed to serve HTTP"; "error" => ?e);
         metrics::http_server::failed_connections_total(&endpoint_name).inc();
     }
@@ -204,9 +209,9 @@ async fn serve_connection(
 #[tracing::span_fn("respond to request")]
 async fn respond(
     endpoint_name: Arc<String>,
-    req: Request<Body>,
+    req: Request<Incoming>,
     routes: Arc<Map<String, ResponseSettings>>,
-) -> Result<Response<Body>, Infallible> {
+) -> Result<Response<Full<Bytes>>, Infallible> {
     log::add_fields! {
         "request_uri" => req.uri().to_string(),
         "method" => req.method().to_string()

diff --git a/foundations/Cargo.toml b/foundations/Cargo.toml
@@ -77,13 +77,15 @@ client-telemetry = ["logging", "metrics", "tracing", "dep:futures-util"]
 
 # Enables the telemetry server.
 telemetry-server = [
+    "dep:http-body-util",
     "dep:hyper",
+    "dep:hyper-util",
     "dep:socket2",
-    "dep:percent-encoding"
+    "dep:percent-encoding",
 ]
 
 # Enables telemetry reporting over gRPC
-telemetry-otlp-grpc = ["dep:tonic", "dep:tokio", "dep:hyper"]
+telemetry-otlp-grpc = ["dep:tonic", "tonic/prost", "dep:tokio", "dep:hyper"]
 
 # Enables experimental tokio runtime metrics
 tokio-runtime-metrics = [
@@ -177,11 +179,9 @@ clap = { workspace = true, optional = true }
 erased-serde = { workspace = true, optional = true }
 futures-util = { workspace = true, optional = true }
 governor = { workspace = true, optional = true }
-hyper = { workspace = true, optional = true, features = [
-    "http1",
-    "runtime",
-    "server",
-] }
+http-body-util = { workspace = true, optional = true }
+hyper = { workspace = true, optional = true, features = ["http1", "server"] }
+hyper-util = { workspace = true, optional = true, features = ["tokio"] }
 indexmap = { workspace = true, optional = true, features = ["serde"] }
 once_cell = { workspace = true, optional = true }
 opentelemetry-proto = { workspace = true, optional = true, features = ["gen-tonic-messages", "trace"] }

diff --git a/foundations/src/telemetry/driver.rs b/foundations/src/telemetry/driver.rs
@@ -1,16 +1,14 @@
 use crate::utils::feature_use;
 use crate::BootstrapResult;
 use futures_util::future::BoxFuture;
-use futures_util::stream::{FuturesUnordered, Stream};
-use futures_util::FutureExt;
+use futures_util::stream::FuturesUnordered;
+use futures_util::{FutureExt, Stream};
 use std::future::Future;
 use std::pin::Pin;
 use std::task::{Context, Poll};
 
 feature_use!(cfg(feature = "telemetry-server"), {
     use super::server::TelemetryServerFuture;
-    use anyhow::anyhow;
-    use hyper::Server;
     use std::net::SocketAddr;
 });
 
@@ -38,7 +36,7 @@ impl TelemetryDriver {
     ) -> Self {
         Self {
             #[cfg(feature = "telemetry-server")]
-            server_addr: server_fut.as_ref().map(Server::local_addr),
+            server_addr: server_fut.as_ref().map(|fut| fut.local_addr()),
 
             #[cfg(feature = "telemetry-server")]
             server_fut,
@@ -67,7 +65,7 @@ impl TelemetryDriver {
         {
             if let Some(server_fut) = self.server_fut.take() {
                 self.tele_futures.push(
-                    async move { Ok(server_fut.with_graceful_shutdown(signal).await?) }.boxed(),
+                    async move { Ok(server_fut.with_graceful_shutdown(signal).await) }.boxed(),
                 );
 
                 return;
@@ -93,7 +91,7 @@ impl Future for TelemetryDriver {
         #[cfg(feature = "telemetry-server")]
         if let Some(server_fut) = &mut self.server_fut {
             if let Poll::Ready(res) = Pin::new(server_fut).poll(cx) {
-                ready_res.push(res.map_err(|err| anyhow!(err)));
+                match res {}
             }
         }