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

macros: fix the tracing-macros crate not compiling (#1000)

Browse Source 
## Motivation

The `tracing-macros` crate doesn't currently compile with the latest
`tracing` release, because it uses internal private API that changed.
We need to fix this so CI isn't broken.

## Solution

I changed the `dbg!` macro so it no longer uses internal APIs. Ideally,
we would implement `dbg!` using the support for string-literal field
names that was recently added to `tracing`, but I couldn't actually get
it to work --- I think the `event!` macros may not handle string literal
field names properly (we only test them with the `span!` macros >_>).
Will try to fix that later, but for now, this fixes CI and I don't think
anyone actually uses the experimental, unreleased `tracing-macros` 
crate.

Signed-off-by: Eliza Weisman <eliza@buoyant.io>
This commit is contained in:
Eliza Weisman 2020-09-29 10:54:07 -07:00
parent 386969ba9a
commit 5c457e5e73
No known key found for this signature in database
GPG Key ID: F9C1A595C3814436
1 changed files with 11 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
tracing-macros/src/lib.rs
View File

@ -1,4 +1,6 @@
#![cfg_attr(docsrs, deny(broken_intra_doc_links))] #![cfg_attr(docsrs, deny(broken_intra_doc_links))]
#[doc(hidden)]
pub use tracing;
/// Alias of `dbg!` for avoiding conflicts with the `std::dbg!` macro. /// Alias of `dbg!` for avoiding conflicts with the `std::dbg!` macro.
#[macro_export] #[macro_export]
@ -10,10 +12,10 @@ macro_rules! trace_dbg {
$crate::dbg!(target: module_path!(), level: $level, $ex) $crate::dbg!(target: module_path!(), level: $level, $ex)
}; };
(target: $target:expr, $ex:expr) => { (target: $target:expr, $ex:expr) => {
$crate::dbg!(target: $target, level: tracing::Level::DEBUG, $ex) $crate::dbg!(target: $target, level: $crate::tracing::Level::DEBUG, $ex)
}; };
($ex:expr) => { ($ex:expr) => {
$crate::dbg!(level: tracing::Level::DEBUG, $ex) $crate::dbg!(level: $crate::tracing::Level::DEBUG, $ex)
}; };
} }
@ -25,42 +27,20 @@ macro_rules! trace_dbg {
#[macro_export] #[macro_export]
macro_rules! dbg { macro_rules! dbg {
(target: $target:expr, level: $level:expr, $ex:expr) => {{ (target: $target:expr, level: $level:expr, $ex:expr) => {{
use tracing::callsite::Callsite; match $ex {
use tracing::{ value => {
callsite, $crate::tracing::event!(target: $target, $level, ?value, stringify!($ex));
field::{debug, Value}, value
Event, Id, Subscriber, }
};
let callsite = tracing::callsite! {
name: concat!("event:trace_dbg(", stringify!($ex), ")"),
kind: tracing::metadata::Kind::EVENT,
target: $target,
level: $level,
fields: value,
};
let val = $ex;
if callsite.is_enabled() {
let meta = callsite.metadata();
let fields = meta.fields();
let key = meta
.fields()
.into_iter()
.next()
.expect("trace_dbg event must have one field");
Event::dispatch(
meta,
&fields.value_set(&[(&key, Some(&debug(&val) as &Value))]),
);
} }
val
}}; }};
(level: $level:expr, $ex:expr) => { (level: $level:expr, $ex:expr) => {
$crate::dbg!(target: module_path!(), level: $level, $ex) $crate::dbg!(target: module_path!(), level: $level, $ex)
}; };
(target: $target:expr, $ex:expr) => { (target: $target:expr, $ex:expr) => {
$crate::dbg!(target: $target, level: tracing::Level::DEBUG, $ex) $crate::dbg!(target: $target, level: $crate::tracing::Level::DEBUG, $ex)
}; };
($ex:expr) => { ($ex:expr) => {
$crate::dbg!(level: tracing::Level::DEBUG, $ex) $crate::dbg!(level: $crate::tracing::Level::DEBUG, $ex)
}; };
} }