From f2583904ef4c709b5e2acf9df05bba7483faaf7d Mon Sep 17 00:00:00 2001
From: alyssa <alyssa@mailc.net>
Date: Sat, 8 Mar 2025 12:05:00 +0000
Subject: [PATCH] chore(rust): clean up duplicated sentry code

---
 crates/libpk/src/lib.rs | 38 +++++++++++++-------------------------
 1 file changed, 13 insertions(+), 25 deletions(-)

diff --git a/crates/libpk/src/lib.rs b/crates/libpk/src/lib.rs
index 03c420e7..af967728 100644
--- a/crates/libpk/src/lib.rs
+++ b/crates/libpk/src/lib.rs
@@ -16,44 +16,32 @@ pub use crate::_config::CONFIG as config;
 // functions in this file are only used by the main function below
 
 pub fn init_logging(component: &str) {
-    // todo: clean up the sentry duplication
-    if config.json_log {
-        let sentry_layer =
-            sentry_tracing::layer().event_mapper(|md, ctx| match md.metadata().level() {
-                &tracing::Level::ERROR => {
-                    // for some reason this works, but letting the library handle it doesn't
-                    let event = event_from_event(md, ctx);
-                    sentry::capture_event(event);
-                    sentry_tracing::EventMapping::Ignore
-                }
-                _ => sentry_tracing::EventMapping::Ignore,
-            });
+    let sentry_layer =
+        sentry_tracing::layer().event_mapper(|md, ctx| match md.metadata().level() {
+            &tracing::Level::ERROR => {
+                // for some reason this works, but letting the library handle it doesn't
+                let event = event_from_event(md, ctx);
+                sentry::capture_event(event);
+                sentry_tracing::EventMapping::Ignore
+            }
+            _ => sentry_tracing::EventMapping::Ignore,
+        });
 
+    if config.json_log {
         let mut layer = json_subscriber::layer();
         layer.inner_layer_mut().add_static_field(
             "component",
             serde_json::Value::String(component.to_string()),
         );
         tracing_subscriber::registry()
-            .with(layer)
             .with(sentry_layer)
+            .with(layer)
             .with(EnvFilter::from_default_env())
             .init();
     } else {
-        let sentry_layer =
-            sentry_tracing::layer().event_mapper(|md, ctx| match md.metadata().level() {
-                &tracing::Level::ERROR => {
-                    // for some reason this works, but letting the library handle it doesn't
-                    let event = event_from_event(md, ctx);
-                    sentry::capture_event(event);
-                    sentry_tracing::EventMapping::Ignore
-                }
-                _ => sentry_tracing::EventMapping::Ignore,
-            });
-
         tracing_subscriber::registry()
-            .with(tracing_subscriber::fmt::layer())
             .with(sentry_layer)
+            .with(tracing_subscriber::fmt::layer())
             .init();
     }
 }