Setting proper queue name on edit & retry

Author: afprtclr

src/ServiceControl.Persistence.Tests/RetryStateTests.cs

@@ -282,7 +282,7 @@ class FakeApplicationLifetime : IHostApplicationLifetime
         class TestReturnToSenderDequeuer : ReturnToSenderDequeuer
         {
             public TestReturnToSenderDequeuer(ReturnToSender returnToSender, IErrorMessageDataStore store, IDomainEvents domainEvents, string endpointName)
-                : base(returnToSender, store, domainEvents, new TestTransportCustomization(), null, new Settings { InstanceName = endpointName })
+                : base(returnToSender, store, domainEvents, new TestTransportCustomization(), null, new Settings { InstanceName = endpointName }, new ErrorQueueNameCache())
             {
             }
 

src/ServiceControl/Recoverability/Editing/EditHandler.cs

@@ -14,12 +14,14 @@
 
     class EditHandler : IHandleMessages<EditAndSend>
     {
-        public EditHandler(IErrorMessageDataStore store, IMessageRedirectsDataStore redirectsStore, IMessageDispatcher dispatcher)
+        public EditHandler(IErrorMessageDataStore store, IMessageRedirectsDataStore redirectsStore, IMessageDispatcher dispatcher, ErrorQueueNameCache errorQueueNameCache)
         {
             this.store = store;
             this.redirectsStore = redirectsStore;
             this.dispatcher = dispatcher;
+            this.errorQueueNameCache = errorQueueNameCache;
             corruptedReplyToHeaderStrategy = new CorruptedReplyToHeaderStrategy(RuntimeEnvironment.MachineName);
+
         }
 
         public async Task Handle(EditAndSend message, IMessageHandlerContext context)
@@ -67,7 +69,8 @@ public async Task Handle(EditAndSend message, IMessageHandlerContext context)
             var outgoingMessage = BuildMessage(message);
             // mark the new message with a link to the original message id
             outgoingMessage.Headers.Add("ServiceControl.EditOf", message.FailedMessageId);
-            outgoingMessage.Headers.Remove("ServiceControl.Retry.AcknowledgementQueue");
+            outgoingMessage.Headers["ServiceControl.Retry.AcknowledgementQueue"] = errorQueueNameCache.ResolvedQueueName;
+
             var address = ApplyRedirect(attempt.FailureDetails.AddressOfFailingEndpoint, redirects);
 
             if (outgoingMessage.Headers.TryGetValue("ServiceControl.RetryTo", out var retryTo))
@@ -116,6 +119,7 @@ Task DispatchEditedMessage(OutgoingMessage editedMessage, string address, IMessa
         readonly IErrorMessageDataStore store;
         readonly IMessageRedirectsDataStore redirectsStore;
         readonly IMessageDispatcher dispatcher;
+        readonly ErrorQueueNameCache errorQueueNameCache;
         static readonly ILog log = LogManager.GetLogger<EditHandler>();
     }
 }

src/ServiceControl/Recoverability/RecoverabilityComponent.cs

@@ -47,6 +47,7 @@ public override void Configure(Settings settings, ITransportCustomization transp
 
             //Return to sender - registered both as singleton and hosted service because it is a dependency of the RetryProcessor
             services.AddSingleton<ReturnToSender>();
+            services.AddSingleton<ErrorQueueNameCache>();
             services.AddSingleton<ReturnToSenderDequeuer>();
             services.AddHostedService(provider => provider.GetRequiredService<ReturnToSenderDequeuer>());
 

src/ServiceControl/Recoverability/Retrying/Infrastructure/ErrorQueueNameCache.cs

@@ -0,0 +1,23 @@
+namespace ServiceControl.Recoverability
+{
+    using System;
+
+    public class ErrorQueueNameCache
+    {
+        string resolvedQueueName;
+
+        public string ResolvedQueueName
+        {
+            get
+            {
+                if (string.IsNullOrEmpty(resolvedQueueName))
+                {
+                    throw new InvalidOperationException($"{ResolvedQueueName} is not set. Please set it before accessing.");
+                }
+
+                return resolvedQueueName;
+            }
+            set => resolvedQueueName = value;
+        }
+    }
+}

src/ServiceControl/Recoverability/Retrying/Infrastructure/ReturnToSenderDequeuer.cs

@@ -14,13 +14,15 @@ namespace ServiceControl.Recoverability
 
     class ReturnToSenderDequeuer : IHostedService
     {
-        public ReturnToSenderDequeuer(ReturnToSender returnToSender, IErrorMessageDataStore dataStore, IDomainEvents domainEvents, ITransportCustomization transportCustomization, TransportSettings transportSettings, Settings settings)
+        public ReturnToSenderDequeuer(ReturnToSender returnToSender, IErrorMessageDataStore dataStore, IDomainEvents domainEvents,
+            ITransportCustomization transportCustomization, TransportSettings transportSettings, Settings settings, ErrorQueueNameCache errorQueueNameCache)
         {
             InputAddress = transportCustomization.ToTransportQualifiedQueueName(settings.StagingQueue);
             this.returnToSender = returnToSender;
             errorQueue = settings.ErrorQueue;
             this.transportCustomization = transportCustomization;
             this.transportSettings = transportSettings;
+            this.errorQueueNameCache = errorQueueNameCache;
 
             faultManager = new CaptureIfMessageSendingFails(dataStore, domainEvents, IncrementCounterOrProlongTimer);
             timer = new Timer(state => StopInternal().GetAwaiter().GetResult());
@@ -35,6 +37,7 @@ public async Task StartAsync(CancellationToken cancellationToken)
             messageDispatcher = transportInfrastructure.Dispatcher;
 
             errorQueueTransportAddress = transportInfrastructure.ToTransportAddress(new QueueAddress(errorQueue));
+            errorQueueNameCache.ResolvedQueueName = errorQueueTransportAddress;
         }
 
         public async Task StopAsync(CancellationToken cancellationToken)
@@ -185,6 +188,7 @@ async Task StopInternal()
         string errorQueueTransportAddress;
         readonly ITransportCustomization transportCustomization;
         readonly TransportSettings transportSettings;
+        readonly ErrorQueueNameCache errorQueueNameCache;
         TransportInfrastructure transportInfrastructure;
         IMessageDispatcher messageDispatcher;
         IMessageReceiver messageReceiver;