@@ -21,6 +21,7 @@ import (
2121 "crypto/md5" //nolint:gosec
2222 "encoding/binary"
2323 "fmt"
24+ "log/slog"
2425 "net"
2526 "net/http"
2627 "net/http/pprof"
@@ -30,6 +31,8 @@ import (
3031 "strings"
3132 "time"
3233
34+ "github.com/go-logr/logr"
35+
3336 "gopkg.in/yaml.v3"
3437 "k8s.io/client-go/kubernetes"
3538 _ "k8s.io/client-go/plugin/pkg/client/auth" // Initialize common client auth plugins.
@@ -66,19 +69,6 @@ const (
6669 readyzPath = "/readyz"
6770)
6871
69- // promLogger implements promhttp.Logger
70- type promLogger struct {}
71-
72- func (pl promLogger ) Println (v ... interface {}) {
73- klog .Error (v ... )
74- }
75-
76- // promLogger implements the Logger interface
77- func (pl promLogger ) Log (v ... interface {}) error {
78- klog .Info (v ... )
79- return nil
80- }
81-
8272// RunKubeStateMetricsWrapper runs KSM with context cancellation.
8373func RunKubeStateMetricsWrapper (ctx context.Context , opts * options.Options ) error {
8474 err := RunKubeStateMetrics (ctx , opts )
@@ -93,7 +83,6 @@ func RunKubeStateMetricsWrapper(ctx context.Context, opts *options.Options) erro
9383// Any out-of-tree custom resource metrics could be registered by newing a registry factory
9484// which implements customresource.RegistryFactory and pass all factories into this function.
9585func RunKubeStateMetrics (ctx context.Context , opts * options.Options ) error {
96- promLogger := promLogger {}
9786 ksmMetricsRegistry := prometheus .NewRegistry ()
9887 ksmMetricsRegistry .MustRegister (versionCollector .NewCollector ("kube_state_metrics" ))
9988 durationVec := promauto .With (ksmMetricsRegistry ).NewHistogramVec (
@@ -361,11 +350,14 @@ func RunKubeStateMetrics(ctx context.Context, opts *options.Options) error {
361350 WebConfigFile : & tlsConfig ,
362351 }
363352
353+ handler := logr .ToSlogHandler (klog .Background ())
354+ sLogger := slog .New (handler )
355+
364356 // Run Telemetry server
365357 {
366358 g .Add (func () error {
367359 klog .InfoS ("Started kube-state-metrics self metrics server" , "telemetryAddress" , telemetryListenAddress )
368- return web .ListenAndServe (& telemetryServer , & telemetryFlags , promLogger )
360+ return web .ListenAndServe (& telemetryServer , & telemetryFlags , sLogger )
369361 }, func (error ) {
370362 ctxShutDown , cancel := context .WithTimeout (ctx , 3 * time .Second )
371363 defer cancel ()
@@ -376,7 +368,7 @@ func RunKubeStateMetrics(ctx context.Context, opts *options.Options) error {
376368 {
377369 g .Add (func () error {
378370 klog .InfoS ("Started metrics server" , "metricsServerAddress" , metricsServerListenAddress )
379- return web .ListenAndServe (& metricsServer , & metricsFlags , promLogger )
371+ return web .ListenAndServe (& metricsServer , & metricsFlags , sLogger )
380372 }, func (error ) {
381373 ctxShutDown , cancel := context .WithTimeout (ctx , 3 * time .Second )
382374 defer cancel ()
@@ -395,8 +387,11 @@ func RunKubeStateMetrics(ctx context.Context, opts *options.Options) error {
395387func buildTelemetryServer (registry prometheus.Gatherer ) * http.ServeMux {
396388 mux := http .NewServeMux ()
397389
390+ handler := logr .ToSlogHandler (klog .Background ())
391+ sLogger := slog .NewLogLogger (handler , slog .LevelError )
392+
398393 // Add metricsPath
399- mux .Handle (metricsPath , promhttp .HandlerFor (registry , promhttp.HandlerOpts {ErrorLog : promLogger {} }))
394+ mux .Handle (metricsPath , promhttp .HandlerFor (registry , promhttp.HandlerOpts {ErrorLog : sLogger }))
400395
401396 // Add readyzPath
402397 mux .Handle (readyzPath , http .HandlerFunc (func (w http.ResponseWriter , _ * http.Request ) {
0 commit comments