Merge remote-tracking branch 'origin/otel-metrics' into fix-hanging-i…

…ngestion
Particular · Jan 31, 2025 · eb85f65 · eb85f65
2 parents 58043ae + b986142
commit eb85f65
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -91,4 +91,4 @@
     <GlobalPackageReference Include="Microsoft.Build.CopyOnWrite" Version="1.0.334" />
     <GlobalPackageReference Include="Particular.Packaging" Version="4.2.0" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/...iceControl.Audit.UnitTests/ApprovalFiles/APIApprovals.PlatformSampleSettings.approved.txt b/...iceControl.Audit.UnitTests/ApprovalFiles/APIApprovals.PlatformSampleSettings.approved.txt
@@ -12,6 +12,7 @@
   "ApiUrl": "http://localhost:8888/api",
   "Port": 8888,
   "PrintMetrics": false,
+  "OtelMetricsUrl": null,
   "Hostname": "localhost",
   "VirtualDirectory": "",
   "TransportType": "LearningTransport",

diff --git a/src/ServiceControl.Audit/Auditing/AuditIngestion.cs b/src/ServiceControl.Audit/Auditing/AuditIngestion.cs
@@ -162,7 +162,6 @@ async Task EnsureStopped(CancellationToken cancellationToken = default)
                     logger.Info("Shutting down. Already stopped, skipping shut down");
                     return; //Already stopped
                 }
-
                 var stoppable = queueIngestor;
                 queueIngestor = null;
                 logger.Info("Shutting down. Infrastructure shut down commencing");

diff --git a/src/ServiceControl.Audit/Auditing/AuditIngestor.cs b/src/ServiceControl.Audit/Auditing/AuditIngestor.cs
@@ -2,7 +2,6 @@
 {
     using System;
     using System.Collections.Generic;
-    using System.Diagnostics;
     using System.Linq;
     using System.Threading.Tasks;
     using Infrastructure.Settings;
@@ -42,7 +41,12 @@ ITransportCustomization transportCustomization
 
             logQueueAddress = transportCustomization.ToTransportQualifiedQueueName(settings.AuditLogQueue);
 
-            auditPersister = new AuditPersister(unitOfWorkFactory, enrichers, messageSession, messageDispatcher);
+            auditPersister = new AuditPersister(
+                unitOfWorkFactory,
+                enrichers,
+                messageSession,
+                messageDispatcher
+            );
         }
 
         public async Task Ingest(List<MessageContext> contexts)

diff --git a/src/ServiceControl.Audit/Auditing/AuditPersister.cs b/src/ServiceControl.Audit/Auditing/AuditPersister.cs
@@ -73,8 +73,6 @@ public async Task<IReadOnlyList<MessageContext>> Persist(IReadOnlyList<MessageCo
 
                         var auditSw = Stopwatch.StartNew();
                         await unitOfWork.RecordProcessedMessage(processedMessage, context.Body);
-                        auditSw.Stop();
-
                         auditBulkInsertDurationMeter.Record(auditSw.ElapsedMilliseconds);
 
                         ingestedAuditMeter.Add(1);
@@ -85,8 +83,6 @@ public async Task<IReadOnlyList<MessageContext>> Persist(IReadOnlyList<MessageCo
 
                         var sagaSw = Stopwatch.StartNew();
                         await unitOfWork.RecordSagaSnapshot(sagaSnapshot);
-                        sagaSw.Stop();
-
                         sagaAuditBulkInsertDurationMeter.Record(sagaSw.ElapsedMilliseconds);
 
                         ingestedSagaAuditMeter.Add(1);
@@ -120,7 +116,6 @@ 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();
-                        commitSw.Stop();
                         bulkInsertCommitDurationMeter.Record(commitSw.ElapsedMilliseconds);
                     }
                     catch (Exception e)