Skip to content

Commit bd5ce47

Browse files
djcrami3l
authored andcommitted
Upgrade to opentelemetry 0.27
1 parent c483273 commit bd5ce47

File tree

3 files changed

+29
-26
lines changed

3 files changed

+29
-26
lines changed

Cargo.lock

+12-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,9 @@ license = "MIT OR Apache-2.0"
144144
[workspace.dependencies]
145145
anyhow = "1.0.69"
146146
fs_at = "0.2.1"
147-
opentelemetry = "0.26"
148-
opentelemetry-otlp = "0.26"
149-
opentelemetry_sdk = { version = "0.26", features = ["rt-tokio"] }
147+
opentelemetry = "0.27"
148+
opentelemetry-otlp = "0.27"
149+
opentelemetry_sdk = { version = "0.27", features = ["rt-tokio"] }
150150
platforms = "3.4"
151151
proptest = "1.1.0"
152152
tempfile = "3.8"
@@ -156,7 +156,7 @@ tokio = { version = "1.26.0", default-features = false, features = ["macros", "r
156156
tokio-retry = { version = "0.3.0" }
157157
tokio-stream = { version = "0.1.14" }
158158
tracing = "0.1"
159-
tracing-opentelemetry = "0.27"
159+
tracing-opentelemetry = "0.28"
160160
tracing-subscriber = "0.3.16"
161161
url = "2.4"
162162
walkdir = "2"

src/cli/log.rs

+13-12
Original file line numberDiff line numberDiff line change
@@ -152,27 +152,28 @@ where
152152
fn telemetry_default_tracer() -> Tracer {
153153
use std::time::Duration;
154154

155-
use opentelemetry::{global, trace::TracerProvider, KeyValue};
155+
use opentelemetry::{global, trace::TracerProvider as _, KeyValue};
156156
use opentelemetry_otlp::WithExportConfig;
157157
use opentelemetry_sdk::{
158-
trace::{Config, Sampler},
158+
runtime::Tokio,
159+
trace::{Config, Sampler, TracerProvider},
159160
Resource,
160161
};
161162

162-
let provider = opentelemetry_otlp::new_pipeline()
163-
.tracing()
164-
.with_exporter(
165-
opentelemetry_otlp::new_exporter()
166-
.tonic()
167-
.with_timeout(Duration::from_secs(3)),
168-
)
169-
.with_trace_config(
163+
let exporter = opentelemetry_otlp::SpanExporter::builder()
164+
.with_tonic()
165+
.with_timeout(Duration::from_secs(3))
166+
.build()
167+
.unwrap();
168+
169+
let provider = TracerProvider::builder()
170+
.with_config(
170171
Config::default()
171172
.with_sampler(Sampler::AlwaysOn)
172173
.with_resource(Resource::new(vec![KeyValue::new("service.name", "rustup")])),
173174
)
174-
.install_batch(opentelemetry_sdk::runtime::Tokio)
175-
.expect("error installing `OtlpTracePipeline` in the current `tokio` runtime");
175+
.with_batch_exporter(exporter, Tokio)
176+
.build();
176177

177178
global::set_tracer_provider(provider.clone());
178179
provider.tracer("tracing-otel-subscriber")

0 commit comments

Comments
 (0)