Skip to content

Replace env_logger with sp_tracing #5065

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
acatangiu merged 29 commits into from
Aug 1, 2024
Merged

Replace env_logger with sp_tracing #5065

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
81309ff
Use sp_tracing for tests logging
Safrout1 Jul 18, 2024
0efe06b
replace env_logger with sp_tracing in test files
Safrout1 Jul 18, 2024
30daacc
Update substrate/frame/sassafras/src/tests.rs
Safrout1 Jul 25, 2024
7e329e5
Merge branch 'master' into use-sp-tracing
acatangiu Jul 25, 2024
467d69c
omit the let _ for sp-tracing
Safrout1 Jul 28, 2024
60611fb
Use sp_tracing with try_init_simple for substrate/frame/contracts/src…
Safrout1 Jul 28, 2024
8b59993
use sp-tracing in polkadot/node/subsystem-bench/src/cli/subsystem-ben…
Safrout1 Jul 28, 2024
50a54d1
Use sp-tracing in substrate/client/executor/benches/bench.rs and subs…
Safrout1 Jul 28, 2024
8980035
Use sp_tracing in bridges/relays/utils/src/initialize.rs and keep the…
Safrout1 Jul 28, 2024
e041bcd
globally remove the env_logger dependency
Safrout1 Jul 28, 2024
86d2d04
Merge branch 'master' into use-sp-tracing
Safrout1 Jul 28, 2024
9b290ac
Merge branch 'master' into use-sp-tracing
Safrout1 Jul 29, 2024
3fb81ce
Merge branch 'master' into use-sp-tracing
acatangiu Jul 29, 2024
f32c85e
Fix errors related to using filters with and subscribe builders with …
Safrout1 Jul 29, 2024
58f4ecb
try fixing the subscriber import issue
Safrout1 Jul 29, 2024
82c7f73
Revert "try fixing the subscriber import issue"
Safrout1 Jul 29, 2024
e132726
Update substrate/primitives/tracing/src/lib.rs
Safrout1 Jul 30, 2024
816a673
Update bridges/relays/utils/Cargo.toml
Safrout1 Jul 30, 2024
46d96b3
Merge branch 'master' into use-sp-tracing
Safrout1 Jul 30, 2024
6c2ed50
fix clippy errors
Safrout1 Jul 30, 2024
7f25f9e
Merge branch 'master' into use-sp-tracing
Safrout1 Jul 30, 2024
a1ca808
Format the initializers.rs file
Safrout1 Jul 30, 2024
0a405f6
Add a .prdoc file
Safrout1 Jul 30, 2024
d794d1d
use default features of sp-tracing always
Safrout1 Jul 30, 2024
e7ed418
format the tracing cargo.toml
Safrout1 Jul 30, 2024
ebc4ef9
formatting cargo.toml files with taplo
Safrout1 Jul 31, 2024
7b4f321
add the suggestions for the prdoc
Safrout1 Jul 31, 2024
928f882
Merge branch 'master' into use-sp-tracing
Safrout1 Jul 31, 2024
0e4bdf3
format the prdoc file
Safrout1 Jul 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 12 additions & 14 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bridges/snowbridge/pallets/outbound-queue/merkle-tree/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ sp-runtime = { workspace = true }

[dev-dependencies]
hex-literal = { workspace = true, default-features = true }
env_logger = { workspace = true }
hex = { workspace = true, default-features = true }
array-bytes = { workspace = true, default-features = true }
sp-crypto-hashing = { workspace = true, default-features = true }
sp-tracing = { workspace = true }

[features]
default = ["std"]
Expand Down
12 changes: 6 additions & 6 deletions bridges/snowbridge/pallets/outbound-queue/merkle-tree/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ mod tests {
#[test]
fn should_generate_empty_root() {
// given
let _ = env_logger::try_init();
let _ = sp_tracing::init_for_tests();
let data = vec![];

// when
Expand All @@ -351,7 +351,7 @@ mod tests {
#[test]
fn should_generate_single_root() {
// given
let _ = env_logger::try_init();
let _ = sp_tracing::init_for_tests();
let data = make_leaves(1);

// when
Expand All @@ -367,7 +367,7 @@ mod tests {
#[test]
fn should_generate_root_pow_2() {
// given
let _ = env_logger::try_init();
let _ = sp_tracing::init_for_tests();
let data = make_leaves(2);

// when
Expand All @@ -382,7 +382,7 @@ mod tests {

#[test]
fn should_generate_root_complex() {
let _ = env_logger::try_init();
let _ = sp_tracing::init_for_tests();
let test = |root, data: Vec<H256>| {
assert_eq!(
array_bytes::bytes2hex("", merkle_root::<Keccak256, _>(data.into_iter()).as_ref()),
Expand All @@ -401,7 +401,7 @@ mod tests {
#[ignore]
fn should_generate_and_verify_proof() {
// given
let _ = env_logger::try_init();
let _ = sp_tracing::init_for_tests();
let data: Vec<H256> = make_leaves(3);

// when
Expand Down Expand Up @@ -458,7 +458,7 @@ mod tests {
#[test]
#[should_panic]
fn should_panic_on_invalid_leaf_index() {
let _ = env_logger::try_init();
let _ = sp_tracing::init_for_tests();
merkle_proof::<Keccak256, _>(make_leaves(1).into_iter(), 5);
}
}
2 changes: 1 addition & 1 deletion polkadot/node/core/approval-voting/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ assert_matches = { workspace = true }
kvdb-memorydb = { workspace = true }
polkadot-primitives-test-helpers = { workspace = true }
log = { workspace = true, default-features = true }
env_logger = { workspace = true }
sp-tracing = { workspace = true }

polkadot-subsystem-bench = { workspace = true }

Expand Down
6 changes: 1 addition & 5 deletions polkadot/node/core/approval-voting/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,11 +543,7 @@ fn test_harness<T: Future<Output = VirtualOverseer>>(
config: HarnessConfig,
test: impl FnOnce(TestHarness) -> T,
) {
let _ = env_logger::builder()
.is_test(true)
.filter(Some("polkadot_node_core_approval_voting"), log::LevelFilter::Trace)
.filter(Some(LOG_TARGET), log::LevelFilter::Trace)
.try_init();
let _ = sp_tracing::init_for_tests();

let HarnessConfig { sync_oracle, sync_oracle_handle, clock, backend, assignment_criteria } =
config;
Expand Down
2 changes: 1 addition & 1 deletion polkadot/node/core/av-store/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ polkadot-node-jaeger = { workspace = true, default-features = true }

[dev-dependencies]
log = { workspace = true, default-features = true }
env_logger = { workspace = true }
assert_matches = { workspace = true }
kvdb-memorydb = { workspace = true }
sp-tracing = { workspace = true }

sp-core = { workspace = true, default-features = true }
polkadot-node-subsystem-util = { workspace = true, default-features = true }
Expand Down
6 changes: 1 addition & 5 deletions polkadot/node/core/av-store/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,7 @@ fn test_harness<T: Future<Output = VirtualOverseer>>(
store: Arc<dyn Database>,
test: impl FnOnce(VirtualOverseer) -> T,
) {
let _ = env_logger::builder()
.is_test(true)
.filter(Some("polkadot_node_core_av_store"), log::LevelFilter::Trace)
.filter(Some(LOG_TARGET), log::LevelFilter::Trace)
.try_init();
let _ = sp_tracing::init_for_tests();

let pool = sp_core::testing::TaskExecutor::new();
let (context, virtual_overseer) =
Expand Down
2 changes: 1 addition & 1 deletion polkadot/node/network/approval-distribution/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,5 @@ schnorrkel = { workspace = true }
# rand_core should match schnorrkel
rand_core = { workspace = true }
rand_chacha = { workspace = true, default-features = true }
env_logger = { workspace = true }
sp-tracing = { workspace = true }
log = { workspace = true, default-features = true }
5 changes: 1 addition & 4 deletions polkadot/node/network/approval-distribution/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,7 @@ fn test_harness<T: Future<Output = VirtualOverseer>>(
mut state: State,
test_fn: impl FnOnce(VirtualOverseer) -> T,
) -> State {
let _ = env_logger::builder()
.is_test(true)
.filter(Some(LOG_TARGET), log::LevelFilter::Trace)
.try_init();
let _ = sp_tracing::init_for_tests();

let pool = sp_core::testing::TaskExecutor::new();
let (context, virtual_overseer) =
Expand Down
3 changes: 1 addition & 2 deletions polkadot/node/network/bitfield-distribution/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ sp-authority-discovery = { workspace = true, default-features = true }
sp-keystore = { workspace = true, default-features = true }
sp-keyring = { workspace = true, default-features = true }
maplit = { workspace = true }
log = { workspace = true, default-features = true }
env_logger = { workspace = true }
sp-tracing = { workspace = true }
assert_matches = { workspace = true }
rand_chacha = { workspace = true, default-features = true }
Loading