Skip to content

pure-docker: deploy otel-collector by default#849

Merged
bobheadxi merged 4 commits into
masterfrom
pure-docker-otel-default
Sep 1, 2022
Merged

pure-docker: deploy otel-collector by default#849
bobheadxi merged 4 commits into
masterfrom
pure-docker-otel-default

Conversation

@bobheadxi

@bobheadxi bobheadxi commented Aug 25, 2022

Copy link
Copy Markdown
Member

Adds OpenTelemetry collector by default and send traces through otel-collector, similar to #848 , except for pure-docker we opt to keep Jaeger as part of the default deployment for simplicity.

I've also updated the tags used here to release tags using tools/update-docker-tags.sh for testing - this old tool does not support "latest"-style versions, and sg ops update-images does not support pure-docker, so this gets us "close enough" in order to test the OpenTelemetry setup.

Closes https://github.com/sourcegraph/sourcegraph/issues/40455

Checklist

Test plan

pure-docker/deploy.sh

@sanderginn sanderginn left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

Comment on lines +7 to +8
if [ -e ~/sourcegraph-docker/zoekt-shared-disk ]; then
mv ~/sourcegraph-docker/zoekt-shared-disk ~/sourcegraph-docker/zoekt-$1-shared-disk

@sanderginn sanderginn Aug 26, 2022

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

F-

@bobheadxi bobheadxi marked this pull request as ready for review September 1, 2022 22:45
@bobheadxi bobheadxi requested a review from a team September 1, 2022 22:45
@bobheadxi bobheadxi merged commit 6d8ecf3 into master Sep 1, 2022
@bobheadxi bobheadxi deleted the pure-docker-otel-default branch September 1, 2022 22:45
@bobheadxi bobheadxi mentioned this pull request Sep 2, 2022
2 tasks
bobheadxi added a commit that referenced this pull request Sep 6, 2022
#849 took a conservative approach to sourcegraph/sourcegraph#40455 by keeping Jaeger around. I've since reached out to the only customer using this deployment mechanism (https://sourcegraph.slack.com/archives/C012V43N8E7/p1662138872279299) which indicates there is no strong interest in keeping Jaeger around, so this change removes it entirely.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

deploy-sourcegraph-docker: make Jaeger optional, always deploy otel-collector

2 participants