HTTP factory integration

Author: kmcclellan

Elasticstretch.DependencyInjection/Elasticstretch.DependencyInjection.csproj

@@ -28,6 +28,7 @@
   <ItemGroup>
     <PackageReference Include="Elastic.Clients.Elasticsearch" Version="*" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="*" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="*" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="*" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="*" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="*" PrivateAssets="All" />

Elasticstretch.DependencyInjection/ElasticstretchServiceCollectionExtensions.cs

@@ -25,10 +25,14 @@ public static class ElasticstretchServiceCollectionExtensions
     /// </remarks>
     /// <param name="services">The service collection.</param>
     /// <param name="configureSettings">A delegate to configure the client settings.</param>
+    /// <param name="configureHttp">
+    /// A delegate to configure the underlying HTTP client (not all features supported).
+    /// </param>
     /// <returns>The same services, for chaining.</returns>
     public static IServiceCollection AddElasticsearchClient(
         this IServiceCollection services,
-        Action<ElasticsearchClientSettings>? configureSettings = null)
+        Action<ElasticsearchClientSettings>? configureSettings = null,
+        Action<IHttpClientBuilder>? configureHttp = null)
     {
         services.AddOptions();
 
@@ -46,6 +50,8 @@ public static IServiceCollection AddElasticsearchClient(
             services.Configure<ElasticsearchClientOptions>(x => x.ConfigureSettings += configureSettings);
         }
 
+        configureHttp?.Invoke(services.AddHttpClient(HttpFactoryClient.ClientName));
+
         return services;
     }
 

Elasticstretch.DependencyInjection/Options/ConfigureClientFromNodes.cs

@@ -1,13 +1,22 @@
 namespace Elastic.Clients.Elasticsearch.Options;
 
+using Microsoft.Extensions.Http;
 using Microsoft.Extensions.Options;
 
 sealed class ConfigureClientFromNodes
     : ConfigureOptionsFromOptions<ElasticsearchClientOptions, ElasticsearchNodeOptions>
 {
-    public ConfigureClientFromNodes(IOptionsFactory<ElasticsearchNodeOptions> optionsFactory)
-        : base(optionsFactory)
+    readonly IServiceProvider _provider;
+    readonly IOptionsMonitor<HttpClientFactoryOptions> _httpOptions;
+
+    public ConfigureClientFromNodes(
+        IServiceProvider provider,
+        IOptionsFactory<ElasticsearchNodeOptions> nodeOptions,
+        IOptionsMonitor<HttpClientFactoryOptions> httpOptions)
+        : base(nodeOptions)
     {
+        _provider = provider;
+        _httpOptions = httpOptions;
     }
 
     protected override void Configure(ElasticsearchClientOptions options, ElasticsearchNodeOptions dependency)
@@ -19,5 +28,6 @@ protected override void Configure(ElasticsearchClientOptions options, Elasticsea
 
         var fallback = options.NodePool;
         options.NodePool = () => dependency.CreatePool() ?? fallback();
+        options.Connection = () => new HttpFactoryClient(_provider, _httpOptions);
     }
 }

Elasticstretch.DependencyInjection/Options/HttpFactoryClient.cs

@@ -0,0 +1,35 @@
+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 : HttpTransportClient
+{
+    public const string ClientName = nameof(ElasticsearchClient);
+
+    readonly IServiceProvider _provider;
+    readonly IOptionsMonitor<HttpClientFactoryOptions> _options;
+
+    public HttpFactoryClient(IServiceProvider provider, IOptionsMonitor<HttpClientFactoryOptions> options)
+    {
+        _provider = provider;
+        _options = options;
+    }
+
+    protected override HttpMessageHandler CreateHttpClientHandler(RequestData requestData)
+    {
+        var builder = _provider.GetRequiredService<HttpMessageHandlerBuilder>();
+        builder.PrimaryHandler = base.CreateHttpClientHandler(requestData);
+
+        foreach (var item in _options.Get(ClientName).HttpMessageHandlerBuilderActions)
+        {
+            item(builder);
+        }
+
+        return builder.Build();
+    }
+}