mirror of
https://github.com/tokio-rs/tokio.git
synced 2026-08-27 00:00:12 +02:00
## Motivation Currently, the primary way to use a span is to use `.enter` and pass a closure to be executed under the span. While that is convenient in many settings, it also comes with two decently inconvenient drawbacks: - It breaks control flow statements like `return`, `?`, `break`, and `continue` - It require re-indenting a potentially large chunk of code if you wish it to appear under a span ## Solution This branch changes the `Span::enter` function to return a scope guard that exits the span when dropped, as in: ```rust let guard = span.enter(); // code here is within the span drop(guard); // code here is no longer within the span ``` The method previously called `enter`, which takes a closure and executes it in the span's context, is now called `Span::in_scope`, and was reimplemented on top of the new `enter` method. This is a breaking change to `tokio-trace` that will be part of the upcoming 0.2 release. Closes #1075 Signed-off-by: Eliza Weisman <[email protected]>
159 lines
3.7 KiB
Rust
159 lines
3.7 KiB
Rust
#![feature(test)]
|
|
|
|
#[macro_use]
|
|
extern crate tokio_trace;
|
|
extern crate test;
|
|
use test::Bencher;
|
|
use tokio_trace::Level;
|
|
|
|
use std::{
|
|
fmt,
|
|
sync::{Mutex, MutexGuard},
|
|
};
|
|
use tokio_trace::{field, span, Event, Id, Metadata};
|
|
|
|
/// A subscriber that is enabled but otherwise does nothing.
|
|
struct EnabledSubscriber;
|
|
|
|
impl tokio_trace::Subscriber for EnabledSubscriber {
|
|
fn new_span(&self, span: &span::Attributes) -> Id {
|
|
let _ = span;
|
|
Id::from_u64(0xDEADFACE)
|
|
}
|
|
|
|
fn event(&self, event: &Event) {
|
|
let _ = event;
|
|
}
|
|
|
|
fn record(&self, span: &Id, values: &span::Record) {
|
|
let _ = (span, values);
|
|
}
|
|
|
|
fn record_follows_from(&self, span: &Id, follows: &Id) {
|
|
let _ = (span, follows);
|
|
}
|
|
|
|
fn enabled(&self, metadata: &Metadata) -> bool {
|
|
let _ = metadata;
|
|
true
|
|
}
|
|
|
|
fn enter(&self, span: &Id) {
|
|
let _ = span;
|
|
}
|
|
|
|
fn exit(&self, span: &Id) {
|
|
let _ = span;
|
|
}
|
|
}
|
|
|
|
/// Simulates a subscriber that records span data.
|
|
struct VisitingSubscriber(Mutex<String>);
|
|
|
|
struct Visitor<'a>(MutexGuard<'a, String>);
|
|
|
|
impl<'a> field::Visit for Visitor<'a> {
|
|
fn record_debug(&mut self, _field: &field::Field, value: &fmt::Debug) {
|
|
use std::fmt::Write;
|
|
let _ = write!(&mut *self.0, "{:?}", value);
|
|
}
|
|
}
|
|
|
|
impl tokio_trace::Subscriber for VisitingSubscriber {
|
|
fn new_span(&self, span: &span::Attributes) -> Id {
|
|
let mut visitor = Visitor(self.0.lock().unwrap());
|
|
span.record(&mut visitor);
|
|
Id::from_u64(0xDEADFACE)
|
|
}
|
|
|
|
fn record(&self, _span: &Id, values: &span::Record) {
|
|
let mut visitor = Visitor(self.0.lock().unwrap());
|
|
values.record(&mut visitor);
|
|
}
|
|
|
|
fn event(&self, event: &Event) {
|
|
let mut visitor = Visitor(self.0.lock().unwrap());
|
|
event.record(&mut visitor);
|
|
}
|
|
|
|
fn record_follows_from(&self, span: &Id, follows: &Id) {
|
|
let _ = (span, follows);
|
|
}
|
|
|
|
fn enabled(&self, metadata: &Metadata) -> bool {
|
|
let _ = metadata;
|
|
true
|
|
}
|
|
|
|
fn enter(&self, span: &Id) {
|
|
let _ = span;
|
|
}
|
|
|
|
fn exit(&self, span: &Id) {
|
|
let _ = span;
|
|
}
|
|
}
|
|
|
|
const N_SPANS: usize = 100;
|
|
|
|
#[bench]
|
|
fn span_no_fields(b: &mut Bencher) {
|
|
tokio_trace::subscriber::with_default(EnabledSubscriber, || {
|
|
b.iter(|| span!(Level::TRACE, "span"))
|
|
});
|
|
}
|
|
|
|
#[bench]
|
|
fn enter_span(b: &mut Bencher) {
|
|
tokio_trace::subscriber::with_default(EnabledSubscriber, || {
|
|
let span = span!(Level::TRACE, "span");
|
|
b.iter(|| test::black_box(span.in_scope(|| {})))
|
|
});
|
|
}
|
|
|
|
#[bench]
|
|
fn span_repeatedly(b: &mut Bencher) {
|
|
#[inline]
|
|
fn mk_span(i: u64) -> tokio_trace::Span {
|
|
span!(Level::TRACE, "span", i = i)
|
|
}
|
|
|
|
let n = test::black_box(N_SPANS);
|
|
tokio_trace::subscriber::with_default(EnabledSubscriber, || {
|
|
b.iter(|| (0..n).fold(mk_span(0), |_, i| mk_span(i as u64)))
|
|
});
|
|
}
|
|
|
|
#[bench]
|
|
fn span_with_fields(b: &mut Bencher) {
|
|
tokio_trace::subscriber::with_default(EnabledSubscriber, || {
|
|
b.iter(|| {
|
|
span!(
|
|
Level::TRACE,
|
|
"span",
|
|
foo = "foo",
|
|
bar = "bar",
|
|
baz = 3,
|
|
quuux = tokio_trace::field::debug(0.99)
|
|
)
|
|
})
|
|
});
|
|
}
|
|
|
|
#[bench]
|
|
fn span_with_fields_record(b: &mut Bencher) {
|
|
let subscriber = VisitingSubscriber(Mutex::new(String::from("")));
|
|
tokio_trace::subscriber::with_default(subscriber, || {
|
|
b.iter(|| {
|
|
span!(
|
|
Level::TRACE,
|
|
"span",
|
|
foo = "foo",
|
|
bar = "bar",
|
|
baz = 3,
|
|
quuux = tokio_trace::field::debug(0.99)
|
|
)
|
|
})
|
|
});
|
|
}
|