From f0e5d8e737b362754d514c31796dd1681701af2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Sun, 9 Mar 2025 14:58:09 +0100
Subject: [PATCH 1/2] Revert back to older diagnostics source

---
 src/Directory.Packages.props                              | 1 -
 .../Auditing/Metrics/IngestionMetrics.cs                  | 8 ++++----
 src/ServiceControl.Audit/ServiceControl.Audit.csproj      | 1 -
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index b2b400a707..4ed9bbd370 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -64,7 +64,6 @@
     <PackageVersion Include="ReactiveUI.WPF" Version="20.1.63" />
     <PackageVersion Include="ServiceControl.Contracts" Version="5.0.0" />
     <PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
-    <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="9.0.2" />
     <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="8.0.1" />
     <PackageVersion Include="System.DirectoryServices.AccountManagement" Version="8.0.1" />
     <PackageVersion Include="System.Linq.Async" Version="6.0.1" />
diff --git a/src/ServiceControl.Audit/Auditing/Metrics/IngestionMetrics.cs b/src/ServiceControl.Audit/Auditing/Metrics/IngestionMetrics.cs
index 2c79c586d5..d9707052c5 100644
--- a/src/ServiceControl.Audit/Auditing/Metrics/IngestionMetrics.cs
+++ b/src/ServiceControl.Audit/Auditing/Metrics/IngestionMetrics.cs
@@ -20,7 +20,7 @@ public IngestionMetrics(IMeterFactory meterFactory)
 
         batchDuration = meter.CreateHistogram<double>(BatchDurationInstrumentName, unit: "seconds", "Message batch processing duration in seconds");
         ingestionDuration = meter.CreateHistogram<double>(MessageDurationInstrumentName, unit: "seconds", description: "Audit message processing duration in seconds");
-        consecutiveBatchFailureGauge = meter.CreateGauge<long>($"{InstrumentPrefix}.consecutive_batch_failure_total", description: "Consecutive audit ingestion batch failure");
+        consecutiveBatchFailureGauge = meter.CreateObservableGauge($"{InstrumentPrefix}.consecutive_batch_failure_total", () => consecutiveBatchFailures, description: "Consecutive audit ingestion batch failure");
         failureCounter = meter.CreateCounter<long>($"{InstrumentPrefix}.failures_total", description: "Audit ingestion failure count");
     }
 
@@ -56,14 +56,14 @@ void RecordBatchOutcome(bool success)
         {
             consecutiveBatchFailures++;
         }
-
-        consecutiveBatchFailureGauge.Record(consecutiveBatchFailures);
     }
 
     long consecutiveBatchFailures;
 
     readonly Histogram<double> batchDuration;
-    readonly Gauge<long> consecutiveBatchFailureGauge;
+#pragma warning disable IDE0052
+    readonly ObservableGauge<long> consecutiveBatchFailureGauge;
+#pragma warning restore IDE0052
     readonly Histogram<double> ingestionDuration;
     readonly Counter<long> failureCounter;
 
diff --git a/src/ServiceControl.Audit/ServiceControl.Audit.csproj b/src/ServiceControl.Audit/ServiceControl.Audit.csproj
index 3d5245157b..ba7d5110d5 100644
--- a/src/ServiceControl.Audit/ServiceControl.Audit.csproj
+++ b/src/ServiceControl.Audit/ServiceControl.Audit.csproj
@@ -32,7 +32,6 @@
     <PackageReference Include="OpenTelemetry.Exporter.Console" />
     <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" />
     <PackageReference Include="OpenTelemetry.Extensions.Hosting" />
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" />
   </ItemGroup>
 
    <ItemGroup>

From 017e855b207b317aa07ebbf5f71e61f6abf43f29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96hlund?= <andreas.ohlund@particular.net>
Date: Sun, 9 Mar 2025 16:09:16 +0100
Subject: [PATCH 2/2] Add comment related to use of ObservableGauge

---
 src/ServiceControl.Audit/Auditing/Metrics/IngestionMetrics.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ServiceControl.Audit/Auditing/Metrics/IngestionMetrics.cs b/src/ServiceControl.Audit/Auditing/Metrics/IngestionMetrics.cs
index d9707052c5..f968cebb72 100644
--- a/src/ServiceControl.Audit/Auditing/Metrics/IngestionMetrics.cs
+++ b/src/ServiceControl.Audit/Auditing/Metrics/IngestionMetrics.cs
@@ -62,6 +62,7 @@ void RecordBatchOutcome(bool success)
 
     readonly Histogram<double> batchDuration;
 #pragma warning disable IDE0052
+    // this can be changed to Gauge<T> once we can use the latest version of System.Diagnostics.DiagnosticSource
     readonly ObservableGauge<long> consecutiveBatchFailureGauge;
 #pragma warning restore IDE0052
     readonly Histogram<double> ingestionDuration;