Implement tracing::Event handling & parent_id for spans and events (p…

…aritytech#6672) * implement events handling, implement parent_id for spans & events * add events to sp_io::storage * update test * add tests * adjust limit * let tracing crate handle parent_ids * re-enable current-id tracking * add test for threads with CurrentSpan * fix log level * remove redundant check for non wasm traces * remove duplicate definition in test * Adding conditional events API * prefer explicit parent_id over current, enhance test * limit changes to client::tracing event implementation * remove From impl due to fallback required on parent_id * implement SPAN_LIMIT change event log output * change version of tracing-core * update dependancies * revert limit * remove duplicate dependency * Apply suggestions from code review Co-authored-by: Bastian Köcher <[email protected]> Co-authored-by: Matt Rutherford <[email protected]> Co-authored-by: Benjamin Kampmann <[email protected]> Co-authored-by: Bastian Köcher <[email protected]>
KILTprotocol · Aug 12, 2020 · 0c3cdf1 · 0c3cdf1
1 parent 5b809d2
commit 0c3cdf1
Show file tree

Hide file tree

Showing 10 changed files with 288 additions and 49 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bin/node/cli/Cargo.toml b/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

diff --git a/client/cli/src/lib.rs b/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);
 

diff --git a/client/executor/Cargo.toml b/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" ]

diff --git a/client/executor/src/integration_tests/mod.rs b/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()));

diff --git a/client/service/Cargo.toml b/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]

diff --git a/client/tracing/Cargo.toml b/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"