⬆️ upgrade to opentelemtry 0.23

FIXE Support for `[email protected]` #145
davidB · Jun 30, 2024 · 7dfe35b · 7dfe35b
1 parent 8052745
commit 7dfe35b
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 25 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -23,23 +23,24 @@ rust-version = "1.73.0"
 
 [workspace.dependencies]
 http = "^1"
-opentelemetry = { version = "0.22", features = [
+opentelemetry = { version = "0.23", features = [
   "trace",
 ], default-features = false }
-opentelemetry_sdk = { version = "0.22", default-features = false, features = [
+opentelemetry_sdk = { version = "0.23", 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" }
+opentelemetry-aws = { version = "0.11", default-features = false }
+opentelemetry-jaeger = { version = "0.22", default-features = false }
+opentelemetry-jaeger-propagator = { version = "0.2", default-features = false }
+opentelemetry-resource-detectors = { version = "0.2.0", default-features = false }
+opentelemetry-semantic-conventions = { version = "0.15", default-features = false }
+opentelemetry-zipkin = { version = "0.21", default-features = false }
+opentelemetry-otlp = { version = "0.16", default-features = false }
+opentelemetry-proto = { version = "0.6", default-features = false }
+opentelemetry-stdout = { version = "0.4" }
 tonic = { version = "0.11", default-features = false } #should be sync with opentelemetry-proto
 tracing = "0.1"
-tracing-opentelemetry = "0.23"
+tracing-opentelemetry = "0.24"
 
 [profile.dev.package.insta]
 opt-level = 3

diff --git a/examples/axum-otlp/Cargo.toml b/examples/axum-otlp/Cargo.toml
@@ -11,8 +11,8 @@ init-tracing-opentelemetry = { path = "../../init-tracing-opentelemetry", featur
   "otlp",
   "tracing_subscriber_ext",
 ] }
-opentelemetry = "0.22"
-opentelemetry-otlp = { version = "0.14", optional = true }
+opentelemetry = "0.23"
+opentelemetry-otlp = { version = "0.16", optional = true }
 serde_json = "1.0.79"
 tokio = { version = "1.0", features = ["full"] }
 tracing = "0.1"

diff --git a/examples/grpc/Cargo.toml b/examples/grpc/Cargo.toml
@@ -10,23 +10,23 @@ init-tracing-opentelemetry = { path = "../../init-tracing-opentelemetry", featur
   "tracing_subscriber_ext",
   "logfmt",
 ] }
-opentelemetry = "0.22"
+opentelemetry = "0.23"
 prost = "0.12"
 tokio = { version = "1.0", features = ["full"] }
-tonic = { version = "0.10", features = [
+tonic = { version = "0.11", features = [
   "transport",
   "channel",
   "codegen",
 ], default-features = false }
-tonic-health = "0.10"
-tonic-reflection = "0.10"
-tonic-tracing-opentelemetry = "0.15" #{ path = "../../tonic-tracing-opentelemetry" }
+tonic-health = "0.11"
+tonic-reflection = "0.11"
+tonic-tracing-opentelemetry = { path = "../../tonic-tracing-opentelemetry" }
 tower = "0.4"
 tracing = "0.1"
 tracing-opentelemetry-instrumentation-sdk = "0.15" # { path = "../../tracing-opentelemetry-instrumentation-sdk" }
 
 [build-dependencies]
-tonic-build = { version = "0.10", default-features = false, features = [
+tonic-build = { version = "0.11", default-features = false, features = [
   "transport",
   "prost",
 ] }

diff --git a/examples/load/Cargo.toml b/examples/load/Cargo.toml
@@ -10,7 +10,7 @@ init-tracing-opentelemetry = { path = "../../init-tracing-opentelemetry", featur
   "tracing_subscriber_ext",
 ] }
 memory-stats = "1.1"
-opentelemetry = "0.22"
+opentelemetry = "0.23"
 serde_json = "1.0.79"
 tokio = { version = "1.0", features = ["full"] }
 tracing = "0.1"

diff --git a/init-tracing-opentelemetry/Cargo.toml b/init-tracing-opentelemetry/Cargo.toml
@@ -19,6 +19,7 @@ opentelemetry-otlp = { workspace = true, optional = true, features = [
   "grpc-tonic",
   "trace",
 ] }
+opentelemetry-resource-detectors = { workspace = true }
 opentelemetry-stdout = { workspace = true, features = [
   "trace",
 ], optional = true }
@@ -58,7 +59,11 @@ tracing-subscriber = { version = "0.3", default-features = false, features = [
 
 [features]
 jaeger = ["dep:opentelemetry-jaeger-propagator"]
-otlp = ["opentelemetry-otlp/http-proto", "opentelemetry-otlp/reqwest-client", "tracer"]
+otlp = [
+  "opentelemetry-otlp/http-proto",
+  "opentelemetry-otlp/reqwest-client",
+  "tracer",
+]
 stdout = ["dep:opentelemetry-stdout", "tracer"]
 tracer = ["dep:opentelemetry-semantic-conventions"]
 xray = ["dep:opentelemetry-aws"]

diff --git a/init-tracing-opentelemetry/src/resource.rs b/init-tracing-opentelemetry/src/resource.rs
@@ -1,8 +1,6 @@
 use opentelemetry::KeyValue;
-use opentelemetry_sdk::{
-    resource::{OsResourceDetector, ResourceDetector},
-    Resource,
-};
+use opentelemetry_resource_detectors::OsResourceDetector;
+use opentelemetry_sdk::{resource::ResourceDetector, Resource};
 use opentelemetry_semantic_conventions::resource;
 use std::time::Duration;