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

Draft
wants to merge 12 commits into
base: main
Choose a base branch
from
Draft

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

All modified and coverable lines are covered by tests ✅

Project coverage is 96.38%. Comparing base (d33515e) to head (fb4b0ce).

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #5681   +/-   ##
=======================================
  Coverage   96.38%   96.38%           
=======================================
  Files         329      329           
  Lines       16060    16061    +1     
=======================================
+ Hits        15479    15480    +1     
  Misses        404      404           
  Partials      177      177           
Flag Coverage Δ
badger_v1 8.04% <ø> (ø)
badger_v2 1.92% <ø> (ø)
cassandra-3.x-v1 16.60% <ø> (ø)
cassandra-3.x-v2 1.84% <ø> (ø)
cassandra-4.x-v1 16.60% <ø> (ø)
cassandra-4.x-v2 1.84% <ø> (ø)
elasticsearch-7.x-v1 18.87% <ø> (ø)
elasticsearch-8.x-v1 19.07% <ø> (ø)
elasticsearch-8.x-v2 19.07% <ø> (ø)
grpc_v1 9.47% <ø> (ø)
grpc_v2 7.49% <ø> (ø)
kafka 9.76% <ø> (ø)
opensearch-1.x-v1 18.93% <ø> (+0.01%) ⬆️
opensearch-2.x-v1 18.93% <ø> (+0.01%) ⬆️
opensearch-2.x-v2 18.92% <ø> (-0.02%) ⬇️
unittests 94.23% <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.

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
Copy link
Member Author

FlamingSaint commented Jun 28, 2024

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])

TODO: Still need to fix the error that microsim is throwing. Not sure what is causing it

microsim-1    | 2024/06/28 05:19:58 Post "http://localhost:14278/api/traces": dial tcp [::1]:14278: connect: connection refused

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog:exprimental Change to an experimental part of the code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants