remove prometheus in Tracing

paritytech · Feb 5, 2020 · ccb3179 · ccb3179
1 parent 5e327c2
commit ccb3179
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 13 deletions.
diff --git a/client/cli/src/params.rs b/client/cli/src/params.rs
@@ -480,9 +480,9 @@ pub struct RunCmd {
 	#[structopt(long = "prometheus-port", value_name = "PORT")]
 	pub prometheus_port: Option<u16>,
 
-	/// Disable connecting to the Substrate prometheus.
+	/// Do not expose a Prometheus metric endpoint.
 	///
-	/// prometheus is on by default on global chains.
+	/// Prometheus metric endpoint is enabled by default.
 	#[structopt(long = "no-prometheus")]
 	pub no_prometheus: bool,
 

diff --git a/client/tracing/src/lib.rs b/client/tracing/src/lib.rs
@@ -34,7 +34,7 @@
 //! let span = tracing::span!(tracing::Level::INFO, "my_span_name", my_number = 10, a_key = "a value");
 //! let _guard = span.enter();
 //! ```
-//! Currently we provide `Log` (default), `Telemetry` and `Prometheus` variants for `Receiver`
+//! Currently we provide `Log` (default), `Telemetry` variants for `Receiver`
 
 use std::collections::HashMap;
 use std::fmt;
@@ -62,8 +62,6 @@ pub enum TracingReceiver {
 	Log,
 	/// Output to telemetry
 	Telemetry,
-	/// Output to Prometheus endpoint
-	Prometheus,
 }
 
 impl Default for TracingReceiver {
@@ -254,7 +252,6 @@ impl ProfilingSubscriber {
 		match self.receiver {
 			TracingReceiver::Log => print_log(span_datum),
 			TracingReceiver::Telemetry => send_telemetry(span_datum),
-			TracingReceiver::Prometheus => send_prometheus(span_datum),
 		}
 	}
 }
@@ -290,6 +287,3 @@ fn send_telemetry(span_datum: SpanDatum) {
 	);
 }
 
-fn send_prometheus(_span_datum: SpanDatum) {
-	unimplemented!()
-}
diff --git a/utils/prometheus/src/lib.rs b/utils/prometheus/src/lib.rs
@@ -66,14 +66,12 @@ async fn request_metrics(req: Request<Body>, registry: Registry) -> Result<Respo
 		let encoder = TextEncoder::new();
 		encoder.encode(&metric_families, &mut buffer).unwrap();
 
-		Response::builder()
-			.status(StatusCode::OK)
+		Response::builder().status(StatusCode::OK)
 			.header("Content-Type", encoder.format_type())
 			.body(Body::from(buffer))
 			.map_err(Error::Http)
 	} else {
-		Response::builder()
-		.status(StatusCode::NOT_FOUND)
+		Response::builder().status(StatusCode::NOT_FOUND)
 		.body(Body::from("Not found."))
 		.map_err(Error::Http)
 	}