JSONSpanSerializer add ToEscaped while serializing serviceName, span.Name, binaryAnnotation.Value #157
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…Name, binaryAnnotation.Value
fedj
reviewed
Nov 3, 2017
| @@ -46,7 +46,7 @@ private void SerializeSpan(StreamWriter writer, Span span) | |||
| writer.Write(openingBrace); | |||
| writer.WriteField(id, NumberUtils.EncodeLongToLowerHexString(span.SpanState.SpanId)); | |||
| writer.Write(comma); | |||
| writer.WriteField(name, span.Name ?? SerializerUtils.DefaultRpcMethodName); | |||
| writer.WriteField(name, span.Name == null ? SerializerUtils.ToEscaped(span.Name) : SerializerUtils.DefaultRpcMethodName); | |||
There was a problem hiding this comment.
I think you meant the opposite. If the name is not null then escape it
| @@ -126,7 +126,7 @@ private static void SerializeEndPoint(StreamWriter writer, IPEndPoint endPoint, | |||
| writer.Write(comma); | |||
| writer.WriteField(port, (short)endPoint.Port); | |||
| writer.Write(comma); | |||
| writer.WriteField(JSONSpanSerializer.serviceName, serviceName); | |||
| writer.WriteField(JSONSpanSerializer.serviceName, SerializerUtils.ToEscaped(serviceName)); | |||
There was a problem hiding this comment.
Shouldn't we also escape annotation.value on line 115 ?
There was a problem hiding this comment.
I find the same problem in serviceName too, so I add it too
I thought annotation.Value is fully controlled by us, so I didn't add it
I commit again
Fix a stupid mistake
|
Thanks a lot @anthonywanted ! |
fedj
pushed a commit
that referenced
this pull request
Jan 16, 2019
…Name, annotation.Value, binaryAnnotation.Value (#157) * JSONSpanSerializer Add ToEscaped while serializing serviceName, span.Name, annotation.Value, binaryAnnotation.Value * Add test * JSONSpanSerializer escape annotation.Value too. Fix a stupid mistake
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
JSONSpanSerializer add ToEscaped while serializing serviceName, span.Name, binaryAnnotation.Value
Fix bug #156