[exporter] Remove jaeger dbmodel dependency #36972
Open
+464
−25
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
4 tasks
yurishkuro
reviewed
Dec 27, 2024
yurishkuro
reviewed
Dec 27, 2024
yurishkuro
pushed a commit
to jaegertracing/jaeger
that referenced
this pull request
Dec 27, 2024
## Which problem is this PR solving? - Resolves #6410 - Prerequisite: open-telemetry/opentelemetry-collector-contrib#36972 ## Description of the changes - move plugin/storage/es/spanstore/dbmodel to plugin/storage/es/spanstore/internal/dbmodel ## How was this change tested? - ## Checklist - [x] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [x] I have signed all commits - [ ] I have added unit tests for the new functionality - [x] I have run lint and test steps successfully - for `jaeger`: `make lint test` - for `jaeger-ui`: `npm run lint` and `npm run test` --------- Signed-off-by: zzzk1 <[email protected]>
yurishkuro
reviewed
Dec 27, 2024
yurishkuro
reviewed
Dec 28, 2024
| @@ -16,22 +15,107 @@ const ( | |||
| tagDotReplacementCharacter = "@" | |||
| ) | |||
|
|
|||
| // logzioSpan is same as esSpan with a few different json field names and an addition on type field. | |||
There was a problem hiding this comment.
I strongly advise to structure your PR such that it does not move code unnecessarily. The diff view should be showing no changes to this type, instead for me it shows as deleted and another one added below, which is named differently and may or may not be the same. Why introduce this additional complexity for the reviewer?
yurishkuro
reviewed
Dec 28, 2024
yurishkuro
reviewed
Dec 28, 2024
| } | ||
|
|
||
| // LogzioSpan is same as ESSpan with a few different json field names and an addition on type field. | ||
| type LogzioSpan struct { |
There was a problem hiding this comment.
none of the new structs should public
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.
Description
Copy the Jaeger plugin/storage/es/spanstore/dbmodel for logzioexporter, and remove the dependency. The dbmodel package in Jaeger will be internal from v1.65 (jaegertracing/jaeger#6428).
Link to tracking issue
Fixes #36970
Testing
Covered by existing