From f90f00b5e33a79716152839869a75cb41d339ebc Mon Sep 17 00:00:00 2001
From: Wim Looman <git@nemo157.com>
Date: Fri, 24 Nov 2023 14:07:23 +0100
Subject: [PATCH] Improve formatting of `rustwide` log messages

Enables `tracing-subscriber/tracing-log` feature to get its support for
formatting based on these messages custom attributes. Requires manually
registering the registry to avoid `tracing-subscriber` attempting to
register its own `tracing-log` instance as we've already registered one
through `rustwide`.
---
 Cargo.toml           |  2 +-
 src/bin/cratesfyi.rs | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 6f006435b..7d8dee145 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -27,7 +27,7 @@ sentry-tower = { version = "0.31.0", features = ["http"] }
 sentry-anyhow = { version = "0.31.0", features = ["backtrace"] }
 log = "0.4"
 tracing = "0.1.37"
-tracing-subscriber = { version = "0.3.16", default-features = false, features = ["ansi", "fmt", "env-filter"] }
+tracing-subscriber = { version = "0.3.16", default-features = false, features = ["ansi", "fmt", "env-filter", "tracing-log"] }
 tracing-log = "0.2.0"
 regex = "1"
 clap = { version = "4.0.22", features = [ "derive" ] }
diff --git a/src/bin/cratesfyi.rs b/src/bin/cratesfyi.rs
index abc694c1a..4bcaab86f 100644
--- a/src/bin/cratesfyi.rs
+++ b/src/bin/cratesfyi.rs
@@ -41,15 +41,16 @@ fn main() {
         );
 
     let _sentry_guard = if let Ok(sentry_dsn) = env::var("SENTRY_DSN") {
-        tracing_registry
-            .with(sentry_tracing::layer().event_filter(|md| {
+        tracing::subscriber::set_global_default(tracing_registry.with(
+            sentry_tracing::layer().event_filter(|md| {
                 if md.fields().field("reported_to_sentry").is_some() {
                     sentry_tracing::EventFilter::Ignore
                 } else {
                     sentry_tracing::default_event_filter(md)
                 }
-            }))
-            .init();
+            }),
+        ))
+        .unwrap();
 
         Some(sentry::init((
             sentry_dsn,
@@ -65,7 +66,7 @@ fn main() {
             .add_integration(sentry_panic::PanicIntegration::default()),
         )))
     } else {
-        tracing_registry.init();
+        tracing::subscriber::set_global_default(tracing_registry).unwrap();
         None
     };