diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ac9472f..41f659f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ - The minium supported Rust version was bumped to **1.46.0** due to requirements from dependencies. +**Features**: + +- Allow capturing backtraces from anyhow errors. + **Fixes**: - Honor the `attach_stacktrace` option correctly when capturing errors. diff --git a/sentry-anyhow/Cargo.toml b/sentry-anyhow/Cargo.toml index 55677be2..5da0f56e 100644 --- a/sentry-anyhow/Cargo.toml +++ b/sentry-anyhow/Cargo.toml @@ -12,8 +12,9 @@ Sentry integration for anyhow. edition = "2018" [dependencies] +sentry-backtrace = { version = "0.22.0", path = "../sentry-backtrace" } sentry-core = { version = "0.22.0", path = "../sentry-core" } -anyhow = "1.0.30" +anyhow = { version = "1.0.39", features = ["backtrace"] } [dev-dependencies] sentry = { version = "0.22.0", path = "../sentry", default-features = false, features = ["test"] } diff --git a/sentry-anyhow/src/lib.rs b/sentry-anyhow/src/lib.rs index ddfd7c23..5163b648 100644 --- a/sentry-anyhow/src/lib.rs +++ b/sentry-anyhow/src/lib.rs @@ -64,8 +64,33 @@ pub trait AnyhowHubExt { } impl AnyhowHubExt for Hub { - fn capture_anyhow(&self, e: &anyhow::Error) -> Uuid { - let e: &dyn std::error::Error = e.as_ref(); - self.capture_error(e) + fn capture_anyhow(&self, anyhow_error: &anyhow::Error) -> Uuid { + let dyn_err: &dyn std::error::Error = anyhow_error.as_ref(); + let mut event = sentry_core::event_from_error(dyn_err); + + // exception records are sorted in reverse + if let Some(exc) = event.exception.iter_mut().last() { + let backtrace = anyhow_error.backtrace(); + exc.stacktrace = sentry_backtrace::parse_stacktrace(&format!("{:#}", backtrace)); + } + + self.capture_event(event) } } + +#[test] +fn test_has_backtrace() { + std::env::set_var("RUST_BACKTRACE", "1"); + + let events = sentry::test::with_captured_events(|| { + capture_anyhow(&anyhow::anyhow!("Oh jeez")); + }); + + let stacktrace = events[0].exception[0].stacktrace.as_ref().unwrap(); + let found_test_fn = stacktrace.frames.iter().any(|frame| match &frame.function { + Some(f) => f.contains("test_has_backtrace"), + None => false, + }); + + assert!(found_test_fn); +} diff --git a/sentry-backtrace/src/parse.rs b/sentry-backtrace/src/parse.rs index 44677e40..1657996a 100644 --- a/sentry-backtrace/src/parse.rs +++ b/sentry-backtrace/src/parse.rs @@ -24,6 +24,7 @@ lazy_static::lazy_static! { \s+at\s # padded "at" in new line (?P[^\r\n]+?) # path to source file (?::(?P\d+))? # optional source line + (?::(?P\d+))? # optional source column )? $ "#).unwrap(); @@ -34,7 +35,7 @@ pub fn parse_stacktrace(bt: &str) -> Option { let mut last_address = None; let frames = FRAME_RE - .captures_iter(&bt) + .captures_iter(bt) .map(|captures| { let abs_path = captures.name("path").map(|m| m.as_str().to_string()); let filename = abs_path.as_ref().map(|p| filename(p).to_string()); @@ -63,6 +64,9 @@ pub fn parse_stacktrace(bt: &str) -> Option { lineno: captures .name("lineno") .map(|x| x.as_str().parse::().unwrap()), + colno: captures + .name("colno") + .map(|x| x.as_str().parse::().unwrap()), ..Default::default() } })