Merge pull request #134155 from serathius/gzip-benchmark

Improve BenchmarkSerializeObject benchmark Kubernetes-commit: f24a967c42e5f211356561bb8073b0e28fa5b81d

Author: k8s-publishing-bot

go.mod

@@ -50,8 +50,8 @@ require (
 gopkg.in/go-jose/go-jose.v2 v2.6.3
 gopkg.in/natefinch/lumberjack.v2 v2.2.1
 k8s.io/api v0.0.0-20250922192300-863819f1e8a7
-k8s.io/apimachinery v0.0.0-20250919032000-da5b06e2fb66
-k8s.io/client-go v0.0.0-20250919032728-7b6fbf8e600b
+k8s.io/apimachinery v0.0.0-20250924032039-65724d7f3dbd
+k8s.io/client-go v0.0.0-20250924032830-6cf045f1f42f
 k8s.io/component-base v0.0.0-20250919034137-4453c3be72a8
 k8s.io/klog/v2 v2.130.1
 k8s.io/kms v0.0.0-20250918004306-2fba1b2102ee

go.sum

@@ -297,10 +297,10 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 k8s.io/api v0.0.0-20250922192300-863819f1e8a7 h1:8dwSssHFKuaxv5A+OSlzYcgmWF5vvcH4dMhpJvuAu9I=
 k8s.io/api v0.0.0-20250922192300-863819f1e8a7/go.mod h1:TOlAUK/2fXrUHaNvBKydwYAc1gMMrwBVJFbcIFXW3CU=
-k8s.io/apimachinery v0.0.0-20250919032000-da5b06e2fb66 h1:jIXLLhQbRs/pl4lqaNMthm/HwXQDjtcp218CAvDxtAw=
-k8s.io/apimachinery v0.0.0-20250919032000-da5b06e2fb66/go.mod h1:1YSL0XujdSTcnuHOR73D16EdW+d49JOdd8TXjCo6Dhc=
-k8s.io/client-go v0.0.0-20250919032728-7b6fbf8e600b h1:0xDtcVt6WdAfDwq7WKqtrturodHMfXYGqy9Dmpfq21o=
-k8s.io/client-go v0.0.0-20250919032728-7b6fbf8e600b/go.mod h1:rLgoyEtcTRxWqVKIaf6XVmq0rmsJCAHJDZwqMGoaaK4=
+k8s.io/apimachinery v0.0.0-20250924032039-65724d7f3dbd h1:7GqbvrpiPpizvleF0yu9ZDT0n6tUKfNcRPjCYc3wydw=
+k8s.io/apimachinery v0.0.0-20250924032039-65724d7f3dbd/go.mod h1:1YSL0XujdSTcnuHOR73D16EdW+d49JOdd8TXjCo6Dhc=
+k8s.io/client-go v0.0.0-20250924032830-6cf045f1f42f h1:mwRRbgglGHu8C02K/nxPdoSMfaJkFPK2M8ny04AawV0=
+k8s.io/client-go v0.0.0-20250924032830-6cf045f1f42f/go.mod h1:n+gkrdm8vty6JF2DDKIt84Fas77bPOuYaaOq15Tn3bI=
 k8s.io/component-base v0.0.0-20250919034137-4453c3be72a8 h1:6ori9Hm1g6OqXGZa9ihRpScRfwRnVwf0PpqzTu2KCl0=
 k8s.io/component-base v0.0.0-20250919034137-4453c3be72a8/go.mod h1:k2hnvURL10Hd0tc/Tn7RZprCv4tlRGtDqYD3GSRo/NE=
 k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=

pkg/endpoints/handlers/responsewriters/writers_test.go

@@ -709,51 +709,59 @@ func toJSON(b *testing.B, list *v1.PodList) []byte {
 return out
 }
 
-func benchmarkSerializeObject(b *testing.B, payload []byte) {
-input, output := len(payload), len(gzipContent(payload, defaultGzipContentEncodingLevel))
-b.Logf("Payload size: %d, expected output size: %d, ratio: %.2f", input, output, float64(output)/float64(input))
-
+func benchmarkSerializeObject(b *testing.B, payload []byte, gzip bool) {
 req := &http.Request{
-Header: http.Header{
-"Accept-Encoding": []string{"gzip"},
-},
 URL: &url.URL{Path: "/path"},
 }
+if gzip {
+req.Header = http.Header{
+"Accept-Encoding": []string{"gzip"},
+}
+}
+
 featuregatetesting.SetFeatureGateDuringTest(b, utilfeature.DefaultFeatureGate, features.APIResponseCompression, true)
 
 encoder := &fakeEncoder{
 buf: payload,
 }
 
 b.ResetTimer()
-for i := 0; i < b.N; i++ {
+responseBytesTotal := 0
+for b.Loop() {
 recorder := httptest.NewRecorder()
 SerializeObject("application/json", encoder, recorder, req, http.StatusOK, nil /* object */)
 result := recorder.Result()
 if result.StatusCode != http.StatusOK {
 b.Fatalf("incorrect status code: got %v; want: %v", result.StatusCode, http.StatusOK)
 }
+responseBytesTotal += recorder.Body.Len()
 }
+b.ReportMetric(float64(responseBytesTotal/b.N), "writtenBytes/op")
 }
 
-func BenchmarkSerializeObject1000PodsPB(b *testing.B) {
-benchmarkSerializeObject(b, toProtoBuf(b, benchmarkItems(b, "testdata/pod.json", 1000)))
-}
-func BenchmarkSerializeObject10000PodsPB(b *testing.B) {
-benchmarkSerializeObject(b, toProtoBuf(b, benchmarkItems(b, "testdata/pod.json", 10000)))
-}
-func BenchmarkSerializeObject100000PodsPB(b *testing.B) {
-benchmarkSerializeObject(b, toProtoBuf(b, benchmarkItems(b, "testdata/pod.json", 100000)))
-}
-
-func BenchmarkSerializeObject1000PodsJSON(b *testing.B) {
-benchmarkSerializeObject(b, toJSON(b, benchmarkItems(b, "testdata/pod.json", 1000)))
-}
-func BenchmarkSerializeObject10000PodsJSON(b *testing.B) {
-benchmarkSerializeObject(b, toJSON(b, benchmarkItems(b, "testdata/pod.json", 10000)))
-}
-func BenchmarkSerializeObject100000PodsJSON(b *testing.B) {
-benchmarkSerializeObject(b, toJSON(b, benchmarkItems(b, "testdata/pod.json", 100000)))
+func BenchmarkSerializeObject(b *testing.B) {
+for _, count := range []int{1_000, 10_000, 100_000} {
+b.Run(fmt.Sprintf("Count=%d", count), func(b *testing.B) {
+medias := []struct {
+name string
+convert func(*testing.B, *v1.PodList) []byte
+}{
+{"Json", toJSON},
+{"Protobuf", toProtoBuf},
+}
+podList := benchmarkItems(b, "testdata/pod.json", count)
+for _, media := range medias {
+b.Run(fmt.Sprintf("MediaType=%s", media.name), func(b *testing.B) {
+payload := media.convert(b, podList)
+for _, gzip := range []bool{true, false} {
+b.Run(fmt.Sprintf("Compression=%v", gzip), func(b *testing.B) {
+benchmarkSerializeObject(b, payload, gzip)
+})
+}
+})
+}
+})
+}
 }
 
 type fakeResponseRecorder struct {