Telemetry improvements (#1886)

* Fix typo

* Support multiple telemetry endpoints and verbosity levels

* Bump substrate-telemetry version

* Telemetrify Aura consensus

* Telemetrify Grandpa

* Fix CI version conflicts

* Implement style remarks

* Fix fixture

* Implement style remarks

* Clone only when necessary

* Get rid of Arc for URL

* Handle connection issues better

substrate/core/service/src/chain_spec.rs

@@ -25,6 +25,7 @@ use runtime_primitives::{BuildStorage, StorageOverlay, ChildrenStorageOverlay};
 use serde_json as json;
 use crate::components::RuntimeGenesis;
 use network::Multiaddr;
+use tel::TelemetryEndpoints;
 
 enum GenesisSource<G> {
 	File(PathBuf),
@@ -87,7 +88,7 @@ struct ChainSpecFile {
 	pub name: String,
 	pub id: String,
 	pub boot_nodes: Vec<String>,
-	pub telemetry_url: Option<String>,
+	pub telemetry_endpoints: Option<TelemetryEndpoints>,
 	pub protocol_id: Option<String>,
 	pub consensus_engine: Option<String>,
 	pub properties: Option<Properties>,
@@ -124,8 +125,8 @@ impl<G: RuntimeGenesis> ChainSpec<G> {
 		&self.spec.id
 	}
 
-	pub fn telemetry_url(&self) -> Option<&str> {
-		self.spec.telemetry_url.as_ref().map(String::as_str)
+	pub fn telemetry_endpoints(&self) -> &Option<TelemetryEndpoints> {
+		&self.spec.telemetry_endpoints
 	}
 
 	pub fn protocol_id(&self) -> Option<&str> {
@@ -170,7 +171,7 @@ impl<G: RuntimeGenesis> ChainSpec<G> {
 		id: &str,
 		constructor: fn() -> G,
 		boot_nodes: Vec<String>,
-		telemetry_url: Option<&str>,
+		telemetry_endpoints: Option<TelemetryEndpoints>,
 		protocol_id: Option<&str>,
 		consensus_engine: Option<&str>,
 		properties: Option<Properties>,
@@ -180,7 +181,7 @@ impl<G: RuntimeGenesis> ChainSpec<G> {
 			name: name.to_owned(),
 			id: id.to_owned(),
 			boot_nodes: boot_nodes,
-			telemetry_url: telemetry_url.map(str::to_owned),
+			telemetry_endpoints,
 			protocol_id: protocol_id.map(str::to_owned),
 			consensus_engine: consensus_engine.map(str::to_owned),
 			properties,

substrate/core/service/src/config.rs

@@ -25,6 +25,7 @@ pub use network::config::{NetworkConfiguration, Roles};
 use runtime_primitives::BuildStorage;
 use serde::{Serialize, de::DeserializeOwned};
 use target_info::Target;
+use tel::TelemetryEndpoints;
 
 /// Service configuration.
 #[derive(Clone)]
@@ -64,7 +65,7 @@ pub struct Configuration<C, G: Serialize + DeserializeOwned + BuildStorage> {
 	/// RPC over Websockets binding address. `None` if disabled.
 	pub rpc_ws: Option<SocketAddr>,
 	/// Telemetry service URL. `None` if disabled.
-	pub telemetry_url: Option<String>,
+	pub telemetry_endpoints: Option<TelemetryEndpoints>,
 	/// The default number of 64KB pages to allocate for Wasm execution
 	pub default_heap_pages: Option<u64>,
 }
@@ -90,11 +91,13 @@ impl<C: Default, G: Serialize + DeserializeOwned + BuildStorage> Configuration<C
 			execution_strategies: Default::default(),
 			rpc_http: None,
 			rpc_ws: None,
-			telemetry_url: None,
+			telemetry_endpoints: None,
 			default_heap_pages: None,
 		};
 		configuration.network.boot_nodes = configuration.chain_spec.boot_nodes().to_vec();
-		configuration.telemetry_url = configuration.chain_spec.telemetry_url().map(str::to_owned);
+
+		configuration.telemetry_endpoints = configuration.chain_spec.telemetry_endpoints().clone();
+
 		configuration
 	}
 

substrate/core/service/src/lib.rs

@@ -41,7 +41,7 @@ use exit_future::Signal;
 pub use tokio::runtime::TaskExecutor;
 use substrate_executor::NativeExecutor;
 use parity_codec::{Encode, Decode};
-use tel::telemetry;
+use tel::*;
 
 pub use self::error::{ErrorKind, Error};
 pub use config::{Configuration, Roles, PruningMode};
@@ -128,7 +128,7 @@ impl<Components: components::Components> Service<Components> {
 
 		let version = config.full_version();
 		info!("Best block: #{}", best_header.number());
-		telemetry!("node.start"; "height" => best_header.number().as_(), "best" => ?best_header.hash());
+		telemetry!(SUBSTRATE_INFO; "node.start"; "height" => best_header.number().as_(), "best" => ?best_header.hash());
 
 		let network_protocol = <Components::Factory>::build_network_protocol(&config)?;
 		let transaction_pool = Arc::new(
@@ -269,7 +269,7 @@ impl<Components: components::Components> Service<Components> {
 		)?;
 
 		// Telemetry
-		let telemetry = config.telemetry_url.clone().map(|url| {
+		let telemetry = config.telemetry_endpoints.clone().map(|endpoints| {
 			let is_authority = config.roles == Roles::AUTHORITY;
 			let network_id = network.local_peer_id().to_base58();
 			let pubkey = format!("{}", public_key);
@@ -278,9 +278,9 @@ impl<Components: components::Components> Service<Components> {
 			let version = version.clone();
 			let chain_name = config.chain_spec.name().to_owned();
 			Arc::new(tel::init_telemetry(tel::TelemetryConfig {
-				url: url,
+				endpoints,
 				on_connect: Box::new(move || {
-					telemetry!("system.connected";
+					telemetry!(SUBSTRATE_INFO; "system.connected";
 						"name" => name.clone(),
 						"implementation" => impl_name.clone(),
 						"version" => version.clone(),