kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #111109 from azylinski/apf-seats-httplog 

Always log APF WorkEstimate params in kube-apiserver http logs

Kubernetes-commit: 08f9125cb0af732e45301b62ff3676dfccd3efbc
This commit is contained in:
Kubernetes Publisher 2022-07-13 22:51:03 -07:00
parent c540a4b65f 87b03dd4f5
commit a561ed6783
3 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
go.mod
View File

@ -39,8 +39,8 @@ require (
gopkg.in/natefinch/lumberjack.v2 v2.0.0
gopkg.in/square/go-jose.v2 v2.2.2
k8s.io/api v0.0.0-20220709052054-b9bd7327add9
k8s.io/apimachinery v0.0.0-20220713051826-0897ed8d5be4
k8s.io/client-go v0.0.0-20220713092258-eabd4289b05a
k8s.io/apimachinery v0.0.0-20220714010307-51e28bce4230
k8s.io/client-go v0.0.0-20220714012324-79a582f2eb0c
k8s.io/component-base v0.0.0-20220708012912-0c18104097b2
k8s.io/klog/v2 v2.70.1
k8s.io/kube-openapi v0.0.0-20220627174259-011e075b9cb8
@ -120,7 +120,7 @@ require (
replace (
k8s.io/api => k8s.io/api v0.0.0-20220709052054-b9bd7327add9
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220713051826-0897ed8d5be4
k8s.io/client-go => k8s.io/client-go v0.0.0-20220713092258-eabd4289b05a
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220714010307-51e28bce4230
k8s.io/client-go => k8s.io/client-go v0.0.0-20220714012324-79a582f2eb0c
k8s.io/component-base => k8s.io/component-base v0.0.0-20220708012912-0c18104097b2
)

8
go.sum
View File

@ -961,10 +961,10 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20220709052054-b9bd7327add9 h1:FEAp0lzAf22GNplJSRIT174/pN71JLVsgVQGdB5OPVo=
k8s.io/api v0.0.0-20220709052054-b9bd7327add9/go.mod h1:mu5fbjml8u+WuYagoAcCQ+yMPxydoFY51dJq/r0+XtY=
k8s.io/apimachinery v0.0.0-20220713051826-0897ed8d5be4 h1:kh78v75M4kX6pOs8MywC8OcEoM6zSsDw1eI4h+9Zm0k=
k8s.io/apimachinery v0.0.0-20220713051826-0897ed8d5be4/go.mod h1:0qktsm8TIQ7Y3rLpUe4SLWy+3L6Su5aSoIQxgqO+4ks=
k8s.io/client-go v0.0.0-20220713092258-eabd4289b05a h1:28QZKnL5AuZ0ydlEVVox50bQJK5OCpZM72Uok/RSxGk=
k8s.io/client-go v0.0.0-20220713092258-eabd4289b05a/go.mod h1:9967awjcRisZcU0mvMZU8jsmu4ADkap83mMW1W90J6Q=
k8s.io/apimachinery v0.0.0-20220714010307-51e28bce4230 h1:LooH+FjqTJcmtMoLbKLzsqFGn7UZD+0YAoE6V3ZmXuE=
k8s.io/apimachinery v0.0.0-20220714010307-51e28bce4230/go.mod h1:0qktsm8TIQ7Y3rLpUe4SLWy+3L6Su5aSoIQxgqO+4ks=
k8s.io/client-go v0.0.0-20220714012324-79a582f2eb0c h1:zLWWod6rVqaKfNVAOBOkK+/XW++aCB1YEdw8n8y56Qk=
k8s.io/client-go v0.0.0-20220714012324-79a582f2eb0c/go.mod h1:77l2Dh8sr+zw8KpQlBChe2RI1N0JUXHgpvm41UIF9aI=
k8s.io/component-base v0.0.0-20220708012912-0c18104097b2 h1:i/NAc1GPbb9K0mNSmWgCcypLgdAaZDA2AaEmsgToZ1k=
k8s.io/component-base v0.0.0-20220708012912-0c18104097b2/go.mod h1:A317728y0vr7wsXWgOx/6mLQK4u1LPJLYIfPinXNvXk=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=

12
pkg/server/filters/priority-and-fairness.go
View File

@ -125,14 +125,10 @@ func WithPriorityAndFairness(
workEstimate := workEstimator(r, classification.FlowSchemaName, classification.PriorityLevelName)
fcmetrics.ObserveWorkEstimatedSeats(classification.PriorityLevelName, classification.FlowSchemaName, workEstimate.MaxSeats())
// nolint:logcheck // Not using the result of klog.V
// inside the if branch is okay, we just use it to
// determine whether the additional information should
// be added.
if klog.V(4).Enabled() {
httplog.AddKeyValue(ctx, "apf_iseats", workEstimate.InitialSeats)
httplog.AddKeyValue(ctx, "apf_fseats", workEstimate.FinalSeats)
}
httplog.AddKeyValue(ctx, "apf_iseats", workEstimate.InitialSeats)
httplog.AddKeyValue(ctx, "apf_fseats", workEstimate.FinalSeats)
httplog.AddKeyValue(ctx, "apf_additionalLatency", workEstimate.AdditionalLatency)
return workEstimate
}