Remove lazy-static, s/example_counter/request_counter

Signed-off-by: Adam Chalmers <[email protected]>

Author: adamchalmers

Cargo.toml

@@ -36,15 +36,10 @@ tide = "0.16"
 actix-web = "4"
 tokio = { version = "1", features = ["rt-multi-thread", "net", "macros", "signal"] }
 hyper = { version = "0.14.16", features = ["server", "http1", "tcp"] }
-lazy_static = "1.4"
 
 [build-dependencies]
 prost-build = { version = "0.9.0", optional = true }
 
-[[example]]
-name = "hyper"
-crate-type = ["bin"]
-
 [[bench]]
 name = "family"
 harness = false

examples/hyper.rs

@@ -9,42 +9,34 @@ use std::{
     net::{IpAddr, Ipv4Addr, SocketAddr},
     pin::Pin,
     sync::Arc,
-    time::Duration,
 };
 use tokio::signal::unix::{signal, SignalKind};
 
-lazy_static::lazy_static! {
-    pub static ref EXAMPLE_COUNTER: Counter = Counter::default();
-}
-
 #[tokio::main]
 async fn main() {
-    let registry = register_metrics();
+    let request_counter = Counter::default();
+
+    let registry = register_metrics(&request_counter);
 
     // Spawn a server to serve the OpenMetrics endpoint.
     let metrics_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 8001);
-    tokio::task::spawn(start_server(metrics_addr, registry));
-
-    loop {
-        EXAMPLE_COUNTER.inc();
-        tokio::time::sleep(Duration::from_secs(1)).await;
-    }
+    tokio::task::spawn(start_metrics_server(metrics_addr, registry));
 }
 
-pub fn register_metrics() -> Registry {
+pub fn register_metrics(example_counter: &Counter) -> Registry {
     let mut registry = <Registry>::with_prefix("tokio_hyper_example");
 
     registry.register(
-        "example_counter",
-        "An example counter that will get incremented automatically",
-        Box::new(EXAMPLE_COUNTER.clone()),
+        "requests",
+        "How many requests the application has received",
+        Box::new(example_counter.clone()),
     );
 
     registry
 }
 
 /// Start a HTTP server to report metrics.
-pub async fn start_server(metrics_addr: SocketAddr, registry: Registry) {
+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}");