Skip to content

Wait for current loop to end before disposing the Kafka consumer #2381

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
jeremydmiller merged 1 commit into from
Mar 31, 2026
+18 −8
Merged

Wait for current loop to end before disposing the Kafka consumer #2381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 9 additions & 4 deletions src/Transports/Kafka/Wolverine.Kafka/Internals/KafkaListener.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ public KafkaListener(KafkaTopic topic, ConsumerConfig config,
var envelope = mapper!.CreateEnvelope(result.Topic, message);
envelope.Offset = result.Offset.Value;
envelope.MessageType ??= _messageTypeName;
if (topic.StampConsumerGroupIdOnEnvelope) envelope.GroupId = config.GroupId;

if (topic.StampConsumerGroupIdOnEnvelope)
envelope.GroupId = config.GroupId;

await receiver.ReceivedAsync(this, envelope);
}
Expand Down Expand Up @@ -105,10 +107,11 @@ public ValueTask DeferAsync(Envelope envelope)
return _receiver.ReceivedAsync(this, envelope);
}

public ValueTask DisposeAsync()
public async ValueTask DisposeAsync()
{
Dispose();
return ValueTask.CompletedTask;
await StopAsync();
_consumer.SafeDispose();
_runner.Dispose();
}

public Uri Address { get; }
Expand Down Expand Up @@ -165,6 +168,8 @@ public async Task MoveToErrorsAsync(Envelope envelope, Exception exception)

public void Dispose()
{
_cancellation.Cancel();
_runner.Wait();
_consumer.SafeDispose();
_runner.Dispose();
}
Expand Down
13 changes: 9 additions & 4 deletions src/Transports/Kafka/Wolverine.Kafka/Internals/KafkaTopicGroupListener.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ public KafkaTopicGroupListener(KafkaTopicGroup endpoint, ConsumerConfig config,

var envelope = mapper!.CreateEnvelope(result.Topic, message);
envelope.Offset = result.Offset.Value;
if (endpoint.StampConsumerGroupIdOnEnvelope) envelope.GroupId = config.GroupId;

if (endpoint.StampConsumerGroupIdOnEnvelope)
envelope.GroupId = config.GroupId;

await receiver.ReceivedAsync(this, envelope);
}
Expand Down Expand Up @@ -101,10 +103,11 @@ public ValueTask DeferAsync(Envelope envelope)
return _receiver.ReceivedAsync(this, envelope);
}

public ValueTask DisposeAsync()
public async ValueTask DisposeAsync()
{
Dispose();
return ValueTask.CompletedTask;
await StopAsync();
_consumer.SafeDispose();
_runner.Dispose();
}

public Uri Address { get; }
Expand Down Expand Up @@ -162,6 +165,8 @@ public async Task MoveToErrorsAsync(Envelope envelope, Exception exception)

public void Dispose()
{
_cancellation.Cancel();
_runner.Wait();
_consumer.SafeDispose();
_runner.Dispose();
}
Expand Down
Loading