re-export tracing for internal-logs

Author: gruebel

opentelemetry-http/Cargo.toml

@@ -14,7 +14,7 @@ default = ["internal-logs"]
 hyper = ["dep:http-body-util", "dep:hyper", "dep:hyper-util", "dep:tokio"]
 reqwest-rustls = ["reqwest", "reqwest/rustls-tls-native-roots"]
 reqwest-rustls-webpki-roots = ["reqwest", "reqwest/rustls-tls-webpki-roots"]
-internal-logs = ["tracing", "opentelemetry/internal-logs"]
+internal-logs = ["opentelemetry/internal-logs"]
 
 [dependencies]
 async-trait = { workspace = true }
@@ -26,12 +26,6 @@ hyper-util = { workspace = true, features = ["client-legacy", "http1", "http2"],
 opentelemetry = { version = "0.29", path = "../opentelemetry", features = ["trace"] }
 reqwest = { workspace = true, features = ["blocking"], optional = true }
 tokio = { workspace = true, features = ["time"], optional = true }
-tracing = {workspace = true, optional = true}
-
-[package.metadata.cargo-machete]
-ignored = [
-    "tracing" # needed for `internal-logs`
-]
 
 [lints]
 workspace = true

opentelemetry-jaeger-propagator/Cargo.toml

@@ -23,19 +23,13 @@ rustdoc-args = ["--cfg", "docsrs"]
 opentelemetry = { version = "0.29", default-features = false, features = [
     "trace",
 ], path = "../opentelemetry" }
-tracing = {workspace = true, optional = true} # optional for opentelemetry internal logging
 
 [dev-dependencies]
 opentelemetry = { features = ["testing"], path = "../opentelemetry" }
 
 [features]
 default = ["internal-logs"]
-internal-logs = ["tracing"]
-
-[package.metadata.cargo-machete]
-ignored = [
-    "tracing" # needed for `internal-logs`
-]
+internal-logs = []
 
 [lints]
 workspace = true

opentelemetry-proto/Cargo.toml

@@ -44,7 +44,7 @@ zpages = ["trace"]
 testing = ["opentelemetry/testing"]
 
 # add ons
-internal-logs = ["tracing"]
+internal-logs = []
 with-schemars = ["schemars"]
 with-serde = ["serde", "hex", "base64"]
 
@@ -56,7 +56,6 @@ opentelemetry_sdk = { version = "0.29", default-features = false, path = "../ope
 schemars = { workspace = true, optional = true }
 serde = { workspace = true, optional = true, features = ["serde_derive"] }
 hex = { workspace = true, optional = true }
-tracing = {workspace = true, optional = true} # optional for opentelemetry internal logging
 base64 = { workspace = true, optional = true }
 
 [dev-dependencies]
@@ -66,10 +65,5 @@ prost-build = { workspace = true }
 tempfile = { workspace = true }
 serde_json = { workspace = true }
 
-[package.metadata.cargo-machete]
-ignored = [
-    "tracing" # needed for `internal-logs`
-]
-
 [lints]
 workspace = true

opentelemetry-sdk/Cargo.toml

@@ -25,7 +25,6 @@ url = { workspace = true, optional = true }
 tokio = { workspace = true, features = ["rt", "time"], optional = true }
 tokio-stream = { workspace = true, optional = true }
 http = { workspace = true, optional = true }
-tracing = {workspace = true, optional = true}
 
 [package.metadata.docs.rs]
 all-features = true
@@ -50,19 +49,14 @@ testing = ["opentelemetry/testing", "trace", "metrics", "logs", "rt-tokio", "rt-
 experimental_async_runtime = []
 rt-tokio = ["tokio", "tokio-stream", "experimental_async_runtime"]
 rt-tokio-current-thread = ["tokio", "tokio-stream", "experimental_async_runtime"]
-internal-logs = ["tracing"]
+internal-logs = []
 experimental_metrics_periodicreader_with_async_runtime = ["metrics"]
 spec_unstable_metrics_views = ["metrics"]
 experimental_logs_batch_log_processor_with_async_runtime = ["logs"]
 experimental_logs_concurrent_log_processor = ["logs"]
 experimental_trace_batch_span_processor_with_async_runtime = ["trace"]
 experimental_metrics_disable_name_validation = ["metrics"]
 
-[package.metadata.cargo-machete]
-ignored = [
-    "tracing" # needed for `internal-logs`
-]
-
 [[bench]]
 name = "context"
 harness = false

opentelemetry/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## vNext
 
+- re-export `tracing` for `internal-logs` feature to remove the need of adding `tracing` as a dependency
+
 ## 0.29.0
 
 Released 2025-Mar-21

opentelemetry/src/global/internal_logging.rs

@@ -26,7 +26,7 @@ macro_rules! otel_info {
     (name: $name:expr $(,)?) => {
         #[cfg(feature = "internal-logs")]
         {
-            tracing::info!( name: $name, target: env!("CARGO_PKG_NAME"), name = $name, "");
+            $crate::info!( name: $name, target: env!("CARGO_PKG_NAME"), name = $name, "");
         }
 
         #[cfg(test)]
@@ -42,7 +42,7 @@ macro_rules! otel_info {
     (name: $name:expr, $($key:ident = $value:expr),+ $(,)?) => {
         #[cfg(feature = "internal-logs")]
         {
-            tracing::info!(name: $name, target: env!("CARGO_PKG_NAME"), name = $name, $($key = $value),+, "");
+            $crate::info!(name: $name, target: env!("CARGO_PKG_NAME"), name = $name, $($key = $value),+, "");
         }
 
         #[cfg(test)]
@@ -77,7 +77,7 @@ macro_rules! otel_warn {
     (name: $name:expr $(,)?) => {
         #[cfg(feature = "internal-logs")]
         {
-            tracing::warn!(name: $name, target: env!("CARGO_PKG_NAME"), name = $name, "");
+            $crate::warn!(name: $name, target: env!("CARGO_PKG_NAME"), name = $name, "");
         }
 
         #[cfg(test)]
@@ -93,7 +93,7 @@ macro_rules! otel_warn {
     (name: $name:expr, $($key:ident = $value:expr),+ $(,)?) => {
         #[cfg(feature = "internal-logs")]
         {
-            tracing::warn!(name: $name,
+            $crate::warn!(name: $name,
                             target: env!("CARGO_PKG_NAME"),
                             name = $name,
                             $($key = {
@@ -135,7 +135,7 @@ macro_rules! otel_debug {
     (name: $name:expr $(,)?) => {
         #[cfg(feature = "internal-logs")]
         {
-            tracing::debug!(name: $name, target: env!("CARGO_PKG_NAME"), name = $name, "");
+            $crate::debug!(name: $name, target: env!("CARGO_PKG_NAME"), name = $name, "");
         }
 
         #[cfg(test)]
@@ -151,7 +151,7 @@ macro_rules! otel_debug {
     (name: $name:expr, $($key:ident = $value:expr),+ $(,)?) => {
         #[cfg(feature = "internal-logs")]
         {
-            tracing::debug!(name: $name, target: env!("CARGO_PKG_NAME"), name = $name, $($key = $value),+, "");
+            $crate::debug!(name: $name, target: env!("CARGO_PKG_NAME"), name = $name, $($key = $value),+, "");
         }
 
         #[cfg(test)]
@@ -186,7 +186,7 @@ macro_rules! otel_error {
     (name: $name:expr $(,)?) => {
         #[cfg(feature = "internal-logs")]
         {
-            tracing::error!(name: $name, target: env!("CARGO_PKG_NAME"), name = $name, "");
+            $crate::error!(name: $name, target: env!("CARGO_PKG_NAME"), name = $name, "");
         }
 
         #[cfg(test)]
@@ -202,7 +202,7 @@ macro_rules! otel_error {
     (name: $name:expr, $($key:ident = $value:expr),+ $(,)?) => {
         #[cfg(feature = "internal-logs")]
         {
-            tracing::error!(name: $name,
+            $crate::error!(name: $name,
                             target: env!("CARGO_PKG_NAME"),
                             name = $name,
                             $($key = {

opentelemetry/src/lib.rs

@@ -299,3 +299,6 @@ pub mod time {
         SystemTime::UNIX_EPOCH + std::time::Duration::from_millis(js_sys::Date::now() as u64)
     }
 }
+
+#[cfg(feature = "internal-logs")]
+pub use tracing::{debug, error, info, warn}; // re-export