[8.18](backport #45944) chore: fix formatting issues in logp printf-style calls

auditbeat/helper/hasher/cached_hasher.go

@@ -126,7 +126,7 @@ func (ch *CachedHasher) HashFile(path string) (map[HashType]Digest, error) {
 	entry := hashEntry{hashes: hashes, statx: statx}
 	if ch.hashLRU.Add(path, entry) {
 		ch.stats.Evictions++
-		ch.log.Debugf("evict (%s)")
+		ch.log.Debugf("evict (%s)", path)
 	}
 
 	ch.log.Debugf("miss (%s) took %v", path, time.Since(x))

auditbeat/module/auditd/audit_linux.go

@@ -442,7 +442,7 @@ func (ms *MetricSet) updateKernelLostMetric(lost uint32) {
 		}
 		logFn("kernel lost events: %d (total: %d)", delta, lost)
 	} else {
-		ms.log.Warnf("kernel lost event counter reset from %d to %d", ms.kernelLost, lost)
+		ms.log.Warnf("kernel lost event counter reset from %d to %d", ms.kernelLost.counter, lost)
 	}
 	ms.kernelLost.counter = lost
 }

filebeat/autodiscover/builder/hints/logs.go

@@ -163,7 +163,7 @@ func (l *logHints) CreateConfig(event bus.Event, options ...ucfg.Option) []*conf
 		// Merge config template with the configs from the annotations
 		// AppendValues option is used to append arrays from annotations to existing arrays while merging
 		if err := config.MergeWithOpts(tempCfg, ucfg.AppendValues); err != nil {
-			l.log.Debugf("hints.builder", "config merge failed with error: %v", err)
+			l.log.Debugf("config merge failed with error: %v", err)
 			continue
 		}
 		module := l.getModule(hints)
@@ -193,11 +193,11 @@ func (l *logHints) CreateConfig(event bus.Event, options ...ucfg.Option) []*conf
 				moduleConf[fileset+".enabled"] = cfg.Enabled
 				moduleConf[fileset+".input"] = filesetConf
 
-				l.log.Debugf("hints.builder", "generated config %+v", moduleConf)
+				l.log.Debugf("generated config %+v", moduleConf)
 			}
 			config, _ = conf.NewConfigFrom(moduleConf)
 		}
-		l.log.Debugf("hints.builder", "generated config %+v of logHints %+v", config, l)
+		l.log.Debugf("generated config %+v of logHints %+v", config, l)
 		configs = append(configs, config)
 	}
 	// Apply information in event to the template to generate the final config

filebeat/input/filestream/copytruncate_prospector.go

@@ -280,7 +280,7 @@ func (p *copyTruncateFileProspector) onFSEvent(
 
 		err := updater.ResetCursor(src, state{Offset: 0})
 		if err != nil {
-			log.Errorf("failed to reset file cursor: %w", err)
+			log.Errorf("failed to reset file cursor: %v", err)
 		}
 		group.Restart(ctx, src)
 

filebeat/input/filestream/filestream.go

@@ -142,7 +142,7 @@ func (f *logFile) startFileMonitoringIfNeeded() {
 			return nil
 		})
 		if err != nil {
-			f.log.Errorf("failed to start file monitoring: %w", err)
+			f.log.Errorf("failed to start file monitoring: %v", err)
 		}
 	}
 
@@ -152,7 +152,7 @@ func (f *logFile) startFileMonitoringIfNeeded() {
 			return nil
 		})
 		if err != nil {
-			f.log.Errorf("failed to schedule a file close: %w", err)
+			f.log.Errorf("failed to schedule a file close: %v", err)
 		}
 	}
 }

filebeat/input/filestream/internal/input-logfile/harvester.go

@@ -140,7 +140,7 @@ func (hg *defaultHarvesterGroup) Start(ctx inputv2.Context, src Source) {
 
 	if err := hg.tg.Go(startHarvester(ctx, hg, src, false, hg.metrics)); err != nil {
 		ctx.Logger.Warnf(
-			"tried to start harvester with task group already closed",
+			"tried to start harvester for %s with task group already closed",
 			ctx.ID)
 	}
 }

filebeat/input/filestream/internal/input-logfile/publish.go

@@ -134,7 +134,7 @@ func (op *updateOp) Execute(store *store, n uint) {
 	} else {
 		err := typeconv.Convert(&resource.cursor, op.delta)
 		if err != nil {
-			store.log.Errorf("failed to perform type conversion: %w", err)
+			store.log.Errorf("failed to perform type conversion: %v", err)
 		}
 	}
 

filebeat/input/filestream/internal/input-logfile/update_writer.go

@@ -66,7 +66,7 @@ func newUpdateWriter(store *store, ch *updateChan) *updateWriter {
 		return nil
 	})
 	if err != nil {
-		store.log.Errorf("failed to schedule the update writer routine: %w", err)
+		store.log.Errorf("failed to schedule the update writer routine: %v", err)
 	}
 
 	return w
@@ -77,7 +77,7 @@ func newUpdateWriter(store *store, ch *updateChan) *updateWriter {
 func (w *updateWriter) Close() {
 	err := w.tg.Stop()
 	if err != nil {
-		w.store.log.Errorf("failed to stop the update writer routine: %w", err)
+		w.store.log.Errorf("failed to stop the update writer routine: %v", err)
 	}
 	w.syncStates(w.ch.TryRecv())
 }

filebeat/input/filestream/prospector.go

@@ -347,7 +347,7 @@ func (p *fileProspector) onRename(log *logp.Logger, ctx input.Context, fe loginp
 		err := s.FindCursorMeta(src, &meta)
 		if err != nil {
 			meta.IdentifierName = p.identifier.Name()
-			log.Warnf("Error while getting cursor meta data of entry '%s': '%w'"+
+			log.Warnf("Error while getting cursor meta data of entry '%s': '%v'"+
 				", using prospector's identifier: '%s'",
 				src.Name(), err, meta.IdentifierName)
 		}

filebeat/input/journald/input.go

@@ -215,7 +215,7 @@ func (inp *journald) Run(
 		if err := publisher.Publish(event, event.Private); err != nil {
 			msg := fmt.Sprintf("could not publish event: %s", err)
 			ctx.UpdateStatus(status.Failed, msg)
-			logger.Errorf(msg)
+			logger.Errorf("%s", msg)
 			return err
 		}
 	}

filebeat/input/log/input.go

@@ -96,7 +96,7 @@ func NewInput(
 	cleanupIfNeeded := func(f func() error) {
 		if cleanupNeeded {
 			if err := f(); err != nil {
-				logp.L().Named("input.log").Errorf("clean up function returned an error: %w", err)
+				logp.L().Named("input.log").Errorf("clean up function returned an error: %v", err)
 			}
 		}
 	}

filebeat/input/unix/input.go

@@ -119,7 +119,7 @@ func (s *server) Run(ctx input.Context, publisher stateless.Publisher) error {
 		return err
 	}
 
-	log.Debugf("%s Input '%v' initialized", s.config.Config.SocketType, ctx.ID)
+	log.Debugf("%v Input '%v' initialized", s.config.Config.SocketType, ctx.ID)
 
 	err = server.Run(ctxtool.FromCanceller(ctx.Cancelation))
 

heartbeat/autodiscover/builder/hints/monitors.go

@@ -124,7 +124,7 @@ func (hb *heartbeatHints) CreateConfig(event bus.Event, options ...ucfg.Option)
 
 		h, err := hb.getHostsWithPort(monitor, port, podEvent)
 		if err != nil {
-			hb.logger.Warnf("unable to find valid hosts for %+v: %w", monitor, err)
+			hb.logger.Warnf("unable to find valid hosts for %+v: %v", monitor, err)
 			continue
 		}
 
@@ -135,7 +135,7 @@ func (hb *heartbeatHints) CreateConfig(event bus.Event, options ...ucfg.Option)
 			hb.logger.Debugf("unable to create config from MapStr %+v", tempCfg)
 			return []*conf.C{}
 		}
-		hb.logger.Debugf("hints.builder", "generated config %+v", config)
+		hb.logger.Debugf("generated config %+v", config)
 		configs = append(configs, config)
 	}
 

heartbeat/beater/heartbeat.go

@@ -79,7 +79,7 @@ func New(b *beat.Beat, rawConfig *conf.C) (beat.Beater, error) {
 		if err == nil {
 			trace = sockTrace
 		} else {
-			logp.L().Warnf("could not connect to socket trace at path %s after %s timeout: %w", stConfig.Path, stConfig.Wait, err)
+			logp.L().Warnf("could not connect to socket trace at path %s after %s timeout: %v", stConfig.Path, stConfig.Wait, err)
 		}
 	}
 
@@ -94,7 +94,7 @@ func New(b *beat.Beat, rawConfig *conf.C) (beat.Beater, error) {
 				trace.Abort()
 				return nil, fmt.Errorf("run_once mode fatal error: %w", err)
 			} else {
-				logp.L().Warnf("skipping monitor state management: %w", err)
+				logp.L().Warnf("skipping monitor state management: %v", err)
 			}
 		} else {
 			replaceStateLoader(monitorstate.MakeESLoader(esClient, monitorstate.DefaultDataStreams, parsedConfig.RunFrom))
@@ -277,7 +277,7 @@ func (bt *Heartbeat) RunCentralMgmtMonitors(b *beat.Beat) {
 		// Backoff panics with 0 duration, set to smallest unit
 		esClient, err := makeESClient(context.TODO(), outCfg.Config(), 1, 1*time.Nanosecond)
 		if err != nil {
-			logp.L().Warnf("skipping monitor state management during managed reload: %w", err)
+			logp.L().Warnf("skipping monitor state management during managed reload: %v", err)
 		} else {
 			bt.replaceStateLoader(monitorstate.MakeESLoader(esClient, monitorstate.DefaultDataStreams, bt.config.RunFrom))
 		}

heartbeat/monitors/active/icmp/stdloop.go

@@ -22,7 +22,7 @@
 	"encoding/binary"
 	"errors"
 	"fmt"
 	"math/rand"
 	"net"
 	"os"
 	"runtime"
@@ -165,7 +165,7 @@
 		bytes := make([]byte, 512)
 		err := conn.SetReadDeadline(time.Now().Add(time.Second))
 		if err != nil {
-			logp.L().Errorf("could not set read deadline for ICMP: %w", err)
+			logp.L().Errorf("could not set read deadline for ICMP: %v", err)
 			return
 		}
 		_, addr, err := conn.ReadFrom(bytes)

heartbeat/monitors/factory.go

@@ -291,7 +291,7 @@ func preProcessors(info beat.Info, location *config.LocationWithID, settings pub
 		geoM, err := util.GeoConfigToMap(location.Geo)
 		if err != nil {
 			geoErrOnce.Do(func() {
-				logp.L().Warnf("could not add heartbeat geo info: %w", err)
+				logp.L().Warnf("could not add heartbeat geo info: %v", err)
 			})
 		}
 

heartbeat/monitors/monitor.go

@@ -266,7 +266,7 @@ func (m *Monitor) Stop() {
 	if m.close != nil {
 		err := m.close()
 		if err != nil {
-			logp.L().Errorf("error closing monitor %s: %w", m.String(), err)
+			logp.L().Errorf("error closing monitor %s: %v", m.String(), err)
 		}
 	}
 

heartbeat/scheduler/schedjob.go

@@ -65,7 +65,7 @@ func (sj *schedJob) run() (startedAt time.Time) {
 		if err == nil {
 			defer sj.jobLimitSem.Release(1)
 		} else {
-			logp.L().Errorf("could not acquire semaphore: %w", err)
+			logp.L().Errorf("could not acquire semaphore: %v", err)
 		}
 	}
 

libbeat/autodiscover/providers/kubernetes/kubernetes.go

@@ -350,7 +350,7 @@ func (p *leaderElectionManager) GenerateHints(event bus.Event) bus.Event {
 func (p *leaderElectionManager) startLeaderElectorIndefinitely(ctx context.Context, lec leaderelection.LeaderElectionConfig) {
 	le, err := leaderelection.NewLeaderElector(lec)
 	if err != nil {
-		p.logger.Errorf("error while creating Leader Elector: %w", err)
+		p.logger.Errorf("error while creating Leader Elector: %v", err)
 	}
 	p.logger.Debugf("Starting Leader Elector")
 

libbeat/conditions/range.go

@@ -114,7 +114,7 @@ func (c Range) Check(event ValuesMap) bool {
 
 		floatValue, err := ExtractFloat(value)
 		if err != nil {
-			logp.L().Named(logName).Warnf(err.Error())
+			logp.L().Named(logName).Warn(err.Error())
 			return false
 		}
 

libbeat/processors/add_host_metadata/add_host_metadata.go

@@ -101,7 +101,7 @@ func New(cfg *config.C) (beat.Processor, error) {
 	cbID, err := uuid.NewV4()
 	// if we fail, fall back to the processor name, hope for the best.
 	if err != nil {
-		p.logger.Errorf("error generating ID for FQDN callback, reverting to processor name: %w", err)
+		p.logger.Errorf("error generating ID for FQDN callback, reverting to processor name: %v", err)
 		cbIDStr = processorName
 	} else {
 		cbIDStr = cbID.String()
@@ -262,7 +262,7 @@ func (p *addHostMetadata) updateOrExpire(useFQDN bool) {
 	go func() {
 		err := p.loadData(false, useFQDN)
 		if err != nil {
-			p.logger.Errorf("error updating data for processor: %w")
+			p.logger.Errorf("error updating data for processor: %v", err)
 			updateChanSuccess <- false
 			return
 		}

libbeat/processors/add_kubernetes_metadata/kubernetes.go

@@ -191,7 +191,7 @@ func (k *kubernetesAnnotator) init(config kubeAnnotatorConfig, cfg *config.C) {
 		if config.Scope == "node" {
 			config.Node, err = kubernetes.DiscoverKubernetesNode(k.log, nd)
 			if err != nil {
-				k.log.Errorf("Couldn't discover Kubernetes node: %w", err)
+				k.log.Errorf("Couldn't discover Kubernetes node: %v", err)
 				return
 			}
 			k.log.Debugf("Initializing a new Kubernetes watcher using host: %s", config.Node)
@@ -299,30 +299,30 @@ func (k *kubernetesAnnotator) init(config kubeAnnotatorConfig, cfg *config.C) {
 		// be populated before trying to generate metadata for Pods.
 		if k.nodeWatcher != nil {
 			if err := k.nodeWatcher.Start(); err != nil {
-				k.log.Debugf("add_kubernetes_metadata", "Couldn't start node watcher: %v", err)
+				k.log.Debugf("Couldn't start node watcher: %v", err)
 				return
 			}
 		}
 		if k.nsWatcher != nil {
 			if err := k.nsWatcher.Start(); err != nil {
-				k.log.Debugf("add_kubernetes_metadata", "Couldn't start namespace watcher: %v", err)
+				k.log.Debugf("Couldn't start namespace watcher: %v", err)
 				return
 			}
 		}
 		if k.rsWatcher != nil {
 			if err := k.rsWatcher.Start(); err != nil {
-				k.log.Debugf("add_kubernetes_metadata", "Couldn't start replicaSet watcher: %v", err)
+				k.log.Debugf("Couldn't start replicaSet watcher: %v", err)
 				return
 			}
 		}
 		if k.jobWatcher != nil {
 			if err := k.jobWatcher.Start(); err != nil {
-				k.log.Debugf("add_kubernetes_metadata", "Couldn't start job watcher: %v", err)
+				k.log.Debugf("Couldn't start job watcher: %v", err)
 				return
 			}
 		}
 		if err := watcher.Start(); err != nil {
-			k.log.Debugf("add_kubernetes_metadata", "Couldn't start pod watcher: %v", err)
+			k.log.Debugf("Couldn't start pod watcher: %v", err)
 			return
 		}
 	})

libbeat/publisher/queue/diskqueue/segments.go

@@ -174,7 +174,7 @@ func scanExistingSegments(logger *logp.Logger, pathStr string) ([]*queueSegment,
 	for _, dirEntry := range dirEntries {
 		file, err := dirEntry.Info()
 		if err != nil {
-			logger.Errorf("could not get info for file '%s', skipping. Error: %w", dirEntry.Name(), err)
+			logger.Errorf("could not get info for file '%s', skipping. Error: %v", dirEntry.Name(), err)
 			continue
 		}
 

metricbeat/mb/lightmodules.go

@@ -257,12 +257,12 @@ func (s *LightModulesSource) moduleNames() ([]string, error) {
 	modules := make(map[string]bool)
 	for _, dir := range s.paths {
 		if _, err := os.Stat(dir); os.IsNotExist(err) {
-			s.log.Debugf("Light modules directory '%d' doesn't exist", dir)
+			s.log.Debugf("Light modules directory '%s' doesn't exist", dir)
 			continue
 		}
 		files, err := ioutil.ReadDir(dir)
 		if err != nil {
-			return nil, fmt.Errorf("listing modules on path '%s': %w", dir, err)
+			return nil, fmt.Errorf("listing modules on path '%s': %v", dir, err)
 		}
 		for _, f := range files {
 			if !f.IsDir() {

metricbeat/module/kubernetes/event/event.go

@@ -101,7 +101,7 @@ func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
 	cfg, _ := conf.NewConfigFrom(&config)
 	ecsClusterMeta, err := util.GetClusterECSMeta(cfg, client, ms.Logger())
 	if err != nil {
-		ms.Logger().Debugf("could not retrieve cluster metadata: %w", err)
+		ms.Logger().Debugf("could not retrieve cluster metadata: %v", err)
 	}
 	if ecsClusterMeta != nil {
 		ms.clusterMeta = ecsClusterMeta
@@ -127,7 +127,7 @@ func (m *MetricSet) Run(reporter mb.PushReporterV2) {
 		FilterFunc: func(obj interface{}) bool {
 			eve, ok := obj.(*kubernetes.Event)
 			if !ok {
-				m.Logger().Debugf("Error while casting event: %s", ok)
+				m.Logger().Debugf("Error while casting event. Got type: %T", obj)
 			}
 			// if fields are null they are decoded to `0001-01-01 00:00:00 +0000 UTC`
 			// so we need to check if they are valid first
@@ -148,7 +148,7 @@ func (m *MetricSet) Run(reporter mb.PushReporterV2) {
 	// start event watcher
 	err := m.watcher.Start()
 	if err != nil {
-		m.Logger().Debugf("Unable to start watcher: %w", err)
+		m.Logger().Debugf("Unable to start watcher: %v", err)
 	}
 	<-reporter.Done()
 	m.watcher.Stop()

metricbeat/module/kubernetes/state_container/state_container.go

@@ -147,7 +147,7 @@ func (m *MetricSet) Fetch(reporter mb.ReporterV2) error {
 			// empty string
 			cID, ok := (containerID).(string)
 			if !ok {
-				m.Logger().Debugf("Error while casting containerID: %s", ok)
+				m.Logger().Debugf("Error while casting containerID, got %T", containerID)
 			}
 			split := strings.Index(cID, "://")
 			if split != -1 {
@@ -162,7 +162,7 @@ func (m *MetricSet) Fetch(reporter mb.ReporterV2) error {
 		if containerImage, ok := event["image"]; ok {
 			cImage, ok := (containerImage).(string)
 			if !ok {
-				m.Logger().Debugf("Error while casting containerImage: %s", ok)
+				m.Logger().Debugf("Error while casting containerImage, got %T", containerImage)
 			}
 
 			kubernetes.ShouldPut(containerFields, "image.name", cImage, m.Logger())

metricbeat/module/kubernetes/util/kubernetes.go

@@ -861,7 +861,7 @@ func NewContainerMetadataEnricher(
 
 		pod, ok := r.(*kubernetes.Pod)
 		if !ok {
-			base.Logger().Debugf("Error while casting event: %s", ok)
+			base.Logger().Debugf("Error while casting event, got %T", r)
 		}
 		pmeta := metaGen.Generate(pod)
 
@@ -900,7 +900,7 @@ func NewContainerMetadataEnricher(
 		ids := make([]string, 0)
 		pod, ok := r.(*kubernetes.Pod)
 		if !ok {
-			base.Logger().Debugf("Error while casting event: %s", ok)
+			base.Logger().Debugf("Error while casting event, got %T", r)
 		}
 
 		for _, container := range append(pod.Spec.Containers, pod.Spec.InitContainers...) {

metricbeat/module/linux/rapl/rapl.go

@@ -83,7 +83,7 @@
 		return nil, err
 	}
 
 	sys := base.Module().(resolve.Resolver)
 	CPUList, err := getMSRCPUs(sys)
 	if err != nil {
 		return nil, fmt.Errorf("error getting list of CPUs to query: %w", err)
@@ -176,7 +176,7 @@
 				continue
 			}
 			if err != nil {
-				logp.L().Infof("Error reading MSR from domain %s: %s skipping.", domain, err)
+				logp.L().Infof("Error reading MSR from domain %s: %s skipping.", domain.Name, err)
 				continue
 			}
 			domainList[domain] = energyTrack{joules: joules, time: time.Now()}