-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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
FlamingSaint
wants to merge
20
commits into
jaegertracing:main
Choose a base branch
from
FlamingSaint:spm
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+321
−12
Draft
Enable SPM in Jaeger v2 #5681
Changes from all commits
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
6ed4f23
Create setup for enabling SPM in v2
FlamingSaint dc85461
Add connector to the config and add suggested changes to the Makefile
FlamingSaint e5d9850
Add integration test for SPM v2
FlamingSaint 1bf0ece
fix
FlamingSaint 8ba9818
Add suggested changes
FlamingSaint 6f61680
Add suggested changes
FlamingSaint ff42224
fix CI
FlamingSaint 0dbda14
Add changes
FlamingSaint 591fda9
fix
FlamingSaint 31ffea5
Add quotes
FlamingSaint ea0d5ec
Fix CI
FlamingSaint fb4b0ce
Add prometheusexporter to components.go
FlamingSaint 231e397
Merge branch 'main' into spm
FlamingSaint 6f42591
fix conflicts
FlamingSaint 0cb5f7a
Use microsim v0.4.1 in docker-compose-v2.yml
FlamingSaint 91987df
Added suggested changes and ran go mod tidy
FlamingSaint c49e322
Merge branch 'main' into spm
FlamingSaint 43b2e72
Add back the endpoint
FlamingSaint 5e9d0e4
Merge branch 'main' into spm
FlamingSaint 977c9d1
Merge branch 'main' into spm
FlamingSaint File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
version: "3.5" | ||
services: | ||
jaeger: | ||
networks: | ||
- backend | ||
image: jaegertracing/jaeger:${JAEGER_IMAGE_TAG:-latest} | ||
volumes: | ||
- "./jaeger-ui.json:/etc/jaeger/jaeger-ui.json" # Do we need this for v2 ? Seems to be running without this. | ||
- "./jaeger-v2-config.yml:/etc/jaeger/jaeger-v2-config.yml" | ||
command: ["--config", "/etc/jaeger/jaeger-v2-config.yml"] | ||
environment: | ||
- METRICS_STORAGE_TYPE=prometheus | ||
- PROMETHEUS_SERVER_URL=http://prometheus:9090 | ||
# - PROMETHEUS_QUERY_SUPPORT_SPANMETRICS_CONNECTOR=${PROMETHEUS_QUERY_SUPPORT_SPANMETRICS_CONNECTOR:-true} | ||
- PROMETHEUS_QUERY_NAMESPACE=${PROMETHEUS_QUERY_NAMESPACE:-} | ||
- PROMETHEUS_QUERY_DURATION_UNIT=${PROMETHEUS_QUERY_DURATION_UNIT:-} | ||
- PROMETHEUS_QUERY_NORMALIZE_CALLS=true | ||
- PROMETHEUS_QUERY_NORMALIZE_DURATION=true | ||
ports: | ||
- "16686:16686" | ||
microsim: | ||
networks: | ||
- backend | ||
image: yurishkuro/microsim:v0.4.1 | ||
command: "-d 24h -s 500ms" | ||
environment: | ||
- OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=http://jaeger:4318/v1/traces | ||
depends_on: | ||
- jaeger | ||
prometheus: | ||
networks: | ||
- backend | ||
image: prom/prometheus:latest | ||
volumes: | ||
- "./prometheus.yml:/etc/prometheus/prometheus.yml" | ||
ports: | ||
- "9090:9090" | ||
grafana: | ||
networks: | ||
- backend | ||
image: grafana/grafana:latest | ||
volumes: | ||
- ./grafana.ini:/etc/grafana/grafana.ini | ||
- ./datasource.yml:/etc/grafana/provisioning/datasources/datasource.yaml | ||
environment: | ||
- GF_AUTH_ANONYMOUS_ENABLED=true | ||
- GF_AUTH_ANONYMOUS_ORG_ROLE=Admin | ||
- GF_AUTH_DISABLE_LOGIN_FORM=true | ||
ports: | ||
- 3000:3000 | ||
|
||
networks: | ||
backend: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
service: | ||
FlamingSaint marked this conversation as resolved.
Show resolved
Hide resolved
|
||
extensions: [jaeger_storage, jaeger_query] | ||
pipelines: | ||
traces: | ||
receivers: [otlp] | ||
processors: [batch] | ||
exporters: [jaeger_storage_exporter, spanmetrics] | ||
metrics/spanmetrics: | ||
receivers: [spanmetrics] | ||
exporters: [prometheus] | ||
|
||
|
||
extensions: | ||
jaeger_query: | ||
trace_storage: some_storage | ||
|
||
jaeger_storage: | ||
backends: | ||
some_storage: | ||
memory: | ||
max_traces: 100000 | ||
|
||
connectors: | ||
spanmetrics: | ||
|
||
receivers: | ||
otlp: | ||
protocols: | ||
grpc: | ||
http: | ||
endpoint: "0.0.0.0:4318" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is default, do we need to specify? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yes this was surprising. Without it I am getting this error traces export: Post "http://jaeger:4318/v1/traces": dial tcp 172.25.0.3:4318: connect: connection refused |
||
|
||
processors: | ||
batch: | ||
|
||
exporters: | ||
jaeger_storage_exporter: | ||
trace_storage: some_storage | ||
prometheus: | ||
endpoint: "0.0.0.0:8889" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nothing is reading these env vars in v2. In v1 they were interpreted by viper as part of cli flags handling. In v2 all configuration must come from the main config.yaml
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Understood.