Skip to content

Commit c78d249

Browse files
committed
Remove counter for forwarding
1 parent 90a2811 commit c78d249

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

src/ServiceControl.Audit/Auditing/AuditIngestor.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,12 @@ public AuditIngestor(
2525
IEnumerable<IEnrichImportedAuditMessages> auditEnrichers, // allows extending message enrichers with custom enrichers registered in the DI container
2626
IMessageSession messageSession,
2727
Lazy<IMessageDispatcher> messageDispatcher,
28-
ITransportCustomization transportCustomization,
29-
AuditIngestionMetrics metrics
28+
ITransportCustomization transportCustomization
3029
)
3130
{
3231
this.settings = settings;
3332
this.messageDispatcher = messageDispatcher;
34-
this.metrics = metrics;
33+
3534
var enrichers = new IEnrichImportedAuditMessages[] { new MessageTypeEnricher(), new EnrichWithTrackingIds(), new ProcessingStatisticsEnricher(), new DetectNewEndpointsFromAuditImportsEnricher(endpointInstanceMonitoring), new DetectSuccessfulRetriesEnricher(), new SagaRelationshipsEnricher() }.Concat(auditEnrichers).ToArray();
3635

3736
logQueueAddress = transportCustomization.ToTransportQualifiedQueueName(settings.AuditLogQueue);
@@ -53,7 +52,6 @@ public async Task Ingest(List<MessageContext> contexts)
5352
if (settings.ForwardAuditMessages)
5453
{
5554
await Forward(stored, logQueueAddress);
56-
metrics.IncrementMessagesForwarded(stored.Count);
5755
}
5856

5957
foreach (var context in contexts)
@@ -132,7 +130,6 @@ public async Task VerifyCanReachForwardingAddress()
132130
readonly AuditPersister auditPersister;
133131
readonly Settings settings;
134132
readonly Lazy<IMessageDispatcher> messageDispatcher;
135-
readonly AuditIngestionMetrics metrics;
136133
readonly string logQueueAddress;
137134

138135
static readonly ILog Log = LogManager.GetLogger<AuditIngestor>();

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,11 @@ public AuditIngestionMetrics(IMeterFactory meterFactory)
99
{
1010
var meter = meterFactory.Create(MeterName, MeterVersion);
1111

12-
forwardedMessagesCounter = meter.CreateCounter<long>(CreateInstrumentName("forwarded"), description: "Audit ingestion forwarded message count");
1312
batchDuration = meter.CreateHistogram<double>(CreateInstrumentName("batch_duration"), unit: "ms", "Average audit message batch processing duration");
1413
consecutiveBatchFailureGauge = meter.CreateObservableGauge(CreateInstrumentName("consecutive_batch_failures"), () => consecutiveBatchFailures, unit: "count", description: "Consecutive audit ingestion batch failure");
1514
ingestionDuration = meter.CreateHistogram<double>(CreateInstrumentName("duration"), unit: "ms", description: "Average incoming audit message processing duration");
1615
}
1716

18-
public void IncrementMessagesForwarded(int count) => forwardedMessagesCounter.Add(count);
19-
2017
public MessageIngestionMetrics BeginIngestion(MessageContext messageContext) => new(messageContext, ingestionDuration);
2118

2219
public BatchMetrics BeginBatch(int maxBatchSize) => new(maxBatchSize, batchDuration, RecordBatchOutcome);
@@ -37,7 +34,6 @@ void RecordBatchOutcome(bool success)
3734

3835
long consecutiveBatchFailures;
3936

40-
readonly Counter<long> forwardedMessagesCounter;
4137
readonly Histogram<double> batchDuration;
4238
#pragma warning disable IDE0052
4339
readonly ObservableGauge<long> consecutiveBatchFailureGauge;

0 commit comments

Comments
 (0)