Merge pull request #40 from datalust/dev

2.1.1 Release

Author: nblumhardt

src/Seq.Input.HealthCheck/HealthCheckInput.cs

@@ -15,6 +15,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Net.Http;
 using Seq.Apps;
 using Seq.Input.HealthCheck.Data;
@@ -88,7 +89,8 @@ public void Start(TextWriter inputWriter)
             extractor = new JsonDataExtractor(DataExtractionExpression);
 
         var targetUrls = TargetUrl.Split(new[] {'\r', '\n'}, StringSplitOptions.RemoveEmptyEntries);
-        foreach (var targetUrl in targetUrls)
+
+        foreach (var (targetUrl, ix) in targetUrls.Select((t, i) => (t, i)))
         {
             var healthCheck = new HttpHealthCheck(
                 _httpClient,
@@ -99,9 +101,14 @@ public void Start(TextWriter inputWriter)
                 BypassHttpCaching,
                 FollowRedirects);
 
+            var delayStart = targetUrls.Length <= 1
+                ? TimeSpan.Zero
+                : TimeSpan.FromMilliseconds(((IntervalSeconds * 1000.0) / targetUrls.Length) * ix);
+
             _healthCheckTasks.Add(new HealthCheckTask(
                 healthCheck,
                 TimeSpan.FromSeconds(IntervalSeconds),
+                delayStart,
                 reporter,
                 Log));
         }
@@ -120,4 +127,4 @@ public void Dispose()
 
         _httpClient?.Dispose();
     }
-}
+}

src/Seq.Input.HealthCheck/HealthCheckTask.cs

@@ -24,23 +24,26 @@ class HealthCheckTask : IDisposable
     readonly CancellationTokenSource _cancel = new();
     readonly Task _healthCheckTask;
 
-    public HealthCheckTask(HttpHealthCheck healthCheck, TimeSpan interval, HealthCheckReporter reporter, ILogger diagnosticLog)
+    public HealthCheckTask(HttpHealthCheck healthCheck, TimeSpan interval, TimeSpan delayStart, HealthCheckReporter reporter, ILogger diagnosticLog)
     {
         if (healthCheck == null) throw new ArgumentNullException(nameof(healthCheck));
         if (reporter == null) throw new ArgumentNullException(nameof(reporter));
 
-        _healthCheckTask = Task.Run(() => Run(healthCheck, interval, reporter, diagnosticLog, _cancel.Token), _cancel.Token);
+        _healthCheckTask = Task.Run(() => Run(healthCheck, interval, delayStart, reporter, diagnosticLog, _cancel.Token), _cancel.Token);
     }
 
     static async Task Run(
         HttpHealthCheck healthCheck,
-        TimeSpan interval, 
-        HealthCheckReporter reporter, 
+        TimeSpan interval,
+        TimeSpan delayStart,
+        HealthCheckReporter reporter,
         ILogger diagnosticLog,
         CancellationToken cancel)
     {
         try
         {
+            if (delayStart > TimeSpan.Zero) await Task.Delay(delayStart, cancel);
+
             while (!cancel.IsCancellationRequested)
             {
                 var result = await healthCheck.CheckNow(cancel);
@@ -74,4 +77,4 @@ public void Dispose()
         _cancel.Dispose();
         _healthCheckTask.Dispose();
     }
-}
+}

src/Seq.Input.HealthCheck/Seq.Input.HealthCheck.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <VersionPrefix>2.1.0</VersionPrefix>
+    <VersionPrefix>2.1.1</VersionPrefix>
     <Description>Seq Health Check: periodically GET an HTTP resource and publish response metrics to Seq.</Description>
     <Authors>Datalust and Contributors</Authors>
     <PackageTags>seq-app</PackageTags>