Skip to content

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

Merged
merged 4 commits into from
Apr 3, 2025

Conversation

pipiland2612
Copy link
Contributor

@pipiland2612 pipiland2612 commented Apr 3, 2025

Which problem is this PR solving?

Description of the changes

  • move model/json to internal/uimodel/converter/v1
    • remove unused fixture.json and model pakage
    • move model/json to internal/uimodel
    • move internal/converter/json to internal/uimodel/v1/converter/json

How was this change tested?

  • pass project test

Checklist

Copy link

codecov bot commented Apr 3, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.20%. Comparing base (4c779b0) to head (72cbe81).
Report is 1 commits behind head on main.

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              
Flag Coverage Δ
badger_v1 10.53% <ø> (ø)
badger_v2 2.18% <ø> (ø)
cassandra-4.x-v1-manual 15.84% <ø> (ø)
cassandra-4.x-v2-auto 2.17% <ø> (ø)
cassandra-4.x-v2-manual 2.17% <ø> (ø)
cassandra-5.x-v1-manual 15.84% <ø> (ø)
cassandra-5.x-v2-auto 2.17% <ø> (ø)
cassandra-5.x-v2-manual 2.17% <ø> (ø)
elasticsearch-6.x-v1 20.76% <ø> (ø)
elasticsearch-7.x-v1 20.84% <ø> (ø)
elasticsearch-8.x-v1 21.02% <ø> (ø)
elasticsearch-8.x-v2 2.18% <ø> (ø)
grpc_v1 11.61% <ø> (ø)
grpc_v2 8.47% <ø> (ø)
kafka-3.x-v1 10.82% <ø> (ø)
kafka-3.x-v2 2.18% <ø> (ø)
memory_v2 2.18% <ø> (ø)
opensearch-1.x-v1 20.89% <ø> (ø)
opensearch-2.x-v1 20.89% <ø> (ø)
opensearch-2.x-v2 2.18% <ø> (ø)
tailsampling-processor 0.59% <ø> (ø)
unittests 94.99% <100.00%> (-0.01%) ⬇️

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

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@@ -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"
Copy link
Member

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

Copy link
Member

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

Copy link
Contributor Author

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

@pipiland2612 pipiland2612 force-pushed the 6869-move-model/json branch 2 times, most recently from 9972a87 to da15dce Compare April 3, 2025 18:55
@pipiland2612 pipiland2612 force-pushed the 6869-move-model/json branch from da15dce to 46cf18a Compare April 3, 2025 19:08
@pipiland2612 pipiland2612 marked this pull request as ready for review April 3, 2025 19:17
@pipiland2612 pipiland2612 requested a review from a team as a code owner April 3, 2025 19:17
@pipiland2612 pipiland2612 requested a review from pavolloffay April 3, 2025 19:17
@yurishkuro yurishkuro added the changelog:refactoring Internal code refactoring without functional changes label Apr 3, 2025
Copy link
Member

@yurishkuro yurishkuro left a comment

Choose a reason for hiding this comment

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

Thanks!

@yurishkuro yurishkuro added this pull request to the merge queue Apr 3, 2025
Merged via the queue into jaegertracing:main with commit 9a45f52 Apr 3, 2025
56 of 58 checks passed
@pipiland2612 pipiland2612 deleted the 6869-move-model/json branch April 4, 2025 05:44
@pipiland2612 pipiland2612 changed the title Move model/json/model.go to internal/uimodel/converter/v1 Move model/json to internal/uimodel Apr 4, 2025
amilbcahat pushed a commit to amilbcahat/jaeger that referenced this pull request May 4, 2025
…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]>
amilbcahat pushed a commit to amilbcahat/jaeger that referenced this pull request May 4, 2025
…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]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog:refactoring Internal code refactoring without functional changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Move private code into /internal/
2 participants