Suggestions

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

@@ -146,7 +146,7 @@ pub fn new_full(config: Configuration) -> Result<TaskManager, ServiceError> {
 
 	if role.is_authority() {
 		let proposer = sc_basic_authorship::ProposerFactory::new(
-			Box::new(task_manager.spawn_handle()),
+			task_manager.spawn_handle(),
 			client.clone(),
 			transaction_pool,
 			prometheus_registry.as_ref(),

bin/node/cli/src/service.rs

@@ -231,7 +231,7 @@ pub fn new_full_base(
 
 	if let sc_service::config::Role::Authority { .. } = &role {
 		let proposer = sc_basic_authorship::ProposerFactory::new(
-			Box::new(task_manager.spawn_handle()),
+			task_manager.spawn_handle(),
 			client.clone(),
 			transaction_pool.clone(),
 			prometheus_registry.as_ref(),
@@ -558,7 +558,7 @@ mod tests {
 				);
 
 				let mut proposer_factory = sc_basic_authorship::ProposerFactory::new(
-					Box::new(service.spawn_handle()),
+					service.spawn_handle(),
 					service.client(),
 					service.transaction_pool(),
 					None,

client/basic-authorship/src/basic_authorship.rs

@@ -403,7 +403,7 @@ mod tests {
 		);
 
 		let mut proposer_factory = ProposerFactory::new(
-			Box::new(spawner.clone()),
+			spawner.clone(),
 			client.clone(),
 			txpool.clone(),
 			None,
@@ -449,7 +449,7 @@ mod tests {
 		);
 
 		let mut proposer_factory = ProposerFactory::new(
-			Box::new(spawner.clone()),
+			spawner.clone(),
 			client.clone(),
 			txpool.clone(),
 			None,
@@ -504,7 +504,7 @@ mod tests {
 		);
 
 		let mut proposer_factory = ProposerFactory::new(
-			Box::new(spawner.clone()),
+			spawner.clone(),
 			client.clone(),
 			txpool.clone(),
 			None,
@@ -578,7 +578,7 @@ mod tests {
 		).unwrap();
 
 		let mut proposer_factory = ProposerFactory::new(
-			Box::new(spawner.clone()),
+			spawner.clone(),
 			client.clone(),
 			txpool.clone(),
 			None,

client/cli/proc-macro/src/lib.rs

@@ -142,7 +142,10 @@ pub fn prefix_logs_with(arg: TokenStream, item: TokenStream) -> TokenStream {
 	(quote! {
 		#(#attrs)*
 		#vis #sig {
-			let span = #crate_name::tracing::info_span!("substrate-node", name = #name);
+			let span = #crate_name::tracing::info_span!(
+				#crate_name::PREFIX_LOG_SPAN,
+				name = #name,
+			);
 			let _enter = span.enter();
 
 			#block

client/cli/src/lib.rs

@@ -51,6 +51,8 @@ use tracing_subscriber::{
 	filter::Directive, fmt::time::ChronoLocal, layer::SubscriberExt, FmtSubscriber, Layer,
 };
 
+pub use logging::PREFIX_LOG_SPAN;
+
 /// Substrate client CLI
 ///
 /// This trait needs to be defined on the root structopt of the application. It will provide the

client/cli/src/logging.rs

@@ -33,6 +33,9 @@ use tracing_subscriber::{
 	Layer,
 };
 
+/// Span name used for the logging prefix. See macro `sc_cli::prefix_logs_with!`
+pub const PREFIX_LOG_SPAN: &str = "substrate-log-prefix";
+
 pub(crate) struct EventFormat<T = SystemTime> {
 	pub(crate) timer: T,
 	pub(crate) ansi: bool,
@@ -111,7 +114,7 @@ where
 			.span(id)
 			.expect("new_span has been called for this span; qed");
 
-		if span.name() != "substrate-node" {
+		if span.name() != PREFIX_LOG_SPAN {
 			return;
 		}
 

client/consensus/manual-seal/src/lib.rs

@@ -297,7 +297,7 @@ mod tests {
 			Options::default(), api(), None, RevalidationType::Full, spawner.clone(),
 		));
 		let env = ProposerFactory::new(
-			Box::new(spawner.clone()),
+			spawner.clone(),
 			client.clone(),
 			pool.clone(),
 			None,
@@ -369,7 +369,7 @@ mod tests {
 			Options::default(), api(), None, RevalidationType::Full, spawner.clone(),
 		));
 		let env = ProposerFactory::new(
-			Box::new(spawner.clone()),
+			spawner.clone(),
 			client.clone(),
 			pool.clone(),
 			None,
@@ -445,7 +445,7 @@ mod tests {
 			Options::default(), pool_api.clone(), None, RevalidationType::Full, spawner.clone(),
 		));
 		let env = ProposerFactory::new(
-			Box::new(spawner.clone()),
+			spawner.clone(),
 			client.clone(),
 			pool.clone(),
 			None,