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 "index out of range" when receiving a dual client/server Zipkin span #4160

Merged
merged 5 commits into from
Jan 15, 2023

Conversation

yurishkuro
Copy link
Member

@yurishkuro yurishkuro commented Jan 15, 2023

Which problem is this PR solving?

Short description of the changes

Signed-off-by: Yuri Shkuro <[email protected]>
@yurishkuro yurishkuro requested a review from a team as a code owner January 15, 2023 06:00
@yurishkuro yurishkuro changed the title Fix "index out of range" when receiving a dial client/server Zipkin span Fix "index out of range" when receiving a dual client/server Zipkin span Jan 15, 2023
@codecov
Copy link

codecov bot commented Jan 15, 2023

Codecov Report

Base: 97.16% // Head: 97.12% // Decreases project coverage by -0.03% ⚠️

Coverage data is based on head (7b7cc85) compared to base (f99a590).
Patch coverage: 100.00% of modified lines in pull request are covered.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #4160      +/-   ##
==========================================
- Coverage   97.16%   97.12%   -0.04%     
==========================================
  Files         295      296       +1     
  Lines       17431    17452      +21     
==========================================
+ Hits        16937    16951      +14     
- Misses        398      403       +5     
- Partials       96       98       +2     
Flag Coverage Δ
unittests 97.12% <100.00%> (-0.04%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
cmd/collector/app/zipkin/zipkindeser/annotation.go 100.00% <ø> (ø)
cmd/collector/app/zipkin/zipkindeser/json.go 97.25% <ø> (ø)
cmd/collector/app/handler/thrift_span_handler.go 96.20% <100.00%> (+0.74%) ⬆️
cmd/collector/app/zipkin/http_handler.go 97.58% <100.00%> (ø)
cmd/collector/app/zipkin/zipkindeser/jsonv2.go 100.00% <100.00%> (ø)
cmd/collector/app/zipkin/zipkindeser/protov2.go 95.13% <100.00%> (ø)
...r/app/zipkin/zipkindeser/zipkindesermocks/mocks.go 100.00% <100.00%> (ø)
... and 1 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

Signed-off-by: Yuri Shkuro <[email protected]>
@yurishkuro
Copy link
Member Author

@albertteoh or @pavolloffay can I get a review plz?

Copy link
Contributor

@albertteoh albertteoh left a comment

Choose a reason for hiding this comment

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

Overall looks good to me, just some nits.

cmd/collector/app/zipkin/http_handler_test.go Outdated Show resolved Hide resolved
cmd/collector/app/zipkin/http_handler_test.go Outdated Show resolved Hide resolved
cmd/collector/app/zipkin/http_handler_test.go Outdated Show resolved Hide resolved
Signed-off-by: Yuri Shkuro <[email protected]>
Signed-off-by: Yuri Shkuro <[email protected]>
Copy link
Contributor

@albertteoh albertteoh left a comment

Choose a reason for hiding this comment

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

LGTM

@yurishkuro
Copy link
Member Author

thanks!

@yurishkuro yurishkuro merged commit e2d0531 into jaegertracing:main Jan 15, 2023
@yurishkuro yurishkuro deleted the fix-3404 branch January 15, 2023 23:49
shubbham1215 pushed a commit to shubbham1215/jaeger that referenced this pull request Feb 22, 2023
…pan (jaegertracing#4160)

## Which problem is this PR solving?
- Resolves jaegertracing#3404 

## Short description of the changes
- Handle case where one input zipkin span is transformed into two Jaeger
spans, but still return response with the same length as input
- Add a test for dial client/server span provided in jaegertracing#3404 
- Side effect: refactor `cmd/collector/app/zipkin` to avoid circular
dependencies

Signed-off-by: Yuri Shkuro <[email protected]>
shubbham1215 pushed a commit to shubbham1215/jaeger that referenced this pull request Mar 5, 2023
…pan (jaegertracing#4160)

## Which problem is this PR solving?
- Resolves jaegertracing#3404

## Short description of the changes
- Handle case where one input zipkin span is transformed into two Jaeger
spans, but still return response with the same length as input
- Add a test for dial client/server span provided in jaegertracing#3404
- Side effect: refactor `cmd/collector/app/zipkin` to avoid circular
dependencies

Signed-off-by: Yuri Shkuro <[email protected]>
Signed-off-by: shubbham1215 <[email protected]>
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.

Request with "parent+children" spans to the zipkin collector service fails with error: index out of range
2 participants