include bucket name when logging error (#18679) (#18822)

kaiyan-sheng · nhnicwaller · web-flow · commit 3d65f07a618e · 2020-05-29T08:06:24.000-06:00
(cherry picked from commit df6f216) Co-authored-by: Nic Waller <42976427+nhnicwaller@users.noreply.github.com>
diff --git a/x-pack/filebeat/input/s3/input.go b/x-pack/filebeat/input/s3/input.go
@@ -391,7 +391,7 @@ func (p *s3Input) handleS3Objects(svc s3iface.ClientAPI, s3Infos []s3Info, errC
 		p.logger.Debugf("Processing file from s3 bucket \"%s\" with name \"%s\"", info.name, info.key)
 		err := p.createEventsFromS3Info(svc, info, s3Ctx)
 		if err != nil {
-			err = errors.Wrapf(err, "createEventsFromS3Info failed for %v", info.key)
+			err = errors.Wrapf(err, "createEventsFromS3Info failed processing file from s3 bucket \"%s\" with name \"%s\"", info.name, info.key)
 			p.logger.Error(err)
 			s3Ctx.setError(err)
 		}

Original file line number	Diff line number	Diff line change
`@@ -391,7 +391,7 @@ func (p *s3Input) handleS3Objects(svc s3iface.ClientAPI, s3Infos []s3Info, errC`
`391`	`391`	`p.logger.Debugf("Processing file from s3 bucket \"%s\" with name \"%s\"", info.name, info.key)`
`392`	`392`	`err := p.createEventsFromS3Info(svc, info, s3Ctx)`
`393`	`393`	`if err != nil {`
`394`		`- err = errors.Wrapf(err, "createEventsFromS3Info failed for %v", info.key)`
	`394`	`+ err = errors.Wrapf(err, "createEventsFromS3Info failed processing file from s3 bucket \"%s\" with name \"%s\"", info.name, info.key)`
`395`	`395`	`p.logger.Error(err)`
`396`	`396`	`s3Ctx.setError(err)`
`397`	`397`	`}`