Make sure histogram buckets work

Author: andreasohlund

src/Directory.Packages.props

@@ -50,6 +50,7 @@
     <PackageVersion Include="NUnit" Version="4.3.2" />
     <PackageVersion Include="NUnit.Analyzers" Version="4.6.0" />
     <PackageVersion Include="NUnit3TestAdapter" Version="5.0.0" />
+    <PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.9.0" />
     <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
     <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
     <PackageVersion Include="Particular.Approvals" Version="2.0.1" />

src/ServiceControl.Audit/Auditing/Metrics/IngestionMetrics.cs

@@ -11,16 +11,17 @@ public class IngestionMetrics
 {
     public const string MeterName = "Particular.ServiceControl.Audit";
 
+    public static readonly string BatchDurationInstrumentName = $"{InstrumentPrefix}.batch_duration_seconds";
+    public static readonly string MessageDurationInstrumentName = $"{InstrumentPrefix}.message_duration_seconds";
+
     public IngestionMetrics(IMeterFactory meterFactory)
     {
         var meter = meterFactory.Create(MeterName, MeterVersion);
 
-        var durationBucketsInSeconds = new InstrumentAdvice<double> { HistogramBucketBoundaries = [0.01, 0.05, 0.1, 0.5, 1, 5] };
-
-        batchDuration = meter.CreateHistogram(CreateInstrumentName("batch_duration_seconds"), unit: "seconds", "Message batch processing duration in seconds", advice: durationBucketsInSeconds);
-        ingestionDuration = meter.CreateHistogram(CreateInstrumentName("message_duration_seconds"), unit: "seconds", description: "Audit message processing duration in seconds", advice: durationBucketsInSeconds);
-        consecutiveBatchFailureGauge = meter.CreateGauge<long>(CreateInstrumentName("consecutive_batch_failure_total"), description: "Consecutive audit ingestion batch failure");
-        failureCounter = meter.CreateCounter<long>(CreateInstrumentName("failures_total"), description: "Audit ingestion failure count");
+        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");
+        failureCounter = meter.CreateCounter<long>($"{InstrumentPrefix}.failures_total", description: "Audit ingestion failure count");
     }
 
     public MessageMetrics BeginIngestion(MessageContext messageContext) => new(messageContext, ingestionDuration);
@@ -59,8 +60,6 @@ void RecordBatchOutcome(bool success)
         consecutiveBatchFailureGauge.Record(consecutiveBatchFailures);
     }
 
-    static string CreateInstrumentName(string instrumentName) => $"sc.audit.ingestion.{instrumentName.ToLower()}";
-
     long consecutiveBatchFailures;
 
     readonly Histogram<double> batchDuration;
@@ -69,6 +68,7 @@ void RecordBatchOutcome(bool success)
     readonly Counter<long> failureCounter;
 
     const string MeterVersion = "0.1.0";
+    const string InstrumentPrefix = "sc.audit.ingestion";
 
     static readonly string SagaUpdateMessageType = typeof(SagaUpdatedMessage).FullName;
 }

src/ServiceControl.Audit/Auditing/Metrics/IngestionMetricsConfiguration.cs

@@ -0,0 +1,19 @@
+namespace ServiceControl.Audit.Auditing.Metrics;
+
+using OpenTelemetry.Metrics;
+
+public static class IngestionMetricsConfiguration
+{
+    public static void AddIngestionMetrics(this MeterProviderBuilder builder)
+    {
+        builder.AddMeter(IngestionMetrics.MeterName);
+
+        // Note: Views can be replaced by new InstrumentAdvice<double> { HistogramBucketBoundaries = [...] }; once we can update to the latest OpenTelemetry packages
+        builder.AddView(
+            instrumentName: IngestionMetrics.MessageDurationInstrumentName,
+            new ExplicitBucketHistogramConfiguration { Boundaries = [0.01, 0.05, 0.1, 0.5, 1, 5] });
+        builder.AddView(
+            instrumentName: IngestionMetrics.BatchDurationInstrumentName,
+            new ExplicitBucketHistogramConfiguration { Boundaries = [0.01, 0.05, 0.1, 0.5, 1, 5] });
+    }
+}

src/ServiceControl.Audit/HostApplicationBuilderExtensions.cs

@@ -112,11 +112,12 @@ public static void AddMetrics(this IHostApplicationBuilder builder, Settings set
                     autoGenerateServiceInstanceId: true))
                 .WithMetrics(b =>
                 {
-                    b.AddMeter(IngestionMetrics.MeterName);
-                    b.AddOtlpExporter(e =>
+                    b.AddIngestionMetrics();
+                    b.AddOtlpExporter(e => e.Endpoint = otelMetricsUri);
+                    if (Debugger.IsAttached)
                     {
-                        e.Endpoint = otelMetricsUri;
-                    });
+                        b.AddConsoleExporter();
+                    }
                 });
 
             var logger = LogManager.GetLogger(typeof(HostApplicationBuilderExtensions));

src/ServiceControl.Audit/ServiceControl.Audit.csproj

@@ -29,6 +29,7 @@
     <PackageReference Include="NServiceBus.CustomChecks" />
     <PackageReference Include="NServiceBus.Extensions.Hosting" />
     <PackageReference Include="NServiceBus.Extensions.Logging" />
+    <PackageReference Include="OpenTelemetry.Exporter.Console" />
     <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" />
     <PackageReference Include="OpenTelemetry.Extensions.Hosting" />
     <PackageReference Include="System.Diagnostics.DiagnosticSource" />