Use /stats/summary for metrics handler #853
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ldx
added a commit
to elotl/kip
that referenced
this pull request
Jul 17, 2020
…09f4e24bb879404e2add887e106e472d8b
|
How about we add the metrics routes to the PodHandler? |
Sure, that's actually where it belongs. We'll have to thread the changes through node-cli, though. Let me refactor this to move the stats route into PodHandlerConfig as a first step. |
|
@cpuguy83 can you take another look now? |
cpuguy83
requested changes
Jul 22, 2020
node/api/server.go
Outdated
| // | ||
| // If the passed in handler func is nil this will create handlers which only | ||
| // serves http.StatusNotImplemented | ||
| func PodStatsSummaryHandler(f PodStatsSummaryHandlerFunc) http.Handler { |
There was a problem hiding this comment.
Let's not delete existing functions.
We can keep the old one for attaching to other
node/api/server.go
Outdated
| @@ -111,7 +98,7 @@ type PodMetricsConfig struct { | |||
| // Callers should take care to namespace the serve mux as they see fit, however | |||
| // these routes get called by the Kubernetes API server. | |||
| func AttachPodMetricsRoutes(p PodMetricsConfig, mux ServeMux) { | |||
| mux.Handle("/", InstrumentHandler(HandlePodStatsSummary(p.GetStatsSummary))) | |||
| mux.Handle("/stats/summary", InstrumentHandler(HandlePodStatsSummary(p.GetStatsSummary))) | |||
There was a problem hiding this comment.
This should remain as is.
If both the metrics routes and the pod routes are attached to the same mux with the pattern "/", it will panic. Instead, add the stats handler function to PodHandlerConfig and set up the route if it is not nil.
cpuguy83
reviewed
Jul 23, 2020
| @@ -64,6 +65,13 @@ func PodHandler(p PodHandlerConfig, debug bool) http.Handler { | |||
| WithExecStreamIdleTimeout(p.StreamIdleTimeout), | |||
| ), | |||
| ).Methods("POST", "GET") | |||
|
|
|||
| if p.GetStatsSummary != nil { | |||
There was a problem hiding this comment.
Just a nit, HandlePotStatsSummary will return a NotImplemented handler if this is nil anyway.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
To allow users to attach both the pod and metrics handlers to the same mux, use "/stats/summary" as the pattern in AttachPodMetricsRoutes. Otherwise, if mux.Handle() is called again for the same pattern, it will panic, and this is what happens in node-cli due to virtual-kubelet/node-cli#27 calling both AttachPodRoutes() AttachPodMetricsRoutes() with the same mux.