From ccb3179bfca127433db6767ce0f09752139929a2 Mon Sep 17 00:00:00 2001 From: nodebreaker-carlsagan Date: Wed, 5 Feb 2020 15:16:50 +0900 Subject: [PATCH] remove prometheus in Tracing --- client/cli/src/params.rs | 4 ++-- client/tracing/src/lib.rs | 8 +------- utils/prometheus/src/lib.rs | 6 ++---- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/client/cli/src/params.rs b/client/cli/src/params.rs index fe7c34fbb1a45..128c66b30b8a9 100644 --- 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, - /// 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 index b6c1b1120f4ed..c00bca9275eec 100644 --- 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 index a59f17a14a738..31cb627578667 100644 --- a/utils/prometheus/src/lib.rs +++ b/utils/prometheus/src/lib.rs @@ -66,14 +66,12 @@ async fn request_metrics(req: Request, registry: Registry) -> Result