Use JsonDocument.TryParseValue

EventStore · Jun 6, 2024 · a9bd3fe · a9bd3fe
1 parent 3bc302d
commit a9bd3fe
Showing 1 changed file with 7 additions and 11 deletions.
diff --git a/src/EventStore.Client/Common/Diagnostics/EventMetadataExtensions.cs b/src/EventStore.Client/Common/Diagnostics/EventMetadataExtensions.cs
@@ -17,18 +17,14 @@ public static ReadOnlySpan<byte> InjectTracingContext(this ReadOnlyMemory<byte>
 
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]
 	public static TracingMetadata ExtractTracingMetadata(this ReadOnlyMemory<byte> eventMetadata) {
-		try {
-			using var doc = JsonDocument.Parse(eventMetadata);
-
-			if (!doc.RootElement.TryGetProperty(TracingConstants.Metadata.TraceId, out var traceId)
-			 || !doc.RootElement.TryGetProperty(TracingConstants.Metadata.SpanId, out var spanId))
-				return TracingMetadata.None;
-
-			return new TracingMetadata(traceId.GetString(), spanId.GetString());
-		}
-		catch (JsonException) {
+		var reader = new Utf8JsonReader(eventMetadata.Span);
+
+		if (!JsonDocument.TryParseValue(ref reader, out var doc)
+		 || !doc.RootElement.TryGetProperty(TracingConstants.Metadata.TraceId, out var traceId)
+		 || !doc.RootElement.TryGetProperty(TracingConstants.Metadata.SpanId, out var spanId))
 			return TracingMetadata.None;
-		}
+
+		return new TracingMetadata(traceId.GetString(), spanId.GetString());
 	}
 
 	[MethodImpl(MethodImplOptions.AggressiveInlining)]