Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions opentelemetry-appender-tracing/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down
6 changes: 3 additions & 3 deletions opentelemetry-appender-tracing/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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 }
Expand All @@ -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]]
Expand Down
8 changes: 4 additions & 4 deletions opentelemetry-appender-tracing/src/layer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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);
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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() {
Expand Down