Fixed: IWrappedMessage + IDeadLetterSuppression handling
#7414
Conversation
Aaronontheweb
changed the title
IWrappedMessage + IDeadLetterSuppression handling
There was a problem hiding this comment.
Reproduction specs for SuppressedDeadLetter production in the case of IWrappedMessages that may themselves be marked as IDeadLetterSuppression or perhaps some of their contents might be marked that way.
There was a problem hiding this comment.
Tests for the WrappedMessage class itself
| @@ -197,6 +197,18 @@ public static object Unwrap(object message) | |||
| } | |||
| return message; | |||
| } | |||
|
|
|||
| internal static bool IsDeadLetterSuppressedAnywhere(object message) | |||
There was a problem hiding this comment.
Function to check, up and down the stack, if a message was marked as IDeadLetterSuppression anywhere within
| if (message == null) throw new InvalidMessageException("Message is null"); | ||
| var i = message as Identify; | ||
| if (i != null) | ||
| switch (message) |
There was a problem hiding this comment.
Refomatting - nothing of significance here
| @@ -46,9 +46,13 @@ public DeadLetterMessageQueue(IActorRef deadLetters) | |||
| /// <param name="envelope">TBD</param> | |||
| public void Enqueue(IActorRef receiver, Envelope envelope) | |||
| { | |||
| if (envelope.Message is DeadLetter) | |||
| if (envelope.Message is AllDeadLetters) | |||
There was a problem hiding this comment.
Important fix - now that we can produce SupressedDeadLetters more easily, this safety check has to be expanded to encompass AllDeadLetters and their derived types, otherwise this will produce a StackOverflowException.
| @@ -104,7 +104,7 @@ public sealed class SuppressedDeadLetter : AllDeadLetters | |||
| /// <exception cref="ArgumentNullException"> | |||
| /// This exception is thrown when either the sender or the recipient is undefined. | |||
| /// </exception> | |||
| public SuppressedDeadLetter(IDeadLetterSuppression message, IActorRef sender, IActorRef recipient) : base(message, sender, recipient) | |||
There was a problem hiding this comment.
Breaking API change here, kind of - needed to relax this type constraint otherwise we'd lose data in the SuppressedDeadLetter logging
Changes
A Phobos customer noticed many
DeadLettermessages appearing only when Phobos was enabled, but not when it was disabled - as it turns out, this is because Phobos' payload for propagating trace information transparently through theActorSystemis anIWrappedMessageand the dead letter logging infrastructure in Akka.NET doesn't account for that accurately.Checklist
For significant changes, please ensure that the following have been completed (delete if not relevant):