starknet_committer_cli,starknet_committer_and_os_cli: move tracing_utils

Author: TzahiTaub

Cargo.lock

@@ -24,6 +24,7 @@ tempfile = { workspace = true, optional = true }
 thiserror.workspace = true
 tokio = { workspace = true, features = ["process", "rt", "time"] }
 tracing.workspace = true
+tracing-subscriber.workspace = true
 
 [dev-dependencies]
 assert-json-diff.workspace = true

crates/apollo_infra_utils/Cargo.toml

@@ -10,6 +10,7 @@ pub mod template;
 #[cfg(any(feature = "testing", test))]
 pub mod test_utils;
 pub mod tracing;
+pub mod tracing_utils;
 pub mod type_name;
 
 pub extern crate apollo_proc_macros as _apollo_proc_macros;

crates/apollo_infra_utils/src/lib.rs

@@ -18,6 +18,7 @@ tempfile.workspace = true
 
 # TODO(Amos): Add `testing` feature and move Python test dependencies under it.
 [dependencies]
+apollo_infra_utils.workspace = true
 # The 'test_programs' feature should be moved under `testing` feature, when it exists.
 apollo_starknet_os_program = { workspace = true, features = ["test_programs"] }
 blake2s.workspace = true

crates/starknet_committer_and_os_cli/src/tracing_utils.rs renamed to crates/apollo_infra_utils/src/tracing_utils.rs

@@ -2,4 +2,3 @@ pub mod block_hash_cli;
 pub mod committer_cli;
 pub mod os_cli;
 pub mod shared_utils;
-pub mod tracing_utils;

crates/starknet_committer_and_os_cli/Cargo.toml

@@ -1,3 +1,4 @@
+use apollo_infra_utils::tracing_utils::configure_tracing;
 use clap::{Args, Parser, Subcommand};
 use starknet_committer_and_os_cli::block_hash_cli::run_block_hash_cli::{
     run_block_hash_cli,
@@ -8,7 +9,6 @@ use starknet_committer_and_os_cli::committer_cli::run_committer_cli::{
     CommitterCliCommand,
 };
 use starknet_committer_and_os_cli::os_cli::run_os_cli::{run_os_cli, OsCliCommand};
-use starknet_committer_and_os_cli::tracing_utils::configure_tracing;
 use tracing::info;
 
 /// Committer and OS CLI.

crates/starknet_committer_and_os_cli/src/lib.rs

@@ -10,12 +10,11 @@ description = "CLI for the committer storage benchmark."
 workspace = true
 
 [dependencies]
+apollo_infra_utils.workspace = true
 clap = { workspace = true, features = ["cargo", "derive"] }
 csv.workspace = true
 rand.workspace = true
 starknet_committer = { workspace = true, features = ["benchmark", "testing"] }
-# TODO(Tzahi): Remove once tracing is moved to a common location.
-starknet_committer_and_os_cli.workspace = true
 starknet_patricia.workspace = true
 starknet_patricia_storage.workspace = true
 tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }

crates/starknet_committer_and_os_cli/src/main.rs

@@ -1,5 +1,5 @@
+use apollo_infra_utils::tracing_utils::{configure_tracing, modify_log_level};
 use clap::{Args, Parser, Subcommand};
-use starknet_committer_and_os_cli::tracing_utils::{configure_tracing, modify_log_level};
 use starknet_committer_cli::commands::run_storage_benchmark;
 use tracing::info;
 use tracing::level_filters::LevelFilter;