Skip to content

Commit 4fc5f1c

Browse files
committed
Merge remote-tracking branch 'origin/main' into refactor-baggage-context
# Conflicts: # opentelemetry/CHANGELOG.md
2 parents bf7e835 + baf4bfd commit 4fc5f1c

File tree

2 files changed

+238
-44
lines changed

2 files changed

+238
-44
lines changed

opentelemetry/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
- Align `Baggage.remove()` signature with `.get()` to take the key as a reference
1414
- `Baggage` can't be retrieved from the `Context` directly anymore and needs to be accessed via `context.baggage()`
1515
- `with_baggage()` and `current_with_baggage()` override any existing `Baggage` in the `Context`
16-
16+
- Changed `Context` to use a stack to properly handle out of order dropping of `ContextGuard`. This imposes a limit of `65535` nested contexts on a single thread. See #[2378](https://github.com/open-telemetry/opentelemetry-rust/pull/2284) and #[1887](https://github.com/open-telemetry/opentelemetry-rust/issues/1887).
1717
- Added additional `name: Option<&str>` parameter to the `event_enabled` method
1818
on the `Logger` trait. This allows implementations (SDK, processor, exporters)
1919
to leverage this additional information to determine if an event is enabled.

0 commit comments

Comments
 (0)