From 11dd0c42ca82b5819dfe6fdb8cf11a58119acd0f Mon Sep 17 00:00:00 2001 From: Thomas Eizinger Date: Mon, 18 Nov 2024 18:17:30 +0000 Subject: [PATCH] refactor(telemetry): remove `IGNORED_TARGETS` (#7365) Sentry allows us to do this kind of filtering on the server-side, we can thus remove this complexity from our codebase. --- rust/logging/src/lib.rs | 41 +++++------------------------------------ 1 file changed, 5 insertions(+), 36 deletions(-) diff --git a/rust/logging/src/lib.rs b/rust/logging/src/lib.rs index 8320faa24..aa86afcb4 100644 --- a/rust/logging/src/lib.rs +++ b/rust/logging/src/lib.rs @@ -106,24 +106,12 @@ pub fn sentry_layer() -> impl Layer + Send + Sync where S: Subscriber + for<'a> LookupSpan<'a>, { - const IGNORED_TARGETS: &[IgnoredEvent] = &[IgnoredEvent::warn( - "tao::platform_impl::platform::event_loop::runner", - )]; - sentry_tracing::layer() - .event_filter(move |md| { - let level = *md.level(); - - if IGNORED_TARGETS.contains(&IgnoredEvent::new(*md.level(), md.target())) { - return EventFilter::Ignore; - } - - match level { - tracing::Level::ERROR | tracing::Level::WARN => EventFilter::Exception, - tracing::Level::INFO | tracing::Level::DEBUG => EventFilter::Breadcrumb, - tracing::Level::TRACE if md.target() == TELEMETRY_TARGET => EventFilter::Event, - _ => EventFilter::Ignore, - } + .event_filter(move |md| match *md.level() { + tracing::Level::ERROR | tracing::Level::WARN => EventFilter::Exception, + tracing::Level::INFO | tracing::Level::DEBUG => EventFilter::Breadcrumb, + tracing::Level::TRACE if md.target() == TELEMETRY_TARGET => EventFilter::Event, + _ => EventFilter::Ignore, }) .span_filter(|md| *md.level() == tracing::Level::TRACE && md.target() == TELEMETRY_TARGET) .enable_span_attributes() @@ -169,22 +157,3 @@ pub mod __export { pub use rand; pub use tracing; } - -#[derive(Debug, PartialEq)] -struct IgnoredEvent<'a> { - level: tracing::Level, - target: &'a str, -} - -impl<'a> IgnoredEvent<'a> { - fn new(level: tracing::Level, target: &'a str) -> Self { - Self { level, target } - } - - const fn warn(target: &'static str) -> Self { - Self { - target, - level: tracing::Level::WARN, - } - } -}