1 files changed, 6 insertions, 70 deletions
diff --git a/src/metrics.rs b/src/metrics.rs
index 7bfa2d2..48f5d9b 100644
--- a/src/metrics.rs
+++ b/src/metrics.rs
@@ -1,83 +1,19 @@
 #![allow(unused_imports, dead_code)]
 use async_trait::async_trait;
 use lazy_static::lazy_static;
-use prometheus::{
-    self, register_histogram_vec, register_int_counter_vec, Encoder, HistogramVec, IntCounterVec,
-    TextEncoder,
-};
 use std::time::{Duration, Instant};
-//use tide::{Next, Request, Response, Result};
+use prometheus::Encoder;
 
-// Copied from https://docs.rs/prometheus/0.12.0/src/prometheus/histogram.rs.html#885-889
-#[inline]
-fn duration_to_seconds(d: Duration) -> f64 {
-    let nanos = f64::from(d.subsec_nanos()) / 1e9;
-    d.as_secs() as f64 + nanos
-}
+// TODO: Vendor in the Metrics struct from warp_prometheus and rework the path matching algorithm
 
-lazy_static! {
-    static ref HTTP_CONNS_COUNTER: IntCounterVec = register_int_counter_vec!(
-        "http_requests_total",
-        "Number of processed HTTP requests",
-        &["code", "method", "url"]
-    )
-    .unwrap();
-    static ref HTTP_REQUEST_DURATION_HISTOGRAM: HistogramVec = register_histogram_vec!(
-        "http_request_duration_seconds",
-        "Duration of HTTP requests",
-        &["code", "method", "url"]
-    )
-    .unwrap();
+pub fn metrics(path_includes: Vec<String>) -> warp::log::Log<impl Fn(warp::log::Info) + Clone> {
+    let metrics = warp_prometheus::Metrics::new(prometheus::default_registry(), &path_includes);
+    warp::log::custom(move |info| metrics.http_metrics(info))
 }
 
-/*pub struct InstrumentationMiddleware {}
-
-#[async_trait]
-impl<S> tide::Middleware<S> for InstrumentationMiddleware
-where
-    S: Send + Sync + Clone + 'static,
-{
-    async fn handle(&self, req: Request<S>, next: Next<'_, S>) -> Result {
-        let url = req.url().to_string();
-        let method = req.method().to_string();
-        // Execute the request
-        let instant = Instant::now();
-        let res = next.run(req).await;
-        let elapsed = duration_to_seconds(instant.elapsed());
-        // Get the code from the response
-        let code = res.status().to_string();
-
-        HTTP_CONNS_COUNTER
-            .with_label_values(&[&code, &method, &url])
-            .inc();
-        HTTP_REQUEST_DURATION_HISTOGRAM
-            .with_label_values(&[&code, &method, &url])
-            .observe(elapsed);
-
-        Ok(res)
-    }
-}*/
-
-/*pub async fn gather<S>(_: Request<S>) -> Result
-where
-    S: Send + Sync + Clone,
-{
-    let mut buffer: Vec<u8> = vec![];
-    let encoder = TextEncoder::new();
-    let metric_families = prometheus::gather();
-    encoder.encode(&metric_families, &mut buffer).unwrap();
-
-    Ok(Response::builder(200).body(buffer).build())
-}*/
-
-// TODO metrics middleware
-// warp doesn't allow running a filter manually
-// so you need to escape into the world of hyper
-// to collect metrics on requests
-
 pub fn gather() -> Vec<u8> {
     let mut buffer: Vec<u8> = vec![];
-    let encoder = TextEncoder::new();
+    let encoder = prometheus::TextEncoder::new();
     let metric_families = prometheus::gather();
     encoder.encode(&metric_families, &mut buffer).unwrap();