From ea192318512c45bbb88510942c4cbd1b579c2bc0 Mon Sep 17 00:00:00 2001
From: rootdarkarchon <root.darkarchon@outlook.com>
Date: Tue, 20 Dec 2022 12:00:23 +0100
Subject: [PATCH] remove unnecessary usings from solution, fixes in metrics

---
 .../MareSynchronosServer/Hubs/MareHub.Groups.cs           | 2 --
 .../MareSynchronosServer/Hubs/MareHub.User.cs             | 1 -
 MareSynchronosServer/MareSynchronosServer/Startup.cs      | 1 -
 .../MareSynchronosShared/Metrics/MareMetrics.cs           | 2 +-
 .../MareSynchronosShared/Metrics/MetricsAPI.cs            | 4 +---
 .../Migrations/20221024141548_GroupTempInvite.cs          | 3 +--
 .../MareSynchronosShared/Models/GroupTempInvite.cs        | 7 +------
 .../FileStatisticsService.cs                              | 8 ++++----
 .../MareSynchronosStaticFilesServer/Startup.cs            | 1 -
 9 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Groups.cs b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Groups.cs
index 5183895..77defbc 100644
--- a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Groups.cs
+++ b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Groups.cs
@@ -1,6 +1,5 @@
 using MareSynchronos.API;
 using MareSynchronosServer.Utils;
-using MareSynchronosShared.Authentication;
 using MareSynchronosShared.Models;
 using MareSynchronosShared.Utils;
 using Microsoft.AspNetCore.Authorization;
@@ -8,7 +7,6 @@ using Microsoft.AspNetCore.SignalR;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Linq;
 using System.Security.Cryptography;
 using System.Threading.Tasks;
diff --git a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.User.cs b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.User.cs
index 34c9bc9..e7ba419 100644
--- a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.User.cs
+++ b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.User.cs
@@ -7,7 +7,6 @@ using MareSynchronos.API;
 using MareSynchronosServer.Utils;
 using MareSynchronosShared.Metrics;
 using MareSynchronosShared.Models;
-using MareSynchronosShared.Protos;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.SignalR;
 using Microsoft.EntityFrameworkCore;
diff --git a/MareSynchronosServer/MareSynchronosServer/Startup.cs b/MareSynchronosServer/MareSynchronosServer/Startup.cs
index d7c1ace..a9307bb 100644
--- a/MareSynchronosServer/MareSynchronosServer/Startup.cs
+++ b/MareSynchronosServer/MareSynchronosServer/Startup.cs
@@ -23,7 +23,6 @@ using MareSynchronosServer.Services;
 using System.Net.Http;
 using MareSynchronosServer.Utils;
 using MareSynchronosServer.RequirementHandlers;
-using MareSynchronosShared.Services;
 using Microsoft.Extensions.Logging;
 
 namespace MareSynchronosServer;
diff --git a/MareSynchronosServer/MareSynchronosShared/Metrics/MareMetrics.cs b/MareSynchronosServer/MareSynchronosShared/Metrics/MareMetrics.cs
index 563df9b..3add03f 100644
--- a/MareSynchronosServer/MareSynchronosShared/Metrics/MareMetrics.cs
+++ b/MareSynchronosServer/MareSynchronosShared/Metrics/MareMetrics.cs
@@ -29,7 +29,7 @@ public class MareMetrics
     {
         if (gauges.ContainsKey(gaugeName))
         {
-            gauges[gaugeName].IncTo(value);
+            gauges[gaugeName].Set(value);
         }
     }
 
diff --git a/MareSynchronosServer/MareSynchronosShared/Metrics/MetricsAPI.cs b/MareSynchronosServer/MareSynchronosShared/Metrics/MetricsAPI.cs
index d573720..34e5631 100644
--- a/MareSynchronosServer/MareSynchronosShared/Metrics/MetricsAPI.cs
+++ b/MareSynchronosServer/MareSynchronosShared/Metrics/MetricsAPI.cs
@@ -1,6 +1,4 @@
-using StackExchange.Redis;
-
-namespace MareSynchronosShared.Metrics;
+namespace MareSynchronosShared.Metrics;
 
 public class MetricsAPI
 {
diff --git a/MareSynchronosServer/MareSynchronosShared/Migrations/20221024141548_GroupTempInvite.cs b/MareSynchronosServer/MareSynchronosShared/Migrations/20221024141548_GroupTempInvite.cs
index 3ce20a5..8261909 100644
--- a/MareSynchronosServer/MareSynchronosShared/Migrations/20221024141548_GroupTempInvite.cs
+++ b/MareSynchronosServer/MareSynchronosShared/Migrations/20221024141548_GroupTempInvite.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/MareSynchronosServer/MareSynchronosShared/Models/GroupTempInvite.cs b/MareSynchronosServer/MareSynchronosShared/Models/GroupTempInvite.cs
index 5088d28..d3f81b7 100644
--- a/MareSynchronosServer/MareSynchronosShared/Models/GroupTempInvite.cs
+++ b/MareSynchronosServer/MareSynchronosShared/Models/GroupTempInvite.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.ComponentModel.DataAnnotations;
 
 namespace MareSynchronosShared.Models;
 
diff --git a/MareSynchronosServer/MareSynchronosStaticFilesServer/FileStatisticsService.cs b/MareSynchronosServer/MareSynchronosStaticFilesServer/FileStatisticsService.cs
index f6dd157..d493a55 100644
--- a/MareSynchronosServer/MareSynchronosStaticFilesServer/FileStatisticsService.cs
+++ b/MareSynchronosServer/MareSynchronosStaticFilesServer/FileStatisticsService.cs
@@ -28,14 +28,14 @@ public class FileStatisticsService : IHostedService
         if (!_pastHourFiles.ContainsKey(fileHash))
         {
             _pastHourFiles[fileHash] = length;
-            _metrics.SetGaugeTo(MetricsAPI.GaugeFilesUniquePastHour, _pastHourFiles.Count);
-            _metrics.SetGaugeTo(MetricsAPI.GaugeFilesUniquePastHourSize, _pastHourFiles.Sum(f => f.Value));
+            _metrics.IncGauge(MetricsAPI.GaugeFilesUniquePastHour);
+            _metrics.IncGauge(MetricsAPI.GaugeFilesUniquePastHourSize, length);
         }
         if (!_pastDayFiles.ContainsKey(fileHash))
         {
             _pastDayFiles[fileHash] = length;
-            _metrics.SetGaugeTo(MetricsAPI.GaugeFilesUniquePastDay, _pastDayFiles.Count);
-            _metrics.SetGaugeTo(MetricsAPI.GaugeFilesUniquePastDaySize, _pastDayFiles.Sum(f => f.Value));
+            _metrics.IncGauge(MetricsAPI.GaugeFilesUniquePastDay);
+            _metrics.IncGauge(MetricsAPI.GaugeFilesUniquePastDaySize, length);
         }
     }
 
diff --git a/MareSynchronosServer/MareSynchronosStaticFilesServer/Startup.cs b/MareSynchronosServer/MareSynchronosStaticFilesServer/Startup.cs
index 7507969..3cbdfa1 100644
--- a/MareSynchronosServer/MareSynchronosStaticFilesServer/Startup.cs
+++ b/MareSynchronosServer/MareSynchronosStaticFilesServer/Startup.cs
@@ -9,7 +9,6 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Logging;
 using Prometheus;
 using System;