Merge pull request #538 from NotEvenANeko/refactor/spdlog

refactor: refactor to `spdlog-rs` instead of `tracing`

Author: eatradish

Cargo.lock

@@ -25,8 +25,7 @@ rustix = { version = "1", features = ["process", "stdio"] }
 libc = "0.2.159"
 reqwest = { version = "0.13", default-features = false, features = ["http2"] }
 rustls = { version = "0.23", default-features = false, features = ["ring", "tls12"], optional = true }
-tracing = "0.1.40"
-tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
+spdlog-rs = { version = "0.5.2", features = ["multi-thread", "source-location", "log"] }
 console-subscriber = { version = "0.5.0", optional = true }
 ratatui = "0.30.0"
 ansi-to-tui = "8.0.0"
@@ -44,7 +43,6 @@ clap_complete = { version = "4.5", features = ["unstable-dynamic"] }
 clap_lex = "0.7.4"
 fs4 = "0.13.1"
 fs_extra = "1.3.0"
-tracing-appender = "0.2.3"
 dirs = "6.0.0"
 termtree = "0.5.1"
 textwrap = "0.16.2"
@@ -56,6 +54,7 @@ debversion = "0.5"
 which = "8"
 rayon = "1.11.0"
 humantime = "2.3"
+env_filter = "0.1.4"
 
 # oma crates
 oma-utils = { path = "./oma-utils", features = ["dbus", "human-bytes"] }

Cargo.toml

@@ -7,6 +7,6 @@ license = "MIT"
 
 [dependencies]
 thiserror = "2"
-tracing = "0.1"
+spdlog-rs = "0.5"
 rust-netrc = "0.1"
 url = "2.5"

apt-auth-config/Cargo.toml

@@ -8,10 +8,10 @@ license = "MIT"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+chrono = { version = "0.4.38", optional = true }
 console = { version = "0.16", optional = true }
 indicatif = { version = "0.18", optional = true }
-tracing = { version = "0.1", optional = true }
-tracing-subscriber =  { version = "0.3", optional = true }
+spdlog-rs = "0.5"
 ratatui = { version = "0.30", optional = true }
 # https://github.com/async-rs/async-std/issues/1055
 # https://github.com/tokio-rs/tokio/issues/5535
@@ -21,7 +21,7 @@ textwrap = { version = "0.16", optional = true }
 aho-corasick = { version = "1.1.3", optional = true }
 
 [features]
-print = ["dep:tracing", "dep:tracing-subscriber", "dep:textwrap", "dep:console", "dep:termbg"]
+print = ["dep:chrono", "dep:textwrap", "dep:console", "dep:termbg"]
 pager = ["dep:ratatui", "dep:ansi-to-tui", "dep:console", "dep:aho-corasick"]
 progress_bar_style = ["dep:indicatif"]
 default = ["print", "pager", "progress_bar_style"]

oma-console/Cargo.toml

@@ -1,11 +1,15 @@
-use oma_console::OmaLayer;
-use tracing_subscriber::{prelude::__tracing_subscriber_SubscriberExt, util::SubscriberInitExt};
+use oma_console::OmaFormatter;
 
 fn main() {
-    tracing_subscriber::registry().with(OmaLayer::new()).init();
-    tracing::info!("Welcome");
-    tracing::debug!("Hello");
-    tracing::info!("I'am fine");
-    tracing::warn!("Thank you");
-    tracing::error!("and you?");
+    spdlog::default_logger()
+        .sinks()
+        .iter()
+        .for_each(|s| s.set_formatter(Box::new(OmaFormatter::default())));
+    spdlog::default_logger().set_level_filter(spdlog::LevelFilter::All);
+
+    spdlog::info!("Welcome");
+    spdlog::debug!("Hello");
+    spdlog::info!("I'am fine");
+    spdlog::warn!("Thank you");
+    spdlog::error!("and you?");
 }

oma-console/examples/msg.rs

@@ -26,11 +26,14 @@ pub mod pb;
 #[cfg(feature = "print")]
 pub mod writer;
 
+#[cfg(feature = "print")]
+pub mod terminal;
+
 #[cfg(feature = "print")]
 pub mod print;
 
 #[cfg(feature = "print")]
-pub use print::OmaLayer;
+pub use print::OmaFormatter;
 
 #[cfg(feature = "print")]
 pub use console;

oma-console/src/lib.rs

@@ -22,8 +22,8 @@ use ratatui::{
     },
     widgets::Borders,
 };
+use spdlog::debug;
 use termbg::Theme;
-use tracing::debug;
 
 use crate::{print::OmaColorFormat, writer::Writer};