From facbb2dc02ecfeae877ec86cf8f80ca9bb3a22a4 Mon Sep 17 00:00:00 2001
From: Cijo Thomas <cijo.thomas@gmail.com>
Date: Fri, 21 Mar 2025 12:15:29 -0700
Subject: [PATCH 1/7] chore: Prepare 0.29 release
---
opentelemetry-appender-log/CHANGELOG.md | 6 ++++++
opentelemetry-appender-log/Cargo.toml | 6 +++---
opentelemetry-appender-tracing/CHANGELOG.md | 5 +++++
opentelemetry-appender-tracing/Cargo.toml | 2 +-
opentelemetry-http/CHANGELOG.md | 6 ++++++
opentelemetry-http/Cargo.toml | 4 ++--
opentelemetry-jaeger-propagator/CHANGELOG.md | 6 ++++++
opentelemetry-jaeger-propagator/Cargo.toml | 4 ++--
opentelemetry-otlp/CHANGELOG.md | 9 +++++++++
opentelemetry-otlp/Cargo.toml | 10 +++++-----
opentelemetry-proto/CHANGELOG.md | 7 +++++++
opentelemetry-proto/Cargo.toml | 6 +++---
opentelemetry-sdk/CHANGELOG.md | 6 ++++++
opentelemetry-sdk/Cargo.toml | 6 +++---
opentelemetry-semantic-conventions/CHANGELOG.md | 4 ++++
opentelemetry-semantic-conventions/Cargo.toml | 2 +-
opentelemetry-stdout/CHANGELOG.md | 7 +++++++
opentelemetry-stdout/Cargo.toml | 6 +++---
opentelemetry-zipkin/CHANGELOG.md | 8 ++++++++
opentelemetry-zipkin/Cargo.toml | 8 ++++----
opentelemetry/CHANGELOG.md | 4 ++++
opentelemetry/Cargo.toml | 2 +-
scripts/RELEASING.md | 1 -
23 files changed, 96 insertions(+), 29 deletions(-)
diff --git a/opentelemetry-appender-log/CHANGELOG.md b/opentelemetry-appender-log/CHANGELOG.md
index 67f206ccfd..512f970022 100644
--- a/opentelemetry-appender-log/CHANGELOG.md
+++ b/opentelemetry-appender-log/CHANGELOG.md
@@ -2,11 +2,17 @@
## vNext
+## 0.29.0
+
+Released 2025-Mar-21
+
- Similar to the `opentelemetry-appender-tracing` fix [2658](https://github.com/open-telemetry/opentelemetry-rust/issues/2658)
InstrumentationScope(Logger) used by the appender now uses an empty ("") named Logger.
Previously, a Logger with name and version of the crate was used.
Receivers (processors, exporters) are expected to use `LogRecord.target()` as scope name.
This is already done in OTLP Exporters, so this change should be transparent to most users.
+- Update `opentelemetry` dependency version to 0.29.
+- Update `opentelemetry-semantic-conventions` dependency version to 0.29.
## 0.28.0
diff --git a/opentelemetry-appender-log/Cargo.toml b/opentelemetry-appender-log/Cargo.toml
index 85d80df5e5..a413b002e2 100644
--- a/opentelemetry-appender-log/Cargo.toml
+++ b/opentelemetry-appender-log/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "opentelemetry-appender-log"
-version = "0.28.0"
+version = "0.29.0"
description = "An OpenTelemetry appender for the log crate"
homepage = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-appender-log"
repository = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-appender-log"
@@ -11,12 +11,12 @@ rust-version = "1.75.0"
edition = "2021"
[dependencies]
-opentelemetry = { version = "0.28", path = "../opentelemetry", features = [
+opentelemetry = { version = "0.29", path = "../opentelemetry", features = [
"logs",
] }
log = { workspace = true, features = ["kv", "std"] }
serde = { workspace = true, optional = true, features = ["std"] }
-opentelemetry-semantic-conventions = { version = "0.28", path = "../opentelemetry-semantic-conventions", optional = true, features = [
+opentelemetry-semantic-conventions = { version = "0.29", path = "../opentelemetry-semantic-conventions", optional = true, features = [
"semconv_experimental",
] }
diff --git a/opentelemetry-appender-tracing/CHANGELOG.md b/opentelemetry-appender-tracing/CHANGELOG.md
index 9633e06368..b4e341383e 100644
--- a/opentelemetry-appender-tracing/CHANGELOG.md
+++ b/opentelemetry-appender-tracing/CHANGELOG.md
@@ -2,6 +2,10 @@
## vNext
+## 0.29.0
+
+Released 2025-Mar-21
+
Fixes [1682](https://github.com/open-telemetry/opentelemetry-rust/issues/1682).
"spec_unstable_logs_enabled" feature now do not suppress logs for other layers.
@@ -53,6 +57,7 @@ of string.
instead of previously reporting the user provided attribute "error".
`error!(....error = &OTelSdkError::AlreadyShutdown as &dyn std::error::Error...)`
- perf - small perf improvement by avoiding string allocation of `target`
+- Update `opentelemetry` dependency version to 0.29.
## 0.28.1
diff --git a/opentelemetry-appender-tracing/Cargo.toml b/opentelemetry-appender-tracing/Cargo.toml
index 28b422f358..cacc4635ac 100644
--- a/opentelemetry-appender-tracing/Cargo.toml
+++ b/opentelemetry-appender-tracing/Cargo.toml
@@ -12,7 +12,7 @@ rust-version = "1.75.0"
[dependencies]
log = { workspace = true, optional = true }
-opentelemetry = { version = "0.28", path = "../opentelemetry", features = ["logs"] }
+opentelemetry = { version = "0.29", path = "../opentelemetry", features = ["logs"] }
tracing = { workspace = true, features = ["std"]}
tracing-core = { workspace = true }
tracing-log = { workspace = true, optional = true }
diff --git a/opentelemetry-http/CHANGELOG.md b/opentelemetry-http/CHANGELOG.md
index 21284445bb..cdf852bf11 100644
--- a/opentelemetry-http/CHANGELOG.md
+++ b/opentelemetry-http/CHANGELOG.md
@@ -2,6 +2,12 @@
## vNext
+## 0.29.0
+
+Released 2025-Mar-21
+
+- Update `opentelemetry` dependency version to 0.29.
+
## 0.28.0
Released 2025-Feb-10
diff --git a/opentelemetry-http/Cargo.toml b/opentelemetry-http/Cargo.toml
index d4a85ee709..0a93bea84c 100644
--- a/opentelemetry-http/Cargo.toml
+++ b/opentelemetry-http/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "opentelemetry-http"
-version = "0.28.0"
+version = "0.29.0"
description = "Helper implementations for sending HTTP requests. Uses include propagating and extracting context over http, exporting telemetry, requesting sampling strategies."
homepage = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-http"
repository = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-http"
@@ -23,7 +23,7 @@ http = { workspace = true }
http-body-util = { workspace = true, optional = true }
hyper = { workspace = true, optional = true }
hyper-util = { workspace = true, features = ["client-legacy", "http1", "http2"], optional = true }
-opentelemetry = { version = "0.28", path = "../opentelemetry", features = ["trace"] }
+opentelemetry = { version = "0.29", path = "../opentelemetry", features = ["trace"] }
reqwest = { workspace = true, features = ["blocking"], optional = true }
tokio = { workspace = true, features = ["time"], optional = true }
tracing = {workspace = true, optional = true}
diff --git a/opentelemetry-jaeger-propagator/CHANGELOG.md b/opentelemetry-jaeger-propagator/CHANGELOG.md
index c1b236c3fa..335093f5f1 100644
--- a/opentelemetry-jaeger-propagator/CHANGELOG.md
+++ b/opentelemetry-jaeger-propagator/CHANGELOG.md
@@ -2,6 +2,12 @@
## vNext
+## 0.29.0
+
+Released 2025-Mar-21
+
+- Update `opentelemetry` dependency version to 0.29.
+
## 0.28.0
Released 2025-Feb-10
diff --git a/opentelemetry-jaeger-propagator/Cargo.toml b/opentelemetry-jaeger-propagator/Cargo.toml
index c177c909c3..9d431bf57e 100644
--- a/opentelemetry-jaeger-propagator/Cargo.toml
+++ b/opentelemetry-jaeger-propagator/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "opentelemetry-jaeger-propagator"
-version = "0.28.0"
+version = "0.29.0"
description = "Jaeger propagator for OpenTelemetry"
homepage = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-jaeger-propagator"
repository = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-jaeger-propagator"
@@ -20,7 +20,7 @@ all-features = true
rustdoc-args = ["--cfg", "docsrs"]
[dependencies]
-opentelemetry = { version = "0.28", default-features = false, features = [
+opentelemetry = { version = "0.29", default-features = false, features = [
"trace",
], path = "../opentelemetry" }
tracing = {workspace = true, optional = true} # optional for opentelemetry internal logging
diff --git a/opentelemetry-otlp/CHANGELOG.md b/opentelemetry-otlp/CHANGELOG.md
index 97156d0569..eb319791f1 100644
--- a/opentelemetry-otlp/CHANGELOG.md
+++ b/opentelemetry-otlp/CHANGELOG.md
@@ -2,6 +2,15 @@
## vNext
+## 0.29.0
+
+Released 2025-Mar-21
+
+- Update `opentelemetry` dependency version to 0.29
+- Update `opentelemetry_sdk` dependency version to 0.29
+- Update `opentelemetry-http` dependency version to 0.29
+- Update `opentelemetry-proto` dependency version to 0.29
+
- The `OTEL_EXPORTER_OTLP_TIMEOUT`, `OTEL_EXPORTER_OTLP_TRACES_TIMEOUT`, `OTEL_EXPORTER_OTLP_METRICS_TIMEOUT` and `OTEL_EXPORTER_OTLP_LOGS_TIMEOUT` are changed from seconds to miliseconds.
- Fixed `.with_headers()` in `HttpExporterBuilder` to correctly support multiple key/value pairs. [#2699](https://github.com/open-telemetry/opentelemetry-rust/pull/2699)
- Fixed
diff --git a/opentelemetry-otlp/Cargo.toml b/opentelemetry-otlp/Cargo.toml
index 2e0fd8cf4c..eedff5117f 100644
--- a/opentelemetry-otlp/Cargo.toml
+++ b/opentelemetry-otlp/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "opentelemetry-otlp"
-version = "0.28.0"
+version = "0.29.0"
description = "Exporter for the OpenTelemetry Collector"
homepage = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-otlp"
repository = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-otlp"
@@ -27,10 +27,10 @@ rustdoc-args = ["--cfg", "docsrs"]
[dependencies]
futures-core = { workspace = true }
-opentelemetry = { version = "0.28", default-features = false, path = "../opentelemetry" }
-opentelemetry_sdk = { version = "0.28", default-features = false, path = "../opentelemetry-sdk" }
-opentelemetry-http = { version = "0.28", path = "../opentelemetry-http", optional = true }
-opentelemetry-proto = { version = "0.28", path = "../opentelemetry-proto", default-features = false }
+opentelemetry = { version = "0.29", default-features = false, path = "../opentelemetry" }
+opentelemetry_sdk = { version = "0.29", default-features = false, path = "../opentelemetry-sdk" }
+opentelemetry-http = { version = "0.29", path = "../opentelemetry-http", optional = true }
+opentelemetry-proto = { version = "0.29", path = "../opentelemetry-proto", default-features = false }
tracing = {workspace = true, optional = true}
prost = { workspace = true, optional = true }
diff --git a/opentelemetry-proto/CHANGELOG.md b/opentelemetry-proto/CHANGELOG.md
index 0faaf5f945..19e34b137d 100644
--- a/opentelemetry-proto/CHANGELOG.md
+++ b/opentelemetry-proto/CHANGELOG.md
@@ -2,6 +2,13 @@
## vNext
+## 0.29.0
+
+Released 2025-Mar-21
+
+- Update `opentelemetry` dependency version to 0.29
+- Update `opentelemetry_sdk` dependency version to 0.29
+
## 0.28.0
Released 2025-Feb-10
diff --git a/opentelemetry-proto/Cargo.toml b/opentelemetry-proto/Cargo.toml
index 415a61b88e..494a0613a4 100644
--- a/opentelemetry-proto/Cargo.toml
+++ b/opentelemetry-proto/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "opentelemetry-proto"
-version = "0.28.0"
+version = "0.29.0"
description = "Protobuf generated files and transformations."
homepage = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-proto"
repository = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-proto"
@@ -51,8 +51,8 @@ with-serde = ["serde", "hex", "base64"]
[dependencies]
tonic = { workspace = true, optional = true, features = ["codegen", "prost"] }
prost = { workspace = true, optional = true }
-opentelemetry = { version = "0.28", default-features = false, path = "../opentelemetry" }
-opentelemetry_sdk = { version = "0.28", default-features = false, path = "../opentelemetry-sdk" }
+opentelemetry = { version = "0.29", default-features = false, path = "../opentelemetry" }
+opentelemetry_sdk = { version = "0.29", default-features = false, path = "../opentelemetry-sdk" }
schemars = { workspace = true, optional = true }
serde = { workspace = true, optional = true, features = ["serde_derive"] }
hex = { workspace = true, optional = true }
diff --git a/opentelemetry-sdk/CHANGELOG.md b/opentelemetry-sdk/CHANGELOG.md
index 28b9901fcd..534142b402 100644
--- a/opentelemetry-sdk/CHANGELOG.md
+++ b/opentelemetry-sdk/CHANGELOG.md
@@ -2,6 +2,12 @@
## vNext
+## 0.29.0
+
+Released 2025-Mar-21
+
+- Update `opentelemetry` dependency to 0.28.
+- Update `opentelemetry-http` dependency to 0.28.
- **Breaking**: The `Runtime` trait has been simplified and refined. See the [#2641](https://github.com/open-telemetry/opentelemetry-rust/pull/2641)
for the changes.
- Removed `async-std` support for `Runtime`, as [`async-std` crate is deprecated](https://crates.io/crates/async-std).
diff --git a/opentelemetry-sdk/Cargo.toml b/opentelemetry-sdk/Cargo.toml
index 37f555e493..85512e64cc 100644
--- a/opentelemetry-sdk/Cargo.toml
+++ b/opentelemetry-sdk/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "opentelemetry_sdk"
-version = "0.28.0"
+version = "0.29.0"
description = "The SDK for the OpenTelemetry metrics collection and distributed tracing framework"
homepage = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-sdk"
repository = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-sdk"
@@ -10,8 +10,8 @@ edition = "2021"
rust-version = "1.75.0"
[dependencies]
-opentelemetry = { version = "0.28", path = "../opentelemetry/" }
-opentelemetry-http = { version = "0.28", path = "../opentelemetry-http", optional = true }
+opentelemetry = { version = "0.29", path = "../opentelemetry/" }
+opentelemetry-http = { version = "0.29", path = "../opentelemetry-http", optional = true }
futures-channel = { workspace = true }
futures-executor = { workspace = true }
futures-util = { workspace = true, features = ["std", "sink", "async-await-macro"] }
diff --git a/opentelemetry-semantic-conventions/CHANGELOG.md b/opentelemetry-semantic-conventions/CHANGELOG.md
index b9f49349ff..527b52eab7 100644
--- a/opentelemetry-semantic-conventions/CHANGELOG.md
+++ b/opentelemetry-semantic-conventions/CHANGELOG.md
@@ -2,6 +2,10 @@
## vNext
+## 0.29.0
+
+Released 2025-Mar-21
+
## 0.28.0
Released 2025-Feb-10
diff --git a/opentelemetry-semantic-conventions/Cargo.toml b/opentelemetry-semantic-conventions/Cargo.toml
index a98c4882ee..62c0567ce1 100644
--- a/opentelemetry-semantic-conventions/Cargo.toml
+++ b/opentelemetry-semantic-conventions/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "opentelemetry-semantic-conventions"
-version = "0.28.0"
+version = "0.29.0"
description = "Semantic conventions for OpenTelemetry"
homepage = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-semantic-conventions"
repository = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-semantic-conventions"
diff --git a/opentelemetry-stdout/CHANGELOG.md b/opentelemetry-stdout/CHANGELOG.md
index 6f76c6ca49..7a4da2e8b5 100644
--- a/opentelemetry-stdout/CHANGELOG.md
+++ b/opentelemetry-stdout/CHANGELOG.md
@@ -2,6 +2,13 @@
## vNext
+## 0.29.0
+
+Released 2025-Mar-21
+
+- Update `opentelemetry` dependency version to 0.28.
+- Update `opentelemetry_sdk` dependency version to 0.28.
+
## 0.28.0
Released 2025-Feb-10
diff --git a/opentelemetry-stdout/Cargo.toml b/opentelemetry-stdout/Cargo.toml
index 364a28a3ed..aea700246c 100644
--- a/opentelemetry-stdout/Cargo.toml
+++ b/opentelemetry-stdout/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "opentelemetry-stdout"
-version = "0.28.0"
+version = "0.29.0"
description = "An OpenTelemetry exporter for stdout"
homepage = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-stdout"
repository = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-stdout"
@@ -28,8 +28,8 @@ logs = ["opentelemetry/logs", "opentelemetry_sdk/logs", "opentelemetry_sdk/spec_
[dependencies]
chrono = { workspace = true, features = ["now"] }
futures-util = { workspace = true, optional = true }
-opentelemetry = { version = "0.28", path = "../opentelemetry" }
-opentelemetry_sdk = { version = "0.28", path = "../opentelemetry-sdk" }
+opentelemetry = { version = "0.29", path = "../opentelemetry" }
+opentelemetry_sdk = { version = "0.29", path = "../opentelemetry-sdk" }
[dev-dependencies]
opentelemetry = { path = "../opentelemetry", features = ["metrics"] }
diff --git a/opentelemetry-zipkin/CHANGELOG.md b/opentelemetry-zipkin/CHANGELOG.md
index 3db1b348d8..be88cb6f6f 100644
--- a/opentelemetry-zipkin/CHANGELOG.md
+++ b/opentelemetry-zipkin/CHANGELOG.md
@@ -2,6 +2,14 @@
## vNext
+## 0.29.0
+
+Released 2025-Mar-21
+
+- Update `opentelemetry` dependency version to 0.29.
+- Update `opentelemetry_sdk` dependency version to 0.29.
+- Update `opentelemetry-http` dependency version to 0.29.
+
- **Breaking** The `ZipkinExporterBuilder::build()` method now returns a
`Result<ZipkinExporter, ExporterBuildError>`. The `ExporterBuildError` enum
lists possible failures specific to the Zipkin exporter and was renamed from
diff --git a/opentelemetry-zipkin/Cargo.toml b/opentelemetry-zipkin/Cargo.toml
index 440b22888e..9293760e3d 100644
--- a/opentelemetry-zipkin/Cargo.toml
+++ b/opentelemetry-zipkin/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "opentelemetry-zipkin"
-version = "0.28.0"
+version = "0.29.0"
description = "Zipkin exporter for OpenTelemetry"
homepage = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-zipkin"
repository = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry-zipkin"
@@ -27,9 +27,9 @@ reqwest-rustls = ["reqwest", "reqwest/rustls-tls-native-roots"]
[dependencies]
once_cell = { workspace = true }
-opentelemetry = { version = "0.28", path = "../opentelemetry" }
-opentelemetry_sdk = { version = "0.28", path = "../opentelemetry-sdk", features = ["trace"] }
-opentelemetry-http = { version = "0.28", path = "../opentelemetry-http" }
+opentelemetry = { version = "0.29", path = "../opentelemetry" }
+opentelemetry_sdk = { version = "0.29", path = "../opentelemetry-sdk", features = ["trace"] }
+opentelemetry-http = { version = "0.29", path = "../opentelemetry-http" }
serde_json = { workspace = true }
serde = { workspace = true, features = ["derive"] }
typed-builder = { workspace = true }
diff --git a/opentelemetry/CHANGELOG.md b/opentelemetry/CHANGELOG.md
index 3a82a3798a..3b3f4faef6 100644
--- a/opentelemetry/CHANGELOG.md
+++ b/opentelemetry/CHANGELOG.md
@@ -2,6 +2,10 @@
## vNext
+## 0.29.0
+
+Released 2025-Mar-21
+
- *Breaking* Moved `ExportError` trait from `opentelemetry::trace::ExportError` to `opentelemetry_sdk::export::ExportError`
- *Breaking* Moved `TraceError` enum from `opentelemetry::trace::TraceError` to `opentelemetry_sdk::trace::TraceError`
- *Breaking* Moved `TraceResult` type alias from `opentelemetry::trace::TraceResult` to `opentelemetry_sdk::trace::TraceResult`
diff --git a/opentelemetry/Cargo.toml b/opentelemetry/Cargo.toml
index a82d263b14..597aeeb84c 100644
--- a/opentelemetry/Cargo.toml
+++ b/opentelemetry/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "opentelemetry"
-version = "0.28.0"
+version = "0.29.0"
description = "OpenTelemetry API for Rust"
homepage = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry"
repository = "https://github.com/open-telemetry/opentelemetry-rust/tree/main/opentelemetry"
diff --git a/scripts/RELEASING.md b/scripts/RELEASING.md
index 5c95c1daa2..84234b3ce8 100644
--- a/scripts/RELEASING.md
+++ b/scripts/RELEASING.md
@@ -29,7 +29,6 @@ A draft PR can be created, but before releasing consider the following:
* Bump appropriate version
* Update change logs to reflect release version.
* Update API/SDK version as necessary
- * Attach `integration test` label to the PR to run integration tests
* If there's a large enough set of changes, consider writing a migration guide.
2. Merge the PR
From 00a311464462c3274fa4f41b8bc74ac67dabeb62 Mon Sep 17 00:00:00 2001
From: Cijo Thomas <cijo.thomas@gmail.com>
Date: Fri, 21 Mar 2025 12:49:33 -0700
Subject: [PATCH 2/7] avoid tracing opentelemetry
---
opentelemetry-appender-tracing/Cargo.toml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/opentelemetry-appender-tracing/Cargo.toml b/opentelemetry-appender-tracing/Cargo.toml
index cacc4635ac..fe3e66fd2f 100644
--- a/opentelemetry-appender-tracing/Cargo.toml
+++ b/opentelemetry-appender-tracing/Cargo.toml
@@ -17,7 +17,7 @@ tracing = { workspace = true, features = ["std"]}
tracing-core = { workspace = true }
tracing-log = { workspace = true, optional = true }
tracing-subscriber = { workspace = true, features = ["registry", "std"] }
-tracing-opentelemetry = { workspace = true, optional = true }
+# tracing-opentelemetry = { workspace = true, optional = true }
[dev-dependencies]
log = { workspace = true }
@@ -36,7 +36,8 @@ pprof = { version = "0.14", features = ["flamegraph", "criterion"] }
default = []
experimental_metadata_attributes = ["dep:tracing-log"]
spec_unstable_logs_enabled = ["opentelemetry/spec_unstable_logs_enabled"]
-experimental_use_tracing_span_context = ["tracing-opentelemetry"]
+# TODO - Enable this in 0.29.1 (once tracing-opentelemetry v0.30 is released)
+# experimental_use_tracing_span_context = ["tracing-opentelemetry"]
[[bench]]
From cc43bd010ea5d9e467c8c58cfbd4efb8f9e420c6 Mon Sep 17 00:00:00 2001
From: Cijo Thomas <cijo.thomas@gmail.com>
Date: Fri, 21 Mar 2025 15:04:00 -0700
Subject: [PATCH 3/7] vne
---
opentelemetry-semantic-conventions/CHANGELOG.md | 4 ----
1 file changed, 4 deletions(-)
diff --git a/opentelemetry-semantic-conventions/CHANGELOG.md b/opentelemetry-semantic-conventions/CHANGELOG.md
index 527b52eab7..b9f49349ff 100644
--- a/opentelemetry-semantic-conventions/CHANGELOG.md
+++ b/opentelemetry-semantic-conventions/CHANGELOG.md
@@ -2,10 +2,6 @@
## vNext
-## 0.29.0
-
-Released 2025-Mar-21
-
## 0.28.0
Released 2025-Feb-10
From 2cf6891d09dff74bb658b1dff3a72c62c9235e9b Mon Sep 17 00:00:00 2001
From: Cijo Thomas <cijo.thomas@gmail.com>
Date: Fri, 21 Mar 2025 15:04:58 -0700
Subject: [PATCH 4/7] clog
---
opentelemetry-semantic-conventions/CHANGELOG.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/opentelemetry-semantic-conventions/CHANGELOG.md b/opentelemetry-semantic-conventions/CHANGELOG.md
index 00047284c7..ca2da01219 100644
--- a/opentelemetry-semantic-conventions/CHANGELOG.md
+++ b/opentelemetry-semantic-conventions/CHANGELOG.md
@@ -3,10 +3,10 @@
## vNext
## 0.29.0
-
- Released 2025-Mar-21
- - Update to [v1.31.0](https://github.com/open-telemetry/semantic-conventions/releases/tag/v1.31.0) of the semantic conventions.
+Released 2025-Mar-21
+
+- Update to [v1.31.0](https://github.com/open-telemetry/semantic-conventions/releases/tag/v1.31.0) of the semantic conventions.
## 0.28.0
From 85f34729b077568193abd6697bc5e353824308d1 Mon Sep 17 00:00:00 2001
From: Cijo Thomas <cijo.thomas@gmail.com>
Date: Fri, 21 Mar 2025 15:05:45 -0700
Subject: [PATCH 5/7] comment unused
---
opentelemetry-appender-tracing/src/layer.rs | 132 ++++++++++----------
1 file changed, 66 insertions(+), 66 deletions(-)
diff --git a/opentelemetry-appender-tracing/src/layer.rs b/opentelemetry-appender-tracing/src/layer.rs
index fe0bc645ed..bd3e5aaea7 100644
--- a/opentelemetry-appender-tracing/src/layer.rs
+++ b/opentelemetry-appender-tracing/src/layer.rs
@@ -244,25 +244,25 @@ where
// Visit fields.
event.record(&mut visitor);
- #[cfg(feature = "experimental_use_tracing_span_context")]
- if let Some(span) = _ctx.event_span(event) {
- use tracing_opentelemetry::OtelData;
- let opt_span_id = span
- .extensions()
- .get::<OtelData>()
- .and_then(|otd| otd.builder.span_id);
-
- let opt_trace_id = span.scope().last().and_then(|root_span| {
- root_span
- .extensions()
- .get::<OtelData>()
- .and_then(|otd| otd.builder.trace_id)
- });
-
- if let Some((trace_id, span_id)) = opt_trace_id.zip(opt_span_id) {
- log_record.set_trace_context(trace_id, span_id, None);
- }
- }
+ // #[cfg(feature = "experimental_use_tracing_span_context")]
+ // if let Some(span) = _ctx.event_span(event) {
+ // use tracing_opentelemetry::OtelData;
+ // let opt_span_id = span
+ // .extensions()
+ // .get::<OtelData>()
+ // .and_then(|otd| otd.builder.span_id);
+
+ // let opt_trace_id = span.scope().last().and_then(|root_span| {
+ // root_span
+ // .extensions()
+ // .get::<OtelData>()
+ // .and_then(|otd| otd.builder.trace_id)
+ // });
+
+ // 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);
@@ -673,66 +673,66 @@ mod tests {
}
}
- #[cfg(feature = "experimental_use_tracing_span_context")]
- #[test]
- fn tracing_appender_inside_tracing_crate_context() {
- use opentelemetry_sdk::trace::InMemorySpanExporterBuilder;
+ // #[cfg(feature = "experimental_use_tracing_span_context")]
+ // #[test]
+ // fn tracing_appender_inside_tracing_crate_context() {
+ // use opentelemetry_sdk::trace::InMemorySpanExporterBuilder;
- // Arrange
- let exporter: InMemoryLogExporter = InMemoryLogExporter::default();
- let logger_provider = SdkLoggerProvider::builder()
- .with_simple_exporter(exporter.clone())
- .build();
+ // // Arrange
+ // let exporter: InMemoryLogExporter = InMemoryLogExporter::default();
+ // let logger_provider = SdkLoggerProvider::builder()
+ // .with_simple_exporter(exporter.clone())
+ // .build();
- // setup tracing layer to compare trace/span IDs against
- let span_exporter = InMemorySpanExporterBuilder::new().build();
- let tracer_provider = SdkTracerProvider::builder()
- .with_simple_exporter(span_exporter.clone())
- .build();
- let tracer = tracer_provider.tracer("test-tracer");
+ // // setup tracing layer to compare trace/span IDs against
+ // let span_exporter = InMemorySpanExporterBuilder::new().build();
+ // let tracer_provider = SdkTracerProvider::builder()
+ // .with_simple_exporter(span_exporter.clone())
+ // .build();
+ // let tracer = tracer_provider.tracer("test-tracer");
- let level_filter = tracing_subscriber::filter::LevelFilter::ERROR;
- let log_layer =
- layer::OpenTelemetryTracingBridge::new(&logger_provider).with_filter(level_filter);
+ // let level_filter = tracing_subscriber::filter::LevelFilter::ERROR;
+ // let log_layer =
+ // layer::OpenTelemetryTracingBridge::new(&logger_provider).with_filter(level_filter);
- let subscriber = tracing_subscriber::registry()
- .with(log_layer)
- .with(tracing_opentelemetry::layer().with_tracer(tracer));
+ // let subscriber = tracing_subscriber::registry()
+ // .with(log_layer)
+ // .with(tracing_opentelemetry::layer().with_tracer(tracer));
- // Avoiding global subscriber.init() as that does not play well with unit tests.
- let _guard = tracing::subscriber::set_default(subscriber);
+ // // Avoiding global subscriber.init() as that does not play well with unit tests.
+ // let _guard = tracing::subscriber::set_default(subscriber);
- // Act
- tracing::error_span!("outer-span").in_scope(|| {
- error!("first-event");
+ // // Act
+ // tracing::error_span!("outer-span").in_scope(|| {
+ // error!("first-event");
- tracing::error_span!("inner-span").in_scope(|| {
- error!("second-event");
- });
- });
+ // tracing::error_span!("inner-span").in_scope(|| {
+ // error!("second-event");
+ // });
+ // });
- assert!(logger_provider.force_flush().is_ok());
+ // assert!(logger_provider.force_flush().is_ok());
- let logs = exporter.get_emitted_logs().expect("No emitted logs");
- assert_eq!(logs.len(), 2, "Expected 2 logs, got: {logs:?}");
+ // let logs = exporter.get_emitted_logs().expect("No emitted logs");
+ // assert_eq!(logs.len(), 2, "Expected 2 logs, got: {logs:?}");
- let spans = span_exporter.get_finished_spans().unwrap();
- assert_eq!(spans.len(), 2);
+ // let spans = span_exporter.get_finished_spans().unwrap();
+ // assert_eq!(spans.len(), 2);
- let trace_id = spans[0].span_context.trace_id();
- assert_eq!(trace_id, spans[1].span_context.trace_id());
- let inner_span_id = spans[0].span_context.span_id();
- let outer_span_id = spans[1].span_context.span_id();
- assert_eq!(outer_span_id, spans[0].parent_span_id);
+ // let trace_id = spans[0].span_context.trace_id();
+ // assert_eq!(trace_id, spans[1].span_context.trace_id());
+ // let inner_span_id = spans[0].span_context.span_id();
+ // let outer_span_id = spans[1].span_context.span_id();
+ // assert_eq!(outer_span_id, spans[0].parent_span_id);
- let trace_ctx0 = logs[0].record.trace_context().unwrap();
- let trace_ctx1 = logs[1].record.trace_context().unwrap();
+ // let trace_ctx0 = logs[0].record.trace_context().unwrap();
+ // let trace_ctx1 = logs[1].record.trace_context().unwrap();
- assert_eq!(trace_ctx0.trace_id, trace_id);
- 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);
- }
+ // assert_eq!(trace_ctx0.trace_id, trace_id);
+ // 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() {
From b0c81575dec2cfaa1f02a9edf72740444c78a72f Mon Sep 17 00:00:00 2001
From: Cijo Thomas <cijo.thomas@gmail.com>
Date: Fri, 21 Mar 2025 15:23:19 -0700
Subject: [PATCH 6/7] typos
---
opentelemetry-sdk/CHANGELOG.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/opentelemetry-sdk/CHANGELOG.md b/opentelemetry-sdk/CHANGELOG.md
index 534142b402..e40018fa0f 100644
--- a/opentelemetry-sdk/CHANGELOG.md
+++ b/opentelemetry-sdk/CHANGELOG.md
@@ -6,8 +6,8 @@
Released 2025-Mar-21
-- Update `opentelemetry` dependency to 0.28.
-- Update `opentelemetry-http` dependency to 0.28.
+- Update `opentelemetry` dependency to 0.29.
+- Update `opentelemetry-http` dependency to 0.29.
- **Breaking**: The `Runtime` trait has been simplified and refined. See the [#2641](https://github.com/open-telemetry/opentelemetry-rust/pull/2641)
for the changes.
- Removed `async-std` support for `Runtime`, as [`async-std` crate is deprecated](https://crates.io/crates/async-std).
From 2759aa701f300fd6b734bada0f5cc9e3536de1cc Mon Sep 17 00:00:00 2001
From: Cijo Thomas <cijo.thomas@gmail.com>
Date: Fri, 21 Mar 2025 16:59:02 -0700
Subject: [PATCH 7/7] fix v
---
opentelemetry-stdout/CHANGELOG.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/opentelemetry-stdout/CHANGELOG.md b/opentelemetry-stdout/CHANGELOG.md
index 7a4da2e8b5..0e8798ae4e 100644
--- a/opentelemetry-stdout/CHANGELOG.md
+++ b/opentelemetry-stdout/CHANGELOG.md
@@ -6,8 +6,8 @@
Released 2025-Mar-21
-- Update `opentelemetry` dependency version to 0.28.
-- Update `opentelemetry_sdk` dependency version to 0.28.
+- Update `opentelemetry` dependency version to 0.29.
+- Update `opentelemetry_sdk` dependency version to 0.29.
## 0.28.0