github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-17 02:06:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #136282 from chaochn47/automated-cherry-pick-of-#135685-upstream-release-1.34

Browse Source 
Automated cherry pick of #135685: Bugfix: calculate request latency properly in audit log filter
This commit is contained in:
Kubernetes Prow Robot
2026-03-26 21:20:19 +05:30
committed by GitHub
parent 51ba107046 80c3d91f44
commit 808ebe63af
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
staging/src/k8s.io/apiserver/pkg/endpoints/filters/audit.go
View File

@@ -149,7 +149,6 @@ func evaluatePolicyAndCreateAuditEvent(req *http.Request, policy audit.PolicyRul
// writeLatencyToAnnotation writes the latency incurred in different
// layers of the apiserver to the annotations of the audit object.
// it should be invoked after ev.StageTimestamp has been set appropriately.
func writeLatencyToAnnotation(ctx context.Context) {
ac := audit.AuditContextFrom(ctx)
// we will track latency in annotation only when the total latency
@@ -157,7 +156,7 @@ func writeLatencyToAnnotation(ctx context.Context) {
// traces in rest/handlers for create, delete, update,
// get, list, and deletecollection.
const threshold = 500 * time.Millisecond
latency := ac.GetEventStageTimestamp().Sub(ac.GetEventRequestReceivedTimestamp().Time)
latency := time.Since(ac.GetEventRequestReceivedTimestamp().Time)
if latency <= threshold {
return
}

21
staging/src/k8s.io/apiserver/pkg/endpoints/filters/audit_test.go
View File

@@ -23,6 +23,7 @@ import (
"net/http/httptest"
"net/url"
"reflect"
"regexp"
"sync"
"testing"
"time"
@@ -224,7 +225,7 @@ func TestAudit(t *testing.T) {
shortRunningPath := "/api/v1/namespaces/default/pods/foo"
longRunningPath := "/api/v1/namespaces/default/pods?watch=true"
delay := 500 * time.Millisecond
delay := 501 * time.Millisecond
for _, test := range []struct {
desc string
@@ -351,6 +352,10 @@ func TestAudit(t *testing.T) {
Verb: "update",
RequestURI: shortRunningPath,
ResponseStatus: &metav1.Status{Code: 200},
Annotations: map[string]string{
"apiserver.latency.k8s.io/response-write": "^[0-9.]+[µnm]s$",
"apiserver.latency.k8s.io/total": "^[0-9.]+[µnm]s$",
},
},
},
true,
@@ -713,6 +718,7 @@ func TestAudit(t *testing.T) {
// simplified long-running check
return ri.Verb == "watch"
})
handler = WithLatencyTrackers(handler)
handler = WithAuditInit(handler)
req, _ := http.NewRequestWithContext(ctx, test.verb, test.path, nil)
@@ -772,6 +778,19 @@ func TestAudit(t *testing.T) {
if (event.ResponseStatus != nil) && (event.ResponseStatus.Code != expect.ResponseStatus.Code) {
t.Errorf("Unexpected status code : %d", event.ResponseStatus.Code)
}
for k, v := range expect.Annotations {
if actual, exists := event.Annotations[k]; !exists {
t.Errorf("Expect key %s in the annotations but it does not exist", k)
} else if matched, _ := regexp.MatchString(v, actual); !matched {
t.Errorf("Annotation %s value %q does not match regex %q", k, actual, v)
}
}
for k := range event.Annotations {
if _, exists := expect.Annotations[k]; !exists {
t.Errorf("Unexpected key %s in the annotations", k)
}
}
}
})
}