chore(o11y): update opentelemetry from 0.21 to 0.22

ymgyt · Mar 8, 2024 · b874c1d · b874c1d
1 parent 20c071e
commit b874c1d
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 43 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/synd_o11y/Cargo.toml b/crates/synd_o11y/Cargo.toml
@@ -15,17 +15,17 @@ version     = "0.1.3"
 [dependencies]
 axum                               = { workspace = true }
 http                               = { workspace = true }
-opentelemetry                      = { version = "0.21.0" }
-opentelemetry-appender-tracing     = { version = "0.2.0", default-features = false }                                                         # disable logs_level_enabled which affect global filtering
-opentelemetry-http                 = { version = "0.10.0" }
-opentelemetry-otlp                 = { version = "0.14.0", default-features = false, features = ["trace", "metrics", "logs", "grpc-tonic"] }
-opentelemetry-semantic-conventions = { version = "0.13.0" }
-opentelemetry_sdk                  = { version = "0.21.2", features = ["logs", "rt-tokio"] }
+opentelemetry                      = { version = "0.22.0" }
+opentelemetry-appender-tracing     = { version = "0.3.0", default-features = false }                                                         # disable logs_level_enabled which affect global filtering
+opentelemetry-http                 = { version = "0.11.0" }
+opentelemetry-otlp                 = { version = "0.15.0", default-features = false, features = ["trace", "metrics", "logs", "grpc-tonic"] }
+opentelemetry-semantic-conventions = { version = "0.14.0" }
+opentelemetry_sdk                  = { version = "0.22.1", features = ["logs", "rt-tokio"] }
 rand                               = { workspace = true }
 reqwest                            = { workspace = true }
 serde                              = { workspace = true, features = ["derive"] }
 tracing                            = { workspace = true }
-tracing-opentelemetry              = { version = "0.22.0" }
+tracing-opentelemetry              = { version = "0.23.0" }
 tracing-subscriber                 = { workspace = true }
 
 [lints]

diff --git a/crates/synd_o11y/src/opentelemetry/guard.rs b/crates/synd_o11y/src/opentelemetry/guard.rs
@@ -4,7 +4,8 @@ pub struct OpenTelemetryGuard;
 impl Drop for OpenTelemetryGuard {
     fn drop(&mut self) {
         opentelemetry::global::shutdown_tracer_provider();
-        opentelemetry::global::shutdown_meter_provider();
+        // global shutdown meter provider api removed in 0.22
+        // opentelemetry::global::shutdown_meter_provider();
         opentelemetry::global::shutdown_logger_provider();
     }
 }
diff --git a/crates/synd_o11y/src/opentelemetry/propagation.rs b/crates/synd_o11y/src/opentelemetry/propagation.rs
@@ -1,6 +1,5 @@
-use opentelemetry_sdk::propagation::{
-    BaggagePropagator, TextMapCompositePropagator, TraceContextPropagator,
-};
+use opentelemetry::propagation::TextMapCompositePropagator;
+use opentelemetry_sdk::propagation::{BaggagePropagator, TraceContextPropagator};
 
 pub mod extension {
     pub use opentelemetry::baggage::BaggageExt as _;

diff --git a/crates/synd_o11y/src/tracing_subscriber/otel_metrics/mod.rs b/crates/synd_o11y/src/tracing_subscriber/otel_metrics/mod.rs
@@ -8,7 +8,7 @@ use opentelemetry_otlp::WithExportConfig as _;
 use opentelemetry_sdk::{
     metrics::{
         reader::{DefaultAggregationSelector, DefaultTemporalitySelector},
-        Instrument, MeterProvider as SdkMeterProvider, PeriodicReader, Stream, View,
+        Instrument, PeriodicReader, SdkMeterProvider, Stream, View,
     },
     runtime, Resource,
 };