diff --git a/Cargo.lock b/Cargo.lock index d0465b12..c03efa13 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -965,29 +965,6 @@ dependencies = [ "syn 2.0.53", ] -[[package]] -name = "env_filter" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" -dependencies = [ - "log", - "regex", -] - -[[package]] -name = "env_logger" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" -dependencies = [ - "anstream", - "anstyle", - "env_filter", - "humantime", - "log", -] - [[package]] name = "equivalent" version = "1.0.1" @@ -1643,11 +1620,10 @@ version = "0.1.0" dependencies = [ "anyhow", "casper-client", - "env_logger", - "log", "nom", "tempfile", "tokio", + "tracing", ] [[package]] diff --git a/kairos-test-utils/Cargo.toml b/kairos-test-utils/Cargo.toml index a48132b3..677b3f37 100644 --- a/kairos-test-utils/Cargo.toml +++ b/kairos-test-utils/Cargo.toml @@ -8,10 +8,9 @@ edition = "2021" [dependencies] -log = "*" -tokio = { version = "*", features = [ "full", "macros" ] } -env_logger = "*" +tokio = { version = "*", features = [ "full", "tracing", "macros" ] } tempfile = "*" +tracing = "0.1" nom = "*" [dev-dependencies] diff --git a/kairos-test-utils/src/cctl.rs b/kairos-test-utils/src/cctl.rs index d781ab50..7f5ebab9 100644 --- a/kairos-test-utils/src/cctl.rs +++ b/kairos-test-utils/src/cctl.rs @@ -42,14 +42,14 @@ impl CCTLNetwork { .output() .expect("failed to execute setup network config"); let output = std::str::from_utf8(output.stdout.as_slice()).unwrap(); - log::info!("{}", output); + tracing::info!("{}", output); let output = Command::new("cctl-infra-net-start") .env("CCTL_ASSETS", &assets_dir) .output() .expect("failed to start network"); let output = std::str::from_utf8(output.stdout.as_slice()).unwrap(); - log::info!("{}", output); + tracing::info!("{}", output); let (_, nodes) = parsers::parse_cctl_infra_net_start_lines(output).unwrap(); let output = Command::new("cctl-infra-node-view-ports") @@ -57,7 +57,7 @@ impl CCTLNetwork { .output() .expect("failed to get node ports"); let output = std::str::from_utf8(output.stdout.as_slice()).unwrap(); - log::info!("{}", output); + tracing::info!("{}", output); let (_, node_ports) = parsers::parse_cctl_infra_node_view_port_lines(output).unwrap(); // Match the started nodes with their respective ports @@ -80,7 +80,7 @@ impl CCTLNetwork { }) .collect(); - log::info!("Waiting for network to start processing blocks"); + tracing::info!("Waiting for network to start processing blocks"); std::thread::sleep(std::time::Duration::from_secs(5)); let output = Command::new("cctl-chain-await-until-block-n") .env("CCTL_ASSETS", &assets_dir) @@ -88,7 +88,7 @@ impl CCTLNetwork { .output() .expect("Waiting for network to start processing blocks failed"); let output = std::str::from_utf8(output.stdout.as_slice()).unwrap(); - log::info!("{}", output); + tracing::info!("{}", output); Ok(CCTLNetwork { working_dir,