Migrate from log to tracing

Author: shepmaster

ui/Cargo.lock

@@ -12,10 +12,8 @@ fork-bomb-prevention = []
 async-trait = "0.1.52"
 axum = { version = "0.6", features = ["headers", "ws"] }
 dotenv = "0.15.0"
-env_logger = "0.10.0"
 futures = "0.3.21"
 lazy_static = "1.0.0"
-log = "0.4.0"
 octocrab = "0.18"
 openssl-probe = "0.1.2"
 petgraph = "0.6.0"
@@ -30,3 +28,5 @@ strum = { version = "0.24.0", features = ["derive"] }
 tempfile = "3"
 tokio = { version = "1.9", features = ["macros", "time", "process", "rt-multi-thread"] }
 tower-http = { version = "0.3", features = ["cors", "fs", "set-header", "trace"] }
+tracing = "0.1.37"
+tracing-subscriber = "0.3.16"

ui/Cargo.toml

@@ -9,6 +9,7 @@ use std::{
     path::{Path, PathBuf},
     sync::Arc,
 };
+use tracing::{error, info, warn};
 
 const DEFAULT_ADDRESS: &str = "127.0.0.1";
 const DEFAULT_PORT: u16 = 5000;
@@ -25,9 +26,8 @@ fn main() {
     let _ = dotenv::dotenv();
     openssl_probe::init_ssl_cert_env_vars();
 
-    // Enable info-level logging by default. env_logger's default is error only.
-    let env_logger_config = env_logger::Env::default().default_filter_or("info");
-    env_logger::Builder::from_env(env_logger_config).init();
+    // Info-level logging is enabled by default.
+    tracing_subscriber::fmt::init();
 
     let config = Config::from_env();
     server_axum::serve(config);
@@ -66,9 +66,9 @@ impl Config {
 
         let index_html = root.join("index.html");
         if index_html.exists() {
-            log::info!("Serving playground frontend from {}", root.display());
+            info!("Serving playground frontend from {}", root.display());
         } else {
-            log::error!(
+            error!(
                 "Playground ui does not exist at {}\n\
                 Playground will not work until `yarn run build` has been run or {PLAYGROUND_UI_ROOT} has been fixed",
                 index_html.display(),
@@ -84,7 +84,7 @@ impl Config {
 
         let gh_token = env::var(PLAYGROUND_GITHUB_TOKEN).ok();
         if gh_token.is_none() {
-            log::warn!("Environment variable {} is not set, so reading and writing GitHub gists will not work", PLAYGROUND_GITHUB_TOKEN);
+            warn!("Environment variable {} is not set, so reading and writing GitHub gists will not work", PLAYGROUND_GITHUB_TOKEN);
         }
 
         let metrics_token = env::var("PLAYGROUND_METRICS_TOKEN").ok();

ui/src/main.rs

@@ -12,6 +12,7 @@ use std::{
 };
 use tempfile::TempDir;
 use tokio::{fs, process::Command, time};
+use tracing::debug;
 
 const DOCKER_PROCESS_TIMEOUT_SOFT: Duration = Duration::from_secs(10);
 const DOCKER_PROCESS_TIMEOUT_HARD: Duration = Duration::from_secs(12);
@@ -495,7 +496,7 @@ impl Sandbox {
             .await
             .context(UnableToSetSourcePermissionsSnafu)?;
 
-        log::debug!(
+        debug!(
             "Wrote {} bytes of source to {}",
             code.len(),
             self.input_file.display()
@@ -518,7 +519,7 @@ impl Sandbox {
 
         cmd.arg(&channel.container_name()).args(&execution_cmd);
 
-        log::debug!("Compilation command is {:?}", cmd);
+        debug!("Compilation command is {:?}", cmd);
 
         cmd
     }
@@ -537,7 +538,7 @@ impl Sandbox {
 
         cmd.arg(&channel.container_name()).args(&execution_cmd);
 
-        log::debug!("Execution command is {:?}", cmd);
+        debug!("Execution command is {:?}", cmd);
 
         cmd
     }
@@ -551,7 +552,7 @@ impl Sandbox {
 
         cmd.arg("rustfmt").args(&["cargo", "fmt"]);
 
-        log::debug!("Formatting command is {:?}", cmd);
+        debug!("Formatting command is {:?}", cmd);
 
         cmd
     }
@@ -564,7 +565,7 @@ impl Sandbox {
 
         cmd.arg("clippy").args(&["cargo", "clippy"]);
 
-        log::debug!("Clippy command is {:?}", cmd);
+        debug!("Clippy command is {:?}", cmd);
 
         cmd
     }
@@ -575,7 +576,7 @@ impl Sandbox {
 
         cmd.arg("miri").args(&["cargo", "miri-playground"]);
 
-        log::debug!("Miri command is {:?}", cmd);
+        debug!("Miri command is {:?}", cmd);
 
         cmd
     }
@@ -591,7 +592,7 @@ impl Sandbox {
             "-Zunpretty=expanded",
         ]);
 
-        log::debug!("Macro expansion command is {:?}", cmd);
+        debug!("Macro expansion command is {:?}", cmd);
 
         cmd
     }