added headers needed for edit and retry (#4745) (#4746)

Co-authored-by: Irina Scurtu <scurtuirina@gmail.com>
Particular · Jan 24, 2025 · 34cd8a1 · 34cd8a1
1 parent 3d91b73
commit 34cd8a1
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/ServiceControl/Recoverability/Editing/EditHandler.cs b/src/ServiceControl/Recoverability/Editing/EditHandler.cs
@@ -67,7 +67,14 @@ 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["ServiceControl.Retry.AcknowledgementQueue"] = "";
             var address = ApplyRedirect(attempt.FailureDetails.AddressOfFailingEndpoint, redirects);
+
+            if (outgoingMessage.Headers.TryGetValue("ServiceControl.RetryTo", out var retryTo))
+            {
+                outgoingMessage.Headers["ServiceControl.TargetEndpointAddress"] = address;
+                address = retryTo;
+            }
             await DispatchEditedMessage(outgoingMessage, address, context);
         }