test: fix unavailable API on TargetFramework=net48

test/Sentry.Testing/JsonSerializableExtensions.cs

@@ -1,13 +1,15 @@
+#nullable enable
+
 namespace Sentry.Testing;
 
 internal static class JsonSerializableExtensions
 {
     private static readonly bool IsWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
 
-    public static string ToJsonString(this ISentryJsonSerializable serializable, IDiagnosticLogger logger = null, bool indented = false) =>
+    public static string ToJsonString(this ISentryJsonSerializable serializable, IDiagnosticLogger? logger = null, bool indented = false) =>
         WriteToJsonString(writer => writer.WriteSerializableValue(serializable, logger), indented);
 
-    public static string ToJsonString(this object @object, IDiagnosticLogger logger = null, bool indented = false) =>
+    public static string ToJsonString(this object @object, IDiagnosticLogger? logger = null, bool indented = false) =>
         WriteToJsonString(writer => writer.WriteDynamicValue(@object, logger), indented);
 
     private static string WriteToJsonString(Action<Utf8JsonWriter> writeAction, bool indented)
@@ -43,4 +45,34 @@ private static string WriteToJsonString(Action<Utf8JsonWriter> writeAction, bool
         // Standardize on \n on all platforms, for consistency in tests.
         return IsWindows ? result.Replace("\r\n", "\n") : result;
     }
+
+    public static JsonDocument ToJsonDocument(this ISentryJsonSerializable serializable, IDiagnosticLogger? logger = null) =>
+        WriteToJsonDocument(writer => writer.WriteSerializableValue(serializable, logger));
+
+    public static JsonDocument ToJsonDocument(this object @object, IDiagnosticLogger? logger = null) =>
+        WriteToJsonDocument(writer => writer.WriteDynamicValue(@object, logger));
+
+    private static JsonDocument WriteToJsonDocument(Action<Utf8JsonWriter> writeAction)
+    {
+#if (NETCOREAPP3_0_OR_GREATER || NETSTANDARD2_1_OR_GREATER)
+        // This implementation is better, as it uses fewer allocations
+        var buffer = new ArrayBufferWriter<byte>();
+
+        using var writer = new Utf8JsonWriter(buffer);
+        writeAction(writer);
+        writer.Flush();
+
+        return JsonDocument.Parse(buffer.WrittenMemory);
+#else
+        // This implementation is compatible with older targets
+        using var stream = new MemoryStream();
+
+        using var writer = new Utf8JsonWriter(stream);
+        writeAction(writer);
+        writer.Flush();
+
+        stream.Seek(0, SeekOrigin.Begin);
+        return JsonDocument.Parse(stream);
+#endif
+    }
 }

test/Sentry.Tests/Internals/DebugStackTraceTests.verify.cs

@@ -240,6 +240,7 @@ public Task CreateFrame_ForNativeAOT()
             IP = 2,
         });
 
+        Assert.NotNull(frame);
         return VerifyJson(frame.ToJsonString());
     }
 #endif

test/Sentry.Tests/Protocol/StructuredLogTests.cs

@@ -46,12 +46,8 @@ public void WriteTo_Empty_AsJson()
     {
         var log = new StructuredLog([]);
 
-        ArrayBufferWriter<byte> bufferWriter = new();
-        using Utf8JsonWriter writer = new(bufferWriter);
-        log.WriteTo(writer, _output);
-        writer.Flush();
+        var document = log.ToJsonDocument(_output);
 
-        var document = JsonDocument.Parse(bufferWriter.WrittenMemory);
         Assert.Equal("""{"items":[]}""", document.RootElement.ToString());
     }