From fbe2f2df46926f9f981cd3b6cbedda6c48069427 Mon Sep 17 00:00:00 2001
From: Ruihang Xia <waynestxia@gmail.com>
Date: Wed, 27 Sep 2023 11:07:03 +0800
Subject: [PATCH] refactor: simplify `warn!` and `error!` macros (#2503)

* refactor: simplify the error! and warn! macros

Signed-off-by: Ruihang Xia <waynestxia@gmail.com>

* support display format

Signed-off-by: Ruihang Xia <waynestxia@gmail.com>

* err.msg to err

Signed-off-by: Ruihang Xia <waynestxia@gmail.com>

---------

Signed-off-by: Ruihang Xia <waynestxia@gmail.com>
---
 src/common/telemetry/src/macros.rs | 54 +++++++++++++++++-------------
 1 file changed, 30 insertions(+), 24 deletions(-)

diff --git a/src/common/telemetry/src/macros.rs b/src/common/telemetry/src/macros.rs
index 4d5f6003b754..c4fd285b3356 100644
--- a/src/common/telemetry/src/macros.rs
+++ b/src/common/telemetry/src/macros.rs
@@ -38,35 +38,38 @@ macro_rules! error {
 
     // error!(e; target: "my_target", "a {} event", "log")
     ($e:expr; target: $target:expr, $($arg:tt)+) => ({
-        use $crate::common_error::ext::ErrorExt;
-        use $crate::common_error::ext::StackError;
-
-        let mut stacks = vec![];
-        $e.debug_fmt(0, &mut stacks);
-        let stacks = stacks.join("\n");
+        $crate::log!(
+            target: $target,
+            $crate::logging::Level::ERROR,
+            err = ?$e,
+            $($arg)+
+        )
+    });
 
+    // error!(%e; target: "my_target", "a {} event", "log")
+    (%$e:expr; target: $target:expr, $($arg:tt)+) => ({
         $crate::log!(
             target: $target,
             $crate::logging::Level::ERROR,
-            err.msg = %stacks,
-            err.code = %$e.status_code(),
+            err = %$e,
             $($arg)+
         )
     });
 
     // error!(e; "a {} event", "log")
     ($e:expr; $($arg:tt)+) => ({
-        use $crate::common_error::ext::ErrorExt;
-        use $crate::common_error::ext::StackError;
-
-        let mut stacks = vec![];
-        $e.debug_fmt(0, &mut stacks);
-        let stacks = stacks.join("\n");
+        $crate::log!(
+            $crate::logging::Level::ERROR,
+            err = ?$e,
+            $($arg)+
+        )
+    });
 
+    // error!(%e; "a {} event", "log")
+    (%$e:expr; $($arg:tt)+) => ({
         $crate::log!(
             $crate::logging::Level::ERROR,
-            err.msg = %stacks,
-            err.code = %$e.status_code(),
+            err = %$e,
             $($arg)+
         )
     });
@@ -87,17 +90,18 @@ macro_rules! warn {
 
     // warn!(e; "a {} event", "log")
     ($e:expr; $($arg:tt)+) => ({
-        use $crate::common_error::ext::ErrorExt;
-        use $crate::common_error::ext::StackError;
-
-        let mut stacks = vec![];
-        $e.debug_fmt(0, &mut stacks);
-        let stacks = stacks.join("\n");
+        $crate::log!(
+            $crate::logging::Level::WARN,
+            err = ?$e,
+            $($arg)+
+        )
+    });
 
+    // warn!(%e; "a {} event", "log")
+    (%$e:expr; $($arg:tt)+) => ({
         $crate::log!(
             $crate::logging::Level::WARN,
-            err.msg = %$e,
-            err.code = %$e.status_code(),
+            err = %$e,
             $($arg)+
         )
     });
@@ -221,8 +225,10 @@ mod tests {
         error!(target: "my_target", "hello {}", "world");
         // Supports both owned and reference type.
         error!(err; target: "my_target", "hello {}", "world");
+        error!(%err; target: "my_target", "hello {}", "world");
         error!(err_ref; target: "my_target", "hello {}", "world");
         error!(err_ref2; "hello {}", "world");
+        error!(%err_ref2; "hello {}", "world");
         error!("hello {}", "world");
 
         let root_err = MockError::with_source(err);