From 1403bf9d96d96502f08a30c395d4d6753f493f00 Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Thu, 4 Aug 2022 15:26:47 +0800
Subject: [PATCH] Companion of paritytech/substrate#10196, !

---
 node/service/src/service/dvm.rs      | 22 ++++++++++++++++++----
 node/service/src/service/mod.rs      | 13 ++++++++-----
 node/service/src/service/template.rs | 12 ++++++++++--
 3 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/node/service/src/service/dvm.rs b/node/service/src/service/dvm.rs
index ec17607e2c..9240a71aec 100644
--- a/node/service/src/service/dvm.rs
+++ b/node/service/src/service/dvm.rs
@@ -96,6 +96,8 @@ where
 			// Spawn Frontier FeeHistory cache maintenance task.
 			task_manager.spawn_essential_handle().spawn(
 				"frontier-fee-history",
+				// TODO: cc @AsceticBear
+				Some("frontier-fee-history"),
 				EthTask::fee_history_task(
 					client.clone(),
 					overrides.clone(),
@@ -106,6 +108,8 @@ where
 			// Spawn mapping sync worker task.
 			task_manager.spawn_essential_handle().spawn(
 				"frontier-mapping-sync-worker",
+				// TODO: cc @AsceticBear
+				Some("frontier-mapping-sync"),
 				MappingSyncWorker::new(
 					client.import_notification_stream(),
 					Duration::new(6, 0),
@@ -124,6 +128,8 @@ where
 				const FILTER_RETAIN_THRESHOLD: u64 = 100;
 				task_manager.spawn_essential_handle().spawn(
 					"frontier-filter-pool",
+					// TODO: cc @AsceticBear
+					Some("frontier-filter-pool"),
 					EthTask::filter_pool_task(client.clone(), filter_pool, FILTER_RETAIN_THRESHOLD),
 				);
 			}
@@ -164,15 +170,23 @@ where
 			// `trace_filter` cache task. Essential.
 			// Proxies rpc requests to it's handler.
 			if let Some(trace_filter_task) = trace_filter_task {
-				task_manager
-					.spawn_essential_handle()
-					.spawn("trace-filter-cache", trace_filter_task);
+				task_manager.spawn_essential_handle().spawn(
+					"trace-filter-cache",
+					// TODO: cc @AsceticBear
+					Some("trace-filter-cache"),
+					trace_filter_task,
+				);
 			}
 
 			// `debug` task if enabled. Essential.
 			// Proxies rpc requests to it's handler.
 			if let Some(debug_task) = debug_task {
-				task_manager.spawn_essential_handle().spawn("ethapi-debug", debug_task);
+				task_manager.spawn_essential_handle().spawn(
+					"ethapi-debug",
+					// TODO: cc @AsceticBear
+					Some("ethapi-debug"),
+					debug_task,
+				);
 			}
 
 			EthRpcRequesters { debug: debug_requester, trace: trace_filter_requester }
diff --git a/node/service/src/service/mod.rs b/node/service/src/service/mod.rs
index fc4086ac48..0248b538e2 100644
--- a/node/service/src/service/mod.rs
+++ b/node/service/src/service/mod.rs
@@ -348,7 +348,7 @@ where
 		};
 		let babe = sc_consensus_babe::start_babe(babe_config)?;
 
-		task_manager.spawn_essential_handle().spawn_blocking("babe", babe);
+		task_manager.spawn_essential_handle().spawn_blocking("babe", None, babe);
 	}
 
 	if is_authority && !authority_discovery_disabled {
@@ -374,9 +374,11 @@ where
 				prometheus_registry.clone(),
 			);
 
-		task_manager
-			.spawn_handle()
-			.spawn("authority-discovery-worker", authority_discovery_worker.run());
+		task_manager.spawn_handle().spawn(
+			"authority-discovery-worker",
+			Some("authority-discovery"),
+			authority_discovery_worker.run(),
+		);
 	}
 
 	let keystore = if is_authority { Some(keystore_container.sync_keystore()) } else { None };
@@ -416,6 +418,7 @@ where
 
 		task_manager.spawn_essential_handle().spawn_blocking(
 			"grandpa-voter",
+			None,
 			sc_finality_grandpa::run_grandpa_voter(grandpa_config)?,
 		);
 	}
@@ -501,7 +504,7 @@ where
 			executor,
 		)?;
 	let telemetry = telemetry.map(|(worker, telemetry)| {
-		task_manager.spawn_handle().spawn("telemetry", worker.run());
+		task_manager.spawn_handle().spawn("telemetry", Some("telemetry"), worker.run());
 		telemetry
 	});
 	let client = Arc::new(client);
diff --git a/node/service/src/service/template.rs b/node/service/src/service/template.rs
index 485963bdb2..3345b14201 100644
--- a/node/service/src/service/template.rs
+++ b/node/service/src/service/template.rs
@@ -278,7 +278,11 @@ pub fn new_full(
 				},
 			});
 			// we spawn the future on a background thread managed by service.
-			task_manager.spawn_essential_handle().spawn_blocking("manual-seal", authorship_future);
+			task_manager.spawn_essential_handle().spawn_blocking(
+				"manual-seal",
+				None,
+				authorship_future,
+			);
 		} else {
 			let authorship_future = manual_seal::run_instant_seal(InstantSealParams {
 				block_import,
@@ -294,7 +298,11 @@ pub fn new_full(
 				},
 			});
 			// we spawn the future on a background thread managed by service.
-			task_manager.spawn_essential_handle().spawn_blocking("instant-seal", authorship_future);
+			task_manager.spawn_essential_handle().spawn_blocking(
+				"instant-seal",
+				None,
+				authorship_future,
+			);
 		}
 
 		log::info!("Manual Seal Ready");