diff --git a/rust/flyrs/Cargo.lock b/rust/flyrs/Cargo.lock index 33f3fafb6c..a12b2131c2 100644 --- a/rust/flyrs/Cargo.lock +++ b/rust/flyrs/Cargo.lock @@ -17,15 +17,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - [[package]] name = "android-tzdata" version = "0.1.1" @@ -226,7 +217,7 @@ dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.11.0", + "strsim", ] [[package]] @@ -283,41 +274,6 @@ version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" -[[package]] -name = "darling" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.9.3", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" -dependencies = [ - "darling_core", - "quote", - "syn 1.0.109", -] - [[package]] name = "doc-comment" version = "0.3.3" @@ -330,29 +286,6 @@ version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" -[[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 = "errno" version = "0.3.8" @@ -414,26 +347,19 @@ dependencies = [ "async-channel", "bincode", "clap", - "env_logger", "flate2", "futures", - "log", - "log-derive", "object_store", "pyo3", "serde", "tar", "tokio", "tokio-util", + "tracing", + "tracing-subscriber", "url", ] -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - [[package]] name = "form_urlencoded" version = "1.2.1" @@ -579,12 +505,6 @@ dependencies = [ "cc", ] -[[package]] -name = "ident_case" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" - [[package]] name = "idna" version = "0.5.0" @@ -619,6 +539,12 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + [[package]] name = "libc" version = "0.2.153" @@ -647,18 +573,6 @@ version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" -[[package]] -name = "log-derive" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a42526bb432bcd1b43571d5f163984effa25409a29f1a3242a54d0577d55bcf" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "memchr" version = "2.7.1" @@ -694,6 +608,16 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + [[package]] name = "num-traits" version = "0.2.18" @@ -749,6 +673,12 @@ version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + [[package]] name = "parking" version = "2.2.0" @@ -892,35 +822,6 @@ dependencies = [ "bitflags 1.3.2", ] -[[package]] -name = "regex" -version = "1.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" - [[package]] name = "rustc-demangle" version = "0.1.23" @@ -975,6 +876,15 @@ dependencies = [ "syn 2.0.52", ] +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + [[package]] name = "signal-hook-registry" version = "1.4.1" @@ -1031,12 +941,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "strsim" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" - [[package]] name = "strsim" version = "0.11.0" @@ -1082,6 +986,16 @@ version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + [[package]] name = "tinyvec" version = "1.6.0" @@ -1169,6 +1083,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "nu-ansi-term", + "sharded-slab", + "smallvec", + "thread_local", + "tracing-core", + "tracing-log", ] [[package]] @@ -1215,6 +1155,12 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + [[package]] name = "virtue" version = "0.0.13" diff --git a/rust/flyrs/Cargo.toml b/rust/flyrs/Cargo.toml index b0a1c92bb6..ab33c9f4a4 100644 --- a/rust/flyrs/Cargo.toml +++ b/rust/flyrs/Cargo.toml @@ -19,6 +19,5 @@ object_store = "0.9.1" url = "2.5.0" flate2 = "1.0.28" tar = "0.4.40" -log = "0.4.21" -log-derive = "0.4.1" -env_logger = "0.11.3" +tracing = "0.1.40" +tracing-subscriber = "0.3.18" diff --git a/rust/flyrs/src/distribution.rs b/rust/flyrs/src/distribution.rs index e852e49e22..e0b3eb8995 100644 --- a/rust/flyrs/src/distribution.rs +++ b/rust/flyrs/src/distribution.rs @@ -1,13 +1,11 @@ use flate2::read::GzDecoder; -use log_derive::{logfn, logfn_inputs}; use object_store; use object_store::{ObjectStore, parse_url}; use object_store::path::Path; use tar::Archive; use url::Url; -#[logfn_inputs(Info, fmt = "Downloading distribution from {} to {}")] -#[logfn(ok = "INFO", err = "ERROR")] +#[tracing::instrument(err)] pub async fn download_unarchive_distribution(src: &Url, dst: &String) -> Result<(), Box> { // Uses the object_store crate to download the distribution from the source to the destination path and untar and unzip it // The source is a URL to the distribution diff --git a/rust/flyrs/src/executor.rs b/rust/flyrs/src/executor.rs index 828bf251b8..b261918800 100644 --- a/rust/flyrs/src/executor.rs +++ b/rust/flyrs/src/executor.rs @@ -1,10 +1,8 @@ use std::fmt::{Display, Formatter}; use clap::Parser; -use log::{debug, info, log_enabled}; -use log::Level::Debug; -use log_derive::{logfn, logfn_inputs}; use pyo3::prelude::*; +use tracing::{debug, info, Level}; use distribution::download_unarchive_distribution; @@ -58,7 +56,7 @@ impl Display for ExecutorArgs { // ): fn debug_python_setup(py: Python) { - if log_enabled!(Debug) { + if tracing::enabled!(tracing::Level::DEBUG) { let sys = PyModule::import_bound(py, "sys").unwrap(); let path = sys.getattr("path").unwrap(); let version = sys.getattr("version").unwrap(); @@ -70,8 +68,7 @@ fn debug_python_setup(py: Python) { } } -#[logfn_inputs(Info, fmt = "Invoking task with {}")] -#[logfn(ok = "INFO", err = "ERROR")] +#[tracing::instrument(err)] pub async fn execute_task(args: &ExecutorArgs) -> Result<(), Box>{ pyo3::prepare_freethreaded_python(); let _ = Python::with_gil(|py| -> Result<(), Box> { @@ -111,8 +108,7 @@ pub async fn execute_task(args: &ExecutorArgs) -> Result<(), Box Result<(), Box> { if executor_args.dynamic_addl_distro.is_some() { info!("Found Dynamic distro {:?}", executor_args.dynamic_addl_distro); diff --git a/rust/flyrs/src/main.rs b/rust/flyrs/src/main.rs index 2bc51b5bc5..1747015603 100644 --- a/rust/flyrs/src/main.rs +++ b/rust/flyrs/src/main.rs @@ -1,8 +1,8 @@ use clap::Parser; -use log::info; +use tracing::info; use tokio; use tokio::runtime::Builder; -use env_logger::Env; +use tracing_subscriber; mod executor; mod distribution; @@ -10,11 +10,7 @@ mod distribution; fn main() -> Result<(), Box> { - let env = Env::default() - .filter_or("FLYRS_LOG_LEVEL", "trace") - .write_style_or("FLYRS_LOG_STYLE", "always"); - - env_logger::init_from_env(env); + tracing_subscriber::fmt::init(); let args = executor::ExecutorArgs::parse();