Use structured logging

Author: mrueg

internal/store/builder.go

@@ -493,7 +493,7 @@ func (b *Builder) buildStores(
 			composedMetricGenFuncs,
 		)
 		if b.fieldSelectorFilter != "" {
-			klog.Infof("FieldSelector is used %s", b.fieldSelectorFilter)
+			klog.InfoS("FieldSelector is used", "fieldSelector", b.fieldSelectorFilter)
 		}
 		listWatcher := listWatchFunc(b.kubeClient, v1.NamespaceAll, b.fieldSelectorFilter)
 		b.startReflector(expectedType, store, listWatcher, useAPIServerCache)
@@ -507,7 +507,7 @@ func (b *Builder) buildStores(
 			composedMetricGenFuncs,
 		)
 		if b.fieldSelectorFilter != "" {
-			klog.Infof("FieldSelector is used %s", b.fieldSelectorFilter)
+			klog.InfoS("FieldSelector is used", "fieldSelector", b.fieldSelectorFilter)
 		}
 		listWatcher := listWatchFunc(b.kubeClient, ns, b.fieldSelectorFilter)
 		b.startReflector(expectedType, store, listWatcher, useAPIServerCache)
@@ -540,7 +540,7 @@ func (b *Builder) buildCustomResourceStores(resourceName string,
 			composedMetricGenFuncs,
 		)
 		if b.fieldSelectorFilter != "" {
-			klog.Infof("FieldSelector is used %s", b.fieldSelectorFilter)
+			klog.InfoS("FieldSelector is used", "fieldSelector", b.fieldSelectorFilter)
 		}
 		listWatcher := listWatchFunc(customResourceClient, v1.NamespaceAll, b.fieldSelectorFilter)
 		b.startReflector(expectedType, store, listWatcher, useAPIServerCache)
@@ -553,7 +553,7 @@ func (b *Builder) buildCustomResourceStores(resourceName string,
 			familyHeaders,
 			composedMetricGenFuncs,
 		)
-		klog.Infof("FieldSelector is used %s", b.fieldSelectorFilter)
+		klog.InfoS("FieldSelector is used", "fieldSelector", b.fieldSelectorFilter)
 		listWatcher := listWatchFunc(customResourceClient, ns, b.fieldSelectorFilter)
 		b.startReflector(expectedType, store, listWatcher, useAPIServerCache)
 		stores = append(stores, store)

internal/wrapper.go

@@ -56,7 +56,7 @@ func RunKubeStateMetricsWrapper(opts *options.Options) {
 			klog.FlushAndExit(klog.ExitFlushTimeout, 1)
 		}
 		cfgViper.OnConfigChange(func(e fsnotify.Event) {
-			klog.Infof("Changes detected: %s\n", e.Name)
+			klog.InfoS("Changes detected", "name", e.Name)
 			cancel()
 			// Wait for the ports to be released.
 			<-time.After(3 * time.Second)
@@ -86,7 +86,7 @@ func RunKubeStateMetricsWrapper(opts *options.Options) {
 			klog.FlushAndExit(klog.ExitFlushTimeout, 1)
 		}
 		crcViper.OnConfigChange(func(e fsnotify.Event) {
-			klog.Infof("Changes detected: %s\n", e.Name)
+			klog.InfoS("Changes detected", "name", e.Name)
 			cancel()
 			// Wait for the ports to be released.
 			<-time.After(3 * time.Second)
@@ -95,7 +95,7 @@ func RunKubeStateMetricsWrapper(opts *options.Options) {
 		})
 		crcViper.WatchConfig()
 	}
-	klog.Infoln("Starting kube-state-metrics")
+	klog.InfoS("Starting kube-state-metrics")
 	KSMRunOrDie(ctx)
 	select {}
 }

pkg/app/server.go

@@ -132,10 +132,10 @@ func RunKubeStateMetrics(ctx context.Context, opts *options.Options) error {
 		if err != nil {
 			// DO NOT end the process.
 			// We want to allow the user to still be able to fix the misconfigured config (redeploy or edit the configmaps) and reload KSM automatically once that's done.
-			klog.Warningf("failed to unmarshal opts config file: %v", err)
+			klog.ErrorS(err, "failed to unmarshal opts config file")
 			// Wait for the next reload.
-			klog.Infof("misconfigured config detected, KSM will automatically reload on next write to the config")
-			klog.Infof("waiting for config to be fixed")
+			klog.InfoS("misconfigured config detected, KSM will automatically reload on next write to the config")
+			klog.InfoS("waiting for config to be fixed")
 			configSuccess.WithLabelValues("config", filepath.Clean(got)).Set(0)
 			<-ctx.Done()
 		} else {