Skip to content

Commit

Permalink
Change TRACING_SET to static (paritytech#7607)
Browse files Browse the repository at this point in the history
* change TRACING_SET to static

* Update primitives/io/src/lib.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* modify test with nested spans

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
  • Loading branch information
2 people authored and darkfriend77 committed Jan 11, 2021
1 parent e771bff commit cce716e
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 1 deletion.
11 changes: 11 additions & 0 deletions client/executor/runtime-test/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,17 @@ sp_core::wasm_export_functions! {
wasm_tracing::exit(span_id)
}

fn test_nested_spans() {
sp_io::init_tracing();
let span_id = wasm_tracing::enter_span(Default::default());
{
sp_io::init_tracing();
let span_id = wasm_tracing::enter_span(Default::default());
wasm_tracing::exit(span_id);
}
wasm_tracing::exit(span_id);
}

fn returns_mutable_static() -> u64 {
unsafe {
MUTABLE_STATIC += 1;
Expand Down
9 changes: 9 additions & 0 deletions client/executor/src/integration_tests/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -719,6 +719,15 @@ fn wasm_tracing_should_work(wasm_method: WasmExecutionMethod) {
assert_eq!(span_datum.target, "default");
assert_eq!(span_datum.name, "");
assert_eq!(values.bool_values.get("wasm").unwrap(), &true);

call_in_wasm(
"test_nested_spans",
Default::default(),
wasm_method,
&mut ext,
).unwrap();
let len = traces.lock().unwrap().len();
assert_eq!(len, 2);
}

#[test_case(WasmExecutionMethod::Interpreted)]
Expand Down
2 changes: 1 addition & 1 deletion primitives/io/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1093,7 +1093,7 @@ mod tracing_setup {
};
use super::{wasm_tracing, Crossing};

const TRACING_SET : AtomicBool = AtomicBool::new(false);
static TRACING_SET: AtomicBool = AtomicBool::new(false);


/// The PassingTracingSubscriber implements `tracing_core::Subscriber`
Expand Down

0 comments on commit cce716e

Please sign in to comment.