Improve serialization perf and fix memory leak in SentryEvent (#1693)

mattjohnsonpint · web-flow · commit 38b5c6443ecb · 2022-06-07T07:41:11.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,8 +6,9 @@
 
 - Improve timestamp precision of transactions and spans ([#1680](https://github.com/getsentry/sentry-dotnet/pull/1680))
 - Flatten AggregateException ([#1672](https://github.com/getsentry/sentry-dotnet/pull/1672))
-  - NOTE: This can affect grouping. You can keep the original behavior by setting the option `KeepAggregateException` to `true`.  
+  - NOTE: This can affect grouping. You can keep the original behavior by setting the option `KeepAggregateException` to `true`.
 - Serialize stack frame addresses as strings. ([#1692](https://github.com/getsentry/sentry-dotnet/pull/1692))
+- Improve serialization perf and fix memory leak in `SentryEvent` ([#1693](https://github.com/getsentry/sentry-dotnet/pull/1693))
 
 ### Features
 
diff --git a/src/Sentry/Envelopes/Envelope.cs b/src/Sentry/Envelopes/Envelope.cs
@@ -232,7 +232,7 @@ public static Envelope FromSession(SessionUpdate sessionUpdate)
             }
 
             return
-                Json.Parse(buffer.ToArray()).GetDictionaryOrNull()
+                Json.Parse(buffer.ToArray(), JsonExtensions.GetDictionaryOrNull)
                 ?? throw new InvalidOperationException("Envelope header is malformed.");
         }
 
diff --git a/src/Sentry/Envelopes/EnvelopeItem.cs b/src/Sentry/Envelopes/EnvelopeItem.cs
@@ -317,7 +317,7 @@ internal static EnvelopeItem FromClientReport(ClientReport report)
             }
 
             return
-                Json.Parse(buffer.ToArray()).GetDictionaryOrNull()
+                Json.Parse(buffer.ToArray(), JsonExtensions.GetDictionaryOrNull)
                 ?? throw new InvalidOperationException("Envelope item header is malformed.");
         }
 
@@ -339,49 +339,49 @@ private static async Task<ISerializable> DeserializePayloadAsync(
             {
                 var bufferLength = (int)(payloadLength ?? stream.Length);
                 var buffer = await stream.ReadByteChunkAsync(bufferLength, cancellationToken).ConfigureAwait(false);
-                var json = Json.Parse(buffer);
+                var sentryEvent = Json.Parse(buffer, SentryEvent.FromJson);
 
-                return new JsonSerializable(SentryEvent.FromJson(json));
+                return new JsonSerializable(sentryEvent);
             }
 
             // User report
             if (string.Equals(payloadType, TypeValueUserReport, StringComparison.OrdinalIgnoreCase))
             {
                 var bufferLength = (int)(payloadLength ?? stream.Length);
                 var buffer = await stream.ReadByteChunkAsync(bufferLength, cancellationToken).ConfigureAwait(false);
-                var json = Json.Parse(buffer);
+                var userFeedback = Json.Parse(buffer, UserFeedback.FromJson);
 
-                return new JsonSerializable(UserFeedback.FromJson(json));
+                return new JsonSerializable(userFeedback);
             }
 
             // Transaction
             if (string.Equals(payloadType, TypeValueTransaction, StringComparison.OrdinalIgnoreCase))
             {
                 var bufferLength = (int)(payloadLength ?? stream.Length);
                 var buffer = await stream.ReadByteChunkAsync(bufferLength, cancellationToken).ConfigureAwait(false);
-                var json = Json.Parse(buffer);
+                var transaction = Json.Parse(buffer, Transaction.FromJson);
 
-                return new JsonSerializable(Transaction.FromJson(json));
+                return new JsonSerializable(transaction);
             }
 
             // Session
             if (string.Equals(payloadType, TypeValueSession, StringComparison.OrdinalIgnoreCase))
             {
                 var bufferLength = (int)(payloadLength ?? stream.Length);
                 var buffer = await stream.ReadByteChunkAsync(bufferLength, cancellationToken).ConfigureAwait(false);
-                var json = Json.Parse(buffer);
+                var sessionUpdate = Json.Parse(buffer, SessionUpdate.FromJson);
 
-                return new JsonSerializable(SessionUpdate.FromJson(json));
+                return new JsonSerializable(sessionUpdate);
             }
 
             // Client Report
             if (string.Equals(payloadType, TypeValueClientReport, StringComparison.OrdinalIgnoreCase))
             {
                 var bufferLength = (int)(payloadLength ?? stream.Length);
                 var buffer = await stream.ReadByteChunkAsync(bufferLength, cancellationToken).ConfigureAwait(false);
-                var json = Json.Parse(buffer);
+                var clientReport = Json.Parse(buffer, ClientReport.FromJson);
 
-                return new JsonSerializable(ClientReport.FromJson(json));
+                return new JsonSerializable(clientReport);
             }
 
             // Arbitrary payload
diff --git a/src/Sentry/GlobalSessionManager.cs b/src/Sentry/GlobalSessionManager.cs
@@ -41,7 +41,7 @@ public GlobalSessionManager(
             _options = options;
             _clock = clock ?? SystemClock.Clock;
             _persistedSessionProvider = persistedSessionProvider
-                                        ?? (filePath => PersistedSessionUpdate.FromJson(Json.Load(filePath)));
+                                        ?? (filePath => Json.Load(filePath, PersistedSessionUpdate.FromJson));
 
             // TODO: session file should really be process-isolated, but we
             // don't have a proper mechanism for that right now.
diff --git a/src/Sentry/Internal/Json.cs b/src/Sentry/Internal/Json.cs
@@ -1,27 +1,28 @@
+using System;
 using System.IO;
 using System.Text.Json;
 
 namespace Sentry.Internal
 {
     internal static class Json
     {
-        public static JsonElement Parse(byte[] json)
+        public static T Parse<T>(byte[] json, Func<JsonElement, T> factory)
         {
             using var jsonDocument = JsonDocument.Parse(json);
-            return jsonDocument.RootElement.Clone();
+            return factory.Invoke(jsonDocument.RootElement);
         }
 
-        public static JsonElement Parse(string json)
+        public static T Parse<T>(string json, Func<JsonElement, T> factory)
         {
             using var jsonDocument = JsonDocument.Parse(json);
-            return jsonDocument.RootElement.Clone();
+            return factory.Invoke(jsonDocument.RootElement);
         }
 
-        public static JsonElement Load(string filePath)
+        public static T Load<T>(string filePath, Func<JsonElement, T> factory)
         {
             using var file = File.OpenRead(filePath);
             using var jsonDocument = JsonDocument.Parse(file);
-            return jsonDocument.RootElement.Clone();
+            return factory.Invoke(jsonDocument.RootElement);
         }
     }
 }
diff --git a/src/Sentry/SentryEvent.cs b/src/Sentry/SentryEvent.cs
@@ -273,8 +273,8 @@ public static SentryEvent FromJson(JsonElement json)
             var logger = json.GetPropertyOrNull("logger")?.GetString();
             var serverName = json.GetPropertyOrNull("server_name")?.GetString();
             var release = json.GetPropertyOrNull("release")?.GetString();
-            var exceptionValues = json.GetPropertyOrNull("exception")?.GetPropertyOrNull("values")?.EnumerateArray().Select(SentryException.FromJson).Pipe(v => new SentryValues<SentryException>(v));
-            var threadValues = json.GetPropertyOrNull("threads")?.GetPropertyOrNull("values")?.EnumerateArray().Select(SentryThread.FromJson).Pipe(v => new SentryValues<SentryThread>(v));
+            var exceptionValues = json.GetPropertyOrNull("exception")?.GetPropertyOrNull("values")?.EnumerateArray().Select(SentryException.FromJson).ToList().Pipe(v => new SentryValues<SentryException>(v));
+            var threadValues = json.GetPropertyOrNull("threads")?.GetPropertyOrNull("values")?.EnumerateArray().Select(SentryThread.FromJson).ToList().Pipe(v => new SentryValues<SentryThread>(v));
             var level = json.GetPropertyOrNull("level")?.GetString()?.ParseEnum<SentryLevel>();
             var transaction = json.GetPropertyOrNull("transaction")?.GetString();
             var request = json.GetPropertyOrNull("request")?.Pipe(Request.FromJson);
diff --git a/test/Sentry.Tests/Protocol/BreadcrumbTests.cs b/test/Sentry.Tests/Protocol/BreadcrumbTests.cs
@@ -8,7 +8,7 @@ public void SerializeObject_ParameterlessConstructor_IncludesTimestamp()
         var sut = new Breadcrumb("test", "unit");
 
         var actualJson = sut.ToJsonString();
-        var actual = Breadcrumb.FromJson(Json.Parse(actualJson));
+        var actual = Json.Parse(actualJson, Breadcrumb.FromJson);
 
         Assert.NotEqual(default, actual.Timestamp);
     }
diff --git a/test/Sentry.Tests/Protocol/Context/AppTests.cs b/test/Sentry.Tests/Protocol/Context/AppTests.cs
@@ -18,7 +18,7 @@ public void SerializeObject_AllPropertiesSetToNonDefault_SerializesValidObject()
 
         var actualString = sut.ToJsonString();
 
-        var actual = App.FromJson(Json.Parse(actualString));
+        var actual = Json.Parse(actualString, App.FromJson);
         actual.Should().BeEquivalentTo(sut);
     }
 
diff --git a/test/Sentry.Tests/Protocol/Context/BrowserTests.cs b/test/Sentry.Tests/Protocol/Context/BrowserTests.cs
@@ -14,7 +14,7 @@ public void SerializeObject_AllPropertiesSetToNonDefault_SerializesValidObject()
 
         var actualString = sut.ToJsonString();
 
-        var actual = Browser.FromJson(Json.Parse(actualString));
+        var actual = Json.Parse(actualString, Browser.FromJson);
         actual.Should().BeEquivalentTo(sut);
     }
 
diff --git a/test/Sentry.Tests/Protocol/Context/ContextsTests.cs b/test/Sentry.Tests/Protocol/Context/ContextsTests.cs
@@ -10,7 +10,7 @@ public void SerializeObject_NoPropertyFilled_SerializesEmptyObject()
 
         var actualString = sut.ToJsonString();
 
-        var actual = Contexts.FromJson(Json.Parse(actualString));
+        var actual = Json.Parse(actualString, Contexts.FromJson);
         actual.Should().BeEquivalentTo(sut);
 
         Assert.Equal("{}", actualString);
@@ -28,7 +28,7 @@ public void SerializeObject_SingleUserDefinedKeyPropertySet_SerializeSinglePrope
 
         var actualString = sut.ToJsonString();
 
-        var actual = Contexts.FromJson(Json.Parse(actualString));
+        var actual = Json.Parse(actualString, Contexts.FromJson);
         actual.Should().BeEquivalentTo(sut);
 
         Assert.Equal("{\"server\":{\"type\":\"os\",\"name\":\"Linux\"}}", actualString);
@@ -47,7 +47,7 @@ public void SerializeObject_SingleDevicePropertySet_SerializeSingleProperty()
 
         var actualString = sut.ToJsonString();
 
-        var actual = Contexts.FromJson(Json.Parse(actualString));
+        var actual = Json.Parse(actualString, Contexts.FromJson);
         actual.Should().BeEquivalentTo(sut);
 
         Assert.Equal("{\"device\":{\"type\":\"device\",\"arch\":\"x86\"}}", actualString);
@@ -66,7 +66,7 @@ public void SerializeObject_SingleAppPropertySet_SerializeSingleProperty()
 
         var actualString = sut.ToJsonString();
 
-        var actual = Contexts.FromJson(Json.Parse(actualString));
+        var actual = Json.Parse(actualString, Contexts.FromJson);
         actual.Should().BeEquivalentTo(sut);
 
         Assert.Equal("{\"app\":{\"type\":\"app\",\"app_name\":\"My.App\"}}", actualString);
@@ -85,7 +85,7 @@ public void SerializeObject_SingleGpuPropertySet_SerializeSingleProperty()
 
         var actualString = sut.ToJsonString();
 
-        var actual = Contexts.FromJson(Json.Parse(actualString));
+        var actual = Json.Parse(actualString, Contexts.FromJson);
         actual.Should().BeEquivalentTo(sut);
 
         Assert.Equal("{\"gpu\":{\"type\":\"gpu\",\"name\":\"My.Gpu\"}}", actualString);
@@ -104,7 +104,7 @@ public void SerializeObject_SingleRuntimePropertySet_SerializeSingleProperty()
 
         var actualString = sut.ToJsonString();
 
-        var actual = Contexts.FromJson(Json.Parse(actualString));
+        var actual = Json.Parse(actualString, Contexts.FromJson);
         actual.Should().BeEquivalentTo(sut);
 
         Assert.Equal("{\"runtime\":{\"type\":\"runtime\",\"version\":\"2.1.1.100\"}}", actualString);
@@ -121,7 +121,7 @@ public void SerializeObject_AnonymousObject_SerializedCorrectly()
 
         // Act
         var json = contexts.ToJsonString();
-        var roundtrip = Contexts.FromJson(Json.Parse(json));
+        var roundtrip = Json.Parse(json, Contexts.FromJson);
 
         // Assert
         json.Should().Be("{\"foo\":{\"Bar\":42,\"Baz\":\"kek\"}}");
@@ -146,7 +146,7 @@ public void Ctor_SingleBrowserPropertySet_SerializeSingleProperty()
 
         var actualString = sut.ToJsonString();
 
-        var actual = Contexts.FromJson(Json.Parse(actualString));
+        var actual = Json.Parse(actualString, Contexts.FromJson);
         actual.Should().BeEquivalentTo(sut);
 
         Assert.Equal("{\"browser\":{\"type\":\"browser\",\"name\":\"Netscape 1\"}}", actualString);
@@ -165,7 +165,7 @@ public void Ctor_SingleOperatingSystemPropertySet_SerializeSingleProperty()
 
         var actualString = sut.ToJsonString();
 
-        var actual = Contexts.FromJson(Json.Parse(actualString));
+        var actual = Json.Parse(actualString, Contexts.FromJson);
         actual.Should().BeEquivalentTo(sut);
 
         Assert.Equal("{\"os\":{\"type\":\"os\",\"name\":\"BeOS 1\"}}", actualString);
diff --git a/test/Sentry.Tests/Protocol/Context/DeviceTests.cs b/test/Sentry.Tests/Protocol/Context/DeviceTests.cs
@@ -203,7 +203,7 @@ public void FromJson_NonSystemTimeZone_NoException()
         const string json = "{\"type\":\"device\",\"timezone\":\"tz_id\",\"timezone_display_name\":\"tz_name\"}";
 
         // Act
-        var device = Device.FromJson(Json.Parse(json));
+        var device = Json.Parse(json, Device.FromJson);
 
         // Assert
         device.Timezone.Should().NotBeNull();
diff --git a/test/Sentry.Tests/Protocol/DebugImageTests.cs b/test/Sentry.Tests/Protocol/DebugImageTests.cs
@@ -30,7 +30,7 @@ public void SerializeObject_AllPropertiesSetToNonDefault_SerializesValidObject()
             "}",
             actual);
 
-        var parsed = DebugImage.FromJson(Json.Parse(actual));
+        var parsed = Json.Parse(actual, DebugImage.FromJson);
 
         parsed.Should().BeEquivalentTo(sut);
     }
diff --git a/test/Sentry.Tests/Protocol/Exceptions/SentryStackFrameTests.cs b/test/Sentry.Tests/Protocol/Exceptions/SentryStackFrameTests.cs
@@ -54,7 +54,7 @@ public void SerializeObject_AllPropertiesSetToNonDefault_SerializesValidObject()
             "}",
             actual);
 
-        var parsed = SentryStackFrame.FromJson(Json.Parse(actual));
+        var parsed = Json.Parse(actual, SentryStackFrame.FromJson);
 
         parsed.Should().BeEquivalentTo(sut);
     }
diff --git a/test/Sentry.Tests/Protocol/SentryEventTests.cs b/test/Sentry.Tests/Protocol/SentryEventTests.cs
@@ -64,7 +64,7 @@ public void SerializeObject_AllPropertiesSetToNonDefault_SerializesValidObject()
             "{\"type\":\"wasm\",\"debug_id\":\"900f7d1b868432939de4457478f34720\"}" +
             "]}");
 
-        var actual = SentryEvent.FromJson(Json.Parse(actualString));
+        var actual = Json.Parse(actualString, SentryEvent.FromJson);
 
         // Assert
         actual.Should().BeEquivalentTo(sut, o =>
diff --git a/test/Sentry.Tests/Protocol/TransactionTests.cs b/test/Sentry.Tests/Protocol/TransactionTests.cs
@@ -74,7 +74,7 @@ public void SerializeObject_AllPropertiesSetToNonDefault_SerializesValidObject()
         // Act
         var finalTransaction = new Transaction(transaction);
         var actualString = finalTransaction.ToJsonString();
-        var actual = Transaction.FromJson(Json.Parse(actualString));
+        var actual = Json.Parse(actualString, Transaction.FromJson);
 
         // Assert
         actual.Should().BeEquivalentTo(finalTransaction, o =>

Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@ public static Envelope FromSession(SessionUpdate sessionUpdate)`
`232`	`232`	`}`
`233`	`233`
`234`	`234`	`return`
`235`		`- Json.Parse(buffer.ToArray()).GetDictionaryOrNull()`
	`235`	`+ Json.Parse(buffer.ToArray(), JsonExtensions.GetDictionaryOrNull)`
`236`	`236`	`?? throw new InvalidOperationException("Envelope header is malformed.");`
`237`	`237`	`}`
`238`	`238`
Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,7 @@ internal static EnvelopeItem FromClientReport(ClientReport report)`
`317`	`317`	`}`
`318`	`318`
`319`	`319`	`return`
`320`		`- Json.Parse(buffer.ToArray()).GetDictionaryOrNull()`
	`320`	`+ Json.Parse(buffer.ToArray(), JsonExtensions.GetDictionaryOrNull)`
`321`	`321`	`?? throw new InvalidOperationException("Envelope item header is malformed.");`
`322`	`322`	`}`
`323`	`323`
`@@ -339,49 +339,49 @@ private static async Task<ISerializable> DeserializePayloadAsync(`
`339`	`339`	`{`
`340`	`340`	`var bufferLength = (int)(payloadLength ?? stream.Length);`
`341`	`341`	`var buffer = await stream.ReadByteChunkAsync(bufferLength, cancellationToken).ConfigureAwait(false);`
`342`		`- var json = Json.Parse(buffer);`
	`342`	`+ var sentryEvent = Json.Parse(buffer, SentryEvent.FromJson);`
`343`	`343`
`344`		`- return new JsonSerializable(SentryEvent.FromJson(json));`
	`344`	`+ return new JsonSerializable(sentryEvent);`
`345`	`345`	`}`
`346`	`346`
`347`	`347`	`// User report`
`348`	`348`	`if (string.Equals(payloadType, TypeValueUserReport, StringComparison.OrdinalIgnoreCase))`
`349`	`349`	`{`
`350`	`350`	`var bufferLength = (int)(payloadLength ?? stream.Length);`
`351`	`351`	`var buffer = await stream.ReadByteChunkAsync(bufferLength, cancellationToken).ConfigureAwait(false);`
`352`		`- var json = Json.Parse(buffer);`
	`352`	`+ var userFeedback = Json.Parse(buffer, UserFeedback.FromJson);`
`353`	`353`
`354`		`- return new JsonSerializable(UserFeedback.FromJson(json));`
	`354`	`+ return new JsonSerializable(userFeedback);`
`355`	`355`	`}`
`356`	`356`
`357`	`357`	`// Transaction`
`358`	`358`	`if (string.Equals(payloadType, TypeValueTransaction, StringComparison.OrdinalIgnoreCase))`
`359`	`359`	`{`
`360`	`360`	`var bufferLength = (int)(payloadLength ?? stream.Length);`
`361`	`361`	`var buffer = await stream.ReadByteChunkAsync(bufferLength, cancellationToken).ConfigureAwait(false);`
`362`		`- var json = Json.Parse(buffer);`
	`362`	`+ var transaction = Json.Parse(buffer, Transaction.FromJson);`
`363`	`363`
`364`		`- return new JsonSerializable(Transaction.FromJson(json));`
	`364`	`+ return new JsonSerializable(transaction);`
`365`	`365`	`}`
`366`	`366`
`367`	`367`	`// Session`
`368`	`368`	`if (string.Equals(payloadType, TypeValueSession, StringComparison.OrdinalIgnoreCase))`
`369`	`369`	`{`
`370`	`370`	`var bufferLength = (int)(payloadLength ?? stream.Length);`
`371`	`371`	`var buffer = await stream.ReadByteChunkAsync(bufferLength, cancellationToken).ConfigureAwait(false);`
`372`		`- var json = Json.Parse(buffer);`
	`372`	`+ var sessionUpdate = Json.Parse(buffer, SessionUpdate.FromJson);`
`373`	`373`
`374`		`- return new JsonSerializable(SessionUpdate.FromJson(json));`
	`374`	`+ return new JsonSerializable(sessionUpdate);`
`375`	`375`	`}`
`376`	`376`
`377`	`377`	`// Client Report`
`378`	`378`	`if (string.Equals(payloadType, TypeValueClientReport, StringComparison.OrdinalIgnoreCase))`
`379`	`379`	`{`
`380`	`380`	`var bufferLength = (int)(payloadLength ?? stream.Length);`
`381`	`381`	`var buffer = await stream.ReadByteChunkAsync(bufferLength, cancellationToken).ConfigureAwait(false);`
`382`		`- var json = Json.Parse(buffer);`
	`382`	`+ var clientReport = Json.Parse(buffer, ClientReport.FromJson);`
`383`	`383`
`384`		`- return new JsonSerializable(ClientReport.FromJson(json));`
	`384`	`+ return new JsonSerializable(clientReport);`
`385`	`385`	`}`
`386`	`386`
`387`	`387`	`// Arbitrary payload`
Original file line number	Diff line number	Diff line change
`@@ -1,27 +1,28 @@`
	`1`	`+using System;`
`1`	`2`	`using System.IO;`
`2`	`3`	`using System.Text.Json;`
`3`	`4`
`4`	`5`	`namespace Sentry.Internal`
`5`	`6`	`{`
`6`	`7`	`internal static class Json`
`7`	`8`	`{`
`8`		`- public static JsonElement Parse(byte[] json)`
	`9`	`+ public static T Parse<T>(byte[] json, Func<JsonElement, T> factory)`
`9`	`10`	`{`
`10`	`11`	`using var jsonDocument = JsonDocument.Parse(json);`
`11`		`- return jsonDocument.RootElement.Clone();`
	`12`	`+ return factory.Invoke(jsonDocument.RootElement);`
`12`	`13`	`}`
`13`	`14`
`14`		`- public static JsonElement Parse(string json)`
	`15`	`+ public static T Parse<T>(string json, Func<JsonElement, T> factory)`
`15`	`16`	`{`
`16`	`17`	`using var jsonDocument = JsonDocument.Parse(json);`
`17`		`- return jsonDocument.RootElement.Clone();`
	`18`	`+ return factory.Invoke(jsonDocument.RootElement);`
`18`	`19`	`}`
`19`	`20`
`20`		`- public static JsonElement Load(string filePath)`
	`21`	`+ public static T Load<T>(string filePath, Func<JsonElement, T> factory)`
`21`	`22`	`{`
`22`	`23`	`using var file = File.OpenRead(filePath);`
`23`	`24`	`using var jsonDocument = JsonDocument.Parse(file);`
`24`		`- return jsonDocument.RootElement.Clone();`
	`25`	`+ return factory.Invoke(jsonDocument.RootElement);`
`25`	`26`	`}`
`26`	`27`	`}`
`27`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ public void SerializeObject_ParameterlessConstructor_IncludesTimestamp()`
`8`	`8`	`var sut = new Breadcrumb("test", "unit");`
`9`	`9`
`10`	`10`	`var actualJson = sut.ToJsonString();`
`11`		`- var actual = Breadcrumb.FromJson(Json.Parse(actualJson));`
	`11`	`+ var actual = Json.Parse(actualJson, Breadcrumb.FromJson);`
`12`	`12`
`13`	`13`	`Assert.NotEqual(default, actual.Timestamp);`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public void SerializeObject_AllPropertiesSetToNonDefault_SerializesValidObject()`
`18`	`18`
`19`	`19`	`var actualString = sut.ToJsonString();`
`20`	`20`
`21`		`- var actual = App.FromJson(Json.Parse(actualString));`
	`21`	`+ var actual = Json.Parse(actualString, App.FromJson);`
`22`	`22`	`actual.Should().BeEquivalentTo(sut);`
`23`	`23`	`}`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public void SerializeObject_AllPropertiesSetToNonDefault_SerializesValidObject()`
`14`	`14`
`15`	`15`	`var actualString = sut.ToJsonString();`
`16`	`16`
`17`		`- var actual = Browser.FromJson(Json.Parse(actualString));`
	`17`	`+ var actual = Json.Parse(actualString, Browser.FromJson);`
`18`	`18`	`actual.Should().BeEquivalentTo(sut);`
`19`	`19`	`}`
`20`	`20`