diff --git a/Cargo.lock b/Cargo.lock index 88b75d71dd..dc6939f76a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1271,9 +1271,9 @@ dependencies = [ [[package]] name = "fragile" -version = "1.2.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85dcb89d2b10c5f6133de2efd8c11959ce9dbb46a2f7a4cab208c4eeda6ce1ab" +checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" dependencies = [ "slab", ] diff --git a/relay-server/Cargo.toml b/relay-server/Cargo.toml index 6407920b1c..5e3c7c2136 100644 --- a/relay-server/Cargo.toml +++ b/relay-server/Cargo.toml @@ -35,7 +35,7 @@ chrono = { version = "0.4.11", features = ["serde"] } clap = "2.33.1" failure = "0.1.8" flate2 = "1.0.19" -fragile = { version = "1.2.1", features = ["slab"] } # used for vendoring sentry-actix +fragile = { version = "2.0.0", features = ["slab"] } # used for vendoring sentry-actix futures = { version = "0.3", package = "futures", features = ["compat"] } futures01 = { version = "0.1.28", package = "futures" } hashbrown = "0.12.3" diff --git a/relay-server/src/middlewares.rs b/relay-server/src/middlewares.rs index 9b48cd722e..d0c15c5835 100644 --- a/relay-server/src/middlewares.rs +++ b/relay-server/src/middlewares.rs @@ -199,12 +199,14 @@ impl Middleware for SentryMiddleware { let root_scope = hub.push_scope(); hub.configure_scope(move |scope| { scope.add_event_processor(move |mut event| { + fragile::stack_token!(tok); + let mut cached_data = cached_data.lock().unwrap(); if cached_data.is_none() && req.is_valid() { let with_pii = client .as_ref() .map_or(false, |x| x.options().send_default_pii); - *cached_data = Some(extract_request(req.get(), with_pii)); + *cached_data = Some(extract_request(req.get(tok), with_pii)); } if let Some((ref transaction, ref req)) = *cached_data {