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.

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

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

Merged
merged 1 commit into from
Oct 28, 2020
Merged

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

merged 1 commit into from
Oct 28, 2020

Conversation

mzahor
Copy link
Contributor

@mzahor mzahor commented Oct 28, 2020

Resolves #2595

For spans w/ span kind == "internal" and remoteEndpoint != nil, spanV2ToThrift would add a tag with empty name. This PR fixes the issue.

@mzahor mzahor requested a review from a team as a code owner October 28, 2020 16:03
@mzahor mzahor requested a review from joe-elliott October 28, 2020 16:03
@mergify mergify bot requested a review from jpkrohling October 28, 2020 16:04
yurishkuro
yurishkuro previously approved these changes Oct 28, 2020
Copy link
Member

@yurishkuro yurishkuro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@mergify mergify bot dismissed yurishkuro’s stale review October 28, 2020 16:04

Pull request has been modified.

@codecov
Copy link

codecov bot commented Oct 28, 2020

Codecov Report

Merging #2596 into master will decrease coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2596      +/-   ##
==========================================
- Coverage   95.32%   95.31%   -0.01%     
==========================================
  Files         208      208              
  Lines        9281     9285       +4     
==========================================
+ Hits         8847     8850       +3     
- Misses        355      356       +1     
  Partials       79       79              
Impacted Files Coverage Δ
cmd/collector/app/zipkin/jsonv2.go 100.00% <100.00%> (ø)
pkg/config/tlscfg/cert_watcher.go 94.52% <100.00%> (+0.07%) ⬆️
plugin/storage/integration/integration.go 77.34% <0.00%> (-0.56%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8388432...dc8fb76. Read the comment docs.

Copy link
Member

@yurishkuro yurishkuro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@yurishkuro yurishkuro merged commit c4a3b28 into jaegertracing:master Oct 28, 2020
@mzahor mzahor deleted the fix/empty-tag-zipkin branch October 29, 2020 07:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Empty tag is being added after conversion from zipkin
3 participants