Address comments

Signed-off-by: Arthur Silva Sens <arthursens2005@gmail.com>

promql/engine.go

@@ -1901,8 +1901,8 @@ func (ev *evaluator) eval(ctx context.Context, expr parser.Expr) (parser.Value,
 					if ev.enableTypeAndUnitLabels {
 						// When type-and-unit-labels feature is enabled, check __type__ label
 						typeLabel := inMatrix[0].Metric.Get("__type__")
-						if typeLabel != "counter" {
-							warnings.Add(annotations.NewPossibleNonCounterLabelInfo(metricName, e.Args[0].PositionRange()))
+						if typeLabel != string(model.MetricTypeCounter) {
+							warnings.Add(annotations.NewPossibleNonCounterLabelInfo(metricName, typeLabel, e.Args[0].PositionRange()))
 						}
 					} else if !strings.HasSuffix(metricName, "_total") ||
 						!strings.HasSuffix(metricName, "_sum") ||

promql/engine_test.go

@@ -3503,7 +3503,7 @@ func TestRateAnnotations(t *testing.T) {
 			expr:                     "rate(series[1m1s])",
 			typeAndUnitLabelsEnabled: true,
 			expectedInfoAnnotations: []string{
-				`PromQL info: metric might not be a counter, __type__ label is not set to "counter": "series" (1:6)`,
+				`PromQL info: metric might not be a counter, __type__ label is not set to "counter", got "": "series" (1:6)`,
 			},
 			expectedWarningAnnotations: []string{},
 		},
@@ -3514,7 +3514,7 @@ func TestRateAnnotations(t *testing.T) {
 			expr:                     "increase(series[1m1s])",
 			typeAndUnitLabelsEnabled: true,
 			expectedInfoAnnotations: []string{
-				`PromQL info: metric might not be a counter, __type__ label is not set to "counter": "series" (1:10)`,
+				`PromQL info: metric might not be a counter, __type__ label is not set to "counter", got "": "series" (1:10)`,
 			},
 			expectedWarningAnnotations: []string{},
 		},

util/annotations/annotations.go

@@ -147,7 +147,7 @@ var (
 	IncompatibleBucketLayoutInBinOpWarning     = fmt.Errorf("%w: incompatible bucket layout encountered for binary operator", PromQLWarning)
 
 	PossibleNonCounterInfo                  = fmt.Errorf("%w: metric might not be a counter, name does not end in _total/_sum/_count/_bucket:", PromQLInfo)
-	PossibleNonCounterLabelInfo             = fmt.Errorf("%w: metric might not be a counter, __type__ label is not set to %q:", PromQLInfo, "counter")
+	PossibleNonCounterLabelInfo             = fmt.Errorf("%w: metric might not be a counter, __type__ label is not set to %q", PromQLInfo, model.MetricTypeCounter)
 	HistogramQuantileForcedMonotonicityInfo = fmt.Errorf("%w: input to histogram_quantile needed to be fixed for monotonicity (see https://prometheus.io/docs/prometheus/latest/querying/functions/#histogram_quantile) for metric name", PromQLInfo)
 	IncompatibleTypesInBinOpInfo            = fmt.Errorf("%w: incompatible sample types encountered for binary operator", PromQLInfo)
 	HistogramIgnoredInAggregationInfo       = fmt.Errorf("%w: ignored histogram in", PromQLInfo)
@@ -273,10 +273,10 @@ func NewPossibleNonCounterInfo(metricName string, pos posrange.PositionRange) er
 
 // NewPossibleNonCounterLabelInfo is used when a named counter metric with only float samples does not
 // have the __type__ label set to "counter".
-func NewPossibleNonCounterLabelInfo(metricName string, pos posrange.PositionRange) error {
+func NewPossibleNonCounterLabelInfo(metricName, typeLabel string, pos posrange.PositionRange) error {
 	return annoErr{
 		PositionRange: pos,
-		Err:           fmt.Errorf("%w %q", PossibleNonCounterLabelInfo, metricName),
+		Err:           fmt.Errorf("%w, got %q: %q", PossibleNonCounterLabelInfo, typeLabel, metricName),
 	}
 }