-
Notifications
You must be signed in to change notification settings - Fork 4.4k
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
xds: emit a labeled gauge of connected xDS streams by version #10243
Conversation
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, couple small some suggestions, nothing blocking
@@ -647,3 +660,23 @@ func runStep(t *testing.T, name string, fn func(t *testing.T)) { | |||
t.FailNow() | |||
} | |||
} | |||
|
|||
func requireProtocolVersionGauge( |
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.
Do you expect that we will call this from other places? Right now it's only called from one place so it might be good to keep it next to the one call site.
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's called in two places: server_test.go
and delta_test.go
for v2 and v3 respectively.
🤔 This PR has changes in the |
🍒 If backport labels were added before merging, cherry-picking will start automatically. To retroactively trigger a backport after merging, add backport labels and re-run https://circleci.com/gh/hashicorp/consul/369442. |
🍒✅ Cherry pick of commit ede14b7 onto |
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.
Other than that one question, looks good to me
@@ -141,6 +150,36 @@ type Server struct { | |||
AuthCheckFrequency time.Duration | |||
|
|||
DisableV2Protocol bool | |||
|
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.
Am I correct in assuming that there can only be one Server instance per host? Do we run multiple servers on different ports or anything like that?
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.
There is exactly one xDS server per consul agent.
Fixes #10099