Adopt Polly V8 in Microsoft.Extensions.Resilience

bench/Libraries/Microsoft.Extensions.Resilience.PerformanceTests/Microsoft.Extensions.Resilience.PerformanceTests.csproj

@@ -3,6 +3,10 @@
     <RootNamespace>Microsoft.Extensions.Resilience</RootNamespace>
     <Description>Benchmarks for Microsoft.Extensions.Resilience.</Description>
   </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\..\..\test\Libraries\Microsoft.Extensions.Resilience.Tests\Resilience\MeteringUtil.cs" Link="MeteringUtil.cs" />
+  </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\Libraries\Microsoft.Extensions.Resilience\Microsoft.Extensions.Resilience.csproj" />

bench/Libraries/Microsoft.Extensions.Resilience.PerformanceTests/ResilienceEnrichmentBenchmark.cs

@@ -0,0 +1,80 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Diagnostics.Metrics;
+using System.Threading.Tasks;
+using BenchmarkDotNet.Attributes;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Diagnostics.ExceptionSummarization;
+using Microsoft.Extensions.Resilience.Test.Resilience;
+using Polly;
+using Polly.Registry;
+using Polly.Telemetry;
+
+namespace Microsoft.Extensions.Resilience.Bench;
+
+public class ResilienceEnrichmentBenchmark
+{
+    private MeterListener? _listener;
+    private ResilienceStrategy? _strategy;
+    private ResilienceStrategy? _strategyEnriched;
+
+    [GlobalSetup]
+    public void GlobalSetup()
+    {
+        _listener = MeteringUtil.ListenPollyMetrics();
+        _strategy = CreateResilienceStrategy(_ => { });
+        _strategyEnriched = CreateResilienceStrategy(services =>
+        {
+            services.AddResilienceEnrichment();
+            services.ConfigureFailureResultContext<string>(res => FailureResultContext.Create("dummy", "dummy", "dummy"));
+        });
+    }
+
+    [GlobalCleanup]
+    public void Cleanup() => _listener?.Dispose();
+
+    [Benchmark(Baseline = true)]
+    public void ReportTelemetry() => _strategy!.Execute(() => "dummy-result");
+
+    [Benchmark]
+    public void ReportTelemetry_Enriched() => _strategyEnriched!.Execute(() => "dummy-result");
+
+    private static ResilienceStrategy CreateResilienceStrategy(Action<IServiceCollection> configure)
+    {
+        var services = new ServiceCollection();
+        services.AddLogging();
+        services.AddExceptionSummarizer();
+        services.AddResilienceStrategy("my-strategy", builder => builder.AddStrategy(context => new DummyStrategy(context.Telemetry), new DummyOptions()));
+        services.AddLogging();
+        configure(services);
+
+        return services.BuildServiceProvider().GetRequiredService<ResilienceStrategyProvider<string>>().GetStrategy("my-strategy");
+    }
+
+    private class DummyStrategy : ResilienceStrategy
+    {
+        private readonly ResilienceStrategyTelemetry _telemetry;
+
+        public DummyStrategy(ResilienceStrategyTelemetry telemetry)
+        {
+            _telemetry = telemetry;
+        }
+
+        protected override ValueTask<Outcome<TResult>> ExecuteCoreAsync<TResult, TState>(
+            Func<ResilienceContext, TState, ValueTask<Outcome<TResult>>> callback,
+            ResilienceContext context,
+            TState state)
+        {
+            _telemetry.Report("Dummy", context, "dummy-args");
+
+            return callback(context, state);
+        }
+    }
+
+    private class DummyOptions : ResilienceStrategyOptions
+    {
+        public override string StrategyType => "Dummy";
+    }
+}

eng/Packages/General.props

@@ -33,7 +33,6 @@
     <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc9.14" />
     <PackageVersion Include="OpenTelemetry" Version="1.4.0" />
     <PackageVersion Include="Polly.Contrib.Simmy" Version="0.3.0" />
-    <PackageVersion Include="Polly.Contrib.WaitAndRetry" Version="1.1.1" />
     <PackageVersion Include="Polly" Version="8.0.0-alpha.4" />
     <PackageVersion Include="Polly.Core" Version="8.0.0-alpha.4" />
     <PackageVersion Include="Polly.Extensions" Version="8.0.0-alpha.4" />