Skip to content

Commit 7f60c92

Browse files
authored
tracing: monomorphize is_enabled call in macros (#787)
Resolves #783.
1 parent e58a869 commit 7f60c92

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

tracing/src/lib.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -869,6 +869,14 @@ pub mod __macro_support {
869869
pub type Once = tracing_core::Once;
870870
}
871871

872+
#[doc(hidden)]
873+
// resolves https://github.com/tokio-rs/tracing/issues/783 by forcing a monomorphization
874+
// in tracing, not downstream crates.
875+
#[inline]
876+
pub fn is_enabled(meta: &crate::Metadata<'_>) -> bool {
877+
crate::dispatcher::get_default(|current| current.enabled(meta))
878+
}
879+
872880
mod sealed {
873881
pub trait Sealed {}
874882
}

tracing/src/macros.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ macro_rules! event {
539539

540540
if $crate::level_enabled!($lvl) {
541541
#[allow(unused_imports)]
542-
use $crate::{callsite, dispatcher, Event, field::{Value, ValueSet}};
542+
use $crate::{callsite, Event, field::{Value, ValueSet}};
543543
use $crate::callsite::Callsite;
544544
let callsite = callsite! {
545545
name: concat!(
@@ -584,7 +584,7 @@ macro_rules! event {
584584
);
585585
if $crate::level_enabled!($lvl) {
586586
#[allow(unused_imports)]
587-
use $crate::{callsite, dispatcher, Event, field::{Value, ValueSet}};
587+
use $crate::{callsite, Event, field::{Value, ValueSet}};
588588
use $crate::callsite::Callsite;
589589
let callsite = callsite! {
590590
name: concat!(
@@ -1860,7 +1860,7 @@ macro_rules! is_enabled {
18601860
true
18611861
} else {
18621862
let meta = $callsite.metadata();
1863-
$crate::dispatcher::get_default(|current| current.enabled(meta))
1863+
$crate::is_enabled(meta)
18641864
}
18651865
}};
18661866
}

0 commit comments

Comments
 (0)