feat: added new macro trace_error and added anyhow features to have trace_anyhow_error

Author: damjack

Cargo.toml

@@ -38,6 +38,7 @@ required-features = ["json-logger"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [dependencies]
+anyhow = {version = "1.0.100", features = ["std"], optional = true}
 opentelemetry = {version = "0.31", optional = true}
 opentelemetry-semantic-conventions = {version = "0.31", optional = true}
 opentelemetry-otlp = {version = "0.31", features = ["http-proto", "reqwest-blocking-client"], default-features = false, optional = true}
@@ -66,4 +67,5 @@ opentelemetry-jaeger = {version = "0.22", features = ["integration_test"]}
 prima_bridge = "0.25"
 tokio = {version = "1.17", features = ["rt", "macros", "rt-multi-thread"]}
 tracing-actix-web = {version = "0.7.11", features = ["opentelemetry_0_27"]}
+tracing-capture = "0.1.0"
 uuid = {version = "1.10", features = ["v4"]}

src/lib.rs

@@ -18,8 +18,11 @@
 //! # }
 //! ```
 
-mod config;
+#[cfg(feature = "traces")]
+#[macro_use]
+mod macros;
 
+mod config;
 mod subscriber;
 
 #[cfg(feature = "json-logger")]
@@ -65,9 +68,7 @@ macro_rules! report_error {
     ($error:expr, $($args:tt)*) => {
         {
           let kind = ::std::any::type_name_of_val(&$error);
-          let stack = error_report::Report::new(&$error);
-          let backtrace = ::std::backtrace::Backtrace::force_capture();
-          $crate::tracing::error!(error.kind = kind, error.stack = ?stack, error.trace = %backtrace, error.message = &$error as &dyn ::std::error::Error, $($args)+)
+          $crate::tracing::error!(error.kind = kind, error = &$error as &dyn ::std::error::Error, $($args)+)
         }
     };
 }

src/macros.rs

@@ -0,0 +1,101 @@
+/// Emitt a tracing error event for an error with rich, structured context.
+/// It capturing the error using the experimental Rust [std::error::Report](https://doc.rust-lang.org/stable/std/error/struct.Report.html)
+/// and adding the type name as error.kind, the backtrace as error.trace and the error stack as error.message
+///
+/// # Examples
+///
+/// ```rust
+/// use prima_tracing::trace_error;
+/// # fn main() {
+///
+/// let error = "not a number".parse::<usize>().unwrap_err();
+/// trace_error!(error, "Parsing error!");
+/// trace_error!(error, "Parsing error: {}", uid="1234");
+/// # }
+/// ```
+#[macro_export]
+macro_rules! trace_error {
+    ($error:expr, $message:expr) => {
+        {
+            $crate::trace_error!($error, $message,)
+        }
+    };
+    ($error:expr, $message:expr, $($field:tt)*) => {
+        {
+            let kind = std::any::type_name_of_val(&$error);
+            let error_message = format!("{:#}", $error);
+            let stack = error_report::Report::new(&$error);
+            let trace = std::backtrace::Backtrace::force_capture();
+
+            $crate::tracing::error!(
+                {
+                    error.message = error_message,
+                    error.kind = kind,
+                    error.stack = ?stack,
+                    error.trace = %trace,
+                    $($field)*
+                },
+                "{} {}",
+                $message,
+                $error
+            );
+        }
+    };
+    ($error:expr, $message:expr) => {
+        {
+            $crate::trace_error!($error, $message, {})
+        }
+    };
+}
+
+/// Emitt a tracing error event for anyhow error with rich, structured context.
+/// It capturing the error using the experimental Rust [std::error::Report](https://doc.rust-lang.org/stable/std/error/struct.Report.html)
+/// and adding the type name as error.kind, the backtrace as error.trace and the error stack as error.message
+///
+/// # Examples
+///
+/// ```rust
+/// use anyhow::anyhow
+/// use prima_tracing::trace_error;
+/// # fn main() {
+///
+/// let error = anyhow!("an error");
+/// trace_anyhow_error!(error, "Throw error!");
+/// trace_anyhow_error!(error, "Throw error!", uid="1234");
+/// # }
+/// ```
+#[cfg(feature = "anyhow")]
+#[macro_export]
+macro_rules! trace_anyhow_error {
+    ($error:expr, $message:expr) => {
+        {
+            $crate::trace_anyhow_error!($error, $message,)
+        }
+    };
+    ($error:expr, $message:expr, $($field:tt)*) => {
+        {
+            let kind = std::any::type_name_of_val(&$error.root_cause());
+            let error_message = format!("{:#}", $error);
+            let std_err: &(dyn std::error::Error + 'static) = $error.as_ref();
+            let stack = error_report::Report::new(std_err);
+
+            $crate::tracing::error!(
+                {
+                    error.message = error_message,
+                    error.kind = kind,
+                    error.stack = ?stack,
+                    error.trace = %$error.backtrace(),
+                    $($field)*
+                },
+                "{} {:?}",
+                $message,
+                $error
+            );
+        }
+    };
+    ($error:expr, $message:expr) => {
+        {
+            $crate::trace_anyhow_error!($error, $message,)
+        }
+    };
+}

tests/macros.rs

@@ -0,0 +1,84 @@
+use tracing_capture::{CaptureLayer, CapturedEvent, SharedStorage};
+use tracing_subscriber::layer::SubscriberExt;
+
+#[cfg(feature = "anyhow")]
+use {anyhow::anyhow, prima_tracing::trace_anyhow_error};
+
+use prima_tracing::trace_error;
+
+#[test]
+fn produce_trace_error() {
+    let error = "not a number".parse::<usize>().unwrap_err();
+
+    with_test_tracing(
+        || {
+            trace_error!(error, "Parsing error!", something = "something");
+        },
+        |events| {
+            let event = events.first().unwrap();
+
+            assert_eq!(event["error.message"], "invalid digit found in string");
+            assert_eq!(event["error.kind"], "core::num::error::ParseIntError");
+            assert_eq!(
+                event["error.stack"].as_debug_str(),
+                Some("invalid digit found in string")
+            );
+            assert!(event["error.trace"].as_debug_str().is_some());
+            assert!(event["error.trace"]
+                .as_debug_str()
+                .unwrap()
+                .contains("macros::produce_trace_error"));
+            assert_eq!(event["something"], "something");
+            assert_eq!(
+                event["message"].as_debug_str(),
+                Some("Parsing error! invalid digit found in string")
+            );
+        },
+    )
+}
+
+#[cfg(feature = "anyhow")]
+#[test]
+fn produce_trace_anyhow_error() {
+    let error = anyhow!("an error");
+
+    with_test_tracing(
+        || {
+            trace_anyhow_error!(error, "Throw error!");
+        },
+        |events| {
+            let event = events.first().unwrap();
+
+            assert_eq!(event["error.message"], "an error");
+            assert_eq!(event["error.kind"], "&dyn core::error::Error");
+            assert_eq!(event["error.stack"].as_debug_str(), Some("an error"));
+            assert_eq!(
+                event["error.trace"].as_debug_str(),
+                Some(format!("{}", error.backtrace()).as_str())
+            );
+            assert_eq!(
+                event["message"].as_debug_str(),
+                Some(format!("Throw error! {error:?}").as_str())
+            );
+        },
+    )
+}
+
+fn with_test_tracing<F, T>(tracing: F, tests: T)
+where
+    F: FnOnce(),
+    T: FnOnce(Vec<CapturedEvent>),
+{
+    let subscriber = tracing_subscriber::fmt().pretty().finish();
+    let storage: SharedStorage = SharedStorage::default();
+    let subscriber = subscriber.with(CaptureLayer::new(&storage));
+
+    tracing::subscriber::with_default(subscriber, || {
+        tracing::info_span!("test-span").in_scope(tracing);
+    });
+
+    let storage = storage.lock();
+    let span = storage.all_spans().next().unwrap();
+
+    tests(span.events().collect());
+}

tests/main.rs

@@ -1 +1,2 @@
 mod e2e;
+mod macros;