diff --git a/Cargo.toml b/Cargo.toml index f8cec48..e806163 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,7 @@ traces = ["tracing-opentelemetry", "opentelemetry", "opentelemetry-otlp"] dev = ["traces"] live = ["json-logger", "datadog", "traces"] -rt-tokio-current-thread = ["opentelemetry/rt-tokio-current-thread"] +rt-tokio-current-thread = ["opentelemetry_sdk/rt-tokio-current-thread"] [[example]] name = "custom-json-subscriber" @@ -37,8 +37,9 @@ required-features = ["json-logger"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -opentelemetry = {version = "0.21", features = ["rt-tokio"], optional = true} +opentelemetry = {version = "0.21", optional = true} opentelemetry-otlp = {version = "0.14", features = ["http-proto", "reqwest-client"], default-features = false, optional = true} +opentelemetry_sdk = {version = "0.21", features = ["rt-tokio"], optional = true} tracing = {version = "0.1", features = ["max_level_debug", "release_max_level_info"]} tracing-log = {version = "0.2"} tracing-opentelemetry = {version = "0.22", optional = true} diff --git a/src/subscriber.rs b/src/subscriber.rs index 5a7721f..c0f2902 100644 --- a/src/subscriber.rs +++ b/src/subscriber.rs @@ -58,7 +58,8 @@ pub fn init_subscriber(subscriber: impl Subscriber + Sync + Send) -> Uninstall { #[cfg(feature = "traces")] { - use opentelemetry::{global, sdk::propagation::TraceContextPropagator}; + use opentelemetry::global; + use opentelemetry_sdk::propagation::TraceContextPropagator; global::set_text_map_propagator(TraceContextPropagator::new()); }; Uninstall diff --git a/src/telemetry.rs b/src/telemetry.rs index dd76e6f..02b1dd7 100644 --- a/src/telemetry.rs +++ b/src/telemetry.rs @@ -1,11 +1,9 @@ -use opentelemetry::{ - sdk::{ - trace::{self, Tracer}, - Resource, - }, - KeyValue, -}; +use opentelemetry::KeyValue; use opentelemetry_otlp::WithExportConfig; +use opentelemetry_sdk::{ + trace::{self, Tracer}, + Resource, +}; use tracing::{span, Subscriber}; use tracing_opentelemetry::OtelData; use tracing_subscriber::{layer::Context, Layer}; @@ -21,11 +19,11 @@ pub fn configure(config: &SubscriberConfig) -> Tracer { let runtime = { #[cfg(feature = "rt-tokio-current-thread")] { - opentelemetry::runtime::TokioCurrentThread + opentelemetry_sdk::runtime::TokioCurrentThread } #[cfg(not(feature = "rt-tokio-current-thread"))] { - opentelemetry::runtime::Tokio + opentelemetry_sdk::runtime::Tokio } };