Make the per labelset series limit error message consistent with per user series error message (#7015)

* Make the per labelset series limit error message consistent with per user series error message

Signed-off-by: Alvin Lin <[email protected]>

* address PR comments

Signed-off-by: Alvin Lin <[email protected]>

---------

Signed-off-by: Alvin Lin <[email protected]>

Author: alvinlin123

pkg/ingester/limiter.go

@@ -21,9 +21,9 @@ var (
 
 type errMaxSeriesPerLabelSetLimitExceeded struct {
 	error
-	id          string
-	localLimit  int
-	globalLimit int
+	id               string
+	actualLocalLimit int
+	globalLimit      int
 }
 
 // RingCount is the interface exposed by a ring implementation which allows
@@ -130,9 +130,9 @@ func (l *Limiter) AssertMaxSeriesPerLabelSet(userID string, metric labels.Labels
 			return err
 		} else if u >= local {
 			return errMaxSeriesPerLabelSetLimitExceeded{
-				id:          limit.Id,
-				localLimit:  local,
-				globalLimit: limit.Limits.MaxSeries,
+				id:               limit.Id,
+				actualLocalLimit: local,
+				globalLimit:      limit.Limits.MaxSeries,
 			}
 		}
 	}
@@ -208,8 +208,8 @@ func (l *Limiter) formatMaxMetadataPerMetricError(userID string, metric string)
 }
 
 func (l *Limiter) formatMaxSeriesPerLabelSetError(err errMaxSeriesPerLabelSetLimitExceeded) error {
-	return fmt.Errorf("per-labelset series limit of %d exceeded (labelSet: %s, local limit: %d global limit: %d actual)",
-		minNonZero(err.globalLimit, err.localLimit), err.id, err.localLimit, err.globalLimit)
+	return fmt.Errorf("per-labelset series limit of %d exceeded (labelSet: %s, global limit: %d actual local limit: %d)",
+		minNonZero(err.globalLimit, err.actualLocalLimit), err.id, err.globalLimit, err.actualLocalLimit)
 }
 
 func (l *Limiter) limitsPerLabelSets(userID string, metric labels.Labels) []validation.LimitsPerLabelSet {

pkg/ingester/limiter_test.go

@@ -521,7 +521,7 @@ func TestLimiter_AssertMaxSeriesPerLabelSet(t *testing.T) {
 			ringIngesterCount:     10,
 			series:                200,
 			shardByAllLabels:      true,
-			expected:              errMaxSeriesPerLabelSetLimitExceeded{globalLimit: 10, localLimit: 3},
+			expected:              errMaxSeriesPerLabelSetLimitExceeded{globalLimit: 10, actualLocalLimit: 3},
 			limits: validation.Limits{
 				LimitsPerLabelSet: []validation.LimitsPerLabelSet{
 					{