Make log-level setting more granular. Hide spans at most levels. Demo simple timestamp.

Core functionality of counting -v flags was taken from `clap_verbosity_flag`, but we match our own custom verbosity now to allow setting different log levels and other settings.

Spans are hidden on the first two levels of verbosity.

Pre-existing Chrono dep is used to create a more compact timestamp in logs with strftime-like formatting.

Author: Kajmany

Cargo.lock

@@ -6,14 +6,13 @@ edition = "2021"
 [dependencies]
 anyhow = "1.0.82"
 clap = { version = "4.5.4", features = ["unicode", "env", "derive"] }
-clap-verbosity-flag = "2.2.0"
 itertools = "0.12.1"
 glob = "0.3.1"
 serde = { version = "1.0", features = ["derive"] }
 serde_yml = "0.0.12"
 serde_nested_with = "0.2.5"
 tracing = { version = "0.1.41", features = ["attributes"] }
-tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
+tracing-subscriber = { version = "0.3.19", features = ["chrono", "env-filter"] }
 fully_pub = "0.1.4"
 void = "1"
 futures = "0.3.30"

Cargo.toml

@@ -1,11 +1,12 @@
 use clap::{Parser, Subcommand};
-use clap_verbosity_flag::{InfoLevel, Verbosity};
 
 #[derive(Parser, Debug)]
 /// Deployment manager for rCTF/beaverCTF challenges deployed on Kubernetes.
 pub struct Cli {
-    #[command(flatten)]
-    pub verbose: Verbosity<InfoLevel>,
+    /// Increase output verbosity. One usage increases slightly. Two increases significantly. Three or
+    /// more maximize output.
+    #[arg(short = 'v', action = clap::ArgAction::Count, global = true)]
+    pub verbosity: u8,
 
     #[command(subcommand)]
     pub command: Commands,

src/cli.rs

@@ -1,25 +1,31 @@
 use beavercds_ng::commands;
 use clap::Parser;
-use tracing::trace;
-use tracing_subscriber::EnvFilter;
+use tracing::{trace, Level};
+use tracing_subscriber::{fmt::time, EnvFilter};
 
 mod cli;
 
 fn main() {
     let cli = cli::Cli::parse();
 
-    // Use RUST_LOG env variable if it's set
-    // Otherwise our tracing is filtered by -q|-v* flag, all others always INFO and above
+    // number of 'v' flags influences our crate's log level, all other log levels, and whether or
+    // not we display the span stack, respectively
+    let (brcds_level, dep_level, display_spans) = match cli.verbosity {
+        0 => (Level::INFO, Level::WARN, false),
+        1 => (Level::DEBUG, Level::INFO, false),
+        2 => (Level::TRACE, Level::DEBUG, true),
+        _ => (Level::TRACE, Level::TRACE, true),
+    };
+
+    // Use RUST_LOG env variable to set log levels if it's set
+    // Otherwise we use the above levels. Span-stack display always influenced by -v
+    let timer = time::ChronoLocal::new("%H:%M:%S".to_owned());
     tracing_subscriber::fmt()
         .with_env_filter(EnvFilter::try_from_default_env().unwrap_or_else(|_| {
-            format!(
-                "{}={},INFO",
-                env!("CARGO_CRATE_NAME"),
-                cli.verbose.log_level_filter()
-            )
-            .into()
+            format!("{}={brcds_level},{dep_level}", env!("CARGO_CRATE_NAME")).into()
         }))
-        .without_time()
+        .with_timer(timer)
+        .with_target(display_spans)
         .init();
 
     trace!("args: {:?}", cli);