diff --git a/foundations-sentry/Cargo.toml b/foundations-sentry/Cargo.toml index 206f14f8..030c1d27 100644 --- a/foundations-sentry/Cargo.toml +++ b/foundations-sentry/Cargo.toml @@ -33,9 +33,9 @@ workspace = true backtrace = { workspace = true } foundations = { workspace = true, features = ["settings", "ratelimit", "metrics"] } governor = { workspace = true } -sentry-backtrace = "0.47.0" -sentry-core = "0.47.0" -sentry-panic = "0.47.0" +sentry-backtrace = "0.49.0" +sentry-core = "0.49.0" +sentry-panic = "0.49.0" [dev-dependencies] -sentry-core = { version = "0.47.0", features = ["test"] } +sentry-core = { version = "0.49.0", features = ["test"] } diff --git a/foundations-sentry/tests/no_flush_panic.rs b/foundations-sentry/tests/no_flush_panic.rs index 04fa0bcd..8dc39dcd 100644 --- a/foundations-sentry/tests/no_flush_panic.rs +++ b/foundations-sentry/tests/no_flush_panic.rs @@ -48,17 +48,13 @@ fn capture_panic( panic: impl FnOnce() + std::panic::UnwindSafe, ) -> Event<'static> { let transport = CountingTransport::new(); - let options = ClientOptions { - dsn: Some(TEST_DSN.parse().unwrap()), - transport: Some(Arc::new(Arc::clone(&transport))), - attach_stacktrace: true, - default_integrations: false, - integrations: vec![ - Arc::new(UnresolvedStacktraceIntegration), - Arc::new(integration), - ], - ..Default::default() - }; + let options = ClientOptions::default() + .dsn(TEST_DSN) + .transport(Arc::new(Arc::clone(&transport))) + .attach_stacktrace(true) + .default_integrations(false) + .add_integration(UnresolvedStacktraceIntegration) + .add_integration(integration); let client = sentry_core::Client::with_options(options); let hub = Hub::new(Some(Arc::new(client)), Default::default()); diff --git a/foundations-sentry/tests/sentry_hook.rs b/foundations-sentry/tests/sentry_hook.rs index dbb309ea..725477cf 100644 --- a/foundations-sentry/tests/sentry_hook.rs +++ b/foundations-sentry/tests/sentry_hook.rs @@ -78,14 +78,12 @@ fn sentry_hook_preserves_previous_before_send_hook() { let previous_hook_count = Arc::new(AtomicU64::new(0)); let counter = Arc::clone(&previous_hook_count); - let mut options = ClientOptions { + let mut options = ClientOptions::default() // Install a custom before_send hook first - before_send: Some(Arc::new(move |event| { + .before_send(move |event| { counter.fetch_add(1, Ordering::Relaxed); Some(event) - })), - ..Default::default() - }; + }); // Now install foundations hook foundations_sentry::install_hook_with_settings(&mut options, &Default::default()); diff --git a/foundations-sentry/tests/unresolved_stacktrace.rs b/foundations-sentry/tests/unresolved_stacktrace.rs index fac59217..a7eb15bf 100644 --- a/foundations-sentry/tests/unresolved_stacktrace.rs +++ b/foundations-sentry/tests/unresolved_stacktrace.rs @@ -1,5 +1,3 @@ -use std::sync::Arc; - use foundations_sentry::backtrace::UnresolvedStacktraceIntegration; use sentry_core::protocol::{Event, Exception, Frame, Stacktrace, Thread}; use sentry_core::{ClientOptions, Integration}; @@ -8,10 +6,7 @@ fn process_event(event: Event<'static>, attach_stacktrace: bool) -> Event<'stati UnresolvedStacktraceIntegration .process_event( event, - &ClientOptions { - attach_stacktrace, - ..Default::default() - }, + &ClientOptions::default().attach_stacktrace(attach_stacktrace), ) .unwrap() } @@ -144,12 +139,10 @@ fn preserves_empty_stacktrace() { #[test] #[should_panic(expected = "must replace sentry_backtrace::AttachStacktraceIntegration")] fn rejects_resolving_stacktrace_integration() { - sentry_core::Client::with_options(ClientOptions { - default_integrations: false, - integrations: vec![ - Arc::new(sentry_backtrace::AttachStacktraceIntegration), - Arc::new(UnresolvedStacktraceIntegration), - ], - ..Default::default() - }); + sentry_core::Client::with_options( + ClientOptions::default() + .default_integrations(false) + .add_integration(sentry_backtrace::AttachStacktraceIntegration) + .add_integration(UnresolvedStacktraceIntegration), + ); }