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.

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

Fix Jaeger ports for HTTP tracing #1128

Merged
merged 2 commits into from
Dec 19, 2024
Merged

Conversation

marcleblanc2
Copy link
Contributor

@marcleblanc2 marcleblanc2 commented Dec 19, 2024

Updating Docker repo to match the fix in the Helm repo from a few months ago, so that otel-collector is sending trace data to Jaeger on the same port that Jaeger is listening on.

Checklist

  • Sister deploy-sourcegraph change:
  • Sister customer-replica change (if necessary, for any changes affecting pure-docker or configuration):
  • All images have a valid tag and SHA256 sum

Test plan

Tested manually

docker-compose -f docker-compose.yaml -f jaeger/docker-compose.yaml -f override.yaml up -d --remove-orphans

@marcleblanc2 marcleblanc2 marked this pull request as ready for review December 19, 2024 08:04
@marcleblanc2 marcleblanc2 enabled auto-merge (squash) December 19, 2024 08:04
@marcleblanc2 marcleblanc2 requested review from Chickensoupwithrice and a team December 19, 2024 08:04
@marcleblanc2
Copy link
Contributor Author

Build is failing with:

docker-test: toomanyrequests: You have reached your pull rate limit. You may increase the limit by authenticating and upgrading: https://www.docker.com/increase-rate-limit

Not likely a blocker for merging this fix.

Copy link
Contributor

@DaedalusG DaedalusG left a comment

Choose a reason for hiding this comment

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

Ahh nice catch I remember this in helm

@marcleblanc2 marcleblanc2 merged commit 74c9bff into main Dec 19, 2024
5 checks passed
@marcleblanc2 marcleblanc2 deleted the ml/fix-jaeger-ports-for-tracing branch December 19, 2024 17:41
@sourcegraph-release-bot
Copy link
Collaborator

The backport to 5.11.x failed at https://github.com/sourcegraph/deploy-sourcegraph-docker/actions/runs/12417929393:

The process '/usr/bin/git' failed with exit code 128

To backport this PR manually, you can either:

Via the sg tool

Use the sg backport command to backport your commit to the release branch.

sg backport -r 5.11.x -p 1128
Via your terminal

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-5.11.x 5.11.x
# Navigate to the new working tree
cd .worktrees/backport-5.11.x
# Create a new branch
git switch --create backport-1128-to-5.11.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 74c9bff00e62304ba9aac231130ccd91fdad8da0
# Push it to GitHub
git push --set-upstream origin backport-1128-to-5.11.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-5.11.x

If you encouter conflict, first resolve the conflict and stage all files, then run the commands below:

git cherry-pick --continue
# Push it to GitHub
git push --set-upstream origin backport-1128-to-5.11.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-5.11.x
  • Follow above instructions to backport the commit.
  • Create a pull request where the base branch is 5.11.x and the compare/head branch is backport-1128-to-5.11.x., click here to create the pull request.

Once the pull request has been created, please ensure the following:

  • Make sure to tag @sourcegraph/release in the pull request description.

  • kindly remove the release-blocker from this pull request.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants