Implement tracing::Event handling & parent_id for spans and events

bin/node/cli/Cargo.toml

@@ -43,7 +43,7 @@ jsonrpc-pubsub = "14.2.0"
 log = "0.4.8"
 rand = "0.7.2"
 structopt = { version = "0.3.8", optional = true }
-tracing = "0.1.10"
+tracing = "0.1.18"
 parking_lot = "0.10.0"
 
 # primitives

client/cli/src/lib.rs

@@ -240,7 +240,7 @@ pub fn init_logger(pattern: &str) {
 	builder.filter(Some("hyper"), log::LevelFilter::Warn);
 	builder.filter(Some("cranelift_wasm"), log::LevelFilter::Warn);
 	// Always log the special target `sc_tracing`, overrides global level
-	builder.filter(Some("sc_tracing"), log::LevelFilter::Info);
+	builder.filter(Some("sc_tracing"), log::LevelFilter::Trace);
 	// Enable info for others.
 	builder.filter(None, log::LevelFilter::Info);
 

client/executor/Cargo.toml

@@ -46,7 +46,7 @@ test-case = "0.3.3"
 sp-runtime = { version = "2.0.0-rc5", path = "../../primitives/runtime" }
 sp-tracing = { version = "2.0.0-rc5", path = "../../primitives/tracing" }
 sc-tracing = { version = "2.0.0-rc5", path = "../tracing" }
-tracing = "0.1.14"
+tracing = "0.1.18"
 
 [features]
 default = [ "std" ]

client/executor/src/integration_tests/mod.rs

@@ -661,14 +661,17 @@ fn parallel_execution(wasm_method: WasmExecutionMethod) {
 fn wasm_tracing_should_work(wasm_method: WasmExecutionMethod) {
 
 	use std::sync::{Arc, Mutex};
-	use sc_tracing::SpanDatum;
+
+	use sc_tracing::{SpanDatum, TraceEvent};
 
 	struct TestTraceHandler(Arc<Mutex<Vec<SpanDatum>>>);
 
 	impl sc_tracing::TraceHandler for TestTraceHandler {
 		fn handle_span(&self, sd: SpanDatum) {
 			self.0.lock().unwrap().push(sd);
 		}
+
+		fn handle_event(&self, _event: TraceEvent) {}
 	}
 
 	let traces = Arc::new(Mutex::new(Vec::new()));

client/service/Cargo.toml

@@ -72,7 +72,7 @@ sc-telemetry = { version = "2.0.0-rc5", path = "../telemetry" }
 sc-offchain = { version = "2.0.0-rc5", path = "../offchain" }
 prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.8.0-rc5"}
 sc-tracing = { version = "2.0.0-rc5", path = "../tracing" }
-tracing = "0.1.10"
+tracing = "0.1.18"
 parity-util-mem = { version = "0.7.0", default-features = false, features = ["primitive-types"] }
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]

client/tracing/Cargo.toml

@@ -19,10 +19,8 @@ rustc-hash = "1.1.0"
 serde = "1.0.101"
 serde_json = "1.0.41"
 slog = { version = "2.5.2", features = ["nested-values"] }
-tracing-core = "0.1.7"
+tracing = "0.1.18"
+tracing-subscriber = "0.2.10"
 sp-tracing = { version = "2.0.0-rc2", path = "../../primitives/tracing" }
 
 sc-telemetry = { version = "2.0.0-rc5", path = "../telemetry" }
-
-[dev-dependencies]
-tracing = "0.1.10"