From 5e989b8742fa37b89efc373d6466991b392835ad Mon Sep 17 00:00:00 2001
From: Dan Kortschak <dan.kortschak@elastic.co>
Date: Tue, 1 Oct 2024 06:47:26 +0930
Subject: [PATCH] x-pack/filebeat/input/{azureblobstorage,gcs,httpjson}: fix
 error logging verbs (#41042)

---
 x-pack/filebeat/input/azureblobstorage/job.go | 2 +-
 x-pack/filebeat/input/gcs/scheduler.go        | 2 +-
 x-pack/filebeat/input/httpjson/request.go     | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/x-pack/filebeat/input/azureblobstorage/job.go b/x-pack/filebeat/input/azureblobstorage/job.go
index ae1c2c1e617..f886f330af6 100644
--- a/x-pack/filebeat/input/azureblobstorage/job.go
+++ b/x-pack/filebeat/input/azureblobstorage/job.go
@@ -28,7 +28,7 @@ import (
 	"github.com/elastic/elastic-agent-libs/mapstr"
 )
 
-const jobErrString = "job with jobId %s encountered an error: %w"
+const jobErrString = "job with jobId %s encountered an error: %v"
 
 type job struct {
 	// client is an azure blob handle
diff --git a/x-pack/filebeat/input/gcs/scheduler.go b/x-pack/filebeat/input/gcs/scheduler.go
index ea992b49924..686ad1394dd 100644
--- a/x-pack/filebeat/input/gcs/scheduler.go
+++ b/x-pack/filebeat/input/gcs/scheduler.go
@@ -232,7 +232,7 @@ func (s *scheduler) addFailedJobs(ctx context.Context, jobs []*job) []*job {
 		if !jobMap[name] {
 			obj, err := s.bucket.Object(name).Attrs(ctx)
 			if err != nil {
-				s.log.Errorf("adding failed job %s to job list caused an error: %w", err)
+				s.log.Errorf("adding failed job %s to job list caused an error: %v", name, err)
 				continue
 			}
 
diff --git a/x-pack/filebeat/input/httpjson/request.go b/x-pack/filebeat/input/httpjson/request.go
index 6cc46b27f2f..160ac67fe9e 100644
--- a/x-pack/filebeat/input/httpjson/request.go
+++ b/x-pack/filebeat/input/httpjson/request.go
@@ -576,7 +576,7 @@ func (p *chainProcessor) handleEvent(ctx context.Context, msg mapstr.M) {
 	// we construct a new response here from each of the pagination events
 	err := json.NewEncoder(body).Encode(msg)
 	if err != nil {
-		p.req.log.Errorf("error processing chain event: %w", err)
+		p.req.log.Errorf("error processing chain event: %v", err)
 		return
 	}
 	response.Body = io.NopCloser(body)
@@ -589,17 +589,17 @@ func (p *chainProcessor) handleEvent(ctx context.Context, msg mapstr.M) {
 	n, err := p.req.processChainPaginationEvents(ctx, p.trCtx, p.pub, &response, p.idx, p.req.log)
 	if err != nil {
 		if errors.Is(err, notLogged{}) {
-			p.req.log.Debugf("ignored error processing chain event: %w", err)
+			p.req.log.Debugf("ignored error processing chain event: %v", err)
 			return
 		}
-		p.req.log.Errorf("error processing chain event: %w", err)
+		p.req.log.Errorf("error processing chain event: %v", err)
 		return
 	}
 	p.n += n
 
 	err = response.Body.Close()
 	if err != nil {
-		p.req.log.Errorf("error closing http response body: %w", err)
+		p.req.log.Errorf("error closing http response body: %v", err)
 	}
 }