Update opentelemetry

Cargo.toml

@@ -34,6 +34,7 @@ otel = [
     "dep:tracing-opentelemetry",
     "dep:tracing-subscriber",
     "dep:opentelemetry",
+    "dep:opentelemetry_sdk",
     "dep:tokio",
 ]
 
@@ -63,6 +64,7 @@ opener = "0.6.0"
 # allows controlling the vendoring status without exposing the presence of the download crate.
 openssl = { version = "0.10", optional = true }
 opentelemetry = { workspace = true, optional = true }
+opentelemetry_sdk = { workspace = true, optional = true }
 opentelemetry-otlp = { workspace = true, optional = true }
 pulldown-cmark = { version = "0.9", default-features = false }
 rand = "0.8"
@@ -157,16 +159,17 @@ derivative = "2.2.0"
 enum_dispatch = "0.3.11"
 fs_at = "0.1.6"
 once_cell = "1.18.0"
-opentelemetry = { version = "0.20.0", features = ["rt-tokio"] }
-opentelemetry-otlp = { version = "0.13.0" }
+opentelemetry = "0.21.0"
+opentelemetry_sdk = { version = "0.21.0", features = ["rt-tokio"] }
+opentelemetry-otlp = "0.14.0"
 proptest = "1.1.0"
 rustup-macros = { path = "rustup-macros" }
 tempfile = "3.8"
 termcolor = "1.2"
 thiserror = "1.0"
 tokio = { version = "1.26.0", default-features = false, features = ["rt-multi-thread"] }
 tracing = "0.1"
-tracing-opentelemetry = { version = "0.21.0" }
+tracing-opentelemetry = "0.22.0"
 tracing-subscriber = "0.3.16"
 url = "2.4"
 walkdir = "2"

src/bin/rustup-init.rs

@@ -54,13 +54,13 @@ fn maybe_trace_rustup() -> Result<utils::ExitCode> {
     {
         use std::time::Duration;
 
-        use opentelemetry::sdk::{
+        use opentelemetry::{global, KeyValue};
+        use opentelemetry_otlp::WithExportConfig;
+        use opentelemetry_sdk::{
+            propagation::TraceContextPropagator,
             trace::{self, Sampler},
             Resource,
         };
-        use opentelemetry::KeyValue;
-        use opentelemetry::{global, sdk::propagation::TraceContextPropagator};
-        use opentelemetry_otlp::WithExportConfig;
         use tracing_subscriber::{layer::SubscriberExt, EnvFilter, Registry};
 
         // Background submission requires a runtime, and since we're probably
@@ -84,7 +84,7 @@ fn maybe_trace_rustup() -> Result<utils::ExitCode> {
                             "rustup",
                         )])),
                 )
-                .install_batch(opentelemetry::runtime::Tokio)?;
+                .install_batch(opentelemetry_sdk::runtime::Tokio)?;
             let env_filter = EnvFilter::try_from_default_env().unwrap_or(EnvFilter::new("INFO"));
             let telemetry = tracing_opentelemetry::layer().with_tracer(tracer);
             let subscriber = Registry::default().with(env_filter).with(telemetry);

src/test.rs

@@ -233,19 +233,16 @@ static TRACE_RUNTIME: Lazy<tokio::runtime::Runtime> =
     Lazy::new(|| tokio::runtime::Runtime::new().unwrap());
 /// A tracer for the tests.
 #[cfg(feature = "otel")]
-static TRACER: Lazy<opentelemetry::sdk::trace::Tracer> = Lazy::new(|| {
+static TRACER: Lazy<opentelemetry_sdk::trace::Tracer> = Lazy::new(|| {
     use std::time::Duration;
 
-    use opentelemetry::KeyValue;
-    use opentelemetry::{
-        global,
-        sdk::{
-            propagation::TraceContextPropagator,
-            trace::{self, Sampler},
-            Resource,
-        },
-    };
+    use opentelemetry::{global, KeyValue};
     use opentelemetry_otlp::WithExportConfig;
+    use opentelemetry_sdk::{
+        propagation::TraceContextPropagator,
+        trace::{self, Sampler},
+        Resource,
+    };
     use tokio::runtime::Handle;
     use tracing_subscriber::{layer::SubscriberExt, EnvFilter, Registry};
 
@@ -268,7 +265,7 @@ static TRACER: Lazy<opentelemetry::sdk::trace::Tracer> = Lazy::new(|| {
                 .with_sampler(Sampler::AlwaysOn)
                 .with_resource(Resource::new(vec![KeyValue::new("service.name", "rustup")])),
         )
-        .install_batch(opentelemetry::runtime::Tokio)
+        .install_batch(opentelemetry_sdk::runtime::Tokio)
         .unwrap();
 
     global::set_text_map_propagator(TraceContextPropagator::new());