Merge branch 'master' into john/range

johnsimons · web-flow · commit 1b185755dbf5 · 2025-03-10T18:17:55.000+10:00
diff --git 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
@@ -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,15 @@ void RecordBatchOutcome(bool success)
         {
             consecutiveBatchFailures++;
         }
-
-        consecutiveBatchFailureGauge.Record(consecutiveBatchFailures);
     }
 
     long consecutiveBatchFailures;
 
     readonly Histogram<double> batchDuration;
-    readonly Gauge<long> consecutiveBatchFailureGauge;
+#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;
     readonly Counter<long> failureCounter;
 
diff --git 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>

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public IngestionMetrics(IMeterFactory meterFactory)`
`20`	`20`
`21`	`21`	`batchDuration = meter.CreateHistogram<double>(BatchDurationInstrumentName, unit: "seconds", "Message batch processing duration in seconds");`
`22`	`22`	`ingestionDuration = meter.CreateHistogram<double>(MessageDurationInstrumentName, unit: "seconds", description: "Audit message processing duration in seconds");`
`23`		`- consecutiveBatchFailureGauge = meter.CreateGauge<long>($"{InstrumentPrefix}.consecutive_batch_failure_total", description: "Consecutive audit ingestion batch failure");`
	`23`	`+ consecutiveBatchFailureGauge = meter.CreateObservableGauge($"{InstrumentPrefix}.consecutive_batch_failure_total", () => consecutiveBatchFailures, description: "Consecutive audit ingestion batch failure");`
`24`	`24`	`failureCounter = meter.CreateCounter<long>($"{InstrumentPrefix}.failures_total", description: "Audit ingestion failure count");`
`25`	`25`	`}`
`26`	`26`
`@@ -56,14 +56,15 @@ void RecordBatchOutcome(bool success)`
`56`	`56`	`{`
`57`	`57`	`consecutiveBatchFailures++;`
`58`	`58`	`}`
`59`		`-`
`60`		`- consecutiveBatchFailureGauge.Record(consecutiveBatchFailures);`
`61`	`59`	`}`
`62`	`60`
`63`	`61`	`long consecutiveBatchFailures;`
`64`	`62`
`65`	`63`	`readonly Histogram<double> batchDuration;`
`66`		`- readonly Gauge<long> consecutiveBatchFailureGauge;`
	`64`	`+#pragma warning disable IDE0052`
	`65`	`+ // this can be changed to Gauge<T> once we can use the latest version of System.Diagnostics.DiagnosticSource`
	`66`	`+ readonly ObservableGauge<long> consecutiveBatchFailureGauge;`
	`67`	`+#pragma warning restore IDE0052`
`67`	`68`	`readonly Histogram<double> ingestionDuration;`
`68`	`69`	`readonly Counter<long> failureCounter;`
`69`	`70`