Register the MemoryInformationRetriever in DI

Author: mauroservienti

src/ServiceControl.Audit.Persistence.RavenDB/CustomChecks/CheckDirtyMemory.cs

@@ -7,23 +7,22 @@ namespace ServiceControl.Audit.Persistence.RavenDB.CustomChecks;
 using NServiceBus.CustomChecks;
 using NServiceBus.Logging;
 
-class CheckDirtyMemory(DatabaseConfiguration databaseConfiguration) : CustomCheck("ServiceControl.Audit database", "Dirty memory trends", TimeSpan.FromMinutes(5))
+class CheckDirtyMemory(MemoryInformationRetriever memoryInformationRetriever) : CustomCheck("ServiceControl.Audit database", "Dirty memory trends", TimeSpan.FromMinutes(5))
 {
     readonly List<int> lastDirtyMemoryReads = [];
     public override async Task<CheckResult> PerformCheck(CancellationToken cancellationToken = default)
     {
-        var retriever = GetMemoryRetriever();
-        var (isHighDirty, dirtyMemory) = await retriever.GetMemoryInformation(cancellationToken);
+        var (isHighDirty, dirtyMemoryKb) = await memoryInformationRetriever.GetMemoryInformation(cancellationToken);
 
         if (isHighDirty)
         {
-            var message = $"There is a high level of dirty memory ({dirtyMemory}kb). Check the ServiceControl " +
+            var message = $"There is a high level of dirty memory ({dirtyMemoryKb}kb). Check the ServiceControl " +
                           "troubleshooting guide for guidance on how to mitigate the issue.";
             Log.Warn(message);
             return CheckResult.Failed(message);
         }
 
-        lastDirtyMemoryReads.Add(dirtyMemory);
+        lastDirtyMemoryReads.Add(dirtyMemoryKb);
         if (lastDirtyMemoryReads.Count > 20)
         {
             //cap the list at 20 which means we're keeping about 1 hour and 40 minutes of data
@@ -39,7 +38,7 @@ public override async Task<CheckResult> PerformCheck(CancellationToken cancellat
             // Three means we'll be observing for 15 minutes before calculating the trend
             case >= 3 when AnalyzeTrendUsingRegression(lastDirtyMemoryReads) == TrendDirection.Increasing:
                 {
-                    var message = $"Dirty memory is increasing. Last available value is {dirtyMemory}kb. " +
+                    var message = $"Dirty memory is increasing. Last available value is {dirtyMemoryKb}kb. " +
                                   $"Check the ServiceControl troubleshooting guide for guidance on how to mitigate the issue.";
                     Log.Warn(message);
                     return CheckResult.Failed(message);
@@ -53,9 +52,6 @@ public override async Task<CheckResult> PerformCheck(CancellationToken cancellat
         return CheckResult.Pass;
     }
 
-    MemoryInformationRetriever _retriever;
-    MemoryInformationRetriever GetMemoryRetriever() => _retriever ??= new MemoryInformationRetriever(databaseConfiguration.ServerConfiguration.ServerUrl);
-
     static TrendDirection AnalyzeTrendUsingRegression(List<int> values)
     {
         if (values is not { Count: > 1 })

src/ServiceControl.Audit.Persistence.RavenDB/MemoryInformationRetriever.cs

@@ -1,15 +1,14 @@
 namespace ServiceControl.Audit.Persistence.RavenDB;
 
 using System;
-using System.Linq;
 using System.Net.Http;
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 
-class MemoryInformationRetriever(string serverUrl)
+class MemoryInformationRetriever(DatabaseConfiguration databaseConfiguration)
 {
-    readonly HttpClient client = new() { BaseAddress = new Uri(serverUrl) };
+    readonly HttpClient client = new() { BaseAddress = new Uri(databaseConfiguration.ServerConfiguration.ServerUrl) };
 
     record ResponseDto
     {

src/ServiceControl.Audit.Persistence.RavenDB/RavenPersistence.cs

@@ -21,6 +21,7 @@ public void AddPersistence(IServiceCollection services)
         static void ConfigureLifecycle(IServiceCollection services, DatabaseConfiguration databaseConfiguration)
         {
             services.AddSingleton(databaseConfiguration);
+            services.AddSingleton<MemoryInformationRetriever>();
 
             services.AddSingleton<IRavenSessionProvider, RavenSessionProvider>();
             services.AddHostedService<RavenPersistenceLifecycleHostedService>();