Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tracing improvements #311

Merged
merged 4 commits into from
Jun 6, 2024
Merged

Tracing improvements #311

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3bc302d
Use TryGetProperty when extracting tracing metadata to prevent except…
josephcummings Jun 6, 2024
a9bd3fe
Use JsonDocument.TryParseValue
josephcummings Jun 6, 2024
5380b91
Handle empty metadata case and dispose of JsonDocument if instantiated
josephcummings Jun 6, 2024
d25dd9c
Implement short-circuit to improve performance when there are no acti…
josephcummings Jun 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions src/EventStore.Client/Common/Diagnostics/EventMetadataExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,16 @@ 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);

return new TracingMetadata(
doc.RootElement.GetProperty(TracingConstants.Metadata.TraceId).GetString(),
doc.RootElement.GetProperty(TracingConstants.Metadata.SpanId).GetString()
);
}
catch (Exception) {
var reader = new Utf8JsonReader(eventMetadata.Span);

if (!JsonDocument.TryParseValue(ref reader, out var doc)
josephcummings marked this conversation as resolved.
Show resolved Hide resolved
|| !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)]
static ReadOnlySpan<byte> InjectTracingMetadata(this ReadOnlyMemory<byte> eventMetadata, TracingMetadata tracingMetadata) {
if (tracingMetadata == TracingMetadata.None || !tracingMetadata.IsValid)
Expand Down
Loading