Skip to content

Commit 1d18b29

Browse files
authored
Fixed JSON operation plan format (#8676)
1 parent 4432f71 commit 1d18b29

File tree

1 file changed

+23
-24
lines changed

1 file changed

+23
-24
lines changed

src/HotChocolate/Fusion-vnext/src/Fusion.Execution/Execution/Nodes/Serialization/JsonOperationPlanFormatter.cs

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,30 @@ public void Format(IBufferWriter<byte> writer, OperationPlan plan, OperationPlan
3636
jsonWriter.WriteString("id", plan.Id);
3737

3838
jsonWriter.WritePropertyName("operation");
39-
WriteOperation(jsonWriter, plan.Operation, trace);
39+
WriteOperation(jsonWriter, plan.Operation);
4040

4141
jsonWriter.WriteNumber("searchSpace", plan.SearchSpace);
4242

43+
if (trace is not null)
44+
{
45+
if (!string.IsNullOrEmpty(trace.AppId))
46+
{
47+
jsonWriter.WriteString("appId", trace.AppId);
48+
}
49+
50+
if (!string.IsNullOrEmpty(trace.EnvironmentName))
51+
{
52+
jsonWriter.WriteString("environment", trace.EnvironmentName);
53+
}
54+
55+
if (!string.IsNullOrEmpty(trace.TraceId))
56+
{
57+
jsonWriter.WriteString("traceId", trace.TraceId);
58+
}
59+
60+
jsonWriter.WriteNumber("duration", trace.Duration.TotalMilliseconds);
61+
}
62+
4363
jsonWriter.WritePropertyName("nodes");
4464
WriteNodes(jsonWriter, plan.AllNodes, trace);
4565

@@ -52,7 +72,7 @@ internal void Format(IBufferWriter<byte> writer, Operation operation, ImmutableA
5272
jsonWriter.WriteStartObject();
5373

5474
jsonWriter.WritePropertyName("operation");
55-
WriteOperation(jsonWriter, operation, null);
75+
WriteOperation(jsonWriter, operation);
5676

5777
jsonWriter.WritePropertyName("nodes");
5878
WriteNodes(jsonWriter, allNodes, null);
@@ -62,8 +82,7 @@ internal void Format(IBufferWriter<byte> writer, Operation operation, ImmutableA
6282

6383
private static void WriteOperation(
6484
Utf8JsonWriter jsonWriter,
65-
Operation operation,
66-
OperationPlanTrace? trace)
85+
Operation operation)
6786
{
6887
jsonWriter.WriteStartObject();
6988

@@ -79,26 +98,6 @@ private static void WriteOperation(
7998
jsonWriter.WriteString("hash", operation.Hash);
8099
jsonWriter.WriteString("shortHash", operation.Hash[..8]);
81100

82-
if (trace is not null)
83-
{
84-
if (!string.IsNullOrEmpty(trace.AppId))
85-
{
86-
jsonWriter.WriteString("appId", trace.AppId);
87-
}
88-
89-
if (!string.IsNullOrEmpty(trace.EnvironmentName))
90-
{
91-
jsonWriter.WriteString("environment", trace.EnvironmentName);
92-
}
93-
94-
if (!string.IsNullOrEmpty(trace.TraceId))
95-
{
96-
jsonWriter.WriteString("traceId", trace.TraceId);
97-
}
98-
99-
jsonWriter.WriteNumber("duration", trace.Duration.TotalMilliseconds);
100-
}
101-
102101
jsonWriter.WriteEndObject();
103102
}
104103

0 commit comments

Comments
 (0)