Auto merge of #4036 - rust-lang:renovate/sentry-conduit-0.x, r=Turbo87

Update Rust crate sentry-conduit to 0.3.0

[![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [sentry-conduit](https://crates.io/crates/sentry-conduit) | dependencies | minor | `0.2.0` -> `0.3.0` |

---

### Configuration

📅 **Schedule**: At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Renovate will not automatically rebase this PR, because other commits have been found.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, click this checkbox.

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/rust-lang/crates.io).

Author: bors

Cargo.lock

@@ -74,7 +74,7 @@ reqwest = { version = "0.11", features = ["blocking", "gzip", "json"] }
 scheduled-thread-pool = "0.2.0"
 semver = { version = "1.0.3", features = ["serde"] }
 sentry = { version = "0.23.0", features = ["tracing"] }
-sentry-conduit = "0.2.0"
+sentry-conduit = { version = "0.3.0", default-features = false }
 serde = { version = "1.0.0", features = ["derive"] }
 serde_json = "1.0.0"
 sha2 = "0.9"

Cargo.toml

@@ -44,8 +44,8 @@ pub fn build_middleware(app: Arc<App>, endpoints: RouteBuilder) -> MiddlewareBui
     let blocked_traffic = app.config.blocked_traffic.clone();
 
     if env != Env::Test {
+        m.add(SentryMiddleware::default());
         m.add(log_request::LogRequests::default());
-        m.around(SentryMiddleware::default());
     }
 
     if env == Env::Development {

src/middleware.rs

@@ -151,11 +151,17 @@ struct C(pub fn(&mut dyn RequestExt) -> EndpointResult);
 
 impl Handler for C {
     fn call(&self, req: &mut dyn RequestExt) -> HandlerResult {
-        // Allow blocking individual routes by their pattern through the `BLOCKED_ROUTES`
-        // environment variable. This is not in a middleware because we need access to
-        // `RoutePattern` before executing the response handler.
         if let Some(pattern) = req.extensions().find::<RoutePattern>() {
-            if req.app().config.blocked_routes.contains(pattern.pattern()) {
+            let pattern = pattern.pattern();
+
+            // Configure the Sentry `transaction` field *before* we handle the request,
+            // but *after* the conduit-router has figured out which handler to use.
+            sentry::configure_scope(|scope| scope.set_transaction(Some(pattern)));
+
+            // Allow blocking individual routes by their pattern through the `BLOCKED_ROUTES`
+            // environment variable. This is not in a middleware because we need access to
+            // `RoutePattern` before executing the response handler.
+            if req.app().config.blocked_routes.contains(pattern) {
                 return Ok(RouteBlocked.response().unwrap());
             }
         }