Fix httpClient for Apitally Hub (#2)

* Fix httpClient injection

* Use named client

Author: itssimon

src/Apitally/ApitallyClient.cs

@@ -18,7 +18,7 @@ class ApitallyClient(
     IOptions<ApitallyOptions> options,
     RequestLogger requestLogger,
     ILogger<ApitallyClient> logger,
-    HttpClient? httpClient = null
+    IHttpClientFactory httpClientFactory
 ) : BackgroundService, IDisposable
 {
     public enum HubRequestStatus
@@ -34,12 +34,9 @@ public enum HubRequestStatus
     private const int InitialSyncIntervalSeconds = 10;
     private const int InitialPeriodSeconds = 3600;
     private const int MaxQueueTimeSeconds = 3600;
-    private const int RequestTimeoutSeconds = 10;
-    private static readonly string HubBaseUrl =
-        Environment.GetEnvironmentVariable("APITALLY_HUB_BASE_URL") ?? "https://hub.apitally.io";
 
     private readonly Guid _instanceUuid = Guid.NewGuid();
-    private readonly HttpClient _httpClient = httpClient ?? CreateHttpClient();
+    private readonly HttpClient _httpClient = httpClientFactory.CreateClient("Apitally");
     private readonly IAsyncPolicy<HttpResponseMessage> _retryPolicy = CreateRetryPolicy();
     private readonly ConcurrentQueue<SyncData> _syncDataQueue = new();
     private readonly Random _random = new();
@@ -58,15 +55,6 @@ public enum HubRequestStatus
     public readonly ConsumerRegistry ConsumerRegistry = new();
     public readonly RequestLogger RequestLogger = requestLogger;
 
-    private static HttpClient CreateHttpClient()
-    {
-        return new HttpClient
-        {
-            BaseAddress = new Uri(HubBaseUrl),
-            Timeout = TimeSpan.FromSeconds(RequestTimeoutSeconds),
-        };
-    }
-
     private static IAsyncPolicy<HttpResponseMessage> CreateRetryPolicy()
     {
         return HttpPolicyExtensions

src/Apitally/ApitallyExtensions.cs

@@ -35,6 +35,19 @@ public static IServiceCollection AddApitally(
             services.PostConfigure(configureOptions);
         }
 
+        // Register IHttpClientFactory which is required by ApitallyClient
+        services.AddHttpClient(
+            "Apitally",
+            client =>
+            {
+                client.BaseAddress = new Uri(
+                    Environment.GetEnvironmentVariable("APITALLY_HUB_BASE_URL")
+                        ?? "https://hub.apitally.io"
+                );
+                client.Timeout = TimeSpan.FromSeconds(10);
+            }
+        );
+
         // Ensure MVC services are registered and add global filter
         services.AddSingleton<ValidationErrorFilter>();
         services.AddControllers(options =>

tests/Apitally.TestApp/ApitallyTestExtensions.cs

@@ -14,6 +14,15 @@ public static IServiceCollection AddApitallyWithoutBackgroundServices(
         {
             services.PostConfigure(configureOptions);
         }
+
+        services.AddHttpClient(
+            "Apitally",
+            client =>
+            {
+                client.BaseAddress = new Uri("http://test");
+                client.Timeout = TimeSpan.FromSeconds(1);
+            }
+        );
         services.AddSingleton<ValidationErrorFilter>();
         services.AddControllers(options =>
         {

tests/Apitally.Tests/ApitallyClientTests.cs

@@ -154,12 +154,17 @@ private static ApitallyClient CreateClient(HttpMessageHandler httpHandler)
         );
         var loggerFactory = LoggerFactory.Create(builder => builder.AddConsole());
         var requestLogger = new RequestLogger(options, loggerFactory.CreateLogger<RequestLogger>());
+
+        // Create a mock IHttpClientFactory that returns a client with the specified handler
         var httpClient = new HttpClient(httpHandler) { BaseAddress = new Uri("http://test") };
+        var mockHttpClientFactory = new Mock<IHttpClientFactory>();
+        mockHttpClientFactory.Setup(f => f.CreateClient("Apitally")).Returns(httpClient);
+
         var client = new ApitallyClient(
             options,
             requestLogger,
             loggerFactory.CreateLogger<ApitallyClient>(),
-            httpClient
+            mockHttpClientFactory.Object
         );
         return client;
     }