Skip to content

Commit d786a34

Browse files
committed
Isolate changes
1 parent 3f8d5b7 commit d786a34

File tree

3 files changed

+22
-6
lines changed

3 files changed

+22
-6
lines changed

src/ServiceControl.Persistence/FailureDetails.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,14 @@ namespace ServiceControl.Contracts.Operations
44

55
public class FailureDetails
66
{
7+
public FailureDetails()
8+
{
9+
TimeOfFailure = DateTime.UtcNow;
10+
}
11+
712
public string AddressOfFailingEndpoint { get; set; }
813

9-
public DateTime TimeOfFailure { get; set; } = DateTime.UtcNow;
14+
public DateTime TimeOfFailure { get; set; }
1015

1116
public ExceptionDetails Exception { get; set; }
1217
}

src/ServiceControl/Monitoring/DetectNewEndpointsFromErrorImportsEnricher.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,13 @@
55
using ServiceControl.Contracts.Operations;
66
using ServiceControl.Persistence;
77

8-
class DetectNewEndpointsFromErrorImportsEnricher(IEndpointInstanceMonitoring monitoring) : IEnrichImportedErrorMessages
8+
class DetectNewEndpointsFromErrorImportsEnricher : IEnrichImportedErrorMessages
99
{
10+
public DetectNewEndpointsFromErrorImportsEnricher(IEndpointInstanceMonitoring monitoring)
11+
{
12+
this.monitoring = monitoring;
13+
}
14+
1015
public void Enrich(ErrorEnricherContext context)
1116
{
1217
var sendingEndpoint = EndpointDetailsParser.SendingEndpoint(context.Headers);
@@ -42,5 +47,7 @@ void TryAddEndpoint(EndpointDetails endpointDetails, ErrorEnricherContext contex
4247
context.Add(endpointDetails);
4348
}
4449
}
50+
51+
IEndpointInstanceMonitoring monitoring;
4552
}
4653
}

src/ServiceControl/Operations/ErrorIngestor.cs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,13 @@ public ErrorIngestor(Metrics metrics,
3737
bulkInsertDurationMeter = metrics.GetMeter("Error ingestion - bulk insert duration", FrequencyInMilliseconds);
3838
var ingestedMeter = metrics.GetCounter("Error ingestion - ingested");
3939

40-
var enrichers = new IEnrichImportedErrorMessages[] { new MessageTypeEnricher(), new EnrichWithTrackingIds(), new ProcessingStatisticsEnricher() }.Concat(errorEnrichers).ToArray();
40+
var enrichers = new IEnrichImportedErrorMessages[]
41+
{
42+
new MessageTypeEnricher(),
43+
new EnrichWithTrackingIds(),
44+
new ProcessingStatisticsEnricher()
45+
46+
}.Concat(errorEnrichers).ToArray();
4147

4248
errorProcessor = new ErrorProcessor(enrichers, failedMessageEnrichers.ToArray(), domainEvents, ingestedMeter);
4349
retryConfirmationProcessor = new RetryConfirmationProcessor(domainEvents);
@@ -61,6 +67,7 @@ public async Task Ingest(List<MessageContext> contexts, CancellationToken cancel
6167
}
6268
}
6369

70+
6471
var storedFailed = await PersistFailedMessages(failedMessages, retriedMessages, cancellationToken);
6572

6673
try
@@ -70,7 +77,6 @@ public async Task Ingest(List<MessageContext> contexts, CancellationToken cancel
7077
{
7178
announcerTasks.Add(errorProcessor.Announce(context));
7279
}
73-
7480
foreach (var context in retriedMessages)
7581
{
7682
announcerTasks.Add(retryConfirmationProcessor.Announce(context));
@@ -84,7 +90,6 @@ public async Task Ingest(List<MessageContext> contexts, CancellationToken cancel
8490
{
8591
Logger.Debug($"Forwarding {storedFailed.Count} messages");
8692
}
87-
8893
await Forward(storedFailed, cancellationToken);
8994
if (Logger.IsDebugEnabled)
9095
{
@@ -128,7 +133,6 @@ async Task<IReadOnlyList<MessageContext>> PersistFailedMessages(List<MessageCont
128133
{
129134
await unitOfWork.Complete(cancellationToken);
130135
}
131-
132136
return storedFailedMessageContexts;
133137
}
134138
catch (Exception e)

0 commit comments

Comments
 (0)