Update ES client

* TransportClient -> IRequestInvoker

Author: kmcclellan

Elasticstretch.DependencyInjection/Elasticstretch.DependencyInjection.csproj

@@ -26,7 +26,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Elastic.Clients.Elasticsearch" Version="[8.9.*,8.12)" />
+    <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.*" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.*" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.*" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.*" />

Elasticstretch.DependencyInjection/ElasticstretchServiceCollectionExtensions.cs

@@ -47,12 +47,14 @@ public static IServiceCollection AddElasticsearchClient(
             x => new ElasticsearchClient(
                 x.GetRequiredService<IOptions<ElasticsearchClientOptions>>().Value.ToSettings()));
 
+        services.TryAddTransient<DelegatingHttpHandlerFactory>();
+
         if (configureSettings != null)
         {
             services.Configure<ElasticsearchClientOptions>(x => x.ConfigureSettings += configureSettings);
         }
 
-        configureHttp?.Invoke(services.AddHttpClient(HttpFactoryClient.ClientName));
+        configureHttp?.Invoke(services.AddHttpClient(ConfigureClientFromNodes.HttpClientName));
 
         return services;
     }

Elasticstretch.DependencyInjection/GlobalSuppressions.cs

@@ -23,3 +23,9 @@
     "CA1812:Avoid uninstantiated internal classes",
     Scope = "type",
     Target = "~T:Elastic.Clients.Elasticsearch.Options.ConfigureClientFromNodes")]
+
+[assembly: SuppressMessage(
+    "Performance",
+    "CA1812:Avoid uninstantiated internal classes",
+    Scope = "type",
+    Target = "~T:Elastic.Clients.Elasticsearch.Options.DelegatingHttpHandlerFactory")]

Elasticstretch.DependencyInjection/Options/ConfigureClientFromNodes.cs

@@ -1,15 +1,16 @@
 namespace Elastic.Clients.Elasticsearch.Options;
 
-using Microsoft.Extensions.Http;
+using Elastic.Transport;
+
 using Microsoft.Extensions.Options;
 
 sealed class ConfigureClientFromNodes(
-    IServiceProvider provider,
-    IOptionsFactory<ElasticsearchNodeOptions> nodeOptions,
-    IOptionsMonitor<HttpClientFactoryOptions> httpOptions,
-    IEnumerable<IHttpMessageHandlerBuilderFilter> httpFilters)
+    DelegatingHttpHandlerFactory httpFactory,
+    IOptionsFactory<ElasticsearchNodeOptions> nodeOptions)
         : ConfigureOptionsFromOptions<ElasticsearchClientOptions, ElasticsearchNodeOptions>(nodeOptions)
 {
+    public const string HttpClientName = nameof(ElasticsearchClient);
+
     protected override void Configure(ElasticsearchClientOptions options, ElasticsearchNodeOptions dependency)
     {
         if (dependency.CredentialsHeader != null)
@@ -19,6 +20,11 @@ protected override void Configure(ElasticsearchClientOptions options, Elasticsea
 
         var fallback = options.NodePool;
         options.NodePool = () => dependency.CreatePool() ?? fallback();
-        options.Connection = () => new HttpFactoryClient(provider, httpOptions, httpFilters);
+        options.Connection = () => new HttpRequestInvoker(CreateHttpHandler);
+    }
+
+    private HttpMessageHandler CreateHttpHandler(HttpMessageHandler defaultHandler, BoundConfiguration config)
+    {
+        return httpFactory.CreateDelegatingHandler(HttpClientName, defaultHandler);
     }
 }

Elasticstretch.DependencyInjection/Options/HttpFactoryClient.cs renamed to Elasticstretch.DependencyInjection/Options/DelegatingHttpHandlerFactory.cs

@@ -1,25 +1,21 @@
 namespace Elastic.Clients.Elasticsearch.Options;
 
-using Elastic.Clients.Elasticsearch;
-using Elastic.Transport;
-
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Http;
 using Microsoft.Extensions.Options;
 
 using System.Net.Http;
 
-sealed class HttpFactoryClient(
-    IServiceProvider provider,
+// Use as much as we can from HTTP client factory configuration, while injecting a primary handler on demand.
+// Compare with https://github.com/dotnet/runtime/blob/05d94d94028b5622b19734e0e1b60d7aca4667b3/src/libraries/Microsoft.Extensions.Http/src/DefaultHttpMessageHandlerBuilder.cs#L47
+sealed class DelegatingHttpHandlerFactory(
+    IServiceProvider services,
     IOptionsMonitor<HttpClientFactoryOptions> options,
     IEnumerable<IHttpMessageHandlerBuilderFilter> filters)
-    : HttpTransportClient
 {
-    public const string ClientName = nameof(ElasticsearchClient);
-
-    protected override HttpMessageHandler CreateHttpClientHandler(RequestData requestData)
+    public HttpMessageHandler CreateDelegatingHandler(string clientName, HttpMessageHandler primaryHandler)
     {
-        var clientOptions = options.Get(ClientName);
+        var clientOptions = options.Get(clientName);
 
         var configureHandler = (HttpMessageHandlerBuilder builder) =>
         {
@@ -35,11 +31,11 @@ protected override HttpMessageHandler CreateHttpClientHandler(RequestData reques
             configureHandler = filter.Configure(configureHandler);
         }
 
-        var builder = provider.GetRequiredService<HttpMessageHandlerBuilder>(); 
-        builder.Name = ClientName;
+        var builder = services.GetRequiredService<HttpMessageHandlerBuilder>(); 
+        builder.Name = clientName;
 
         configureHandler(builder);
-        builder.PrimaryHandler = base.CreateHttpClientHandler(requestData);
+        builder.PrimaryHandler = primaryHandler;
 
         return builder.Build();
     }

Elasticstretch.DependencyInjection/Options/ElasticsearchClientOptions.cs

@@ -19,7 +19,7 @@ public class ElasticsearchClientOptions
     /// <summary>
     /// Gets or sets the factory for the underlying transport connection.
     /// </summary>
-    public Func<TransportClient> Connection { get; set; } = () => new HttpTransportClient();
+    public Func<IRequestInvoker> Connection { get; set; } = () => new HttpRequestInvoker();
 
     /// <summary>
     /// Gets or sets the factory for the client source serializer.