UPSTREAM: <carry>: add http logging for kubelet metrics endpoint

Author: tkashem

pkg/kubelet/server/server.go

@@ -474,15 +474,17 @@ func (s *Server) InstallAuthNotRequiredHandlers() {
 		r.RawMustRegister(metrics.NewPrometheusCollector(prometheusHostAdapter{s.host}, containerPrometheusLabelsFunc(s.host), includedMetrics, clock.RealClock{}, cadvisorOpts))
 	}
 	s.restfulCont.Handle(cadvisorMetricsPath,
-		compbasemetrics.HandlerFor(r, compbasemetrics.HandlerOpts{ErrorHandling: compbasemetrics.ContinueOnError}),
-	)
+		WithHTTPLogging(
+			compbasemetrics.HandlerFor(r, compbasemetrics.HandlerOpts{ErrorHandling: compbasemetrics.ContinueOnError}),
+		))
 
 	s.addMetricsBucketMatcher("metrics/resource")
 	resourceRegistry := compbasemetrics.NewKubeRegistry()
 	resourceRegistry.CustomMustRegister(collectors.NewResourceMetricsCollector(s.resourceAnalyzer))
 	s.restfulCont.Handle(resourceMetricsPath,
-		compbasemetrics.HandlerFor(resourceRegistry, compbasemetrics.HandlerOpts{ErrorHandling: compbasemetrics.ContinueOnError}),
-	)
+		WithHTTPLogging(
+			compbasemetrics.HandlerFor(resourceRegistry, compbasemetrics.HandlerOpts{ErrorHandling: compbasemetrics.ContinueOnError}),
+		))
 
 	// prober metrics are exposed under a different endpoint
 

pkg/kubelet/server/server_patch.go

@@ -0,0 +1,80 @@
+package server
+
+import (
+	"net/http"
+	"time"
+
+	"k8s.io/apiserver/pkg/audit"
+	"k8s.io/apiserver/pkg/endpoints/responsewriter"
+	"k8s.io/klog/v2"
+)
+
+func WithHTTPLogging(handler http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+		logger := &httpLogger{
+			req:       req,
+			w:         w,
+			startedAt: time.Now(),
+		}
+		defer logger.log()
+
+		w = responsewriter.WrapForHTTP1Or2(logger)
+		handler.ServeHTTP(w, req)
+	})
+}
+
+type httpLogger struct {
+	req *http.Request
+	w   http.ResponseWriter
+
+	startedAt      time.Time
+	statusRecorded bool
+	statusCode     int
+}
+
+var _ http.ResponseWriter = &httpLogger{}
+var _ responsewriter.UserProvidedDecorator = &httpLogger{}
+
+func (l *httpLogger) Unwrap() http.ResponseWriter {
+	return l.w
+}
+
+// Header implements http.ResponseWriter.
+func (l *httpLogger) Header() http.Header {
+	return l.w.Header()
+}
+
+// Write implements http.ResponseWriter.
+func (l *httpLogger) Write(b []byte) (int, error) {
+	if !l.statusRecorded {
+		l.record(http.StatusOK) // Default if WriteHeader hasn't been called
+	}
+	return l.w.Write(b)
+}
+
+// WriteHeader implements http.ResponseWriter.
+func (l *httpLogger) WriteHeader(status int) {
+	l.record(status)
+	l.w.WriteHeader(status)
+}
+
+func (l *httpLogger) record(status int) {
+	l.statusCode = status
+	l.statusRecorded = true
+}
+
+func (l *httpLogger) log() {
+	latency := time.Since(l.startedAt)
+	auditID := audit.GetAuditIDTruncated(l.req.Context())
+
+	kvs := []interface{}{
+		"method", l.req.Method,
+		"URI", l.req.RequestURI,
+		"latency", latency,
+		"userAgent", l.req.UserAgent(),
+		"audit-ID", auditID,
+		"srcIP", l.req.RemoteAddr,
+		"status", l.statusCode,
+	}
+	klog.V(1).InfoSDepth(1, "HTTP", kvs...)
+}