switch to tracing to provide more insightful logs

Author: pietroalbini

Cargo.lock

@@ -11,15 +11,13 @@ atomicwrites = "0.2"
 bincode = "1.0"
 brotli = "1.2"
 digest = "0.7"
-env_logger = "0.5"
 failure = "0.1"
 futures = "0.1"
 fnv = "1.0"
 hex = "0.3"
 hmac = "0.6"
 hyper = "0.12"
 lazy_static = "1.0"
-log = "0.4"
 regex = "0.2"
 reqwest = "0.9"
 serde = "1.0"
@@ -32,3 +30,5 @@ dotenv = "0.14"
 crossbeam = "0.7"
 percent-encoding = "2.1.0"
 threadpool = "1.8.1"
+tracing = "0.1.16"
+tracing-subscriber = "0.2.8"

Cargo.toml

@@ -1,7 +1,6 @@
 use crate::offline;
 use crate::rla;
 
-use log;
 use std::fs;
 use std::io::{self, Write};
 use std::path::Path;
@@ -61,19 +60,20 @@ pub fn dir(
 
         let now = Instant::now();
 
-        let level = if now - last_print >= progress_every {
+        if now - last_print >= progress_every {
             last_print = now;
-            log::Level::Debug
+            debug!(
+                "Extracting errors from {} [{}/?]...",
+                entry.path().display(),
+                count
+            );
         } else {
-            log::Level::Trace
-        };
-
-        log!(
-            level,
-            "Extracting errors from {} [{}/?]...",
-            entry.path().display(),
-            count
-        );
+            trace!(
+                "Extracting errors from {} [{}/?]...",
+                entry.path().display(),
+                count
+            );
+        }
 
         let log = offline::fs::load_maybe_compressed(entry.path())?;
         let lines = load_lines(ci, &log);

src/bin/offline/extract.rs

@@ -1,7 +1,6 @@
 use crate::offline;
 use crate::rla;
 
-use log;
 use std::path::{Path, PathBuf};
 use std::time::Duration;
 use std::time::Instant;
@@ -30,19 +29,12 @@ pub fn learn(
 
         let now = Instant::now();
 
-        let level = if now - last_print >= progress_every {
+        if now - last_print >= progress_every {
             last_print = now;
-            log::Level::Debug
+            debug!("Learning from {} [{}/?]...", input.path().display(), count);
         } else {
-            log::Level::Trace
-        };
-
-        log!(
-            level,
-            "Learning from {} [{}/?]...",
-            input.path().display(),
-            count
-        );
+            trace!("Learning from {} [{}/?]...", input.path().display(), count);
+        }
 
         let data = offline::fs::load_maybe_compressed(input.path())?;
 

src/bin/offline/learn.rs

@@ -6,11 +6,10 @@
 )]
 
 extern crate brotli;
-extern crate env_logger;
 #[macro_use]
 extern crate failure;
 #[macro_use]
-extern crate log;
+extern crate tracing;
 extern crate rust_log_analyzer as rla;
 extern crate walkdir;
 

src/bin/rla-offline.rs

@@ -5,13 +5,12 @@
     clippy::useless_let_if_seq
 )]
 
-extern crate env_logger;
 #[macro_use]
 extern crate failure;
 extern crate futures;
 extern crate hyper;
 #[macro_use]
-extern crate log;
+extern crate tracing;
 extern crate crossbeam;
 extern crate regex;
 extern crate rust_log_analyzer as rla;

src/bin/rla-server.rs

@@ -1,8 +1,5 @@
 use crate::rla;
-use env_logger;
 use failure::ResultExt;
-use log;
-use std::env;
 use std::process;
 
 pub(crate) enum CliCiPlatform {
@@ -40,19 +37,9 @@ impl std::str::FromStr for CliCiPlatform {
 }
 
 pub fn run<F: FnOnce() -> rla::Result<()>>(f: F) {
-    let mut log_builder = env_logger::Builder::new();
-
-    if let Ok(s) = env::var("RLA_LOG") {
-        log_builder.parse(&s);
-    } else {
-        log_builder.filter(None, log::LevelFilter::Info);
-    }
-
-    if let Ok(s) = env::var("RLA_LOG_STYLE") {
-        log_builder.parse_write_style(&s);
-    }
-
-    log_builder.init();
+    tracing_subscriber::fmt()
+        .with_env_filter(tracing_subscriber::EnvFilter::from_env("RLA_LOG"))
+        .init();
 
     log_and_exit_error(|| f());
 }

src/bin/util/mod.rs

@@ -16,14 +16,14 @@ extern crate hmac;
 extern crate hyper;
 #[macro_use]
 extern crate lazy_static;
-#[macro_use]
-extern crate log;
 extern crate regex;
 extern crate reqwest;
 extern crate serde;
 #[macro_use]
 extern crate serde_derive;
 extern crate sha1;
+#[macro_use]
+extern crate tracing;
 
 pub mod ci;
 pub mod extract;