Skip to content

Commit 0d11d07

Browse files
authored
Prepare v0.28.0 (open-telemetry#2635)
1 parent 551ad5f commit 0d11d07

File tree

3 files changed

+17
-8
lines changed

3 files changed

+17
-8
lines changed

CHANGELOG.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,16 @@
22

33
## vNext
44

5-
- Bump msrv to 1.75.0.
65
- 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)
76

7+
8+
## 0.28.0
9+
10+
Released 2025-Feb-10
11+
12+
- Update `opentelemetry` dependency version to 0.28.
13+
- Bump msrv to 1.75.0.
14+
815
## 0.27.0
916

1017
Released 2024-Nov-11

Cargo.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ rust-version = "1.75.0"
1212

1313
[dependencies]
1414
log = { workspace = true, optional = true }
15-
opentelemetry = { version = "0.27", path = "../opentelemetry", features = ["logs"] }
15+
opentelemetry = { version = "0.28", path = "../opentelemetry", features = ["logs"] }
1616
tracing = { workspace = true, features = ["std"]}
1717
tracing-core = { workspace = true }
1818
tracing-log = { version = "0.2", optional = true }
1919
tracing-subscriber = { workspace = true, features = ["registry", "std"] }
20-
tracing-opentelemetry = { version = "0.28", optional = true }
20+
#tracing-opentelemetry = { version = "0.28", optional = true }
2121

2222
[dev-dependencies]
2323
log = { workspace = true }
@@ -32,9 +32,11 @@ tokio = { workspace = true, features = ["full"]}
3232
pprof = { version = "0.14", features = ["flamegraph", "criterion"] }
3333

3434
[features]
35+
default = []
3536
experimental_metadata_attributes = ["dep:tracing-log"]
3637
spec_unstable_logs_enabled = ["opentelemetry/spec_unstable_logs_enabled"]
37-
experimental_use_tracing_span_context = ["tracing-opentelemetry"]
38+
# TODO - Enable this in 0.28.1 (once tracing-opentelemetry v0.29 is released)
39+
#experimental_use_tracing_span_context = ["tracing-opentelemetry"]
3840

3941

4042
[[bench]]

src/layer.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ where
180180
// Visit fields.
181181
event.record(&mut visitor);
182182

183-
#[cfg(feature = "experimental_use_tracing_span_context")]
183+
/*#[cfg(feature = "experimental_use_tracing_span_context")]
184184
if let Some(span) = _ctx.event_span(event) {
185185
use tracing_opentelemetry::OtelData;
186186
let opt_span_id = span
@@ -198,7 +198,7 @@ where
198198
if let Some((trace_id, span_id)) = opt_trace_id.zip(opt_span_id) {
199199
log_record.set_trace_context(trace_id, span_id, None);
200200
}
201-
}
201+
} */
202202

203203
//emit record
204204
self.logger.emit(log_record);
@@ -516,7 +516,7 @@ mod tests {
516516
}
517517
}
518518

519-
#[cfg(feature = "experimental_use_tracing_span_context")]
519+
/*#[cfg(feature = "experimental_use_tracing_span_context")]
520520
#[test]
521521
fn tracing_appender_inside_tracing_crate_context() {
522522
use opentelemetry_sdk::trace::InMemorySpanExporterBuilder;
@@ -575,7 +575,7 @@ mod tests {
575575
assert_eq!(trace_ctx1.trace_id, trace_id);
576576
assert_eq!(trace_ctx0.span_id, outer_span_id);
577577
assert_eq!(trace_ctx1.span_id, inner_span_id);
578-
}
578+
}*/
579579

580580
#[test]
581581
fn tracing_appender_standalone_with_tracing_log() {

0 commit comments

Comments
 (0)