Add generics

client/cli/src/informant/display.rs

@@ -23,10 +23,10 @@ use sp_runtime::traits::{
 };
 use sc_service::NetworkStatus;
 use std::{convert::{TryFrom, TryInto}, fmt, time};
-use prometheus_endpoint::{create_gauge, Gauge};
+use prometheus_endpoint::{create_gauge, Gauge, U64};
 
 prometheus_endpoint::lazy_static! {
-	pub static ref SYNC_TARGET: Gauge = create_gauge(
+	pub static ref SYNC_TARGET: Gauge<U64> = create_gauge(
 		"sync_target_number",
 		"block sync target number"
 	);
@@ -74,7 +74,7 @@ impl<B: BlockT> InformantDisplay<B> {
 			(SyncState::Idle, _) => ("Idle".into(), "".into()),
 			(SyncState::Downloading, None) => (format!("Syncing{}", speed), "".into()),
 			(SyncState::Downloading, Some(n)) => {
-				SYNC_TARGET.set(n.unique_saturated_into() as i64);
+				SYNC_TARGET.set(n.unique_saturated_into() as u64);
 				(format!("Syncing{}", speed), format!(", target=#{}", n))
 			}
 		};

client/service/src/builder.rs

@@ -54,46 +54,38 @@ use sysinfo::{get_current_pid, ProcessExt, System, SystemExt};
 use sc_telemetry::{telemetry, SUBSTRATE_INFO};
 use sp_transaction_pool::{TransactionPool, TransactionPoolMaintainer};
 use sp_blockchain;
-use prometheus_endpoint::{create_gauge, Gauge};
+use prometheus_endpoint::{create_gauge, Gauge, U64, F64};
 
 prometheus_endpoint::lazy_static! {
-	pub static ref FINALITY_HEIGHT: Gauge = create_gauge(
+	pub static ref FINALITY_HEIGHT: Gauge<U64> = create_gauge(
 		"consensus_finality_block_height_number",
 		"block is finality HEIGHT"
 	);
-	pub static ref BEST_HEIGHT: Gauge = create_gauge(
+	pub static ref BEST_HEIGHT: Gauge<U64> = create_gauge(
 		"consensus_best_block_height_number",
 		"block is best HEIGHT"
 	);
-	pub static ref BLOCK_INTERVAL_SECONDS: Gauge = create_gauge(
-		"consensus_block_interval_seconds",
-		"Time between this and last block(Block.Header.Time) in seconds"
-	);
-	pub static ref P2P_PEERS_NUM: Gauge = create_gauge(
+	pub static ref P2P_PEERS_NUM: Gauge<U64> = create_gauge(
 		"p2p_peers_number",
 		"network gosip peers number"
 	);
-	pub static ref TX_COUNT: Gauge = create_gauge(
+	pub static ref TX_COUNT: Gauge<U64> = create_gauge(
 		"consensus_num_txs",
 		"Number of transactions"
 	);
-	pub static ref NODE_MEMORY: Gauge = create_gauge(
+	pub static ref NODE_MEMORY: Gauge<U64> = create_gauge(
 		"consensus_node_memory",
 		"node memory"
 	);
-	pub static ref NODE_CPU: Gauge = create_gauge(
+	pub static ref NODE_CPU: Gauge<F64> = create_gauge(
 		"consensus_node_cpu",
 		"node cpu"
 	);
-	pub static ref STATE_CACHE_SIZE: Gauge = create_gauge(
-		"consensus_state_cache_size",
-		"used state cache size"
-	);
-	pub static ref P2P_NODE_DOWNLOAD: Gauge = create_gauge(
+	pub static ref P2P_NODE_DOWNLOAD: Gauge<U64> = create_gauge(
 		"p2p_peers_receive_byte_per_sec",
 		"p2p_node_download_per_sec_byte"
 	);
-	pub static ref P2P_NODE_UPLOAD: Gauge = create_gauge(
+	pub static ref P2P_NODE_UPLOAD: Gauge<U64> = create_gauge(
 		"p2p_peers_send_byte_per_sec",
 		"p2p_node_upload_per_sec_byte"
 	);
@@ -996,14 +988,14 @@ ServiceBuilder<
 				"bandwidth_upload" => bandwidth_upload,
 				"used_state_cache_size" => used_state_cache_size,
 			);
-			NODE_MEMORY.set(memory as i64);
-			NODE_CPU.set(cpu_usage as i64);
-			TX_COUNT.set(txpool_status.ready as i64);
-			FINALITY_HEIGHT.set(finalized_number as i64);
-			BEST_HEIGHT.set(best_number as i64);
-			P2P_PEERS_NUM.set(num_peers as i64);
-			P2P_NODE_DOWNLOAD.set(net_status.average_download_per_sec as i64);
-			P2P_NODE_UPLOAD.set(net_status.average_upload_per_sec as i64);
+			NODE_MEMORY.set(memory);
+			NODE_CPU.set(f64::from(cpu_usage));
+			TX_COUNT.set(txpool_status.ready as u64);
+			FINALITY_HEIGHT.set(finalized_number);
+			BEST_HEIGHT.set(best_number);
+			P2P_PEERS_NUM.set(num_peers as u64);
+			P2P_NODE_DOWNLOAD.set(net_status.average_download_per_sec);
+			P2P_NODE_UPLOAD.set(net_status.average_upload_per_sec);
 			Ok(())
 		}).select(exit.clone().map(Ok).compat()).then(|_| Ok(()));
 		let _ = to_spawn_tx.unbounded_send(Box::new(tel_task));

utils/prometheus/Cargo.toml

@@ -13,7 +13,6 @@ prometheus = { version = "0.7", features = ["nightly", "process"]}
 tokio = "0.2"
 futures-util = { version = "0.3.1", default-features = false, features = ["io"] }
 lazy_static = "1.4"
-sp-runtime = { package = "sp-runtime",path = "../../primitives/runtime" }
 derive_more = "0.99"
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]

utils/prometheus/src/lib.rs

@@ -14,24 +14,22 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
 
-
-#[macro_use]
 extern crate lazy_static;
-use futures_util::{FutureExt,future::{Future}};
+
+use futures_util::{FutureExt, future::Future};
 use hyper::http::StatusCode;
-use hyper::Server;
-use hyper::{Body, Request, Response, service::{service_fn, make_service_fn}};
-pub use prometheus::{Encoder, HistogramOpts, Opts, TextEncoder};
-pub use prometheus::{Histogram, IntCounter};
-pub use prometheus::IntGauge as Gauge;
-pub use sp_runtime::traits::SaturatedConversion;
+use hyper::{Server, Body, Request, Response, service::{service_fn, make_service_fn}};
+use prometheus::{Encoder, Opts, TextEncoder, core::Atomic};
 use std::net::SocketAddr;
 #[cfg(not(target_os = "unknown"))]
 mod networking;
 
+pub use prometheus::core::{
+	GenericGauge as Gauge, AtomicF64 as F64, AtomicI64 as I64, AtomicU64 as U64
+};
 pub use lazy_static::lazy_static;
 
-pub fn create_gauge(name: &str, description: &str) -> Gauge {
+pub fn create_gauge<T: Atomic + 'static>(name: &str, description: &str) -> Gauge<T> {
 	let opts = Opts::new(name, description);
 	let gauge = Gauge::with_opts(opts).expect("Creating Gauge Failed");
 	prometheus::register(Box::new(gauge.clone())).expect("Registering gauge failed");
@@ -58,22 +56,16 @@ impl std::error::Error for Error {
 }
 
 async fn request_metrics(req: Request<Body>) -> Result<Response<Body>, Error> {
-	if req.uri().path() == "/metrics" {
-		let metric_families = prometheus::gather();
-		let mut buffer = vec![];
-		let encoder = TextEncoder::new();
-		encoder.encode(&metric_families, &mut buffer).unwrap();
-		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)
-			.body(Body::from("Not found."))
-			.map_err(Error::Http)
-	}
+	let metric_families = prometheus::gather();
+	let mut buffer = vec![];
+	let encoder = TextEncoder::new();
+	encoder.encode(&metric_families, &mut buffer).unwrap();
+
+	Response::builder()
+		.status(StatusCode::OK)
+		.header("Content-Type", encoder.format_type())
+		.body(Body::from(buffer))
+		.map_err(Error::Http)
 }
 
 #[derive(Clone)]