log: fix LogTracer not honoring max level filters (#1543)

Co-authored-by: Eliza Weisman <eliza@buoyant.io>
tokio-rs · Sep 11, 2021 · 5fdbcbf · 5fdbcbf
1 parent 8f80a39
commit 5fdbcbf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/tracing-log/src/log_tracer.rs b/tracing-log/src/log_tracer.rs
@@ -183,7 +183,9 @@ impl log::Log for LogTracer {
     }
 
     fn log(&self, record: &log::Record<'_>) {
-        crate::dispatch_record(record);
+        if self.enabled(record.metadata()) {
+            crate::dispatch_record(record);
+        }
     }
 
     fn flush(&self) {}

diff --git a/tracing-log/tests/log_tracer.rs b/tracing-log/tests/log_tracer.rs
@@ -1,7 +1,7 @@
 use std::sync::{Arc, Mutex};
 use tracing::collect::with_default;
 use tracing_core::span::{Attributes, Record};
-use tracing_core::{span, Collect, Event, Level, Metadata};
+use tracing_core::{span, Collect, Event, Level, LevelFilter, Metadata};
 use tracing_log::{LogTracer, NormalizeEvent};
 
 struct State {
@@ -26,6 +26,10 @@ impl Collect for TestSubscriber {
         true
     }
 
+    fn max_level_hint(&self) -> Option<LevelFilter> {
+        Some(LevelFilter::from_level(Level::INFO))
+    }
+
     fn new_span(&self, _span: &Attributes<'_>) -> span::Id {
         span::Id::from_u64(42)
     }
@@ -67,6 +71,8 @@ fn normalized_metadata() {
     let state = me.clone();
 
     with_default(TestSubscriber(me), || {
+        log::info!("expected info log");
+        log::debug!("unexpected debug log");
         let log = log::Record::builder()
             .args(format_args!("Error!"))
             .level(log::Level::Info)