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.

Sign up for GitHub

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

Jump to bottom

Jaeger-SPM-Config #655

Merged
merged 9 commits into from
Dec 25, 2022
Merged

Jaeger-SPM-Config #655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
17f394b
prometheus.server-url parameter
devrimdemiroz Dec 21, 2022
ff208c5
prometheus.server-url
devrimdemiroz Dec 21, 2022
e4d3414
Merge pull request #1 from devrimdemiroz/patch-2
devrimdemiroz Dec 21, 2022
61358b0
Merge branch 'main' into patch-1
puckpuck Dec 24, 2022
882f3b4
Update docker-compose.yml
devrimdemiroz Dec 24, 2022
966cc5c
Merge branch 'open-telemetry:main' into patch-1
devrimdemiroz Dec 24, 2022
b853813
lint typo correctin
devrimdemiroz Dec 24, 2022
0d89ccd
Update CHANGELOG.md
devrimdemiroz Dec 24, 2022
de8b0d9
remove extra blank space
puckpuck Dec 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,3 +107,4 @@ JAEGER_SERVICE_HOST=jaeger
# Prometheus
PROMETHEUS_SERVICE_PORT=9090
PROMETHEUS_SERVICE_HOST=prometheus
PROMETHEUS_ADDR=${PROMETHEUS_SERVICE_HOST}:${PROMETHEUS_SERVICE_PORT}
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,3 +164,5 @@ significant modifications will be credited to OpenTelemetry Authors.
([#651](https://github.com/open-telemetry/opentelemetry-demo/pull/651))
* Add resource detectors to frontend service
([#648](https://github.com/open-telemetry/opentelemetry-demo/pull/648))
* Add Jaeger-SPM-Config
([#655](https://github.com/open-telemetry/opentelemetry-demo/pull/655))
9 changes: 8 additions & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,13 @@ services:
jaeger:
image: jaegertracing/all-in-one
container_name: jaeger
command: ["--memory.max-traces", "10000", "--query.base-path", "/jaeger/ui"]
command:
- "--memory.max-traces"
- "10000"
- "--query.base-path"
- "/jaeger/ui"
- "--prometheus.server-url"
- "http://${PROMETHEUS_ADDR}"
deploy:
resources:
limits:
Expand All @@ -586,6 +592,7 @@ services:
- "4317" # OTLP gRPC default port
environment:
- COLLECTOR_OTLP_ENABLED=true
- METRICS_STORAGE_TYPE=prometheus
logging: *logging

# Grafana
Expand Down