Skip to content

fix: don't create tags w/ empty name for internal zipkin spans #2596

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

Merged
yurishkuro merged 1 commit into from
Oct 28, 2020
Merged

fix: don't create tags w/ empty name for internal zipkin spans #2596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion cmd/collector/app/zipkin/jsonv2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,9 @@ func spanV2ToThrift(s *models.Span) (*zipkincore.Span, error) {
if err != nil {
return nil, err
}
tSpan.BinaryAnnotations = append(tSpan.BinaryAnnotations, rAddrAnno)
if rAddrAnno != nil {
tSpan.BinaryAnnotations = append(tSpan.BinaryAnnotations, rAddrAnno)
}
}

// add local component to represent service name
Expand Down Expand Up @@ -112,6 +114,8 @@ func remoteEndpToThrift(e *models.Endpoint, kind string) (*zipkincore.BinaryAnno
key = zipkincore.CLIENT_ADDR
case models.SpanKindCONSUMER, models.SpanKindPRODUCER:
key = zipkincore.MESSAGE_ADDR
default:
return nil, nil
}

return &zipkincore.BinaryAnnotation{
Expand Down
1 change: 1 addition & 0 deletions cmd/collector/app/zipkin/jsonv2_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ func TestRemoteEndpToThrift(t *testing.T) {
{kind: models.SpanKindSERVER, expected: &zipkincore.BinaryAnnotation{Key: zipkincore.CLIENT_ADDR, AnnotationType: zipkincore.AnnotationType_BOOL}},
{kind: models.SpanKindPRODUCER, expected: &zipkincore.BinaryAnnotation{Key: zipkincore.MESSAGE_ADDR, AnnotationType: zipkincore.AnnotationType_BOOL}},
{kind: models.SpanKindCONSUMER, expected: &zipkincore.BinaryAnnotation{Key: zipkincore.MESSAGE_ADDR, AnnotationType: zipkincore.AnnotationType_BOOL}},
{kind: "", expected: nil},
}
for _, test := range tests {
banns, err := remoteEndpToThrift(nil, test.kind)
Expand Down