Allow unknown fields while parsing json history (#1092)

temporalio · Apr 19, 2023 · 528337f · 528337f
1 parent a090256
commit 528337f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/internal/internal_worker.go b/internal/internal_worker.go
@@ -1418,8 +1418,13 @@ func extractHistoryFromFile(jsonfileName string, lastEventID int64) (*historypb.
 // HistoryFromJSON deserializes history from a reader of JSON bytes. This does
 // not close the reader if it is closeable.
 func HistoryFromJSON(r io.Reader, lastEventID int64) (*historypb.History, error) {
+	unmarshaler := jsonpb.Unmarshaler{
+		// Allow unknown fields because if the histroy was generated with a different version of the proto
+		// fields may have been added/removed.
+		AllowUnknownFields: true,
+	}
 	var hist historypb.History
-	if err := jsonpb.Unmarshal(r, &hist); err != nil {
+	if err := unmarshaler.Unmarshal(r, &hist); err != nil {
 		return nil, err
 	}
 	// If there is a last event ID, slice the rest off

diff --git a/test/replaytests/local-activity.json b/test/replaytests/local-activity.json
@@ -70,7 +70,8 @@
     "scheduledEventId": "2",
     "startedEventId": "3",
     "identity": "11111@Quinn-Klassens-MacBook-Pro.local@",
-    "binaryChecksum": "48a264a4d5038290773fdab470dbf90b"
+    "binaryChecksum": "48a264a4d5038290773fdab470dbf90b",
+    "workerVersioningId": null
    }
   },
   {