chore: set logger without mucking around with env vars

examples/chat.rs

@@ -19,25 +19,25 @@ use str0m::media::{Direction, KeyframeRequest, MediaData, Mid, Rid};
 use str0m::media::{KeyframeRequestKind, MediaKind};
 use str0m::net::Protocol;
 use str0m::{net::Receive, Candidate, Event, IceConnectionState, Input, Output, Rtc, RtcError};
+use tracing::subscriber::DefaultGuard;
+use tracing_subscriber::util::SubscriberInitExt as _;
+use tracing_subscriber::EnvFilter;
 
 mod util;
 
-fn init_log() {
-    use std::env;
-    use tracing_subscriber::{fmt, prelude::*, EnvFilter};
-
-    if env::var("RUST_LOG").is_err() {
-        env::set_var("RUST_LOG", "chat=info,str0m=info");
-    }
-
-    tracing_subscriber::registry()
-        .with(fmt::layer())
-        .with(EnvFilter::from_default_env())
-        .init();
+fn init_log() -> DefaultGuard {
+    tracing_subscriber::fmt()
+        .with_env_filter(
+            EnvFilter::builder()
+                .with_default_directive("chat=info,str0m=info".parse().unwrap())
+                .from_env()
+                .unwrap(),
+        )
+        .set_default()
 }
 
 pub fn main() {
-    init_log();
+    let _guard = init_log();
 
     let certificate = include_bytes!("cer.pem").to_vec();
     let private_key = include_bytes!("key.pem").to_vec();

examples/http-post.rs

@@ -14,25 +14,25 @@ use str0m::change::SdpOffer;
 use str0m::net::Protocol;
 use str0m::net::Receive;
 use str0m::{Candidate, Event, IceConnectionState, Input, Output, Rtc, RtcError};
+use tracing::subscriber::DefaultGuard;
+use tracing_subscriber::util::SubscriberInitExt as _;
+use tracing_subscriber::EnvFilter;
 
 mod util;
 
-fn init_log() {
-    use std::env;
-    use tracing_subscriber::{fmt, prelude::*, EnvFilter};
-
-    if env::var("RUST_LOG").is_err() {
-        env::set_var("RUST_LOG", "http_post=debug,str0m=debug");
-    }
-
-    tracing_subscriber::registry()
-        .with(fmt::layer())
-        .with(EnvFilter::from_default_env())
-        .init();
+fn init_log() -> DefaultGuard {
+    tracing_subscriber::fmt()
+        .with_env_filter(
+            EnvFilter::builder()
+                .with_default_directive("http_post=debug,str0m=debug".parse().unwrap())
+                .from_env()
+                .unwrap(),
+        )
+        .set_default()
 }
 
 pub fn main() {
-    init_log();
+    let _guard = init_log();
 
     let certificate = include_bytes!("cer.pem").to_vec();
     let private_key = include_bytes!("key.pem").to_vec();

src/ice/agent.rs

@@ -1571,7 +1571,7 @@ impl IceAgent {
 mod test {
     use super::*;
     use std::net::SocketAddr;
-    use std::sync::Once;
+    use tracing_subscriber::util::SubscriberInitExt as _;
 
     impl IceAgent {
         fn pair_indexes(&self) -> Vec<(usize, usize)> {
@@ -1746,21 +1746,10 @@ mod test {
 
     #[test]
     fn form_pairs_replace_remote_redundant() {
-        use std::env;
-        use tracing_subscriber::{fmt, prelude::*, EnvFilter};
-
-        if env::var("RUST_LOG").is_err() {
-            env::set_var("RUST_LOG", "debug");
-        }
-
-        static START: Once = Once::new();
-
-        START.call_once(|| {
-            tracing_subscriber::registry()
-                .with(fmt::layer())
-                .with(EnvFilter::from_default_env())
-                .init();
-        });
+        let _guard = tracing_subscriber::fmt()
+            .with_env_filter("debug")
+            .with_test_writer()
+            .set_default();
 
         let mut agent = IceAgent::new();
         agent.set_ice_lite(true);

src/ice/mod.rs

@@ -398,20 +398,6 @@ mod test {
         );
     }
 
-    // pub fn init_log() {
-    //     use std::env;
-    //     use tracing_subscriber::{fmt, prelude::*, EnvFilter};
-
-    //     if env::var("RUST_LOG").is_err() {
-    //         env::set_var("RUST_LOG", "trace");
-    //     }
-
-    //     tracing_subscriber::registry()
-    //         .with(fmt::layer())
-    //         .with(EnvFilter::from_default_env())
-    //         .init();
-    // }
-
     #[test]
     pub fn ice_lite_disconnect_reconnect() {
         // init_log();

tests/bidirectional.rs

@@ -11,7 +11,7 @@ use common::{init_log, progress, TestRtc};
 
 #[test]
 pub fn bidirectional_same_m_line() -> Result<(), RtcError> {
-    init_log();
+    let _guard = init_log();
 
     let mut l = TestRtc::new(info_span!("L"));
     let mut r = TestRtc::new(info_span!("R"));

tests/common.rs

@@ -16,7 +16,10 @@ use str0m::rtp::RtpHeader;
 use str0m::Candidate;
 use str0m::{Event, Input, Output, Rtc, RtcError};
 use tracing::info_span;
+use tracing::subscriber::DefaultGuard;
 use tracing::Span;
+use tracing_subscriber::util::SubscriberInitExt as _;
+use tracing_subscriber::EnvFilter;
 
 pub struct TestRtc {
     pub span: Span,
@@ -201,22 +204,15 @@ impl DerefMut for TestRtc {
     }
 }
 
-pub fn init_log() {
-    use std::env;
-    use tracing_subscriber::{fmt, prelude::*, EnvFilter};
-
-    if env::var("RUST_LOG").is_err() {
-        env::set_var("RUST_LOG", "str0m=debug");
-    }
-
-    static START: Once = Once::new();
-
-    START.call_once(|| {
-        tracing_subscriber::registry()
-            .with(fmt::layer())
-            .with(EnvFilter::from_default_env())
-            .init();
-    });
+pub fn init_log() -> DefaultGuard {
+    tracing_subscriber::fmt()
+        .with_env_filter(
+            EnvFilter::builder()
+                .with_default_directive("str0m=debug".parse().unwrap())
+                .from_env()
+                .unwrap(),
+        )
+        .set_default()
 }
 
 pub fn connect_l_r() -> (TestRtc, TestRtc) {

tests/contiguous.rs

@@ -11,7 +11,7 @@ use common::{init_log, progress, TestRtc};
 
 #[test]
 pub fn contiguous_all_the_way() -> Result<(), RtcError> {
-    init_log();
+    let _guard = init_log();
 
     let output = Server::with_vp8_input()
         .timeout(Duration::seconds(5))
@@ -34,7 +34,7 @@ pub fn contiguous_all_the_way() -> Result<(), RtcError> {
 
 #[test]
 pub fn not_contiguous() -> Result<(), RtcError> {
-    init_log();
+    let _guard = init_log();
 
     let output = Server::with_vp8_input()
         .skip_packet(14337)
@@ -61,7 +61,7 @@ pub fn not_contiguous() -> Result<(), RtcError> {
 
 #[test]
 pub fn vp9_contiguous_all_the_way() -> Result<(), RtcError> {
-    init_log();
+    let _guard = init_log();
 
     let output = Server::with_vp9_input().get_output()?;
     let mut count = 0;
@@ -82,7 +82,7 @@ pub fn vp9_contiguous_all_the_way() -> Result<(), RtcError> {
 
 #[test]
 pub fn vp9_not_contiguous() -> Result<(), RtcError> {
-    init_log();
+    let _guard = init_log();
 
     let output = Server::with_vp9_input().skip_packet(30952).get_output()?;
     let mut count = 0;

tests/data-channel-direct.rs

@@ -10,7 +10,7 @@ use common::{init_log, progress, TestRtc};
 
 #[test]
 pub fn data_channel_direct() -> Result<(), RtcError> {
-    init_log();
+    let _guard = init_log();
 
     let mut l = TestRtc::new(info_span!("L"));
 

tests/data-channel.rs

@@ -9,7 +9,7 @@ use common::{init_log, progress, TestRtc};
 
 #[test]
 pub fn data_channel() -> Result<(), RtcError> {
-    init_log();
+    let _guard = init_log();
 
     let mut l = TestRtc::new(info_span!("L"));
     let mut r = TestRtc::new(info_span!("R"));

tests/flappy-ice-state.rs

@@ -10,7 +10,7 @@ use common::{init_log, progress, TestRtc};
 
 #[test]
 pub fn flappy_ice_lite_state() -> Result<(), RtcError> {
-    init_log();
+    let _guard = init_log();
 
     let mut l = TestRtc::new(info_span!("L"));
 

tests/ice-restart.rs

@@ -10,7 +10,7 @@ use common::{init_log, progress, TestRtc};
 
 #[test]
 pub fn ice_restart() -> Result<(), RtcError> {
-    init_log();
+    let _guard = init_log();
 
     let mut l = TestRtc::new(info_span!("L"));
 

tests/keyframes.rs

@@ -12,7 +12,7 @@ use common::{init_log, progress, TestRtc};
 
 #[test]
 pub fn test_vp8_keyframes_detection() -> Result<(), RtcError> {
-    init_log();
+    let _guard = init_log();
 
     let mut l = TestRtc::new(info_span!("L"));
     let mut r = TestRtc::new(info_span!("R"));
@@ -103,7 +103,7 @@ pub fn test_vp8_keyframes_detection() -> Result<(), RtcError> {
 
 #[test]
 pub fn test_vp9_keyframes_detection() -> Result<(), RtcError> {
-    init_log();
+    let _guard = init_log();
 
     let mut l = TestRtc::new(info_span!("L"));
     let mut r = TestRtc::new(info_span!("R"));
@@ -195,7 +195,7 @@ pub fn test_vp9_keyframes_detection() -> Result<(), RtcError> {
 
 #[test]
 pub fn test_h264_keyframes_detection() -> Result<(), RtcError> {
-    init_log();
+    let _guard = init_log();
 
     let mut l = TestRtc::new(info_span!("L"));
     let mut r = TestRtc::new(info_span!("R"));

tests/nack.rs

@@ -14,7 +14,7 @@ use crate::common::progress_with_loss;
 
 #[test]
 pub fn loss_recovery() -> Result<(), RtcError> {
-    init_log();
+    let _guard = init_log();
 
     let (mut l, mut r) = connect_l_r();
 
@@ -170,7 +170,7 @@ pub fn loss_recovery() -> Result<(), RtcError> {
 
 #[test]
 pub fn nack_delay() -> Result<(), RtcError> {
-    init_log();
+    let _guard = init_log();
 
     let (mut l, mut r) = connect_l_r();
 

tests/remb.rs

@@ -11,7 +11,7 @@ use common::{init_log, negotiate, progress, TestRtc};
 
 #[test]
 pub fn remb() -> Result<(), RtcError> {
-    init_log();
+    let _guard = init_log();
     let l_rtc = Rtc::builder().build();
     let r_rtc = Rtc::builder().build();
 

tests/repeated.rs

@@ -10,7 +10,7 @@ use common::{connect_l_r, init_log, progress};
 
 #[test]
 pub fn repeated() -> Result<(), RtcError> {
-    init_log();
+    let _guard = init_log();
 
     let (mut l, mut r) = connect_l_r();
 

tests/rtp-direct-mid-rid.rs

@@ -11,7 +11,7 @@ use common::{connect_l_r, init_log, progress};
 
 #[test]
 pub fn rtp_direct_mid_rid() -> Result<(), RtcError> {
-    init_log();
+    let _guard = init_log();
 
     let (mut l, mut r) = connect_l_r();
 

tests/rtp-direct-mid.rs

@@ -11,7 +11,7 @@ use common::{connect_l_r, init_log, progress};
 
 #[test]
 pub fn rtp_direct_mid() -> Result<(), RtcError> {
-    init_log();
+    let _guard = init_log();
 
     let (mut l, mut r) = connect_l_r();
 

tests/rtp-direct-ssrc.rs

@@ -11,7 +11,7 @@ use common::{connect_l_r, init_log, progress};
 
 #[test]
 pub fn rtp_direct_ssrc() -> Result<(), RtcError> {
-    init_log();
+    let _guard = init_log();
 
     let (mut l, mut r) = connect_l_r();
 

tests/rtp-direct-with-roc.rs

@@ -12,7 +12,7 @@ use common::{connect_l_r, init_log, progress};
 
 #[test]
 pub fn rtp_direct_with_roc() -> Result<(), RtcError> {
-    init_log();
+    let _guard = init_log();
 
     let (mut l, mut r) = connect_l_r();
 

tests/rtx-cache-0.rs

@@ -11,7 +11,7 @@ use common::{connect_l_r, init_log, progress};
 
 #[test]
 pub fn rtx_cache_0() -> Result<(), RtcError> {
-    init_log();
+    let _guard = init_log();
 
     let (mut l, mut r) = connect_l_r();