chore(deps): update opentelemetry

Cargo.toml

@@ -137,9 +137,9 @@ license = "MIT OR Apache-2.0"
 [workspace.dependencies]
 anyhow = "1.0.69"
 fs_at = "0.2.1"
-opentelemetry = "0.27"
-opentelemetry-otlp = "0.27"
-opentelemetry_sdk = { version = "0.27", features = ["rt-tokio"] }
+opentelemetry = "0.28"
+opentelemetry-otlp = { version = "0.28", features = ["grpc-tonic"] }
+opentelemetry_sdk = { version = "0.28", features = ["rt-tokio"] }
 platforms = "3.4"
 proptest = "1.1.0"
 tempfile = "3.8"
@@ -149,7 +149,7 @@ tokio = { version = "1.26.0", default-features = false, features = ["macros", "r
 tokio-retry = { version = "0.3.0" }
 tokio-stream = { version = "0.1.14" }
 tracing = "0.1"
-tracing-opentelemetry = "0.28"
+tracing-opentelemetry = "0.29"
 tracing-subscriber = "0.3.16"
 url = "2.4"
 walkdir = "2"

src/bin/rustup-init.rs

@@ -24,6 +24,7 @@ use rs_tracing::{
 use tracing_subscriber::{EnvFilter, Registry, reload::Handle};
 
 use rustup::cli::common;
+use rustup::cli::log;
 use rustup::cli::proxy_mode;
 use rustup::cli::rustup_mode;
 #[cfg(windows)]
@@ -41,16 +42,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::shutdown_tracer_provider();
+    let result = {
+        #[cfg(feature = "otel")]
+        let _telemetry_guard = log::set_global_telemetry();
+
+        let (subscriber, console_filter) = log::tracing_subscriber(&process);
+        tracing::subscriber::set_global_default(subscriber)?;
+        run_rustup(&process, console_filter).await
+    };
 
     match result {
         Err(e) => {

src/cli/log.rs

@@ -153,12 +153,11 @@ where
 fn telemetry_default_tracer() -> Tracer {
     use std::time::Duration;
 
-    use opentelemetry::{KeyValue, global, trace::TracerProvider as _};
+    use opentelemetry::{global, trace::TracerProvider as _};
     use opentelemetry_otlp::WithExportConfig;
     use opentelemetry_sdk::{
         Resource,
-        runtime::Tokio,
-        trace::{Sampler, TracerProvider},
+        trace::{Sampler, SdkTracerProvider},
     };
 
     let exporter = opentelemetry_otlp::SpanExporter::builder()
@@ -167,12 +166,36 @@ fn telemetry_default_tracer() -> Tracer {
         .build()
         .unwrap();
 
-    let provider = TracerProvider::builder()
+    let provider = SdkTracerProvider::builder()
         .with_sampler(Sampler::AlwaysOn)
-        .with_resource(Resource::new(vec![KeyValue::new("service.name", "rustup")]))
-        .with_batch_exporter(exporter, Tokio)
+        .with_resource(Resource::builder().with_service_name("rustup").build())
+        .with_batch_exporter(exporter)
         .build();
 
     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(),
+        );
+    }
+}

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>,
-    _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,7 +243,9 @@ impl From<TestContext> for TestProcess {
         Self {
             process: inner,
             console_filter,
-            _guard: tracing_subscriber.set_default(),
+            #[cfg(feature = "otel")]
+            _telemetry_guard: log::set_global_telemetry(),
+            _tracing_guard: tracing_subscriber.set_default(),
         }
     }
 }

src/test.rs

@@ -231,20 +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::shutdown_tracer_provider();
-    }
-}