Fix incorrect prefix for "Prepared block for proposing at" (paritytec…

…h#305) * Fix incorrect prefix for "Prepared block for proposing at" * Update Substrate & Polkadot * Fix quotes & codec * WIP * Fix logger rename * Revert "WIP" This reverts commit af2fe96. * WIP * CLEANUP * Working state * WIP * WIP
n1stta · Mar 17, 2021 · a90308b · a90308b
1 parent 8f1ef9d
commit a90308b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/client/collator/Cargo.toml b/client/collator/Cargo.toml
@@ -28,7 +28,7 @@ cumulus-primitives-core = { path = "../../primitives/core" }
 codec = { package = "parity-scale-codec", version = "2.0.0", features = [ "derive" ] }
 futures = { version = "0.3.1", features = ["compat"] }
 parking_lot = "0.9"
-tracing = "0.1.22"
+tracing = "0.1.25"
 
 [dev-dependencies]
 # Polkadot dependencies

diff --git a/client/collator/src/lib.rs b/client/collator/src/lib.rs
@@ -40,12 +40,10 @@ use polkadot_primitives::v1::{
 };
 
 use codec::{Decode, Encode};
-
 use futures::{channel::oneshot, FutureExt};
-
 use std::sync::Arc;
-
 use parking_lot::Mutex;
+use tracing::Instrument;
 
 /// The logging target.
 const LOG_TARGET: &str = "cumulus-collator";
@@ -370,13 +368,15 @@ pub async fn start_collator<Block, Backend, BS, Spawner>(
 		parachain_consensus,
 	);
 
+	let span = tracing::Span::current();
 	let config = CollationGenerationConfig {
 		key,
 		para_id,
 		collator: Box::new(move |relay_parent, validation_data| {
 			let collator = collator.clone();
 			collator
 				.produce_candidate(relay_parent, validation_data.clone())
+				.instrument(span.clone())
 				.boxed()
 		}),
 	};