From 0c3206a2ff6c32d5760e9ba23395eaa0f58f1e39 Mon Sep 17 00:00:00 2001
From: Jonathan Johnson <jon@khonsulabs.com>
Date: Fri, 10 Nov 2023 13:47:40 -0800
Subject: [PATCH] Adding RUST_LOG support to tracing

Also default level has been upped to info
---
 Cargo.lock | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 Cargo.toml |  4 +++-
 src/lib.rs | 12 +++++++++-
 3 files changed, 80 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4e6a390bc..d49972b40 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -45,6 +45,15 @@ dependencies = [
  "zerocopy",
 ]
 
+[[package]]
+name = "aho-corasick"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "allocator-api2"
 version = "0.2.16"
@@ -1000,6 +1009,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "matchers"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+dependencies = [
+ "regex-automata 0.1.10",
+]
+
 [[package]]
 name = "memchr"
 version = "2.6.4"
@@ -1531,6 +1549,50 @@ dependencies = [
  "bitflags 1.3.2",
 ]
 
+[[package]]
+name = "regex"
+version = "1.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata 0.4.3",
+ "regex-syntax 0.8.2",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+dependencies = [
+ "regex-syntax 0.6.29",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax 0.8.2",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+
 [[package]]
 name = "renderdoc-sys"
 version = "1.0.0"
@@ -1921,10 +1983,14 @@ version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
 dependencies = [
+ "matchers",
  "nu-ansi-term",
+ "once_cell",
+ "regex",
  "sharded-slab",
  "smallvec",
  "thread_local",
+ "tracing",
  "tracing-core",
  "tracing-log",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 203f6f89e..6eff0c125 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,7 +17,9 @@ kempt = "0.2.1"
 intentional = "0.1.0"
 tracing = "0.1.40"
 
-tracing-subscriber = { version = "0.3", optional = true }
+tracing-subscriber = { version = "0.3", optional = true, features = [
+    "env-filter",
+] }
 palette = "0.7.3"
 
 
diff --git a/src/lib.rs b/src/lib.rs
index 664bf3a51..0841d52c3 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -142,14 +142,24 @@ fn initialize_tracing() {
     #[cfg(feature = "tracing-output")]
     {
         use tracing::Level;
+        use tracing_subscriber::filter::LevelFilter;
+        use tracing_subscriber::layer::SubscriberExt;
+        use tracing_subscriber::util::SubscriberInitExt;
+        use tracing_subscriber::EnvFilter;
 
         #[cfg(debug_assertions)]
-        const MAX_LEVEL: Level = Level::DEBUG;
+        const MAX_LEVEL: Level = Level::INFO;
         #[cfg(not(debug_assertions))]
         const MAX_LEVEL: Level = Level::ERROR;
 
         let _result = tracing_subscriber::fmt::fmt()
             .with_max_level(MAX_LEVEL)
+            .finish()
+            .with(
+                EnvFilter::builder()
+                    .with_default_directive(LevelFilter::from_level(MAX_LEVEL).into())
+                    .from_env_lossy(),
+            )
             .try_init();
     }
 }