From 252d08014e67e4e0933ca7efdbbbddc3d3b78d35 Mon Sep 17 00:00:00 2001
From: Brandon Ording <bording@gmail.com>
Date: Mon, 4 Mar 2024 17:23:26 -0500
Subject: [PATCH] Add recoverability config for Monitoring instance

---
 .../WebApplicationBuilderExtensions.cs                      | 6 ++++++
 src/ServiceControl/Infrastructure/NServiceBusFactory.cs     | 1 +
 2 files changed, 7 insertions(+)

diff --git a/src/ServiceControl.Monitoring/WebApplicationBuilderExtensions.cs b/src/ServiceControl.Monitoring/WebApplicationBuilderExtensions.cs
index 1197ec8848..cd8527da81 100644
--- a/src/ServiceControl.Monitoring/WebApplicationBuilderExtensions.cs
+++ b/src/ServiceControl.Monitoring/WebApplicationBuilderExtensions.cs
@@ -111,7 +111,13 @@ internal static void ConfigureEndpoint(EndpointConfiguration config, Func<ICriti
 
         config.UseSerialization<NewtonsoftJsonSerializer>();
         config.UsePersistence<NonDurablePersistence>();
+
+        var recoverability = config.Recoverability();
+        recoverability.Immediate(c => c.NumberOfRetries(3));
+        recoverability.Delayed(c => c.NumberOfRetries(0));
+
         config.SendFailedMessagesTo(settings.ErrorQueue);
+
         config.DisableFeature<AutoSubscribe>();
 
         config.AddDeserializer<TaggedLongValueWriterOccurrenceSerializerDefinition>();
diff --git a/src/ServiceControl/Infrastructure/NServiceBusFactory.cs b/src/ServiceControl/Infrastructure/NServiceBusFactory.cs
index baf6d350a1..2203b27f4e 100644
--- a/src/ServiceControl/Infrastructure/NServiceBusFactory.cs
+++ b/src/ServiceControl/Infrastructure/NServiceBusFactory.cs
@@ -39,6 +39,7 @@ static class NServiceBusFactory
             recoverability.Immediate(c => c.NumberOfRetries(3));
             recoverability.Delayed(c => c.NumberOfRetries(0));
             recoverability.AddUnrecoverableException<UnrecoverableException>();
+
             configuration.SendFailedMessagesTo(transportSettings.ErrorQueue);
 
             recoverability.CustomPolicy(SendEmailNotificationHandler.RecoverabilityPolicy);