Add cross-platform exception serialization support #7222
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Arkatufus
commented
Jun 3, 2024
| @@ -82,6 +83,11 @@ public Proto.Msg.ExceptionData ExceptionToProtoNet(Exception exception) | |||
| message.StackTrace = exception.StackTrace ?? ""; | |||
| message.Source = exception.Source ?? ""; | |||
| message.InnerException = ExceptionToProto(exception.InnerException); | |||
|
|
|||
| var forwardedFrom = exceptionType.GetCustomAttribute<TypeForwardedFromAttribute>(); | |||
There was a problem hiding this comment.
.NET standard introduced this attribute to mark a type as being moved from a different assembly
There was a problem hiding this comment.
Wow, that would have been good to know a long time ago lol
Comment on lines
+123
to
+127
| if (exceptionType is null && proto.TypeForwardedFrom != string.Empty) | ||
| { | ||
| var typeName = $"{proto.TypeName[..proto.TypeName.IndexOf(',')]}, {proto.TypeForwardedFrom}"; | ||
| exceptionType = Type.GetType(typeName); | ||
| } |
There was a problem hiding this comment.
Retry type loading with a different assembly name, if the type was marked as moved from an older assembly name
| @@ -69,6 +69,7 @@ message ExceptionData { | |||
| string source = 4; | |||
| ExceptionData innerException = 5; | |||
| map<string, Payload> customFields = 6; | |||
| string typeForwardedFrom = 7; | |||
There was a problem hiding this comment.
Added a single entry in the .proto file
|
Limiting the blast radius of this change to remoting |
Aaronontheweb
approved these changes
Jun 3, 2024
Comment on lines
+123
to
+127
| if (exceptionType is null && proto.TypeForwardedFrom != string.Empty) | ||
| { | ||
| var typeName = $"{proto.TypeName[..proto.TypeName.IndexOf(',')]}, {proto.TypeForwardedFrom}"; | ||
| exceptionType = Type.GetType(typeName); | ||
| } |
|
Discussed with @Arkatufus - we're gonna add a repro to this before we merge it. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #7215
Changes
Embed
TypeForwardedFromAttributedata inside the wire format so we can mapSystem.Private.Corlibtomscorlibtypes.Checklist
For significant changes, please ensure that the following have been completed (delete if not relevant):