[automated] Merge branch 'release/8.0' => 'main' (#4480)

* Http.Resilience does not depend on redaction anymore (#4470) * Do not depend on redaction anymore fixes * Update dependencies from https://github.com/dotnet/aspnetcore build 20230926.22 (#4478) Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Mvc.Testing , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.Caching.StackExchangeRedis , Microsoft.Extensions.Diagnostics.HealthChecks , Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions , Microsoft.Extensions.Features , Microsoft.Extensions.Http.Polly , Microsoft.Extensions.ObjectPool From Version 8.0.0-rtm.23475.5 -> To Version 8.0.0-rtm.23476.22 Dependency coherency updates Microsoft.Bcl.TimeProvider,Microsoft.Extensions.Caching.Abstractions,Microsoft.Extensions.Caching.Memory,Microsoft.Extensions.Configuration.Abstractions,Microsoft.Extensions.Configuration.Binder,Microsoft.Extensions.Configuration.CommandLine,Microsoft.Extensions.Configuration.Json,Microsoft.Extensions.Configuration,Microsoft.Extensions.DependencyInjection.Abstractions,Microsoft.Extensions.DependencyInjection,Microsoft.Extensions.Hosting.Abstractions,Microsoft.Extensions.Hosting,Microsoft.Extensions.Http,Microsoft.Extensions.Logging.Abstractions,Microsoft.Extensions.Logging.Configuration,Microsoft.Extensions.Logging.Console,Microsoft.Extensions.Logging,Microsoft.Extensions.Options.ConfigurationExtensions,Microsoft.Extensions.Options.DataAnnotations,Microsoft.Extensions.Options,Microsoft.Extensions.Primitives,System.Collections.Immutable,System.Configuration.ConfigurationManager,System.Diagnostics.DiagnosticSource,System.Diagnostics.PerformanceCounter,System.IO.Hashing,System.Net.Http.Json,System.Security.Cryptography.Pkcs,System.Security.Cryptography.Xml,System.Text.Encodings.Web,System.Text.Json,System.Runtime.Caching From Version 8.0.0-rc.2.23464.16 -> To Version 8.0.0-rtm.23475.7 (parent: Microsoft.AspNetCore.App.Runtime.win-x64 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Javier Calvarro Nelson <[email protected]> * Rename `Endpoint` to `UriEndpoint` (#4476) * Rename Endpoint to UriEndpoint * Drop fault injection from resilience (#4475) * Drop fault injection from resilience * Update API baselines --------- Co-authored-by: martintmk <[email protected]> Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Javier Calvarro Nelson <[email protected]>
dotnet · Sep 27, 2023 · b07ccb0 · b07ccb0
1 parent 245194e
commit b07ccb0
Show file tree

Hide file tree

Showing 101 changed files with 243 additions and 5,509 deletions.
diff --git a/.../Microsoft.Extensions.Http.Resilience.PerformanceTests/FaultInjectionRequestBenchmarks.cs b/.../Microsoft.Extensions.Http.Resilience.PerformanceTests/FaultInjectionRequestBenchmarks.cs
diff --git a/bench/Libraries/Microsoft.Extensions.Http.Resilience.PerformanceTests/HttpClientFactory.cs b/bench/Libraries/Microsoft.Extensions.Http.Resilience.PerformanceTests/HttpClientFactory.cs
@@ -6,7 +6,6 @@
 using System.Linq;
 using System.Threading;
 using Microsoft.Extensions.Compliance.Redaction;
-using Microsoft.Extensions.Compliance.Testing;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Logging;
@@ -68,7 +67,7 @@ public static ServiceProvider InitializeServiceProvider(params HedgingClientType
     private static void AddHedging(this IServiceCollection services, HedgingClientType clientType)
     {
         var clientBuilder = services.AddHttpClient(clientType.ToString(), client => client.Timeout = Timeout.InfiniteTimeSpan);
-        var hedgingBuilder = clientBuilder.AddStandardHedgingHandler().SelectPipelineByAuthority(FakeClassifications.PublicData);
+        var hedgingBuilder = clientBuilder.AddStandardHedgingHandler().SelectPipelineByAuthority();
         _ = clientBuilder.AddHttpMessageHandler<NoRemoteCallHandler>();
 
         if (clientType.HasFlag(HedgingClientType.NoRoutes))
@@ -84,15 +83,15 @@ private static void AddHedging(this IServiceCollection services, HedgingClientTy
             {
                 options.Groups = Enumerable.Repeat(0, routes).Select(_ =>
                 {
-                    return new EndpointGroup
+                    return new UriEndpointGroup
                     {
                         Endpoints = new[]
                         {
-                            new WeightedEndpoint
+                            new WeightedUriEndpoint
                             {
                                 Uri = new Uri(PrimaryEndpoint)
                             },
-                            new WeightedEndpoint
+                            new WeightedUriEndpoint
                             {
                                 Uri = new Uri(SecondaryEndpoint)
                             }
@@ -107,15 +106,15 @@ private static void AddHedging(this IServiceCollection services, HedgingClientTy
             {
                 options.Groups = Enumerable.Repeat(0, routes).Select(_ =>
                 {
-                    return new WeightedEndpointGroup
+                    return new WeightedUriEndpointGroup
                     {
                         Endpoints = new[]
                         {
-                            new WeightedEndpoint
+                            new WeightedUriEndpoint
                             {
                                 Uri = new Uri(PrimaryEndpoint)
                             },
-                            new WeightedEndpoint
+                            new WeightedUriEndpoint
                             {
                                 Uri = new Uri(SecondaryEndpoint)
                             }