Skip to content

feat: hyper 1.0 example #184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
junkurihara wants to merge 2 commits into from
Closed

feat: hyper 1.0 example #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df537d1
feat: hyper 1.0 example
junkurihara Nov 23, 2023
0a72404
Merge branch 'dependabot/cargo/hyper-1.0.0' into feat/hyper-1.0
junkurihara Nov 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ rand = "0.8.4"
tide = "0.16"
actix-web = "4"
tokio = { version = "1", features = ["rt-multi-thread", "net", "macros", "signal"] }
hyper = { version = "1.0.0", features = ["server", "http1", "tcp"] }
hyper = { version = "1.0.1", features = ["server", "http1"] }
hyper-util = { version = "0.1.1", features = ["full"] }
http-body-util = "0.1.0"

[build-dependencies]
prost-build = { version = "0.11.0", optional = true }
Expand All @@ -54,4 +56,4 @@ required-features = []
name = "proto"
path = "benches/encoding/proto.rs"
harness = false
required-features = ["protobuf"]
required-features = ["protobuf"]
56 changes: 36 additions & 20 deletions examples/hyper.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
use hyper::{
service::{make_service_fn, service_fn},
Body, Request, Response, Server,
service::service_fn,
Request, Response, body::{Incoming, Bytes},
server::conn::http1,
};
use hyper_util::rt::TokioIo;
use http_body_util::{combinators, Full, BodyExt};
use prometheus_client::{encoding::text::encode, metrics::counter::Counter, registry::Registry};
use std::{
future::Future,
Expand All @@ -10,7 +13,7 @@ use std::{
pin::Pin,
sync::Arc,
};
use tokio::signal::unix::{signal, SignalKind};
use tokio::{pin, net::TcpListener, signal::unix::{signal, SignalKind}};

#[tokio::main]
async fn main() {
Expand All @@ -31,39 +34,47 @@ async fn main() {

/// Start a HTTP server to report metrics.
pub async fn start_metrics_server(metrics_addr: SocketAddr, registry: Registry) {
let mut shutdown_stream = signal(SignalKind::terminate()).unwrap();

eprintln!("Starting metrics server on {metrics_addr}");

let registry = Arc::new(registry);
Server::bind(&metrics_addr)
.serve(make_service_fn(move |_conn| {
let registry = registry.clone();
async move {
let handler = make_handler(registry);
Ok::<_, io::Error>(service_fn(handler))

let tcp_listener = TcpListener::bind(metrics_addr).await.unwrap();
let server = http1::Builder::new();
while let Ok((stream, _)) = tcp_listener.accept().await {
let mut shutdown_stream = signal(SignalKind::terminate()).unwrap();
let io = TokioIo::new(stream);
let server_clone = server.clone();
let registry_clone = registry.clone();
tokio::task::spawn(async move {
let conn = server_clone.serve_connection(io, service_fn(make_handler(registry_clone)));
pin!(conn);
tokio::select! {
_ = conn.as_mut() => {}
_ = shutdown_stream.recv() => {
conn.as_mut().graceful_shutdown();
}
}
}))
.with_graceful_shutdown(async move {
shutdown_stream.recv().await;
})
.await
.unwrap();
});
}
}

/// Boxed HTTP body for responses
type BoxBody = combinators::BoxBody<Bytes, hyper::Error>;

/// This function returns a HTTP handler (i.e. another function)
pub fn make_handler(
registry: Arc<Registry>,
) -> impl Fn(Request<Body>) -> Pin<Box<dyn Future<Output = io::Result<Response<Body>>> + Send>> {
) -> impl Fn(Request<Incoming>) -> Pin<Box<dyn Future<Output = io::Result<Response<BoxBody>>> + Send>> {
// This closure accepts a request and responds with the OpenMetrics encoding of our metrics.
move |_req: Request<Body>| {
move |_req: Request<Incoming>| {
let reg = registry.clone();

Box::pin(async move {
let mut buf = String::new();
encode(&mut buf, &reg.clone())
.map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))
.map(|_| {
let body = Body::from(buf);
let body = full(Bytes::from(buf));
Response::builder()
.header(
hyper::header::CONTENT_TYPE,
Expand All @@ -75,3 +86,8 @@ pub fn make_handler(
})
}
}

/// helper function to build a full boxed body
pub fn full(body: Bytes) -> BoxBody {
Full::new(body).map_err(|never| match never {}).boxed()
}