From 341e5558f116b00c01de0fcbcf542f7e0127fdd5 Mon Sep 17 00:00:00 2001
From: Utkarsh Umesan Pillai <66651184+utpilla@users.noreply.github.com>
Date: Mon, 20 May 2024 11:39:07 -0700
Subject: [PATCH 1/3] Add semver check

---
 .github/workflows/ci.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 295c69bc6b..1a7a48fcad 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -62,6 +62,19 @@ jobs:
         args: --all -- --check
     - name: Lint
       run: bash ./scripts/lint.sh
+  semver:
+    runs-on: ubuntu-latest
+    name: semver
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: true
+    - name: Install stable
+      uses: dtolnay/rust-toolchain@stable
+      with:
+        components: rustfmt
+    - name: cargo-semver-checks
+      uses: obi1kenobi/cargo-semver-checks-action@v2
   external-types:
     strategy:
       matrix:

From b0606aec23f52baece4aadd2fcc6ab03b53ffd3f Mon Sep 17 00:00:00 2001
From: Utkarsh Umesan Pillai <66651184+utpilla@users.noreply.github.com>
Date: Mon, 20 May 2024 11:52:13 -0700
Subject: [PATCH 2/3] Update Enum

---
 opentelemetry-sdk/src/trace/config.rs     | 12 ++++++------
 opentelemetry/src/global/error_handler.rs |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/opentelemetry-sdk/src/trace/config.rs b/opentelemetry-sdk/src/trace/config.rs
index 88aa925286..23d027d0bb 100644
--- a/opentelemetry-sdk/src/trace/config.rs
+++ b/opentelemetry-sdk/src/trace/config.rs
@@ -128,7 +128,7 @@ impl Default for Config {
                         Box::new(Sampler::TraceIdRatioBased(r))
                     } else {
                         handle_error(
-                            Error::Other(String::from(
+                            Error::Others(String::from(
                                 "Missing or invalid OTEL_TRACES_SAMPLER_ARG value. Falling back to default: 1.0"))
                         );
                         Box::new(Sampler::TraceIdRatioBased(1.0))
@@ -148,7 +148,7 @@ impl Default for Config {
                         ))))
                     } else {
                         handle_error(
-                            Error::Other(String::from(
+                            Error::Others(String::from(
                             "Missing or invalid OTEL_TRACES_SAMPLER_ARG value. Falling back to default: 1.0"
                         )));
                         Box::new(Sampler::ParentBased(Box::new(Sampler::TraceIdRatioBased(
@@ -158,24 +158,24 @@ impl Default for Config {
                 }
                 "parentbased_jaeger_remote" => {
                     handle_error(
-                        Error::Other(String::from(
+                        Error::Others(String::from(
                         "Unimplemented parentbased_jaeger_remote sampler. Falling back to default: parentbased_always_on"
                     )));
                     Box::new(Sampler::ParentBased(Box::new(Sampler::AlwaysOn)))
                 }
                 "jaeger_remote" => {
                     handle_error(
-                        Error::Other(String::from("Unimplemented jaeger_remote sampler. Falling back to default: parentbased_always_on")));
+                        Error::Others(String::from("Unimplemented jaeger_remote sampler. Falling back to default: parentbased_always_on")));
                     Box::new(Sampler::ParentBased(Box::new(Sampler::AlwaysOn)))
                 }
                 "xray" => {
                     handle_error(
-                        Error::Other(String::from("Unimplemented xray sampler. Falling back to default: parentbased_always_on")));
+                        Error::Others(String::from("Unimplemented xray sampler. Falling back to default: parentbased_always_on")));
                     Box::new(Sampler::ParentBased(Box::new(Sampler::AlwaysOn)))
                 }
                 s => {
                     handle_error(
-                        Error::Other(format!("Unrecognised OTEL_TRACES_SAMPLER value: {}. Falling back to default: parentbased_always_on",
+                        Error::Others(format!("Unrecognised OTEL_TRACES_SAMPLER value: {}. Falling back to default: parentbased_always_on",
                         s
                     )));
                     Box::new(Sampler::ParentBased(Box::new(Sampler::AlwaysOn)))
diff --git a/opentelemetry/src/global/error_handler.rs b/opentelemetry/src/global/error_handler.rs
index 87149c1b39..732a49c812 100644
--- a/opentelemetry/src/global/error_handler.rs
+++ b/opentelemetry/src/global/error_handler.rs
@@ -39,12 +39,12 @@ pub enum Error {
 
     #[error("{0}")]
     /// Other types of failures not covered by the variants above.
-    Other(String),
+    Others(String),
 }
 
 impl<T> From<PoisonError<T>> for Error {
     fn from(err: PoisonError<T>) -> Self {
-        Error::Other(err.to_string())
+        Error::Others(err.to_string())
     }
 }
 
@@ -69,7 +69,7 @@ pub fn handle_error<T: Into<Error>>(err: T) {
             Error::Propagation(err) => {
                 eprintln!("OpenTelemetry propagation error occurred. {}", err)
             }
-            Error::Other(err_msg) => eprintln!("OpenTelemetry error occurred. {}", err_msg),
+            Error::Others(err_msg) => eprintln!("OpenTelemetry error occurred. {}", err_msg),
         },
     }
 }

From 12ea5a354446daf33c38af0a8b329f58150730f6 Mon Sep 17 00:00:00 2001
From: Utkarsh Umesan Pillai <utpilla@microsoft.com>
Date: Mon, 20 May 2024 16:28:45 -0700
Subject: [PATCH 3/3] Update action version

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1a7a48fcad..b95a5ec7a6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -74,7 +74,7 @@ jobs:
       with:
         components: rustfmt
     - name: cargo-semver-checks
-      uses: obi1kenobi/cargo-semver-checks-action@v2
+      uses: obi1kenobi/cargo-semver-checks-action@v2.3
   external-types:
     strategy:
       matrix: