From d01fc48262079df18c94f947c1ee43a6e7b73559 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Tue, 27 Jan 2026 18:33:18 +0800
Subject: [PATCH 1/2] Add correlation ID support to RabbitMQ's JobQueue

Resolve #24753
---
 .../Volo/Abp/BackgroundJobs/RabbitMQ/JobQueue.cs      | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/JobQueue.cs b/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/JobQueue.cs
index bdc28c7ca0..3d55bb67b4 100644
--- a/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/JobQueue.cs
+++ b/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/JobQueue.cs
@@ -12,6 +12,7 @@ using RabbitMQ.Client.Events;
 using Volo.Abp.ExceptionHandling;
 using Volo.Abp.RabbitMQ;
 using Volo.Abp.Threading;
+using Volo.Abp.Tracing;
 
 namespace Volo.Abp.BackgroundJobs.RabbitMQ;
 
@@ -33,6 +34,7 @@ public class JobQueue<TArgs> : IJobQueue<TArgs>
     protected IBackgroundJobExecuter JobExecuter { get; }
     protected IServiceScopeFactory ServiceScopeFactory { get; }
     protected IExceptionNotifier ExceptionNotifier { get; }
+    protected ICorrelationIdProvider CorrelationIdProvider { get; }
 
     protected SemaphoreSlim SyncObj = new SemaphoreSlim(1, 1);
     protected bool IsDiposed { get; private set; }
@@ -44,7 +46,8 @@ public class JobQueue<TArgs> : IJobQueue<TArgs>
         IRabbitMqSerializer serializer,
         IBackgroundJobExecuter jobExecuter,
         IServiceScopeFactory serviceScopeFactory,
-        IExceptionNotifier exceptionNotifier)
+        IExceptionNotifier exceptionNotifier,
+        ICorrelationIdProvider correlationIdProvider)
     {
         AbpBackgroundJobOptions = backgroundJobOptions.Value;
         AbpRabbitMqBackgroundJobOptions = rabbitMqAbpBackgroundJobOptions.Value;
@@ -52,6 +55,7 @@ public class JobQueue<TArgs> : IJobQueue<TArgs>
         JobExecuter = jobExecuter;
         ServiceScopeFactory = serviceScopeFactory;
         ExceptionNotifier = exceptionNotifier;
+        CorrelationIdProvider = correlationIdProvider;
         ChannelPool = channelPool;
 
         JobConfiguration = AbpBackgroundJobOptions.GetJob(typeof(TArgs));
@@ -201,7 +205,10 @@ public class JobQueue<TArgs> : IJobQueue<TArgs>
 
             try
             {
-                await JobExecuter.ExecuteAsync(context);
+                using (CorrelationIdProvider.Change(ea.BasicProperties.CorrelationId))
+                {
+                    await JobExecuter.ExecuteAsync(context);
+                }
                 await ChannelAccessor!.Channel.BasicAckAsync(deliveryTag: ea.DeliveryTag, multiple: false);
             }
             catch (BackgroundJobExecutionException)

From fcc13150143defc3ca1b7681ac349a2584378667 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Wed, 28 Jan 2026 08:23:51 +0800
Subject: [PATCH 2/2] Add CorrelationId to RabbitMQ job messages

---
 .../Volo/Abp/BackgroundJobs/RabbitMQ/JobQueue.cs               | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/JobQueue.cs b/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/JobQueue.cs
index 3d55bb67b4..1e2280b78a 100644
--- a/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/JobQueue.cs
+++ b/framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/JobQueue.cs
@@ -172,7 +172,8 @@ public class JobQueue<TArgs> : IJobQueue<TArgs>
         var routingKey = QueueConfiguration.QueueName;
         var basicProperties = new BasicProperties
         {
-            Persistent = true
+            Persistent = true,
+            CorrelationId = CorrelationIdProvider.Get()
         };
 
         if (delay.HasValue)