From 257377315d3949bff73d627b5deccd7f6a85376d Mon Sep 17 00:00:00 2001
From: Dirkjan Ochtman <dirkjan@ochtman.nl>
Date: Tue, 10 Dec 2024 16:53:08 +0100
Subject: [PATCH] Upgrade to thiserror 2 (#2406)

Co-authored-by: Cijo Thomas <cijo.thomas@gmail.com>
---
 Cargo.toml                             | 2 +-
 opentelemetry-sdk/src/logs/error.rs    | 2 +-
 opentelemetry-sdk/src/metrics/error.rs | 2 +-
 opentelemetry/src/trace/mod.rs         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 3e123b901e..a6ed25e2d9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -39,7 +39,7 @@ reqwest = { version = "0.12", default-features = false }
 serde = { version = "1.0", default-features = false }
 serde_json = "1.0"
 temp-env = "0.3.6"
-thiserror = { version = "1", default-features = false }
+thiserror = { version = "2", default-features = false }
 tonic = { version = "0.12.3", default-features = false }
 tonic-build = "0.12"
 tokio = { version = "1", default-features = false }
diff --git a/opentelemetry-sdk/src/logs/error.rs b/opentelemetry-sdk/src/logs/error.rs
index 1cbcd29e2e..4f33ba6dbf 100644
--- a/opentelemetry-sdk/src/logs/error.rs
+++ b/opentelemetry-sdk/src/logs/error.rs
@@ -11,7 +11,7 @@ pub type LogResult<T> = Result<T, LogError>;
 /// Errors returned by the log SDK.
 pub enum LogError {
     /// Export failed with the error returned by the exporter.
-    #[error("Exporter {} encountered the following errors: {0}", .0.exporter_name())]
+    #[error("Exporter {0} encountered the following errors: {name}", name = .0.exporter_name())]
     ExportFailed(Box<dyn ExportError>),
 
     /// Export failed to finish after certain period and processor stopped the export.
diff --git a/opentelemetry-sdk/src/metrics/error.rs b/opentelemetry-sdk/src/metrics/error.rs
index 13e0e7b752..cb8afcab0e 100644
--- a/opentelemetry-sdk/src/metrics/error.rs
+++ b/opentelemetry-sdk/src/metrics/error.rs
@@ -18,7 +18,7 @@ pub enum MetricError {
     #[error("Config error {0}")]
     Config(String),
     /// Fail to export metrics
-    #[error("Metrics exporter {} failed with {0}", .0.exporter_name())]
+    #[error("Metrics exporter {0} failed with {name}", name = .0.exporter_name())]
     ExportErr(Box<dyn ExportError>),
     /// Invalid instrument configuration such invalid instrument name, invalid instrument description, invalid instrument unit, etc.
     /// See [spec](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/api.md#general-characteristics)
diff --git a/opentelemetry/src/trace/mod.rs b/opentelemetry/src/trace/mod.rs
index 09443c4b4c..c93e258893 100644
--- a/opentelemetry/src/trace/mod.rs
+++ b/opentelemetry/src/trace/mod.rs
@@ -205,7 +205,7 @@ pub type TraceResult<T> = Result<T, TraceError>;
 #[non_exhaustive]
 pub enum TraceError {
     /// Export failed with the error returned by the exporter
-    #[error("Exporter {} encountered the following error(s): {0}", .0.exporter_name())]
+    #[error("Exporter {0} encountered the following error(s): {name}", name = .0.exporter_name())]
     ExportFailed(Box<dyn ExportError>),
 
     /// Export failed to finish after certain period and processor stopped the export.