cargo: update prometheus to 0.7

commons/Cargo.toml

@@ -2,13 +2,16 @@
 name = "commons"
 version = "0.1.0"
 authors = ["Stefan Junker <mail@stefanjunker.de>"]
+edition = "2018"
 
 [dependencies]
 actix-web = "^0.7.8"
+env_logger = "^0.6.0"
 failure = "^0.1.5"
 lazy_static = "^1.2.0"
 log = "^0.4.6"
-prometheus = "^0.6.0"
+prometheus = "^0.7.0"
 serde = "^1.0.70"
 serde_json = "^1.0.34"
+tokio = "^0.1"
 url = "^1.7.2"

commons/src/lib.rs

@@ -21,6 +21,8 @@ pub mod de;
 mod errors;
 pub use crate::errors::{register_metrics, GraphError};
 
+pub mod testing;
+
 use actix_web::http::header;
 use std::collections::HashSet;
 use url::form_urlencoded;

commons/src/testing.rs

@@ -0,0 +1,18 @@
+//! Test helpers.
+
+use failure::Fallible;
+use tokio::runtime::current_thread::Runtime;
+
+/// Initialize a tokio runtime for tests, with logging.
+pub fn init_runtime() -> Fallible<Runtime> {
+    let _ = env_logger::try_init_from_env(env_logger::Env::default());
+    Runtime::new().map_err(failure::Error::from)
+}
+
+/// Register a dummy gauge, with given value.
+pub fn dummy_gauge(registry: &prometheus::Registry, value: f64) -> Fallible<()> {
+    let test_gauge = prometheus::Gauge::new("dummy_gauge", "dummy help")?;
+    test_gauge.set(value);
+    registry.register(Box::new(test_gauge))?;
+    Ok(())
+}

graph-builder/Cargo.toml

@@ -18,7 +18,7 @@ futures = "0.1"
 itertools = "^0.7.8"
 lazy_static = "^1.2.0"
 log = "^0.4.3"
-prometheus = "^0.6.0"
+prometheus = "^0.7.0"
 quay = { path = "../quay" }
 regex = "^1.1.0"
 reqwest = "^0.9.0"
@@ -34,6 +34,9 @@ toml = "^0.4.10"
 url = "^1.7.2"
 parking_lot = "^0.8.0"
 
+[dev-dependencies]
+twoway = "^0.2"
+
 [features]
 test-net = []
 test-net-private = []

graph-builder/src/status.rs

@@ -64,3 +64,47 @@ pub fn serve_readiness(
     };
     Box::new(future::ok(resp))
 }
+
+#[cfg(test)]
+mod tests {
+    use crate::graph::State;
+    use crate::status;
+    use actix_web::test::TestRequest;
+    use commons::testing;
+    use failure::Fallible;
+    use parking_lot::RwLock;
+    use std::collections::HashSet;
+    use std::sync::Arc;
+
+    fn mock_state() -> State {
+        let json_graph = Arc::new(RwLock::new(String::new()));
+        let live = Arc::new(RwLock::new(false));
+        let ready = Arc::new(RwLock::new(false));
+
+        State::new(
+            json_graph.clone(),
+            HashSet::new(),
+            live.clone(),
+            ready.clone(),
+        )
+    }
+
+    #[test]
+    fn serve_metrics_basic() -> Fallible<()> {
+        let mut rt = testing::init_runtime()?;
+        testing::dummy_gauge(&status::PROM_REGISTRY, 42.0)?;
+
+        let http_req = TestRequest::with_state(mock_state()).finish();
+        let metrics_call = status::serve_metrics(http_req);
+        let resp = rt.block_on(metrics_call)?;
+
+        assert_eq!(resp.status().as_u16(), 200);
+        assert!(resp.body().is_binary());
+
+        if let actix_web::Body::Binary(body) = resp.body() {
+            assert!(!body.is_empty());
+            assert!(twoway::find_bytes(body.as_ref(), b"cincinnati_gb_dummy_gauge 42\n").is_some());
+        }
+        Ok(())
+    }
+}

policy-engine/Cargo.toml

@@ -16,7 +16,7 @@ hyper = "^0.12.6"
 lazy_static = "^1.2.0"
 log = "^0.4.3"
 openapiv3 = "0.1"
-prometheus = "^0.6.0"
+prometheus = "^0.7.0"
 semver = "^0.9.0"
 serde = "^1.0.70"
 serde_derive = "^1.0.70"
@@ -28,3 +28,4 @@ url = "1.7.2"
 
 [dev-dependencies]
 tokio = "^0.1"
+twoway = "^0.2"

policy-engine/src/metrics.rs

@@ -31,3 +31,30 @@ pub(crate) fn serve(
         .map(|content| HttpResponse::Ok().body(content));
     Box::new(resp)
 }
+
+#[cfg(test)]
+mod tests {
+    use crate::metrics;
+    use actix_web::test::TestRequest;
+    use commons::testing;
+    use failure::Fallible;
+
+    #[test]
+    fn serve_metrics_basic() -> Fallible<()> {
+        let mut rt = testing::init_runtime()?;
+        testing::dummy_gauge(&metrics::PROM_REGISTRY, 42.0)?;
+
+        let http_req = TestRequest::with_state(()).finish();
+        let metrics_call = metrics::serve(http_req);
+        let resp = rt.block_on(metrics_call)?;
+
+        assert_eq!(resp.status().as_u16(), 200);
+        assert!(resp.body().is_binary());
+
+        if let actix_web::Body::Binary(body) = resp.body() {
+            assert!(!body.is_empty());
+            assert!(twoway::find_bytes(body.as_ref(), b"cincinnati_pe_dummy_gauge 42\n").is_some());
+        };
+        Ok(())
+    }
+}