Stop using prefixes

Author: andreasohlund

src/ServiceControl.Audit/Auditing/AuditIngestion.cs

@@ -257,10 +257,10 @@ async Task Loop()
         readonly IAuditIngestionUnitOfWorkFactory unitOfWorkFactory;
         readonly Settings settings;
         readonly Channel<MessageContext> channel;
-        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 Histogram<double> auditMessageSize = AuditMetrics.Meter.CreateHistogram<double>($"{AuditMetrics.Prefix}.audit_message_size", unit: "kilobytes");
-        readonly Counter<long> receivedAudits = AuditMetrics.Meter.CreateCounter<long>($"{AuditMetrics.Prefix}.received_audits");
+        readonly Histogram<long> auditBatchSize = Telemetry.Meter.CreateHistogram<long>("messages_batch_size");
+        readonly Histogram<double> auditBatchDuration = Telemetry.Meter.CreateHistogram<double>("messages_batch_duration", unit: "ms");
+        readonly Histogram<double> auditMessageSize = Telemetry.Meter.CreateHistogram<double>("messages_size", unit: "kilobytes");
+        readonly Counter<long> receivedAudits = Telemetry.Meter.CreateCounter<long>("messages_received");
         readonly Watchdog watchdog;
         readonly Task ingestionWorker;
         readonly IHostApplicationLifetime applicationLifetime;

src/ServiceControl.Audit/Auditing/AuditPersister.cs

@@ -283,11 +283,11 @@ await messageDispatcher.Value.Dispatch(new TransportOperations(messagesToEmit.To
             }
         }
 
-        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");
+        readonly Counter<long> storedAudits = Telemetry.Meter.CreateCounter<long>("messages_stored");
+        readonly Counter<long> storedSagas = Telemetry.Meter.CreateCounter<long>("sagas_stored");
+        readonly Histogram<double> auditBulkInsertDuration = Telemetry.Meter.CreateHistogram<double>("messages_bulk_insert_duration", unit: "ms");
+        readonly Histogram<double> sagaAuditBulkInsertDuration = Telemetry.Meter.CreateHistogram<double>("sagas_bulk_insert_duration", unit: "ms");
+        readonly Histogram<double> auditCommitDuration = Telemetry.Meter.CreateHistogram<double>("messages_commit_duration", unit: "ms");
 
         static readonly ILog Logger = LogManager.GetLogger<AuditPersister>();
     }

src/ServiceControl.Audit/HostApplicationBuilderExtensions.cs

@@ -74,22 +74,23 @@ public static void AddServiceControlAudit(this IHostApplicationBuilder builder,
             {
                 throw new UriFormatException($"Invalid OtelMetricsUrl: {settings.OtelMetricsUrl}");
             }
+
             builder.Services.AddOpenTelemetry()
                 .ConfigureResource(b => b.AddService(
                     serviceName: "Particular.ServiceControl.Audit",
                     serviceVersion: version,
                     serviceInstanceId: settings.InstanceName))
                 .WithMetrics(b =>
                 {
-                    b.AddMeter(AuditMetrics.MeterName);
+                    b.AddMeter(Telemetry.MeterName);
                     b.AddOtlpExporter(e =>
                     {
                         e.Endpoint = otelMetricsUri;
                     });
                 });
+
             var logger = LogManager.GetLogger(typeof(HostApplicationBuilderExtensions));
             logger.InfoFormat("OpenTelemetry metrics exporter enabled: {0}", settings.OtelMetricsUrl);
-
         }
 
         // Configure after the NServiceBus hosted service to ensure NServiceBus is already started

src/ServiceControl.Audit/Infrastructure/AuditMetrics.cs

@@ -0,0 +1,9 @@
+namespace ServiceControl.Audit;
+
+using System.Diagnostics.Metrics;
+
+static class Telemetry
+{
+    public const string MeterName = "Particular.ServiceControl.Audit";
+    public static readonly Meter Meter = new(MeterName, "0.1.0");
+}