Fix incorrect prefix for "Prepared block for proposing at" (#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 af2fe967bb5841a55024783dbccf6c75cba6ab1a.

* WIP

* CLEANUP

* Working state

* WIP

* WIP

cumulus/Cargo.lock

@@ -10237,11 +10237,11 @@ dependencies = [
 
 [[package]]
 name = "tracing-futures"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab7bb6f14721aa00656086e9335d363c5c8747bae02ebe32ea2c7dece5689b4c"
+checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2"
 dependencies = [
- "pin-project 0.4.27",
+ "pin-project 1.0.4",
  "tracing",
 ]
 

cumulus/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

cumulus/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,6 +368,7 @@ pub async fn start_collator<Block, Backend, BS, Spawner>(
 		parachain_consensus,
 	);
 
+	let span = tracing::Span::current();
 	let config = CollationGenerationConfig {
 		key,
 		para_id,
@@ -377,6 +376,7 @@ pub async fn start_collator<Block, Backend, BS, Spawner>(
 			let collator = collator.clone();
 			collator
 				.produce_candidate(relay_parent, validation_data.clone())
+				.instrument(span.clone())
 				.boxed()
 		}),
 	};