Telemetry per node

bin/node-template/node/src/service.rs

@@ -39,7 +39,7 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 >, ServiceError> {
 	let inherent_data_providers = sp_inherents::InherentDataProviders::new();
 
-	let (client, backend, keystore_container, task_manager) =
+	let (client, backend, keystore_container, task_manager, telemetry) =
 		sc_service::new_full_parts::<Block, RuntimeApi, Executor>(&config)?;
 	let client = Arc::new(client);
 
@@ -73,17 +73,31 @@ pub fn new_partial(config: &Configuration) -> Result<sc_service::PartialComponen
 	)?;
 
 	Ok(sc_service::PartialComponents {
-		client, backend, task_manager, import_queue, keystore_container,
-		select_chain, transaction_pool,inherent_data_providers,
+		client,
+		backend,
+		task_manager,
+		import_queue,
+		keystore_container,
+		select_chain,
+		transaction_pool,
+		inherent_data_providers,
+		telemetry,
 		other: (aura_block_import, grandpa_link),
 	})
 }
 
 /// Builds a new service for a full client.
 pub fn new_full(config: Configuration) -> Result<TaskManager, ServiceError> {
 	let sc_service::PartialComponents {
-		client, backend, mut task_manager, import_queue, keystore_container,
-		select_chain, transaction_pool, inherent_data_providers,
+		client,
+		backend,
+		mut task_manager,
+		import_queue,
+		keystore_container,
+		select_chain,
+		transaction_pool,
+		inherent_data_providers,
+		telemetry,
 		other: (block_import, grandpa_link),
 	} = new_partial(&config)?;
 
@@ -141,7 +155,11 @@ pub fn new_full(config: Configuration) -> Result<TaskManager, ServiceError> {
 		rpc_extensions_builder,
 		on_demand: None,
 		remote_blockchain: None,
-		backend, network_status_sinks, system_rpc_tx, config,
+		backend,
+		network_status_sinks,
+		system_rpc_tx,
+		config,
+		telemetry,
 	})?;
 
 	if role.is_authority() {
@@ -224,7 +242,7 @@ pub fn new_full(config: Configuration) -> Result<TaskManager, ServiceError> {
 
 /// Builds a new service for a light client.
 pub fn new_light(config: Configuration) -> Result<TaskManager, ServiceError> {
-	let (client, backend, keystore_container, mut task_manager, on_demand) =
+	let (client, backend, keystore_container, mut task_manager, on_demand, telemetry) =
 		sc_service::new_light_parts::<Block, RuntimeApi, Executor>(&config)?;
 
 	let transaction_pool = Arc::new(sc_transaction_pool::BasicPool::new_light(
@@ -291,6 +309,7 @@ pub fn new_light(config: Configuration) -> Result<TaskManager, ServiceError> {
 		network,
 		network_status_sinks,
 		system_rpc_tx,
+		telemetry,
 	 })?;
 
 	 network_starter.start_network();

bin/node/cli/browser-demo/build.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 cargo +nightly build --release -p node-cli --target wasm32-unknown-unknown --no-default-features --features browser -Z features=itarget
 wasm-bindgen ../../../../target/wasm32-unknown-unknown/release/node_cli.wasm --out-dir pkg --target web
-python -m http.server 8000
+python -m http.server 8080

bin/node/cli/src/browser.rs

@@ -23,7 +23,6 @@ use browser_utils::{
 	Client,
 	browser_configuration, set_console_error_panic_hook, init_console_log,
 };
-use std::str::FromStr;
 
 /// Starts the client.
 #[wasm_bindgen]
@@ -35,14 +34,15 @@ pub async fn start_client(chain_spec: Option<String>, log_level: String) -> Resu
 
 async fn start_inner(chain_spec: Option<String>, log_level: String) -> Result<Client, Box<dyn std::error::Error>> {
 	set_console_error_panic_hook();
-	init_console_log(log::Level::from_str(&log_level)?)?;
+	let telemetries = init_console_log(log_level.as_str())?;
 	let chain_spec = match chain_spec {
 		Some(chain_spec) => ChainSpec::from_json_bytes(chain_spec.as_bytes().to_vec())
 			.map_err(|e| format!("{:?}", e))?,
 		None => crate::chain_spec::development_config(),
 	};
 
-	let config = browser_configuration(chain_spec).await?;
+	let mut config = browser_configuration(chain_spec, telemetries).await?;
+	config.telemetry_endpoints = Some(sc_telemetry::TelemetryEndpoints::new(vec![("ws://127.0.0.1:8000/submit".to_string(), 10)]).unwrap());
 
 	info!("Substrate browser node");
 	info!("✌️  version {}", config.impl_version);

bin/node/cli/src/command.rs

@@ -73,10 +73,18 @@ pub fn run() -> Result<()> {
 		None => {
 			let runner = cli.create_runner(&cli.run)?;
 			runner.run_node_until_exit(|config| async move {
-				match config.role {
-					Role::Light => service::new_light(config),
-					_ => service::new_full(config),
-				}
+				// TODO revert after test
+				let config2 = cli.create_configuration(&cli.run, config.task_executor.clone(), config.telemetries.clone()).unwrap();
+				let mut task_manager = match config.role {
+					Role::Light => service::new_light(config).unwrap(),
+					_ => service::new_full(config).unwrap(),
+				};
+				let task_manager2 = match config2.role {
+					Role::Light => service::new_light(config2).unwrap(),
+					_ => service::new_full(config2).unwrap(),
+				};
+				task_manager.add_child(task_manager2);
+				Ok(task_manager)
 			})
 		}
 		Some(Subcommand::Inspect(cmd)) => {