Merge remote-tracking branch 'origin/main' into mtomka/api-review-2

src/Polly.Core/PublicAPI.Unshipped.txt

@@ -90,6 +90,7 @@ Polly.CompositeStrategyBuilderBase.Name.get -> string?
 Polly.CompositeStrategyBuilderBase.Name.set -> void
 Polly.CompositeStrategyBuilderBase.Validator.get -> System.Action<Polly.ResilienceValidationContext!>!
 Polly.CompositeStrategyBuilderExtensions
+Polly.CircuitBreakerResiliencePipelineBuilderExtensions
 Polly.ExecutionRejectedException
 Polly.ExecutionRejectedException.ExecutionRejectedException() -> void
 Polly.ExecutionRejectedException.ExecutionRejectedException(string! message) -> void
@@ -371,6 +372,10 @@ Polly.Telemetry.ResilienceTelemetrySource
 Polly.Telemetry.ResilienceTelemetrySource.BuilderInstanceName.get -> string?
 Polly.Telemetry.ResilienceTelemetrySource.BuilderName.get -> string?
 Polly.Telemetry.ResilienceTelemetrySource.ResilienceTelemetrySource(string? builderName, string? builderInstanceName, string? strategyName) -> void
+Polly.Telemetry.ResilienceTelemetrySource.BuilderProperties.get -> Polly.ResilienceProperties!
+Polly.Telemetry.ResilienceTelemetrySource.PipelineInstanceName.get -> string?
+Polly.Telemetry.ResilienceTelemetrySource.PipelineName.get -> string?
+Polly.Telemetry.ResilienceTelemetrySource.ResilienceTelemetrySource(string? pipelineName, string? pipelineInstanceName, Polly.ResilienceProperties! builderProperties, string? strategyName) -> void
 Polly.Telemetry.ResilienceTelemetrySource.StrategyName.get -> string?
 Polly.Telemetry.TelemetryEventArguments
 Polly.Telemetry.TelemetryEventArguments.Arguments.get -> object!

src/Polly.Core/Telemetry/ResilienceTelemetrySource.cs

@@ -11,16 +11,16 @@ public sealed class ResilienceTelemetrySource
     /// <summary>
     /// Initializes a new instance of the <see cref="ResilienceTelemetrySource"/> class.
     /// </summary>
-    /// <param name="builderName">The builder name.</param>
-    /// <param name="builderInstanceName">The builder instance name.</param>
+    /// <param name="pipelineName">The pipeline name.</param>
+    /// <param name="pipelineInstanceName">The pipeline instance name.</param>
     /// <param name="strategyName">The strategy name.</param>
     public ResilienceTelemetrySource(
-        string? builderName,
-        string? builderInstanceName,
+        string? pipelineName,
+        string? pipelineInstanceName,
         string? strategyName)
     {
-        BuilderName = builderName;
-        BuilderInstanceName = builderInstanceName;
+        PipelineName = pipelineName;
+        PipelineInstanceName = pipelineInstanceName;
         StrategyName = strategyName;
     }
 

src/Polly.Extensions/DependencyInjection/PollyServiceCollectionExtensions.cs

@@ -250,7 +250,7 @@ private static void AddResiliencePipelineBuilder(this IServiceCollection service
 
         services.TryAddTransient(serviceProvider =>
         {
-            var builder = new CompositeStrategyBuilder();
+            var builder = new ResiliencePipelineBuilder();
             builder.ConfigureTelemetry(serviceProvider.GetRequiredService<IOptions<TelemetryOptions>>().Value);
             return builder;
         });

test/Polly.Core.Tests/ResiliencePipelineBuilderTests.cs

@@ -28,7 +28,7 @@ public void CopyCtor_Ok()
             DiagnosticSource = Substitute.For<DiagnosticSource>(),
         };
 
-        var other = new CompositeStrategyBuilder<double>(builder);
+        var other = new ResiliencePipelineBuilder<double>(builder);
         other.Name.Should().Be(builder.Name);
         other.TimeProvider.Should().Be(builder.TimeProvider);
         other.DiagnosticSource.Should().BeSameAs(builder.DiagnosticSource);

test/Polly.Core.Tests/Retry/RetryResiliencePipelineBuilderExtensionsTests.cs

@@ -131,7 +131,7 @@ private static TimeSpan GetAggregatedDelay<T>(RetryStrategyOptions<T> options)
     {
         var aggregatedDelay = TimeSpan.Zero;
 
-        var strategy = new CompositeStrategyBuilder().AddRetry(new()
+        var strategy = new ResiliencePipelineBuilder().AddRetry(new()
         {
             RetryCount = options.RetryCount,
             BaseDelay = options.BaseDelay,

test/Polly.Core.Tests/Retry/RetryResilienceStrategyTests.cs

@@ -352,6 +352,6 @@ private async ValueTask<int> ExecuteAndAdvance(ResiliencePipelineBridge<object>
         return await executing;
     }
 
-    private ReactiveResilienceStrategyBridge<object> CreateSut(TimeProvider? timeProvider = null) =>
+    private ResiliencePipelineBridge<object> CreateSut(TimeProvider? timeProvider = null) =>
         new(new RetryResilienceStrategy<object>(_options, timeProvider ?? _timeProvider, _telemetry));
 }

test/Polly.Core.Tests/StrategyBuilderContextTests.cs

@@ -17,7 +17,7 @@ public void Ctor_EnsureDefaults()
         context.TimeProvider.Should().Be(timeProvider);
         context.Telemetry.Should().NotBeNull();
 
-        context.Telemetry.TelemetrySource.BuilderName.Should().Be("builder-name");
+        context.Telemetry.TelemetrySource.PipelineName.Should().Be("builder-name");
         context.Telemetry.TelemetrySource.StrategyName.Should().Be("strategy-name");
     }
 }

test/Polly.Extensions.Tests/DependencyInjection/PollyServiceCollectionExtensionTests.cs

@@ -165,7 +165,7 @@ public void AddResiliencePipeline_EnsureResiliencePipelineBuilderResolvedCorrect
         var asserted = false;
         var key = new ResiliencePropertyKey<int>("A");
 
-        AddResilienceStrategy(Key, context => asserted = true);
+        AddResiliencePipeline(Key, context => asserted = true);
 
         CreateProvider().GetPipeline(Key);