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

Enable SPM in Jaeger v2 #5681

Merged
merged 71 commits into from
Jul 24, 2024
Merged

Enable SPM in Jaeger v2 #5681

merged 71 commits into from
Jul 24, 2024

Conversation

FlamingSaint
Copy link
Member

@FlamingSaint FlamingSaint commented Jun 26, 2024

Which problem is this PR solving?

Description of the changes

  • Added a new docker-compose file
  • Added the configuration file which will be used for enabling SPM in v2

How was this change tested?

  • Run make dev-v2 inside docker-compose/monitor

Checklist

Copy link

codecov bot commented Jun 26, 2024

Codecov Report

Attention: Patch coverage is 97.61905% with 2 lines in your changes missing coverage. Please review.

Project coverage is 96.65%. Comparing base (74ee5d6) to head (d641e36).

Files Patch % Lines
...eger/internal/extension/jaegerstorage/extension.go 95.83% 1 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #5681      +/-   ##
==========================================
- Coverage   96.66%   96.65%   -0.02%     
==========================================
  Files         341      342       +1     
  Lines       16451    16515      +64     
==========================================
+ Hits        15902    15962      +60     
- Misses        361      363       +2     
- Partials      188      190       +2     
Flag Coverage Δ
badger_v1 8.05% <ø> (ø)
badger_v2 1.81% <0.00%> (-0.09%) ⬇️
cassandra-3.x-v1 16.61% <ø> (ø)
cassandra-3.x-v2 1.74% <0.00%> (-0.09%) ⬇️
cassandra-4.x-v1 16.61% <ø> (ø)
cassandra-4.x-v2 1.74% <0.00%> (-0.09%) ⬇️
elasticsearch-6.x-v1 18.78% <ø> (ø)
elasticsearch-7.x-v1 18.83% <ø> (ø)
elasticsearch-8.x-v1 19.02% <ø> (ø)
elasticsearch-8.x-v2 1.80% <0.00%> (-0.10%) ⬇️
grpc_v1 9.52% <ø> (ø)
grpc_v2 7.14% <0.00%> (-0.34%) ⬇️
kafka 9.74% <ø> (ø)
memory_v2 1.80% <0.00%> (-0.10%) ⬇️
opensearch-1.x-v1 18.89% <ø> (ø)
opensearch-2.x-v1 18.88% <ø> (ø)
opensearch-2.x-v2 1.80% <0.00%> (-0.09%) ⬇️
unittests 95.07% <97.61%> (-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.

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.

I strongly advice including integration test in this PR, since we already have it for v1. This would be the best proof that the setup works.

docker-compose/monitor/Makefile Outdated Show resolved Hide resolved
docker-compose/monitor/Makefile Outdated Show resolved Hide resolved
docker-compose/monitor/jaeger-v2-config.yml Show resolved Hide resolved
@FlamingSaint
Copy link
Member Author

I strongly advice including integration test in this PR, since we already have it for v1. This would be the best proof that the setup works.

Okay. I will start working on adding the e2e test for v2.

Signed-off-by: FlamingSaint <[email protected]>
@yurishkuro yurishkuro added the changelog:exprimental Change to an experimental part of the code label Jun 27, 2024
Makefile Outdated Show resolved Hide resolved
Signed-off-by: FlamingSaint <[email protected]>
Signed-off-by: FlamingSaint <[email protected]>
Signed-off-by: FlamingSaint <[email protected]>
Signed-off-by: FlamingSaint <[email protected]>
Signed-off-by: FlamingSaint <[email protected]>
Signed-off-by: FlamingSaint <[email protected]>
Signed-off-by: FlamingSaint <[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.

overall lgtm, but CI for v2 failed. Please test it locally first, it's fairly quick.

  time="2024-06-28T00:59:22Z" level=warning msg="/home/runner/work/jaeger/jaeger/docker-compose/monitor/docker-compose-v2.yml: `version` is obsolete"
  jaeger-1  | 2024/06/28 00:54:31 application version: git-commit=250261fca3c21d70178ee896353c4c50e971c725, git-version=v1.58.0, build-date=2024-06-28T00:52:08Z
  jaeger-1  | Error: failed to get config: cannot unmarshal the configuration: 1 error(s) decoding:
  jaeger-1  | 
  jaeger-1  | * error decoding 'exporters': unknown type: "prometheus" for id: "prometheus" (valid values: [otlphttp jaeger_storage_exporter kafka debug otlp])
  jaeger-1  | 2024/06/28 00:54:31 failed to get config: cannot unmarshal the configuration: 1 error(s) decoding:
  jaeger-1  | 
  jaeger-1  | * error decoding 'exporters': unknown type: "prometheus" for id: "prometheus" (valid values: [otlphttp jaeger_storage_exporter kafka debug otlp])

.github/workflows/ci-build-spm.yml Outdated Show resolved Hide resolved
@FlamingSaint

This comment was marked as resolved.

FlamingSaint and others added 3 commits July 3, 2024 15:36
Signed-off-by: Raghuram Kannan <[email protected]>
Signed-off-by: FlamingSaint <[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.

You are missing the concept of "metrics storage", similar to span storage. It can be defined as part of query extension (as it's the only dependency), and you need to change the extension code to actually create and pass that storage to QueryService.

docker-compose/monitor/docker-compose-v2.yml Outdated Show resolved Hide resolved
docker-compose/monitor/docker-compose-v2.yml Outdated Show resolved Hide resolved
docker-compose/monitor/jaeger-v2-config.yml Show resolved Hide resolved
docker-compose/monitor/jaeger-v2-config.yml Outdated Show resolved Hide resolved
go.mod Show resolved Hide resolved
go.mod Outdated Show resolved Hide resolved
scripts/spm-integration-test.sh Show resolved Hide resolved
FlamingSaint and others added 7 commits July 21, 2024 22:28
Signed-off-by: FlamingSaint <[email protected]>
Signed-off-by: FlamingSaint <[email protected]>
Signed-off-by: FlamingSaint <[email protected]>
Signed-off-by: FlamingSaint <[email protected]>
Signed-off-by: FlamingSaint <[email protected]>
Signed-off-by: FlamingSaint <[email protected]>
@FlamingSaint FlamingSaint marked this pull request as ready for review July 22, 2024 21:18
@FlamingSaint FlamingSaint requested a review from a team as a code owner July 22, 2024 21:18
@dosubot dosubot bot added area/storage docker Pull requests that update Docker code v2 labels Jul 22, 2024
FlamingSaint and others added 3 commits July 23, 2024 10:57
Signed-off-by: FlamingSaint <[email protected]>
Signed-off-by: FlamingSaint <[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.

Can we bump the code coverage for PR to be above 95%?

Signed-off-by: FlamingSaint <[email protected]>
Signed-off-by: FlamingSaint <[email protected]>
Signed-off-by: FlamingSaint <[email protected]>
Signed-off-by: FlamingSaint <[email protected]>
Signed-off-by: FlamingSaint <[email protected]>
Signed-off-by: FlamingSaint <[email protected]>
@yurishkuro yurishkuro merged commit d8b2110 into jaegertracing:main Jul 24, 2024
44 checks passed
@yurishkuro
Copy link
Member

🎉

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/storage changelog:exprimental Change to an experimental part of the code docker Pull requests that update Docker code v2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants