diff --git a/tracing-subscriber/Cargo.toml b/tracing-subscriber/Cargo.toml index ca5db4db07..3510bfce5c 100644 --- a/tracing-subscriber/Cargo.toml +++ b/tracing-subscriber/Cargo.toml @@ -83,3 +83,7 @@ harness = false [[bench]] name = "fmt" harness = false + +[[bench]] +name = "enter" +harness = false diff --git a/tracing-subscriber/benches/enter.rs b/tracing-subscriber/benches/enter.rs new file mode 100644 index 0000000000..49c6e730a8 --- /dev/null +++ b/tracing-subscriber/benches/enter.rs @@ -0,0 +1,64 @@ +use criterion::{criterion_group, criterion_main, Criterion}; +use tracing_subscriber::prelude::*; + +fn enter(c: &mut Criterion) { + let mut group = c.benchmark_group("enter"); + let _subscriber = tracing_subscriber::fmt() + .with_max_level(tracing::Level::INFO) + .finish() + .set_default(); + group.bench_function("enabled", |b| { + let span = tracing::info_span!("foo"); + b.iter_with_large_drop(|| span.enter()) + }); + group.bench_function("disabled", |b| { + let span = tracing::debug_span!("foo"); + b.iter_with_large_drop(|| span.enter()) + }); +} + +fn enter_exit(c: &mut Criterion) { + let mut group = c.benchmark_group("enter_exit"); + let _subscriber = tracing_subscriber::fmt() + .with_max_level(tracing::Level::INFO) + .finish() + .set_default(); + group.bench_function("enabled", |b| { + let span = tracing::info_span!("foo"); + b.iter(|| span.enter()) + }); + group.bench_function("disabled", |b| { + let span = tracing::debug_span!("foo"); + b.iter(|| span.enter()) + }); +} + +fn enter_many(c: &mut Criterion) { + let mut group = c.benchmark_group("enter_many"); + let _subscriber = tracing_subscriber::fmt() + .with_max_level(tracing::Level::INFO) + .finish() + .set_default(); + group.bench_function("enabled", |b| { + let span1 = tracing::info_span!("span1"); + let _e1 = span1.enter(); + let span2 = tracing::info_span!("span2"); + let _e2 = span2.enter(); + let span3 = tracing::info_span!("span3"); + let _e3 = span3.enter(); + let span = tracing::info_span!("foo"); + b.iter_with_large_drop(|| span.enter()) + }); + group.bench_function("disabled", |b| { + let span1 = tracing::info_span!("span1"); + let _e1 = span1.enter(); + let span2 = tracing::info_span!("span2"); + let _e2 = span2.enter(); + let span3 = tracing::info_span!("span3"); + let _e3 = span3.enter(); + let span = tracing::debug_span!("foo"); + b.iter_with_large_drop(|| span.enter()) + }); +} +criterion_group!(benches, enter, enter_exit, enter_many); +criterion_main!(benches); diff --git a/tracing-subscriber/src/registry/sharded.rs b/tracing-subscriber/src/registry/sharded.rs index c55b8081ce..d26a3e70e3 100644 --- a/tracing-subscriber/src/registry/sharded.rs +++ b/tracing-subscriber/src/registry/sharded.rs @@ -202,19 +202,21 @@ impl Subscriber for Registry { fn event(&self, _: &Event<'_>) {} fn enter(&self, id: &span::Id) { - self.current_spans + if self + .current_spans .get_or_default() .borrow_mut() - .push(self.clone_span(id)); + .push(id.clone()) + { + self.clone_span(id); + } } fn exit(&self, id: &span::Id) { - if let Some(id) = self - .current_spans - .get() - .and_then(|spans| spans.borrow_mut().pop(id)) - { - dispatcher::get_default(|dispatch| dispatch.try_close(id.clone())); + if let Some(spans) = self.current_spans.get() { + if spans.borrow_mut().pop(id) { + dispatcher::get_default(|dispatch| dispatch.try_close(id.clone())); + } } } diff --git a/tracing-subscriber/src/registry/stack.rs b/tracing-subscriber/src/registry/stack.rs index e85cb7c3cf..b0b372c13f 100644 --- a/tracing-subscriber/src/registry/stack.rs +++ b/tracing-subscriber/src/registry/stack.rs @@ -1,5 +1,3 @@ -use std::collections::HashSet; - pub(crate) use tracing_core::span::Id; #[derive(Debug)] @@ -15,19 +13,18 @@ struct ContextId { #[derive(Debug, Default)] pub(crate) struct SpanStack { stack: Vec, - ids: HashSet, } impl SpanStack { - pub(crate) fn push(&mut self, id: Id) { - let duplicate = self.ids.contains(&id); - if !duplicate { - self.ids.insert(id.clone()); - } - self.stack.push(ContextId { id, duplicate }) + #[inline] + pub(crate) fn push(&mut self, id: Id) -> bool { + let duplicate = self.stack.iter().any(|i| i.id == id); + self.stack.push(ContextId { id, duplicate }); + !duplicate } - pub(crate) fn pop(&mut self, expected_id: &Id) -> Option { + #[inline] + pub(crate) fn pop(&mut self, expected_id: &Id) -> bool { if let Some((idx, _)) = self .stack .iter() @@ -35,14 +32,10 @@ impl SpanStack { .rev() .find(|(_, ctx_id)| ctx_id.id == *expected_id) { - let ContextId { id, duplicate } = self.stack.remove(idx); - if !duplicate { - self.ids.remove(&id); - } - Some(id) - } else { - None + let ContextId { id: _, duplicate } = self.stack.remove(idx); + return !duplicate; } + false } #[inline] @@ -65,7 +58,7 @@ mod tests { let id = Id::from_u64(1); stack.push(id.clone()); - assert_eq!(Some(id.clone()), stack.pop(&id)); + assert!(stack.pop(&id)); } #[test] @@ -75,6 +68,6 @@ mod tests { stack.push(Id::from_u64(2)); let id = Id::from_u64(1); - assert_eq!(Some(id.clone()), stack.pop(&id)); + assert!(stack.pop(&id)); } }