stat_sinks: remove well_known_names

[daixiang0]

Signed-off-by: Long Dai [email protected]

Commit Message:

Remove well_known_names in stat_sinks field, part of #7238

Additional Description:
Additional Description:
Risk Level: Low
Testing: functional
Docs Changes:
Release Notes:
Platform Specific Features:
[Optional Runtime guard:]
[Optional Fixes #Issue]
[Optional Deprecated:]
[Optional API Considerations:]

[jmarantz]

@envoyproxy/senior-maintainers

[mattklein123]

Please merge main.

/wait

[daixiang0]

@mattklein123 done, sorry for rebase :(

[jmarantz]

In the future, please try to avoid force-pushing in Envoy PRs; it makes it harder to follow the comment history.

[daixiang0]

@jmarantz I would take care of it, thanks for review!

[jmarantz]

Don't rebase either. Below is what I do. I have to admit I am using git in the most basic way. I stay on a narrow path that limits me quite a bit in taking advantage of what git can do, but it seems to work for me :)

This is a script I call git-sync.

#!/bin/sh

function die() {
    echo $@
    exit 1
}

git status | grep -q "nothing to commit" || die "Uncommitted changes exist"

branch=$(git status|head -1|cut -f3 -d\ )
git checkout main
git fetch upstream
git reset --hard upstream/main
git push origin main --force --no-verify
git checkout "$branch"
git merge main

Why is this mess better than rebase/force-push? I don't know the answer to that deep question, except that rebase/force-push is very unfriendly to the github review flow, and the above works fine for me.

[daixiang0]

Good script! I will do it. Thank you a lot @jmarantz

Update, since the last merge push, my commit log becomes wired :(
Even with your script, still cover others' commits.

I would fix it by force push to remove others' commits, sorry again!

[jmarantz]

/wait

[jmarantz]

/wait

[jmarantz]

/wait