-
Notifications
You must be signed in to change notification settings - Fork 2.6k
Move model/json to internal/uimodel #6973
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
Move model/json to internal/uimodel #6973
Conversation
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #6973 +/- ##
==========================================
- Coverage 96.21% 96.20% -0.01%
==========================================
Files 345 345
Lines 20359 20359
==========================================
- Hits 19588 19586 -2
- Misses 581 583 +2
Partials 190 190
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:
|
@@ -9,7 +9,7 @@ import ( | |||
"strings" | |||
|
|||
"github.com/jaegertracing/jaeger-idl/model/v1" | |||
"github.com/jaegertracing/jaeger/model/json" | |||
v1 "github.com/jaegertracing/jaeger/internal/uimodel/converter/v1" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
v1 is a bad alias
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
keep the alias as json to minimize code changes
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi, I've fixed it. Thanks for noticing
9972a87
to
da15dce
Compare
Signed-off-by: pipiland <[email protected]>
Signed-off-by: pipiland <[email protected]>
da15dce
to
46cf18a
Compare
Signed-off-by: pipiland <[email protected]>
Signed-off-by: pipiland <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks!
…ing#6973) ## Which problem is this PR solving? - Resolves jaegertracing#6869 ## Description of the changes - move `model/json` to `internal/uimodel/converter/v1` - remove unused `fixture.json` and `model` pakage - move `model/json/model.go` to `internal/uimodel/converter/v1` ## How was this change tested? - pass project test ## Checklist - [x] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [x] I have signed all commits - [x] 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: pipiland <[email protected]>
…ing#6973) ## Which problem is this PR solving? - Resolves jaegertracing#6869 ## Description of the changes - move `model/json` to `internal/uimodel/converter/v1` - remove unused `fixture.json` and `model` pakage - move `model/json/model.go` to `internal/uimodel/converter/v1` ## How was this change tested? - pass project test ## Checklist - [x] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [x] I have signed all commits - [x] 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: pipiland <[email protected]> Signed-off-by: amol-verma-allen <[email protected]>
Which problem is this PR solving?
Description of the changes
model/json
tointernal/uimodel/converter/v1
fixture.json
andmodel
pakagemodel/json
tointernal/uimodel
internal/converter/json
tointernal/uimodel/v1/converter/json
How was this change tested?
Checklist
jaeger
:make lint test
jaeger-ui
:npm run lint
andnpm run test