Cleanup

Signed-off-by: Michel Hollands <[email protected]>

Author: MichelHollands

pkg/ingester/errors.go

@@ -9,12 +9,12 @@ import (
 )
 
 type validationError struct {
-	err       error // underlying error
-	errorType string
-	code      int
-	noReport  bool // if true, error will be counted but not reported to caller
-	labels    labels.Labels
-	ipAddress string
+	err                error // underlying error
+	errorType          string
+	code               int
+	noReport           bool // if true, error will be counted but not reported to caller
+	labels             labels.Labels
+	forwardIPAddresses string
 }
 
 func makeLimitError(errorType string, err error) error {
@@ -50,8 +50,9 @@ func makeMetricLimitError(errorType string, labels labels.Labels, err error) err
 	}
 }
 
-func (e *validationError) AddIPAddress(ipAddress string) {
-	e.ipAddress = ipAddress
+// AddForwardIPAddresses adds the string containing the addresses to the error
+func (e *validationError) AddForwardIPAddresses(ipAddresses string) {
+	e.forwardIPAddresses = ipAddresses
 }
 
 func (e *validationError) Error() string {
@@ -62,8 +63,8 @@ func (e *validationError) Error() string {
 		return e.err.Error()
 	}
 	ipStr := ""
-	if e.ipAddress != "" {
-		ipStr = fmt.Sprintf(" from IP address %v", e.ipAddress)
+	if e.forwardIPAddresses != "" {
+		ipStr = fmt.Sprintf(" from IP address %v", e.forwardIPAddresses)
 	}
 	return fmt.Sprintf("%s%s for series %s", e.err.Error(), ipStr, e.labels.String())
 }

pkg/ingester/ingester.go

@@ -376,10 +376,6 @@ func (i *Ingester) checkRunningOrStopping() error {
 
 // Push implements client.IngesterServer
 func (i *Ingester) Push(ctx context.Context, req *client.WriteRequest) (*client.WriteResponse, error) {
-	ipAddresses := util.GetSourceFromIncomingCtx(ctx)
-	// TODO: remove
-	level.Info(util.Logger).Log("ingestor Push IP addresses received", ipAddresses)
-
 	if err := i.checkRunningOrStopping(); err != nil {
 		return nil, err
 	}
@@ -507,10 +503,8 @@ func (i *Ingester) append(ctx context.Context, userID string, labels labelPairs,
 				return nil
 			}
 			ipAddresses := util.GetSourceFromIncomingCtx(ctx)
-			// TODO: remove
-			level.Info(util.Logger).Log("ingestor IP addresses received", ipAddresses)
 			if ipAddresses != "" {
-				ve.AddIPAddress(ipAddresses)
+				ve.AddForwardIPAddresses(ipAddresses)
 			}
 		}
 		return err