feat: add global component tag to rust json logs, add sentry, some cleanup

lib/libpk/Cargo.toml

@@ -10,7 +10,9 @@ lazy_static = { workspace = true }
 metrics = { workspace = true }
 prost = { workspace = true }
 prost-types = { workspace = true }
+sentry = { workspace = true }
 serde = { workspace = true }
+serde_json = { workspace = true }
 sqlx = { workspace = true }
 time = { workspace = true }
 tokio = { workspace = true }
@@ -20,6 +22,7 @@ twilight-model = { workspace = true }
 uuid = { workspace = true }
 
 config = "0.14.0"
+json-subscriber = { version = "0.2.2", features = ["env-filter"] }
 metrics-exporter-prometheus = { version = "0.15.3", default-features = false, features = ["tokio", "http-listener", "tracing"] }
 
 [build-dependencies]

lib/libpk/src/_config.rs

@@ -102,6 +102,9 @@ pub struct PKConfig {
 
     #[serde(default = "_json_log_default")]
     pub(crate) json_log: bool,
+
+    #[serde(default)]
+    pub sentry_url: Option<String>,
 }
 
 impl PKConfig {

lib/libpk/src/lib.rs

@@ -1,6 +1,7 @@
 #![feature(let_chains)]
 use metrics_exporter_prometheus::PrometheusBuilder;
-use tracing_subscriber::EnvFilter;
+use sentry::IntoDsn;
+use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt, EnvFilter};
 
 pub mod db;
 pub mod proto;
@@ -9,12 +10,18 @@ pub mod util;
 pub mod _config;
 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) -> anyhow::Result<()> {
-    // todo: fix component
     if config.json_log {
-        tracing_subscriber::fmt()
-            .json()
-            .with_env_filter(EnvFilter::from_default_env())
+        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(EnvFilter::from_default_env())
             .init();
     } else {
         tracing_subscriber::fmt()
@@ -33,3 +40,40 @@ pub fn init_metrics() -> anyhow::Result<()> {
     }
     Ok(())
 }
+
+pub fn init_sentry() -> sentry::ClientInitGuard {
+    sentry::init(sentry::ClientOptions {
+        dsn: config
+            .sentry_url
+            .clone()
+            .map(|u| u.into_dsn().unwrap())
+            .flatten(),
+        release: sentry::release_name!(),
+        ..Default::default()
+    })
+}
+
+#[macro_export]
+macro_rules! main {
+    ($component:expr) => {
+        fn main() -> anyhow::Result<()> {
+            let _sentry_guard = libpk::init_sentry();
+            // we might also be able to use env!("CARGO_CRATE_NAME") here
+            libpk::init_logging($component)?;
+            tokio::runtime::Builder::new_multi_thread()
+                .enable_all()
+                .build()
+                .unwrap()
+                .block_on(async {
+                    if let Err(err) = libpk::init_metrics() {
+                        tracing::error!("failed to init metrics collector: {err}");
+                    };
+                    tracing::info!("hello world");
+                    if let Err(err) = real_main().await {
+                        tracing::error!("failed to run service: {err}");
+                    };
+                });
+            Ok(())
+        }
+    };
+}