fix(s3): correlate server-owned request IDs (#5433)

* fix(s3): correlate server-owned request IDs

* fix(server): preserve trace context and Swift routing

---------

Co-authored-by: houseme <housemecn@gmail.com>

crates/protocols/src/swift/router.rs

@@ -84,20 +84,19 @@ impl SwiftRouter {
         Self { enabled, url_prefix }
     }
 
+    /// Return whether a URI matches the Swift route shape without allocating
+    /// decoded route components.
+    pub fn matches(&self, uri: &Uri) -> bool {
+        let Some(path) = self.route_path(uri) else {
+            return false;
+        };
+        let mut segments = path.trim_start_matches('/').split('/');
+        segments.next() == Some("v1") && segments.next().is_some_and(Self::is_valid_account)
+    }
+
     /// Parse a URI and return a SwiftRoute if it matches Swift URL pattern
     pub fn route(&self, uri: &Uri, method: Method) -> Option<SwiftRoute> {
-        if !self.enabled {
-            return None;
-        }
-
-        let path = uri.path();
-
-        // Strip optional prefix
-        let path = if let Some(prefix) = &self.url_prefix {
-            path.strip_prefix(&format!("/{}/", prefix))?
-        } else {
-            path
-        };
+        let path = self.route_path(uri)?;
 
         // Split path into segments - preserve empty segments to maintain object key fidelity
         // Swift allows trailing slashes and consecutive slashes in object names (e.g., "dir/" or "a//b")
@@ -175,6 +174,17 @@ impl SwiftRouter {
     fn is_valid_account(account: &str) -> bool {
         ACCOUNT_PATTERN.is_match(account)
     }
+
+    fn route_path<'a>(&self, uri: &'a Uri) -> Option<&'a str> {
+        if !self.enabled {
+            return None;
+        }
+        let path = uri.path();
+        let Some(prefix) = &self.url_prefix else {
+            return Some(path);
+        };
+        path.strip_prefix('/')?.strip_prefix(prefix)?.strip_prefix('/')
+    }
 }
 
 #[cfg(test)]
@@ -281,6 +291,42 @@ mod tests {
         assert_eq!(route, None);
     }
 
+    #[test]
+    fn test_matches_agrees_with_route_without_decoding_components() {
+        let router = SwiftRouter::new(true, None);
+        for path in [
+            "/v1/AUTH_project",
+            "/v1/AUTH_project/",
+            "/v1/AUTH_project/container",
+            "/v1/AUTH_project/container/a%20long/object",
+            "//v1/AUTH_project/container/object",
+            "/v1/not-a-swift-account/object",
+            "/v1/AUTH_/object",
+            "/bucket/object",
+        ] {
+            let uri = path.parse().expect("Swift route test URI");
+            assert_eq!(
+                router.matches(&uri),
+                router.route(&uri, Method::GET).is_some(),
+                "classification must match full routing for {path}"
+            );
+        }
+
+        let prefixed_router = SwiftRouter::new(true, Some("swift".to_string()));
+        for path in [
+            "/swift/v1/AUTH_project/container",
+            "/swiftish/v1/AUTH_project/container",
+            "/v1/AUTH_project/container",
+        ] {
+            let uri = path.parse().expect("prefixed Swift route test URI");
+            assert_eq!(
+                prefixed_router.matches(&uri),
+                prefixed_router.route(&uri, Method::GET).is_some(),
+                "prefixed classification must match full routing for {path}"
+            );
+        }
+    }
+
     #[test]
     fn test_project_id_extraction() {
         let route = SwiftRoute::Account {