refactor(log): introduce GlobalTelemetryGuard

Author: rami3l

src/bin/rustup-init.rs

@@ -41,18 +41,14 @@ async fn main() -> Result<ExitCode> {
     pre_rustup_main_init();
 
     let process = Process::os();
-    #[cfg(feature = "otel")]
-    opentelemetry::global::set_text_map_propagator(
-        opentelemetry_sdk::propagation::TraceContextPropagator::new(),
-    );
-    let (subscriber, console_filter) = rustup::cli::log::tracing_subscriber(&process);
-    tracing::subscriber::set_global_default(subscriber)?;
-    let result = run_rustup(&process, console_filter).await;
-    // We're tracing, so block until all spans are exported.
-    #[cfg(feature = "otel")]
-    opentelemetry::global::set_tracer_provider(
-        opentelemetry::trace::noop::NoopTracerProvider::new(),
-    );
+    let result = {
+        #[cfg(feature = "otel")]
+        let _telemetry_guard = rustup::cli::log::set_global_telemetry();
+
+        let (subscriber, console_filter) = rustup::cli::log::tracing_subscriber(&process);
+        tracing::subscriber::set_global_default(subscriber)?;
+        run_rustup(&process, console_filter).await
+    };
 
     match result {
         Err(e) => {

src/cli/log.rs

@@ -175,3 +175,27 @@ fn telemetry_default_tracer() -> Tracer {
     global::set_tracer_provider(provider.clone());
     provider.tracer("tracing-otel-subscriber")
 }
+
+#[cfg(feature = "otel")]
+#[must_use]
+pub struct GlobalTelemetryGuard {
+    _private: (),
+}
+
+#[cfg(feature = "otel")]
+pub fn set_global_telemetry() -> GlobalTelemetryGuard {
+    opentelemetry::global::set_text_map_propagator(
+        opentelemetry_sdk::propagation::TraceContextPropagator::new(),
+    );
+    GlobalTelemetryGuard { _private: () }
+}
+
+#[cfg(feature = "otel")]
+impl Drop for GlobalTelemetryGuard {
+    fn drop(&mut self) {
+        // We're tracing, so block until all spans are exported.
+        opentelemetry::global::set_tracer_provider(
+            opentelemetry::trace::noop::NoopTracerProvider::new(),
+        );
+    }
+}