From 7da8227c518a287b1e6d2105c244eee7e0166e29 Mon Sep 17 00:00:00 2001
From: Rhys Bevilaqua <rhys.bevilaqua@particular.net>
Date: Mon, 31 Aug 2026 15:19:52 +0800
Subject: [PATCH 1/2] Remove error message downstream pulbishing

---
 .../MessageFailedPublisher.cs                 | 41 -------------------
 .../Recoverability/RecoverabilityComponent.cs |  2 -
 2 files changed, 43 deletions(-)
 delete mode 100644 src/ServiceControl/Recoverability/ExternalIntegration/MessageFailedPublisher.cs

diff --git a/src/ServiceControl/Recoverability/ExternalIntegration/MessageFailedPublisher.cs b/src/ServiceControl/Recoverability/ExternalIntegration/MessageFailedPublisher.cs
deleted file mode 100644
index 38ae30155d..0000000000
--- a/src/ServiceControl/Recoverability/ExternalIntegration/MessageFailedPublisher.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-namespace ServiceControl.Recoverability.ExternalIntegration
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-    using System.Threading;
-    using System.Threading.Tasks;
-    using Contracts.MessageFailures;
-    using ExternalIntegrations;
-    using ServiceControl.Persistence;
-
-    class MessageFailedPublisher : EventPublisher<MessageFailed, MessageFailedPublisher.DispatchContext>
-    {
-        readonly IFailedMessageQueryDataStore dataStore;
-
-        public MessageFailedPublisher(IFailedMessageQueryDataStore dataStore)
-        {
-            this.dataStore = dataStore;
-        }
-
-        protected override DispatchContext CreateDispatchRequest(MessageFailed @event)
-        {
-            return new DispatchContext
-            {
-                FailedMessageId = new Guid(@event.FailedMessageId)
-            };
-        }
-
-        protected override async Task<IEnumerable<object>> PublishEvents(IEnumerable<DispatchContext> contexts, CancellationToken cancellationToken = default)
-        {
-            var ids = contexts.Select(x => x.FailedMessageId).ToArray();
-            var results = await dataStore.GetFailedMessagesByIds(ids, cancellationToken);
-            return results.Select(x => x.ToEvent());
-        }
-
-        public class DispatchContext
-        {
-            public Guid FailedMessageId { get; set; }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/ServiceControl/Recoverability/RecoverabilityComponent.cs b/src/ServiceControl/Recoverability/RecoverabilityComponent.cs
index ab17793427..bda16a54cf 100644
--- a/src/ServiceControl/Recoverability/RecoverabilityComponent.cs
+++ b/src/ServiceControl/Recoverability/RecoverabilityComponent.cs
@@ -115,7 +115,6 @@ public override void Configure(Settings settings, ITransportCustomization transp
             services.AddIntegrationEventPublisher<FailedMessageGroupBatchArchivedPublisher>();
             services.AddIntegrationEventPublisher<FailedMessageGroupBatchUnarchivedPublisher>();
             services.AddIntegrationEventPublisher<FailedMessagesUnarchivedPublisher>();
-            services.AddIntegrationEventPublisher<MessageFailedPublisher>();
             services.AddIntegrationEventPublisher<MessageFailureResolvedByRetryPublisher>();
             services.AddIntegrationEventPublisher<MessageFailureResolvedManuallyPublisher>();
             services.AddIntegrationEventPublisher<MessageEditedAndRetriedPublisher>();
@@ -125,7 +124,6 @@ public override void Configure(Settings settings, ITransportCustomization transp
             services.AddEventLogMapping<FailedMessageGroupArchivedDefinition>();
             services.AddEventLogMapping<FailedMessageGroupUnarchivedDefinition>();
             services.AddEventLogMapping<FailedMessageUnArchivedDefinition>();
-            services.AddEventLogMapping<MessageFailedDefinition>();
             services.AddEventLogMapping<MessageFailedInStagingDefinition>();
             services.AddEventLogMapping<MessageFailureResolvedByRetryDefinition>();
             services.AddEventLogMapping<MessageFailureResolvedManuallyDefinition>();

From 93ad14df0fe77954a90626e89ad5fa4a1256bafe Mon Sep 17 00:00:00 2001
From: Rhys Bevilaqua <rhys.bevilaqua@particular.net>
Date: Tue, 1 Sep 2026 16:38:54 +0800
Subject: [PATCH 2/2] Re-enable external event mapping

---
 src/ServiceControl/Recoverability/RecoverabilityComponent.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ServiceControl/Recoverability/RecoverabilityComponent.cs b/src/ServiceControl/Recoverability/RecoverabilityComponent.cs
index bda16a54cf..2e4c99b451 100644
--- a/src/ServiceControl/Recoverability/RecoverabilityComponent.cs
+++ b/src/ServiceControl/Recoverability/RecoverabilityComponent.cs
@@ -115,6 +115,7 @@ public override void Configure(Settings settings, ITransportCustomization transp
             services.AddIntegrationEventPublisher<FailedMessageGroupBatchArchivedPublisher>();
             services.AddIntegrationEventPublisher<FailedMessageGroupBatchUnarchivedPublisher>();
             services.AddIntegrationEventPublisher<FailedMessagesUnarchivedPublisher>();
+            services.AddIntegrationEventPublisher<MessageFailedPublisher>();
             services.AddIntegrationEventPublisher<MessageFailureResolvedByRetryPublisher>();
             services.AddIntegrationEventPublisher<MessageFailureResolvedManuallyPublisher>();
             services.AddIntegrationEventPublisher<MessageEditedAndRetriedPublisher>();