diff --git a/Cargo.lock b/Cargo.lock index 33d4e233..f794b7dd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -955,7 +955,7 @@ dependencies = [ "tonic", "tracing", "tracing-core", - "tracing-subscriber 0.3.11", + "tracing-subscriber 0.3.15", ] [[package]] @@ -4337,7 +4337,7 @@ checksum = "ea50bcf843510179a7ba41c9fe4d83a8958e9f8adf707ec731ff999297536344" dependencies = [ "sentry-core", "tracing-core", - "tracing-subscriber 0.3.11", + "tracing-subscriber 0.3.15", ] [[package]] @@ -5562,7 +5562,7 @@ checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e" dependencies = [ "crossbeam-channel", "time 0.3.14", - "tracing-subscriber 0.3.11", + "tracing-subscriber 0.3.15", ] [[package]] @@ -5578,11 +5578,11 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.26" +version = "0.1.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f" +checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7" dependencies = [ - "lazy_static", + "once_cell", "valuable", ] @@ -5593,7 +5593,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" dependencies = [ "tracing", - "tracing-subscriber 0.3.11", + "tracing-subscriber 0.3.15", ] [[package]] @@ -5604,7 +5604,7 @@ checksum = "0bae117ee14789185e129aaee5d93750abe67fdc5a9a62650452bfe4e122a3a9" dependencies = [ "lazy_static", "tracing", - "tracing-subscriber 0.3.11", + "tracing-subscriber 0.3.15", ] [[package]] @@ -5625,7 +5625,7 @@ checksum = "ba316a74e8fc3c3896a850dba2375928a9fa171b085ecddfc7c054d39970f3fd" dependencies = [ "libc", "tracing-core", - "tracing-subscriber 0.3.11", + "tracing-subscriber 0.3.15", ] [[package]] @@ -5658,13 +5658,13 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.11" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bc28f93baff38037f64e6f43d34cfa1605f27a49c34e8a04c5e78b0babf2596" +checksum = "60db860322da191b40952ad9affe65ea23e7dd6a5c442c2c42865810c6ab8e6b" dependencies = [ "ansi_term 0.12.1", - "lazy_static", "matchers 0.1.0", + "once_cell", "regex", "sharded-slab", "smallvec 1.8.0", @@ -6448,7 +6448,7 @@ dependencies = [ "tracing", "tracing-error", "tracing-futures", - "tracing-subscriber 0.3.11", + "tracing-subscriber 0.3.15", "zcash_proofs", "zebra-chain", "zebra-script", @@ -6605,7 +6605,7 @@ dependencies = [ "tower", "tracing", "tracing-error", - "tracing-subscriber 0.3.11", + "tracing-subscriber 0.3.15", ] [[package]] @@ -6618,7 +6618,7 @@ dependencies = [ "structopt", "tinyvec", "tracing-error", - "tracing-subscriber 0.3.11", + "tracing-subscriber 0.3.15", "zebra-chain", "zebra-consensus", "zebra-state", @@ -6676,7 +6676,7 @@ dependencies = [ "tracing-flame", "tracing-futures", "tracing-journald", - "tracing-subscriber 0.3.11", + "tracing-subscriber 0.3.15", "vergen", "zebra-chain", "zebra-consensus", diff --git a/zebra-consensus/Cargo.toml b/zebra-consensus/Cargo.toml index cd449a63..999e0a19 100644 --- a/zebra-consensus/Cargo.toml +++ b/zebra-consensus/Cargo.toml @@ -62,7 +62,7 @@ spandoc = "0.2.2" tokio = { version = "1.21.1", features = ["full", "tracing", "test-util"] } tracing-error = "0.2.0" -tracing-subscriber = "0.3.11" +tracing-subscriber = "0.3.15" zebra-chain = { path = "../zebra-chain", features = ["proptest-impl"] } zebra-state = { path = "../zebra-state", features = ["proptest-impl"] } diff --git a/zebra-test/Cargo.toml b/zebra-test/Cargo.toml index 2755bcd6..cf2db1c4 100644 --- a/zebra-test/Cargo.toml +++ b/zebra-test/Cargo.toml @@ -31,7 +31,7 @@ owo-colors = "3.5.0" spandoc = "0.2.2" thiserror = "1.0.35" -tracing-subscriber = { version = "0.3.11", features = ["env-filter"] } +tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } tracing-error = "0.2.0" tracing = "0.1.31" diff --git a/zebra-utils/Cargo.toml b/zebra-utils/Cargo.toml index 6a886321..725b852e 100644 --- a/zebra-utils/Cargo.toml +++ b/zebra-utils/Cargo.toml @@ -17,7 +17,7 @@ structopt = "0.3.26" hex = "0.4.3" serde_json = "1.0.85" tracing-error = "0.2.0" -tracing-subscriber = "0.3.11" +tracing-subscriber = "0.3.15" zebra-chain = { path = "../zebra-chain" } zebra-consensus = { path = "../zebra-consensus" } diff --git a/zebrad/Cargo.toml b/zebrad/Cargo.toml index 5be5c7e8..ef2bdbfc 100644 --- a/zebrad/Cargo.toml +++ b/zebrad/Cargo.toml @@ -98,7 +98,7 @@ tinyvec = { version = "1.6.0", features = ["rustc_1_55"] } thiserror = "1.0.35" -tracing-subscriber = { version = "0.3.11", features = ["env-filter"] } +tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } tracing-appender = "0.2.2" tracing-error = "0.2.0" tracing-futures = "0.2.5" diff --git a/zebrad/src/components/tracing/component.rs b/zebrad/src/components/tracing/component.rs index 641a810e..e95e5627 100644 --- a/zebrad/src/components/tracing/component.rs +++ b/zebrad/src/components/tracing/component.rs @@ -99,7 +99,8 @@ impl Tracing { let subscriber = tracing_subscriber::registry(); // TODO: find out why crawl_and_dial and try_to_sync evade this filter, - // and why they also don't get the global net/commit span + // and why they also don't get the global net/commit span. + // Note: this might have been fixed by tracing 0.3.15, or by recent Zebra refactors. // // Using `registry` as the base subscriber, the logs from most other functions get filtered. // Using `FmtSubscriber` as the base subscriber, all the logs get filtered.