Fix samples

React to breaking changes.

Author: martincostello

samples/Extensibility/Program.cs

@@ -4,7 +4,7 @@
 // ------------------------------------------------------------------------
 // Usage of custom strategy
 // ------------------------------------------------------------------------
-var strategy = new ResilienceStrategyBuilder()
+var strategy = new CompositeStrategyBuilder()
     // This is custom extension defined in this sample
     .AddMyResilienceStrategy(new MyResilienceStrategyOptions
     {
@@ -23,7 +23,7 @@
 // SIMPLE EXTENSIBILITY MODEL (INLINE STRATEGY)
 // ------------------------------------------------------------------------
 
-strategy = new ResilienceStrategyBuilder()
+strategy = new CompositeStrategyBuilder()
     // Just add the strategy instance directly
     .AddStrategy(new MySimpleStrategy())
     .Build();
@@ -125,7 +125,7 @@ protected override async ValueTask<Outcome<TResult>> ExecuteCore<TResult, TState
 public static class MyResilienceStrategyExtensions
 {
     // Add new extension that works for both "ResilienceStrategyBuilder" and "ResilienceStrategyBuilder<T>"
-    public static TBuilder AddMyResilienceStrategy<TBuilder>(this TBuilder builder, MyResilienceStrategyOptions options) where TBuilder : ResilienceStrategyBuilderBase
+    public static TBuilder AddMyResilienceStrategy<TBuilder>(this TBuilder builder, MyResilienceStrategyOptions options) where TBuilder : CompositeStrategyBuilderBase
         => builder.AddStrategy(
             // Provide a factory that creates the strategy
             context => new MyResilienceStrategy(context.Telemetry, options),

samples/GenericStrategies/Program.cs

@@ -11,7 +11,7 @@
 // The generic ResilienceStrategyBuilder<T> creates a ResilienceStrategy<T>
 // that can execute synchronous and asynchronous callbacks that return T.
 
-ResilienceStrategy<HttpResponseMessage> strategy = new ResilienceStrategyBuilder<HttpResponseMessage>()
+ResilienceStrategy<HttpResponseMessage> strategy = new CompositeStrategyBuilder<HttpResponseMessage>()
     .AddFallback(new FallbackStrategyOptions<HttpResponseMessage>
     {
         FallbackAction = _ =>

samples/Intro/Program.cs

@@ -9,7 +9,7 @@
 // The ResilienceStrategyBuilder creates a ResilienceStrategy
 // that can be executed synchronously or asynchronously
 // and for both void and result-returning user-callbacks.
-ResilienceStrategy strategy = new ResilienceStrategyBuilder()
+ResilienceStrategy strategy = new CompositeStrategyBuilder()
     // Use convenience extension that accepts TimeSpan
     .AddTimeout(TimeSpan.FromSeconds(5)) 
     .Build();
@@ -37,7 +37,7 @@
 // 3. Create and execute a pipeline of strategies
 // ------------------------------------------------------------------------
 
-strategy = new ResilienceStrategyBuilder()
+strategy = new CompositeStrategyBuilder()
     // Add retries using the options
     .AddRetry(new RetryStrategyOptions
     {
@@ -51,7 +51,7 @@
             _ => PredicateResult.False
         },
         // Register user callback called whenever retry occurs
-        OnRetry = args => { Console.WriteLine($"Retrying...{args.Arguments.Attempt} attempt"); return default; },
+        OnRetry = args => { Console.WriteLine($"Retrying...{args.Arguments.AttemptNumber} attempt"); return default; },
         BaseDelay = TimeSpan.FromMilliseconds(400),
         BackoffType = RetryBackoffType.Constant,
         RetryCount = 3

samples/Retries/Program.cs

@@ -9,7 +9,7 @@
 // 1. Create a retry strategy that handles all exceptions
 // ------------------------------------------------------------------------
 
-ResilienceStrategy strategy = new ResilienceStrategyBuilder()
+ResilienceStrategy strategy = new CompositeStrategyBuilder()
     // Default retry options handle all exceptions
     .AddRetry(new RetryStrategyOptions())
     .Build();
@@ -21,7 +21,7 @@
 // 2. Customize the retry behavior
 // ------------------------------------------------------------------------
 
-strategy = new ResilienceStrategyBuilder()
+strategy = new CompositeStrategyBuilder()
     .AddRetry(new RetryStrategyOptions
     {
         // Specify what exceptions should be retried using PredicateBuilder
@@ -31,7 +31,8 @@
 
         // The recommended backoff type for HTTP scenarios
         // See here for more information: https://github.com/App-vNext/Polly/wiki/Retry-with-jitter#more-complex-jitter
-        BackoffType = RetryBackoffType.ExponentialWithJitter
+        BackoffType = RetryBackoffType.Exponential,
+        UseJitter = true
     })
     .Build();
 
@@ -42,7 +43,7 @@
 // 3. Register the callbacks
 // ------------------------------------------------------------------------
 
-strategy = new ResilienceStrategyBuilder()
+strategy = new CompositeStrategyBuilder()
     .AddRetry(new RetryStrategyOptions
     {
         // Specify what exceptions should be retried using switch expressions
@@ -53,7 +54,7 @@
         },
         OnRetry = outcome =>
         {
-            Console.WriteLine($"Retrying attempt {outcome.Arguments.Attempt}...");
+            Console.WriteLine($"Retrying attempt {outcome.Arguments.AttemptNumber}...");
             return default;
         }
     })
@@ -66,7 +67,7 @@
 // 4. Create an HTTP retry strategy that handles both exceptions and results
 // ------------------------------------------------------------------------
 
-ResilienceStrategy<HttpResponseMessage> httpStrategy = new ResilienceStrategyBuilder<HttpResponseMessage>()
+ResilienceStrategy<HttpResponseMessage> httpStrategy = new CompositeStrategyBuilder<HttpResponseMessage>()
     .AddRetry(new RetryStrategyOptions<HttpResponseMessage>
     {
         // Specify what exceptions or results should be retried