Code review

Signed-off-by: Nick Pillitteri <[email protected]>

internal/component/mimir/rules/kubernetes/events.go

@@ -2,7 +2,6 @@ package rules
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"regexp"
 	"sync"
@@ -68,20 +67,20 @@ func (e *eventProcessor) run(ctx context.Context) {
 		err := e.processEvent(ctx, evt)
 
 		if err != nil {
-			retries := c.queue.NumRequeues(evt)
-			if retries < 5 && !errors.Is(err, client.ErrUnrecoverable) {
-				c.metrics.eventsRetried.WithLabelValues(string(evt.Typ)).Inc()
-				c.queue.AddRateLimited(evt)
-				level.Error(c.log).Log(
+			retries := e.queue.NumRequeues(evt)
+			if retries < 5 && !client.IsUnrecoverable(err) {
+				e.metrics.eventsRetried.WithLabelValues(string(evt.Typ)).Inc()
+				e.queue.AddRateLimited(evt)
+				level.Error(e.logger).Log(
 
 					"msg", "failed to process event, will retry",
 					"retries", fmt.Sprintf("%d/5", retries),
 					"err", err,
 				)
 				continue
 			} else {
-				c.metrics.eventsFailed.WithLabelValues(string(evt.Typ)).Inc()
-				level.Error(c.log).Log(
+				e.metrics.eventsFailed.WithLabelValues(string(evt.Typ)).Inc()
+				level.Error(e.logger).Log(
 					"msg", "failed to process event, unrecoverable error or max retries exceeded",
 					"retries", fmt.Sprintf("%d/5", retries),
 					"err", err,

internal/mimir/client/client.go

@@ -27,6 +27,11 @@ var (
 	ErrUnrecoverable    = errors.New("unrecoverable error response")
 )
 
+// IsUnrecoverable returns true for errors from API requests that should not be retried, false otherwise.
+func IsUnrecoverable(err error) bool {
+	return errors.Is(err, ErrUnrecoverable)
+}
+
 // Config is used to configure a MimirClient.
 type Config struct {
 	ID                   string

internal/mimir/client/client_test.go

@@ -1,7 +1,6 @@
 package client
 
 import (
-	"errors"
 	"io"
 	"net/http"
 	"net/url"
@@ -178,7 +177,7 @@ func TestCheckResponseErrors(t *testing.T) {
 
 			err := checkResponse(response)
 			require.Error(t, err)
-			require.Equal(t, tt.fatal, errors.Is(err, ErrUnrecoverable), "%+v is not expected recoverable/unrecoverable", err)
+			require.Equal(t, tt.fatal, IsUnrecoverable(err), "%+v is not expected recoverable/unrecoverable", err)
 		})
 	}
 }