Skip to content

[refactor] Consolidate v1/v2 reader factory adapter functionality #7019

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 3 commits into from
Apr 13, 2025

Conversation

mahadzaryab1
Copy link
Collaborator

Which problem is this PR solving?

Description of the changes

  • This PR consolidates the v1/v2 reader adapter functionality by combining GetV1Reader with NewSpanReader

How was this change tested?

  • CI

Checklist

@mahadzaryab1 mahadzaryab1 added the changelog:refactoring Internal code refactoring without functional changes label Apr 13, 2025
@mahadzaryab1 mahadzaryab1 requested a review from yurishkuro April 13, 2025 17:09
@mahadzaryab1 mahadzaryab1 requested a review from a team as a code owner April 13, 2025 17:09
@@ -23,11 +23,13 @@ type TraceReader struct {
spanReader spanstore.Reader
}

func GetV1Reader(reader tracestore.Reader) (spanstore.Reader, bool) {
func GetV1Reader(reader tracestore.Reader) spanstore.Reader {
Copy link
Member

Choose a reason for hiding this comment

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

do we need similar change for writer?

Copy link
Collaborator Author

@mahadzaryab1 mahadzaryab1 Apr 13, 2025

Choose a reason for hiding this comment

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

yep - will do in a follow-up PR

Copy link

codecov bot commented Apr 13, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 95.99%. Comparing base (f8c40ff) to head (338f86a).
Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #7019      +/-   ##
==========================================
+ Coverage   95.97%   95.99%   +0.02%     
==========================================
  Files         346      346              
  Lines       20632    20622      -10     
==========================================
- Hits        19802    19797       -5     
+ Misses        626      622       -4     
+ Partials      204      203       -1     
Flag Coverage Δ
badger_v1 10.48% <0.00%> (+<0.01%) ⬆️
badger_v2 2.17% <0.00%> (+<0.01%) ⬆️
cassandra-4.x-v1-manual 15.77% <0.00%> (+<0.01%) ⬆️
cassandra-4.x-v2-auto 2.16% <0.00%> (+<0.01%) ⬆️
cassandra-4.x-v2-manual 2.16% <0.00%> (+<0.01%) ⬆️
cassandra-5.x-v1-manual 15.77% <0.00%> (+<0.01%) ⬆️
cassandra-5.x-v2-auto 2.16% <0.00%> (+<0.01%) ⬆️
cassandra-5.x-v2-manual 2.16% <0.00%> (+<0.01%) ⬆️
elasticsearch-6.x-v1 20.87% <0.00%> (+<0.01%) ⬆️
elasticsearch-7.x-v1 20.96% <0.00%> (+<0.01%) ⬆️
elasticsearch-8.x-v1 21.13% <0.00%> (+<0.01%) ⬆️
elasticsearch-8.x-v2 2.17% <0.00%> (+<0.01%) ⬆️
grpc_v1 11.56% <0.00%> (+<0.01%) ⬆️
grpc_v2 8.43% <0.00%> (+<0.01%) ⬆️
kafka-3.x-v1 10.77% <0.00%> (+<0.01%) ⬆️
kafka-3.x-v2 2.17% <0.00%> (+<0.01%) ⬆️
memory_v2 2.17% <0.00%> (+<0.01%) ⬆️
opensearch-1.x-v1 21.01% <0.00%> (+<0.01%) ⬆️
opensearch-2.x-v1 21.01% <0.00%> (+<0.01%) ⬆️
opensearch-2.x-v2 2.17% <0.00%> (+<0.01%) ⬆️
tailsampling-processor 0.59% <0.00%> (+<0.01%) ⬆️
unittests 94.80% <100.00%> (+0.02%) ⬆️

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 this pull request to the merge queue Apr 13, 2025
Merged via the queue into jaegertracing:main with commit 59970f0 Apr 13, 2025
59 checks passed
@mahadzaryab1 mahadzaryab1 deleted the adapter-improvement branch April 14, 2025 01:14
amilbcahat pushed a commit to amilbcahat/jaeger that referenced this pull request May 4, 2025
…egertracing#7019)

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

## Description of the changes
- This PR consolidates the v1/v2 reader adapter functionality by
combining `GetV1Reader` with `NewSpanReader`

## 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]>
amilbcahat pushed a commit to amilbcahat/jaeger that referenced this pull request May 4, 2025
…egertracing#7019)

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

## Description of the changes
- This PR consolidates the v1/v2 reader adapter functionality by
combining `GetV1Reader` with `NewSpanReader`

## 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]>
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
area/storage changelog:refactoring Internal code refactoring without functional changes v2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants