From 4d1ef1f87149e27116f67a7c097a728d8493b8b8 Mon Sep 17 00:00:00 2001
From: rootdarkarchon <root.darkarchon@outlook.com>
Date: Tue, 27 Dec 2022 15:43:58 +0100
Subject: [PATCH] something something metrics

---
 MareSynchronosServer/MareSynchronosServer/Program.cs         | 5 +++--
 .../MareSynchronosServer/Services/SystemInfoService.cs       | 1 +
 .../MareSynchronosServer/Services/UserCleanupService.cs      | 2 --
 .../MareSynchronosServices/Discord/MareModule.cs             | 2 --
 MareSynchronosServer/MareSynchronosServices/Program.cs       | 3 ---
 MareSynchronosServer/MareSynchronosServices/Startup.cs       | 5 +----
 .../MareSynchronosShared/Utils/MareConfigurationBase.cs      | 2 +-
 7 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/MareSynchronosServer/MareSynchronosServer/Program.cs b/MareSynchronosServer/MareSynchronosServer/Program.cs
index e106b41..6e5db64 100644
--- a/MareSynchronosServer/MareSynchronosServer/Program.cs
+++ b/MareSynchronosServer/MareSynchronosServer/Program.cs
@@ -36,8 +36,9 @@ public class Program
 
             var metrics = services.GetRequiredService<MareMetrics>();
 
-            metrics.SetGaugeTo(MetricsAPI.GaugePairs, context.ClientPairs.Count());
-            metrics.SetGaugeTo(MetricsAPI.GaugePairsPaused, context.ClientPairs.Count(p => p.IsPaused));
+            metrics.SetGaugeTo(MetricsAPI.GaugeUsersRegistered, context.Users.AsNoTracking().Count());
+            metrics.SetGaugeTo(MetricsAPI.GaugePairs, context.ClientPairs.AsNoTracking().Count());
+            metrics.SetGaugeTo(MetricsAPI.GaugePairsPaused, context.ClientPairs.AsNoTracking().Count(p => p.IsPaused));
 
         }
 
diff --git a/MareSynchronosServer/MareSynchronosServer/Services/SystemInfoService.cs b/MareSynchronosServer/MareSynchronosServer/Services/SystemInfoService.cs
index 708228a..e249fcc 100644
--- a/MareSynchronosServer/MareSynchronosServer/Services/SystemInfoService.cs
+++ b/MareSynchronosServer/MareSynchronosServer/Services/SystemInfoService.cs
@@ -67,6 +67,7 @@ public class SystemInfoService : IHostedService, IDisposable
             _mareMetrics.SetGaugeTo(MetricsAPI.GaugeGroups, db.Groups.AsNoTracking().Count());
             _mareMetrics.SetGaugeTo(MetricsAPI.GaugeGroupPairs, db.GroupPairs.AsNoTracking().Count());
             _mareMetrics.SetGaugeTo(MetricsAPI.GaugeGroupPairsPaused, db.GroupPairs.AsNoTracking().Count(p => p.IsPaused));
+            _mareMetrics.SetGaugeTo(MetricsAPI.GaugeUsersRegistered, db.Users.AsNoTracking().Count());
         }
     }
 
diff --git a/MareSynchronosServer/MareSynchronosServer/Services/UserCleanupService.cs b/MareSynchronosServer/MareSynchronosServer/Services/UserCleanupService.cs
index dc82498..11b033d 100644
--- a/MareSynchronosServer/MareSynchronosServer/Services/UserCleanupService.cs
+++ b/MareSynchronosServer/MareSynchronosServer/Services/UserCleanupService.cs
@@ -185,8 +185,6 @@ public class UserCleanupService : IHostedService
         dbContext.Users.Remove(user);
 
         await dbContext.SaveChangesAsync().ConfigureAwait(false);
-
-        metrics.DecGauge(MetricsAPI.GaugeUsersRegistered, 1);
     }
 
     public Task StopAsync(CancellationToken cancellationToken)
diff --git a/MareSynchronosServer/MareSynchronosServices/Discord/MareModule.cs b/MareSynchronosServer/MareSynchronosServices/Discord/MareModule.cs
index a779eb4..a2c7dd7 100644
--- a/MareSynchronosServer/MareSynchronosServices/Discord/MareModule.cs
+++ b/MareSynchronosServer/MareSynchronosServices/Discord/MareModule.cs
@@ -864,8 +864,6 @@ public class MareModule : InteractionModuleBase
 
                     _botServices.Logger.LogInformation("User registered: {userUID}", user.UID);
 
-                    _botServices.Metrics.IncGauge(MetricsAPI.GaugeUsersRegistered, 1);
-
                     lodestoneAuth.StartedAt = null;
                     lodestoneAuth.User = user;
                     lodestoneAuth.LodestoneAuthString = null;
diff --git a/MareSynchronosServer/MareSynchronosServices/Program.cs b/MareSynchronosServer/MareSynchronosServices/Program.cs
index b87a722..69302a2 100644
--- a/MareSynchronosServer/MareSynchronosServices/Program.cs
+++ b/MareSynchronosServer/MareSynchronosServices/Program.cs
@@ -15,9 +15,6 @@ public class Program
         {
             var services = scope.ServiceProvider;
             using var dbContext = services.GetRequiredService<MareDbContext>();
-            var metrics = services.GetRequiredService<MareMetrics>();
-
-            metrics.SetGaugeTo(MetricsAPI.GaugeUsersRegistered, dbContext.Users.Count());
 
             var options = host.Services.GetService<IConfigurationService<ServicesConfiguration>>();
             var optionsServer = host.Services.GetService<IConfigurationService<ServerConfiguration>>();
diff --git a/MareSynchronosServer/MareSynchronosServices/Startup.cs b/MareSynchronosServer/MareSynchronosServices/Startup.cs
index b0e00ae..f84c440 100644
--- a/MareSynchronosServer/MareSynchronosServices/Startup.cs
+++ b/MareSynchronosServer/MareSynchronosServices/Startup.cs
@@ -33,10 +33,7 @@ public class Startup
         }, Configuration.GetValue(nameof(MareConfigurationBase.DbContextPoolSize), 1024));
 
         services.AddSingleton(m => new MareMetrics(m.GetService<ILogger<MareMetrics>>(), new List<string> { },
-        new List<string>
-        {
-            MetricsAPI.GaugeUsersRegistered
-        }));
+        new List<string> {}));
 
         var noRetryConfig = new MethodConfig
         {
diff --git a/MareSynchronosServer/MareSynchronosShared/Utils/MareConfigurationBase.cs b/MareSynchronosServer/MareSynchronosShared/Utils/MareConfigurationBase.cs
index 011627e..993ba29 100644
--- a/MareSynchronosServer/MareSynchronosShared/Utils/MareConfigurationBase.cs
+++ b/MareSynchronosServer/MareSynchronosShared/Utils/MareConfigurationBase.cs
@@ -9,7 +9,7 @@ public class MareConfigurationBase : IMareConfiguration
 {
     public int DbContextPoolSize { get; set; } = 100;
     public string ShardName { get; set; } = string.Empty;
-    public int MetricsPort { get; set; } = 4981;
+    public int MetricsPort { get; set; }
 
     public T GetValue<T>(string key)
     {