Skip to content

Add correlation ID support to RabbitMQ's JobQueue #24755

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
EngincanV merged 2 commits into from
Jan 28, 2026
Merged

Add correlation ID support to RabbitMQ's JobQueue #24755

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d01fc48
Add correlation ID support to RabbitMQ's JobQueue
maliming Jan 27, 2026
fcc1315
Add CorrelationId to RabbitMQ job messages
maliming Jan 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions framework/src/Volo.Abp.BackgroundJobs.RabbitMQ/Volo/Abp/BackgroundJobs/RabbitMQ/JobQueue.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
using Volo.Abp.ExceptionHandling;
using Volo.Abp.RabbitMQ;
using Volo.Abp.Threading;
using Volo.Abp.Tracing;

namespace Volo.Abp.BackgroundJobs.RabbitMQ;

Expand All @@ -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; }
Expand All @@ -44,14 +46,16 @@ public JobQueue(
IRabbitMqSerializer serializer,
IBackgroundJobExecuter jobExecuter,
IServiceScopeFactory serviceScopeFactory,
IExceptionNotifier exceptionNotifier)
IExceptionNotifier exceptionNotifier,
ICorrelationIdProvider correlationIdProvider)
{
AbpBackgroundJobOptions = backgroundJobOptions.Value;
AbpRabbitMqBackgroundJobOptions = rabbitMqAbpBackgroundJobOptions.Value;
Serializer = serializer;
JobExecuter = jobExecuter;
ServiceScopeFactory = serviceScopeFactory;
ExceptionNotifier = exceptionNotifier;
CorrelationIdProvider = correlationIdProvider;
ChannelPool = channelPool;

JobConfiguration = AbpBackgroundJobOptions.GetJob(typeof(TArgs));
Expand Down Expand Up @@ -201,7 +205,10 @@ protected virtual async Task MessageReceived(object sender, BasicDeliverEventArg

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)
Expand Down
Loading