In async PolicyWrap executions, Context.PolicyKey and Context.PolicyWrapKey may reset to outer values in the PolicyWrap too early

Summary:

Policykey Context property is null when its passed to onRetry delegate when using WaitAndRetryAsync + ExecuteAsync.

Perhaps i’m missing something here, although i’m not able to reproduce if I switch to a synchronous policy.

Expected behavior: after setting PoliyKey when creating policy, its then set on the Context object passed to onRetry delegate.

PS C:\Users\hamish.rose\Desktop\test> dotnet run
In on retry. PolicyKey: test, OperationKey: ExecutingMethod

Actual behaviour: PolicyKey is null on Context object passed to onRetry delegate, even though its set on the policy.

PS C:\Users\hamish.rose\Desktop\test> dotnet run
In on retry. PolicyKey: , OperationKey: ExecutingMethod

Steps / Code to reproduce the problem:

using System;
using System.Threading.Tasks;
using Polly;
using Polly.Retry;

namespace test
{
    class Program
    {
        static async Task Main(string[] args)
        {
            var policy = Policy.Handle<Exception>()
                  .WaitAndRetryAsync(
                  1,
                  (x, y) => TimeSpan.FromSeconds(5),
                  (ex, timespan, context) => Console.WriteLine($"In on retry. PolicyKey: {context.PolicyKey}, OperationKey: {context.OperationKey}"))
                  .WithPolicyKey("test") as RetryPolicy;

            await policy.ExecuteAsync(async context => await Task.Run(() => throw new Exception()), new Context("ExecutingMethod"));
        }
    }
}

[reisenberger]

Fix merged to master. Will be live as soon as v6.1.1 is released to nuget

[reisenberger]

@hamish-rose Thanks for the confirmation!