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
docker-compose: add otel-collector by default, disable jaeger by default #848
Conversation
2b2dd72
to
7a6f322
Compare
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.
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 |
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.
LGTM
environment: | ||
- 'SAMPLING_STRATEGIES_FILE=/etc/jaeger/sampling_strategies.json' | ||
|
||
# Configure collector to send traces to Jaeger |
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.
# 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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.yaml
overlay, a Jaeger instance can be deployed andotel-collector
will be configured to send traces to the deployed Jaeger instance.The pure-docker version of this change is in #849
Closes sourcegraph/sourcegraph#40455
Checklist
Test plan