Skip to content

Commit b443a9c

Browse files
committed
better metrics names
1 parent e784f0e commit b443a9c

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

src/ServiceControl.Audit/Auditing/AuditIngestion.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -257,10 +257,10 @@ async Task Loop()
257257
readonly IAuditIngestionUnitOfWorkFactory unitOfWorkFactory;
258258
readonly Settings settings;
259259
readonly Channel<MessageContext> channel;
260-
readonly Histogram<long> auditBatchSize = Telemetry.Meter.CreateHistogram<long>("messages_batch_size");
261-
readonly Histogram<double> auditBatchDuration = Telemetry.Meter.CreateHistogram<double>("messages_batch_duration", unit: "ms");
262-
readonly Histogram<double> auditMessageSize = Telemetry.Meter.CreateHistogram<double>("messages_size", unit: "kilobytes");
263-
readonly Counter<long> receivedAudits = Telemetry.Meter.CreateCounter<long>("messages_received");
260+
readonly Histogram<long> auditBatchSize = Telemetry.Meter.CreateHistogram<long>(Telemetry.CreateInstrumentName("ingestion.", "batch_size"));
261+
readonly Histogram<double> auditBatchDuration = Telemetry.Meter.CreateHistogram<double>(Telemetry.CreateInstrumentName("ingestion.", "batch_duration"), unit: "ms");
262+
readonly Histogram<double> auditMessageSize = Telemetry.Meter.CreateHistogram<double>(Telemetry.CreateInstrumentName("ingestion.", "message_size"), unit: "kilobytes");
263+
readonly Counter<long> receivedAudits = Telemetry.Meter.CreateCounter<long>(Telemetry.CreateInstrumentName("ingestion.", "count"));
264264
readonly Watchdog watchdog;
265265
readonly Task ingestionWorker;
266266
readonly IHostApplicationLifetime applicationLifetime;

src/ServiceControl.Audit/Auditing/AuditPersister.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -283,11 +283,12 @@ await messageDispatcher.Value.Dispatch(new TransportOperations(messagesToEmit.To
283283
}
284284
}
285285

286-
readonly Counter<long> storedAudits = Telemetry.Meter.CreateCounter<long>("messages_stored");
287-
readonly Counter<long> storedSagas = Telemetry.Meter.CreateCounter<long>("sagas_stored");
288-
readonly Histogram<double> auditBulkInsertDuration = Telemetry.Meter.CreateHistogram<double>("messages_bulk_insert_duration", unit: "ms");
289-
readonly Histogram<double> sagaAuditBulkInsertDuration = Telemetry.Meter.CreateHistogram<double>("sagas_bulk_insert_duration", unit: "ms");
290-
readonly Histogram<double> auditCommitDuration = Telemetry.Meter.CreateHistogram<double>("messages_commit_duration", unit: "ms");
286+
readonly Counter<long> storedAudits = Telemetry.Meter.CreateCounter<long>(Telemetry.CreateInstrumentName("storage.messages", "count"));
287+
readonly Histogram<double> auditBulkInsertDuration = Telemetry.Meter.CreateHistogram<double>(Telemetry.CreateInstrumentName("storage.messages", "insert_duration"), unit: "ms");
288+
readonly Histogram<double> auditCommitDuration = Telemetry.Meter.CreateHistogram<double>(Telemetry.CreateInstrumentName("storage.messages", "commit_duration"), unit: "ms");
289+
290+
readonly Counter<long> storedSagas = Telemetry.Meter.CreateCounter<long>(Telemetry.CreateInstrumentName("storage.sagas", "count"));
291+
readonly Histogram<double> sagaAuditBulkInsertDuration = Telemetry.Meter.CreateHistogram<double>(Telemetry.CreateInstrumentName("storage.sagas", "insert_duration"), unit: "ms");
291292

292293
static readonly ILog Logger = LogManager.GetLogger<AuditPersister>();
293294
}

src/ServiceControl.Audit/Infrastructure/Telemetry.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,6 @@ static class Telemetry
66
{
77
public const string MeterName = "Particular.ServiceControl.Audit";
88
public static readonly Meter Meter = new(MeterName, "0.1.0");
9+
10+
public static string CreateInstrumentName(string instrumentNamespace, string instrumentName) => $"sc.audit.{instrumentNamespace}.{instrumentName}".ToLower();
911
}

0 commit comments

Comments
 (0)