Skip to content

Fix OTel activity leak in Direct request mode #1047

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
mtmk merged 3 commits into from
Jan 29, 2026
Merged

Fix OTel activity leak in Direct request mode #1047

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1cc5671
Fix OTel activity leak in Direct request mode
mtmk Jan 22, 2026
9743343
Add tests
mtmk Jan 29, 2026
8414954
Merge branch 'main' into fix-direct-mode-otel-activity-disposal
mtmk Jan 29, 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
8 changes: 6 additions & 2 deletions src/NATS.Client.Core/NatsConnection.RequestReply.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@ public async ValueTask<NatsMsg<TReply>> RequestAsync<TRequest, TReply>(
using var rt = _replyTaskFactory.CreateReplyTask(replySerializer, replyOpts.Timeout);
requestSerializer ??= Opts.SerializerRegistry.GetSerializer<TRequest>();
await PublishAsync(subject, data, headers, rt.Subject, requestSerializer, requestOpts, cancellationToken).ConfigureAwait(false);
return await rt.GetResultAsync(cancellationToken).ConfigureAwait(false);
var msg = await rt.GetResultAsync(cancellationToken).ConfigureAwait(false);
msg.Headers?.Activity?.Dispose();
return msg;
}

await using var sub1 = await CreateRequestSubAsync<TRequest, TReply>(subject, data, headers, requestSerializer, replySerializer, requestOpts, replyOpts, cancellationToken)
Expand All @@ -77,7 +79,9 @@ public async ValueTask<NatsMsg<TReply>> RequestAsync<TRequest, TReply>(
using var rt = _replyTaskFactory.CreateReplyTask(replySerializer, replyOpts.Timeout);
requestSerializer ??= Opts.SerializerRegistry.GetSerializer<TRequest>();
await PublishAsync(subject, data, headers, rt.Subject, requestSerializer, requestOpts, cancellationToken).ConfigureAwait(false);
return await rt.GetResultAsync(cancellationToken).ConfigureAwait(false);
var msg = await rt.GetResultAsync(cancellationToken).ConfigureAwait(false);
msg.Headers?.Activity?.Dispose();
return msg;
}

await using var sub = await CreateRequestSubAsync<TRequest, TReply>(subject, data, headers, requestSerializer, replySerializer, requestOpts, replyOpts, cancellationToken)
Expand Down
Loading