Skip to content

Commit 238e472

Browse files
renovate[bot]rami3l
authored andcommitted
chore(deps): update opentelemetry
1 parent fe3fd88 commit 238e472

File tree

5 files changed

+44
-25
lines changed

5 files changed

+44
-25
lines changed

Cargo.lock

Lines changed: 29 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,9 @@ license = "MIT OR Apache-2.0"
137137
[workspace.dependencies]
138138
anyhow = "1.0.69"
139139
fs_at = "0.2.1"
140-
opentelemetry = "0.27"
141-
opentelemetry-otlp = "0.27"
142-
opentelemetry_sdk = { version = "0.27", features = ["rt-tokio"] }
140+
opentelemetry = "0.28"
141+
opentelemetry-otlp = { version = "0.28", features = ["grpc-tonic"] }
142+
opentelemetry_sdk = { version = "0.28", features = ["rt-tokio"] }
143143
platforms = "3.4"
144144
proptest = "1.1.0"
145145
tempfile = "3.8"
@@ -149,7 +149,7 @@ tokio = { version = "1.26.0", default-features = false, features = ["macros", "r
149149
tokio-retry = { version = "0.3.0" }
150150
tokio-stream = { version = "0.1.14" }
151151
tracing = "0.1"
152-
tracing-opentelemetry = "0.28"
152+
tracing-opentelemetry = "0.29"
153153
tracing-subscriber = "0.3.16"
154154
url = "2.4"
155155
walkdir = "2"

src/bin/rustup-init.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@ async fn main() -> Result<ExitCode> {
5050
let result = run_rustup(&process, console_filter).await;
5151
// We're tracing, so block until all spans are exported.
5252
#[cfg(feature = "otel")]
53-
opentelemetry::global::shutdown_tracer_provider();
53+
opentelemetry::global::set_tracer_provider(
54+
opentelemetry::trace::noop::NoopTracerProvider::new(),
55+
);
5456

5557
match result {
5658
Err(e) => {

src/cli/log.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -153,12 +153,11 @@ where
153153
fn telemetry_default_tracer() -> Tracer {
154154
use std::time::Duration;
155155

156-
use opentelemetry::{KeyValue, global, trace::TracerProvider as _};
156+
use opentelemetry::{global, trace::TracerProvider as _};
157157
use opentelemetry_otlp::WithExportConfig;
158158
use opentelemetry_sdk::{
159159
Resource,
160-
runtime::Tokio,
161-
trace::{Sampler, TracerProvider},
160+
trace::{Sampler, SdkTracerProvider},
162161
};
163162

164163
let exporter = opentelemetry_otlp::SpanExporter::builder()
@@ -167,10 +166,10 @@ fn telemetry_default_tracer() -> Tracer {
167166
.build()
168167
.unwrap();
169168

170-
let provider = TracerProvider::builder()
169+
let provider = SdkTracerProvider::builder()
171170
.with_sampler(Sampler::AlwaysOn)
172-
.with_resource(Resource::new(vec![KeyValue::new("service.name", "rustup")]))
173-
.with_batch_exporter(exporter, Tokio)
171+
.with_resource(Resource::builder().with_service_name("rustup").build())
172+
.with_batch_exporter(exporter)
174173
.build();
175174

176175
global::set_tracer_provider(provider.clone());

src/test.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,8 @@ pub async fn after_test_async() {
245245
#[cfg(feature = "otel")]
246246
{
247247
// We're tracing, so block until all spans are exported.
248-
opentelemetry::global::shutdown_tracer_provider();
248+
opentelemetry::global::set_tracer_provider(
249+
opentelemetry::trace::noop::NoopTracerProvider::new(),
250+
);
249251
}
250252
}

0 commit comments

Comments
 (0)