fix(#446605): broaden shutdown OperationCanceledException guard in ReceiverWrapper#114
Merged
Merged
Conversation
…o cover CancellationToken.None The previous guard checked oce.CancellationToken.IsCancellationRequested, but the Azure ServiceBus SDK raises ProcessErrorAsync with a TaskCanceledException whose CancellationToken is CancellationToken.None during processor shutdown — so IsCancellationRequested is always false and the guard never fired. Widening to any OperationCanceledException is safe because genuine transport errors are ServiceBusException, not OperationCanceledException. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
ecofrankie
force-pushed
the
teams/core/209/task/446605
branch
from
0ddd607 to
596055e
Compare
benspeth
approved these changes
Jun 9, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
oce.CancellationToken.IsCancellationRequestedfrom the guard inReceiverWrapper.OnExceptionOccuredProcessErrorAsyncwith aTaskCanceledExceptionwhose.CancellationTokenisCancellationToken.Noneduring shutdown — the previous guard never firedOperationCanceledExceptionis safe: genuine transport errors surface asServiceBusException, notOperationCanceledExceptionCancellationToken.None(the actual SDK case) and a dedicatedTaskCanceledExceptionvariantContext
PR #204351 shipped as v5.7.2 with a guard checking
IsCancellationRequested. Post-deployment APM analysis (ADO task #446605 / US #442484) confirmed 30TaskCanceledExceptionerrors still appearing in a shutdown burst — the Azure SDK sets the token toCancellationToken.Noneinternally so the guard was alwaysfalse.Test plan
OnExceptionOccured_WithOperationCanceledException_DoesNotLogError— SDK shutdown path withCancellationToken.NoneOnExceptionOccured_WithTaskCanceledException_DoesNotLogError— explicitTaskCanceledExceptioncaseOnExceptionOccured_WithNonCancelledToken_LogsError— confirms genuine errors still log at Error