Fix PR comments

x-pack/filebeat/input/awss3/_meta/terraform/README.md

@@ -4,6 +4,7 @@ This directory contains a Terraform module that creates the AWS resources needed
 for executing the integration tests for the `aws-s3` Filebeat input. It creates
 an S3 bucket and SQS queue and configures S3 `ObjectCreated:*` notifications to
 be delivered to SQS. It also creates a second S3 bucket, SNS topic, SQS queue and configures S3 `ObjectCreated:*` notifications to be delivered to SNS and also creates a subscription for this SNS topic to SQS queue to automatically place messages sent to SNS topic in SQS queue.
+
 ## Cloud AWS environment
 
 It outputs configuration information that is consumed by the tests to

x-pack/filebeat/input/awss3/input.go

@@ -418,10 +418,6 @@ func pollSqsWaitingMetric(ctx context.Context, receiver *sqsReader) {
 
 	t := time.NewTicker(time.Minute)
 	defer t.Stop()
-	// Initialize the metric to 0 at the start of the one minute time interval to avoid
-	// giving misleading metric value -1 even though SQS messages are processed.
-	// The value will be updated every minute
-	receiver.metrics.sqsMessagesWaiting.Set(int64(0))
 	for {
 		select {
 		case <-ctx.Done():

x-pack/filebeat/input/awss3/input_integration_test.go

@@ -213,7 +213,7 @@ func TestInputRunSQSOnLocalstack(t *testing.T) {
 	// Ensure SQS is empty before testing.
 	drainSQS(t, region, queueUrl, awsCfg)
 
-	//Upload test files to S3 to generate SQS notification
+	// Upload test files to S3 to generate SQS notification
 	s3Client := s3.NewFromConfig(awsCfg, func(o *s3.Options) {
 		o.UsePathStyle = true
 	})

x-pack/filebeat/input/awss3/metrics.go

@@ -175,6 +175,7 @@ func newInputMetrics(id string, optionalParent *monitoring.Registry, maxWorkers
 		s3ObjectsInflight:                   monitoring.NewUint(reg, "s3_objects_inflight_gauge"),
 		s3ObjectProcessingTime:              metrics.NewUniformSample(1024),
 	}
+
 	// Initializing the sqs_messages_waiting_gauge value to -1 so that we can distinguish between no messages waiting (0) and never collected / error collecting (-1).
 	out.sqsMessagesWaiting.Set(int64(-1))
 	adapter.NewGoMetrics(reg, "sqs_message_processing_time", adapter.Accept).

x-pack/filebeat/input/awss3/sqs.go

@@ -79,9 +79,6 @@ func (r *sqsReader) Receive(ctx context.Context) error {
 		// Process each SQS message asynchronously with a goroutine.
 		r.log.Debugf("Received %v SQS messages.", len(msgs))
 		r.metrics.sqsMessagesReceivedTotal.Add(uint64(len(msgs)))
-		// Initialize the sqs_message_waiting_gauge to 0 to indicate that that SQS messages are received.
-		// PollSqsWaitingMetric shall reassign the value if there are messages waiting
-		r.metrics.sqsMessagesWaiting.Set(int64(0))
 		workerWg.Add(len(msgs))
 
 		for _, msg := range msgs {