Add node name to the log lines (#7328)

* Initial commit Forked at: 601e2fa139 Parent branch: origin/master * WIP Forked at: 601e2fa139 Parent branch: origin/master * WIP Forked at: 601e2fa139 Parent branch: origin/master * WIP Forked at: 601e2fa139 Parent branch: origin/master * WIP Forked at: 601e2fa139 Parent branch: origin/master * WIP Forked at: 601e2fa139 Parent branch: origin/master * CLEANUP Forked at: 601e2fa139 Parent branch: origin/master * Add notes to original source code * CLEANUP Forked at: 601e2fa139 Parent branch: origin/master * CLEANUP Forked at: 601e2fa139 Parent branch: origin/master * WIP Forked at: 601e2fa139 Parent branch: origin/master * WIP Forked at: 601e2fa139 Parent branch: origin/master * WIP Forked at: 601e2fa139 Parent branch: origin/master * CLEANUP Forked at: 601e2fa139 Parent branch: origin/master * WIP Forked at: 601e2fa139 Parent branch: origin/master * Some doc * Test with trybuild * Revert "Test with trybuild" (issue with trybuild atm) This reverts commit 9055ec2206808ba3ddce6e3d87eb358907fa5e42. https://github.com/dtolnay/trybuild/issues/53 * Apply suggestions * Rename derive to proc-macro * Remove "prefix" feature from informant * Blocking task should use SpawnHandle::spawn_blocking * Improve doc as suggested * Fixes Forked at: 601e2fa139 Parent branch: origin/master * Apply suggestion * Update client/cli/proc-macro/src/lib.rs Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * More suggestions * CLEANUP Forked at: 601e2fa139 Parent branch: origin/master * Improve error message * CLEANUP Forked at: 601e2fa139 Parent branch: origin/master * Fix async issue * CLEANUP Forked at: 601e2fa139 Parent branch: origin/master * CLEANUP Forked at: 601e2fa139 Parent branch: origin/master * Add test * fix doc test * Update client/cli/src/logging.rs Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * Update client/basic-authorship/src/basic_authorship.rs Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * Update client/basic-authorship/src/basic_authorship.rs Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com> * Apply suggestions * Suggestions * Clarify doc * WIP Forked at: 601e2fa139 Parent branch: origin/master Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
2026-06-13 09:21:05 +00:00 · 2020-10-21 17:13:07 +02:00
parent 4e9256aba2
commit 8cebbd142d
20 changed files with 704 additions and 77 deletions
@@ -77,6 +77,7 @@ prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../..
 sc-tracing = { version = "2.0.0", path = "../tracing" }
 sp-tracing = { version = "2.0.0", path = "../../primitives/tracing" }
 tracing = "0.1.19"
+tracing-futures = { version = "0.2.4" }
 parity-util-mem = { version = "0.7.0", default-features = false, features = ["primitive-types"] }

 [target.'cfg(not(target_os = "unknown"))'.dependencies]
@@ -27,6 +27,7 @@ use prometheus_endpoint::{
 	CounterVec, HistogramOpts, HistogramVec, Opts, Registry, U64
 };
 use sp_utils::mpsc::{TracingUnboundedSender, TracingUnboundedReceiver, tracing_unbounded};
+use tracing_futures::Instrument;
 use crate::{config::{TaskExecutor, TaskType, JoinFuture}, Error};

 mod prometheus_future;
@@ -116,7 +117,7 @@ impl SpawnTaskHandle {
 			}
 		};

-		let join_handle = self.executor.spawn(Box::pin(future), task_type);
+		let join_handle = self.executor.spawn(Box::pin(future.in_current_span()), task_type);
 		let mut task_notifier = self.task_notifier.clone();
 		self.executor.spawn(
 			Box::pin(async move {
@@ -31,6 +31,7 @@ use tokio::{runtime::Runtime, prelude::FutureExt};
 use tokio::timer::Interval;
 use sc_service::{
 	TaskManager,
+	SpawnTaskHandle,
 	GenericChainSpec,
 	ChainSpecExtension,
 	Configuration,
@@ -75,6 +76,7 @@ pub trait TestNetNode: Clone + Future<Item = (), Error = sc_service::Error> + Se
 	fn client(&self) -> Arc<Client<Self::Backend, Self::Executor, Self::Block, Self::RuntimeApi>>;
 	fn transaction_pool(&self) -> Arc<Self::TransactionPool>;
 	fn network(&self) -> Arc<sc_network::NetworkService<Self::Block, <Self::Block as BlockT>::Hash>>;
+	fn spawn_handle(&self) -> SpawnTaskHandle;
 }

 pub struct TestNetComponents<TBl: BlockT, TBackend, TExec, TRtApi, TExPool> {
@@ -147,6 +149,9 @@ TestNetComponents<TBl, TBackend, TExec, TRtApi, TExPool>
 	fn network(&self) -> Arc<sc_network::NetworkService<Self::Block, <Self::Block as BlockT>::Hash>> {
 		self.network.clone()
 	}
+	fn spawn_handle(&self) -> SpawnTaskHandle {
+		self.task_manager.lock().spawn_handle()
+	}
 }

 impl<G, E, F, L, U> TestNet<G, E, F, L, U>