Skip to content

Move pkg/adjuster to cmd/query/app/querysvc/internal/adjuster #6956

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 2, 2025

Conversation

pipiland2612
Copy link
Contributor

@pipiland2612 pipiland2612 commented Apr 1, 2025

Which problem is this PR solving?

Description of the changes

  • moved pkg/adjuster to cmd/query/app/querysvc/internal/adjuster

How was this change tested?

  • changes have passed all tests of the project

Checklist

@pipiland2612 pipiland2612 marked this pull request as ready for review April 1, 2025 19:37
@pipiland2612 pipiland2612 requested a review from a team as a code owner April 1, 2025 19:37
@pipiland2612 pipiland2612 requested a review from albertteoh April 1, 2025 19:37
mahadzaryab1
mahadzaryab1 previously approved these changes Apr 1, 2025
Copy link

codecov bot commented Apr 1, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.20%. Comparing base (2fb42ef) to head (76f5ec5).
Report is 6 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #6956   +/-   ##
=======================================
  Coverage   96.19%   96.20%           
=======================================
  Files         344      343    -1     
  Lines       20253    20266   +13     
=======================================
+ Hits        19483    19496   +13     
  Misses        581      581           
  Partials      189      189           
Flag Coverage Δ
badger_v1 10.53% <ø> (+0.32%) ⬆️
badger_v2 2.18% <ø> (+0.06%) ⬆️
cassandra-4.x-v1-manual 15.84% <ø> (+0.48%) ⬆️
cassandra-4.x-v2-auto 2.17% <ø> (+0.06%) ⬆️
cassandra-4.x-v2-manual 2.17% <ø> (+0.06%) ⬆️
cassandra-5.x-v1-manual 15.84% <ø> (+0.48%) ⬆️
cassandra-5.x-v2-auto 2.17% <ø> (+0.06%) ⬆️
cassandra-5.x-v2-manual 2.17% <ø> (+0.06%) ⬆️
elasticsearch-6.x-v1 20.76% <ø> (+0.63%) ⬆️
elasticsearch-7.x-v1 20.84% <ø> (+0.63%) ⬆️
elasticsearch-8.x-v1 21.02% <ø> (+0.64%) ⬆️
elasticsearch-8.x-v2 2.18% <ø> (+0.06%) ⬆️
grpc_v1 11.61% <ø> (+0.33%) ⬆️
grpc_v2 8.47% <ø> (+0.23%) ⬆️
kafka-3.x-v1 10.82% <ø> (+0.30%) ⬆️
kafka-3.x-v2 2.18% <ø> (+0.06%) ⬆️
memory_v2 2.18% <ø> (+0.06%) ⬆️
opensearch-1.x-v1 20.89% <ø> (+0.63%) ⬆️
opensearch-2.x-v1 20.89% <ø> (+0.63%) ⬆️
opensearch-2.x-v2 2.18% <ø> (+0.06%) ⬆️
tailsampling-processor 0.59% <ø> (+0.01%) ⬆️
unittests 94.98% <ø> (+<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.

@mahadzaryab1 mahadzaryab1 added the changelog:refactoring Internal code refactoring without functional changes label Apr 1, 2025
@yurishkuro
Copy link
Member

please see feedback on #6916

@mahadzaryab1 mahadzaryab1 self-requested a review April 1, 2025 20:36
@mahadzaryab1 mahadzaryab1 dismissed their stale review April 1, 2025 20:37

waiting on getting Yuri's feedback addressed

@pipiland2612
Copy link
Contributor Author

pipiland2612 commented Apr 1, 2025

@yurishkuro thanks for the comment.

Indeed, the primary client of the package is cmd/query/app/querysvc/query_service.go.

However adjuster.ZipkinSpanIDUniquifier is used in internal/storage/v1/memory/memory.go.

Could you advise if this is actually needed in internal/storage/v1/memory/memory.go at all? I don't see it in use for other Trace Storage like elasticsearch.

If it's not needed, then it's straightforward to move to cmd/query/app/querysvc/adjuster. Otherwise, I struggle to see which would be the best approaches.

@yurishkuro
Copy link
Member

yurishkuro commented Apr 2, 2025

However adjuster.ZipkinSpanIDUniquifier is used in internal/storage/v1/memory/memory.go.

Feel free to remove it from memory storage.

@yurishkuro
Copy link
Member

move to cmd/query/app/querysvc/adjuster

Move to cmd/query/app/querysvc/internal/adjuster instead, to prevent usage from other packages

@pipiland2612 pipiland2612 force-pushed the 6869-move-pkg-adjuster branch from 5c8f189 to 628f3be Compare April 2, 2025 11:15
@@ -7,20 +7,20 @@ package querysvc
import (
"time"

"github.com/jaegertracing/jaeger/model/adjuster"
adjuster2 "github.com/jaegertracing/jaeger/cmd/query/app/querysvc/internal/adjuster"
Copy link
Member

Choose a reason for hiding this comment

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

renaming is unnecessary change

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Agree. I adjusted this in 76f5ec5.

@pipiland2612 pipiland2612 changed the title Move pkg/adjuster to internal/adjuster Move pkg/adjuster to cmd/query/app/querysvc/internal/adjuster Apr 2, 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 2, 2025
Merged via the queue into jaegertracing:main with commit 9224477 Apr 2, 2025
56 checks passed
@pipiland2612 pipiland2612 deleted the 6869-move-pkg-adjuster branch April 2, 2025 16:12
amilbcahat pushed a commit to amilbcahat/jaeger that referenced this pull request May 4, 2025
…tracing#6956)

## Which problem is this PR solving?
- part of jaegertracing#6869

## Description of the changes
- moved `pkg/adjuster` to `cmd/query/app/querysvc/internal/adjuster`

## How was this change tested?

- changes have passed all tests of the project

## 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
…tracing#6956)

## Which problem is this PR solving?
- part of jaegertracing#6869

## Description of the changes
- moved `pkg/adjuster` to `cmd/query/app/querysvc/internal/adjuster`

## How was this change tested?

- changes have passed all tests of the project

## 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.

3 participants