From 29cbf5cb4bf2f16600ec0d53e5a6b6c2829e6dfe Mon Sep 17 00:00:00 2001
From: Laura Hausmann <laura@hausmann.dev>
Date: Thu, 24 Oct 2024 19:06:37 +0200
Subject: [PATCH] [backend/asp] Return trace identifier header even when no
 error has occurred

---
 .../Core/Middleware/ErrorHandlerMiddleware.cs              | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Iceshrimp.Backend/Core/Middleware/ErrorHandlerMiddleware.cs b/Iceshrimp.Backend/Core/Middleware/ErrorHandlerMiddleware.cs
index 0a5919c9..8845c372 100644
--- a/Iceshrimp.Backend/Core/Middleware/ErrorHandlerMiddleware.cs
+++ b/Iceshrimp.Backend/Core/Middleware/ErrorHandlerMiddleware.cs
@@ -26,6 +26,7 @@ public class ErrorHandlerMiddleware(
 	{
 		try
 		{
+			ctx.Response.Headers.RequestId = ctx.TraceIdentifier;
 			await next(ctx);
 		}
 		catch (Exception e)
@@ -76,8 +77,7 @@ public class ErrorHandlerMiddleware(
 				if (verbosity > ExceptionVerbosity.Basic && ce.OverrideBasic)
 					verbosity = ExceptionVerbosity.Basic;
 
-				ctx.Response.StatusCode        = (int)ce.StatusCode;
-				ctx.Response.Headers.RequestId = ctx.TraceIdentifier;
+				ctx.Response.StatusCode = (int)ce.StatusCode;
 
 				if (isMastodon)
 				{
@@ -118,8 +118,7 @@ public class ErrorHandlerMiddleware(
 			}
 			else
 			{
-				ctx.Response.StatusCode        = 500;
-				ctx.Response.Headers.RequestId = ctx.TraceIdentifier;
+				ctx.Response.StatusCode = 500;
 
 				var error = new ErrorResponse(e)
 				{