From 4c5c1012531898414d3089d6068e477512e9349b Mon Sep 17 00:00:00 2001 From: Jesse White Date: Thu, 4 Jan 2024 10:50:00 -0500 Subject: [PATCH 1/2] Fix StatusCode in stdout exporter (#1453) (#1454) Fixes https://github.com/open-telemetry/opentelemetry-rust/issues/1453 ## Changes Swap the ordinals to match the spec. Co-authored-by: Lalit Kumar Bhasin --- opentelemetry-stdout/src/trace/transform.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opentelemetry-stdout/src/trace/transform.rs b/opentelemetry-stdout/src/trace/transform.rs index 8a83c41629..07725c9483 100644 --- a/opentelemetry-stdout/src/trace/transform.rs +++ b/opentelemetry-stdout/src/trace/transform.rs @@ -217,11 +217,11 @@ impl From for Status { }, opentelemetry::trace::Status::Error { description } => Status { message: Some(description), - code: 1, + code: 2, }, opentelemetry::trace::Status::Ok => Status { message: None, - code: 2, + code: 1, }, } } From 7eb4c2704e104579e6eb887cd56d4c62fe02a30e Mon Sep 17 00:00:00 2001 From: Julian Tescher Date: Thu, 4 Jan 2024 12:31:44 -0500 Subject: [PATCH 2/2] Prepare for v0.21.2 release (#1463) Backport #1434 and #1452 to v0.21.x. --- opentelemetry-sdk/CHANGELOG.md | 2 ++ opentelemetry-sdk/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/opentelemetry-sdk/CHANGELOG.md b/opentelemetry-sdk/CHANGELOG.md index 71f6cfb8c5..363e71e5d7 100644 --- a/opentelemetry-sdk/CHANGELOG.md +++ b/opentelemetry-sdk/CHANGELOG.md @@ -29,6 +29,8 @@ - [#1375](https://github.com/open-telemetry/opentelemetry-rust/pull/1375/) Fix metric collections during PeriodicReader shutdown +## v0.21.2 + ### Fixed - Fix delta aggregation metric reuse. (#1434) diff --git a/opentelemetry-sdk/Cargo.toml b/opentelemetry-sdk/Cargo.toml index cb968c8df0..570745d9ca 100644 --- a/opentelemetry-sdk/Cargo.toml +++ b/opentelemetry-sdk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "opentelemetry_sdk" -version = "0.21.1" +version = "0.21.2" description = "The SDK for the OpenTelemetry metrics collection and distributed tracing framework" homepage = "https://github.com/open-telemetry/opentelemetry-rust" repository = "https://github.com/open-telemetry/opentelemetry-rust"