docker-compose: add otel-collector by default, disable jaeger by default#848
Conversation
2b2dd72 to
7a6f322
Compare
sanderginn
left a comment
There was a problem hiding this comment.
It all looks good to me.
Is this repository meant to serve as a public deployment method? If so, we might want to offer means to set a custom otel config.
Yes - I added a mounted-by-default template similar to your approach in sourcegraph/deploy-sourcegraph#4163: 0b2f378 |
| environment: | ||
| - 'SAMPLING_STRATEGIES_FILE=/etc/jaeger/sampling_strategies.json' | ||
|
|
||
| # Configure collector to send traces to Jaeger |
There was a problem hiding this comment.
| # Configure collector to send traces to Jaeger | |
| # Configure collector to send traces to Jaeger | |
| # By default listens on the following ports: | |
| # - grpc 4317 | |
| # - http 4318 |
There was a problem hiding this comment.
This is already indicated on docstring for the underlying service configuration in the base docker-compose.yaml file, so I think we should be fine to omit this here
|
docker compose stuff looks good to me, but how about our pure docker distro? https://github.com/sourcegraph/deploy-sourcegraph-docker/tree/master/pure-docker I know there has not been much clear signal how to better support pure-docker distro in the future, but I do think we should back-port these changes to pure-docker as well. |
|
pure-docker changes are here: #849 with some slight variations (still in draft) |
4832119 to
4ec016f
Compare
4ec016f to
806c7e9
Compare
Removes Jaeger from the default docker-compose deployment, and replaces it with OpenTelemetry Collector configured to log data only.
With the
jaeger/docker-compose.yamloverlay, a Jaeger instance can be deployed andotel-collectorwill be configured to send traces to the deployed Jaeger instance.The pure-docker version of this change is in #849
Closes https://github.com/sourcegraph/sourcegraph/issues/40455
Checklist
Test plan
docker-compose \ -f docker-compose/docker-compose.yaml \ -f docker-compose/jaeger/docker-compose.yaml \ -f docker-compose/dev/docker-compose.yaml up{ "observability.tracing": { "type": "opentelemetry" } }