Companion to substrate #10196 - Add group name in task metrics (#732)

* Use blank task group name

Signed-off-by: Andrei Sandu <andrei-mihail@parity.io>

* cargo fmt

Signed-off-by: Andrei Sandu <andrei-mihail@parity.io>

* Update

Signed-off-by: Andrei Sandu <andrei-mihail@parity.io>

* update Cargo.lock and switch from 0.9.12 to master

* format with LATEST nightly

Co-authored-by: Andronik Ordian <write@reusable.software>

cumulus/client/collator/src/lib.rs

@@ -390,7 +390,7 @@ mod tests {
 				.build()
 				.expect("Builds overseer");
 
-		spawner.spawn("overseer", overseer.run().then(|_| async { () }).boxed());
+		spawner.spawn("overseer", None, overseer.run().then(|_| async { () }).boxed());
 
 		let collator_start = start_collator(StartCollatorParams {
 			runtime_api: client.clone(),

cumulus/client/network/src/lib.rs

@@ -522,6 +522,7 @@ impl<Block: BlockT> WaitToAnnounce<Block> {
 
 		self.spawner.spawn(
 			"cumulus-wait-to-announce",
+			None,
 			async move {
 				tracing::debug!(
 					target: "cumulus-network",

cumulus/client/service/src/lib.rs

@@ -237,7 +237,9 @@ where
 			self.announce_block,
 		);
 
-		self.task_manager.spawn_essential_handle().spawn("cumulus-consensus", consensus);
+		self.task_manager
+			.spawn_essential_handle()
+			.spawn("cumulus-consensus", None, consensus);
 	}
 }
 
@@ -281,9 +283,11 @@ where
 			self.para_id,
 		);
 
-		self.task_manager
+		self.task_manager.spawn_essential_handle().spawn(
-			.spawn_essential_handle()
+			"cumulus-pov-recovery",
-			.spawn("cumulus-pov-recovery", pov_recovery.run());
+			None,
+			pov_recovery.run(),
+		);
 
 		Ok(())
 	}

cumulus/parachain-template/node/src/service.rs

@@ -127,7 +127,7 @@ where
 	let telemetry_worker_handle = telemetry.as_ref().map(|(worker, _)| worker.handle());
 
 	let telemetry = telemetry.map(|(worker, telemetry)| {
-		task_manager.spawn_handle().spawn("telemetry", worker.run());
+		task_manager.spawn_handle().spawn("telemetry", None, worker.run());
 		telemetry
 	});
 

cumulus/polkadot-parachains/src/service.rs

@@ -209,7 +209,7 @@ where
 	let telemetry_worker_handle = telemetry.as_ref().map(|(worker, _)| worker.handle());
 
 	let telemetry = telemetry.map(|(worker, telemetry)| {
-		task_manager.spawn_handle().spawn("telemetry", worker.run());
+		task_manager.spawn_handle().spawn("telemetry", None, worker.run());
 		telemetry
 	});
 

cumulus/test/service/Cargo.toml

@@ -65,8 +65,8 @@ futures = "0.3.5"
 polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "master" }
 
 # Substrate dependencies
-sc-cli = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12" }
+sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }
-substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.12" }
+substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "master" }
 
 [[bench]]
 name = "transaction_throughput"