itsscb/tracing
1
0
Fork 0
mirror of https://github.com/tokio-rs/tracing.git synced 2025-10-02 23:34:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

tracing: fix "name / parent" variant of event! (#2983)

Browse Source 
## Motivation

In the case of an event with a name and a parent, the change in #2083
to use a free function instead of a method for `is_enabled` was not
applied. This particular variant was also not covered by any tests,
which is how this error slipped through CI.

## Solution

This change fixes the `is_enabled` call and adds additional test
coverage for this macros case.

Co-authored-by: Hayden Stainsby <hds@caffeineconcepts.com>
This commit is contained in:
Mododo 2025-06-03 12:04:27 +03:00 committed by GitHub
parent 656a7c909f
commit cdc32121ba
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tracing/src/macros.rs
View File

@ -789,7 +789,7 @@ macro_rules! event {
let enabled = $crate::level_enabled!($lvl) && { let enabled = $crate::level_enabled!($lvl) && {
let interest = __CALLSITE.interest(); let interest = __CALLSITE.interest();
!interest.is_never() && __CALLSITE.is_enabled(interest) !interest.is_never() && $crate::__macro_support::__is_enabled(__CALLSITE.metadata(), interest)
}; };
if enabled { if enabled {
(|value_set: $crate::field::ValueSet| { (|value_set: $crate::field::ValueSet| {

12
tracing/tests/macros.rs
View File

@ -526,6 +526,13 @@ fn locals_no_message() {
private_data, private_data,
?data, ?data,
); );
event!(
name: "foo",
parent: ::core::option::Option::None,
Level::WARN,
private_data,
?data,
);
event!( event!(
target: "app_events", target: "app_events",
Level::WARN, Level::WARN,
@ -570,6 +577,7 @@ fn trace() {
trace!({ foo = ?2, bar.baz = %78 }, "quux"); trace!({ foo = ?2, bar.baz = %78 }, "quux");
trace!(name: "foo", foo = 3, bar.baz = 2, quux = false); trace!(name: "foo", foo = 3, bar.baz = 2, quux = false);
trace!(name: "foo", target: "foo_events", foo = 3, bar.baz = 2, quux = false); trace!(name: "foo", target: "foo_events", foo = 3, bar.baz = 2, quux = false);
trace!(name: "foo", parent: ::core::option::Option::None, foo = 3, bar.baz = 2, quux = false);
trace!(target: "foo_events", foo = 3, bar.baz = 2, quux = false); trace!(target: "foo_events", foo = 3, bar.baz = 2, quux = false);
trace!(target: "foo_events", foo = 3, bar.baz = 3,); trace!(target: "foo_events", foo = 3, bar.baz = 3,);
trace!(target: "foo_events", "foo"); trace!(target: "foo_events", "foo");
@ -636,6 +644,7 @@ fn debug() {
debug!({ foo = ?2, bar.baz = %78 }, "quux"); debug!({ foo = ?2, bar.baz = %78 }, "quux");
debug!(name: "foo", foo = 3, bar.baz = 2, quux = false); debug!(name: "foo", foo = 3, bar.baz = 2, quux = false);
debug!(name: "foo", target: "foo_events", foo = 3, bar.baz = 2, quux = false); debug!(name: "foo", target: "foo_events", foo = 3, bar.baz = 2, quux = false);
debug!(name: "foo", parent: ::core::option::Option::None, foo = 3, bar.baz = 2, quux = false);
debug!(target: "foo_events", foo = 3, bar.baz = 2, quux = false); debug!(target: "foo_events", foo = 3, bar.baz = 2, quux = false);
debug!(target: "foo_events", foo = 3, bar.baz = 3,); debug!(target: "foo_events", foo = 3, bar.baz = 3,);
debug!(target: "foo_events", "foo"); debug!(target: "foo_events", "foo");
@ -702,6 +711,7 @@ fn info() {
info!({ foo = ?2, bar.baz = %78 }, "quux"); info!({ foo = ?2, bar.baz = %78 }, "quux");
info!(name: "foo", foo = 3, bar.baz = 2, quux = false); info!(name: "foo", foo = 3, bar.baz = 2, quux = false);
info!(name: "foo", target: "foo_events", foo = 3, bar.baz = 2, quux = false); info!(name: "foo", target: "foo_events", foo = 3, bar.baz = 2, quux = false);
info!(name: "foo", parent: ::core::option::Option::None, foo = 3, bar.baz = 2, quux = false);
info!(target: "foo_events", foo = 3, bar.baz = 2, quux = false); info!(target: "foo_events", foo = 3, bar.baz = 2, quux = false);
info!(target: "foo_events", foo = 3, bar.baz = 3,); info!(target: "foo_events", foo = 3, bar.baz = 3,);
info!(target: "foo_events", "foo"); info!(target: "foo_events", "foo");
@ -768,6 +778,7 @@ fn warn() {
warn!({ foo = ?2, bar.baz = %78 }, "quux"); warn!({ foo = ?2, bar.baz = %78 }, "quux");
warn!(name: "foo", foo = 3, bar.baz = 2, quux = false); warn!(name: "foo", foo = 3, bar.baz = 2, quux = false);
warn!(name: "foo", target: "foo_events", foo = 3, bar.baz = 2, quux = false); warn!(name: "foo", target: "foo_events", foo = 3, bar.baz = 2, quux = false);
warn!(name: "foo", parent: ::core::option::Option::None, foo = 3, bar.baz = 2, quux = false);
warn!(target: "foo_events", foo = 3, bar.baz = 2, quux = false); warn!(target: "foo_events", foo = 3, bar.baz = 2, quux = false);
warn!(target: "foo_events", foo = 3, bar.baz = 3,); warn!(target: "foo_events", foo = 3, bar.baz = 3,);
warn!(target: "foo_events", "foo"); warn!(target: "foo_events", "foo");
@ -834,6 +845,7 @@ fn error() {
error!({ foo = ?2, bar.baz = %78 }, "quux"); error!({ foo = ?2, bar.baz = %78 }, "quux");
error!(name: "foo", foo = 3, bar.baz = 2, quux = false); error!(name: "foo", foo = 3, bar.baz = 2, quux = false);
error!(name: "foo", target: "foo_events", foo = 3, bar.baz = 2, quux = false); error!(name: "foo", target: "foo_events", foo = 3, bar.baz = 2, quux = false);
error!(name: "foo", parent: ::core::option::Option::None, foo = 3, bar.baz = 2, quux = false);
error!(target: "foo_events", foo = 3, bar.baz = 2, quux = false); error!(target: "foo_events", foo = 3, bar.baz = 2, quux = false);
error!(target: "foo_events", foo = 3, bar.baz = 3,); error!(target: "foo_events", foo = 3, bar.baz = 3,);
error!(target: "foo_events", "foo"); error!(target: "foo_events", "foo");