From 9e60371aeb9f46acbcf45fb225ebecbfbcda028e Mon Sep 17 00:00:00 2001
From: Quentin Gliech <quenting@element.io>
Date: Thu, 4 Jun 2026 12:31:17 +0200
Subject: [PATCH] mas-cli: log the requester on the request log line

Add `requester=...` to the `http.server.response` log line, reading the
`Requester` recorded on the request's `LogContext`.
---
 crates/cli/src/server.rs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/crates/cli/src/server.rs b/crates/cli/src/server.rs
index 15114a5d9..917c255d7 100644
--- a/crates/cli/src/server.rs
+++ b/crates/cli/src/server.rs
@@ -191,7 +191,12 @@ async fn log_response_middleware(
 
     let response = next.run(request).await;
 
-    let Some(stats) = LogContext::maybe_with(LogContext::stats) else {
+    let Some((stats, requester)) = LogContext::maybe_with(|ctx| {
+        (
+            ctx.stats(),
+            ctx.requester().cloned().map(tracing::field::display),
+        )
+    }) else {
         tracing::error!("Missing log context for request, this is a bug!");
         return response;
     };
@@ -200,14 +205,17 @@ async fn log_response_middleware(
     match status_code.as_u16() {
         100..=399 => tracing::info!(
             name: "http.server.response",
+            { requester = requester },
             "\"{method} {path} HTTP/{version}\" {status_code} {user_agent:?} [{stats}]",
         ),
         400..=499 => tracing::warn!(
             name: "http.server.response",
+            { requester = requester },
             "\"{method} {path} HTTP/{version}\" {status_code} {user_agent:?} [{stats}]",
         ),
         500..=599 => tracing::error!(
             name: "http.server.response",
+            { requester = requester },
             "\"{method} {path} HTTP/{version}\" {status_code} {user_agent:?} [{stats}]",
         ),
         _ => { /* This shouldn't happen */ }