fix: avoid panic when re-setting global default subscriber (#5129)

NomicFoundation · Apr 17, 2024 · a41cb44 · a41cb44
1 parent 3b36d76
commit a41cb44
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.changeset/twelve-ducks-exercise.md b/.changeset/twelve-ducks-exercise.md
@@ -0,0 +1,5 @@
+---
+"@nomicfoundation/edr": patch
+---
+
+Fixed panic when re-setting global default subscriber
diff --git a/crates/edr_napi/src/context.rs b/crates/edr_napi/src/context.rs
@@ -34,6 +34,7 @@ impl EdrContext {
 
 #[derive(Debug)]
 pub struct Context {
+    _subscriber_guard: tracing::subscriber::DefaultGuard,
     #[cfg(feature = "tracing")]
     _tracing_write_guard: tracing_flame::FlushGuard<std::io::BufWriter<std::fs::File>>,
 }
@@ -63,10 +64,10 @@ impl Context {
         #[cfg(feature = "tracing")]
         let subscriber = subscriber.with(flame_layer);
 
-        tracing::subscriber::set_global_default(subscriber)
-            .expect("Could not set global default tracing subscriber");
+        let subscriber_guard = tracing::subscriber::set_default(subscriber);
 
         Ok(Self {
+            _subscriber_guard: subscriber_guard,
             #[cfg(feature = "tracing")]
             _tracing_write_guard: guard,
         })