Better metrics names

Author: andreasohlund

src/ServiceControl.Audit/Auditing/AuditIngestion.cs

@@ -191,7 +191,7 @@ async Task OnMessage(MessageContext messageContext, CancellationToken cancellati
             var taskCompletionSource = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
             messageContext.SetTaskCompletionSource(taskCompletionSource);
 
-            receivedMeter.Add(1);
+            receivedAudits.Add(1);
 
             await channel.Writer.WriteAsync(messageContext, cancellationToken);
             await taskCompletionSource.Task;
@@ -212,11 +212,11 @@ async Task Loop()
                         contexts.Add(context);
                     }
 
-                    batchSizeMeter.Record(contexts.Count);
+                    auditBatchSize.Record(contexts.Count);
                     var sw = Stopwatch.StartNew();
 
                     await auditIngestor.Ingest(contexts);
-                    batchDurationMeter.Record(sw.ElapsedMilliseconds);
+                    auditBatchDuration.Record(sw.ElapsedMilliseconds);
                 }
                 catch (OperationCanceledException)
                 {
@@ -247,7 +247,7 @@ async Task Loop()
         TransportInfrastructure transportInfrastructure;
         IMessageReceiver queueIngestor;
 
-        readonly SemaphoreSlim startStopSemaphore = new SemaphoreSlim(1);
+        readonly SemaphoreSlim startStopSemaphore = new(1);
         readonly string inputEndpoint;
         readonly ITransportCustomization transportCustomization;
         readonly TransportSettings transportSettings;
@@ -256,9 +256,9 @@ async Task Loop()
         readonly IAuditIngestionUnitOfWorkFactory unitOfWorkFactory;
         readonly Settings settings;
         readonly Channel<MessageContext> channel;
-        readonly Histogram<long> batchSizeMeter = AuditMetrics.Meter.CreateHistogram<long>($"{AuditMetrics.Prefix}.batch_size");
-        readonly Histogram<double> batchDurationMeter = AuditMetrics.Meter.CreateHistogram<double>($"{AuditMetrics.Prefix}.batch_duration", unit: "ms");
-        readonly Counter<long> receivedMeter = AuditMetrics.Meter.CreateCounter<long>($"{AuditMetrics.Prefix}.received");
+        readonly Histogram<long> auditBatchSize = AuditMetrics.Meter.CreateHistogram<long>($"{AuditMetrics.Prefix}.batch_size_audits");
+        readonly Histogram<double> auditBatchDuration = AuditMetrics.Meter.CreateHistogram<double>($"{AuditMetrics.Prefix}.batch_duration_audits", unit: "ms");
+        readonly Counter<long> receivedAudits = AuditMetrics.Meter.CreateCounter<long>($"{AuditMetrics.Prefix}.received_audits");
         readonly Watchdog watchdog;
         readonly Task ingestionWorker;
         readonly IHostApplicationLifetime applicationLifetime;

src/ServiceControl.Audit/Auditing/AuditPersister.cs

@@ -75,9 +75,9 @@ public async Task<IReadOnlyList<MessageContext>> Persist(IReadOnlyList<MessageCo
 
                         var auditSw = Stopwatch.StartNew();
                         await unitOfWork.RecordProcessedMessage(processedMessage, context.Body);
-                        auditBulkInsertDurationMeter.Record(auditSw.ElapsedMilliseconds);
+                        auditBulkInsertDuration.Record(auditSw.ElapsedMilliseconds);
 
-                        ingestedAuditMeter.Add(1);
+                        storedAudits.Add(1);
                     }
                     else if (context.Extensions.TryGet(out SagaSnapshot sagaSnapshot))
                     {
@@ -88,9 +88,9 @@ public async Task<IReadOnlyList<MessageContext>> Persist(IReadOnlyList<MessageCo
 
                         var sagaSw = Stopwatch.StartNew();
                         await unitOfWork.RecordSagaSnapshot(sagaSnapshot);
-                        sagaAuditBulkInsertDurationMeter.Record(sagaSw.ElapsedMilliseconds);
+                        sagaAuditBulkInsertDuration.Record(sagaSw.ElapsedMilliseconds);
 
-                        ingestedSagaAuditMeter.Add(1);
+                        storedSagas.Add(1);
                     }
 
                     storedContexts.Add(context);
@@ -130,7 +130,7 @@ public async Task<IReadOnlyList<MessageContext>> Persist(IReadOnlyList<MessageCo
                         // this can throw even though dispose is never supposed to throw
                         var commitSw = Stopwatch.StartNew();
                         await unitOfWork.DisposeAsync();
-                        bulkInsertCommitDurationMeter.Record(commitSw.ElapsedMilliseconds);
+                        auditCommitDuration.Record(commitSw.ElapsedMilliseconds);
                     }
                     catch (Exception e)
                     {
@@ -283,11 +283,11 @@ await messageDispatcher.Value.Dispatch(new TransportOperations(messagesToEmit.To
             }
         }
 
-        readonly Counter<long> ingestedAuditMeter = AuditMetrics.Meter.CreateCounter<long>($"{AuditMetrics.Prefix}.stored_audit_messages");
-        readonly Counter<long> ingestedSagaAuditMeter = AuditMetrics.Meter.CreateCounter<long>($"{AuditMetrics.Prefix}.stored_saga_audits");
-        readonly Histogram<double> auditBulkInsertDurationMeter = AuditMetrics.Meter.CreateHistogram<double>($"{AuditMetrics.Prefix}.bulk_insert_duration_audit", unit: "ms");
-        readonly Histogram<double> sagaAuditBulkInsertDurationMeter = AuditMetrics.Meter.CreateHistogram<double>($"{AuditMetrics.Prefix}.bulk_insert_duration_sagas", unit: "ms");
-        readonly Histogram<double> bulkInsertCommitDurationMeter = AuditMetrics.Meter.CreateHistogram<double>($"{AuditMetrics.Prefix}.commit_duration_audit", unit: "ms");
+        readonly Counter<long> storedAudits = AuditMetrics.Meter.CreateCounter<long>($"{AuditMetrics.Prefix}.stored_audit_messages");
+        readonly Counter<long> storedSagas = AuditMetrics.Meter.CreateCounter<long>($"{AuditMetrics.Prefix}.stored_saga_audits");
+        readonly Histogram<double> auditBulkInsertDuration = AuditMetrics.Meter.CreateHistogram<double>($"{AuditMetrics.Prefix}.bulk_insert_duration_audits", unit: "ms");
+        readonly Histogram<double> sagaAuditBulkInsertDuration = AuditMetrics.Meter.CreateHistogram<double>($"{AuditMetrics.Prefix}.bulk_insert_duration_sagas", unit: "ms");
+        readonly Histogram<double> auditCommitDuration = AuditMetrics.Meter.CreateHistogram<double>($"{AuditMetrics.Prefix}.commit_duration_audits", unit: "ms");
 
         static readonly ILog Logger = LogManager.GetLogger<AuditPersister>();
     }