no-std or warm compatibility issues, grapana-data -source code refere…

…nce and correction,applicable

client/cli/src/lib.rs

@@ -910,6 +910,7 @@ where
 	let rpc_interface: &str = interface_str(cli.rpc_external, cli.unsafe_rpc_external, cli.validator)?;
 	let ws_interface: &str = interface_str(cli.ws_external, cli.unsafe_ws_external, cli.validator)?;
 	let grafana_interface: &str = if cli.grafana_external { "0.0.0.0" } else { "127.0.0.1" };
+	let prometheus_interface: &str = if cli.prometheus_external { "0.0.0.0" } else { "127.0.0.1" };
 
 	config.rpc_http = Some(parse_address(&format!("{}:{}", rpc_interface, 9933), cli.rpc_port)?);
 	config.rpc_ws = Some(parse_address(&format!("{}:{}", ws_interface, 9944), cli.ws_port)?);
@@ -943,12 +944,10 @@ where
 	config.tracing_receiver = cli.tracing_receiver.into();
 
 	// Override prometheus
-	match cli.prometheus_endpoint {
-		None => {config.prometheus_endpoint = None;},
-		Some(x) => {
-			config.prometheus_endpoint = Some(parse_address(&format!("{}:{}", x, 33333), cli.prometheus_port)?);
-			}
-	}
+	if cli.prometheus_external {
+			config.prometheus_port = Some(
+		parse_address(&format!("{}:{}", prometheus_interface, 33333), cli.prometheus_port)?
+	)}
 	// Imply forced authoring on --dev
 	config.force_authoring = cli.shared_params.dev || cli.force_authoring;
 

client/cli/src/params.rs

@@ -443,9 +443,9 @@ pub struct RunCmd {
 	/// Prometheus exporter TCP port.
 	#[structopt(long = "prometheus-port", value_name = "PORT")]
 	pub prometheus_port: Option<u16>,
-	/// Prometheus exporter IP addr.
-	#[structopt(long = "prometheus-addr", value_name = "Local IP address")]
-	pub prometheus_endpoint: Option<String>,
+	/// Prometheus exporter on/off external".
+	#[structopt(long = "prometheus-external")]
+	pub prometheus_external: bool,
 
 	/// Listen to all Websocket interfaces.
 	///

client/service/src/builder.rs

@@ -1116,11 +1116,15 @@ ServiceBuilder<
 			telemetry
 		});
 		// prometheus init
-		match config.prometheus_endpoint {
-			None => (),
-			Some(x) => {
-				let _prometheus = sc_prometheus::init_prometheus(x);
-			}
+		if let Some(port) = config.prometheus_port {
+			let future = select(
+					sc_prometheus::init_prometheus(port).boxed()
+					,exit.clone()
+				).map(|either| match either {
+					Either::Left((result, _)) => result.map_err(|_| ()),
+					Either::Right(_) => Ok(())
+				}).compat();
+				let _ = to_spawn_tx.unbounded_send(Box::new(future));
 		}
 		// Grafana data source
 		if let Some(port) = config.grafana_port {

client/service/src/config.rs

@@ -75,8 +75,8 @@ pub struct Configuration<C, G, E = NoExtension> {
 	pub rpc_cors: Option<Vec<String>>,
 	/// Grafana data source http port. `None` if disabled.
 	pub grafana_port: Option<SocketAddr>,
-	/// Promteheus IP addr. `None` if disabled. and defult port 33333
-	pub prometheus_endpoint: Option<SocketAddr>,
+	/// Promteheus Port. `None` if disabled. and defult port 33333
+	pub prometheus_port: Option<SocketAddr>,
 	/// Telemetry service URL. `None` if disabled.
 	pub telemetry_endpoints: Option<TelemetryEndpoints>,
 	/// External WASM transport for the telemetry. If `Some`, when connection to a telemetry
@@ -155,7 +155,7 @@ impl<C, G, E> Configuration<C, G, E> where
 			rpc_ws: None,
 			rpc_ws_max_connections: None,
 			rpc_cors: Some(vec![]),
-			prometheus_endpoint: None,
+			prometheus_port: None,
 			grafana_port: None,
 			telemetry_endpoints: None,
 			telemetry_external_transport: None,

client/service/test/src/lib.rs

@@ -192,7 +192,7 @@ fn node_config<G, E: Clone> (
 		rpc_ws: None,
 		rpc_ws_max_connections: None,
 		rpc_cors: None,
-		prometheus_endpoint: None,
+		prometheus_port: None,
 		grafana_port: None,
 		telemetry_endpoints: None,
 		telemetry_external_transport: None,

utils/prometheus/Cargo.toml

@@ -6,12 +6,14 @@ description = "prometheus utils"
 edition = "2018"
 
 [dependencies]
-hyper = "0.12"
-lazy_static = "1.0"
-log = "0.4"
+hyper = { version = "0.13.1", default-features = false, features = ["stream"] }
+lazy_static = "1.4"
+log = "0.4.8"
 prometheus = { version = "0.7", features = ["nightly", "process"]}
-tokio = "0.1"
+tokio = "0.2"
+futures-util = { version = "0.3.1", default-features = false, features = ["io"] }
 sp-runtime = { package = "sp-runtime",path = "../../primitives/runtime" }
+derive_more = "0.99"
 
-[dev-dependencies]
-reqwest = "0.9"
+[target.'cfg(not(target_os = "unknown"))'.dependencies]
+async-std = { version = "1.0.1", features = ["unstable"] }