refactor: separate tracing and analytics middlewares as it was

Author: lsipii

VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/Middleware/AnalyticsMiddleware.cs

@@ -4,6 +4,9 @@
 
 namespace VirtualFinland.UserAPI.Middleware;
 
+/// <summary>
+/// Adds analytics to the request pipeline (for authenticated user requests)
+/// </summary>
 public class AnalyticsMiddleware
 {
     private readonly RequestDelegate _next;
@@ -17,11 +20,6 @@ public AnalyticsMiddleware(RequestDelegate next, AnalyticsService analyticsServi
 
     public async Task Invoke(HttpContext context)
     {
-        if (context.Request.Headers.TryGetValue(Constants.Headers.XRequestTraceId, out var traceId))
-        {
-            context.TraceIdentifier = traceId;
-        }
-
         await _next.Invoke(context);
 
         var authenticatedUser = context.Items["User"];

VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/Middleware/RequestTracingMiddleware.cs

@@ -0,0 +1,26 @@
+using VirtualFinland.UserAPI.Helpers;
+
+namespace VirtualFinland.UserAPI.Middleware;
+
+/// <summary>
+/// Overrides the trace identifier with the value of the X-Request-TraceId header (if present)
+/// </summary>
+public class RequestTracingMiddleware
+{
+    private readonly RequestDelegate _next;
+
+    public RequestTracingMiddleware(RequestDelegate next)
+    {
+        _next = next;
+    }
+
+    public async Task Invoke(HttpContext context)
+    {
+        if (context.Request.Headers.TryGetValue(Constants.Headers.XRequestTraceId, out var traceId))
+        {
+            context.TraceIdentifier = traceId;
+        }
+
+        await _next.Invoke(context);
+    }
+}

VirtualFinland.UserAPI/src/VirtualFinland.UsersAPI/Program.cs

@@ -191,6 +191,7 @@
     };
 });
 
+app.UseMiddleware<RequestTracingMiddleware>();
 app.UseMiddleware<AnalyticsMiddleware>();
 app.UseMiddleware<ErrorHandlerMiddleware>();
 app.UseHttpsRedirection();