github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 18:24:07 +00:00
Code Issues Projects Releases Wiki Activity

REST Client metrics capture grows unbounded

Browse Source 
The URLs were unique by namespace and query parameter value, which means
an infinite number of metrics counters could be created.
This commit is contained in:
Clayton Coleman 2015-06-10 12:52:28 -04:00
parent 629237bbb7
commit bdbf477207
2 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/client/request.go
View File

@ -530,12 +530,25 @@ func (r *Request) URL() *url.URL {
return finalURL return finalURL
} }
// finalURLTemplate is similar to URL(), but if the request contains name of an object // finalURLTemplate is similar to URL(), but will make all specific parameter values equal
// (e.g. GET for a specific Pod) it will be substited with "<name>". // - instead of name or namespace, "{name}" and "{namespace}" will be used, and all query
func (r *Request) finalURLTemplate() string { // parameters will be reset. This creates a copy of the request so as not to change the
// underyling object. This means some useful request info (like the types of field
// selectors in use) will be lost.
// TODO: preserve field selector keys
func (r Request) finalURLTemplate() string {
if len(r.resourceName) != 0 { if len(r.resourceName) != 0 {
r.resourceName = "<name>" r.resourceName = "{name}"
} }
if r.namespaceSet && len(r.namespace) != 0 {
r.namespace = "{namespace}"
}
newParams := url.Values{}
v := []string{"{value}"}
for k := range r.params {
newParams[k] = v
}
r.params = newParams
return r.URL().String() return r.URL().String()
} }

18
pkg/client/request_test.go
View File

@ -215,6 +215,24 @@ func TestResultIntoWithErrReturnsErr(t *testing.T) {
} }
} }
func TestURLTemplate(t *testing.T) {
uri, _ := url.Parse("http://localhost")
r := NewRequest(nil, "POST", uri, "test", nil, false, false)
r.Prefix("pre1").Resource("r1").Namespace("ns").Name("nm").Param("p0", "v0")
full := r.URL()
if full.String() != "http://localhost/pre1/namespaces/ns/r1/nm?p0=v0" {
t.Errorf("unexpected initial URL: %s", full)
}
actual := r.finalURLTemplate()
expected := "http://localhost/pre1/namespaces/%7Bnamespace%7D/r1/%7Bname%7D?p0=%7Bvalue%7D"
if actual != expected {
t.Errorf("unexpected URL template: %s %s", actual, expected)
}
if r.URL().String() != full.String() {
t.Errorf("creating URL template changed request: %s -> %s", full.String(), r.URL().String())
}
}
func TestTransformResponse(t *testing.T) { func TestTransformResponse(t *testing.T) {
invalid := []byte("aaaaa") invalid := []byte("aaaaa")
uri, _ := url.Parse("http://localhost") uri, _ := url.Parse("http://localhost")