Merge pull request #36 from granstel/metrics

Metrics

src/FillInTheTextBot.Api/FillInTheTextBot.Api.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <Version>1.21.0</Version>
+    <Version>1.22.0</Version>
     <PackageReleaseNotes>Optimized interaction with Dialogflow</PackageReleaseNotes>
   </PropertyGroup>
 

src/FillInTheTextBot.Api/appsettings.json

@@ -48,7 +48,11 @@
         "стоп",
         "закончить",
         "выйти",
-        "выход"
+        "выход",
+        "заткнись дура",
+        "заткнись, дура",
+        "алиса пока",
+        "алиса, пока"
       ]
     }
   }

src/FillInTheTextBot.Messengers.Yandex/YandexService.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Threading.Tasks;
 using FillInTheTextBot.Services;
 using Microsoft.Extensions.Logging;

src/FillInTheTextBot.Messengers/MessengerService.cs

@@ -73,6 +73,8 @@ public virtual async Task<TOutput> ProcessIncomingAsync(TInput input)
                         }
                     }
                 };
+
+                MetricsCollector.Increment("ErrorAnswer", string.Empty);
             }
 
             using (Tracing.Trace(operationName: "AfterAsync"))

src/FillInTheTextBot.Services/ConversationService.cs

@@ -12,7 +12,7 @@ namespace FillInTheTextBot.Services
 {
     public class ConversationService : IConversationService
     {
-        private static readonly Random Random = new Random();
+        private static readonly Random Random = new();
 
         private readonly ConversationConfiguration _configuration;
         private readonly IDialogflowService _dialogflowService;
@@ -129,7 +129,7 @@ private async Task<Response> GetText(Request request, string startText, string t
                 }
 
                 var eventName = $"event:{textKey}";
-
+                MetricsCollector.Increment("event", textKey);
 
                 var dialog = await _dialogflowService.GetResponseAsync(eventName, request.SessionId, request.ScopeKey);
 
@@ -303,8 +303,10 @@ private async Task<Response> TryGetAnswerForCancelsSlotFilling(bool? isCancelsSl
             {
                 return response;
             }
-
-            const string eventName = $"event:CancelsSlotFilling";
+
+            const string cancelsSlotFilling = "CancelsSlotFilling";
+            const string eventName = $"event:{cancelsSlotFilling}";
+            MetricsCollector.Increment("event", cancelsSlotFilling);
 
             var cancelsSlotFillingDialog = await _dialogflowService.GetResponseAsync(eventName, sessionId, scopeKey);
 

src/FillInTheTextBot.Services/DialogflowService.cs

@@ -9,7 +9,6 @@
 using InternalModels = FillInTheTextBot.Models;
 using Microsoft.Extensions.Logging;
 using FillInTheTextBot.Services.Mapping;
-using Prometheus;
 
 namespace FillInTheTextBot.Services
 {
@@ -38,8 +37,6 @@ public class DialogflowService : IDialogflowService
 
         private readonly Dictionary<InternalModels.Source, Func<InternalModels.Request, string, EventInput>> _eventResolvers;
 
-        private readonly Gauge _statistics;
-
         public DialogflowService(
             ILogger<DialogflowService> log,
             ScopesSelector<SessionsClient> sessionsClientSelector,
@@ -55,9 +52,6 @@ public DialogflowService(
                 {InternalModels.Source.Sber, DefaultWelcomeEventResolve},
                 {InternalModels.Source.Marusia, DefaultWelcomeEventResolve}
             };
-
-            _statistics = Metrics
-                .CreateGauge("statistics", "Statistics", "statistic_name", "parameter");
         }
 
         public async Task<InternalModels.Dialog> GetResponseAsync(string text, string sessionId, string scopeKey)
@@ -97,7 +91,7 @@ public Task SetContextAsync(string sessionId, string scopeKey, string contextNam
         {
             using (Tracing.Trace(s => s.WithTag(nameof(context.ScopeId), context.ScopeId), "Get response from Dialogflow"))
             {
-                _statistics.WithLabels("dialogflow_DetectIntent_scope", context.ScopeId).Inc();
+                MetricsCollector.Increment("dialogflow_DetectIntent_scope", context.ScopeId);
 
                 context.TryGetParameterValue(nameof(DialogflowConfiguration.ProjectId), out string projectId);
                 context.TryGetParameterValue(nameof(DialogflowConfiguration.LanguageCode), out string languageCode);
@@ -118,6 +112,8 @@ public Task SetContextAsync(string sessionId, string scopeKey, string contextNam
 
                 var queryResult = intentResponse.QueryResult;
 
+                MetricsCollector.Increment("intent", queryResult.Intent.DisplayName);
+
                 var response = queryResult.ToDialog();
 
                 response.ScopeKey = context.ScopeId;
@@ -137,7 +133,7 @@ private Task SetContextInternalAsync(ContextsClient client, string sessionId, Sc
 
                 var context = GetContext(projectId, region, session, contextName, lifeSpan, parameters);
 
-                _statistics.WithLabels("dialogflow_CreateContext_scope", scopeContext.ScopeId).Inc();
+                MetricsCollector.Increment("dialogflow_CreateContext_scope", scopeContext.ScopeId);
 
                 return client.CreateContextAsync(session, context);
             }

src/FillInTheTextBot.Services/MetricsCollector.cs

@@ -0,0 +1,19 @@
+using Prometheus;
+
+namespace FillInTheTextBot.Services;
+
+public static class MetricsCollector
+{
+    private static readonly Gauge Metrics;
+
+    static MetricsCollector()
+    {
+        Metrics = Prometheus.Metrics
+            .CreateGauge("metrics", "Custom metrics", "metric_name", "parameter");
+    }
+
+    public static void Increment(string key, string value)
+    {
+        Metrics.WithLabels(key, value).Inc();
+    }
+}