Merge branch 'main' into cijothomas/exporter-build-result-logs

Author: cijothomas

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)
 
 

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]]

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() {

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();
     ///

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");
 ///