🥅 Remove the spammy errors from Sentry

eigenein · eigenein · commit 99e92ed49c2a · 2023-06-09T19:16:00.000+02:00
diff --git a/src/main.rs b/src/main.rs
@@ -18,24 +18,19 @@ mod web;
 mod weegee;
 
 use clap::Parser;
-use sentry::integrations::anyhow::capture_anyhow;
 
 use crate::{
     cli::{Cli, Command},
     prelude::*,
+    tracing::trace,
 };
 
 #[tokio::main]
 async fn main() -> Result {
     let args = Cli::parse();
     let _sentry_guard = tracing::init(args.sentry_dsn, 1.0)?;
 
-    let result = match args.command {
-        Command::Web(args) => web::run(args).await,
-    };
-
-    if let Err(error) = &result {
-        capture_anyhow(error);
+    match args.command {
+        Command::Web(args) => trace(web::run(args).await),
     }
-    result
 }
diff --git a/src/tracing.rs b/src/tracing.rs
@@ -1,8 +1,11 @@
 use std::borrow::Cow;
 
 use clap::crate_version;
-use sentry::{integrations::tracing::EventFilter, ClientInitGuard, ClientOptions, Scope};
-use tracing::{info, Level};
+use sentry::{
+    integrations::{anyhow::capture_anyhow, tracing::EventFilter},
+    ClientInitGuard, ClientOptions, Scope,
+};
+use tracing::{error, info, Level};
 use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt, EnvFilter, Layer};
 
 use crate::{models::User, prelude::*};
@@ -21,13 +24,8 @@ pub fn init(sentry_dsn: Option<String>, traces_sample_rate: f32) -> Result<Clien
     let guard = sentry::init((sentry_dsn, sentry_options));
 
     let sentry_layer = sentry::integrations::tracing::layer()
-        .event_filter(|metadata| match metadata.level() {
-            &Level::ERROR | &Level::WARN => EventFilter::Event,
-            &Level::INFO | &Level::DEBUG | &Level::TRACE => EventFilter::Breadcrumb,
-        })
-        .span_filter(|metadata| {
-            matches!(metadata.level(), &Level::ERROR | &Level::WARN | &Level::INFO | &Level::DEBUG)
-        });
+        .event_filter(|_metadata| EventFilter::Breadcrumb)
+        .span_filter(|metadata| metadata.level() >= &Level::DEBUG);
 
     let format_filter = EnvFilter::try_from_env("BLITZ_TANKS_LOG")
         .or_else(|_| EnvFilter::try_new("warn,blitz_tanks=info"))?;
@@ -60,3 +58,13 @@ pub fn configure_user(scope: &mut Scope, user: Option<&User>) {
         }
     }
 }
+
+/// Proxy the result, and report a possible error.
+#[inline]
+pub fn trace<T>(result: Result<T>) -> Result<T> {
+    if let Err(error) = &result {
+        let event_id = capture_anyhow(error);
+        error!(?event_id, "💥 failed");
+    }
+    result
+}
diff --git a/src/web/error.rs b/src/web/error.rs
@@ -3,7 +3,6 @@ use axum::{
     http::StatusCode,
     response::{IntoResponse, Response},
 };
-use sentry::integrations::anyhow::capture_anyhow;
 use tracing::{error, warn};
 
 /// Custom error enumeration, which can be used in the web handlers.
@@ -41,7 +40,6 @@ impl IntoResponse for WebError {
 
             Self::InternalServerError(error) => {
                 error!("💥 internal server error: {error:#}");
-                capture_anyhow(&error);
                 StatusCode::INTERNAL_SERVER_ERROR
             }
         };
diff --git a/src/web/tracing_.rs b/src/web/tracing_.rs
@@ -15,7 +15,7 @@ pub fn on_request(request: &Request<Body>, span: &Span) {
 
 pub fn on_response<B>(response: &Response<B>, latency: Duration, span: &Span) {
     if response.status().is_server_error() {
-        error!(parent: span, status = ?response.status(), ?latency, "🛬 failed");
+        error!(parent: span, status = ?response.status(), ?latency, "💥 failed");
     } else if response.status().is_client_error() {
         warn!(parent: span, status = ?response.status(), ?latency, "🛬 finished");
     } else {
@@ -24,6 +24,6 @@ pub fn on_response<B>(response: &Response<B>, latency: Duration, span: &Span) {
 }
 
 #[allow(clippy::needless_pass_by_value)]
-pub fn on_failure(_error: ServerErrorsFailureClass, latency: Duration, span: &Span) {
-    error!(parent: span, ?latency, "💥 something went wrong");
+pub fn on_failure(error: ServerErrorsFailureClass, latency: Duration, span: &Span) {
+    error!(parent: span, ?error, ?latency, "💥 failed");
 }
