wip

cmd/prometheus/main.go

@@ -541,6 +541,7 @@ func main() {
 	slog.SetDefault(logger)
 	// Hacky but temporary
 	parser.Logger = logger.With("component", "parser")
+	relabel.Logger = logger.With("component", "relabel")
 
 	notifs := notifications.NewNotifications(cfg.maxNotificationsSubscribers, prometheus.DefaultRegisterer)
 	cfg.web.NotificationsSub = notifs.Sub

model/relabel/relabel.go

@@ -22,11 +22,15 @@ import (
 
 	"github.com/grafana/regexp"
 	"github.com/prometheus/common/model"
+	"github.com/prometheus/common/promslog"
 
 	"github.com/prometheus/prometheus/model/labels"
+	"github.com/prometheus/prometheus/promql/parser"
 )
 
 var (
+	Logger = promslog.NewNopLogger()
+
 	relabelTarget = regexp.MustCompile(`^(?:(?:[a-zA-Z_]|\$(?:\{\w+\}|\w+))+\w*)+$`)
 
 	DefaultRelabelConfig = Config{
@@ -255,6 +259,10 @@ func relabel(cfg *Config, lb *labels.Builder) (keep bool) {
 		values = make([]string, 0, len(cfg.SourceLabels))
 	}
 	for _, ln := range cfg.SourceLabels {
+		if ln == model.BucketLabel || ln == model.QuantileLabel {
+			parser.NarrowSelectors.WithLabelValues("relabel").Inc()
+			Logger.Debug("relabel_config concerns 'le' or 'quantile' labels, it may need to be adjusted to count for float values", "source_labels", cfg.SourceLabels, "regex", cfg.Regex)
+		}
 		values = append(values, lb.Get(string(ln)))
 	}
 	val := strings.Join(values, cfg.Separator)

promql/parser/parse.go

@@ -36,17 +36,18 @@ import (
 )
 
 var (
-	Logger                   = promslog.NewNopLogger()
-	narrowSelectorOnIntegers = prometheus.NewCounter(
+	Logger          = promslog.NewNopLogger()
+	NarrowSelectors = prometheus.NewCounterVec(
 		prometheus.CounterOpts{
-			Name: "prometheus_parser_narrow_selectors_on_integers_count",
-			Help: "Number of selectors that are explicitly set to only match integers on 'quantile' and 'le' labels",
+			Name: "prometheus_narrow_selectors_count",
+			Help: "Number of selectors that may unintentionally only match integers on 'quantile' and 'le' labels",
 		},
+		[]string{"component"},
 	)
 )
 
 func init() {
-	prometheus.MustRegister(narrowSelectorOnIntegers)
+	prometheus.MustRegister(NarrowSelectors)
 }
 
 // isInteger is a light strconv.Atoi that avoids allocations due to Atoi's returned error and doesn't
@@ -97,7 +98,7 @@ Outer:
 			switch lm.Type {
 			case labels.MatchEqual, labels.MatchNotEqual:
 				if n, ok := isInteger(lm.Value); ok {
-					narrowSelectorOnIntegers.Inc()
+					NarrowSelectors.WithLabelValues("parser").Inc()
 					Logger.Debug("selector set to explicitly match an integer, but values could be floats", "narrow_matcher_label", lm.Name, "integer", n, "matchers", vs.LabelMatchers)
 				}
 				break Outer
@@ -112,7 +113,7 @@ Outer:
 					}
 				}
 
-				narrowSelectorOnIntegers.Inc()
+				NarrowSelectors.WithLabelValues("parser").Inc()
 				Logger.Debug("selector set to explicitly match integers only, but values could be floats", "narrow_matcher_label", lm.Name, "matchers", vs.LabelMatchers)
 				break Outer
 			}

promql/parser/parse_test.go

@@ -4658,15 +4658,15 @@ func Test_checkLabelMatchers(t *testing.T) {
 
 	for _, tt := range cases {
 		t.Run(tt.expr, func(t *testing.T) {
-			counter := client_testutil.ToFloat64(narrowSelectorOnIntegers)
+			counter := client_testutil.ToFloat64(NarrowSelectors.WithLabelValues("parser"))
 			err := tt.fn(tt.expr)
 			require.NoError(t, err)
 
 			if tt.shouldIncrementCounter {
 				counter++
 			}
 
-			require.Equal(t, counter, client_testutil.ToFloat64(narrowSelectorOnIntegers))
+			require.Equal(t, counter, client_testutil.ToFloat64(NarrowSelectors.WithLabelValues("parser")))
 		})
 	}
 }