refactor(test): replace (before|after)_test_async() with TestProcess::_telemetry_guard

Author: rami3l

src/process.rs

@@ -20,6 +20,9 @@ use tracing_subscriber::util::SubscriberInitExt;
 #[cfg(feature = "test")]
 use tracing_subscriber::{EnvFilter, Registry, reload::Handle};
 
+#[cfg(all(feature = "test", feature = "otel"))]
+use crate::cli::log;
+
 pub mod filesource;
 pub mod terminalsource;
 
@@ -180,7 +183,10 @@ impl Default for OsProcess {
 pub struct TestProcess {
     pub process: Process,
     pub console_filter: Handle<EnvFilter, Registry>,
-    _tracing_guard: DefaultGuard, // guard is dropped at the end of the test
+    // These guards are dropped _in order_ at the end of the test.
+    #[cfg(feature = "otel")]
+    _telemetry_guard: log::GlobalTelemetryGuard,
+    _tracing_guard: DefaultGuard,
 }
 
 #[cfg(feature = "test")]
@@ -237,6 +243,8 @@ impl From<TestContext> for TestProcess {
         Self {
             process: inner,
             console_filter,
+            #[cfg(feature = "otel")]
+            _telemetry_guard: log::set_global_telemetry(),
             _tracing_guard: tracing_subscriber.set_default(),
         }
     }

src/test.rs

@@ -231,22 +231,3 @@ where
     let rustup_home = RustupHome::new_in(test_dir)?;
     f(&rustup_home)
 }
-
-pub async fn before_test_async() {
-    #[cfg(feature = "otel")]
-    {
-        opentelemetry::global::set_text_map_propagator(
-            opentelemetry_sdk::propagation::TraceContextPropagator::new(),
-        );
-    }
-}
-
-pub async fn after_test_async() {
-    #[cfg(feature = "otel")]
-    {
-        // We're tracing, so block until all spans are exported.
-        opentelemetry::global::set_tracer_provider(
-            opentelemetry::trace::noop::NoopTracerProvider::new(),
-        );
-    }
-}