Replace the use of model/converter/thrift/zipkin #6879
Merged
Conversation
This file contains hidden or 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
…ided by OTEL collector contrib (pkg/translator/zipkin/zipkinthriftconverter) Signed-off-by: Mohammed Shuraih Shaikh <[email protected]>
yurishkuro
added
the
changelog:refactoring
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #6879 +/- ##
==========================================
- Coverage 96.23% 96.11% -0.12%
==========================================
Files 344 341 -3
Lines 19972 19641 -331
==========================================
- Hits 19220 18878 -342
- Misses 569 577 +8
- Partials 183 186 +3
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
yurishkuro
reviewed
Mar 19, 2025
|
|
||
| "github.com/jaegertracing/jaeger-idl/model/v1" | ||
| "github.com/jaegertracing/jaeger/model/converter/thrift/zipkin" |
There was a problem hiding this comment.
Why is it that in tests you had to introduce extra error handling but here just swapping the import is sufficient?
There was a problem hiding this comment.
Because the Implementation of SerializeThrift function in jaeger only returned []byte, but its implementation was changed in OTEL collector contrib as it now returns ([]byte,err).
And the SerializeThrift func is only used in the test files, so only the test files needed extra error handling.
yurishkuro
approved these changes
Mar 19, 2025
yurishkuro
changed the title
amilbcahat
pushed a commit
to amilbcahat/jaeger
that referenced
this pull request
May 4, 2025
## Which problem is this PR solving? - Resolves jaegertracing#6859 ## Description of the changes - Changed the all imports of "github.com/jaegertracing/jaeger/model/converter/thrift/zipkin" to "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin/zipkinthriftconverter". - Deleted model/converter/thrift/zipkin package as we don't use it. ## How was this change tested? - Successfully tested by running make test ## Checklist - [ ✔] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [ ✔ ] I have signed all commits - [ ✔] I have run lint and test steps successfully Signed-off-by: Mohammed Shuraih Shaikh <[email protected]>
amilbcahat
pushed a commit
to amilbcahat/jaeger
that referenced
this pull request
May 4, 2025
## Which problem is this PR solving? - Resolves jaegertracing#6859 ## Description of the changes - Changed the all imports of "github.com/jaegertracing/jaeger/model/converter/thrift/zipkin" to "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin/zipkinthriftconverter". - Deleted model/converter/thrift/zipkin package as we don't use it. ## How was this change tested? - Successfully tested by running make test ## Checklist - [ ✔] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [ ✔ ] I have signed all commits - [ ✔] I have run lint and test steps successfully Signed-off-by: Mohammed Shuraih Shaikh <[email protected]> Signed-off-by: amol-verma-allen <[email protected]>
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.
Which problem is this PR solving?
Description of the changes
Changed the all imports of "github.com/jaegertracing/jaeger/model/converter/thrift/zipkin" to "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin/zipkinthriftconverter".
Deleted model/converter/thrift/zipkin package as we don't use it.
How was this change tested?
Checklist