@@ -84,7 +84,7 @@ reqwest = { version = "0.13.4", default-features = false }
 ring = "0.17.14"
 rustls = { version = "0.23.40", default-features = false }
 secrecy = "0.10.3"
-sentry = "0.49.3"
+sentry = "0.49.5"
 sentry-options = "1.2.4"
 sentry_arroyo = "2.47.0"
 # - `ssl` is required for SASL/SCRAM
 
@@ -18,7 +18,7 @@ sentry = ["init", "dep:sentry"]
 [dependencies]
 anyhow = { workspace = true }
 console = { workspace = true, optional = true }
-sentry = { workspace = true, features = ["tracing"], optional = true }
+sentry = { workspace = true, features = ["tracing", "logs"], optional = true }
 serde = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter", "json"], optional = true }
@@ -6,7 +6,7 @@
 //!    `objectstore_log::info!()`. Never import the macros; always qualify at the call site.
 //! 2. [`LoggingConfig`] and [`LogFormat`] for configuring log level and output format, and
 //!    (behind the `init` feature) an [`init`] function to wire up a `tracing-subscriber` stack.
-//!    When built with the `sentry` feature, `init` also attaches a Sentry tracing layer if the
+//!    When built with the `sentry` feature, `init` also attaches Sentry tracing layers if the
 //!    Sentry client has already been initialized.
 //! 3. Custom level macros (`error!`, `warn!`, etc.) that extend their `tracing` equivalents with
 //!    an optional `!<error>` first argument for ergonomic error field attachment, plus [`event_dyn!`]
 
@@ -1,7 +1,6 @@
 use tracing_subscriber::prelude::*;
 use tracing_subscriber::{EnvFilter, Registry};
 
-use crate::Level;
 use crate::config::{LogFormat, LoggingConfig};
 
 // Generated by build.rs: `const CRATE_NAMES: &[&str]` listing all objectstore workspace crates.
@@ -13,26 +12,33 @@ include!(concat!(env!("OUT_DIR"), "/constants.gen.rs"));
 /// for internal objectstore crates. Log format (`pretty`, `simplified`, or `json`) is determined
 /// by `config.format`, defaulting to pretty when a terminal is attached.
 ///
-/// When built with the `sentry` feature, also attaches a Sentry tracing layer if the Sentry client
-/// has been initialized. `ERROR` and `WARN` events become Sentry events; `INFO`/`DEBUG` become
-/// Sentry logs; `TRACE` events are ignored. `ERROR`..`DEBUG` spans become Sentry spans; `TRACE`
-/// spans are ignored.
+/// When built with the `sentry` feature, also attaches Sentry tracing layers if the Sentry client
+/// has been initialized. `ERROR`..`DEBUG` spans become Sentry spans and `ERROR`..`DEBUG` events
+/// become Sentry logs. `ERROR` and `WARN` events also become Sentry error events. Logs and error
+/// events include the attributes of their parent spans. `TRACE` spans and events are ignored.
 pub fn init(config: &LoggingConfig) {
     #[cfg(feature = "sentry")]
     let sentry_layer = sentry::Hub::current()
         .client()
         .filter(|c| c.is_enabled())
         .map(|_| {
-            use sentry::integrations::tracing as sentry_tracing;
-            sentry_tracing::layer()
-                .event_filter(|metadata| match *metadata.level() {
-                    Level::ERROR | Level::WARN => {
-                        sentry_tracing::EventFilter::Event | sentry_tracing::EventFilter::Log
-                    }
-                    Level::INFO | Level::DEBUG => sentry_tracing::EventFilter::Log,
-                    Level::TRACE => sentry_tracing::EventFilter::Ignore,
-                })
-                .span_filter(|metadata| !matches!(*metadata.level(), Level::TRACE))
+            use sentry::integrations::tracing::{ErrorLayer, LogLayer, SpanLayer};
+            use tracing_subscriber::filter::{FilterExt, LevelFilter, filter_fn};
+
+            SpanLayer::new()
+                .with_filter(LevelFilter::DEBUG)
+                .and_then(
+                    ErrorLayer::new()
+                        .enable_span_attributes()
+                        // Span attributes come only from spans that pass both the span layer's
+                        // and the event layer's filter, so the error layer accepts all spans.
+                        .with_filter(LevelFilter::WARN.or(filter_fn(|m| m.is_span()))),
+                )
+                .and_then(
+                    LogLayer::new()
+                        .enable_span_attributes()
+                        .with_filter(LevelFilter::DEBUG),
+                )
         });
 
     let format = tracing_subscriber::fmt::layer()
 
@@ -2,7 +2,7 @@
 //!
 //! Call [`init_sentry`] during server startup before creating the Tokio runtime so it can
 //! instrument async tasks from the start. Tracing subscriber initialization (including the
-//! Sentry tracing layer) is handled by [`objectstore_log::init`].
+//! Sentry tracing layers) is handled by [`objectstore_log::init`].
 
 use secrecy::ExposeSecret;
 
 
@@ -98,7 +98,6 @@ impl App {
 mod tests {
     use axum::body::{Body, to_bytes};
     use axum::http::StatusCode;
-    use objectstore_log::tracing;
     use objectstore_service::backend::local_fs::FileSystemConfig;
     use sentry::protocol::{Context, EnvelopeItem, TraceContext, Transaction};
     use tower::ServiceExt;
@@ -123,8 +122,8 @@ mod tests {
             .unwrap();
         let _subscriber = tracing_subscriber::registry()
             .with(
-                sentry::integrations::tracing::layer()
-                    .span_filter(|metadata| *metadata.level() != tracing::Level::TRACE),
+                sentry::integrations::tracing::SpanLayer::new()
+                    .with_filter(tracing_subscriber::filter::LevelFilter::DEBUG),
             )
             .set_default();
         let trace_id = "11111111111111111111111111111111";