Skip to content
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

[api_v3][query] Change api_v3 grpc handler to use query service v2 #6452

Merged
merged 19 commits into from
Jan 1, 2025

Conversation

mahadzaryab1
Copy link
Collaborator

@mahadzaryab1 mahadzaryab1 commented Dec 31, 2024

Which problem is this PR solving?

Description of the changes

  • This PR migrates the v3_api GRPC handler to use the new v2 query service.

How was this change tested?

  • CI

Checklist

Copy link

codecov bot commented Dec 31, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.27%. Comparing base (e3a883e) to head (cb10ad3).
Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #6452   +/-   ##
=======================================
  Coverage   96.26%   96.27%           
=======================================
  Files         370      371    +1     
  Lines       21144    21195   +51     
=======================================
+ Hits        20355    20406   +51     
  Misses        604      604           
  Partials      185      185           
Flag Coverage Δ
badger_v1 10.51% <0.00%> (-0.03%) ⬇️
badger_v2 2.58% <0.00%> (-0.01%) ⬇️
cassandra-4.x-v1-manual 16.37% <0.00%> (-0.04%) ⬇️
cassandra-4.x-v2-auto 2.51% <0.00%> (-0.01%) ⬇️
cassandra-4.x-v2-manual 2.51% <0.00%> (-0.04%) ⬇️
cassandra-5.x-v1-manual 16.37% <0.00%> (-0.04%) ⬇️
cassandra-5.x-v2-auto 2.51% <0.00%> (-0.01%) ⬇️
cassandra-5.x-v2-manual 2.51% <0.00%> (-0.01%) ⬇️
elasticsearch-6.x-v1 20.08% <0.00%> (-0.05%) ⬇️
elasticsearch-7.x-v1 20.17% <0.00%> (-0.05%) ⬇️
elasticsearch-8.x-v1 20.33% <0.00%> (-0.05%) ⬇️
elasticsearch-8.x-v2 2.57% <0.00%> (-0.12%) ⬇️
grpc_v1 12.16% <0.00%> (-0.02%) ⬇️
grpc_v2 8.95% <0.00%> (-0.03%) ⬇️
kafka-3.x-v1 10.35% <0.00%> (-0.03%) ⬇️
kafka-3.x-v2 2.58% <0.00%> (-0.01%) ⬇️
memory_v2 2.57% <0.00%> (-0.02%) ⬇️
opensearch-1.x-v1 20.21% <0.00%> (-0.06%) ⬇️
opensearch-2.x-v1 20.21% <0.00%> (-0.06%) ⬇️
opensearch-2.x-v2 2.57% <0.00%> (-0.02%) ⬇️
tailsampling-processor 0.39% <0.00%> (-0.01%) ⬇️
unittests 95.14% <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.

Signed-off-by: Mahad Zaryab <[email protected]>
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.

lgtm, but lint/tests are not happy

cmd/query/app/apiv3/grpc_handler.go Outdated Show resolved Hide resolved
cmd/query/app/apiv3/grpc_handler.go Outdated Show resolved Hide resolved
cmd/query/app/apiv3/grpc_handler.go Outdated Show resolved Hide resolved
@mahadzaryab1
Copy link
Collaborator Author

lgtm, but lint/tests are not happy

@yurishkuro yep - I need to fix the tests. Will do that now.

@mahadzaryab1 mahadzaryab1 changed the title [WIP][api_v3][query] Change api_v3 handler to get traces using v2 query service [WIP][api_v3][query] Change api_v3 grpc handler to get traces using v2 query service Jan 1, 2025
return opts
}

func initializeV2ArchiveStorage(
Copy link
Collaborator Author

@mahadzaryab1 mahadzaryab1 Jan 1, 2025

Choose a reason for hiding this comment

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

@yurishkuro we're repeating this logic two times at the moment (here and in the query server). Should we move this into a common helper somewhere?

Copy link
Member

@yurishkuro yurishkuro Jan 1, 2025

Choose a reason for hiding this comment

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

ok to leave for now. We haven't finished archive factory PR, but the idea was that in the v2 extension we won't be using v1adapter but get v2 reader/writer directly from storage extension.

@mahadzaryab1 mahadzaryab1 changed the title [WIP][api_v3][query] Change api_v3 grpc handler to get traces using v2 query service [api_v3][query] Change api_v3 grpc handler to get traces using v2 query service Jan 1, 2025
@mahadzaryab1 mahadzaryab1 marked this pull request as ready for review January 1, 2025 17:18
@mahadzaryab1 mahadzaryab1 requested a review from a team as a code owner January 1, 2025 17:18
@dosubot dosubot bot added the area/storage label Jan 1, 2025
Signed-off-by: Mahad Zaryab <[email protected]>
@yurishkuro yurishkuro changed the title [api_v3][query] Change api_v3 grpc handler to get traces using v2 query service [api_v3][query] Change api_v3 grpc handler to use query service v2 Jan 1, 2025
@yurishkuro yurishkuro merged commit 2fe9e21 into jaegertracing:main Jan 1, 2025
54 checks passed
Manik2708 pushed a commit to Manik2708/jaeger that referenced this pull request Jan 2, 2025
…aegertracing#6452)

## Which problem is this PR solving?
- Towards jaegertracing#6337

## Description of the changes
- This PR migrates the v3_api GRPC handler to use the new v2 query
service.

## How was this change tested?
- CI

## 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: Mahad Zaryab <[email protected]>
@mahadzaryab1 mahadzaryab1 deleted the api-v3-qs-v2 branch January 6, 2025 00:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants