Skip to content

[Http.Resilience] The DisableFor method should try to retrieve the request object from the resilience context #6618

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
merged 1 commit into from
Jul 22, 2025
Merged

[Http.Resilience] The DisableFor method should try to retrieve the request object from the resilience context #6618

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
8 changes: 5 additions & 3 deletions ...ibraries/Microsoft.Extensions.Http.Resilience/Polly/HttpRetryStrategyOptionsExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using Microsoft.Shared.DiagnosticIds;
using Microsoft.Shared.Diagnostics;
using Polly;
using Polly.Retry;

namespace Microsoft.Extensions.Http.Resilience;

Expand Down Expand Up @@ -52,15 +53,16 @@ public static void DisableFor(this HttpRetryStrategyOptions options, params Http
{
var result = await shouldHandle(args).ConfigureAwait(args.Context.ContinueOnCapturedContext);

if (result &&
args.Outcome.Result is HttpResponseMessage response &&
response.RequestMessage is HttpRequestMessage request)
if (result && GetRequestMessage(args) is HttpRequestMessage request)
{
return !methods.Contains(request.Method);
}

return result;
};
}

private static HttpRequestMessage? GetRequestMessage(RetryPredicateArguments<HttpResponseMessage> args) =>
args.Outcome.Result?.RequestMessage ?? args.Context.GetRequestMessage();
}

16 changes: 11 additions & 5 deletions ...crosoft.Extensions.Http.Resilience.Tests/Polly/HttpRetryStrategyOptionsExtensionsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,16 @@ public async Task DisableFor_RespectsOriginalShouldHandlePredicate()
}

[Fact]
public async Task DisableFor_ResponseMessageIsNull_DoesNotDisableRetries()
public async Task DisableFor_ResponseMessageIsNull_RetrievesRequestMessageFromContext()
{
var options = new HttpRetryStrategyOptions { ShouldHandle = _ => PredicateResult.True() };
options.DisableFor(HttpMethod.Post);

Assert.True(await options.ShouldHandle(CreatePredicateArguments(null)));
using var request = new HttpRequestMessage { Method = HttpMethod.Post };
var context = ResilienceContextPool.Shared.Get();
context.SetRequestMessage(request);

Assert.False(await options.ShouldHandle(CreatePredicateArguments(null, context)));
}

[Fact]
Expand All @@ -80,8 +84,10 @@ public async Task DisableFor_RequestMessageIsNull_DoesNotDisableRetries()
options.DisableFor(HttpMethod.Post);

using var response = new HttpResponseMessage { RequestMessage = null };
var context = ResilienceContextPool.Shared.Get();
context.SetRequestMessage(null);

Assert.True(await options.ShouldHandle(CreatePredicateArguments(response)));
Assert.True(await options.ShouldHandle(CreatePredicateArguments(response, context)));
}

[Theory]
Expand All @@ -105,10 +111,10 @@ public async Task DisableForUnsafeHttpMethods_PositiveScenario(string httpMethod
Assert.Equal(shouldHandle, await options.ShouldHandle(CreatePredicateArguments(response)));
}

private static RetryPredicateArguments<HttpResponseMessage> CreatePredicateArguments(HttpResponseMessage? response)
private static RetryPredicateArguments<HttpResponseMessage> CreatePredicateArguments(HttpResponseMessage? response, ResilienceContext? context = null)
{
return new RetryPredicateArguments<HttpResponseMessage>(
ResilienceContextPool.Shared.Get(),
context ?? ResilienceContextPool.Shared.Get(),
Outcome.FromResult(response),
attemptNumber: 1);
}
Expand Down
Loading