Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

Create v2 QueryService #6337

Closed
yurishkuro opened this issue Dec 11, 2024 · 0 comments
Closed

Create v2 QueryService #6337

yurishkuro opened this issue Dec 11, 2024 · 0 comments
Labels
area/otel v2

Comments

@yurishkuro
Copy link
Member

The components of /cmd/query all depend on a QueryService which is a higher level abstraction that spanstore.Reader as it performs post-query adjustments on the trace before it is returned to the client.

In order to upgrade all the components in query to V2 Storage API we need to create a QueryServiceV2 that will operate on OTLP data instead of legacy model.Span.

The proposal is:

  • clone QueryService and update to OTLP data model
  • change query app to instantiate both of these structs temporarily
  • then we can start upgrading the endpoint handlers to work with QueryServiceV2, starting with apiv3 handler which already operates on OTLP and thus would require minimal changes
@mahadzaryab1 mahadzaryab1 mentioned this issue Dec 11, 2024
Merged
4 tasks
@mahadzaryab1 mahadzaryab1 mentioned this issue Dec 25, 2024
Merged
4 tasks
yurishkuro pushed a commit that referenced this issue Dec 25, 2024
@mahadzaryab1
[v2][query] Implement helper to buffer sequence of traces (#6401)
ba6228f 
## Which problem is this PR solving?
- Towards #6337 

## Description of the changes
- This PR implements a helper `AggregateTraces` in the `jptrace` package
to aggregate a sequence of `[]ptrace.Traces` to `ptrace.Traces`. This
was done by combining contiguous trace chunks together based on the
traceID.

## How was this change tested?
- Added unit tests

## 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 <mahadzaryab1@gmail.com>
@yurishkuro yurishkuro mentioned this issue Dec 29, 2024
Closed
2 tasks
@mahadzaryab1 mahadzaryab1 mentioned this issue Dec 31, 2024
Merged
4 tasks
yurishkuro pushed a commit that referenced this issue Dec 31, 2024
@mahadzaryab1
[chore] Create v2 directory for querysvc package (#6450)
c474466 
## Which problem is this PR solving?
- Towards #6337 

## Description of the changes
- Created a `v2` directory under querysvc and moved the new adjusters
into that package. This will also allow us to make a separate package
for the v2 query service under this new directory.

## 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 <mahadzaryab1@gmail.com>
mahadzaryab1 added a commit that referenced this issue Dec 31, 2024
@mahadzaryab1
[v2][storage] Create v2 query service to operate on otlp data model (#…
ed30d5d 
…6343)

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

## Description of the changes
- Implement a v2 version of the query service that operates on the OTLP
data model. This PR will be followed up by a series of PRs where this
this new query service will be updated with the existing handlers. Once
all the handlers have been migrated to use this query service, we can
remove the old one.

## How was this change tested?
- Added unit tests

## 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`: `yarn lint` and `yarn test`

---------

Signed-off-by: Mahad Zaryab <mahadzaryab1@gmail.com>
This was referenced Dec 31, 2024
Merged
Merged
mahadzaryab1 added a commit that referenced this issue Jan 1, 2025
@mahadzaryab1 @yurishkuro
[v2][query] Fix query service to not perform aggregation for raw trac…
e3a883e 
…es (#6453)

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

## Description of the changes
- The query service was currently performing aggregation when the
`raw_traces` flag is set. This PR fixes that by removing aggregation
when the flag is set.

## How was this change tested?
- Adding unit tests

## 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 <mahadzaryab1@gmail.com>
Signed-off-by: Yuri Shkuro <github@ysh.us>
Co-authored-by: Yuri Shkuro <github@ysh.us>
yurishkuro pushed a commit that referenced this issue Jan 1, 2025
@mahadzaryab1
[api_v3][query] Change api_v3 grpc handler to use query service v2 (#…
2fe9e21 
…6452)

## Which problem is this PR solving?
- Towards #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 <mahadzaryab1@gmail.com>
@mahadzaryab1 mahadzaryab1 mentioned this issue Jan 1, 2025
Merged
4 tasks
Manik2708 pushed a commit to Manik2708/jaeger that referenced this issue Jan 2, 2025
@mahadzaryab1 @Manik2708
[api_v3][query] Change api_v3 grpc handler to use query service v2 (j…
986d57c 
…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 <mahadzaryab1@gmail.com>
Manik2708 pushed a commit to Manik2708/jaeger that referenced this issue Jan 5, 2025
@mahadzaryab1 @Manik2708
[chore] Create v2 directory for querysvc package (jaegertracing#6450)
cf95261 
## Which problem is this PR solving?
- Towards jaegertracing#6337 

## Description of the changes
- Created a `v2` directory under querysvc and moved the new adjusters
into that package. This will also allow us to make a separate package
for the v2 query service under this new directory.

## 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 <mahadzaryab1@gmail.com>
Manik2708 pushed a commit to Manik2708/jaeger that referenced this issue Jan 5, 2025
@mahadzaryab1 @Manik2708
[v2][storage] Create v2 query service to operate on otlp data model (j…
d12c910 
…aegertracing#6343)

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

## Description of the changes
- Implement a v2 version of the query service that operates on the OTLP
data model. This PR will be followed up by a series of PRs where this
this new query service will be updated with the existing handlers. Once
all the handlers have been migrated to use this query service, we can
remove the old one.

## How was this change tested?
- Added unit tests

## 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`: `yarn lint` and `yarn test`

---------

Signed-off-by: Mahad Zaryab <mahadzaryab1@gmail.com>
Manik2708 pushed a commit to Manik2708/jaeger that referenced this issue Jan 5, 2025
@mahadzaryab1 @yurishkuro @Manik2708
[v2][query] Fix query service to not perform aggregation for raw trac…
e6d0a69 
…es (jaegertracing#6453)

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

## Description of the changes
- The query service was currently performing aggregation when the
`raw_traces` flag is set. This PR fixes that by removing aggregation
when the flag is set.

## How was this change tested?
- Adding unit tests

## 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 <mahadzaryab1@gmail.com>
Signed-off-by: Yuri Shkuro <github@ysh.us>
Co-authored-by: Yuri Shkuro <github@ysh.us>
Manik2708 pushed a commit to Manik2708/jaeger that referenced this issue Jan 5, 2025
@mahadzaryab1 @Manik2708
[v2][query] Implement helper to buffer sequence of traces (jaegertrac…
153b653 
…ing#6401)

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

## Description of the changes
- This PR implements a helper `AggregateTraces` in the `jptrace` package
to aggregate a sequence of `[]ptrace.Traces` to `ptrace.Traces`. This
was done by combining contiguous trace chunks together based on the
traceID.

## How was this change tested?
- Added unit tests

## 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 <mahadzaryab1@gmail.com>
# for free to join this conversation on GitHub. Already have an account? # to comment
Assignees
No one assigned
Labels
area/otel v2
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@yurishkuro