From 21e899b8bdb90216302f5489f8e2036e55a17e7a Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Sat, 29 Jul 2023 09:42:23 +0800
Subject: [PATCH] Update AbpCorrelationIdMiddleware.cs

---
 .../Abp/AspNetCore/Tracing/AbpCorrelationIdMiddleware.cs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Tracing/AbpCorrelationIdMiddleware.cs b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Tracing/AbpCorrelationIdMiddleware.cs
index 2e78d9f666..c73f8641ad 100644
--- a/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Tracing/AbpCorrelationIdMiddleware.cs
+++ b/framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/Tracing/AbpCorrelationIdMiddleware.cs
@@ -21,9 +21,12 @@ public class AbpCorrelationIdMiddleware : IMiddleware, ITransientDependency
 
     public async Task InvokeAsync(HttpContext context, RequestDelegate next)
     {
-        var correlationId = _correlationIdProvider.Get();
-        CheckAndSetCorrelationIdOnResponse(context, _options, correlationId);
-        await next(context);
+        var correlationId = GetCorrelationIdFromRequest(context);
+        using (_correlationIdProvider.Change(correlationId))
+        {
+            CheckAndSetCorrelationIdOnResponse(context, _options, correlationId);
+            await next(context);
+        }
     }
 
     protected virtual void CheckAndSetCorrelationIdOnResponse(