Fix Zipkin spanFormat #5261
Merged
Fix Zipkin spanFormat #5261
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
yurishkuro
reviewed
Mar 9, 2024
| @@ -69,6 +69,9 @@ func startZipkinReceiver( | |||
| } | |||
|
|
|||
| consumerAdapter := newConsumerDelegate(logger, spanProcessor, tm) | |||
| // reset Zipkin spanFormat | |||
| consumerAdapter.batchConsumer.spanOptions.SpanFormat = processor.ZipkinSpanFormat | |||
There was a problem hiding this comment.
can you add a test for this? TestZipkinReceiver submits zipkin spans but uses a mockSpanProcessor, we could potentially enhance it to validate that those spans are coming with the desired tag
There was a problem hiding this comment.
Done.
@yurishkuro PTAL :)
Signed-off-by: Yuan Fang <yuanfang@alauda.io>
fyuan1316
force-pushed
the
fix/zipkin-spanformat
branch
from
ed0f593
to
77b5976
Compare
yurishkuro
approved these changes
Mar 11, 2024
|
Looks like uploading codecov failed. |
varshith257
pushed a commit
to varshith257/jaeger
that referenced
this pull request
Mar 13, 2024
<!-- !! Please DELETE this comment before posting. We appreciate your contribution to the Jaeger project! 👋🎉 --> ## Which problem is this PR solving? - <!-- Example: Resolves jaegertracing#123 --> Resolves jaegertracing#5260 ## Description of the changes - ## How was this change tested? - ## Checklist - [ ] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [ ] I have signed all commits - [ ] I have added unit tests for the new functionality - [ ] I have run lint and test steps successfully - for `jaeger`: `make lint test` - for `jaeger-ui`: `yarn lint` and `yarn test` Signed-off-by: Yuan Fang <yuanfang@alauda.io> Co-authored-by: Yuri Shkuro <yurishkuro@users.noreply.github.com> Signed-off-by: Vamshi Maskuri <gwcchintu@gmail.com>
varshith257
added a commit
to varshith257/jaeger
that referenced
this pull request
Mar 13, 2024
This reverts commit 139b5f6.
varshith257
pushed a commit
to varshith257/jaeger
that referenced
this pull request
Mar 13, 2024
<!-- !! Please DELETE this comment before posting. We appreciate your contribution to the Jaeger project! 👋🎉 --> ## Which problem is this PR solving? - <!-- Example: Resolves jaegertracing#123 --> Resolves jaegertracing#5260 ## Description of the changes - ## How was this change tested? - ## Checklist - [ ] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [ ] I have signed all commits - [ ] I have added unit tests for the new functionality - [ ] I have run lint and test steps successfully - for `jaeger`: `make lint test` - for `jaeger-ui`: `yarn lint` and `yarn test` Signed-off-by: Yuan Fang <yuanfang@alauda.io> Co-authored-by: Yuri Shkuro <yurishkuro@users.noreply.github.com> Signed-off-by: Vamshi Maskuri <gwcchintu@gmail.com>
varshith257
added a commit
to varshith257/jaeger
that referenced
this pull request
Mar 13, 2024
This reverts commit 139b5f6. Signed-off-by: Vamshi Maskuri <gwcchintu@gmail.com>
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?
Resolves #5260
Description of the changes
How was this change tested?
Checklist
jaeger:make lint testjaeger-ui:yarn lintandyarn test