⬆️ upgrade to opentelemtry 0.22 (and related crate)

Signed-off-by: David Bernard <[email protected]>

Cargo.toml

@@ -23,16 +23,23 @@ rust-version = "1.73.0"
 
 [workspace.dependencies]
 http = "^1"
-opentelemetry = { version = "0.21", features = [
+opentelemetry = { version = "0.22", features = [
   "trace",
 ], default-features = false }
-opentelemetry-otlp = { version = "0.14", default-features = false }
-opentelemetry-proto = { version = "0.4", default-features = false }
-opentelemetry_sdk = { version = "0.21", default-features = false, features = [
+opentelemetry_sdk = { version = "0.22", default-features = false, features = [
   "rt-tokio",
 ] }
+opentelemetry-aws = { version = "0.10", default-features = false }
+opentelemetry-jaeger = { version = "0.21", default-features = false }
+opentelemetry-jaeger-propagator = { version = "0.1", default-features = false }
+opentelemetry-semantic-conventions = { version = "0.14", default-features = false }
+opentelemetry-zipkin = { version = "0.20", default-features = false }
+opentelemetry-otlp = { version = "0.15", default-features = false }
+opentelemetry-proto = { version = "0.5", default-features = false }
+opentelemetry-stdout = { version = "0.3" }
+tonic = { version = "0.11", default-features = false } #should be sync with opentelemetry-proto
 tracing = "0.1"
-tracing-opentelemetry = "0.22"
+tracing-opentelemetry = "0.23"
 
 [profile.dev.package.insta]
 opt-level = 3

fake-opentelemetry-collector/Cargo.toml

@@ -25,10 +25,9 @@ opentelemetry_sdk = { workspace = true, features = [
 serde = { version = "1.0.136", features = ["derive"] }
 tokio = { version = "1.27", features = ["full"] }
 tokio-stream = { version = "0.1", features = ["net"] }
-tonic = "0.9" #should be sync with opentelemetry-proto
+tonic = { workspace = true }
 tracing = { workspace = true }
 
 [dev-dependencies]
 assert2 = "0.3"
-hyper = "0.14"
 insta = { version = "1.29.0", features = ["yaml", "redactions"] }

init-tracing-opentelemetry/Cargo.toml

@@ -13,19 +13,20 @@ license.workspace = true
 
 [dependencies]
 opentelemetry = { workspace = true }
-opentelemetry-aws = { version = "0.9", optional = true }
-opentelemetry-jaeger = { version = "0.20", features = [
+opentelemetry-aws = { workspace = true, optional = true }
+opentelemetry-jaeger = { workspace = true, features = [
   "rt-tokio",
 ], optional = true }
-opentelemetry-otlp = { version = "0.14", optional = true }
-opentelemetry-stdout = { version = "0.2", features = [
+opentelemetry-jaeger-propagator = { workspace = true, optional = true }
+opentelemetry-otlp = { workspace = true, optional = true }
+opentelemetry-stdout = { workspace = true, features = [
   "trace",
 ], optional = true }
-opentelemetry-semantic-conventions = { version = "0.13", optional = true }
-opentelemetry-zipkin = { version = "0.19", features = [], optional = true }
+opentelemetry-semantic-conventions = { workspace = true, optional = true }
+opentelemetry-zipkin = { workspace = true, features = [], optional = true }
 opentelemetry_sdk = { workspace = true }
 thiserror = "1.0"
-tonic = { version = "0.9", optional = true, features = ["tls"] }
+tonic = { workspace = true, optional = true, features = ["tls"] }
 tracing = { workspace = true }
 tracing-logfmt-otel = { version = "0.2", optional = true }
 tracing-opentelemetry = { workspace = true }
@@ -56,7 +57,11 @@ tracing-subscriber = { version = "0.3", default-features = false, features = [
 ] }
 
 [features]
-jaeger = ["dep:opentelemetry-jaeger", "tracer"]
+jaeger = [
+  "dep:opentelemetry-jaeger",
+  "dep:opentelemetry-jaeger-propagator",
+  "tracer",
+]
 otlp = ["opentelemetry-otlp/http-proto", "tracer"]
 stdout = ["dep:opentelemetry-stdout", "tracer"]
 tracer = ["dep:opentelemetry-semantic-conventions"]

init-tracing-opentelemetry/src/jaeger.rs

@@ -20,7 +20,7 @@ where
     F: FnOnce(AgentPipeline) -> AgentPipeline,
 {
     let mut pipeline = opentelemetry_jaeger::new_agent_pipeline();
-    if let Some(name) = resource.get(semcov::resource::SERVICE_NAME) {
+    if let Some(name) = resource.get(semcov::resource::SERVICE_NAME.into()) {
         pipeline = pipeline.with_service_name(name.to_string());
     }
     pipeline = pipeline.with_trace_config(

init-tracing-opentelemetry/src/lib.rs

@@ -9,11 +9,9 @@
 mod error;
 pub use error::Error;
 
-use opentelemetry::propagation::TextMapPropagator;
+use opentelemetry::propagation::{TextMapCompositePropagator, TextMapPropagator};
 use opentelemetry::trace::TraceError;
-use opentelemetry_sdk::propagation::{
-    BaggagePropagator, TextMapCompositePropagator, TraceContextPropagator,
-};
+use opentelemetry_sdk::propagation::{BaggagePropagator, TraceContextPropagator};
 
 #[cfg(feature = "jaeger")]
 pub mod jaeger;
@@ -96,7 +94,7 @@ fn propagator_from_string(
         )),
         #[cfg(feature = "jaeger")]
         "jaeger" => Ok(Some(Box::new(
-            opentelemetry_jaeger::Propagator::default()
+            opentelemetry_jaeger_propagator::Propagator::default()
         ))),
         #[cfg(not(feature = "jaeger"))]
         "jaeger" => Err(TraceError::from(

init-tracing-opentelemetry/src/resource.rs

@@ -1,8 +1,9 @@
+use opentelemetry::KeyValue;
 use opentelemetry_sdk::{
     resource::{OsResourceDetector, ResourceDetector},
     Resource,
 };
-use opentelemetry_semantic_conventions as semcov;
+use opentelemetry_semantic_conventions::resource;
 use std::time::Duration;
 
 /// To log detected value set environement variable `RUST_LOG="...,otel::setup::resource=debug"`
@@ -83,15 +84,15 @@ impl ResourceDetector for ServiceInfoDetector {
                 self.fallback_service_name
                     .map(std::string::ToString::to_string)
             })
-            .map(|v| semcov::resource::SERVICE_NAME.string(v));
+            .map(|v| KeyValue::new(resource::SERVICE_NAME, v));
         let service_version = std::env::var("SERVICE_VERSION")
             .or_else(|_| std::env::var("APP_VERSION"))
             .ok()
             .or_else(|| {
                 self.fallback_service_version
                     .map(std::string::ToString::to_string)
             })
-            .map(|v| semcov::resource::SERVICE_VERSION.string(v));
+            .map(|v| KeyValue::new(resource::SERVICE_VERSION, v));
         Resource::new(vec![service_name, service_version].into_iter().flatten())
     }
 }

tracing-opentelemetry-instrumentation-sdk/Cargo.toml

@@ -17,7 +17,6 @@ license.workspace = true
 
 [dependencies]
 http = { workspace = true, optional = true }
-# opentelemetry-semantic-conventions = { version = "0.11" }
 opentelemetry = { workspace = true }
 tracing = { workspace = true }
 tracing-opentelemetry = { workspace = true }