Skip to content

Commit d9591bd

Browse files
committed
Properly call Collect::event_enabled in more places
1 parent df4b068 commit d9591bd

File tree

3 files changed

+19
-1
lines changed

3 files changed

+19
-1
lines changed

tracing-core/src/collect.rs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -642,6 +642,11 @@ impl Collect for alloc::boxed::Box<dyn Collect + Send + Sync + 'static> {
642642
self.as_ref().record_follows_from(span, follows)
643643
}
644644

645+
#[inline]
646+
fn event_enabled(&self, event: &Event<'_>) -> bool {
647+
self.as_ref().event_enabled(event)
648+
}
649+
645650
#[inline]
646651
fn event(&self, event: &Event<'_>) {
647652
self.as_ref().event(event)
@@ -713,6 +718,11 @@ impl Collect for alloc::sync::Arc<dyn Collect + Send + Sync + 'static> {
713718
self.as_ref().record_follows_from(span, follows)
714719
}
715720

721+
#[inline]
722+
fn event_enabled(&self, event: &Event<'_>) -> bool {
723+
self.as_ref().event_enabled(event)
724+
}
725+
716726
#[inline]
717727
fn event(&self, event: &Event<'_>) {
718728
self.as_ref().event(event)

tracing-core/src/dispatch.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -682,7 +682,10 @@ impl Dispatch {
682682
/// [`event`]: super::collect::Collect::event
683683
#[inline]
684684
pub fn event(&self, event: &Event<'_>) {
685-
self.collector().event(event)
685+
let collector = self.collector();
686+
if collector.event_enabled(event) {
687+
collector.event(event);
688+
}
686689
}
687690

688691
/// Records that a span has been can_enter.

tracing-subscriber/src/fmt/mod.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,11 @@ where
393393
self.inner.record_follows_from(span, follows)
394394
}
395395

396+
#[inline]
397+
fn event_enabled(&self, event: &Event<'_>) -> bool {
398+
self.inner.event_enabled(event)
399+
}
400+
396401
#[inline]
397402
fn event(&self, event: &Event<'_>) {
398403
self.inner.event(event);

0 commit comments

Comments
 (0)