Merge pull request #867 from portier/feat/prometheus

Drop prometheus crate dep, reimplement metrics

Cargo.toml

@@ -93,10 +93,6 @@ features = ["builder"]
 version = "0.4.11"
 features = ["std", "release_max_level_info"]
 
-[dependencies.prometheus]
-version = "0.13.0"
-default-features = false
-
 [dependencies.rand_core]
 optional = true
 version = "0.6.4"

src/agents/fetch.rs

@@ -1,7 +1,7 @@
+use crate::metrics::Histogram;
 use crate::utils::agent::{Agent, Context, Handler, Message};
 use headers::{CacheControl, HeaderMapExt};
 use http::StatusCode;
-use prometheus::Histogram;
 use reqwest::{Client, Method, Request};
 use std::time::Duration;
 use thiserror::Error;

src/agents/store/mod.rs

@@ -1,10 +1,10 @@
 use crate::agents::key_manager::rotating::{KeySet, RotatingKeys};
 use crate::config::LimitInput;
 use crate::crypto::SigningAlgorithm;
+use crate::metrics::Histogram;
 use crate::utils::agent::{Addr, Message, Sender};
 use crate::utils::BoxError;
 use crate::web::{Session, SessionData};
-use prometheus::Histogram;
 use std::collections::HashSet;
 use url::Url;
 

src/handlers/pages.rs

@@ -4,7 +4,6 @@ use crate::web::{data_response, empty_response, Context, HandlerResult, Response
 use headers::{ContentType, Header};
 use http::StatusCode;
 use hyper_staticfile::{AcceptEncoding, ResponseBuilder};
-use prometheus::{Encoder, TextEncoder};
 use std::env;
 
 /// Handler for the root path, redirects to the Portier homepage.
@@ -33,13 +32,11 @@ pub async fn version(_ctx: &mut Context) -> HandlerResult {
 
 /// Metrics route. (Prometheus-compatible)
 pub async fn metrics(_ctx: &mut Context) -> HandlerResult {
-    let mut buffer = vec![];
-    let metric_families = prometheus::gather();
-    let encoder = TextEncoder::new();
-    encoder.encode(&metric_families, &mut buffer).unwrap();
+    let mut buffer = String::new();
+    crate::metrics::write_metrics(&mut buffer).unwrap();
 
     let mut res = data_response(buffer);
-    res.header(ContentType::name(), encoder.format_type());
+    res.header(ContentType::name(), "text/plain; version=0.0.4");
     Ok(res)
 }