rework metrics

MareSynchronosServer/MareSynchronosStaticFilesServer/CleanupService.cs

@@ -16,13 +16,13 @@ namespace MareSynchronosStaticFilesServer;
 
 public class CleanupService : IHostedService, IDisposable
 {
-    private readonly MetricsService.MetricsServiceClient _metrics;
+    private readonly MareMetrics _metrics;
     private readonly ILogger<CleanupService> _logger;
     private readonly IServiceProvider _services;
     private readonly IConfiguration _configuration;
     private Timer? _timer;
 
-    public CleanupService(MetricsService.MetricsServiceClient metrics, ILogger<CleanupService> logger, IServiceProvider services, IConfiguration configuration)
+    public CleanupService(MareMetrics metrics, ILogger<CleanupService> logger, IServiceProvider services, IConfiguration configuration)
     {
         _metrics = metrics;
         _logger = logger;
@@ -30,31 +30,22 @@ public class CleanupService : IHostedService, IDisposable
         _configuration = configuration.GetRequiredSection("MareSynchronos");
     }
 
-    public async Task StartAsync(CancellationToken cancellationToken)
+    public Task StartAsync(CancellationToken cancellationToken)
     {
         _logger.LogInformation("Cleanup Service started");
 
-        _ = Task.Run(async () =>
-        {
-            _logger.LogInformation("Calculating initial files");
+        _logger.LogInformation("Calculating initial files");
 
-            DirectoryInfo dir = new DirectoryInfo(_configuration["CacheDirectory"]);
-            var allFiles = dir.GetFiles();
-            await _metrics.SetGaugeAsync(new SetGaugeRequest()
-            {
-                GaugeName = MetricsAPI.GaugeFilesTotalSize,
-                Value = allFiles.Sum(f => f.Length)
-            });
-            await _metrics.SetGaugeAsync(new SetGaugeRequest()
-            {
-                GaugeName = MetricsAPI.GaugeFilesTotal,
-                Value = allFiles.Length
-            });
+        DirectoryInfo dir = new DirectoryInfo(_configuration["CacheDirectory"]);
+        var allFiles = dir.GetFiles();
+        _metrics.SetGaugeTo(MetricsAPI.GaugeFilesTotalSize, allFiles.Sum(f => f.Length));
+        _metrics.SetGaugeTo(MetricsAPI.GaugeFilesTotal, allFiles.Length);
 
-            _logger.LogInformation("Initial file calculation finished, starting periodic cleanup task");
+        _logger.LogInformation("Initial file calculation finished, starting periodic cleanup task");
 
-            _timer = new Timer(CleanUp, null, TimeSpan.FromSeconds(15), TimeSpan.FromMinutes(10));
-        });
+        _timer = new Timer(CleanUp, null, TimeSpan.FromSeconds(15), TimeSpan.FromMinutes(10));
+
+        return Task.CompletedTask;
     }
 
     private void CleanUp(object? state)
@@ -86,8 +77,8 @@ public class CleanupService : IHostedService, IDisposable
                 }
                 else if (fi.LastAccessTime < prevTime)
                 {
-                    _metrics.DecGauge(new() { GaugeName = MetricsAPI.GaugeFilesTotalSize, Value = fi.Length });
-                    _metrics.DecGauge(new() { GaugeName = MetricsAPI.GaugeFilesTotal, Value = 1 });
+                    _metrics.DecGauge(MetricsAPI.GaugeFilesTotalSize, fi.Length);
+                    _metrics.DecGauge(MetricsAPI.GaugeFilesTotal);
                     _logger.LogInformation("File outdated: {fileName}", fileName);
                     dbContext.Files.Remove(file);
                     fi.Delete();
@@ -101,8 +92,8 @@ public class CleanupService : IHostedService, IDisposable
             {
                 if (!allFilesHashes.Contains(file.Name.ToUpperInvariant()))
                 {
-                    _metrics.DecGauge(new() { GaugeName = MetricsAPI.GaugeFilesTotalSize, Value = file.Length });
-                    _metrics.DecGauge(new() { GaugeName = MetricsAPI.GaugeFilesTotal, Value = 1 });
+                    _metrics.DecGauge(MetricsAPI.GaugeFilesTotalSize, file.Length);
+                    _metrics.DecGauge(MetricsAPI.GaugeFilesTotal);
                     file.Delete();
                     _logger.LogInformation("File not in DB, deleting: {fileName}", file.FullName);
                 }
@@ -131,8 +122,8 @@ public class CleanupService : IHostedService, IDisposable
                     removedHashes.Add(oldestFile.Name.ToLower());
                     allLocalFiles.Remove(oldestFile);
                     totalCacheSizeInBytes -= oldestFile.Length;
-                    _metrics.DecGauge(new() { GaugeName = MetricsAPI.GaugeFilesTotalSize, Value = oldestFile.Length });
-                    _metrics.DecGauge(new() { GaugeName = MetricsAPI.GaugeFilesTotal, Value = 1 });
+                    _metrics.DecGauge(MetricsAPI.GaugeFilesTotalSize, oldestFile.Length);
+                    _metrics.DecGauge(MetricsAPI.GaugeFilesTotal);
                     oldestFile.Delete();
                 }
 

MareSynchronosServer/MareSynchronosStaticFilesServer/FileService.cs

@@ -17,9 +17,9 @@ public class FileService : MareSynchronosShared.Protos.FileService.FileServiceBa
     private readonly string _basePath;
     private readonly MareDbContext _mareDbContext;
     private readonly ILogger<FileService> _logger;
-    private readonly MetricsService.MetricsServiceClient _metricsClient;
+    private readonly MareMetrics _metricsClient;
 
-    public FileService(MareDbContext mareDbContext, IConfiguration configuration, ILogger<FileService> logger, MetricsService.MetricsServiceClient metricsClient)
+    public FileService(MareDbContext mareDbContext, IConfiguration configuration, ILogger<FileService> logger, MareMetrics metricsClient)
     {
         _basePath = configuration.GetRequiredSection("MareSynchronos")["CacheDirectory"];
         _mareDbContext = mareDbContext;
@@ -37,10 +37,8 @@ public class FileService : MareSynchronosShared.Protos.FileService.FileServiceBa
             await File.WriteAllBytesAsync(filePath, byteData);
             file.Uploaded = true;
 
-            await _metricsClient.IncGaugeAsync(new GaugeRequest()
-            { GaugeName = MetricsAPI.GaugeFilesTotalSize, Value = byteData.Length }).ConfigureAwait(false);
-            await _metricsClient.IncGaugeAsync(new GaugeRequest()
-            { GaugeName = MetricsAPI.GaugeFilesTotal, Value = 1 }).ConfigureAwait(false);
+            _metricsClient.IncGauge(MetricsAPI.GaugeFilesTotal, 1);
+            _metricsClient.IncGauge(MetricsAPI.GaugeFilesTotalSize, byteData.Length);
 
             await _mareDbContext.SaveChangesAsync().ConfigureAwait(false);
             _logger.LogInformation("User {user} uploaded file {hash}", request.Uploader, request.Hash);
@@ -62,10 +60,8 @@ public class FileService : MareSynchronosShared.Protos.FileService.FileServiceBa
                 {
                     _mareDbContext.Files.Remove(file);
 
-                    await _metricsClient.DecGaugeAsync(new GaugeRequest()
-                    { GaugeName = MetricsAPI.GaugeFilesTotalSize, Value = fi.Length }).ConfigureAwait(false);
-                    await _metricsClient.DecGaugeAsync(new GaugeRequest()
-                    { GaugeName = MetricsAPI.GaugeFilesTotal, Value = 1 }).ConfigureAwait(false);
+                    _metricsClient.DecGauge(MetricsAPI.GaugeFilesTotal, 1);
+                    _metricsClient.DecGauge(MetricsAPI.GaugeFilesTotalSize, fi.Length);
                 }
             }
             catch (Exception ex)

MareSynchronosServer/MareSynchronosStaticFilesServer/MareSynchronosStaticFilesServer.csproj

@@ -21,6 +21,7 @@
     <PackageReference Include="Grpc.Net.Client" Version="2.47.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.8" />
     <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="6.0.0" />
+    <PackageReference Include="prometheus-net.AspNetCore" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>

MareSynchronosServer/MareSynchronosStaticFilesServer/Startup.cs

@@ -1,6 +1,7 @@
 using Grpc.Net.Client.Configuration;
 using MareSynchronosShared.Authentication;
 using MareSynchronosShared.Data;
+using MareSynchronosShared.Metrics;
 using MareSynchronosShared.Protos;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authorization;
@@ -10,7 +11,9 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.FileProviders;
+using Prometheus;
 using System;
+using System.Collections.Generic;
 
 namespace MareSynchronosStaticFilesServer;
 
@@ -44,6 +47,13 @@ public class Startup
             }
         };
 
+        services.AddSingleton(new MareMetrics(new List<string> {
+        }, new List<string>
+        {
+            MetricsAPI.GaugeFilesTotalSize,
+            MetricsAPI.GaugeFilesTotal
+        }));
+
         services.AddGrpcClient<AuthService.AuthServiceClient>(c =>
         {
             c.Address = new Uri(mareSettings.GetValue<string>("ServiceAddress"));
@@ -51,13 +61,6 @@ public class Startup
         {
             c.ServiceConfig = new ServiceConfig { MethodConfigs = { defaultMethodConfig } };
         });
-        services.AddGrpcClient<MetricsService.MetricsServiceClient>(c =>
-        {
-            c.Address = new Uri(mareSettings.GetValue<string>("ServiceAddress"));
-        }).ConfigureChannel(c =>
-        {
-            c.ServiceConfig = new ServiceConfig { MethodConfigs = { defaultMethodConfig } };
-        });
 
         services.AddDbContextPool<MareDbContext>(options =>
         {
@@ -89,6 +92,9 @@ public class Startup
 
         app.UseRouting();
 
+        var metricServer = new KestrelMetricServer(4982);
+        metricServer.Start();
+
         app.UseAuthentication();
         app.UseAuthorization();
 

MareSynchronosServer/MareSynchronosStaticFilesServer/appsettings.json

@@ -22,7 +22,7 @@
   "MareSynchronos": {
     "CacheSizeHardLimitInGiB": -1,
     "UnusedFileRetentionPeriodInDays": 7,
-    "CacheDirectory": "G:\\ServerTest", // do not delete this key and set it to the path where the files will be stored
+    "CacheDirectory": "G:\\ServerTest",
     "ServiceAddress": "http://localhost:5002"
   },
   "AllowedHosts": "*"