Skip to content

Commit 8c34380

Browse files
authored
Merge branch 'main' into log-async-trait-impl
2 parents 3af54c3 + c726c4d commit 8c34380

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

Cargo.toml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,10 @@ tonic = { version = "0.12.3", default-features = false }
4444
tonic-build = "0.12"
4545
tokio = { version = "1", default-features = false }
4646
tokio-stream = "0.1"
47-
tracing = { version = "0.1", default-features = false }
48-
tracing-core = { version = "0.1", default-features = false }
47+
# Using `tracing 0.1.40` because 0.1.39 (which is yanked) introduces the ability to set event names in macros,
48+
# required for OpenTelemetry's internal logging macros.
49+
tracing = { version = ">=0.1.40", default-features = false }
50+
# `tracing-core >=0.1.33` is required for compatibility with `tracing >=0.1.40`.
51+
tracing-core = { version = ">=0.1.33", default-features = false }
4952
tracing-subscriber = { version = "0.3", default-features = false }
5053
url = { version = "2.5", default-features = false }

opentelemetry-sdk/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,9 @@
102102
- Getter methods have been introduced to access field values.
103103
This change impacts custom exporter and processor developers by requiring updates to code that directly accessed LogRecord fields. They must now use the provided getter methods (e.g., `log_record.event_name()` instead of `log_record.event_name`).
104104

105+
- Upgrade the tracing crate used for internal logging to version 0.1.40 or later. This is necessary because the internal logging macros utilize the name field as
106+
metadata, a feature introduced in version 0.1.40. [#2418](https://github.com/open-telemetry/opentelemetry-rust/pull/2418)
107+
105108
## 0.27.1
106109

107110
Released 2024-Nov-27

0 commit comments

Comments
 (0)