Add subresource to apiserver tracing

This commit is contained in:
HirazawaUi 2023-09-03 21:37:13 +08:00
parent bcb59a03eb
commit c83eb6dcaa
3 changed files with 31 additions and 0 deletions

View File

@ -131,6 +131,24 @@ func (lazy *lazyName) String() string {
return "unknown"
}
// lazySubresource implements String() string and it will
// lazily get Group from request info.
type lazySubresource struct {
req *http.Request
}
func (lazy *lazySubresource) String() string {
if lazy.req != nil {
ctx := lazy.req.Context()
requestInfo, ok := apirequest.RequestInfoFrom(ctx)
if ok {
return requestInfo.Subresource
}
}
return "unknown"
}
// lazyAuditID implements Stringer interface to lazily retrieve
// the audit ID associated with the request.
type lazyAuditID struct {

View File

@ -121,6 +121,18 @@ func TestLazyName(t *testing.T) {
assert.Equal(t, "jaeger-76d45d6876-vqp8t", fmt.Sprintf("%v", scopeWithReq))
}
func TestLazySubresource(t *testing.T) {
assert.Equal(t, "unknown", fmt.Sprintf("%v", &lazySubresource{}))
scopeWithEmptyReq := &lazySubresource{&http.Request{}}
assert.Equal(t, "unknown", fmt.Sprintf("%v", scopeWithEmptyReq))
req := &http.Request{}
ctx := request.WithRequestInfo(context.TODO(), &request.RequestInfo{Subresource: "binding"})
scopeWithReq := &lazySubresource{req: req.WithContext(ctx)}
assert.Equal(t, "binding", fmt.Sprintf("%v", scopeWithReq))
}
func TestLazyResource(t *testing.T) {
assert.Equal(t, "unknown", fmt.Sprintf("%v", &lazyResource{}))

View File

@ -30,6 +30,7 @@ func traceFields(req *http.Request) []attribute.KeyValue {
attribute.Stringer("api-group", &lazyAPIGroup{req: req}),
attribute.Stringer("api-version", &lazyAPIVersion{req: req}),
attribute.Stringer("name", &lazyName{req: req}),
attribute.Stringer("subresource", &lazySubresource{req: req}),
attribute.String("protocol", req.Proto),
attribute.Stringer("resource", &lazyResource{req: req}),
attribute.Stringer("scope", &lazyScope{req: req}),