Skip to content

Commit 6d909c6

Browse files
committed
simplify example
1 parent 99c62f4 commit 6d909c6

File tree

1 file changed

+7
-13
lines changed

1 file changed

+7
-13
lines changed

examples/hyper.rs

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,19 @@ use tokio::signal::unix::{signal, SignalKind};
1414

1515
#[tokio::main]
1616
async fn main() {
17-
let request_counter = Counter::default();
17+
let request_counter: Counter<u64> = Default::default();
1818

19-
let registry = register_metrics(&request_counter);
20-
21-
// Spawn a server to serve the OpenMetrics endpoint.
22-
let metrics_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 8001);
23-
tokio::task::spawn(start_metrics_server(metrics_addr, registry));
24-
}
25-
26-
pub fn register_metrics(example_counter: &Counter) -> Registry {
2719
let mut registry = <Registry>::with_prefix("tokio_hyper_example");
2820

2921
registry.register(
3022
"requests",
3123
"How many requests the application has received",
32-
Box::new(example_counter.clone()),
24+
Box::new(request_counter.clone()),
3325
);
3426

35-
registry
27+
// Spawn a server to serve the OpenMetrics endpoint.
28+
let metrics_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 8001);
29+
start_metrics_server(metrics_addr, registry).await
3630
}
3731

3832
/// Start a HTTP server to report metrics.
@@ -67,13 +61,13 @@ pub fn make_handler(
6761
Box::pin(async move {
6862
let mut buf = Vec::new();
6963
encode(&mut buf, &reg.clone()).map(|_| {
70-
let body = std::str::from_utf8(buf.as_slice()).unwrap().to_string();
64+
let body = Body::from(buf);
7165
Response::builder()
7266
.header(
7367
hyper::header::CONTENT_TYPE,
7468
"application/openmetrics-text; version=1.0.0; charset=utf-8",
7569
)
76-
.body(Body::from(body))
70+
.body(body)
7771
.unwrap()
7872
})
7973
})

0 commit comments

Comments
 (0)