Group prometheus metrics

ATI.Services.Common/ATI.Services.Common.csproj

@@ -4,7 +4,6 @@
     <RuntimeIdentifiers>linux-x64</RuntimeIdentifiers>
     <Authors>Team Services</Authors>
     <Company>ATI</Company>
-    <LangVersion>10</LangVersion>
     <PublishReadyToRun>true</PublishReadyToRun>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageId>atisu.services.common</PackageId>
@@ -18,15 +17,15 @@
     <PackageReference Include="Dapper" Version="2.0.30" />
     <PackageReference Include="HtmlSanitizer" Version="8.0.692" />
     <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="3.0.1" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.2" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.3" />
     <PackageReference Include="NLog" Version="4.7.6" />
     <PackageReference Include="NLog.DiagnosticSource" Version="1.3.0" />
     <PackageReference Include="NLog.Web.AspNetCore" Version="4.9.3" />
     <PackageReference Include="Npgsql" Version="7.0.4" />
     <PackageReference Include="Polly" Version="7.2.3" />
-    <PackageReference Include="prometheus-net" Version="8.0.0" />
+    <PackageReference Include="prometheus-net" Version="8.2.1" />
     <PackageReference Include="StackExchange.Redis" Version="2.2.50" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
     <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.5.0" />

ATI.Services.Common/Initializers/MetricsInitializer.cs

@@ -25,10 +25,7 @@ public Task InitializeAsync()
                 return Task.CompletedTask;
             }
 
-            if (_metricsOptions.MetricsServiceName != null )
-            {
-                MetricsFactory.Init(_metricsOptions.MetricsServiceName, _metricsOptions.DefaultLongRequestTime);
-            }
+            MetricsFactory.Init(_metricsOptions.DefaultLongRequestTime);
 
             _initialized = true;
             return Task.CompletedTask;

ATI.Services.Common/Logging/LogSource.cs

@@ -13,6 +13,7 @@ public enum LogSource
         Sql = 4,
         Controller = 5, 
         Repository = 6,
-        ExternalHttpClient = 8
+        RabbitMq = 9,
+        Custom = 10
     }
 }

ATI.Services.Common/Metrics/ExceptionsMetricsCollector.cs

@@ -1,59 +1,49 @@
 using System;
 using System.Collections.Concurrent;
 using System.Diagnostics.Tracing;
-using Microsoft.Extensions.Configuration;
 using Prometheus;
-using ConfigurationManager = ATI.Services.Common.Behaviors.ConfigurationManager;
 
-namespace ATI.Services.Common.Metrics
-{
-    public class ExceptionsMetricsCollector : EventListener
-    {
-        // Да, даже под linux - Microsoft-Windows
-        private const string ExceptionSourceName = "Microsoft-Windows-DotNETRuntime";
-        private const int ExceptionBit = 0x8000;
-        private const int ExceptionNameIndex = 0;
-        private readonly ConcurrentDictionary<string, long> _exceptionCounters = new();
-        private MetricFactory _metricFactory;
-        private const string ExceptionsMetricName = "Exceptions";
-        private Gauge _gauge;
+namespace ATI.Services.Common.Metrics;
 
-        private string ServiceName { get; }
-        public ExceptionsMetricsCollector()
-        {
-            ServiceName = ConfigurationManager.GetSection(nameof(MetricsOptions)).Get<MetricsOptions>().MetricsServiceName;
-        }
+public class ExceptionsMetricsCollector : EventListener
+{
+    // Да, даже под linux - Microsoft-Windows
+    private const string ExceptionSourceName = "Microsoft-Windows-DotNETRuntime";
+    private const int ExceptionBit = 0x8000;
+    private const int ExceptionNameIndex = 0;
+    private readonly ConcurrentDictionary<string, long> _exceptionCounters = new();
+    private MetricFactory _metricFactory;
+    private Gauge _gauge;
 
-        protected override void OnEventSourceCreated(EventSource eventSource)
-        {
-            if (eventSource.Name != ExceptionSourceName)
-                return;
+    protected override void OnEventSourceCreated(EventSource eventSource)
+    {
+        if (eventSource.Name != ExceptionSourceName)
+            return;
 
-            EnableEvents(
-                eventSource,
-                EventLevel.Error,
-                (EventKeywords) ExceptionBit);
-        }
+        EnableEvents(
+            eventSource,
+            EventLevel.Error,
+            (EventKeywords) ExceptionBit);
+    }
 
-        protected override void OnEventWritten(EventWrittenEventArgs eventData)
-        {
-            var exceptionType = eventData.Payload[ExceptionNameIndex].ToString();
-            _exceptionCounters.AddOrUpdate(exceptionType, _ => 1, (_, oldValue) => oldValue + 1);
-        }
+    protected override void OnEventWritten(EventWrittenEventArgs eventData)
+    {
+        var exceptionType = eventData.Payload[ExceptionNameIndex].ToString();
+        _exceptionCounters.AddOrUpdate(exceptionType, _ => 1, (_, oldValue) => oldValue + 1);
+    }
 
-        public void RegisterMetrics(CollectorRegistry registry)
-        {
-            _metricFactory = Prometheus.Metrics.WithCustomRegistry(registry);
-            _gauge = _metricFactory.CreateGauge(ServiceName + ExceptionsMetricName, "", "machine_name", "exception_type");
-        }
+    public void RegisterMetrics(CollectorRegistry registry)
+    {
+        _metricFactory = Prometheus.Metrics.WithCustomRegistry(registry);
+        _gauge = _metricFactory.CreateGauge($"{MetricsFactory.Prefix}_Exceptions", "", "machine_name", "exception_type");
+    }
 
-        public void UpdateMetrics()
+    public void UpdateMetrics()
+    {
+        foreach (var exceptionType in _exceptionCounters.Keys)
         {
-            foreach (var exceptionType in _exceptionCounters.Keys)
-            {
-                _exceptionCounters.TryRemove(exceptionType, out var count);
-                _gauge.WithLabels(Environment.MachineName, exceptionType).Set(count);
-            }
+            _exceptionCounters.TryRemove(exceptionType, out var count);
+            _gauge.WithLabels(Environment.MachineName, exceptionType).Set(count);
         }
     }
 }