Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
chore(deps): update opentelemetry
  • Loading branch information
renovate[bot] authored and rami3l committed Mar 1, 2025
commit f1198859aa7701beb449d88d6f1a1778119fd6d8
42 changes: 29 additions & 13 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
4 changes: 3 additions & 1 deletion src/bin/rustup-init.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@ async fn main() -> Result<ExitCode> {
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();
opentelemetry::global::set_tracer_provider(
opentelemetry::trace::noop::NoopTracerProvider::new(),
);

match result {
Err(e) => {
Expand Down
11 changes: 5 additions & 6 deletions src/cli/log.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -167,10 +166,10 @@ 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());
Expand Down
4 changes: 3 additions & 1 deletion src/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,8 @@ pub async fn after_test_async() {
#[cfg(feature = "otel")]
{
// We're tracing, so block until all spans are exported.
opentelemetry::global::shutdown_tracer_provider();
opentelemetry::global::set_tracer_provider(
opentelemetry::trace::noop::NoopTracerProvider::new(),
);
}
}