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

telemetrygateway: add external URL to instance identifier #59014

Merged
merged 1 commit into from Dec 15, 2023

Conversation

bobheadxi
Copy link
Member

@bobheadxi bobheadxi commented Dec 14, 2023

This change adds the external URL to the exported events payload. We send it once at the beginning of the stream as part of the stream metadata, and in Telemetry Gateway this gets joined onto each event payload, per request: https://sourcegraph.slack.com/archives/C05BGNBEPKL/p1702584292491359?thread_ts=1702583517.559349&cid=C05BGNBEPKL

Test plan

Unit tests

Preview 🤩

Preview Link

@cla-bot cla-bot bot added the cla-signed label Dec 14, 2023
@bobheadxi bobheadxi marked this pull request as ready for review December 14, 2023 20:16
@bobheadxi bobheadxi added backport 5.2 backport/improvement Final touching of existing features labels Dec 14, 2023
@bobheadxi bobheadxi merged commit 172cbe3 into main Dec 15, 2023
22 checks passed
@bobheadxi bobheadxi deleted the telemetry-v2-external-url branch December 15, 2023 18:52
@sourcegraph-release-guild-bot
Copy link
Collaborator

The backport to 5.2 failed at https://github.com/sourcegraph/sourcegraph/actions/runs/7225925130:

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

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.2 5.2
# Navigate to the new working tree
cd .worktrees/backport-5.2
# Create a new branch
git switch --create backport-59014-to-5.2
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 172cbe3711fd2e0e2c75ebb88c2153526028e4e1
# Push it to GitHub
git push --set-upstream origin backport-59014-to-5.2
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-5.2

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-59014-to-5.2
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-5.2
  • Follow above instructions to backport the commit.
  • Create a pull request where the base branch is 5.2 and the compare/head branch is backport-59014-to-5.2., click here to create the pull request.
  • Make sure to tag @sourcegraph/release-guild in the pull request description.
  • Once the backport pull request is created, kindly remove the release-blocker from this pull request.

@sourcegraph-release-guild-bot sourcegraph-release-guild-bot added backports failed-backport-to-5.2 release-blocker Prevents us from releasing: https://about.sourcegraph.com/handbook/engineering/releases labels Dec 15, 2023
bobheadxi added a commit that referenced this pull request Dec 15, 2023
This change adds the external URL to the exported events payload. We send it once at the beginning of the stream as part of the stream metadata, and in Telemetry Gateway this gets joined onto each event payload, per request: https://sourcegraph.slack.com/archives/C05BGNBEPKL/p1702584292491359?thread_ts=1702583517.559349&cid=C05BGNBEPKL

(cherry picked from commit 172cbe3)
@bobheadxi bobheadxi removed the release-blocker Prevents us from releasing: https://about.sourcegraph.com/handbook/engineering/releases label Dec 15, 2023
@varungandhi-src varungandhi-src mentioned this pull request Jan 16, 2024
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.

None yet

3 participants