Merge branch 'main' into bug/1209-fix-upgrade-performance

open-telemetry · Jan 4, 2024 · 85ef890 · 85ef890
2 parents 731901c + 7eb4c27
commit 85ef890
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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"

diff --git a/opentelemetry-stdout/src/trace/transform.rs b/opentelemetry-stdout/src/trace/transform.rs
@@ -217,11 +217,11 @@ impl From<opentelemetry::trace::Status> 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,
             },
         }
     }