Skip to content

Commit 99544c4

Browse files
authored
deps(metrics-example): update opentelemetry to 0.27
this will help fix the `cargo deny` situation as `opentelemetry-otlp` `0.25` has `tokio` [locked to `~1.38.0`](https://crates.io/crates/opentelemetry-otlp/0.25.0/dependencies) 🤷‍♂️ which then impedes us tfrom updating `netlink-sys` Pull-Request: libp2p#5735.
1 parent cda1470 commit 99544c4

File tree

3 files changed

+40
-35
lines changed

3 files changed

+40
-35
lines changed

Cargo.lock

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

examples/metrics/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ release = false
1212
futures = { workspace = true }
1313
axum = "0.7"
1414
libp2p = { path = "../../libp2p", features = ["tokio", "metrics", "ping", "noise", "identify", "tcp", "yamux", "macros"] }
15-
opentelemetry = { version = "0.25.0", features = ["metrics"] }
16-
opentelemetry-otlp = { version = "0.25.0", features = ["metrics"] }
17-
opentelemetry_sdk = { version = "0.25.0", features = ["rt-tokio", "metrics"] }
15+
opentelemetry = { version = "0.27.0", features = ["metrics"] }
16+
opentelemetry-otlp = { version = "0.27.0", features = ["metrics"] }
17+
opentelemetry_sdk = { version = "0.27.0", features = ["rt-tokio", "metrics"] }
1818
prometheus-client = { workspace = true }
1919
tokio = { workspace = true, features = ["full"] }
2020
tracing = { workspace = true }
21-
tracing-opentelemetry = "0.26.0"
21+
tracing-opentelemetry = "0.28.0"
2222
tracing-subscriber = { workspace = true, features = ["env-filter"] }
2323

2424
[lints]

examples/metrics/src/main.rs

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ use libp2p::{
3131
swarm::{NetworkBehaviour, SwarmEvent},
3232
tcp, yamux,
3333
};
34-
use opentelemetry::{trace::TracerProvider, KeyValue};
34+
use opentelemetry::{trace::TracerProvider as _, KeyValue};
35+
use opentelemetry_otlp::SpanExporter;
36+
use opentelemetry_sdk::{runtime, trace::TracerProvider};
3537
use prometheus_client::registry::Registry;
3638
use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt, EnvFilter, Layer};
3739

@@ -92,14 +94,16 @@ async fn main() -> Result<(), Box<dyn Error>> {
9294
}
9395

9496
fn setup_tracing() -> Result<(), Box<dyn Error>> {
95-
let provider = opentelemetry_otlp::new_pipeline()
96-
.tracing()
97-
.with_exporter(opentelemetry_otlp::new_exporter().tonic())
98-
.with_trace_config(opentelemetry_sdk::trace::Config::default().with_resource(
99-
opentelemetry_sdk::Resource::new(vec![KeyValue::new("service.name", "libp2p")]),
100-
))
101-
.install_batch(opentelemetry_sdk::runtime::Tokio)?;
102-
97+
let provider = TracerProvider::builder()
98+
.with_batch_exporter(
99+
SpanExporter::builder().with_tonic().build()?,
100+
runtime::Tokio,
101+
)
102+
.with_resource(opentelemetry_sdk::Resource::new(vec![KeyValue::new(
103+
"service.name",
104+
"libp2p",
105+
)]))
106+
.build();
103107
tracing_subscriber::registry()
104108
.with(tracing_subscriber::fmt::layer().with_filter(EnvFilter::from_default_env()))
105109
.with(

0 commit comments

Comments
 (0)