From 1b1f258d1b06a7c75bb83fb93bdd2adf3cc5367d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Marti=CC=81nez=20Bernardo?=
 <pablo.martinezbernardo@datadoghq.com>
Date: Thu, 12 Feb 2026 12:03:35 +0100
Subject: [PATCH] extract_request_body before exiting handle_end_invocation

---
 bottlecap/src/lifecycle/listener.rs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/bottlecap/src/lifecycle/listener.rs b/bottlecap/src/lifecycle/listener.rs
index f6b32fb68..060e2ecfe 100644
--- a/bottlecap/src/lifecycle/listener.rs
+++ b/bottlecap/src/lifecycle/listener.rs
@@ -164,16 +164,16 @@ impl Listener {
         State((invocation_processor_handle, _, tasks)): State<ListenerState>,
         request: Request,
     ) -> Response {
+        let (parts, body) = match extract_request_body(request).await {
+            Ok(r) => r,
+            Err(e) => {
+                error!("Failed to extract request body: {e}");
+                return (StatusCode::OK, json!({}).to_string()).into_response();
+            }
+        };
+
         let mut join_set = tasks.lock().await;
         join_set.spawn(async move {
-            let (parts, body) = match extract_request_body(request).await {
-                Ok(r) => r,
-                Err(e) => {
-                    error!("Failed to extract request body: {e}");
-                    return;
-                }
-            };
-
             Self::universal_instrumentation_end(&parts.headers, body, invocation_processor_handle)
                 .await;
         });