From efaaa7eae08041ceaf823a4961d58ee9301f01d9 Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Wed, 12 Feb 2025 09:21:52 -0800 Subject: [PATCH 1/3] fix doc test --- opentelemetry/src/logs/logger.rs | 2 +- opentelemetry/src/propagation/composite.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/opentelemetry/src/logs/logger.rs b/opentelemetry/src/logs/logger.rs index ae04946eec..c1ef610f3d 100644 --- a/opentelemetry/src/logs/logger.rs +++ b/opentelemetry/src/logs/logger.rs @@ -36,7 +36,7 @@ pub trait LoggerProvider { /// ``` /// use opentelemetry::InstrumentationScope; /// use opentelemetry::logs::LoggerProvider; - /// use opentelemetry_sdk::logs::LoggerProvider as SdkLoggerProvider; + /// use opentelemetry_sdk::logs::SdkLoggerProvider; /// /// let provider = SdkLoggerProvider::builder().build(); /// diff --git a/opentelemetry/src/propagation/composite.rs b/opentelemetry/src/propagation/composite.rs index db638449e1..570f204edd 100644 --- a/opentelemetry/src/propagation/composite.rs +++ b/opentelemetry/src/propagation/composite.rs @@ -49,7 +49,7 @@ use std::collections::HashSet; /// let mut injector = HashMap::new(); /// /// // And a given span -/// let example_span = sdktrace::TracerProvider::default() +/// let example_span = sdktrace::SdkTracerProvider::default() /// .tracer("example-component") /// .start("span-name"); /// From f2751393053c9acaffb0d8f220ce406127afebca Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Wed, 12 Feb 2025 09:39:51 -0800 Subject: [PATCH 2/3] update tracing-otel version, and the experimental flag --- opentelemetry-appender-tracing/CHANGELOG.md | 5 +++++ opentelemetry-appender-tracing/Cargo.toml | 6 +++--- opentelemetry-appender-tracing/src/layer.rs | 8 ++++---- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/opentelemetry-appender-tracing/CHANGELOG.md b/opentelemetry-appender-tracing/CHANGELOG.md index b0bfb5998a..d7898bf92e 100644 --- a/opentelemetry-appender-tracing/CHANGELOG.md +++ b/opentelemetry-appender-tracing/CHANGELOG.md @@ -2,6 +2,11 @@ ## vNext +## 0.28.1 + +Released 2025-Feb-12 + +- Bump `tracing-opentelemetry` to 0.29 - New experimental feature to use trace\_id & span\_id from spans created through the [tracing](https://crates.io/crates/tracing) crate (experimental_use_tracing_span_context) [#2438](https://github.com/open-telemetry/opentelemetry-rust/pull/2438) diff --git a/opentelemetry-appender-tracing/Cargo.toml b/opentelemetry-appender-tracing/Cargo.toml index 43facb2ef4..0d9a0e9b9b 100644 --- a/opentelemetry-appender-tracing/Cargo.toml +++ b/opentelemetry-appender-tracing/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "opentelemetry-appender-tracing" -version = "0.28.0" +version = "0.28.1" edition = "2021" description = "An OpenTelemetry log appender for the tracing crate" homepage = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-appender-tracing" @@ -17,7 +17,7 @@ tracing = { workspace = true, features = ["std"]} tracing-core = { workspace = true } tracing-log = { version = "0.2", optional = true } tracing-subscriber = { workspace = true, features = ["registry", "std"] } -#tracing-opentelemetry = { version = "0.28", optional = true } +tracing-opentelemetry = { version = "0.29", optional = true } [dev-dependencies] log = { workspace = true } @@ -36,7 +36,7 @@ default = [] experimental_metadata_attributes = ["dep:tracing-log"] spec_unstable_logs_enabled = ["opentelemetry/spec_unstable_logs_enabled"] # TODO - Enable this in 0.28.1 (once tracing-opentelemetry v0.29 is released) -#experimental_use_tracing_span_context = ["tracing-opentelemetry"] +experimental_use_tracing_span_context = ["tracing-opentelemetry"] [[bench]] diff --git a/opentelemetry-appender-tracing/src/layer.rs b/opentelemetry-appender-tracing/src/layer.rs index 366a12a9e7..f883cf087a 100644 --- a/opentelemetry-appender-tracing/src/layer.rs +++ b/opentelemetry-appender-tracing/src/layer.rs @@ -180,7 +180,7 @@ where // Visit fields. event.record(&mut visitor); - /*#[cfg(feature = "experimental_use_tracing_span_context")] + #[cfg(feature = "experimental_use_tracing_span_context")] if let Some(span) = _ctx.event_span(event) { use tracing_opentelemetry::OtelData; let opt_span_id = span @@ -198,7 +198,7 @@ where if let Some((trace_id, span_id)) = opt_trace_id.zip(opt_span_id) { log_record.set_trace_context(trace_id, span_id, None); } - } */ + } //emit record self.logger.emit(log_record); @@ -516,7 +516,7 @@ mod tests { } } - /*#[cfg(feature = "experimental_use_tracing_span_context")] + #[cfg(feature = "experimental_use_tracing_span_context")] #[test] fn tracing_appender_inside_tracing_crate_context() { use opentelemetry_sdk::trace::InMemorySpanExporterBuilder; @@ -575,7 +575,7 @@ mod tests { assert_eq!(trace_ctx1.trace_id, trace_id); assert_eq!(trace_ctx0.span_id, outer_span_id); assert_eq!(trace_ctx1.span_id, inner_span_id); - }*/ + } #[test] fn tracing_appender_standalone_with_tracing_log() { From a319d8b653cff17aa717e9e62fcef0ed6ba44443 Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Wed, 12 Feb 2025 09:43:41 -0800 Subject: [PATCH 3/3] revert conflict --- opentelemetry/src/logs/logger.rs | 2 +- opentelemetry/src/propagation/composite.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/opentelemetry/src/logs/logger.rs b/opentelemetry/src/logs/logger.rs index c1ef610f3d..ae04946eec 100644 --- a/opentelemetry/src/logs/logger.rs +++ b/opentelemetry/src/logs/logger.rs @@ -36,7 +36,7 @@ pub trait LoggerProvider { /// ``` /// use opentelemetry::InstrumentationScope; /// use opentelemetry::logs::LoggerProvider; - /// use opentelemetry_sdk::logs::SdkLoggerProvider; + /// use opentelemetry_sdk::logs::LoggerProvider as SdkLoggerProvider; /// /// let provider = SdkLoggerProvider::builder().build(); /// diff --git a/opentelemetry/src/propagation/composite.rs b/opentelemetry/src/propagation/composite.rs index 570f204edd..db638449e1 100644 --- a/opentelemetry/src/propagation/composite.rs +++ b/opentelemetry/src/propagation/composite.rs @@ -49,7 +49,7 @@ use std::collections::HashSet; /// let mut injector = HashMap::new(); /// /// // And a given span -/// let example_span = sdktrace::SdkTracerProvider::default() +/// let example_span = sdktrace::TracerProvider::default() /// .tracer("example-component") /// .start("span-name"); ///