From a6fa63e19535ae7e465ea2d45387d51d9cd2135e Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Fri, 13 Dec 2024 15:07:05 +0000
Subject: [PATCH 1/8] OTLP: add CLI flag for 'quiet zero'

So that we can update all ingesters before enabling this in distributors.
---
 pkg/api/api.go                 |  2 +-
 pkg/distributor/distributor.go |  4 ++++
 pkg/distributor/otel.go        |  6 ++++--
 pkg/distributor/otel_test.go   | 14 +++++++-------
 pkg/distributor/push_test.go   |  2 +-
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/pkg/api/api.go b/pkg/api/api.go
index fd8cdd261f4..bd8da8e6e80 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -267,7 +267,7 @@ func (a *API) RegisterDistributor(d *distributor.Distributor, pushConfig distrib
 	), true, false, "POST")
 	a.RegisterRoute(OTLPPushEndpoint, distributor.OTLPHandler(
 		pushConfig.MaxOTLPRequestSize, d.RequestBufferPool, a.sourceIPs, limits, pushConfig.OTelResourceAttributePromotionConfig,
-		pushConfig.RetryConfig, d.PushWithMiddlewares, d.PushMetrics, reg, a.logger,
+		pushConfig.RetryConfig, pushConfig.EnableStartTimeQuietZero, d.PushWithMiddlewares, d.PushMetrics, reg, a.logger,
 	), true, false, "POST")
 
 	a.indexPage.AddLinks(defaultWeight, "Distributor", []IndexPageLink{
diff --git a/pkg/distributor/distributor.go b/pkg/distributor/distributor.go
index 41bf16ddb43..1db43cdbb88 100644
--- a/pkg/distributor/distributor.go
+++ b/pkg/distributor/distributor.go
@@ -249,6 +249,9 @@ type Config struct {
 
 	// OTelResourceAttributePromotionConfig allows for specializing OTel resource attribute promotion.
 	OTelResourceAttributePromotionConfig OTelResourceAttributePromotionConfig `yaml:"-"`
+
+	// Change the implementation of Otel startTime from a real zero to a special NaN value.
+	EnableStartTimeQuietZero bool `yaml:"start_time_quiet_zero" category:"advanced"`
 }
 
 // PushWrapper wraps around a push. It is similar to middleware.Interface.
@@ -267,6 +270,7 @@ func (cfg *Config) RegisterFlags(f *flag.FlagSet, logger log.Logger) {
 	f.DurationVar(&cfg.RemoteTimeout, "distributor.remote-timeout", 2*time.Second, "Timeout for downstream ingesters.")
 	f.BoolVar(&cfg.WriteRequestsBufferPoolingEnabled, "distributor.write-requests-buffer-pooling-enabled", true, "Enable pooling of buffers used for marshaling write requests.")
 	f.IntVar(&cfg.ReusableIngesterPushWorkers, "distributor.reusable-ingester-push-workers", 2000, "Number of pre-allocated workers used to forward push requests to the ingesters. If 0, no workers will be used and a new goroutine will be spawned for each ingester push request. If not enough workers available, new goroutine will be spawned. (Note: this is a performance optimization, not a limiting feature.)")
+	f.BoolVar(&cfg.EnableStartTimeQuietZero, "distributor.otel-start-time-quiet-zero", false, "Change the implementation of Otel startTime from a real zero to a special NaN value.")
 
 	cfg.DefaultLimits.RegisterFlags(f)
 }
diff --git a/pkg/distributor/otel.go b/pkg/distributor/otel.go
index 1f4621b8446..0c3570913e1 100644
--- a/pkg/distributor/otel.go
+++ b/pkg/distributor/otel.go
@@ -63,6 +63,7 @@ func OTLPHandler(
 	limits OTLPHandlerLimits,
 	resourceAttributePromotionConfig OTelResourceAttributePromotionConfig,
 	retryCfg RetryConfig,
+	enableStartTimeQuietZero bool,
 	push PushFunc,
 	pushMetrics *PushMetrics,
 	reg prometheus.Registerer,
@@ -183,7 +184,7 @@ func OTLPHandler(
 		pushMetrics.ObserveUncompressedBodySize(tenantID, float64(uncompressedBodySize))
 
 		var metrics []mimirpb.PreallocTimeseries
-		metrics, err = otelMetricsToTimeseries(ctx, tenantID, addSuffixes, enableCTZeroIngestion, promoteResourceAttributes, keepIdentifyingResourceAttributes, discardedDueToOtelParseError, spanLogger, otlpReq.Metrics())
+		metrics, err = otelMetricsToTimeseries(ctx, tenantID, addSuffixes, enableCTZeroIngestion, enableStartTimeQuietZero, promoteResourceAttributes, keepIdentifyingResourceAttributes, discardedDueToOtelParseError, spanLogger, otlpReq.Metrics())
 		if err != nil {
 			return err
 		}
@@ -413,11 +414,12 @@ func otelMetricsToMetadata(addSuffixes bool, md pmetric.Metrics) []*mimirpb.Metr
 	return metadata
 }
 
-func otelMetricsToTimeseries(ctx context.Context, tenantID string, addSuffixes, enableCTZeroIngestion bool, promoteResourceAttributes []string, keepIdentifyingResourceAttributes bool, discardedDueToOtelParseError *prometheus.CounterVec, logger log.Logger, md pmetric.Metrics) ([]mimirpb.PreallocTimeseries, error) {
+func otelMetricsToTimeseries(ctx context.Context, tenantID string, addSuffixes, enableCTZeroIngestion, enableStartTimeQuietZero bool, promoteResourceAttributes []string, keepIdentifyingResourceAttributes bool, discardedDueToOtelParseError *prometheus.CounterVec, logger log.Logger, md pmetric.Metrics) ([]mimirpb.PreallocTimeseries, error) {
 	converter := otlp.NewMimirConverter()
 	_, errs := converter.FromMetrics(ctx, md, otlp.Settings{
 		AddMetricSuffixes:                   addSuffixes,
 		EnableCreatedTimestampZeroIngestion: enableCTZeroIngestion,
+		EnableStartTimeQuietZero:            enableStartTimeQuietZero,
 		PromoteResourceAttributes:           promoteResourceAttributes,
 		KeepIdentifyingResourceAttributes:   keepIdentifyingResourceAttributes,
 	}, utillog.SlogFromGoKit(logger))
diff --git a/pkg/distributor/otel_test.go b/pkg/distributor/otel_test.go
index 614784756cb..cc9d0cc8751 100644
--- a/pkg/distributor/otel_test.go
+++ b/pkg/distributor/otel_test.go
@@ -283,7 +283,7 @@ func TestOTelMetricsToTimeSeries(t *testing.T) {
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
 			mimirTS, err := otelMetricsToTimeseries(
-				context.Background(), tenantID, true, false, tc.promoteResourceAttributes, tc.keepIdentifyingResourceAttributes, discardedDueToOTelParseError, log.NewNopLogger(), md,
+				context.Background(), tenantID, true, false, false, tc.promoteResourceAttributes, tc.keepIdentifyingResourceAttributes, discardedDueToOTelParseError, log.NewNopLogger(), md,
 			)
 			require.NoError(t, err)
 			require.Len(t, mimirTS, 2)
@@ -351,7 +351,7 @@ func BenchmarkOTLPHandler(b *testing.B) {
 		validation.NewMockTenantLimits(map[string]*validation.Limits{}),
 	)
 	require.NoError(b, err)
-	handler := OTLPHandler(100000, nil, nil, limits, nil, RetryConfig{}, pushFunc, nil, nil, log.NewNopLogger())
+	handler := OTLPHandler(100000, nil, nil, limits, nil, RetryConfig{}, false, pushFunc, nil, nil, log.NewNopLogger())
 
 	b.Run("protobuf", func(b *testing.B) {
 		req := createOTLPProtoRequest(b, exportReq, "")
@@ -750,7 +750,7 @@ func TestHandlerOTLPPush(t *testing.T) {
 
 			logs := &concurrency.SyncBuffer{}
 			retryConfig := RetryConfig{Enabled: true, MinBackoff: 5 * time.Second, MaxBackoff: 5 * time.Second}
-			handler := OTLPHandler(tt.maxMsgSize, nil, nil, limits, tt.resourceAttributePromotionConfig, retryConfig, pusher, nil, nil, level.NewFilter(log.NewLogfmtLogger(logs), level.AllowInfo()))
+			handler := OTLPHandler(tt.maxMsgSize, nil, nil, limits, tt.resourceAttributePromotionConfig, retryConfig, false, pusher, nil, nil, level.NewFilter(log.NewLogfmtLogger(logs), level.AllowInfo()))
 
 			resp := httptest.NewRecorder()
 			handler.ServeHTTP(resp, req)
@@ -823,7 +823,7 @@ func TestHandler_otlpDroppedMetricsPanic(t *testing.T) {
 
 	req := createOTLPProtoRequest(t, pmetricotlp.NewExportRequestFromMetrics(md), "")
 	resp := httptest.NewRecorder()
-	handler := OTLPHandler(100000, nil, nil, limits, nil, RetryConfig{}, func(_ context.Context, pushReq *Request) error {
+	handler := OTLPHandler(100000, nil, nil, limits, nil, RetryConfig{}, false, func(_ context.Context, pushReq *Request) error {
 		request, err := pushReq.WriteRequest()
 		assert.NoError(t, err)
 		assert.Len(t, request.Timeseries, 3)
@@ -869,7 +869,7 @@ func TestHandler_otlpDroppedMetricsPanic2(t *testing.T) {
 
 	req := createOTLPProtoRequest(t, pmetricotlp.NewExportRequestFromMetrics(md), "")
 	resp := httptest.NewRecorder()
-	handler := OTLPHandler(100000, nil, nil, limits, nil, RetryConfig{}, func(_ context.Context, pushReq *Request) error {
+	handler := OTLPHandler(100000, nil, nil, limits, nil, RetryConfig{}, false, func(_ context.Context, pushReq *Request) error {
 		request, err := pushReq.WriteRequest()
 		t.Cleanup(pushReq.CleanUp)
 		require.NoError(t, err)
@@ -895,7 +895,7 @@ func TestHandler_otlpDroppedMetricsPanic2(t *testing.T) {
 
 	req = createOTLPProtoRequest(t, pmetricotlp.NewExportRequestFromMetrics(md), "")
 	resp = httptest.NewRecorder()
-	handler = OTLPHandler(100000, nil, nil, limits, nil, RetryConfig{}, func(_ context.Context, pushReq *Request) error {
+	handler = OTLPHandler(100000, nil, nil, limits, nil, RetryConfig{}, false, func(_ context.Context, pushReq *Request) error {
 		request, err := pushReq.WriteRequest()
 		t.Cleanup(pushReq.CleanUp)
 		require.NoError(t, err)
@@ -923,7 +923,7 @@ func TestHandler_otlpWriteRequestTooBigWithCompression(t *testing.T) {
 
 	resp := httptest.NewRecorder()
 
-	handler := OTLPHandler(140, nil, nil, nil, nil, RetryConfig{}, readBodyPushFunc(t), nil, nil, log.NewNopLogger())
+	handler := OTLPHandler(140, nil, nil, nil, nil, RetryConfig{}, false, readBodyPushFunc(t), nil, nil, log.NewNopLogger())
 	handler.ServeHTTP(resp, req)
 	assert.Equal(t, http.StatusRequestEntityTooLarge, resp.Code)
 	body, err := io.ReadAll(resp.Body)
diff --git a/pkg/distributor/push_test.go b/pkg/distributor/push_test.go
index 192769b1141..0e588b978e8 100644
--- a/pkg/distributor/push_test.go
+++ b/pkg/distributor/push_test.go
@@ -1183,7 +1183,7 @@ func TestOTLPPushHandlerErrorsAreReportedCorrectlyViaHttpgrpc(t *testing.T) {
 
 		return nil
 	}
-	h := OTLPHandler(200, util.NewBufferPool(0), nil, otlpLimitsMock{}, nil, RetryConfig{}, push, newPushMetrics(reg), reg, log.NewNopLogger())
+	h := OTLPHandler(200, util.NewBufferPool(0), nil, otlpLimitsMock{}, nil, RetryConfig{}, false, push, newPushMetrics(reg), reg, log.NewNopLogger())
 	srv.HTTP.Handle("/otlp", h)
 
 	// start the server

From df99a0467c3f46cec7e696af66fd886961aa7004 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Fri, 13 Dec 2024 15:13:23 +0000
Subject: [PATCH 2/8] Use mimir-prometheus from jvp/reimplement-quiet-zeros
 branch

---
 go.mod                                        |   3 +-
 go.sum                                        |  12 +-
 .../prometheus/prometheus/config/config.go    |  44 +--
 .../prometheus/model/exemplar/exemplar.go     |   2 +-
 .../prometheus/model/labels/labels.go         |   6 -
 .../prometheus/model/labels/labels_common.go  |   6 +-
 .../model/labels/labels_dedupelabels.go       |   5 -
 .../model/labels/labels_stringlabels.go       |   5 -
 .../model/textparse/openmetricsparse.go       |   2 +-
 .../prometheus/model/value/value.go           |   3 +
 .../prometheus/prometheus/promql/functions.go |  13 +-
 .../promql/parser/generated_parser.y          |   4 +-
 .../promql/parser/generated_parser.y.go       | 333 +++++++++---------
 .../prometheus/promql/parser/parse.go         |   3 +-
 .../prometheus/promql/parser/printer.go       |  17 +-
 .../prometheus/promql/promqltest/test.go      |  38 +-
 .../promql/promqltest/testdata/functions.test |  29 --
 .../prometheus/prometheus/rules/group.go      |  62 +---
 .../prometheus/prometheus/rules/manager.go    |   6 -
 .../prometheus/prometheus/scrape/scrape.go    |   1 -
 .../prometheus/normalize_name.go              |  31 +-
 .../prometheusremotewrite/helper.go           |  14 +-
 .../prometheusremotewrite/metrics_to_prw.go   |   1 +
 .../storage/remote/queue_manager.go           |   4 +-
 .../prometheus/prometheus/tsdb/head.go        |   2 +-
 .../prometheus/prometheus/tsdb/head_append.go |  11 +-
 .../prometheus/prometheus/tsdb/head_wal.go    |   7 +
 .../prometheus/tsdb/index/postings.go         |   7 +-
 .../prometheus/prometheus/tsdb/querier.go     |   2 +-
 .../prometheus/util/logging/dedupe.go         |   5 +-
 vendor/modules.txt                            |   4 +-
 31 files changed, 282 insertions(+), 400 deletions(-)

diff --git a/go.mod b/go.mod
index fcefa33f397..af69ec5db5c 100644
--- a/go.mod
+++ b/go.mod
@@ -286,8 +286,7 @@ require (
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )
 
-// Using a fork of Prometheus with Mimir-specific changes.
-replace github.com/prometheus/prometheus => github.com/grafana/mimir-prometheus v0.0.0-20241219104229-b50052711673
+replace github.com/prometheus/prometheus => github.com/grafana/mimir-prometheus v0.0.0-20241213145946-1e9d95a2e3cd
 
 // Replace memberlist with our fork which includes some fixes that haven't been
 // merged upstream yet:
diff --git a/go.sum b/go.sum
index 7c983d07a84..090bb379186 100644
--- a/go.sum
+++ b/go.sum
@@ -935,8 +935,8 @@ github.com/cncf/xds/go v0.0.0-20230105202645-06c439db220b/go.mod h1:eXthEFrGJvWH
 github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20240423153145-555b57ec207b/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8=
-github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 h1:QVw89YDxXxEe+l8gU8ETbOasdwEV+avkR75ZzsVV9WI=
-github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8=
+github.com/cncf/xds/go v0.0.0-20240723142845-024c85f92f20 h1:N+3sFI5GUjRKBi+i0TxYVST9h4Ie192jJWpHvthBBgg=
+github.com/cncf/xds/go v0.0.0-20240723142845-024c85f92f20/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8=
 github.com/colega/go-yaml-yaml v0.0.0-20220720105220-255a8d16d094 h1:FpZSn61BWXbtyH68+uSv416veEswX1M2HRyQfdHnOyQ=
 github.com/colega/go-yaml-yaml v0.0.0-20220720105220-255a8d16d094/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM=
@@ -1283,8 +1283,8 @@ github.com/grafana/gomemcache v0.0.0-20241016125027-0a5bcc5aef40 h1:1TeKhyS+pvzO
 github.com/grafana/gomemcache v0.0.0-20241016125027-0a5bcc5aef40/go.mod h1:IGRj8oOoxwJbHBYl1+OhS9UjQR0dv6SQOep7HqmtyFU=
 github.com/grafana/memberlist v0.3.1-0.20220714140823-09ffed8adbbe h1:yIXAAbLswn7VNWBIvM71O2QsgfgW9fRXZNR0DXe6pDU=
 github.com/grafana/memberlist v0.3.1-0.20220714140823-09ffed8adbbe/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE=
-github.com/grafana/mimir-prometheus v0.0.0-20241219104229-b50052711673 h1:z3nSCBMtEMtD/LAIkwrHsT03n7qgeU+0M6rEMZQbxVI=
-github.com/grafana/mimir-prometheus v0.0.0-20241219104229-b50052711673/go.mod h1:a5LEa2Vy87wOp0Vu6sLmEIR1V59fqH3QosOSiErAr30=
+github.com/grafana/mimir-prometheus v0.0.0-20241213145946-1e9d95a2e3cd h1:udN4x69ZecueBBm8cCZFtWsRmUMW/UiBLg0xBWxu9kc=
+github.com/grafana/mimir-prometheus v0.0.0-20241213145946-1e9d95a2e3cd/go.mod h1:NpYc1U0eC7m6xUh3t3Pq565KxaIc08Oaquiu71dEMi8=
 github.com/grafana/opentracing-contrib-go-stdlib v0.0.0-20230509071955-f410e79da956 h1:em1oddjXL8c1tL0iFdtVtPloq2hRPen2MJQKoAWpxu0=
 github.com/grafana/opentracing-contrib-go-stdlib v0.0.0-20230509071955-f410e79da956/go.mod h1:qtI1ogk+2JhVPIXVc6q+NHziSmy2W5GbdQZFUHADCBU=
 github.com/grafana/prometheus-alertmanager v0.25.1-0.20240930132144-b5e64e81e8d3 h1:6D2gGAwyQBElSrp3E+9lSr7k8gLuP3Aiy20rweLWeBw=
@@ -1394,8 +1394,8 @@ github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
 github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
-github.com/ionos-cloud/sdk-go/v6 v6.3.0 h1:/lTieTH9Mo/CWm3cTlFLnK10jgxjUGkAqRffGqvPteY=
-github.com/ionos-cloud/sdk-go/v6 v6.3.0/go.mod h1:SXrO9OGyWjd2rZhAhEpdYN6VUAODzzqRdqA9BCviQtI=
+github.com/ionos-cloud/sdk-go/v6 v6.2.1 h1:mxxN+frNVmbFrmmFfXnBC3g2USYJrl6mc1LW2iNYbFY=
+github.com/ionos-cloud/sdk-go/v6 v6.2.1/go.mod h1:SXrO9OGyWjd2rZhAhEpdYN6VUAODzzqRdqA9BCviQtI=
 github.com/jessevdk/go-flags v1.5.0 h1:1jKYvbxEjfUl0fmqTCOfonvskHHXMjBySTLW4y9LFvc=
 github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
 github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
diff --git a/vendor/github.com/prometheus/prometheus/config/config.go b/vendor/github.com/prometheus/prometheus/config/config.go
index 73282ac4295..86d8563536a 100644
--- a/vendor/github.com/prometheus/prometheus/config/config.go
+++ b/vendor/github.com/prometheus/prometheus/config/config.go
@@ -117,12 +117,11 @@ func Load(s string, logger *slog.Logger) (*Config, error) {
 	default:
 		return nil, fmt.Errorf("unsupported OTLP translation strategy %q", cfg.OTLPConfig.TranslationStrategy)
 	}
-	cfg.loaded = true
+
 	return cfg, nil
 }
 
-// LoadFile parses and validates the given YAML file into a read-only Config.
-// Callers should never write to or shallow copy the returned Config.
+// LoadFile parses the given YAML file into a Config.
 func LoadFile(filename string, agentMode bool, logger *slog.Logger) (*Config, error) {
 	content, err := os.ReadFile(filename)
 	if err != nil {
@@ -271,12 +270,9 @@ type Config struct {
 	RemoteWriteConfigs []*RemoteWriteConfig `yaml:"remote_write,omitempty"`
 	RemoteReadConfigs  []*RemoteReadConfig  `yaml:"remote_read,omitempty"`
 	OTLPConfig         OTLPConfig           `yaml:"otlp,omitempty"`
-
-	loaded bool // Certain methods require configuration to use Load validation.
 }
 
 // SetDirectory joins any relative file paths with dir.
-// This method writes to config, and it's not concurrency safe.
 func (c *Config) SetDirectory(dir string) {
 	c.GlobalConfig.SetDirectory(dir)
 	c.AlertingConfig.SetDirectory(dir)
@@ -306,26 +302,24 @@ func (c Config) String() string {
 	return string(b)
 }
 
-// GetScrapeConfigs returns the read-only, validated scrape configurations including
-// the ones from the scrape_config_files.
-// This method does not write to config, and it's concurrency safe (the pointer receiver is for efficiency).
-// This method also assumes the Config was created by Load or LoadFile function, it returns error
-// if it was not. We can't re-validate or apply globals here due to races,
-// read more https://github.com/prometheus/prometheus/issues/15538.
+// GetScrapeConfigs returns the scrape configurations.
 func (c *Config) GetScrapeConfigs() ([]*ScrapeConfig, error) {
-	if !c.loaded {
-		// Programmatic error, we warn before more confusing errors would happen due to lack of the globalization.
-		return nil, errors.New("scrape config cannot be fetched, main config was not validated and loaded correctly; should not happen")
-	}
-
 	scfgs := make([]*ScrapeConfig, len(c.ScrapeConfigs))
+
 	jobNames := map[string]string{}
 	for i, scfg := range c.ScrapeConfigs {
+		// We do these checks for library users that would not call validate in
+		// Unmarshal.
+		if err := scfg.Validate(c.GlobalConfig); err != nil {
+			return nil, err
+		}
+
+		if _, ok := jobNames[scfg.JobName]; ok {
+			return nil, fmt.Errorf("found multiple scrape configs with job name %q", scfg.JobName)
+		}
 		jobNames[scfg.JobName] = "main config file"
 		scfgs[i] = scfg
 	}
-
-	// Re-read and validate the dynamic scrape config rules.
 	for _, pat := range c.ScrapeConfigFiles {
 		fs, err := filepath.Glob(pat)
 		if err != nil {
@@ -361,7 +355,6 @@ func (c *Config) GetScrapeConfigs() ([]*ScrapeConfig, error) {
 }
 
 // UnmarshalYAML implements the yaml.Unmarshaler interface.
-// NOTE: This method should not be used outside of this package. Use Load or LoadFile instead.
 func (c *Config) UnmarshalYAML(unmarshal func(interface{}) error) error {
 	*c = DefaultConfig
 	// We want to set c to the defaults and then overwrite it with the input.
@@ -398,18 +391,18 @@ func (c *Config) UnmarshalYAML(unmarshal func(interface{}) error) error {
 		}
 	}
 
-	// Do global overrides and validation.
+	// Do global overrides and validate unique names.
 	jobNames := map[string]struct{}{}
 	for _, scfg := range c.ScrapeConfigs {
 		if err := scfg.Validate(c.GlobalConfig); err != nil {
 			return err
 		}
+
 		if _, ok := jobNames[scfg.JobName]; ok {
 			return fmt.Errorf("found multiple scrape configs with job name %q", scfg.JobName)
 		}
 		jobNames[scfg.JobName] = struct{}{}
 	}
-
 	rwNames := map[string]struct{}{}
 	for _, rwcfg := range c.RemoteWriteConfigs {
 		if rwcfg == nil {
@@ -1427,13 +1420,10 @@ func getGoGCEnv() int {
 type translationStrategyOption string
 
 var (
-	// NoUTF8EscapingWithSuffixes will accept metric/label names as they are.
-	// Unit and type suffixes may be added to metric names, according to certain rules.
+	// NoUTF8EscapingWithSuffixes will keep UTF-8 characters as they are, units and type suffixes will still be added.
 	NoUTF8EscapingWithSuffixes translationStrategyOption = "NoUTF8EscapingWithSuffixes"
 	// UnderscoreEscapingWithSuffixes is the default option for translating OTLP to Prometheus.
-	// This option will translate metric name characters that are not alphanumerics/underscores/colons to underscores,
-	// and label name characters that are not alphanumerics/underscores to underscores.
-	// Unit and type suffixes may be appended to metric names, according to certain rules.
+	// This option will translate all UTF-8 characters to underscores, while adding units and type suffixes.
 	UnderscoreEscapingWithSuffixes translationStrategyOption = "UnderscoreEscapingWithSuffixes"
 )
 
diff --git a/vendor/github.com/prometheus/prometheus/model/exemplar/exemplar.go b/vendor/github.com/prometheus/prometheus/model/exemplar/exemplar.go
index d03940f1b29..2c28b172571 100644
--- a/vendor/github.com/prometheus/prometheus/model/exemplar/exemplar.go
+++ b/vendor/github.com/prometheus/prometheus/model/exemplar/exemplar.go
@@ -18,7 +18,7 @@ import "github.com/prometheus/prometheus/model/labels"
 // ExemplarMaxLabelSetLength is defined by OpenMetrics: "The combined length of
 // the label names and values of an Exemplar's LabelSet MUST NOT exceed 128
 // UTF-8 characters."
-// https://github.com/prometheus/OpenMetrics/blob/v1.0.0/specification/OpenMetrics.md#exemplars
+// https://github.com/OpenObservability/OpenMetrics/blob/main/specification/OpenMetrics.md#exemplars
 const ExemplarMaxLabelSetLength = 128
 
 // Exemplar is additional information associated with a time series.
diff --git a/vendor/github.com/prometheus/prometheus/model/labels/labels.go b/vendor/github.com/prometheus/prometheus/model/labels/labels.go
index 0747ab90d92..f4de7496ce7 100644
--- a/vendor/github.com/prometheus/prometheus/model/labels/labels.go
+++ b/vendor/github.com/prometheus/prometheus/model/labels/labels.go
@@ -19,7 +19,6 @@ import (
 	"bytes"
 	"slices"
 	"strings"
-	"unsafe"
 
 	"github.com/cespare/xxhash/v2"
 )
@@ -489,8 +488,3 @@ func (b *ScratchBuilder) Labels() Labels {
 func (b *ScratchBuilder) Overwrite(ls *Labels) {
 	*ls = append((*ls)[:0], b.add...)
 }
-
-// SizeOfLabels returns the approximate space required for n copies of a label.
-func SizeOfLabels(name, value string, n uint64) uint64 {
-	return (uint64(len(name)) + uint64(unsafe.Sizeof(name)) + uint64(len(value)) + uint64(unsafe.Sizeof(value))) * n
-}
diff --git a/vendor/github.com/prometheus/prometheus/model/labels/labels_common.go b/vendor/github.com/prometheus/prometheus/model/labels/labels_common.go
index a232eeea5d3..99529a38367 100644
--- a/vendor/github.com/prometheus/prometheus/model/labels/labels_common.go
+++ b/vendor/github.com/prometheus/prometheus/model/labels/labels_common.go
@@ -51,11 +51,7 @@ func (ls Labels) String() string {
 			b.WriteByte(',')
 			b.WriteByte(' ')
 		}
-		if !model.LabelName(l.Name).IsValidLegacy() {
-			b.Write(strconv.AppendQuote(b.AvailableBuffer(), l.Name))
-		} else {
-			b.WriteString(l.Name)
-		}
+		b.WriteString(l.Name)
 		b.WriteByte('=')
 		b.Write(strconv.AppendQuote(b.AvailableBuffer(), l.Value))
 		i++
diff --git a/vendor/github.com/prometheus/prometheus/model/labels/labels_dedupelabels.go b/vendor/github.com/prometheus/prometheus/model/labels/labels_dedupelabels.go
index a0d83e00447..da8a88cc158 100644
--- a/vendor/github.com/prometheus/prometheus/model/labels/labels_dedupelabels.go
+++ b/vendor/github.com/prometheus/prometheus/model/labels/labels_dedupelabels.go
@@ -815,8 +815,3 @@ func (b *ScratchBuilder) Overwrite(ls *Labels) {
 	ls.syms = b.syms.nameTable
 	ls.data = yoloString(b.overwriteBuffer)
 }
-
-// SizeOfLabels returns the approximate space required for n copies of a label.
-func SizeOfLabels(name, value string, n uint64) uint64 {
-	return uint64(len(name)+len(value)) + n*4 // Assuming most symbol-table entries are 2 bytes long.
-}
diff --git a/vendor/github.com/prometheus/prometheus/model/labels/labels_stringlabels.go b/vendor/github.com/prometheus/prometheus/model/labels/labels_stringlabels.go
index f49ed96f650..c64bb990e02 100644
--- a/vendor/github.com/prometheus/prometheus/model/labels/labels_stringlabels.go
+++ b/vendor/github.com/prometheus/prometheus/model/labels/labels_stringlabels.go
@@ -691,8 +691,3 @@ func NewScratchBuilderWithSymbolTable(_ *SymbolTable, n int) ScratchBuilder {
 func (b *ScratchBuilder) SetSymbolTable(_ *SymbolTable) {
 	// no-op
 }
-
-// SizeOfLabels returns the approximate space required for n copies of a label.
-func SizeOfLabels(name, value string, n uint64) uint64 {
-	return uint64(labelSize(&Label{Name: name, Value: value})) * n
-}
diff --git a/vendor/github.com/prometheus/prometheus/model/textparse/openmetricsparse.go b/vendor/github.com/prometheus/prometheus/model/textparse/openmetricsparse.go
index f0dd51afeed..16e805f3a93 100644
--- a/vendor/github.com/prometheus/prometheus/model/textparse/openmetricsparse.go
+++ b/vendor/github.com/prometheus/prometheus/model/textparse/openmetricsparse.go
@@ -337,7 +337,7 @@ func (p *OpenMetricsParser) CreatedTimestamp() *int64 {
 		}
 
 		// All timestamps in OpenMetrics are Unix Epoch in seconds. Convert to milliseconds.
-		// https://github.com/prometheus/OpenMetrics/blob/v1.0.0/specification/OpenMetrics.md#timestamps
+		// https://github.com/OpenObservability/OpenMetrics/blob/main/specification/OpenMetrics.md#timestamps
 		ct := int64(p.val * 1000.0)
 		p.setCTParseValues(ct, currHash, currName, true)
 		return &ct
diff --git a/vendor/github.com/prometheus/prometheus/model/value/value.go b/vendor/github.com/prometheus/prometheus/model/value/value.go
index 655ce852d51..d3dd9b996fe 100644
--- a/vendor/github.com/prometheus/prometheus/model/value/value.go
+++ b/vendor/github.com/prometheus/prometheus/model/value/value.go
@@ -26,6 +26,9 @@ const (
 	// complicated values in the future. It is 2 rather than 1 to make
 	// it easier to distinguish from the NormalNaN by a human when debugging.
 	StaleNaN uint64 = 0x7ff0000000000002
+
+	// QuietZeroNaN signals TSDB to add a zero, but do nothing if there is already a value at that timestamp.
+	QuietZeroNaN uint64 = 0x7ff0000000000003
 )
 
 // IsStaleNaN returns true when the provided NaN value is a stale marker.
diff --git a/vendor/github.com/prometheus/prometheus/promql/functions.go b/vendor/github.com/prometheus/prometheus/promql/functions.go
index da1821fd18a..016e676d316 100644
--- a/vendor/github.com/prometheus/prometheus/promql/functions.go
+++ b/vendor/github.com/prometheus/prometheus/promql/functions.go
@@ -345,14 +345,11 @@ func calcTrendValue(i int, tf, s0, s1, b float64) float64 {
 	return x + y
 }
 
-// Double exponential smoothing is similar to a weighted moving average, where
-// historical data has exponentially less influence on the current data. It also
-// accounts for trends in data. The smoothing factor (0 < sf < 1) affects how
-// historical data will affect the current data. A lower smoothing factor
-// increases the influence of historical data. The trend factor (0 < tf < 1)
-// affects how trends in historical data will affect the current data. A higher
-// trend factor increases the influence. of trends. Algorithm taken from
-// https://en.wikipedia.org/wiki/Exponential_smoothing .
+// Holt-Winters is similar to a weighted moving average, where historical data has exponentially less influence on the current data.
+// Holt-Winter also accounts for trends in data. The smoothing factor (0 < sf < 1) affects how historical data will affect the current
+// data. A lower smoothing factor increases the influence of historical data. The trend factor (0 < tf < 1) affects
+// how trends in historical data will affect the current data. A higher trend factor increases the influence.
+// of trends. Algorithm taken from https://en.wikipedia.org/wiki/Exponential_smoothing titled: "Double exponential smoothing".
 func funcDoubleExponentialSmoothing(vals []parser.Value, args parser.Expressions, enh *EvalNodeHelper) (Vector, annotations.Annotations) {
 	samples := vals[0].(Matrix)[0]
 
diff --git a/vendor/github.com/prometheus/prometheus/promql/parser/generated_parser.y b/vendor/github.com/prometheus/prometheus/promql/parser/generated_parser.y
index 3865dc6548d..c321a1e9735 100644
--- a/vendor/github.com/prometheus/prometheus/promql/parser/generated_parser.y
+++ b/vendor/github.com/prometheus/prometheus/promql/parser/generated_parser.y
@@ -669,14 +669,14 @@ label_set_item  : IDENTIFIER EQL STRING
                         { $$ = labels.Label{Name: $1.Val, Value: yylex.(*parser).unquoteString($3.Val) } }
                 | string_identifier EQL STRING
                         { $$ = labels.Label{Name: $1.Val, Value: yylex.(*parser).unquoteString($3.Val) } }
-                | string_identifier
-                        { $$ = labels.Label{Name: labels.MetricName, Value: $1.Val} }
                 | IDENTIFIER EQL error
                         { yylex.(*parser).unexpected("label set", "string"); $$ = labels.Label{}}
                 | string_identifier EQL error
                         { yylex.(*parser).unexpected("label set", "string"); $$ = labels.Label{}}
                 | IDENTIFIER error
                         { yylex.(*parser).unexpected("label set", "\"=\""); $$ = labels.Label{}}
+                | string_identifier error
+                        { yylex.(*parser).unexpected("label set", "\"=\""); $$ = labels.Label{}}
                 | error
                         { yylex.(*parser).unexpected("label set", "identifier or \"}\""); $$ = labels.Label{} }
                 ;
diff --git a/vendor/github.com/prometheus/prometheus/promql/parser/generated_parser.y.go b/vendor/github.com/prometheus/prometheus/promql/parser/generated_parser.y.go
index 7ff8591169b..8979410ceb4 100644
--- a/vendor/github.com/prometheus/prometheus/promql/parser/generated_parser.y.go
+++ b/vendor/github.com/prometheus/prometheus/promql/parser/generated_parser.y.go
@@ -339,7 +339,7 @@ var yyExca = [...]int16{
 	79, 197,
 	85, 197,
 	-2, 125,
-	-1, 204,
+	-1, 205,
 	9, 246,
 	12, 246,
 	13, 246,
@@ -371,7 +371,7 @@ var yyExca = [...]int16{
 	88, 246,
 	89, 246,
 	-2, 0,
-	-1, 205,
+	-1, 206,
 	9, 246,
 	12, 246,
 	13, 246,
@@ -407,139 +407,139 @@ var yyExca = [...]int16{
 
 const yyPrivate = 57344
 
-const yyLast = 803
+const yyLast = 804
 
 var yyAct = [...]int16{
-	154, 338, 336, 157, 343, 230, 39, 196, 280, 44,
-	295, 294, 84, 120, 82, 233, 180, 109, 108, 350,
-	351, 352, 353, 110, 111, 243, 202, 158, 203, 135,
-	112, 249, 361, 6, 333, 329, 113, 332, 232, 204,
-	205, 308, 271, 60, 130, 270, 297, 268, 162, 315,
-	156, 360, 153, 306, 359, 344, 200, 162, 161, 55,
-	245, 246, 222, 115, 247, 116, 107, 161, 269, 54,
-	267, 114, 260, 306, 182, 234, 236, 238, 239, 240,
-	248, 250, 253, 254, 255, 256, 257, 261, 262, 163,
-	122, 235, 237, 241, 242, 244, 251, 252, 192, 328,
-	111, 258, 259, 117, 190, 164, 112, 152, 103, 55,
-	106, 337, 77, 113, 184, 151, 35, 165, 327, 54,
-	175, 191, 169, 172, 183, 185, 167, 189, 168, 2,
-	3, 4, 5, 107, 198, 105, 159, 160, 201, 186,
-	188, 7, 326, 206, 207, 208, 209, 210, 211, 212,
-	213, 214, 215, 216, 217, 218, 219, 220, 199, 194,
-	89, 91, 221, 162, 264, 325, 197, 223, 224, 171,
-	200, 100, 101, 161, 162, 103, 104, 106, 90, 263,
-	233, 324, 170, 162, 161, 323, 362, 322, 321, 274,
-	243, 122, 266, 161, 131, 163, 249, 272, 123, 320,
-	229, 319, 105, 232, 275, 318, 163, 317, 121, 85,
-	316, 164, 163, 292, 293, 163, 265, 296, 129, 83,
-	276, 86, 164, 273, 10, 245, 246, 187, 164, 247,
-	88, 164, 86, 50, 79, 36, 298, 260, 1, 78,
-	234, 236, 238, 239, 240, 248, 250, 253, 254, 255,
-	256, 257, 261, 262, 123, 49, 235, 237, 241, 242,
-	244, 251, 252, 181, 121, 182, 258, 259, 128, 48,
-	127, 304, 119, 305, 307, 59, 309, 86, 9, 9,
-	47, 46, 134, 310, 311, 136, 137, 138, 139, 140,
+	155, 339, 337, 158, 344, 231, 39, 197, 281, 44,
+	296, 295, 84, 120, 82, 181, 109, 108, 351, 352,
+	353, 354, 107, 111, 203, 136, 204, 159, 154, 112,
+	205, 206, 234, 6, 271, 55, 163, 163, 107, 334,
+	333, 307, 244, 275, 309, 54, 162, 162, 250, 363,
+	91, 272, 330, 131, 362, 233, 60, 270, 276, 110,
+	100, 101, 298, 115, 103, 116, 106, 90, 164, 164,
+	114, 265, 113, 361, 277, 307, 360, 246, 247, 338,
+	103, 248, 106, 153, 165, 165, 264, 316, 201, 261,
+	122, 105, 235, 237, 239, 240, 241, 249, 251, 254,
+	255, 256, 257, 258, 262, 263, 273, 105, 236, 238,
+	242, 243, 245, 252, 253, 152, 117, 166, 259, 260,
+	176, 164, 170, 173, 163, 168, 223, 169, 172, 2,
+	3, 4, 5, 107, 162, 199, 111, 165, 187, 202,
+	189, 171, 112, 269, 207, 208, 209, 210, 211, 212,
+	213, 214, 215, 216, 217, 218, 219, 220, 221, 200,
+	89, 91, 113, 222, 123, 193, 268, 329, 224, 225,
+	183, 100, 101, 191, 121, 103, 104, 106, 90, 7,
+	85, 234, 266, 182, 55, 183, 328, 86, 192, 123,
+	83, 244, 122, 267, 54, 132, 190, 250, 188, 121,
+	345, 230, 105, 86, 233, 77, 35, 119, 304, 10,
+	185, 327, 86, 303, 293, 294, 157, 315, 297, 79,
+	184, 186, 326, 163, 274, 185, 246, 247, 302, 325,
+	248, 324, 314, 162, 323, 184, 186, 299, 261, 313,
+	322, 235, 237, 239, 240, 241, 249, 251, 254, 255,
+	256, 257, 258, 262, 263, 164, 321, 236, 238, 242,
+	243, 245, 252, 253, 180, 126, 320, 259, 260, 179,
+	125, 165, 305, 319, 306, 308, 318, 310, 317, 130,
+	88, 129, 178, 124, 311, 312, 137, 138, 139, 140,
 	141, 142, 143, 144, 145, 146, 147, 148, 149, 150,
-	45, 43, 132, 173, 179, 184, 166, 85, 330, 178,
-	331, 42, 133, 55, 41, 183, 185, 83, 339, 340,
-	341, 335, 177, 54, 342, 81, 346, 345, 348, 347,
-	86, 303, 40, 314, 354, 355, 302, 55, 51, 356,
-	53, 77, 300, 56, 195, 358, 22, 54, 313, 55,
-	174, 301, 227, 57, 8, 312, 226, 357, 37, 54,
-	363, 299, 126, 277, 87, 193, 228, 125, 80, 75,
-	349, 225, 155, 58, 231, 18, 19, 52, 118, 20,
-	124, 0, 0, 0, 0, 76, 0, 0, 0, 0,
+	151, 195, 160, 161, 50, 163, 36, 167, 198, 331,
+	78, 332, 201, 228, 55, 162, 85, 227, 1, 340,
+	341, 342, 336, 49, 54, 343, 83, 347, 346, 349,
+	348, 48, 226, 47, 81, 355, 356, 164, 55, 86,
+	357, 53, 77, 301, 56, 8, 359, 22, 54, 37,
+	55, 175, 46, 165, 57, 128, 135, 127, 45, 43,
+	54, 364, 300, 59, 133, 174, 9, 9, 42, 134,
+	75, 41, 40, 51, 196, 358, 18, 19, 278, 87,
+	20, 194, 229, 80, 350, 156, 76, 58, 232, 52,
+	118, 61, 62, 63, 64, 65, 66, 67, 68, 69,
+	70, 71, 72, 73, 74, 0, 0, 0, 13, 0,
+	0, 0, 24, 0, 30, 0, 0, 31, 32, 55,
+	38, 0, 53, 77, 0, 56, 280, 0, 22, 54,
+	0, 0, 0, 279, 0, 57, 0, 283, 284, 282,
+	289, 291, 288, 290, 285, 286, 287, 292, 0, 0,
+	0, 75, 0, 0, 0, 0, 0, 18, 19, 0,
+	0, 20, 0, 0, 0, 0, 0, 76, 0, 0,
+	0, 0, 61, 62, 63, 64, 65, 66, 67, 68,
+	69, 70, 71, 72, 73, 74, 0, 0, 0, 13,
+	0, 0, 0, 24, 0, 30, 0, 55, 31, 32,
+	53, 77, 0, 56, 335, 0, 22, 54, 0, 0,
+	0, 0, 0, 57, 0, 283, 284, 282, 289, 291,
+	288, 290, 285, 286, 287, 292, 0, 0, 0, 75,
+	0, 0, 0, 0, 0, 18, 19, 0, 0, 20,
+	0, 0, 0, 17, 77, 76, 0, 0, 0, 22,
 	61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
 	71, 72, 73, 74, 0, 0, 0, 13, 0, 0,
-	0, 24, 0, 30, 0, 0, 31, 32, 55, 38,
-	107, 53, 77, 0, 56, 279, 0, 22, 54, 0,
-	0, 0, 278, 0, 57, 0, 282, 283, 281, 288,
-	290, 287, 289, 284, 285, 286, 291, 0, 91, 0,
-	75, 0, 0, 0, 0, 0, 18, 19, 100, 101,
-	20, 0, 103, 0, 106, 90, 76, 0, 0, 0,
-	0, 61, 62, 63, 64, 65, 66, 67, 68, 69,
-	70, 71, 72, 73, 74, 0, 0, 0, 13, 105,
-	0, 0, 24, 0, 30, 0, 55, 31, 32, 53,
-	77, 0, 56, 334, 0, 22, 54, 0, 0, 0,
-	0, 0, 57, 0, 282, 283, 281, 288, 290, 287,
-	289, 284, 285, 286, 291, 0, 0, 0, 75, 0,
-	0, 0, 0, 0, 18, 19, 0, 0, 20, 0,
-	0, 0, 17, 77, 76, 0, 0, 0, 22, 61,
-	62, 63, 64, 65, 66, 67, 68, 69, 70, 71,
-	72, 73, 74, 0, 0, 0, 13, 0, 0, 0,
-	24, 0, 30, 0, 0, 31, 32, 18, 19, 0,
-	0, 20, 0, 0, 0, 17, 35, 0, 0, 0,
-	0, 22, 11, 12, 14, 15, 16, 21, 23, 25,
-	26, 27, 28, 29, 33, 34, 0, 0, 0, 13,
-	0, 0, 0, 24, 0, 30, 0, 0, 31, 32,
-	18, 19, 0, 0, 20, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 11, 12, 14, 15, 16,
-	21, 23, 25, 26, 27, 28, 29, 33, 34, 107,
-	0, 0, 13, 0, 0, 0, 24, 176, 30, 0,
-	0, 31, 32, 0, 0, 0, 0, 0, 107, 0,
-	0, 0, 0, 0, 0, 0, 89, 91, 92, 0,
+	0, 24, 0, 30, 0, 0, 31, 32, 18, 19,
+	0, 0, 20, 0, 0, 0, 17, 35, 0, 0,
+	0, 0, 22, 11, 12, 14, 15, 16, 21, 23,
+	25, 26, 27, 28, 29, 33, 34, 0, 0, 0,
+	13, 0, 0, 0, 24, 0, 30, 0, 0, 31,
+	32, 18, 19, 0, 0, 20, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 11, 12, 14, 15,
+	16, 21, 23, 25, 26, 27, 28, 29, 33, 34,
+	107, 0, 0, 13, 0, 0, 0, 24, 177, 30,
+	0, 0, 31, 32, 0, 0, 0, 0, 0, 107,
+	0, 0, 0, 0, 0, 0, 0, 89, 91, 92,
+	0, 93, 94, 95, 96, 97, 98, 99, 100, 101,
+	102, 0, 103, 104, 106, 90, 89, 91, 92, 0,
 	93, 94, 95, 96, 97, 98, 99, 100, 101, 102,
-	0, 103, 104, 106, 90, 89, 91, 92, 0, 93,
-	94, 95, 96, 97, 98, 99, 100, 101, 102, 0,
-	103, 104, 106, 90, 107, 0, 0, 0, 105, 0,
+	0, 103, 104, 106, 90, 107, 0, 0, 0, 105,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 107, 0, 0, 0, 105, 0, 0,
-	0, 89, 91, 92, 0, 93, 94, 95, 0, 97,
-	98, 99, 100, 101, 102, 0, 103, 104, 106, 90,
-	89, 91, 92, 0, 93, 94, 0, 0, 97, 98,
-	0, 100, 101, 102, 0, 103, 104, 106, 90, 0,
-	0, 0, 0, 105, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 107, 0, 0, 0, 105, 0,
+	0, 0, 89, 91, 92, 0, 93, 94, 95, 0,
+	97, 98, 99, 100, 101, 102, 0, 103, 104, 106,
+	90, 89, 91, 92, 0, 93, 94, 0, 0, 97,
+	98, 0, 100, 101, 102, 0, 103, 104, 106, 90,
+	0, 0, 0, 0, 105, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 105,
+	0, 0, 0, 105,
 }
 
 var yyPact = [...]int16{
-	31, 131, 573, 573, 409, 530, -1000, -1000, -1000, 103,
+	31, 169, 574, 574, 410, 531, -1000, -1000, -1000, 193,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, -1000, 305, -1000, 228, -1000, 654,
+	-1000, -1000, -1000, -1000, -1000, 314, -1000, 278, -1000, 655,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, 21, 98, -1000, -1000, 487, -1000, 487, 99,
+	-1000, -1000, 57, 147, -1000, -1000, 488, -1000, 488, 192,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, -1000, -1000, -1000, 252, -1000, -1000,
-	360, -1000, -1000, 266, 214, -1000, -1000, 20, -1000, -49,
-	-49, -49, -49, -49, -49, -49, -49, -49, -49, -49,
-	-49, -49, -49, -49, -49, 50, 48, 304, 98, -55,
-	-1000, 167, 167, 328, -1000, 635, 52, -1000, 302, -1000,
-	-1000, 261, 70, -1000, -1000, 207, -1000, 102, -1000, 96,
-	154, 487, -1000, -56, -41, -1000, 487, 487, 487, 487,
-	487, 487, 487, 487, 487, 487, 487, 487, 487, 487,
-	487, -1000, 100, -1000, -1000, 47, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, 39, 39, 350, -1000, -1000, -1000, -1000,
-	178, -1000, -1000, 157, -1000, 654, -1000, -1000, 196, -1000,
-	45, -1000, -1000, -1000, -1000, -1000, 43, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, 16, 171, 163, -1000, -1000, -1000,
-	408, 406, 167, 167, 167, 167, 52, 52, 119, 119,
-	119, 719, 700, 119, 119, 719, 52, 52, 119, 52,
-	406, -1000, 24, -1000, -1000, -1000, 340, -1000, 329, -1000,
+	-1000, -1000, -1000, -1000, -1000, -1000, -1000, 187, -1000, -1000,
+	263, -1000, -1000, 353, 277, -1000, -1000, 29, -1000, -53,
+	-53, -53, -53, -53, -53, -53, -53, -53, -53, -53,
+	-53, -53, -53, -53, -53, 26, 214, 305, 147, -56,
+	-1000, 126, 126, 329, -1000, 636, 24, -1000, 262, -1000,
+	-1000, 181, 166, -1000, -1000, 178, -1000, 171, -1000, 163,
+	-1000, 296, 488, -1000, -58, -50, -1000, 488, 488, 488,
+	488, 488, 488, 488, 488, 488, 488, 488, 488, 488,
+	488, 488, -1000, 175, -1000, -1000, 111, -1000, -1000, -1000,
+	-1000, -1000, -1000, -1000, 115, 115, 311, -1000, -1000, -1000,
+	-1000, 179, -1000, -1000, 64, -1000, 655, -1000, -1000, 162,
+	-1000, 141, -1000, -1000, -1000, -1000, -1000, 32, -1000, -1000,
+	-1000, -1000, -1000, -1000, -1000, 25, 80, 17, -1000, -1000,
+	-1000, 409, 8, 126, 126, 126, 126, 24, 24, 119,
+	119, 119, 720, 701, 119, 119, 720, 24, 24, 119,
+	24, 8, -1000, 40, -1000, -1000, -1000, 341, -1000, 206,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, 487, -1000, -1000, -1000, -1000, -1000,
-	-1000, 34, 34, 15, 34, 40, 40, 331, 32, -1000,
-	-1000, 204, 201, 199, 195, 193, 182, 181, 179, 175,
-	159, 136, -1000, -1000, -1000, -1000, -1000, -1000, 97, -1000,
-	-1000, -1000, 13, -1000, 654, -1000, -1000, -1000, 34, -1000,
-	11, 8, 486, -1000, -1000, -1000, 54, 174, 174, 174,
-	39, 41, 41, 54, 41, 54, -73, -1000, -1000, -1000,
-	-1000, -1000, 34, 34, -1000, -1000, -1000, 34, -1000, -1000,
-	-1000, -1000, -1000, -1000, 174, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, -1000, -1000, -1000, 30, -1000, 165,
-	-1000, -1000, -1000, -1000,
+	-1000, -1000, -1000, -1000, -1000, 488, -1000, -1000, -1000, -1000,
+	-1000, -1000, 56, 56, 18, 56, 72, 72, 215, 70,
+	-1000, -1000, 272, 270, 267, 260, 250, 234, 228, 225,
+	223, 216, 205, -1000, -1000, -1000, -1000, -1000, -1000, 165,
+	-1000, -1000, -1000, 30, -1000, 655, -1000, -1000, -1000, 56,
+	-1000, 14, 13, 487, -1000, -1000, -1000, 22, 27, 27,
+	27, 115, 186, 186, 22, 186, 22, -74, -1000, -1000,
+	-1000, -1000, -1000, 56, 56, -1000, -1000, -1000, 56, -1000,
+	-1000, -1000, -1000, -1000, -1000, 27, -1000, -1000, -1000, -1000,
+	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 52, -1000,
+	28, -1000, -1000, -1000, -1000,
 }
 
 var yyPgo = [...]int16{
-	0, 378, 13, 377, 5, 16, 374, 275, 373, 372,
-	12, 370, 224, 354, 368, 14, 366, 10, 11, 365,
-	364, 7, 363, 8, 4, 357, 2, 1, 3, 344,
-	27, 0, 338, 332, 18, 194, 314, 312, 6, 311,
-	303, 17, 302, 43, 301, 9, 300, 282, 281, 280,
-	269, 255, 233, 238, 235,
+	0, 390, 13, 389, 5, 15, 388, 363, 387, 385,
+	12, 384, 209, 345, 383, 14, 382, 10, 11, 381,
+	379, 7, 378, 8, 4, 375, 2, 1, 3, 374,
+	27, 0, 373, 372, 17, 195, 371, 369, 6, 368,
+	365, 16, 364, 56, 359, 9, 358, 356, 352, 333,
+	331, 323, 304, 318, 306,
 }
 
 var yyR1 = [...]int8{
@@ -584,7 +584,7 @@ var yyR2 = [...]int8{
 	2, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 3, 4, 2, 0,
-	3, 1, 2, 3, 3, 1, 3, 3, 2, 1,
+	3, 1, 2, 3, 3, 3, 3, 2, 2, 1,
 	2, 0, 3, 2, 1, 1, 3, 1, 3, 4,
 	1, 3, 5, 5, 1, 1, 1, 4, 3, 3,
 	2, 3, 1, 2, 3, 3, 3, 3, 3, 3,
@@ -612,30 +612,30 @@ var yyChk = [...]int16{
 	52, 53, 54, 56, 57, 83, 58, 14, -34, -41,
 	2, 79, 85, 15, -41, -38, -38, -43, -1, 20,
 	-2, 12, -10, 2, 20, 7, 2, 4, 2, 4,
-	24, -35, -42, -37, -47, 78, -35, -35, -35, -35,
+	2, 24, -35, -42, -37, -47, 78, -35, -35, -35,
 	-35, -35, -35, -35, -35, -35, -35, -35, -35, -35,
-	-35, -45, 57, 2, -31, -9, 2, -28, -30, 88,
-	89, 19, 9, 41, 57, -45, 2, -41, -34, -17,
-	15, 2, -17, -40, 22, -38, 22, 20, 7, 2,
-	-5, 2, 4, 54, 44, 55, -5, 20, -15, 25,
-	2, 25, 2, -19, 5, -29, -21, 12, -28, -30,
-	16, -38, 82, 84, 80, 81, -38, -38, -38, -38,
+	-35, -35, -45, 57, 2, -31, -9, 2, -28, -30,
+	88, 89, 19, 9, 41, 57, -45, 2, -41, -34,
+	-17, 15, 2, -17, -40, 22, -38, 22, 20, 7,
+	2, -5, 2, 4, 54, 44, 55, -5, 20, -15,
+	25, 2, 25, 2, -19, 5, -29, -21, 12, -28,
+	-30, 16, -38, 82, 84, 80, 81, -38, -38, -38,
 	-38, -38, -38, -38, -38, -38, -38, -38, -38, -38,
-	-38, -45, 15, -28, -28, 21, 6, 2, -16, 22,
-	-4, -6, 25, 2, 62, 78, 63, 79, 64, 65,
-	66, 80, 81, 12, 82, 47, 48, 51, 67, 18,
-	68, 83, 84, 69, 70, 71, 72, 73, 88, 89,
-	59, 74, 75, 22, 7, 20, -2, 25, 2, 25,
-	2, 26, 26, -30, 26, 41, 57, -22, 24, 17,
-	-23, 30, 28, 29, 35, 36, 37, 33, 31, 34,
-	32, 38, -17, -17, -18, -17, -18, 22, -45, 21,
-	2, 22, 7, 2, -38, -27, 19, -27, 26, -27,
-	-21, -21, 24, 17, 2, 17, 6, 6, 6, 6,
-	6, 6, 6, 6, 6, 6, 6, 21, 2, 22,
-	-4, -27, 26, 26, 17, -23, -26, 57, -27, -31,
-	-31, -31, -28, -24, 14, -24, -26, -24, -26, -11,
-	92, 93, 94, 95, -27, -27, -27, -25, -31, 24,
-	21, 2, 21, -31,
+	-38, -38, -45, 15, -28, -28, 21, 6, 2, -16,
+	22, -4, -6, 25, 2, 62, 78, 63, 79, 64,
+	65, 66, 80, 81, 12, 82, 47, 48, 51, 67,
+	18, 68, 83, 84, 69, 70, 71, 72, 73, 88,
+	89, 59, 74, 75, 22, 7, 20, -2, 25, 2,
+	25, 2, 26, 26, -30, 26, 41, 57, -22, 24,
+	17, -23, 30, 28, 29, 35, 36, 37, 33, 31,
+	34, 32, 38, -17, -17, -18, -17, -18, 22, -45,
+	21, 2, 22, 7, 2, -38, -27, 19, -27, 26,
+	-27, -21, -21, 24, 17, 2, 17, 6, 6, 6,
+	6, 6, 6, 6, 6, 6, 6, 6, 21, 2,
+	22, -4, -27, 26, 26, 17, -23, -26, 57, -27,
+	-31, -31, -31, -28, -24, 14, -24, -26, -24, -26,
+	-11, 92, 93, 94, 95, -27, -27, -27, -25, -31,
+	24, 21, 2, 21, -31,
 }
 
 var yyDef = [...]int16{
@@ -647,35 +647,35 @@ var yyDef = [...]int16{
 	18, 19, 0, 108, 233, 234, 0, 244, 0, 85,
 	86, -2, -2, -2, -2, -2, -2, -2, -2, -2,
 	-2, -2, -2, -2, -2, 227, 228, 0, 5, 100,
-	0, 128, 131, 0, 135, 139, 245, 140, 144, 43,
+	0, 128, 131, 0, 0, 139, 245, 140, 144, 43,
 	43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
 	43, 43, 43, 43, 43, 0, 0, 0, 0, 22,
 	23, 0, 0, 0, 61, 0, 83, 84, 0, 89,
-	91, 0, 95, 99, 126, 0, 132, 0, 138, 0,
-	143, 0, 42, 47, 48, 44, 0, 0, 0, 0,
+	91, 0, 95, 99, 126, 0, 132, 0, 137, 0,
+	138, 143, 0, 42, 47, 48, 44, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 68, 0, 70, 71, 0, 73, 239, 240, 74,
-	75, 235, 236, 0, 0, 0, 82, 20, 21, 24,
-	0, 54, 25, 0, 63, 65, 67, 87, 0, 92,
-	0, 98, 229, 230, 231, 232, 0, 127, 130, 133,
-	136, 134, 137, 142, 145, 147, 150, 154, 155, 156,
-	0, 26, 0, 0, -2, -2, 27, 28, 29, 30,
-	31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
-	41, 69, 0, 237, 238, 76, 0, 81, 0, 53,
-	56, 58, 59, 60, 198, 199, 200, 201, 202, 203,
-	204, 205, 206, 207, 208, 209, 210, 211, 212, 213,
-	214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
-	224, 225, 226, 62, 66, 88, 90, 93, 97, 94,
-	96, 0, 0, 0, 0, 0, 0, 0, 0, 160,
-	162, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 45, 46, 49, 247, 50, 72, 0, 78,
-	80, 51, 0, 57, 64, 146, 241, 148, 0, 151,
-	0, 0, 0, 158, 163, 159, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 77, 79, 52,
-	55, 149, 0, 0, 157, 161, 164, 0, 243, 165,
-	166, 167, 168, 169, 0, 170, 171, 172, 173, 174,
-	180, 181, 182, 183, 152, 153, 242, 0, 178, 0,
-	176, 179, 175, 177,
+	0, 0, 68, 0, 70, 71, 0, 73, 239, 240,
+	74, 75, 235, 236, 0, 0, 0, 82, 20, 21,
+	24, 0, 54, 25, 0, 63, 65, 67, 87, 0,
+	92, 0, 98, 229, 230, 231, 232, 0, 127, 130,
+	133, 135, 134, 136, 142, 145, 147, 150, 154, 155,
+	156, 0, 26, 0, 0, -2, -2, 27, 28, 29,
+	30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+	40, 41, 69, 0, 237, 238, 76, 0, 81, 0,
+	53, 56, 58, 59, 60, 198, 199, 200, 201, 202,
+	203, 204, 205, 206, 207, 208, 209, 210, 211, 212,
+	213, 214, 215, 216, 217, 218, 219, 220, 221, 222,
+	223, 224, 225, 226, 62, 66, 88, 90, 93, 97,
+	94, 96, 0, 0, 0, 0, 0, 0, 0, 0,
+	160, 162, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 45, 46, 49, 247, 50, 72, 0,
+	78, 80, 51, 0, 57, 64, 146, 241, 148, 0,
+	151, 0, 0, 0, 158, 163, 159, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 77, 79,
+	52, 55, 149, 0, 0, 157, 161, 164, 0, 243,
+	165, 166, 167, 168, 169, 0, 170, 171, 172, 173,
+	174, 180, 181, 182, 183, 152, 153, 242, 0, 178,
+	0, 176, 179, 175, 177,
 }
 
 var yyTok1 = [...]int8{
@@ -1623,9 +1623,10 @@ yydefault:
 			yyVAL.label = labels.Label{Name: yyDollar[1].item.Val, Value: yylex.(*parser).unquoteString(yyDollar[3].item.Val)}
 		}
 	case 135:
-		yyDollar = yyS[yypt-1 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		{
-			yyVAL.label = labels.Label{Name: labels.MetricName, Value: yyDollar[1].item.Val}
+			yylex.(*parser).unexpected("label set", "string")
+			yyVAL.label = labels.Label{}
 		}
 	case 136:
 		yyDollar = yyS[yypt-3 : yypt+1]
@@ -1634,9 +1635,9 @@ yydefault:
 			yyVAL.label = labels.Label{}
 		}
 	case 137:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-2 : yypt+1]
 		{
-			yylex.(*parser).unexpected("label set", "string")
+			yylex.(*parser).unexpected("label set", "\"=\"")
 			yyVAL.label = labels.Label{}
 		}
 	case 138:
diff --git a/vendor/github.com/prometheus/prometheus/promql/parser/parse.go b/vendor/github.com/prometheus/prometheus/promql/parser/parse.go
index 9d38fd2d6dc..e8abe90194f 100644
--- a/vendor/github.com/prometheus/prometheus/promql/parser/parse.go
+++ b/vendor/github.com/prometheus/prometheus/promql/parser/parse.go
@@ -244,8 +244,7 @@ type seriesDescription struct {
 	values []SequenceValue
 }
 
-// ParseSeriesDesc parses the description of a time series. It is only used in
-// the PromQL testing framework code.
+// ParseSeriesDesc parses the description of a time series.
 func ParseSeriesDesc(input string) (labels labels.Labels, values []SequenceValue, err error) {
 	p := NewParser(input)
 	p.lex.seriesDesc = true
diff --git a/vendor/github.com/prometheus/prometheus/promql/parser/printer.go b/vendor/github.com/prometheus/prometheus/promql/parser/printer.go
index afe755e7dd4..63b19508276 100644
--- a/vendor/github.com/prometheus/prometheus/promql/parser/printer.go
+++ b/vendor/github.com/prometheus/prometheus/promql/parser/printer.go
@@ -14,10 +14,8 @@
 package parser
 
 import (
-	"bytes"
 	"fmt"
 	"sort"
-	"strconv"
 	"strings"
 	"time"
 
@@ -93,20 +91,13 @@ func (node *AggregateExpr) getAggOpStr() string {
 }
 
 func joinLabels(ss []string) string {
-	var bytea [1024]byte // On stack to avoid memory allocation while building the output.
-	b := bytes.NewBuffer(bytea[:0])
-
 	for i, s := range ss {
-		if i > 0 {
-			b.WriteString(", ")
-		}
-		if !model.IsValidLegacyMetricName(string(model.LabelValue(s))) {
-			b.Write(strconv.AppendQuote(b.AvailableBuffer(), s))
-		} else {
-			b.WriteString(s)
+		// If the label is already quoted, don't quote it again.
+		if s[0] != '"' && s[0] != '\'' && s[0] != '`' && !model.IsValidLegacyMetricName(string(model.LabelValue(s))) {
+			ss[i] = fmt.Sprintf("\"%s\"", s)
 		}
 	}
-	return b.String()
+	return strings.Join(ss, ", ")
 }
 
 func (node *BinaryExpr) returnBool() string {
diff --git a/vendor/github.com/prometheus/prometheus/promql/promqltest/test.go b/vendor/github.com/prometheus/prometheus/promql/promqltest/test.go
index efa2136f10a..f208b4f3135 100644
--- a/vendor/github.com/prometheus/prometheus/promql/promqltest/test.go
+++ b/vendor/github.com/prometheus/prometheus/promql/promqltest/test.go
@@ -56,10 +56,6 @@ const (
 	DefaultMaxSamplesPerQuery = 10000
 )
 
-func init() {
-	model.NameValidationScheme = model.UTF8Validation
-}
-
 type TBRun interface {
 	testing.TB
 	Run(string, func(*testing.T)) bool
@@ -70,7 +66,7 @@ var testStartTime = time.Unix(0, 0).UTC()
 // LoadedStorage returns storage with generated data using the provided load statements.
 // Non-load statements will cause test errors.
 func LoadedStorage(t testutil.T, input string) *teststorage.TestStorage {
-	test, err := newTest(t, input, false, newTestStorage)
+	test, err := newTest(t, input, false)
 	require.NoError(t, err)
 
 	for _, cmd := range test.cmds {
@@ -81,7 +77,7 @@ func LoadedStorage(t testutil.T, input string) *teststorage.TestStorage {
 			t.Errorf("only 'load' commands accepted, got '%s'", cmd)
 		}
 	}
-	return test.storage.(*teststorage.TestStorage)
+	return test.storage
 }
 
 // NewTestEngine creates a promql.Engine with enablePerStepStats, lookbackDelta and maxSamples, and returns it.
@@ -112,11 +108,6 @@ func NewTestEngineWithOpts(tb testing.TB, opts promql.EngineOpts) *promql.Engine
 
 // RunBuiltinTests runs an acceptance test suite against the provided engine.
 func RunBuiltinTests(t TBRun, engine promql.QueryEngine) {
-	RunBuiltinTestsWithStorage(t, engine, newTestStorage)
-}
-
-// RunBuiltinTestsWithStorage runs an acceptance test suite against the provided engine and storage.
-func RunBuiltinTestsWithStorage(t TBRun, engine promql.QueryEngine, newStorage func(testutil.T) storage.Storage) {
 	t.Cleanup(func() { parser.EnableExperimentalFunctions = false })
 	parser.EnableExperimentalFunctions = true
 
@@ -127,29 +118,24 @@ func RunBuiltinTestsWithStorage(t TBRun, engine promql.QueryEngine, newStorage f
 		t.Run(fn, func(t *testing.T) {
 			content, err := fs.ReadFile(testsFs, fn)
 			require.NoError(t, err)
-			RunTestWithStorage(t, string(content), engine, newStorage)
+			RunTest(t, string(content), engine)
 		})
 	}
 }
 
 // RunTest parses and runs the test against the provided engine.
 func RunTest(t testutil.T, input string, engine promql.QueryEngine) {
-	RunTestWithStorage(t, input, engine, newTestStorage)
-}
-
-// RunTestWithStorage parses and runs the test against the provided engine and storage.
-func RunTestWithStorage(t testutil.T, input string, engine promql.QueryEngine, newStorage func(testutil.T) storage.Storage) {
-	require.NoError(t, runTest(t, input, engine, newStorage, false))
+	require.NoError(t, runTest(t, input, engine, false))
 }
 
 // testTest allows tests to be run in "test-the-test" mode (true for
 // testingMode). This is a special mode for testing test code execution itself.
 func testTest(t testutil.T, input string, engine promql.QueryEngine) error {
-	return runTest(t, input, engine, newTestStorage, true)
+	return runTest(t, input, engine, true)
 }
 
-func runTest(t testutil.T, input string, engine promql.QueryEngine, newStorage func(testutil.T) storage.Storage, testingMode bool) error {
-	test, err := newTest(t, input, testingMode, newStorage)
+func runTest(t testutil.T, input string, engine promql.QueryEngine, testingMode bool) error {
+	test, err := newTest(t, input, testingMode)
 
 	// Why do this before checking err? newTest() can create the test storage and then return an error,
 	// and we want to make sure to clean that up to avoid leaking goroutines.
@@ -189,20 +175,18 @@ type test struct {
 
 	cmds []testCommand
 
-	open    func(testutil.T) storage.Storage
-	storage storage.Storage
+	storage *teststorage.TestStorage
 
 	context   context.Context
 	cancelCtx context.CancelFunc
 }
 
 // newTest returns an initialized empty Test.
-func newTest(t testutil.T, input string, testingMode bool, newStorage func(testutil.T) storage.Storage) (*test, error) {
+func newTest(t testutil.T, input string, testingMode bool) (*test, error) {
 	test := &test{
 		T:           t,
 		cmds:        []testCommand{},
 		testingMode: testingMode,
-		open:        newStorage,
 	}
 	err := test.parse(input)
 	test.clear()
@@ -210,8 +194,6 @@ func newTest(t testutil.T, input string, testingMode bool, newStorage func(testu
 	return test, err
 }
 
-func newTestStorage(t testutil.T) storage.Storage { return teststorage.New(t) }
-
 //go:embed testdata
 var testsFs embed.FS
 
@@ -1285,7 +1267,7 @@ func (t *test) clear() {
 	if t.cancelCtx != nil {
 		t.cancelCtx()
 	}
-	t.storage = t.open(t.T)
+	t.storage = teststorage.New(t)
 	t.context, t.cancelCtx = context.WithCancel(context.Background())
 }
 
diff --git a/vendor/github.com/prometheus/prometheus/promql/promqltest/testdata/functions.test b/vendor/github.com/prometheus/prometheus/promql/promqltest/testdata/functions.test
index a00ed8a3ea6..2ed7ffb6a45 100644
--- a/vendor/github.com/prometheus/prometheus/promql/promqltest/testdata/functions.test
+++ b/vendor/github.com/prometheus/prometheus/promql/promqltest/testdata/functions.test
@@ -256,9 +256,6 @@ clear
 load 5m
 	testcounter_reset_middle_total	0+10x4 0+10x5
 	http_requests_total{job="app-server", instance="1", group="canary"}		0+80x10
-	testcounter_reset_middle_mix	0+10x4 0+10x5 {{schema:0 sum:1 count:1}} {{schema:1 sum:2 count:2}}
-	http_requests_mix{job="app-server", instance="1", group="canary"}		0+80x10 {{schema:0 sum:1 count:1}}
-    http_requests_histogram{job="app-server", instance="1", group="canary"}		{{schema:0 sum:1 count:2}}x10
 
 # deriv should return the same as rate in simple cases.
 eval instant at 50m rate(http_requests_total{group="canary", instance="1", job="app-server"}[50m])
@@ -271,16 +268,6 @@ eval instant at 50m deriv(http_requests_total{group="canary", instance="1", job=
 eval instant at 50m deriv(testcounter_reset_middle_total[100m])
 	{} 0.010606060606060607
 
-# deriv should ignore histograms.
-eval instant at 110m deriv(http_requests_mix{group="canary", instance="1", job="app-server"}[110m])
-	{group="canary", instance="1", job="app-server"} 0.26666666666666666
-
-eval instant at 100m deriv(testcounter_reset_middle_mix[110m])
-	{} 0.010606060606060607
-
-eval instant at 50m deriv(http_requests_histogram[60m])
-    #empty
-
 # predict_linear should return correct result.
 # X/s = [  0, 300, 600, 900,1200,1500,1800,2100,2400,2700,3000]
 # Y   = [  0,  10,  20,  30,  40,   0,  10,  20,  30,  40,  50]
@@ -1123,16 +1110,11 @@ clear
 # Don't return anything when there's something there.
 load 5m
 	http_requests{job="api-server", instance="0", group="production"}	0+10x10
-	http_requests_histogram{job="api-server", instance="0", group="production"} {{schema:0 sum:1 count:1}}x11
 
 eval instant at 50m absent(http_requests)
 
 eval instant at 50m absent(sum(http_requests))
 
-eval instant at 50m absent(http_requests_histogram)
-
-eval instant at 50m absent(sum(http_requests_histogram))
-
 clear
 
 eval instant at 50m absent(sum(nonexistent{job="testjob", instance="testinstance"}))
@@ -1180,7 +1162,6 @@ load 1m
 	httpd_handshake_failures_total{instance="127.0.0.1",job="node"}	1+1x15
 	httpd_log_lines_total{instance="127.0.0.1",job="node"}	1
 	ssl_certificate_expiry_seconds{job="ingress"} NaN NaN NaN NaN NaN
-	http_requests_histogram{path="/foo",instance="127.0.0.1",job="httpd"} {{schema:0 sum:1 count:1}}x11
 
 eval instant at 5m absent_over_time(http_requests_total[5m])
 
@@ -1224,16 +1205,6 @@ eval instant at 5m absent_over_time({job="ingress"}[4m])
 eval instant at 10m absent_over_time({job="ingress"}[4m])
 	{job="ingress"} 1
 
-eval instant at 10m absent_over_time(http_requests_histogram[5m])
-
-eval instant at 10m absent_over_time(rate(http_requests_histogram[5m])[5m:1m])
-
-eval instant at 20m absent_over_time(http_requests_histogram[5m])
-    {} 1
-
-eval instant at 20m absent_over_time(rate(http_requests_histogram[5m])[5m:1m])
-    {} 1
-
 clear
 
 # Testdata for present_over_time()
diff --git a/vendor/github.com/prometheus/prometheus/rules/group.go b/vendor/github.com/prometheus/prometheus/rules/group.go
index 8ad8958f8dd..b6feb6f9625 100644
--- a/vendor/github.com/prometheus/prometheus/rules/group.go
+++ b/vendor/github.com/prometheus/prometheus/rules/group.go
@@ -44,21 +44,20 @@ import (
 
 // Group is a set of rules that have a logical relation.
 type Group struct {
-	name                  string
-	file                  string
-	interval              time.Duration
-	queryOffset           *time.Duration
-	limit                 int
-	rules                 []Rule
-	sourceTenants         []string
-	seriesInPreviousEval  []map[string]labels.Labels // One per Rule.
-	staleSeries           []labels.Labels
-	opts                  *ManagerOptions
-	mtx                   sync.Mutex
-	evaluationTime        time.Duration // Time it took to evaluate the group.
-	evaluationRuleTimeSum time.Duration // Sum of time it took to evaluate each rule in the group.
-	lastEvaluation        time.Time     // Wall-clock time of most recent evaluation.
-	lastEvalTimestamp     time.Time     // Time slot used for most recent evaluation.
+	name                 string
+	file                 string
+	interval             time.Duration
+	queryOffset          *time.Duration
+	limit                int
+	rules                []Rule
+	sourceTenants        []string
+	seriesInPreviousEval []map[string]labels.Labels // One per Rule.
+	staleSeries          []labels.Labels
+	opts                 *ManagerOptions
+	mtx                  sync.Mutex
+	evaluationTime       time.Duration
+	lastEvaluation       time.Time // Wall-clock time of most recent evaluation.
+	lastEvalTimestamp    time.Time // Time slot used for most recent evaluation.
 
 	shouldRestore bool
 
@@ -120,7 +119,6 @@ func NewGroup(o GroupOptions) *Group {
 	metrics.EvalFailures.WithLabelValues(key)
 	metrics.GroupLastEvalTime.WithLabelValues(key)
 	metrics.GroupLastDuration.WithLabelValues(key)
-	metrics.GroupLastRuleDurationSum.WithLabelValues(key)
 	metrics.GroupRules.WithLabelValues(key).Set(float64(len(o.Rules)))
 	metrics.GroupSamples.WithLabelValues(key)
 	metrics.GroupInterval.WithLabelValues(key).Set(o.Interval.Seconds())
@@ -382,28 +380,6 @@ func (g *Group) setEvaluationTime(dur time.Duration) {
 	g.evaluationTime = dur
 }
 
-// GetRuleEvaluationTimeSum returns the sum of the time it took to evaluate each rule in the group irrespective of concurrency.
-func (g *Group) GetRuleEvaluationTimeSum() time.Duration {
-	g.mtx.Lock()
-	defer g.mtx.Unlock()
-	return g.evaluationRuleTimeSum
-}
-
-// updateRuleEvaluationTimeSum updates evaluationRuleTimeSum which is the sum of the time it took to evaluate each rule in the group irrespective of concurrency.
-// It collects the times from the rules themselves.
-func (g *Group) updateRuleEvaluationTimeSum() {
-	var sum time.Duration
-	for _, rule := range g.rules {
-		sum += rule.GetEvaluationDuration()
-	}
-
-	g.metrics.GroupLastRuleDurationSum.WithLabelValues(GroupKey(g.file, g.name)).Set(sum.Seconds())
-
-	g.mtx.Lock()
-	defer g.mtx.Unlock()
-	g.evaluationRuleTimeSum = sum
-}
-
 // GetLastEvaluation returns the time the last evaluation of the rule group took place.
 func (g *Group) GetLastEvaluation() time.Time {
 	g.mtx.Lock()
@@ -940,7 +916,6 @@ type Metrics struct {
 	GroupInterval            *prometheus.GaugeVec
 	GroupLastEvalTime        *prometheus.GaugeVec
 	GroupLastDuration        *prometheus.GaugeVec
-	GroupLastRuleDurationSum *prometheus.GaugeVec
 	GroupLastRestoreDuration *prometheus.GaugeVec
 	GroupRules               *prometheus.GaugeVec
 	GroupSamples             *prometheus.GaugeVec
@@ -1019,14 +994,6 @@ func NewGroupMetrics(reg prometheus.Registerer) *Metrics {
 			},
 			[]string{"rule_group"},
 		),
-		GroupLastRuleDurationSum: prometheus.NewGaugeVec(
-			prometheus.GaugeOpts{
-				Namespace: namespace,
-				Name:      "rule_group_last_rule_duration_sum_seconds",
-				Help:      "The sum of time in seconds it took to evaluate each rule in the group regardless of concurrency. This should be higher than the group duration if rules are evaluated concurrently.",
-			},
-			[]string{"rule_group"},
-		),
 		GroupLastRestoreDuration: prometheus.NewGaugeVec(
 			prometheus.GaugeOpts{
 				Namespace: namespace,
@@ -1064,7 +1031,6 @@ func NewGroupMetrics(reg prometheus.Registerer) *Metrics {
 			m.GroupInterval,
 			m.GroupLastEvalTime,
 			m.GroupLastDuration,
-			m.GroupLastRuleDurationSum,
 			m.GroupLastRestoreDuration,
 			m.GroupRules,
 			m.GroupSamples,
diff --git a/vendor/github.com/prometheus/prometheus/rules/manager.go b/vendor/github.com/prometheus/prometheus/rules/manager.go
index 58020126e52..b5bb0151166 100644
--- a/vendor/github.com/prometheus/prometheus/rules/manager.go
+++ b/vendor/github.com/prometheus/prometheus/rules/manager.go
@@ -82,7 +82,6 @@ func DefaultEvalIterationFunc(ctx context.Context, g *Group, evalTimestamp time.
 	timeSinceStart := time.Since(start)
 
 	g.metrics.IterationDuration.Observe(timeSinceStart.Seconds())
-	g.updateRuleEvaluationTimeSum()
 	g.setEvaluationTime(timeSinceStart)
 	g.setLastEvaluation(start)
 	g.setLastEvalTimestamp(evalTimestamp)
@@ -483,11 +482,6 @@ type ruleDependencyController struct{}
 // AnalyseRules implements RuleDependencyController.
 func (c ruleDependencyController) AnalyseRules(rules []Rule) {
 	depMap := buildDependencyMap(rules)
-
-	if depMap == nil {
-		return
-	}
-
 	for _, r := range rules {
 		r.SetNoDependentRules(depMap.dependents(r) == 0)
 		r.SetNoDependencyRules(depMap.dependencies(r) == 0)
diff --git a/vendor/github.com/prometheus/prometheus/scrape/scrape.go b/vendor/github.com/prometheus/prometheus/scrape/scrape.go
index 4803354cf6f..5c6063fa586 100644
--- a/vendor/github.com/prometheus/prometheus/scrape/scrape.go
+++ b/vendor/github.com/prometheus/prometheus/scrape/scrape.go
@@ -361,7 +361,6 @@ func (sp *scrapePool) restartLoops(reuseCache bool) {
 				bodySizeLimit:        bodySizeLimit,
 				acceptHeader:         acceptHeader(sp.config.ScrapeProtocols, validationScheme),
 				acceptEncodingHeader: acceptEncodingHeader(enableCompression),
-				metrics:              sp.metrics,
 			}
 			newLoop = sp.newLoop(scrapeLoopOptions{
 				target:                   t,
diff --git a/vendor/github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheus/normalize_name.go b/vendor/github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheus/normalize_name.go
index 6967ca013c2..335705aa8dd 100644
--- a/vendor/github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheus/normalize_name.go
+++ b/vendor/github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheus/normalize_name.go
@@ -30,7 +30,7 @@ import (
 // OTLP metrics use the c/s notation as specified at https://ucum.org/ucum.html
 // (See also https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/semantic_conventions/README.md#instrument-units)
 // Prometheus best practices for units: https://prometheus.io/docs/practices/naming/#base-units
-// OpenMetrics specification for units: https://github.com/prometheus/OpenMetrics/blob/v1.0.0/specification/OpenMetrics.md#units-and-base-units
+// OpenMetrics specification for units: https://github.com/OpenObservability/OpenMetrics/blob/main/specification/OpenMetrics.md#units-and-base-units
 var unitMap = map[string]string{
 	// Time
 	"d":   "days",
@@ -122,22 +122,17 @@ func BuildCompliantName(metric pmetric.Metric, namespace string, addMetricSuffix
 
 // Build a normalized name for the specified metric.
 func normalizeName(metric pmetric.Metric, namespace string, allowUTF8 bool) string {
-	var nameTokens []string
-	var separators []string
+	var translationFunc func(rune) bool
 	if !allowUTF8 {
 		nonTokenMetricCharRE := regexp.MustCompile(`[^a-zA-Z0-9:]`)
-		// Split metric name into "tokens" (of supported metric name runes).
-		// Note that this has the side effect of replacing multiple consecutive underscores with a single underscore.
-		// This is part of the OTel to Prometheus specification: https://github.com/open-telemetry/opentelemetry-specification/blob/v1.38.0/specification/compatibility/prometheus_and_openmetrics.md#otlp-metric-points-to-prometheus.
-		nameTokens = strings.FieldsFunc(
-			metric.Name(),
-			func(r rune) bool { return nonTokenMetricCharRE.MatchString(string(r)) },
-		)
+		translationFunc = func(r rune) bool { return nonTokenMetricCharRE.MatchString(string(r)) }
 	} else {
-		translationFunc := func(r rune) bool { return !unicode.IsLetter(r) && !unicode.IsDigit(r) && r != ':' }
-		// Split metric name into "tokens" (of supported metric name runes).
-		nameTokens, separators = fieldsFunc(metric.Name(), translationFunc)
+		translationFunc = func(r rune) bool { return !unicode.IsLetter(r) && !unicode.IsDigit(r) && r != ':' }
 	}
+	// Split metric name into "tokens" (of supported metric name runes).
+	// Note that this has the side effect of replacing multiple consecutive underscores with a single underscore.
+	// This is part of the OTel to Prometheus specification: https://github.com/open-telemetry/opentelemetry-specification/blob/v1.38.0/specification/compatibility/prometheus_and_openmetrics.md#otlp-metric-points-to-prometheus.
+	nameTokens, separators := fieldsFunc(metric.Name(), translationFunc)
 
 	// Split unit at the '/' if any
 	unitTokens := strings.SplitN(metric.Unit(), "/", 2)
@@ -206,14 +201,12 @@ func normalizeName(metric pmetric.Metric, namespace string, allowUTF8 bool) stri
 		nameTokens = append([]string{namespace}, nameTokens...)
 	}
 
-	var normalizedName string
+	// Build the string from the tokens + separators.
+	// If UTF-8 isn't allowed, we'll use underscores as separators.
 	if !allowUTF8 {
-		// Build the string from the tokens, separated with underscores
-		normalizedName = strings.Join(nameTokens, "_")
-	} else {
-		// Build the string from the tokens + separators.
-		normalizedName = join(nameTokens, separators, "_")
+		separators = []string{}
 	}
+	normalizedName := join(nameTokens, separators, "_")
 
 	// Metric name cannot start with a digit, so prefix it with "_" in this case
 	if normalizedName != "" && unicode.IsDigit(rune(normalizedName[0])) {
diff --git a/vendor/github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheusremotewrite/helper.go b/vendor/github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheusremotewrite/helper.go
index 4f12d1f3470..f4fc44bf48c 100644
--- a/vendor/github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheusremotewrite/helper.go
+++ b/vendor/github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheusremotewrite/helper.go
@@ -51,7 +51,7 @@ const (
 	createdSuffix = "_created"
 	// maxExemplarRunes is the maximum number of UTF-8 exemplar characters
 	// according to the prometheus specification
-	// https://github.com/prometheus/OpenMetrics/blob/v1.0.0/specification/OpenMetrics.md#exemplars
+	// https://github.com/OpenObservability/OpenMetrics/blob/main/specification/OpenMetrics.md#exemplars
 	maxExemplarRunes = 128
 	// Trace and Span id keys are defined as part of the spec:
 	// https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification%2Fmetrics%2Fdatamodel.md#exemplars-2
@@ -595,9 +595,10 @@ const defaultIntervalForStartTimestamps = int64(300_000)
 // handleStartTime adds a zero sample at startTs only if startTs is within validIntervalForStartTimestamps of the sample timestamp.
 // The reason for doing this is that PRW v1 doesn't support Created Timestamps. After switching to PRW v2's direct CT support,
 // make use of its direct support fort Created Timestamps instead.
+// See https://github.com/prometheus/prometheus/issues/14600 for context.
 // See https://opentelemetry.io/docs/specs/otel/metrics/data-model/#resets-and-gaps to know more about how OTel handles
 // resets for cumulative metrics.
-func (c *PrometheusConverter) handleStartTime(startTs, ts int64, labels []prompb.Label, settings Settings, typ string, value float64, logger *slog.Logger) {
+func (c *PrometheusConverter) handleStartTime(startTs, ts int64, labels []prompb.Label, settings Settings, typ string, val float64, logger *slog.Logger) {
 	if !settings.EnableCreatedTimestampZeroIngestion {
 		return
 	}
@@ -619,10 +620,13 @@ func (c *PrometheusConverter) handleStartTime(startTs, ts int64, labels []prompb
 		return
 	}
 
-	logger.Debug("adding zero value at start_ts", "type", typ, "labels", labelsStringer(labels), "start_ts", startTs, "sample_ts", ts, "sample_value", value)
+	logger.Debug("adding zero value at start_ts", "type", typ, "labels", labelsStringer(labels), "start_ts", startTs, "sample_ts", ts, "sample_value", val)
 
-	// See https://github.com/prometheus/prometheus/issues/14600 for context.
-	c.addSample(&prompb.Sample{Timestamp: startTs}, labels)
+	var createdTimeValue float64
+	if settings.EnableStartTimeQuietZero {
+		createdTimeValue = math.Float64frombits(value.QuietZeroNaN)
+	}
+	c.addSample(&prompb.Sample{Timestamp: startTs, Value: createdTimeValue}, labels)
 }
 
 // handleHistogramStartTime similar to the method above but for native histograms..
diff --git a/vendor/github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheusremotewrite/metrics_to_prw.go b/vendor/github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheusremotewrite/metrics_to_prw.go
index 7f0cc04a106..65fd0800476 100644
--- a/vendor/github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheusremotewrite/metrics_to_prw.go
+++ b/vendor/github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheusremotewrite/metrics_to_prw.go
@@ -47,6 +47,7 @@ type Settings struct {
 
 	// Mimir specifics.
 	EnableCreatedTimestampZeroIngestion        bool
+	EnableStartTimeQuietZero                   bool
 	ValidIntervalCreatedTimestampZeroIngestion time.Duration
 }
 
diff --git a/vendor/github.com/prometheus/prometheus/storage/remote/queue_manager.go b/vendor/github.com/prometheus/prometheus/storage/remote/queue_manager.go
index 475c126eff3..f6d6cbc7e91 100644
--- a/vendor/github.com/prometheus/prometheus/storage/remote/queue_manager.go
+++ b/vendor/github.com/prometheus/prometheus/storage/remote/queue_manager.go
@@ -1688,7 +1688,7 @@ func (s *shards) updateMetrics(_ context.Context, err error, sampleCount, exempl
 	s.enqueuedHistograms.Sub(int64(histogramCount))
 }
 
-// sendSamplesWithBackoff to the remote storage with backoff for recoverable errors.
+// sendSamples to the remote storage with backoff for recoverable errors.
 func (s *shards) sendSamplesWithBackoff(ctx context.Context, samples []prompb.TimeSeries, sampleCount, exemplarCount, histogramCount, metadataCount int, pBuf *proto.Buffer, buf *[]byte, enc Compression) (WriteResponseStats, error) {
 	// Build the WriteRequest with no metadata.
 	req, highest, lowest, err := buildWriteRequest(s.qm.logger, samples, nil, pBuf, buf, nil, enc)
@@ -1802,7 +1802,7 @@ func (s *shards) sendSamplesWithBackoff(ctx context.Context, samples []prompb.Ti
 	return accumulatedStats, err
 }
 
-// sendV2SamplesWithBackoff to the remote storage with backoff for recoverable errors.
+// sendV2Samples to the remote storage with backoff for recoverable errors.
 func (s *shards) sendV2SamplesWithBackoff(ctx context.Context, samples []writev2.TimeSeries, labels []string, sampleCount, exemplarCount, histogramCount, metadataCount int, pBuf, buf *[]byte, enc Compression) (WriteResponseStats, error) {
 	// Build the WriteRequest with no metadata.
 	req, highest, lowest, err := buildV2WriteRequest(s.qm.logger, samples, labels, pBuf, buf, nil, enc)
diff --git a/vendor/github.com/prometheus/prometheus/tsdb/head.go b/vendor/github.com/prometheus/prometheus/tsdb/head.go
index b4fa652a438..324b0a60607 100644
--- a/vendor/github.com/prometheus/prometheus/tsdb/head.go
+++ b/vendor/github.com/prometheus/prometheus/tsdb/head.go
@@ -1079,7 +1079,7 @@ func (h *Head) PostingsCardinalityStats(statsByLabelName string, limit int) *ind
 		return h.cardinalityCache
 	}
 	h.cardinalityCacheKey = cacheKey
-	h.cardinalityCache = h.postings.Stats(statsByLabelName, limit, labels.SizeOfLabels)
+	h.cardinalityCache = h.postings.Stats(statsByLabelName, limit)
 	h.lastPostingsStatsCall = time.Duration(time.Now().Unix()) * time.Second
 
 	return h.cardinalityCache
diff --git a/vendor/github.com/prometheus/prometheus/tsdb/head_append.go b/vendor/github.com/prometheus/prometheus/tsdb/head_append.go
index b64607a417e..a4def2bc918 100644
--- a/vendor/github.com/prometheus/prometheus/tsdb/head_append.go
+++ b/vendor/github.com/prometheus/prometheus/tsdb/head_append.go
@@ -497,7 +497,7 @@ func (s *memSeries) appendable(t int64, v float64, headMaxt, minValidTime, oooTi
 			if s.lastHistogramValue != nil || s.lastFloatHistogramValue != nil {
 				return false, 0, storage.NewDuplicateHistogramToFloatErr(t, v)
 			}
-			if math.Float64bits(s.lastValue) != math.Float64bits(v) {
+			if math.Float64bits(s.lastValue) != math.Float64bits(v) && math.Float64bits(v) != value.QuietZeroNaN {
 				return false, 0, storage.NewDuplicateFloatErr(t, s.lastValue, v)
 			}
 			// Sample is identical (ts + value) with most current (highest ts) sample in sampleBuf.
@@ -505,6 +505,10 @@ func (s *memSeries) appendable(t int64, v float64, headMaxt, minValidTime, oooTi
 		}
 	}
 
+	if math.Float64bits(v) == value.QuietZeroNaN { // Say it's allowed; it will be dropped later in commitSamples.
+		return true, 0, nil
+	}
+
 	// The sample cannot go in the in-order chunk. Check if it can go in the out-of-order chunk.
 	if oooTimeWindow > 0 && t >= headMaxt-oooTimeWindow {
 		return true, headMaxt - t, nil
@@ -1144,6 +1148,8 @@ func (a *headAppender) commitSamples(acc *appenderCommitContext) {
 		switch {
 		case err != nil:
 			// Do nothing here.
+		case oooSample && math.Float64bits(s.V) == value.QuietZeroNaN:
+			// No-op: we don't store quiet zeros out-of-order.
 		case oooSample:
 			// Sample is OOO and OOO handling is enabled
 			// and the delta is within the OOO tolerance.
@@ -1190,6 +1196,9 @@ func (a *headAppender) commitSamples(acc *appenderCommitContext) {
 				acc.floatsAppended--
 			}
 		default:
+			if math.Float64bits(s.V) == value.QuietZeroNaN {
+				s.V = 0 // Note that this is modifying the copy which is what will be appended but the WAL got the NaN already.
+			}
 			ok, chunkCreated = series.append(s.T, s.V, a.appendID, acc.appendChunkOpts)
 			if ok {
 				if s.T < acc.inOrderMint {
diff --git a/vendor/github.com/prometheus/prometheus/tsdb/head_wal.go b/vendor/github.com/prometheus/prometheus/tsdb/head_wal.go
index b1f3abd1545..5b1a868837a 100644
--- a/vendor/github.com/prometheus/prometheus/tsdb/head_wal.go
+++ b/vendor/github.com/prometheus/prometheus/tsdb/head_wal.go
@@ -30,6 +30,7 @@ import (
 	"github.com/prometheus/prometheus/model/histogram"
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/prometheus/prometheus/model/metadata"
+	"github.com/prometheus/prometheus/model/value"
 	"github.com/prometheus/prometheus/storage"
 	"github.com/prometheus/prometheus/tsdb/chunkenc"
 	"github.com/prometheus/prometheus/tsdb/chunks"
@@ -589,6 +590,9 @@ func (wp *walSubsetProcessor) processWALSamples(h *Head, mmappedChunks, oooMmapp
 			if s.T <= ms.mmMaxTime {
 				continue
 			}
+			if math.Float64bits(s.V) == value.QuietZeroNaN {
+				s.V = 0
+			}
 			if _, chunkCreated := ms.append(s.T, s.V, 0, appendChunkOpts); chunkCreated {
 				h.metrics.chunksCreated.Inc()
 				h.metrics.chunks.Inc()
@@ -989,6 +993,9 @@ func (wp *wblSubsetProcessor) processWBLSamples(h *Head) (unknownRefs, unknownHi
 				unknownRefs++
 				continue
 			}
+			if math.Float64bits(s.V) == value.QuietZeroNaN {
+				continue
+			}
 			ok, chunkCreated, _ := ms.insert(s.T, s.V, nil, nil, h.chunkDiskMapper, oooCapMax, h.logger)
 			if chunkCreated {
 				h.metrics.chunksCreated.Inc()
diff --git a/vendor/github.com/prometheus/prometheus/tsdb/index/postings.go b/vendor/github.com/prometheus/prometheus/tsdb/index/postings.go
index 3e550ed5e65..b44b4089275 100644
--- a/vendor/github.com/prometheus/prometheus/tsdb/index/postings.go
+++ b/vendor/github.com/prometheus/prometheus/tsdb/index/postings.go
@@ -72,7 +72,7 @@ type MemPostings struct {
 	// lvs holds the label values for each label name.
 	// lvs[name] is essentially an unsorted append-only list of all keys in m[name]
 	// mtx must be held when interacting with lvs.
-	// Since it's append-only, it is safe to read the label values slice after releasing the lock.
+	// Since it's append-only, it is safe to the label values slice after releasing the lock.
 	lvs map[string][]string
 
 	ordered bool
@@ -190,8 +190,7 @@ type PostingsStats struct {
 }
 
 // Stats calculates the cardinality statistics from postings.
-// Caller can pass in a function which computes the space required for n series with a given label.
-func (p *MemPostings) Stats(label string, limit int, labelSizeFunc func(string, string, uint64) uint64) *PostingsStats {
+func (p *MemPostings) Stats(label string, limit int) *PostingsStats {
 	var size uint64
 	p.mtx.RLock()
 
@@ -219,7 +218,7 @@ func (p *MemPostings) Stats(label string, limit int, labelSizeFunc func(string,
 			}
 			seriesCnt := uint64(len(values))
 			labelValuePairs.push(Stat{Name: n + "=" + name, Count: seriesCnt})
-			size += labelSizeFunc(n, name, seriesCnt)
+			size += uint64(len(name)) * seriesCnt
 		}
 		labelValueLength.push(Stat{Name: n, Count: size})
 	}
diff --git a/vendor/github.com/prometheus/prometheus/tsdb/querier.go b/vendor/github.com/prometheus/prometheus/tsdb/querier.go
index 0d2f1ddcd89..7f4c4317f23 100644
--- a/vendor/github.com/prometheus/prometheus/tsdb/querier.go
+++ b/vendor/github.com/prometheus/prometheus/tsdb/querier.go
@@ -270,7 +270,7 @@ func PostingsForMatchers(ctx context.Context, ix IndexPostingsReader, ms ...*lab
 			its = append(its, it)
 		case m.Type == labels.MatchNotRegexp && m.Value == ".+":
 			// .+ regexp matches any non-empty string: get postings for all label values and remove them.
-			notIts = append(notIts, ix.PostingsForAllLabelValues(ctx, m.Name))
+			its = append(notIts, ix.PostingsForAllLabelValues(ctx, m.Name))
 
 		case labelMustBeSet[m.Name]:
 			// If this matcher must be non-empty, we can be smarter.
diff --git a/vendor/github.com/prometheus/prometheus/util/logging/dedupe.go b/vendor/github.com/prometheus/prometheus/util/logging/dedupe.go
index 8137f4f22b9..e7dff20f786 100644
--- a/vendor/github.com/prometheus/prometheus/util/logging/dedupe.go
+++ b/vendor/github.com/prometheus/prometheus/util/logging/dedupe.go
@@ -33,7 +33,7 @@ type Deduper struct {
 	next   *slog.Logger
 	repeat time.Duration
 	quit   chan struct{}
-	mtx    *sync.RWMutex
+	mtx    sync.RWMutex
 	seen   map[string]time.Time
 }
 
@@ -43,7 +43,6 @@ func Dedupe(next *slog.Logger, repeat time.Duration) *Deduper {
 		next:   next,
 		repeat: repeat,
 		quit:   make(chan struct{}),
-		mtx:    new(sync.RWMutex),
 		seen:   map[string]time.Time{},
 	}
 	go d.run()
@@ -89,7 +88,6 @@ func (d *Deduper) WithAttrs(attrs []slog.Attr) slog.Handler {
 		repeat: d.repeat,
 		quit:   d.quit,
 		seen:   d.seen,
-		mtx:    d.mtx,
 	}
 }
 
@@ -105,7 +103,6 @@ func (d *Deduper) WithGroup(name string) slog.Handler {
 		repeat: d.repeat,
 		quit:   d.quit,
 		seen:   d.seen,
-		mtx:    d.mtx,
 	}
 }
 
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 180a59033de..b67f27ed734 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -1039,7 +1039,7 @@ github.com/prometheus/exporter-toolkit/web
 github.com/prometheus/procfs
 github.com/prometheus/procfs/internal/fs
 github.com/prometheus/procfs/internal/util
-# github.com/prometheus/prometheus v1.99.0 => github.com/grafana/mimir-prometheus v0.0.0-20241219104229-b50052711673
+# github.com/prometheus/prometheus v1.99.0 => github.com/grafana/mimir-prometheus v0.0.0-20241213145946-1e9d95a2e3cd
 ## explicit; go 1.22.0
 github.com/prometheus/prometheus/config
 github.com/prometheus/prometheus/discovery
@@ -1711,7 +1711,7 @@ sigs.k8s.io/kustomize/kyaml/yaml/walk
 sigs.k8s.io/yaml
 sigs.k8s.io/yaml/goyaml.v2
 sigs.k8s.io/yaml/goyaml.v3
-# github.com/prometheus/prometheus => github.com/grafana/mimir-prometheus v0.0.0-20241219104229-b50052711673
+# github.com/prometheus/prometheus => github.com/grafana/mimir-prometheus v0.0.0-20241213145946-1e9d95a2e3cd
 # github.com/hashicorp/memberlist => github.com/grafana/memberlist v0.3.1-0.20220714140823-09ffed8adbbe
 # gopkg.in/yaml.v3 => github.com/colega/go-yaml-yaml v0.0.0-20220720105220-255a8d16d094
 # github.com/grafana/regexp => github.com/grafana/regexp v0.0.0-20240531075221-3685f1377d7b

From ac8adf61e855ee331880fd1ad3c41029b1c33c6c Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Fri, 13 Dec 2024 15:31:38 +0000
Subject: [PATCH 3/8] make generate-otlp

---
 pkg/distributor/otlp/helper_generated.go         | 12 ++++++++----
 pkg/distributor/otlp/metrics_to_prw_generated.go |  1 +
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkg/distributor/otlp/helper_generated.go b/pkg/distributor/otlp/helper_generated.go
index b5dd5650bd3..8fbd4b3036e 100644
--- a/pkg/distributor/otlp/helper_generated.go
+++ b/pkg/distributor/otlp/helper_generated.go
@@ -597,9 +597,10 @@ const defaultIntervalForStartTimestamps = int64(300_000)
 // handleStartTime adds a zero sample at startTs only if startTs is within validIntervalForStartTimestamps of the sample timestamp.
 // The reason for doing this is that PRW v1 doesn't support Created Timestamps. After switching to PRW v2's direct CT support,
 // make use of its direct support fort Created Timestamps instead.
+// See https://github.com/prometheus/prometheus/issues/14600 for context.
 // See https://opentelemetry.io/docs/specs/otel/metrics/data-model/#resets-and-gaps to know more about how OTel handles
 // resets for cumulative metrics.
-func (c *MimirConverter) handleStartTime(startTs, ts int64, labels []mimirpb.LabelAdapter, settings Settings, typ string, value float64, logger *slog.Logger) {
+func (c *MimirConverter) handleStartTime(startTs, ts int64, labels []mimirpb.LabelAdapter, settings Settings, typ string, val float64, logger *slog.Logger) {
 	if !settings.EnableCreatedTimestampZeroIngestion {
 		return
 	}
@@ -621,10 +622,13 @@ func (c *MimirConverter) handleStartTime(startTs, ts int64, labels []mimirpb.Lab
 		return
 	}
 
-	logger.Debug("adding zero value at start_ts", "type", typ, "labels", labelsStringer(labels), "start_ts", startTs, "sample_ts", ts, "sample_value", value)
+	logger.Debug("adding zero value at start_ts", "type", typ, "labels", labelsStringer(labels), "start_ts", startTs, "sample_ts", ts, "sample_value", val)
 
-	// See https://github.com/prometheus/prometheus/issues/14600 for context.
-	c.addSample(&mimirpb.Sample{TimestampMs: startTs}, labels)
+	var createdTimeValue float64
+	if settings.EnableStartTimeQuietZero {
+		createdTimeValue = math.Float64frombits(value.QuietZeroNaN)
+	}
+	c.addSample(&mimirpb.Sample{TimestampMs: startTs, Value: createdTimeValue}, labels)
 }
 
 // handleHistogramStartTime similar to the method above but for native histograms..
diff --git a/pkg/distributor/otlp/metrics_to_prw_generated.go b/pkg/distributor/otlp/metrics_to_prw_generated.go
index 5eb1391dadd..e9fdbbc8964 100644
--- a/pkg/distributor/otlp/metrics_to_prw_generated.go
+++ b/pkg/distributor/otlp/metrics_to_prw_generated.go
@@ -50,6 +50,7 @@ type Settings struct {
 
 	// Mimir specifics.
 	EnableCreatedTimestampZeroIngestion        bool
+	EnableStartTimeQuietZero                   bool
 	ValidIntervalCreatedTimestampZeroIngestion time.Duration
 }
 

From 86e27ebecc7939402f869dfc019eca5c74513ba5 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Fri, 13 Dec 2024 18:41:12 +0000
Subject: [PATCH 4/8] make doc

---
 .../mimir/configure/configuration-parameters/index.md        | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/sources/mimir/configure/configuration-parameters/index.md b/docs/sources/mimir/configure/configuration-parameters/index.md
index dfd84fbca61..f228620f322 100644
--- a/docs/sources/mimir/configure/configuration-parameters/index.md
+++ b/docs/sources/mimir/configure/configuration-parameters/index.md
@@ -956,6 +956,11 @@ instance_limits:
 # limiting feature.)
 # CLI flag: -distributor.reusable-ingester-push-workers
 [reusable_ingester_push_workers: <int> | default = 2000]
+
+# (advanced) Change the implementation of Otel startTime from a real zero to a
+# special NaN value.
+# CLI flag: -distributor.otel-start-time-quiet-zero
+[start_time_quiet_zero: <boolean> | default = false]
 ```
 
 ### ingester

From fe4dd9963244e011b4a49797c578e6eabc7bac89 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Fri, 13 Dec 2024 19:02:43 +0000
Subject: [PATCH 5/8] make reference-help

---
 cmd/mimir/config-descriptor.json | 11 +++++++++++
 cmd/mimir/help-all.txt.tmpl      |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/cmd/mimir/config-descriptor.json b/cmd/mimir/config-descriptor.json
index dcc0ebfb925..fbb603ddfb4 100644
--- a/cmd/mimir/config-descriptor.json
+++ b/cmd/mimir/config-descriptor.json
@@ -1690,6 +1690,17 @@
           "fieldFlag": "distributor.reusable-ingester-push-workers",
           "fieldType": "int",
           "fieldCategory": "advanced"
+        },
+        {
+          "kind": "field",
+          "name": "start_time_quiet_zero",
+          "required": false,
+          "desc": "Change the implementation of Otel startTime from a real zero to a special NaN value.",
+          "fieldValue": null,
+          "fieldDefaultValue": false,
+          "fieldFlag": "distributor.otel-start-time-quiet-zero",
+          "fieldType": "boolean",
+          "fieldCategory": "advanced"
         }
       ],
       "fieldValue": null,
diff --git a/cmd/mimir/help-all.txt.tmpl b/cmd/mimir/help-all.txt.tmpl
index bd0256e3f6c..90dbf5352a0 100644
--- a/cmd/mimir/help-all.txt.tmpl
+++ b/cmd/mimir/help-all.txt.tmpl
@@ -1393,6 +1393,8 @@ Usage of ./cmd/mimir/mimir:
     	Whether to enable automatic suffixes to names of metrics ingested through OTLP.
   -distributor.otel-promote-resource-attributes comma-separated-list-of-strings
     	[experimental] Optionally specify OTel resource attributes to promote to labels.
+  -distributor.otel-start-time-quiet-zero
+    	Change the implementation of Otel startTime from a real zero to a special NaN value.
   -distributor.remote-timeout duration
     	Timeout for downstream ingesters. (default 2s)
   -distributor.request-burst-size int

From 788eab1e0f88441493d73ddbb0ab1fd34a7faeb1 Mon Sep 17 00:00:00 2001
From: Jesus Vazquez <jesus.vazquez@grafana.com>
Date: Thu, 2 Jan 2025 16:28:24 +0100
Subject: [PATCH 6/8] update mimir prometheus commit to
 93fa7617c0419ba9e49c1980a153206e8bb47089

---
 go.mod                                        |   2 +-
 go.sum                                        |  12 +-
 .../prometheus/prometheus/config/config.go    |  44 ++-
 .../prometheus/model/exemplar/exemplar.go     |   2 +-
 .../prometheus/model/labels/labels.go         |   6 +
 .../prometheus/model/labels/labels_common.go  |   6 +-
 .../model/labels/labels_dedupelabels.go       |   5 +
 .../model/labels/labels_stringlabels.go       |   5 +
 .../model/textparse/openmetricsparse.go       |   2 +-
 .../prometheus/prometheus/promql/functions.go |  13 +-
 .../promql/parser/generated_parser.y          |   4 +-
 .../promql/parser/generated_parser.y.go       | 333 +++++++++---------
 .../prometheus/promql/parser/parse.go         |   3 +-
 .../prometheus/promql/parser/printer.go       |  17 +-
 .../prometheus/promql/promqltest/test.go      |  38 +-
 .../promql/promqltest/testdata/functions.test |  29 ++
 .../prometheus/prometheus/rules/group.go      |  62 +++-
 .../prometheus/prometheus/rules/manager.go    |   6 +
 .../prometheus/prometheus/scrape/scrape.go    |   1 +
 .../prometheus/normalize_name.go              |  31 +-
 .../prometheusremotewrite/helper.go           |   2 +-
 .../storage/remote/queue_manager.go           |   4 +-
 .../prometheus/prometheus/tsdb/head.go        |   2 +-
 .../prometheus/tsdb/head_read_mimir.go        |   7 +
 .../prometheus/tsdb/index/postings.go         |   7 +-
 .../prometheus/prometheus/tsdb/querier.go     |   2 +-
 .../prometheus/util/logging/dedupe.go         |   5 +-
 vendor/modules.txt                            |   4 +-
 28 files changed, 401 insertions(+), 253 deletions(-)
 create mode 100644 vendor/github.com/prometheus/prometheus/tsdb/head_read_mimir.go

diff --git a/go.mod b/go.mod
index af69ec5db5c..fe8f7bf2a9f 100644
--- a/go.mod
+++ b/go.mod
@@ -286,7 +286,7 @@ require (
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )
 
-replace github.com/prometheus/prometheus => github.com/grafana/mimir-prometheus v0.0.0-20241213145946-1e9d95a2e3cd
+replace github.com/prometheus/prometheus => github.com/grafana/mimir-prometheus v0.0.0-20250102152619-93fa7617c041
 
 // Replace memberlist with our fork which includes some fixes that haven't been
 // merged upstream yet:
diff --git a/go.sum b/go.sum
index 090bb379186..5a26457ed85 100644
--- a/go.sum
+++ b/go.sum
@@ -935,8 +935,8 @@ github.com/cncf/xds/go v0.0.0-20230105202645-06c439db220b/go.mod h1:eXthEFrGJvWH
 github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20240423153145-555b57ec207b/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8=
-github.com/cncf/xds/go v0.0.0-20240723142845-024c85f92f20 h1:N+3sFI5GUjRKBi+i0TxYVST9h4Ie192jJWpHvthBBgg=
-github.com/cncf/xds/go v0.0.0-20240723142845-024c85f92f20/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8=
+github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 h1:QVw89YDxXxEe+l8gU8ETbOasdwEV+avkR75ZzsVV9WI=
+github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8=
 github.com/colega/go-yaml-yaml v0.0.0-20220720105220-255a8d16d094 h1:FpZSn61BWXbtyH68+uSv416veEswX1M2HRyQfdHnOyQ=
 github.com/colega/go-yaml-yaml v0.0.0-20220720105220-255a8d16d094/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM=
@@ -1283,8 +1283,8 @@ github.com/grafana/gomemcache v0.0.0-20241016125027-0a5bcc5aef40 h1:1TeKhyS+pvzO
 github.com/grafana/gomemcache v0.0.0-20241016125027-0a5bcc5aef40/go.mod h1:IGRj8oOoxwJbHBYl1+OhS9UjQR0dv6SQOep7HqmtyFU=
 github.com/grafana/memberlist v0.3.1-0.20220714140823-09ffed8adbbe h1:yIXAAbLswn7VNWBIvM71O2QsgfgW9fRXZNR0DXe6pDU=
 github.com/grafana/memberlist v0.3.1-0.20220714140823-09ffed8adbbe/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE=
-github.com/grafana/mimir-prometheus v0.0.0-20241213145946-1e9d95a2e3cd h1:udN4x69ZecueBBm8cCZFtWsRmUMW/UiBLg0xBWxu9kc=
-github.com/grafana/mimir-prometheus v0.0.0-20241213145946-1e9d95a2e3cd/go.mod h1:NpYc1U0eC7m6xUh3t3Pq565KxaIc08Oaquiu71dEMi8=
+github.com/grafana/mimir-prometheus v0.0.0-20250102152619-93fa7617c041 h1:tZFQRbiyOW630aJ7r+p+N3kUWhMVeWLRGSjZsK9KA0s=
+github.com/grafana/mimir-prometheus v0.0.0-20250102152619-93fa7617c041/go.mod h1:a5LEa2Vy87wOp0Vu6sLmEIR1V59fqH3QosOSiErAr30=
 github.com/grafana/opentracing-contrib-go-stdlib v0.0.0-20230509071955-f410e79da956 h1:em1oddjXL8c1tL0iFdtVtPloq2hRPen2MJQKoAWpxu0=
 github.com/grafana/opentracing-contrib-go-stdlib v0.0.0-20230509071955-f410e79da956/go.mod h1:qtI1ogk+2JhVPIXVc6q+NHziSmy2W5GbdQZFUHADCBU=
 github.com/grafana/prometheus-alertmanager v0.25.1-0.20240930132144-b5e64e81e8d3 h1:6D2gGAwyQBElSrp3E+9lSr7k8gLuP3Aiy20rweLWeBw=
@@ -1394,8 +1394,8 @@ github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
 github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
-github.com/ionos-cloud/sdk-go/v6 v6.2.1 h1:mxxN+frNVmbFrmmFfXnBC3g2USYJrl6mc1LW2iNYbFY=
-github.com/ionos-cloud/sdk-go/v6 v6.2.1/go.mod h1:SXrO9OGyWjd2rZhAhEpdYN6VUAODzzqRdqA9BCviQtI=
+github.com/ionos-cloud/sdk-go/v6 v6.3.0 h1:/lTieTH9Mo/CWm3cTlFLnK10jgxjUGkAqRffGqvPteY=
+github.com/ionos-cloud/sdk-go/v6 v6.3.0/go.mod h1:SXrO9OGyWjd2rZhAhEpdYN6VUAODzzqRdqA9BCviQtI=
 github.com/jessevdk/go-flags v1.5.0 h1:1jKYvbxEjfUl0fmqTCOfonvskHHXMjBySTLW4y9LFvc=
 github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
 github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
diff --git a/vendor/github.com/prometheus/prometheus/config/config.go b/vendor/github.com/prometheus/prometheus/config/config.go
index 86d8563536a..73282ac4295 100644
--- a/vendor/github.com/prometheus/prometheus/config/config.go
+++ b/vendor/github.com/prometheus/prometheus/config/config.go
@@ -117,11 +117,12 @@ func Load(s string, logger *slog.Logger) (*Config, error) {
 	default:
 		return nil, fmt.Errorf("unsupported OTLP translation strategy %q", cfg.OTLPConfig.TranslationStrategy)
 	}
-
+	cfg.loaded = true
 	return cfg, nil
 }
 
-// LoadFile parses the given YAML file into a Config.
+// LoadFile parses and validates the given YAML file into a read-only Config.
+// Callers should never write to or shallow copy the returned Config.
 func LoadFile(filename string, agentMode bool, logger *slog.Logger) (*Config, error) {
 	content, err := os.ReadFile(filename)
 	if err != nil {
@@ -270,9 +271,12 @@ type Config struct {
 	RemoteWriteConfigs []*RemoteWriteConfig `yaml:"remote_write,omitempty"`
 	RemoteReadConfigs  []*RemoteReadConfig  `yaml:"remote_read,omitempty"`
 	OTLPConfig         OTLPConfig           `yaml:"otlp,omitempty"`
+
+	loaded bool // Certain methods require configuration to use Load validation.
 }
 
 // SetDirectory joins any relative file paths with dir.
+// This method writes to config, and it's not concurrency safe.
 func (c *Config) SetDirectory(dir string) {
 	c.GlobalConfig.SetDirectory(dir)
 	c.AlertingConfig.SetDirectory(dir)
@@ -302,24 +306,26 @@ func (c Config) String() string {
 	return string(b)
 }
 
-// GetScrapeConfigs returns the scrape configurations.
+// GetScrapeConfigs returns the read-only, validated scrape configurations including
+// the ones from the scrape_config_files.
+// This method does not write to config, and it's concurrency safe (the pointer receiver is for efficiency).
+// This method also assumes the Config was created by Load or LoadFile function, it returns error
+// if it was not. We can't re-validate or apply globals here due to races,
+// read more https://github.com/prometheus/prometheus/issues/15538.
 func (c *Config) GetScrapeConfigs() ([]*ScrapeConfig, error) {
-	scfgs := make([]*ScrapeConfig, len(c.ScrapeConfigs))
+	if !c.loaded {
+		// Programmatic error, we warn before more confusing errors would happen due to lack of the globalization.
+		return nil, errors.New("scrape config cannot be fetched, main config was not validated and loaded correctly; should not happen")
+	}
 
+	scfgs := make([]*ScrapeConfig, len(c.ScrapeConfigs))
 	jobNames := map[string]string{}
 	for i, scfg := range c.ScrapeConfigs {
-		// We do these checks for library users that would not call validate in
-		// Unmarshal.
-		if err := scfg.Validate(c.GlobalConfig); err != nil {
-			return nil, err
-		}
-
-		if _, ok := jobNames[scfg.JobName]; ok {
-			return nil, fmt.Errorf("found multiple scrape configs with job name %q", scfg.JobName)
-		}
 		jobNames[scfg.JobName] = "main config file"
 		scfgs[i] = scfg
 	}
+
+	// Re-read and validate the dynamic scrape config rules.
 	for _, pat := range c.ScrapeConfigFiles {
 		fs, err := filepath.Glob(pat)
 		if err != nil {
@@ -355,6 +361,7 @@ func (c *Config) GetScrapeConfigs() ([]*ScrapeConfig, error) {
 }
 
 // UnmarshalYAML implements the yaml.Unmarshaler interface.
+// NOTE: This method should not be used outside of this package. Use Load or LoadFile instead.
 func (c *Config) UnmarshalYAML(unmarshal func(interface{}) error) error {
 	*c = DefaultConfig
 	// We want to set c to the defaults and then overwrite it with the input.
@@ -391,18 +398,18 @@ func (c *Config) UnmarshalYAML(unmarshal func(interface{}) error) error {
 		}
 	}
 
-	// Do global overrides and validate unique names.
+	// Do global overrides and validation.
 	jobNames := map[string]struct{}{}
 	for _, scfg := range c.ScrapeConfigs {
 		if err := scfg.Validate(c.GlobalConfig); err != nil {
 			return err
 		}
-
 		if _, ok := jobNames[scfg.JobName]; ok {
 			return fmt.Errorf("found multiple scrape configs with job name %q", scfg.JobName)
 		}
 		jobNames[scfg.JobName] = struct{}{}
 	}
+
 	rwNames := map[string]struct{}{}
 	for _, rwcfg := range c.RemoteWriteConfigs {
 		if rwcfg == nil {
@@ -1420,10 +1427,13 @@ func getGoGCEnv() int {
 type translationStrategyOption string
 
 var (
-	// NoUTF8EscapingWithSuffixes will keep UTF-8 characters as they are, units and type suffixes will still be added.
+	// NoUTF8EscapingWithSuffixes will accept metric/label names as they are.
+	// Unit and type suffixes may be added to metric names, according to certain rules.
 	NoUTF8EscapingWithSuffixes translationStrategyOption = "NoUTF8EscapingWithSuffixes"
 	// UnderscoreEscapingWithSuffixes is the default option for translating OTLP to Prometheus.
-	// This option will translate all UTF-8 characters to underscores, while adding units and type suffixes.
+	// This option will translate metric name characters that are not alphanumerics/underscores/colons to underscores,
+	// and label name characters that are not alphanumerics/underscores to underscores.
+	// Unit and type suffixes may be appended to metric names, according to certain rules.
 	UnderscoreEscapingWithSuffixes translationStrategyOption = "UnderscoreEscapingWithSuffixes"
 )
 
diff --git a/vendor/github.com/prometheus/prometheus/model/exemplar/exemplar.go b/vendor/github.com/prometheus/prometheus/model/exemplar/exemplar.go
index 2c28b172571..d03940f1b29 100644
--- a/vendor/github.com/prometheus/prometheus/model/exemplar/exemplar.go
+++ b/vendor/github.com/prometheus/prometheus/model/exemplar/exemplar.go
@@ -18,7 +18,7 @@ import "github.com/prometheus/prometheus/model/labels"
 // ExemplarMaxLabelSetLength is defined by OpenMetrics: "The combined length of
 // the label names and values of an Exemplar's LabelSet MUST NOT exceed 128
 // UTF-8 characters."
-// https://github.com/OpenObservability/OpenMetrics/blob/main/specification/OpenMetrics.md#exemplars
+// https://github.com/prometheus/OpenMetrics/blob/v1.0.0/specification/OpenMetrics.md#exemplars
 const ExemplarMaxLabelSetLength = 128
 
 // Exemplar is additional information associated with a time series.
diff --git a/vendor/github.com/prometheus/prometheus/model/labels/labels.go b/vendor/github.com/prometheus/prometheus/model/labels/labels.go
index f4de7496ce7..0747ab90d92 100644
--- a/vendor/github.com/prometheus/prometheus/model/labels/labels.go
+++ b/vendor/github.com/prometheus/prometheus/model/labels/labels.go
@@ -19,6 +19,7 @@ import (
 	"bytes"
 	"slices"
 	"strings"
+	"unsafe"
 
 	"github.com/cespare/xxhash/v2"
 )
@@ -488,3 +489,8 @@ func (b *ScratchBuilder) Labels() Labels {
 func (b *ScratchBuilder) Overwrite(ls *Labels) {
 	*ls = append((*ls)[:0], b.add...)
 }
+
+// SizeOfLabels returns the approximate space required for n copies of a label.
+func SizeOfLabels(name, value string, n uint64) uint64 {
+	return (uint64(len(name)) + uint64(unsafe.Sizeof(name)) + uint64(len(value)) + uint64(unsafe.Sizeof(value))) * n
+}
diff --git a/vendor/github.com/prometheus/prometheus/model/labels/labels_common.go b/vendor/github.com/prometheus/prometheus/model/labels/labels_common.go
index 99529a38367..a232eeea5d3 100644
--- a/vendor/github.com/prometheus/prometheus/model/labels/labels_common.go
+++ b/vendor/github.com/prometheus/prometheus/model/labels/labels_common.go
@@ -51,7 +51,11 @@ func (ls Labels) String() string {
 			b.WriteByte(',')
 			b.WriteByte(' ')
 		}
-		b.WriteString(l.Name)
+		if !model.LabelName(l.Name).IsValidLegacy() {
+			b.Write(strconv.AppendQuote(b.AvailableBuffer(), l.Name))
+		} else {
+			b.WriteString(l.Name)
+		}
 		b.WriteByte('=')
 		b.Write(strconv.AppendQuote(b.AvailableBuffer(), l.Value))
 		i++
diff --git a/vendor/github.com/prometheus/prometheus/model/labels/labels_dedupelabels.go b/vendor/github.com/prometheus/prometheus/model/labels/labels_dedupelabels.go
index da8a88cc158..a0d83e00447 100644
--- a/vendor/github.com/prometheus/prometheus/model/labels/labels_dedupelabels.go
+++ b/vendor/github.com/prometheus/prometheus/model/labels/labels_dedupelabels.go
@@ -815,3 +815,8 @@ func (b *ScratchBuilder) Overwrite(ls *Labels) {
 	ls.syms = b.syms.nameTable
 	ls.data = yoloString(b.overwriteBuffer)
 }
+
+// SizeOfLabels returns the approximate space required for n copies of a label.
+func SizeOfLabels(name, value string, n uint64) uint64 {
+	return uint64(len(name)+len(value)) + n*4 // Assuming most symbol-table entries are 2 bytes long.
+}
diff --git a/vendor/github.com/prometheus/prometheus/model/labels/labels_stringlabels.go b/vendor/github.com/prometheus/prometheus/model/labels/labels_stringlabels.go
index c64bb990e02..f49ed96f650 100644
--- a/vendor/github.com/prometheus/prometheus/model/labels/labels_stringlabels.go
+++ b/vendor/github.com/prometheus/prometheus/model/labels/labels_stringlabels.go
@@ -691,3 +691,8 @@ func NewScratchBuilderWithSymbolTable(_ *SymbolTable, n int) ScratchBuilder {
 func (b *ScratchBuilder) SetSymbolTable(_ *SymbolTable) {
 	// no-op
 }
+
+// SizeOfLabels returns the approximate space required for n copies of a label.
+func SizeOfLabels(name, value string, n uint64) uint64 {
+	return uint64(labelSize(&Label{Name: name, Value: value})) * n
+}
diff --git a/vendor/github.com/prometheus/prometheus/model/textparse/openmetricsparse.go b/vendor/github.com/prometheus/prometheus/model/textparse/openmetricsparse.go
index 16e805f3a93..f0dd51afeed 100644
--- a/vendor/github.com/prometheus/prometheus/model/textparse/openmetricsparse.go
+++ b/vendor/github.com/prometheus/prometheus/model/textparse/openmetricsparse.go
@@ -337,7 +337,7 @@ func (p *OpenMetricsParser) CreatedTimestamp() *int64 {
 		}
 
 		// All timestamps in OpenMetrics are Unix Epoch in seconds. Convert to milliseconds.
-		// https://github.com/OpenObservability/OpenMetrics/blob/main/specification/OpenMetrics.md#timestamps
+		// https://github.com/prometheus/OpenMetrics/blob/v1.0.0/specification/OpenMetrics.md#timestamps
 		ct := int64(p.val * 1000.0)
 		p.setCTParseValues(ct, currHash, currName, true)
 		return &ct
diff --git a/vendor/github.com/prometheus/prometheus/promql/functions.go b/vendor/github.com/prometheus/prometheus/promql/functions.go
index 016e676d316..da1821fd18a 100644
--- a/vendor/github.com/prometheus/prometheus/promql/functions.go
+++ b/vendor/github.com/prometheus/prometheus/promql/functions.go
@@ -345,11 +345,14 @@ func calcTrendValue(i int, tf, s0, s1, b float64) float64 {
 	return x + y
 }
 
-// Holt-Winters is similar to a weighted moving average, where historical data has exponentially less influence on the current data.
-// Holt-Winter also accounts for trends in data. The smoothing factor (0 < sf < 1) affects how historical data will affect the current
-// data. A lower smoothing factor increases the influence of historical data. The trend factor (0 < tf < 1) affects
-// how trends in historical data will affect the current data. A higher trend factor increases the influence.
-// of trends. Algorithm taken from https://en.wikipedia.org/wiki/Exponential_smoothing titled: "Double exponential smoothing".
+// Double exponential smoothing is similar to a weighted moving average, where
+// historical data has exponentially less influence on the current data. It also
+// accounts for trends in data. The smoothing factor (0 < sf < 1) affects how
+// historical data will affect the current data. A lower smoothing factor
+// increases the influence of historical data. The trend factor (0 < tf < 1)
+// affects how trends in historical data will affect the current data. A higher
+// trend factor increases the influence. of trends. Algorithm taken from
+// https://en.wikipedia.org/wiki/Exponential_smoothing .
 func funcDoubleExponentialSmoothing(vals []parser.Value, args parser.Expressions, enh *EvalNodeHelper) (Vector, annotations.Annotations) {
 	samples := vals[0].(Matrix)[0]
 
diff --git a/vendor/github.com/prometheus/prometheus/promql/parser/generated_parser.y b/vendor/github.com/prometheus/prometheus/promql/parser/generated_parser.y
index c321a1e9735..3865dc6548d 100644
--- a/vendor/github.com/prometheus/prometheus/promql/parser/generated_parser.y
+++ b/vendor/github.com/prometheus/prometheus/promql/parser/generated_parser.y
@@ -669,14 +669,14 @@ label_set_item  : IDENTIFIER EQL STRING
                         { $$ = labels.Label{Name: $1.Val, Value: yylex.(*parser).unquoteString($3.Val) } }
                 | string_identifier EQL STRING
                         { $$ = labels.Label{Name: $1.Val, Value: yylex.(*parser).unquoteString($3.Val) } }
+                | string_identifier
+                        { $$ = labels.Label{Name: labels.MetricName, Value: $1.Val} }
                 | IDENTIFIER EQL error
                         { yylex.(*parser).unexpected("label set", "string"); $$ = labels.Label{}}
                 | string_identifier EQL error
                         { yylex.(*parser).unexpected("label set", "string"); $$ = labels.Label{}}
                 | IDENTIFIER error
                         { yylex.(*parser).unexpected("label set", "\"=\""); $$ = labels.Label{}}
-                | string_identifier error
-                        { yylex.(*parser).unexpected("label set", "\"=\""); $$ = labels.Label{}}
                 | error
                         { yylex.(*parser).unexpected("label set", "identifier or \"}\""); $$ = labels.Label{} }
                 ;
diff --git a/vendor/github.com/prometheus/prometheus/promql/parser/generated_parser.y.go b/vendor/github.com/prometheus/prometheus/promql/parser/generated_parser.y.go
index 8979410ceb4..7ff8591169b 100644
--- a/vendor/github.com/prometheus/prometheus/promql/parser/generated_parser.y.go
+++ b/vendor/github.com/prometheus/prometheus/promql/parser/generated_parser.y.go
@@ -339,7 +339,7 @@ var yyExca = [...]int16{
 	79, 197,
 	85, 197,
 	-2, 125,
-	-1, 205,
+	-1, 204,
 	9, 246,
 	12, 246,
 	13, 246,
@@ -371,7 +371,7 @@ var yyExca = [...]int16{
 	88, 246,
 	89, 246,
 	-2, 0,
-	-1, 206,
+	-1, 205,
 	9, 246,
 	12, 246,
 	13, 246,
@@ -407,139 +407,139 @@ var yyExca = [...]int16{
 
 const yyPrivate = 57344
 
-const yyLast = 804
+const yyLast = 803
 
 var yyAct = [...]int16{
-	155, 339, 337, 158, 344, 231, 39, 197, 281, 44,
-	296, 295, 84, 120, 82, 181, 109, 108, 351, 352,
-	353, 354, 107, 111, 203, 136, 204, 159, 154, 112,
-	205, 206, 234, 6, 271, 55, 163, 163, 107, 334,
-	333, 307, 244, 275, 309, 54, 162, 162, 250, 363,
-	91, 272, 330, 131, 362, 233, 60, 270, 276, 110,
-	100, 101, 298, 115, 103, 116, 106, 90, 164, 164,
-	114, 265, 113, 361, 277, 307, 360, 246, 247, 338,
-	103, 248, 106, 153, 165, 165, 264, 316, 201, 261,
-	122, 105, 235, 237, 239, 240, 241, 249, 251, 254,
-	255, 256, 257, 258, 262, 263, 273, 105, 236, 238,
-	242, 243, 245, 252, 253, 152, 117, 166, 259, 260,
-	176, 164, 170, 173, 163, 168, 223, 169, 172, 2,
-	3, 4, 5, 107, 162, 199, 111, 165, 187, 202,
-	189, 171, 112, 269, 207, 208, 209, 210, 211, 212,
-	213, 214, 215, 216, 217, 218, 219, 220, 221, 200,
-	89, 91, 113, 222, 123, 193, 268, 329, 224, 225,
-	183, 100, 101, 191, 121, 103, 104, 106, 90, 7,
-	85, 234, 266, 182, 55, 183, 328, 86, 192, 123,
-	83, 244, 122, 267, 54, 132, 190, 250, 188, 121,
-	345, 230, 105, 86, 233, 77, 35, 119, 304, 10,
-	185, 327, 86, 303, 293, 294, 157, 315, 297, 79,
-	184, 186, 326, 163, 274, 185, 246, 247, 302, 325,
-	248, 324, 314, 162, 323, 184, 186, 299, 261, 313,
-	322, 235, 237, 239, 240, 241, 249, 251, 254, 255,
-	256, 257, 258, 262, 263, 164, 321, 236, 238, 242,
-	243, 245, 252, 253, 180, 126, 320, 259, 260, 179,
-	125, 165, 305, 319, 306, 308, 318, 310, 317, 130,
-	88, 129, 178, 124, 311, 312, 137, 138, 139, 140,
+	154, 338, 336, 157, 343, 230, 39, 196, 280, 44,
+	295, 294, 84, 120, 82, 233, 180, 109, 108, 350,
+	351, 352, 353, 110, 111, 243, 202, 158, 203, 135,
+	112, 249, 361, 6, 333, 329, 113, 332, 232, 204,
+	205, 308, 271, 60, 130, 270, 297, 268, 162, 315,
+	156, 360, 153, 306, 359, 344, 200, 162, 161, 55,
+	245, 246, 222, 115, 247, 116, 107, 161, 269, 54,
+	267, 114, 260, 306, 182, 234, 236, 238, 239, 240,
+	248, 250, 253, 254, 255, 256, 257, 261, 262, 163,
+	122, 235, 237, 241, 242, 244, 251, 252, 192, 328,
+	111, 258, 259, 117, 190, 164, 112, 152, 103, 55,
+	106, 337, 77, 113, 184, 151, 35, 165, 327, 54,
+	175, 191, 169, 172, 183, 185, 167, 189, 168, 2,
+	3, 4, 5, 107, 198, 105, 159, 160, 201, 186,
+	188, 7, 326, 206, 207, 208, 209, 210, 211, 212,
+	213, 214, 215, 216, 217, 218, 219, 220, 199, 194,
+	89, 91, 221, 162, 264, 325, 197, 223, 224, 171,
+	200, 100, 101, 161, 162, 103, 104, 106, 90, 263,
+	233, 324, 170, 162, 161, 323, 362, 322, 321, 274,
+	243, 122, 266, 161, 131, 163, 249, 272, 123, 320,
+	229, 319, 105, 232, 275, 318, 163, 317, 121, 85,
+	316, 164, 163, 292, 293, 163, 265, 296, 129, 83,
+	276, 86, 164, 273, 10, 245, 246, 187, 164, 247,
+	88, 164, 86, 50, 79, 36, 298, 260, 1, 78,
+	234, 236, 238, 239, 240, 248, 250, 253, 254, 255,
+	256, 257, 261, 262, 123, 49, 235, 237, 241, 242,
+	244, 251, 252, 181, 121, 182, 258, 259, 128, 48,
+	127, 304, 119, 305, 307, 59, 309, 86, 9, 9,
+	47, 46, 134, 310, 311, 136, 137, 138, 139, 140,
 	141, 142, 143, 144, 145, 146, 147, 148, 149, 150,
-	151, 195, 160, 161, 50, 163, 36, 167, 198, 331,
-	78, 332, 201, 228, 55, 162, 85, 227, 1, 340,
-	341, 342, 336, 49, 54, 343, 83, 347, 346, 349,
-	348, 48, 226, 47, 81, 355, 356, 164, 55, 86,
-	357, 53, 77, 301, 56, 8, 359, 22, 54, 37,
-	55, 175, 46, 165, 57, 128, 135, 127, 45, 43,
-	54, 364, 300, 59, 133, 174, 9, 9, 42, 134,
-	75, 41, 40, 51, 196, 358, 18, 19, 278, 87,
-	20, 194, 229, 80, 350, 156, 76, 58, 232, 52,
-	118, 61, 62, 63, 64, 65, 66, 67, 68, 69,
-	70, 71, 72, 73, 74, 0, 0, 0, 13, 0,
-	0, 0, 24, 0, 30, 0, 0, 31, 32, 55,
-	38, 0, 53, 77, 0, 56, 280, 0, 22, 54,
-	0, 0, 0, 279, 0, 57, 0, 283, 284, 282,
-	289, 291, 288, 290, 285, 286, 287, 292, 0, 0,
-	0, 75, 0, 0, 0, 0, 0, 18, 19, 0,
-	0, 20, 0, 0, 0, 0, 0, 76, 0, 0,
-	0, 0, 61, 62, 63, 64, 65, 66, 67, 68,
-	69, 70, 71, 72, 73, 74, 0, 0, 0, 13,
-	0, 0, 0, 24, 0, 30, 0, 55, 31, 32,
-	53, 77, 0, 56, 335, 0, 22, 54, 0, 0,
-	0, 0, 0, 57, 0, 283, 284, 282, 289, 291,
-	288, 290, 285, 286, 287, 292, 0, 0, 0, 75,
-	0, 0, 0, 0, 0, 18, 19, 0, 0, 20,
-	0, 0, 0, 17, 77, 76, 0, 0, 0, 22,
+	45, 43, 132, 173, 179, 184, 166, 85, 330, 178,
+	331, 42, 133, 55, 41, 183, 185, 83, 339, 340,
+	341, 335, 177, 54, 342, 81, 346, 345, 348, 347,
+	86, 303, 40, 314, 354, 355, 302, 55, 51, 356,
+	53, 77, 300, 56, 195, 358, 22, 54, 313, 55,
+	174, 301, 227, 57, 8, 312, 226, 357, 37, 54,
+	363, 299, 126, 277, 87, 193, 228, 125, 80, 75,
+	349, 225, 155, 58, 231, 18, 19, 52, 118, 20,
+	124, 0, 0, 0, 0, 76, 0, 0, 0, 0,
 	61, 62, 63, 64, 65, 66, 67, 68, 69, 70,
 	71, 72, 73, 74, 0, 0, 0, 13, 0, 0,
-	0, 24, 0, 30, 0, 0, 31, 32, 18, 19,
-	0, 0, 20, 0, 0, 0, 17, 35, 0, 0,
-	0, 0, 22, 11, 12, 14, 15, 16, 21, 23,
-	25, 26, 27, 28, 29, 33, 34, 0, 0, 0,
-	13, 0, 0, 0, 24, 0, 30, 0, 0, 31,
-	32, 18, 19, 0, 0, 20, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 11, 12, 14, 15,
-	16, 21, 23, 25, 26, 27, 28, 29, 33, 34,
-	107, 0, 0, 13, 0, 0, 0, 24, 177, 30,
-	0, 0, 31, 32, 0, 0, 0, 0, 0, 107,
-	0, 0, 0, 0, 0, 0, 0, 89, 91, 92,
-	0, 93, 94, 95, 96, 97, 98, 99, 100, 101,
-	102, 0, 103, 104, 106, 90, 89, 91, 92, 0,
+	0, 24, 0, 30, 0, 0, 31, 32, 55, 38,
+	107, 53, 77, 0, 56, 279, 0, 22, 54, 0,
+	0, 0, 278, 0, 57, 0, 282, 283, 281, 288,
+	290, 287, 289, 284, 285, 286, 291, 0, 91, 0,
+	75, 0, 0, 0, 0, 0, 18, 19, 100, 101,
+	20, 0, 103, 0, 106, 90, 76, 0, 0, 0,
+	0, 61, 62, 63, 64, 65, 66, 67, 68, 69,
+	70, 71, 72, 73, 74, 0, 0, 0, 13, 105,
+	0, 0, 24, 0, 30, 0, 55, 31, 32, 53,
+	77, 0, 56, 334, 0, 22, 54, 0, 0, 0,
+	0, 0, 57, 0, 282, 283, 281, 288, 290, 287,
+	289, 284, 285, 286, 291, 0, 0, 0, 75, 0,
+	0, 0, 0, 0, 18, 19, 0, 0, 20, 0,
+	0, 0, 17, 77, 76, 0, 0, 0, 22, 61,
+	62, 63, 64, 65, 66, 67, 68, 69, 70, 71,
+	72, 73, 74, 0, 0, 0, 13, 0, 0, 0,
+	24, 0, 30, 0, 0, 31, 32, 18, 19, 0,
+	0, 20, 0, 0, 0, 17, 35, 0, 0, 0,
+	0, 22, 11, 12, 14, 15, 16, 21, 23, 25,
+	26, 27, 28, 29, 33, 34, 0, 0, 0, 13,
+	0, 0, 0, 24, 0, 30, 0, 0, 31, 32,
+	18, 19, 0, 0, 20, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 11, 12, 14, 15, 16,
+	21, 23, 25, 26, 27, 28, 29, 33, 34, 107,
+	0, 0, 13, 0, 0, 0, 24, 176, 30, 0,
+	0, 31, 32, 0, 0, 0, 0, 0, 107, 0,
+	0, 0, 0, 0, 0, 0, 89, 91, 92, 0,
 	93, 94, 95, 96, 97, 98, 99, 100, 101, 102,
-	0, 103, 104, 106, 90, 107, 0, 0, 0, 105,
+	0, 103, 104, 106, 90, 89, 91, 92, 0, 93,
+	94, 95, 96, 97, 98, 99, 100, 101, 102, 0,
+	103, 104, 106, 90, 107, 0, 0, 0, 105, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 107, 0, 0, 0, 105, 0,
-	0, 0, 89, 91, 92, 0, 93, 94, 95, 0,
-	97, 98, 99, 100, 101, 102, 0, 103, 104, 106,
-	90, 89, 91, 92, 0, 93, 94, 0, 0, 97,
-	98, 0, 100, 101, 102, 0, 103, 104, 106, 90,
-	0, 0, 0, 0, 105, 0, 0, 0, 0, 0,
+	0, 0, 0, 107, 0, 0, 0, 105, 0, 0,
+	0, 89, 91, 92, 0, 93, 94, 95, 0, 97,
+	98, 99, 100, 101, 102, 0, 103, 104, 106, 90,
+	89, 91, 92, 0, 93, 94, 0, 0, 97, 98,
+	0, 100, 101, 102, 0, 103, 104, 106, 90, 0,
+	0, 0, 0, 105, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 105,
+	0, 0, 105,
 }
 
 var yyPact = [...]int16{
-	31, 169, 574, 574, 410, 531, -1000, -1000, -1000, 193,
+	31, 131, 573, 573, 409, 530, -1000, -1000, -1000, 103,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, -1000, 314, -1000, 278, -1000, 655,
+	-1000, -1000, -1000, -1000, -1000, 305, -1000, 228, -1000, 654,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, 57, 147, -1000, -1000, 488, -1000, 488, 192,
+	-1000, -1000, 21, 98, -1000, -1000, 487, -1000, 487, 99,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, -1000, -1000, -1000, 187, -1000, -1000,
-	263, -1000, -1000, 353, 277, -1000, -1000, 29, -1000, -53,
-	-53, -53, -53, -53, -53, -53, -53, -53, -53, -53,
-	-53, -53, -53, -53, -53, 26, 214, 305, 147, -56,
-	-1000, 126, 126, 329, -1000, 636, 24, -1000, 262, -1000,
-	-1000, 181, 166, -1000, -1000, 178, -1000, 171, -1000, 163,
-	-1000, 296, 488, -1000, -58, -50, -1000, 488, 488, 488,
-	488, 488, 488, 488, 488, 488, 488, 488, 488, 488,
-	488, 488, -1000, 175, -1000, -1000, 111, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, 115, 115, 311, -1000, -1000, -1000,
-	-1000, 179, -1000, -1000, 64, -1000, 655, -1000, -1000, 162,
-	-1000, 141, -1000, -1000, -1000, -1000, -1000, 32, -1000, -1000,
-	-1000, -1000, -1000, -1000, -1000, 25, 80, 17, -1000, -1000,
-	-1000, 409, 8, 126, 126, 126, 126, 24, 24, 119,
-	119, 119, 720, 701, 119, 119, 720, 24, 24, 119,
-	24, 8, -1000, 40, -1000, -1000, -1000, 341, -1000, 206,
+	-1000, -1000, -1000, -1000, -1000, -1000, -1000, 252, -1000, -1000,
+	360, -1000, -1000, 266, 214, -1000, -1000, 20, -1000, -49,
+	-49, -49, -49, -49, -49, -49, -49, -49, -49, -49,
+	-49, -49, -49, -49, -49, 50, 48, 304, 98, -55,
+	-1000, 167, 167, 328, -1000, 635, 52, -1000, 302, -1000,
+	-1000, 261, 70, -1000, -1000, 207, -1000, 102, -1000, 96,
+	154, 487, -1000, -56, -41, -1000, 487, 487, 487, 487,
+	487, 487, 487, 487, 487, 487, 487, 487, 487, 487,
+	487, -1000, 100, -1000, -1000, 47, -1000, -1000, -1000, -1000,
+	-1000, -1000, -1000, 39, 39, 350, -1000, -1000, -1000, -1000,
+	178, -1000, -1000, 157, -1000, 654, -1000, -1000, 196, -1000,
+	45, -1000, -1000, -1000, -1000, -1000, 43, -1000, -1000, -1000,
+	-1000, -1000, -1000, -1000, 16, 171, 163, -1000, -1000, -1000,
+	408, 406, 167, 167, 167, 167, 52, 52, 119, 119,
+	119, 719, 700, 119, 119, 719, 52, 52, 119, 52,
+	406, -1000, 24, -1000, -1000, -1000, 340, -1000, 329, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
 	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, -1000, 488, -1000, -1000, -1000, -1000,
-	-1000, -1000, 56, 56, 18, 56, 72, 72, 215, 70,
-	-1000, -1000, 272, 270, 267, 260, 250, 234, 228, 225,
-	223, 216, 205, -1000, -1000, -1000, -1000, -1000, -1000, 165,
-	-1000, -1000, -1000, 30, -1000, 655, -1000, -1000, -1000, 56,
-	-1000, 14, 13, 487, -1000, -1000, -1000, 22, 27, 27,
-	27, 115, 186, 186, 22, 186, 22, -74, -1000, -1000,
-	-1000, -1000, -1000, 56, 56, -1000, -1000, -1000, 56, -1000,
-	-1000, -1000, -1000, -1000, -1000, 27, -1000, -1000, -1000, -1000,
-	-1000, -1000, -1000, -1000, -1000, -1000, -1000, -1000, 52, -1000,
-	28, -1000, -1000, -1000, -1000,
+	-1000, -1000, -1000, -1000, 487, -1000, -1000, -1000, -1000, -1000,
+	-1000, 34, 34, 15, 34, 40, 40, 331, 32, -1000,
+	-1000, 204, 201, 199, 195, 193, 182, 181, 179, 175,
+	159, 136, -1000, -1000, -1000, -1000, -1000, -1000, 97, -1000,
+	-1000, -1000, 13, -1000, 654, -1000, -1000, -1000, 34, -1000,
+	11, 8, 486, -1000, -1000, -1000, 54, 174, 174, 174,
+	39, 41, 41, 54, 41, 54, -73, -1000, -1000, -1000,
+	-1000, -1000, 34, 34, -1000, -1000, -1000, 34, -1000, -1000,
+	-1000, -1000, -1000, -1000, 174, -1000, -1000, -1000, -1000, -1000,
+	-1000, -1000, -1000, -1000, -1000, -1000, -1000, 30, -1000, 165,
+	-1000, -1000, -1000, -1000,
 }
 
 var yyPgo = [...]int16{
-	0, 390, 13, 389, 5, 15, 388, 363, 387, 385,
-	12, 384, 209, 345, 383, 14, 382, 10, 11, 381,
-	379, 7, 378, 8, 4, 375, 2, 1, 3, 374,
-	27, 0, 373, 372, 17, 195, 371, 369, 6, 368,
-	365, 16, 364, 56, 359, 9, 358, 356, 352, 333,
-	331, 323, 304, 318, 306,
+	0, 378, 13, 377, 5, 16, 374, 275, 373, 372,
+	12, 370, 224, 354, 368, 14, 366, 10, 11, 365,
+	364, 7, 363, 8, 4, 357, 2, 1, 3, 344,
+	27, 0, 338, 332, 18, 194, 314, 312, 6, 311,
+	303, 17, 302, 43, 301, 9, 300, 282, 281, 280,
+	269, 255, 233, 238, 235,
 }
 
 var yyR1 = [...]int8{
@@ -584,7 +584,7 @@ var yyR2 = [...]int8{
 	2, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 3, 4, 2, 0,
-	3, 1, 2, 3, 3, 3, 3, 2, 2, 1,
+	3, 1, 2, 3, 3, 1, 3, 3, 2, 1,
 	2, 0, 3, 2, 1, 1, 3, 1, 3, 4,
 	1, 3, 5, 5, 1, 1, 1, 4, 3, 3,
 	2, 3, 1, 2, 3, 3, 3, 3, 3, 3,
@@ -612,30 +612,30 @@ var yyChk = [...]int16{
 	52, 53, 54, 56, 57, 83, 58, 14, -34, -41,
 	2, 79, 85, 15, -41, -38, -38, -43, -1, 20,
 	-2, 12, -10, 2, 20, 7, 2, 4, 2, 4,
-	2, 24, -35, -42, -37, -47, 78, -35, -35, -35,
+	24, -35, -42, -37, -47, 78, -35, -35, -35, -35,
 	-35, -35, -35, -35, -35, -35, -35, -35, -35, -35,
-	-35, -35, -45, 57, 2, -31, -9, 2, -28, -30,
-	88, 89, 19, 9, 41, 57, -45, 2, -41, -34,
-	-17, 15, 2, -17, -40, 22, -38, 22, 20, 7,
-	2, -5, 2, 4, 54, 44, 55, -5, 20, -15,
-	25, 2, 25, 2, -19, 5, -29, -21, 12, -28,
-	-30, 16, -38, 82, 84, 80, 81, -38, -38, -38,
+	-35, -45, 57, 2, -31, -9, 2, -28, -30, 88,
+	89, 19, 9, 41, 57, -45, 2, -41, -34, -17,
+	15, 2, -17, -40, 22, -38, 22, 20, 7, 2,
+	-5, 2, 4, 54, 44, 55, -5, 20, -15, 25,
+	2, 25, 2, -19, 5, -29, -21, 12, -28, -30,
+	16, -38, 82, 84, 80, 81, -38, -38, -38, -38,
 	-38, -38, -38, -38, -38, -38, -38, -38, -38, -38,
-	-38, -38, -45, 15, -28, -28, 21, 6, 2, -16,
-	22, -4, -6, 25, 2, 62, 78, 63, 79, 64,
-	65, 66, 80, 81, 12, 82, 47, 48, 51, 67,
-	18, 68, 83, 84, 69, 70, 71, 72, 73, 88,
-	89, 59, 74, 75, 22, 7, 20, -2, 25, 2,
-	25, 2, 26, 26, -30, 26, 41, 57, -22, 24,
-	17, -23, 30, 28, 29, 35, 36, 37, 33, 31,
-	34, 32, 38, -17, -17, -18, -17, -18, 22, -45,
-	21, 2, 22, 7, 2, -38, -27, 19, -27, 26,
-	-27, -21, -21, 24, 17, 2, 17, 6, 6, 6,
-	6, 6, 6, 6, 6, 6, 6, 6, 21, 2,
-	22, -4, -27, 26, 26, 17, -23, -26, 57, -27,
-	-31, -31, -31, -28, -24, 14, -24, -26, -24, -26,
-	-11, 92, 93, 94, 95, -27, -27, -27, -25, -31,
-	24, 21, 2, 21, -31,
+	-38, -45, 15, -28, -28, 21, 6, 2, -16, 22,
+	-4, -6, 25, 2, 62, 78, 63, 79, 64, 65,
+	66, 80, 81, 12, 82, 47, 48, 51, 67, 18,
+	68, 83, 84, 69, 70, 71, 72, 73, 88, 89,
+	59, 74, 75, 22, 7, 20, -2, 25, 2, 25,
+	2, 26, 26, -30, 26, 41, 57, -22, 24, 17,
+	-23, 30, 28, 29, 35, 36, 37, 33, 31, 34,
+	32, 38, -17, -17, -18, -17, -18, 22, -45, 21,
+	2, 22, 7, 2, -38, -27, 19, -27, 26, -27,
+	-21, -21, 24, 17, 2, 17, 6, 6, 6, 6,
+	6, 6, 6, 6, 6, 6, 6, 21, 2, 22,
+	-4, -27, 26, 26, 17, -23, -26, 57, -27, -31,
+	-31, -31, -28, -24, 14, -24, -26, -24, -26, -11,
+	92, 93, 94, 95, -27, -27, -27, -25, -31, 24,
+	21, 2, 21, -31,
 }
 
 var yyDef = [...]int16{
@@ -647,35 +647,35 @@ var yyDef = [...]int16{
 	18, 19, 0, 108, 233, 234, 0, 244, 0, 85,
 	86, -2, -2, -2, -2, -2, -2, -2, -2, -2,
 	-2, -2, -2, -2, -2, 227, 228, 0, 5, 100,
-	0, 128, 131, 0, 0, 139, 245, 140, 144, 43,
+	0, 128, 131, 0, 135, 139, 245, 140, 144, 43,
 	43, 43, 43, 43, 43, 43, 43, 43, 43, 43,
 	43, 43, 43, 43, 43, 0, 0, 0, 0, 22,
 	23, 0, 0, 0, 61, 0, 83, 84, 0, 89,
-	91, 0, 95, 99, 126, 0, 132, 0, 137, 0,
-	138, 143, 0, 42, 47, 48, 44, 0, 0, 0,
+	91, 0, 95, 99, 126, 0, 132, 0, 138, 0,
+	143, 0, 42, 47, 48, 44, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 68, 0, 70, 71, 0, 73, 239, 240,
-	74, 75, 235, 236, 0, 0, 0, 82, 20, 21,
-	24, 0, 54, 25, 0, 63, 65, 67, 87, 0,
-	92, 0, 98, 229, 230, 231, 232, 0, 127, 130,
-	133, 135, 134, 136, 142, 145, 147, 150, 154, 155,
-	156, 0, 26, 0, 0, -2, -2, 27, 28, 29,
-	30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
-	40, 41, 69, 0, 237, 238, 76, 0, 81, 0,
-	53, 56, 58, 59, 60, 198, 199, 200, 201, 202,
-	203, 204, 205, 206, 207, 208, 209, 210, 211, 212,
-	213, 214, 215, 216, 217, 218, 219, 220, 221, 222,
-	223, 224, 225, 226, 62, 66, 88, 90, 93, 97,
-	94, 96, 0, 0, 0, 0, 0, 0, 0, 0,
-	160, 162, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 45, 46, 49, 247, 50, 72, 0,
-	78, 80, 51, 0, 57, 64, 146, 241, 148, 0,
-	151, 0, 0, 0, 158, 163, 159, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 77, 79,
-	52, 55, 149, 0, 0, 157, 161, 164, 0, 243,
-	165, 166, 167, 168, 169, 0, 170, 171, 172, 173,
-	174, 180, 181, 182, 183, 152, 153, 242, 0, 178,
-	0, 176, 179, 175, 177,
+	0, 68, 0, 70, 71, 0, 73, 239, 240, 74,
+	75, 235, 236, 0, 0, 0, 82, 20, 21, 24,
+	0, 54, 25, 0, 63, 65, 67, 87, 0, 92,
+	0, 98, 229, 230, 231, 232, 0, 127, 130, 133,
+	136, 134, 137, 142, 145, 147, 150, 154, 155, 156,
+	0, 26, 0, 0, -2, -2, 27, 28, 29, 30,
+	31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+	41, 69, 0, 237, 238, 76, 0, 81, 0, 53,
+	56, 58, 59, 60, 198, 199, 200, 201, 202, 203,
+	204, 205, 206, 207, 208, 209, 210, 211, 212, 213,
+	214, 215, 216, 217, 218, 219, 220, 221, 222, 223,
+	224, 225, 226, 62, 66, 88, 90, 93, 97, 94,
+	96, 0, 0, 0, 0, 0, 0, 0, 0, 160,
+	162, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 45, 46, 49, 247, 50, 72, 0, 78,
+	80, 51, 0, 57, 64, 146, 241, 148, 0, 151,
+	0, 0, 0, 158, 163, 159, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 77, 79, 52,
+	55, 149, 0, 0, 157, 161, 164, 0, 243, 165,
+	166, 167, 168, 169, 0, 170, 171, 172, 173, 174,
+	180, 181, 182, 183, 152, 153, 242, 0, 178, 0,
+	176, 179, 175, 177,
 }
 
 var yyTok1 = [...]int8{
@@ -1623,10 +1623,9 @@ yydefault:
 			yyVAL.label = labels.Label{Name: yyDollar[1].item.Val, Value: yylex.(*parser).unquoteString(yyDollar[3].item.Val)}
 		}
 	case 135:
-		yyDollar = yyS[yypt-3 : yypt+1]
+		yyDollar = yyS[yypt-1 : yypt+1]
 		{
-			yylex.(*parser).unexpected("label set", "string")
-			yyVAL.label = labels.Label{}
+			yyVAL.label = labels.Label{Name: labels.MetricName, Value: yyDollar[1].item.Val}
 		}
 	case 136:
 		yyDollar = yyS[yypt-3 : yypt+1]
@@ -1635,9 +1634,9 @@ yydefault:
 			yyVAL.label = labels.Label{}
 		}
 	case 137:
-		yyDollar = yyS[yypt-2 : yypt+1]
+		yyDollar = yyS[yypt-3 : yypt+1]
 		{
-			yylex.(*parser).unexpected("label set", "\"=\"")
+			yylex.(*parser).unexpected("label set", "string")
 			yyVAL.label = labels.Label{}
 		}
 	case 138:
diff --git a/vendor/github.com/prometheus/prometheus/promql/parser/parse.go b/vendor/github.com/prometheus/prometheus/promql/parser/parse.go
index e8abe90194f..9d38fd2d6dc 100644
--- a/vendor/github.com/prometheus/prometheus/promql/parser/parse.go
+++ b/vendor/github.com/prometheus/prometheus/promql/parser/parse.go
@@ -244,7 +244,8 @@ type seriesDescription struct {
 	values []SequenceValue
 }
 
-// ParseSeriesDesc parses the description of a time series.
+// ParseSeriesDesc parses the description of a time series. It is only used in
+// the PromQL testing framework code.
 func ParseSeriesDesc(input string) (labels labels.Labels, values []SequenceValue, err error) {
 	p := NewParser(input)
 	p.lex.seriesDesc = true
diff --git a/vendor/github.com/prometheus/prometheus/promql/parser/printer.go b/vendor/github.com/prometheus/prometheus/promql/parser/printer.go
index 63b19508276..afe755e7dd4 100644
--- a/vendor/github.com/prometheus/prometheus/promql/parser/printer.go
+++ b/vendor/github.com/prometheus/prometheus/promql/parser/printer.go
@@ -14,8 +14,10 @@
 package parser
 
 import (
+	"bytes"
 	"fmt"
 	"sort"
+	"strconv"
 	"strings"
 	"time"
 
@@ -91,13 +93,20 @@ func (node *AggregateExpr) getAggOpStr() string {
 }
 
 func joinLabels(ss []string) string {
+	var bytea [1024]byte // On stack to avoid memory allocation while building the output.
+	b := bytes.NewBuffer(bytea[:0])
+
 	for i, s := range ss {
-		// If the label is already quoted, don't quote it again.
-		if s[0] != '"' && s[0] != '\'' && s[0] != '`' && !model.IsValidLegacyMetricName(string(model.LabelValue(s))) {
-			ss[i] = fmt.Sprintf("\"%s\"", s)
+		if i > 0 {
+			b.WriteString(", ")
+		}
+		if !model.IsValidLegacyMetricName(string(model.LabelValue(s))) {
+			b.Write(strconv.AppendQuote(b.AvailableBuffer(), s))
+		} else {
+			b.WriteString(s)
 		}
 	}
-	return strings.Join(ss, ", ")
+	return b.String()
 }
 
 func (node *BinaryExpr) returnBool() string {
diff --git a/vendor/github.com/prometheus/prometheus/promql/promqltest/test.go b/vendor/github.com/prometheus/prometheus/promql/promqltest/test.go
index f208b4f3135..efa2136f10a 100644
--- a/vendor/github.com/prometheus/prometheus/promql/promqltest/test.go
+++ b/vendor/github.com/prometheus/prometheus/promql/promqltest/test.go
@@ -56,6 +56,10 @@ const (
 	DefaultMaxSamplesPerQuery = 10000
 )
 
+func init() {
+	model.NameValidationScheme = model.UTF8Validation
+}
+
 type TBRun interface {
 	testing.TB
 	Run(string, func(*testing.T)) bool
@@ -66,7 +70,7 @@ var testStartTime = time.Unix(0, 0).UTC()
 // LoadedStorage returns storage with generated data using the provided load statements.
 // Non-load statements will cause test errors.
 func LoadedStorage(t testutil.T, input string) *teststorage.TestStorage {
-	test, err := newTest(t, input, false)
+	test, err := newTest(t, input, false, newTestStorage)
 	require.NoError(t, err)
 
 	for _, cmd := range test.cmds {
@@ -77,7 +81,7 @@ func LoadedStorage(t testutil.T, input string) *teststorage.TestStorage {
 			t.Errorf("only 'load' commands accepted, got '%s'", cmd)
 		}
 	}
-	return test.storage
+	return test.storage.(*teststorage.TestStorage)
 }
 
 // NewTestEngine creates a promql.Engine with enablePerStepStats, lookbackDelta and maxSamples, and returns it.
@@ -108,6 +112,11 @@ func NewTestEngineWithOpts(tb testing.TB, opts promql.EngineOpts) *promql.Engine
 
 // RunBuiltinTests runs an acceptance test suite against the provided engine.
 func RunBuiltinTests(t TBRun, engine promql.QueryEngine) {
+	RunBuiltinTestsWithStorage(t, engine, newTestStorage)
+}
+
+// RunBuiltinTestsWithStorage runs an acceptance test suite against the provided engine and storage.
+func RunBuiltinTestsWithStorage(t TBRun, engine promql.QueryEngine, newStorage func(testutil.T) storage.Storage) {
 	t.Cleanup(func() { parser.EnableExperimentalFunctions = false })
 	parser.EnableExperimentalFunctions = true
 
@@ -118,24 +127,29 @@ func RunBuiltinTests(t TBRun, engine promql.QueryEngine) {
 		t.Run(fn, func(t *testing.T) {
 			content, err := fs.ReadFile(testsFs, fn)
 			require.NoError(t, err)
-			RunTest(t, string(content), engine)
+			RunTestWithStorage(t, string(content), engine, newStorage)
 		})
 	}
 }
 
 // RunTest parses and runs the test against the provided engine.
 func RunTest(t testutil.T, input string, engine promql.QueryEngine) {
-	require.NoError(t, runTest(t, input, engine, false))
+	RunTestWithStorage(t, input, engine, newTestStorage)
+}
+
+// RunTestWithStorage parses and runs the test against the provided engine and storage.
+func RunTestWithStorage(t testutil.T, input string, engine promql.QueryEngine, newStorage func(testutil.T) storage.Storage) {
+	require.NoError(t, runTest(t, input, engine, newStorage, false))
 }
 
 // testTest allows tests to be run in "test-the-test" mode (true for
 // testingMode). This is a special mode for testing test code execution itself.
 func testTest(t testutil.T, input string, engine promql.QueryEngine) error {
-	return runTest(t, input, engine, true)
+	return runTest(t, input, engine, newTestStorage, true)
 }
 
-func runTest(t testutil.T, input string, engine promql.QueryEngine, testingMode bool) error {
-	test, err := newTest(t, input, testingMode)
+func runTest(t testutil.T, input string, engine promql.QueryEngine, newStorage func(testutil.T) storage.Storage, testingMode bool) error {
+	test, err := newTest(t, input, testingMode, newStorage)
 
 	// Why do this before checking err? newTest() can create the test storage and then return an error,
 	// and we want to make sure to clean that up to avoid leaking goroutines.
@@ -175,18 +189,20 @@ type test struct {
 
 	cmds []testCommand
 
-	storage *teststorage.TestStorage
+	open    func(testutil.T) storage.Storage
+	storage storage.Storage
 
 	context   context.Context
 	cancelCtx context.CancelFunc
 }
 
 // newTest returns an initialized empty Test.
-func newTest(t testutil.T, input string, testingMode bool) (*test, error) {
+func newTest(t testutil.T, input string, testingMode bool, newStorage func(testutil.T) storage.Storage) (*test, error) {
 	test := &test{
 		T:           t,
 		cmds:        []testCommand{},
 		testingMode: testingMode,
+		open:        newStorage,
 	}
 	err := test.parse(input)
 	test.clear()
@@ -194,6 +210,8 @@ func newTest(t testutil.T, input string, testingMode bool) (*test, error) {
 	return test, err
 }
 
+func newTestStorage(t testutil.T) storage.Storage { return teststorage.New(t) }
+
 //go:embed testdata
 var testsFs embed.FS
 
@@ -1267,7 +1285,7 @@ func (t *test) clear() {
 	if t.cancelCtx != nil {
 		t.cancelCtx()
 	}
-	t.storage = teststorage.New(t)
+	t.storage = t.open(t.T)
 	t.context, t.cancelCtx = context.WithCancel(context.Background())
 }
 
diff --git a/vendor/github.com/prometheus/prometheus/promql/promqltest/testdata/functions.test b/vendor/github.com/prometheus/prometheus/promql/promqltest/testdata/functions.test
index 2ed7ffb6a45..a00ed8a3ea6 100644
--- a/vendor/github.com/prometheus/prometheus/promql/promqltest/testdata/functions.test
+++ b/vendor/github.com/prometheus/prometheus/promql/promqltest/testdata/functions.test
@@ -256,6 +256,9 @@ clear
 load 5m
 	testcounter_reset_middle_total	0+10x4 0+10x5
 	http_requests_total{job="app-server", instance="1", group="canary"}		0+80x10
+	testcounter_reset_middle_mix	0+10x4 0+10x5 {{schema:0 sum:1 count:1}} {{schema:1 sum:2 count:2}}
+	http_requests_mix{job="app-server", instance="1", group="canary"}		0+80x10 {{schema:0 sum:1 count:1}}
+    http_requests_histogram{job="app-server", instance="1", group="canary"}		{{schema:0 sum:1 count:2}}x10
 
 # deriv should return the same as rate in simple cases.
 eval instant at 50m rate(http_requests_total{group="canary", instance="1", job="app-server"}[50m])
@@ -268,6 +271,16 @@ eval instant at 50m deriv(http_requests_total{group="canary", instance="1", job=
 eval instant at 50m deriv(testcounter_reset_middle_total[100m])
 	{} 0.010606060606060607
 
+# deriv should ignore histograms.
+eval instant at 110m deriv(http_requests_mix{group="canary", instance="1", job="app-server"}[110m])
+	{group="canary", instance="1", job="app-server"} 0.26666666666666666
+
+eval instant at 100m deriv(testcounter_reset_middle_mix[110m])
+	{} 0.010606060606060607
+
+eval instant at 50m deriv(http_requests_histogram[60m])
+    #empty
+
 # predict_linear should return correct result.
 # X/s = [  0, 300, 600, 900,1200,1500,1800,2100,2400,2700,3000]
 # Y   = [  0,  10,  20,  30,  40,   0,  10,  20,  30,  40,  50]
@@ -1110,11 +1123,16 @@ clear
 # Don't return anything when there's something there.
 load 5m
 	http_requests{job="api-server", instance="0", group="production"}	0+10x10
+	http_requests_histogram{job="api-server", instance="0", group="production"} {{schema:0 sum:1 count:1}}x11
 
 eval instant at 50m absent(http_requests)
 
 eval instant at 50m absent(sum(http_requests))
 
+eval instant at 50m absent(http_requests_histogram)
+
+eval instant at 50m absent(sum(http_requests_histogram))
+
 clear
 
 eval instant at 50m absent(sum(nonexistent{job="testjob", instance="testinstance"}))
@@ -1162,6 +1180,7 @@ load 1m
 	httpd_handshake_failures_total{instance="127.0.0.1",job="node"}	1+1x15
 	httpd_log_lines_total{instance="127.0.0.1",job="node"}	1
 	ssl_certificate_expiry_seconds{job="ingress"} NaN NaN NaN NaN NaN
+	http_requests_histogram{path="/foo",instance="127.0.0.1",job="httpd"} {{schema:0 sum:1 count:1}}x11
 
 eval instant at 5m absent_over_time(http_requests_total[5m])
 
@@ -1205,6 +1224,16 @@ eval instant at 5m absent_over_time({job="ingress"}[4m])
 eval instant at 10m absent_over_time({job="ingress"}[4m])
 	{job="ingress"} 1
 
+eval instant at 10m absent_over_time(http_requests_histogram[5m])
+
+eval instant at 10m absent_over_time(rate(http_requests_histogram[5m])[5m:1m])
+
+eval instant at 20m absent_over_time(http_requests_histogram[5m])
+    {} 1
+
+eval instant at 20m absent_over_time(rate(http_requests_histogram[5m])[5m:1m])
+    {} 1
+
 clear
 
 # Testdata for present_over_time()
diff --git a/vendor/github.com/prometheus/prometheus/rules/group.go b/vendor/github.com/prometheus/prometheus/rules/group.go
index b6feb6f9625..8ad8958f8dd 100644
--- a/vendor/github.com/prometheus/prometheus/rules/group.go
+++ b/vendor/github.com/prometheus/prometheus/rules/group.go
@@ -44,20 +44,21 @@ import (
 
 // Group is a set of rules that have a logical relation.
 type Group struct {
-	name                 string
-	file                 string
-	interval             time.Duration
-	queryOffset          *time.Duration
-	limit                int
-	rules                []Rule
-	sourceTenants        []string
-	seriesInPreviousEval []map[string]labels.Labels // One per Rule.
-	staleSeries          []labels.Labels
-	opts                 *ManagerOptions
-	mtx                  sync.Mutex
-	evaluationTime       time.Duration
-	lastEvaluation       time.Time // Wall-clock time of most recent evaluation.
-	lastEvalTimestamp    time.Time // Time slot used for most recent evaluation.
+	name                  string
+	file                  string
+	interval              time.Duration
+	queryOffset           *time.Duration
+	limit                 int
+	rules                 []Rule
+	sourceTenants         []string
+	seriesInPreviousEval  []map[string]labels.Labels // One per Rule.
+	staleSeries           []labels.Labels
+	opts                  *ManagerOptions
+	mtx                   sync.Mutex
+	evaluationTime        time.Duration // Time it took to evaluate the group.
+	evaluationRuleTimeSum time.Duration // Sum of time it took to evaluate each rule in the group.
+	lastEvaluation        time.Time     // Wall-clock time of most recent evaluation.
+	lastEvalTimestamp     time.Time     // Time slot used for most recent evaluation.
 
 	shouldRestore bool
 
@@ -119,6 +120,7 @@ func NewGroup(o GroupOptions) *Group {
 	metrics.EvalFailures.WithLabelValues(key)
 	metrics.GroupLastEvalTime.WithLabelValues(key)
 	metrics.GroupLastDuration.WithLabelValues(key)
+	metrics.GroupLastRuleDurationSum.WithLabelValues(key)
 	metrics.GroupRules.WithLabelValues(key).Set(float64(len(o.Rules)))
 	metrics.GroupSamples.WithLabelValues(key)
 	metrics.GroupInterval.WithLabelValues(key).Set(o.Interval.Seconds())
@@ -380,6 +382,28 @@ func (g *Group) setEvaluationTime(dur time.Duration) {
 	g.evaluationTime = dur
 }
 
+// GetRuleEvaluationTimeSum returns the sum of the time it took to evaluate each rule in the group irrespective of concurrency.
+func (g *Group) GetRuleEvaluationTimeSum() time.Duration {
+	g.mtx.Lock()
+	defer g.mtx.Unlock()
+	return g.evaluationRuleTimeSum
+}
+
+// updateRuleEvaluationTimeSum updates evaluationRuleTimeSum which is the sum of the time it took to evaluate each rule in the group irrespective of concurrency.
+// It collects the times from the rules themselves.
+func (g *Group) updateRuleEvaluationTimeSum() {
+	var sum time.Duration
+	for _, rule := range g.rules {
+		sum += rule.GetEvaluationDuration()
+	}
+
+	g.metrics.GroupLastRuleDurationSum.WithLabelValues(GroupKey(g.file, g.name)).Set(sum.Seconds())
+
+	g.mtx.Lock()
+	defer g.mtx.Unlock()
+	g.evaluationRuleTimeSum = sum
+}
+
 // GetLastEvaluation returns the time the last evaluation of the rule group took place.
 func (g *Group) GetLastEvaluation() time.Time {
 	g.mtx.Lock()
@@ -916,6 +940,7 @@ type Metrics struct {
 	GroupInterval            *prometheus.GaugeVec
 	GroupLastEvalTime        *prometheus.GaugeVec
 	GroupLastDuration        *prometheus.GaugeVec
+	GroupLastRuleDurationSum *prometheus.GaugeVec
 	GroupLastRestoreDuration *prometheus.GaugeVec
 	GroupRules               *prometheus.GaugeVec
 	GroupSamples             *prometheus.GaugeVec
@@ -994,6 +1019,14 @@ func NewGroupMetrics(reg prometheus.Registerer) *Metrics {
 			},
 			[]string{"rule_group"},
 		),
+		GroupLastRuleDurationSum: prometheus.NewGaugeVec(
+			prometheus.GaugeOpts{
+				Namespace: namespace,
+				Name:      "rule_group_last_rule_duration_sum_seconds",
+				Help:      "The sum of time in seconds it took to evaluate each rule in the group regardless of concurrency. This should be higher than the group duration if rules are evaluated concurrently.",
+			},
+			[]string{"rule_group"},
+		),
 		GroupLastRestoreDuration: prometheus.NewGaugeVec(
 			prometheus.GaugeOpts{
 				Namespace: namespace,
@@ -1031,6 +1064,7 @@ func NewGroupMetrics(reg prometheus.Registerer) *Metrics {
 			m.GroupInterval,
 			m.GroupLastEvalTime,
 			m.GroupLastDuration,
+			m.GroupLastRuleDurationSum,
 			m.GroupLastRestoreDuration,
 			m.GroupRules,
 			m.GroupSamples,
diff --git a/vendor/github.com/prometheus/prometheus/rules/manager.go b/vendor/github.com/prometheus/prometheus/rules/manager.go
index b5bb0151166..58020126e52 100644
--- a/vendor/github.com/prometheus/prometheus/rules/manager.go
+++ b/vendor/github.com/prometheus/prometheus/rules/manager.go
@@ -82,6 +82,7 @@ func DefaultEvalIterationFunc(ctx context.Context, g *Group, evalTimestamp time.
 	timeSinceStart := time.Since(start)
 
 	g.metrics.IterationDuration.Observe(timeSinceStart.Seconds())
+	g.updateRuleEvaluationTimeSum()
 	g.setEvaluationTime(timeSinceStart)
 	g.setLastEvaluation(start)
 	g.setLastEvalTimestamp(evalTimestamp)
@@ -482,6 +483,11 @@ type ruleDependencyController struct{}
 // AnalyseRules implements RuleDependencyController.
 func (c ruleDependencyController) AnalyseRules(rules []Rule) {
 	depMap := buildDependencyMap(rules)
+
+	if depMap == nil {
+		return
+	}
+
 	for _, r := range rules {
 		r.SetNoDependentRules(depMap.dependents(r) == 0)
 		r.SetNoDependencyRules(depMap.dependencies(r) == 0)
diff --git a/vendor/github.com/prometheus/prometheus/scrape/scrape.go b/vendor/github.com/prometheus/prometheus/scrape/scrape.go
index 5c6063fa586..4803354cf6f 100644
--- a/vendor/github.com/prometheus/prometheus/scrape/scrape.go
+++ b/vendor/github.com/prometheus/prometheus/scrape/scrape.go
@@ -361,6 +361,7 @@ func (sp *scrapePool) restartLoops(reuseCache bool) {
 				bodySizeLimit:        bodySizeLimit,
 				acceptHeader:         acceptHeader(sp.config.ScrapeProtocols, validationScheme),
 				acceptEncodingHeader: acceptEncodingHeader(enableCompression),
+				metrics:              sp.metrics,
 			}
 			newLoop = sp.newLoop(scrapeLoopOptions{
 				target:                   t,
diff --git a/vendor/github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheus/normalize_name.go b/vendor/github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheus/normalize_name.go
index 335705aa8dd..6967ca013c2 100644
--- a/vendor/github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheus/normalize_name.go
+++ b/vendor/github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheus/normalize_name.go
@@ -30,7 +30,7 @@ import (
 // OTLP metrics use the c/s notation as specified at https://ucum.org/ucum.html
 // (See also https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/semantic_conventions/README.md#instrument-units)
 // Prometheus best practices for units: https://prometheus.io/docs/practices/naming/#base-units
-// OpenMetrics specification for units: https://github.com/OpenObservability/OpenMetrics/blob/main/specification/OpenMetrics.md#units-and-base-units
+// OpenMetrics specification for units: https://github.com/prometheus/OpenMetrics/blob/v1.0.0/specification/OpenMetrics.md#units-and-base-units
 var unitMap = map[string]string{
 	// Time
 	"d":   "days",
@@ -122,17 +122,22 @@ func BuildCompliantName(metric pmetric.Metric, namespace string, addMetricSuffix
 
 // Build a normalized name for the specified metric.
 func normalizeName(metric pmetric.Metric, namespace string, allowUTF8 bool) string {
-	var translationFunc func(rune) bool
+	var nameTokens []string
+	var separators []string
 	if !allowUTF8 {
 		nonTokenMetricCharRE := regexp.MustCompile(`[^a-zA-Z0-9:]`)
-		translationFunc = func(r rune) bool { return nonTokenMetricCharRE.MatchString(string(r)) }
+		// Split metric name into "tokens" (of supported metric name runes).
+		// Note that this has the side effect of replacing multiple consecutive underscores with a single underscore.
+		// This is part of the OTel to Prometheus specification: https://github.com/open-telemetry/opentelemetry-specification/blob/v1.38.0/specification/compatibility/prometheus_and_openmetrics.md#otlp-metric-points-to-prometheus.
+		nameTokens = strings.FieldsFunc(
+			metric.Name(),
+			func(r rune) bool { return nonTokenMetricCharRE.MatchString(string(r)) },
+		)
 	} else {
-		translationFunc = func(r rune) bool { return !unicode.IsLetter(r) && !unicode.IsDigit(r) && r != ':' }
+		translationFunc := func(r rune) bool { return !unicode.IsLetter(r) && !unicode.IsDigit(r) && r != ':' }
+		// Split metric name into "tokens" (of supported metric name runes).
+		nameTokens, separators = fieldsFunc(metric.Name(), translationFunc)
 	}
-	// Split metric name into "tokens" (of supported metric name runes).
-	// Note that this has the side effect of replacing multiple consecutive underscores with a single underscore.
-	// This is part of the OTel to Prometheus specification: https://github.com/open-telemetry/opentelemetry-specification/blob/v1.38.0/specification/compatibility/prometheus_and_openmetrics.md#otlp-metric-points-to-prometheus.
-	nameTokens, separators := fieldsFunc(metric.Name(), translationFunc)
 
 	// Split unit at the '/' if any
 	unitTokens := strings.SplitN(metric.Unit(), "/", 2)
@@ -201,12 +206,14 @@ func normalizeName(metric pmetric.Metric, namespace string, allowUTF8 bool) stri
 		nameTokens = append([]string{namespace}, nameTokens...)
 	}
 
-	// Build the string from the tokens + separators.
-	// If UTF-8 isn't allowed, we'll use underscores as separators.
+	var normalizedName string
 	if !allowUTF8 {
-		separators = []string{}
+		// Build the string from the tokens, separated with underscores
+		normalizedName = strings.Join(nameTokens, "_")
+	} else {
+		// Build the string from the tokens + separators.
+		normalizedName = join(nameTokens, separators, "_")
 	}
-	normalizedName := join(nameTokens, separators, "_")
 
 	// Metric name cannot start with a digit, so prefix it with "_" in this case
 	if normalizedName != "" && unicode.IsDigit(rune(normalizedName[0])) {
diff --git a/vendor/github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheusremotewrite/helper.go b/vendor/github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheusremotewrite/helper.go
index f4fc44bf48c..82f3bb591ec 100644
--- a/vendor/github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheusremotewrite/helper.go
+++ b/vendor/github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheusremotewrite/helper.go
@@ -51,7 +51,7 @@ const (
 	createdSuffix = "_created"
 	// maxExemplarRunes is the maximum number of UTF-8 exemplar characters
 	// according to the prometheus specification
-	// https://github.com/OpenObservability/OpenMetrics/blob/main/specification/OpenMetrics.md#exemplars
+	// https://github.com/prometheus/OpenMetrics/blob/v1.0.0/specification/OpenMetrics.md#exemplars
 	maxExemplarRunes = 128
 	// Trace and Span id keys are defined as part of the spec:
 	// https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification%2Fmetrics%2Fdatamodel.md#exemplars-2
diff --git a/vendor/github.com/prometheus/prometheus/storage/remote/queue_manager.go b/vendor/github.com/prometheus/prometheus/storage/remote/queue_manager.go
index f6d6cbc7e91..475c126eff3 100644
--- a/vendor/github.com/prometheus/prometheus/storage/remote/queue_manager.go
+++ b/vendor/github.com/prometheus/prometheus/storage/remote/queue_manager.go
@@ -1688,7 +1688,7 @@ func (s *shards) updateMetrics(_ context.Context, err error, sampleCount, exempl
 	s.enqueuedHistograms.Sub(int64(histogramCount))
 }
 
-// sendSamples to the remote storage with backoff for recoverable errors.
+// sendSamplesWithBackoff to the remote storage with backoff for recoverable errors.
 func (s *shards) sendSamplesWithBackoff(ctx context.Context, samples []prompb.TimeSeries, sampleCount, exemplarCount, histogramCount, metadataCount int, pBuf *proto.Buffer, buf *[]byte, enc Compression) (WriteResponseStats, error) {
 	// Build the WriteRequest with no metadata.
 	req, highest, lowest, err := buildWriteRequest(s.qm.logger, samples, nil, pBuf, buf, nil, enc)
@@ -1802,7 +1802,7 @@ func (s *shards) sendSamplesWithBackoff(ctx context.Context, samples []prompb.Ti
 	return accumulatedStats, err
 }
 
-// sendV2Samples to the remote storage with backoff for recoverable errors.
+// sendV2SamplesWithBackoff to the remote storage with backoff for recoverable errors.
 func (s *shards) sendV2SamplesWithBackoff(ctx context.Context, samples []writev2.TimeSeries, labels []string, sampleCount, exemplarCount, histogramCount, metadataCount int, pBuf, buf *[]byte, enc Compression) (WriteResponseStats, error) {
 	// Build the WriteRequest with no metadata.
 	req, highest, lowest, err := buildV2WriteRequest(s.qm.logger, samples, labels, pBuf, buf, nil, enc)
diff --git a/vendor/github.com/prometheus/prometheus/tsdb/head.go b/vendor/github.com/prometheus/prometheus/tsdb/head.go
index 324b0a60607..b4fa652a438 100644
--- a/vendor/github.com/prometheus/prometheus/tsdb/head.go
+++ b/vendor/github.com/prometheus/prometheus/tsdb/head.go
@@ -1079,7 +1079,7 @@ func (h *Head) PostingsCardinalityStats(statsByLabelName string, limit int) *ind
 		return h.cardinalityCache
 	}
 	h.cardinalityCacheKey = cacheKey
-	h.cardinalityCache = h.postings.Stats(statsByLabelName, limit)
+	h.cardinalityCache = h.postings.Stats(statsByLabelName, limit, labels.SizeOfLabels)
 	h.lastPostingsStatsCall = time.Duration(time.Now().Unix()) * time.Second
 
 	return h.cardinalityCache
diff --git a/vendor/github.com/prometheus/prometheus/tsdb/head_read_mimir.go b/vendor/github.com/prometheus/prometheus/tsdb/head_read_mimir.go
new file mode 100644
index 00000000000..7d9c765fdb5
--- /dev/null
+++ b/vendor/github.com/prometheus/prometheus/tsdb/head_read_mimir.go
@@ -0,0 +1,7 @@
+package tsdb
+
+import "math"
+
+func (h *Head) MustIndex() IndexReader {
+	return h.indexRange(math.MinInt64, math.MaxInt64)
+}
diff --git a/vendor/github.com/prometheus/prometheus/tsdb/index/postings.go b/vendor/github.com/prometheus/prometheus/tsdb/index/postings.go
index b44b4089275..3e550ed5e65 100644
--- a/vendor/github.com/prometheus/prometheus/tsdb/index/postings.go
+++ b/vendor/github.com/prometheus/prometheus/tsdb/index/postings.go
@@ -72,7 +72,7 @@ type MemPostings struct {
 	// lvs holds the label values for each label name.
 	// lvs[name] is essentially an unsorted append-only list of all keys in m[name]
 	// mtx must be held when interacting with lvs.
-	// Since it's append-only, it is safe to the label values slice after releasing the lock.
+	// Since it's append-only, it is safe to read the label values slice after releasing the lock.
 	lvs map[string][]string
 
 	ordered bool
@@ -190,7 +190,8 @@ type PostingsStats struct {
 }
 
 // Stats calculates the cardinality statistics from postings.
-func (p *MemPostings) Stats(label string, limit int) *PostingsStats {
+// Caller can pass in a function which computes the space required for n series with a given label.
+func (p *MemPostings) Stats(label string, limit int, labelSizeFunc func(string, string, uint64) uint64) *PostingsStats {
 	var size uint64
 	p.mtx.RLock()
 
@@ -218,7 +219,7 @@ func (p *MemPostings) Stats(label string, limit int) *PostingsStats {
 			}
 			seriesCnt := uint64(len(values))
 			labelValuePairs.push(Stat{Name: n + "=" + name, Count: seriesCnt})
-			size += uint64(len(name)) * seriesCnt
+			size += labelSizeFunc(n, name, seriesCnt)
 		}
 		labelValueLength.push(Stat{Name: n, Count: size})
 	}
diff --git a/vendor/github.com/prometheus/prometheus/tsdb/querier.go b/vendor/github.com/prometheus/prometheus/tsdb/querier.go
index 7f4c4317f23..0d2f1ddcd89 100644
--- a/vendor/github.com/prometheus/prometheus/tsdb/querier.go
+++ b/vendor/github.com/prometheus/prometheus/tsdb/querier.go
@@ -270,7 +270,7 @@ func PostingsForMatchers(ctx context.Context, ix IndexPostingsReader, ms ...*lab
 			its = append(its, it)
 		case m.Type == labels.MatchNotRegexp && m.Value == ".+":
 			// .+ regexp matches any non-empty string: get postings for all label values and remove them.
-			its = append(notIts, ix.PostingsForAllLabelValues(ctx, m.Name))
+			notIts = append(notIts, ix.PostingsForAllLabelValues(ctx, m.Name))
 
 		case labelMustBeSet[m.Name]:
 			// If this matcher must be non-empty, we can be smarter.
diff --git a/vendor/github.com/prometheus/prometheus/util/logging/dedupe.go b/vendor/github.com/prometheus/prometheus/util/logging/dedupe.go
index e7dff20f786..8137f4f22b9 100644
--- a/vendor/github.com/prometheus/prometheus/util/logging/dedupe.go
+++ b/vendor/github.com/prometheus/prometheus/util/logging/dedupe.go
@@ -33,7 +33,7 @@ type Deduper struct {
 	next   *slog.Logger
 	repeat time.Duration
 	quit   chan struct{}
-	mtx    sync.RWMutex
+	mtx    *sync.RWMutex
 	seen   map[string]time.Time
 }
 
@@ -43,6 +43,7 @@ func Dedupe(next *slog.Logger, repeat time.Duration) *Deduper {
 		next:   next,
 		repeat: repeat,
 		quit:   make(chan struct{}),
+		mtx:    new(sync.RWMutex),
 		seen:   map[string]time.Time{},
 	}
 	go d.run()
@@ -88,6 +89,7 @@ func (d *Deduper) WithAttrs(attrs []slog.Attr) slog.Handler {
 		repeat: d.repeat,
 		quit:   d.quit,
 		seen:   d.seen,
+		mtx:    d.mtx,
 	}
 }
 
@@ -103,6 +105,7 @@ func (d *Deduper) WithGroup(name string) slog.Handler {
 		repeat: d.repeat,
 		quit:   d.quit,
 		seen:   d.seen,
+		mtx:    d.mtx,
 	}
 }
 
diff --git a/vendor/modules.txt b/vendor/modules.txt
index b67f27ed734..05717732ad5 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -1039,7 +1039,7 @@ github.com/prometheus/exporter-toolkit/web
 github.com/prometheus/procfs
 github.com/prometheus/procfs/internal/fs
 github.com/prometheus/procfs/internal/util
-# github.com/prometheus/prometheus v1.99.0 => github.com/grafana/mimir-prometheus v0.0.0-20241213145946-1e9d95a2e3cd
+# github.com/prometheus/prometheus v1.99.0 => github.com/grafana/mimir-prometheus v0.0.0-20250102152619-93fa7617c041
 ## explicit; go 1.22.0
 github.com/prometheus/prometheus/config
 github.com/prometheus/prometheus/discovery
@@ -1711,7 +1711,7 @@ sigs.k8s.io/kustomize/kyaml/yaml/walk
 sigs.k8s.io/yaml
 sigs.k8s.io/yaml/goyaml.v2
 sigs.k8s.io/yaml/goyaml.v3
-# github.com/prometheus/prometheus => github.com/grafana/mimir-prometheus v0.0.0-20241213145946-1e9d95a2e3cd
+# github.com/prometheus/prometheus => github.com/grafana/mimir-prometheus v0.0.0-20250102152619-93fa7617c041
 # github.com/hashicorp/memberlist => github.com/grafana/memberlist v0.3.1-0.20220714140823-09ffed8adbbe
 # gopkg.in/yaml.v3 => github.com/colega/go-yaml-yaml v0.0.0-20220720105220-255a8d16d094
 # github.com/grafana/regexp => github.com/grafana/regexp v0.0.0-20240531075221-3685f1377d7b

From 33d7945de3b10e03bddedf154dd7c672040db395 Mon Sep 17 00:00:00 2001
From: Jesus Vazquez <jesus.vazquez@grafana.com>
Date: Thu, 2 Jan 2025 16:42:23 +0100
Subject: [PATCH 7/8] hide flag from docs

Signed-off-by: Jesus Vazquez <jesus.vazquez@grafana.com>
---
 cmd/mimir/config-descriptor.json                      | 11 -----------
 cmd/mimir/help-all.txt.tmpl                           |  2 --
 .../mimir/configure/configuration-parameters/index.md |  5 -----
 pkg/distributor/distributor.go                        |  6 +++---
 4 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/cmd/mimir/config-descriptor.json b/cmd/mimir/config-descriptor.json
index fbb603ddfb4..dcc0ebfb925 100644
--- a/cmd/mimir/config-descriptor.json
+++ b/cmd/mimir/config-descriptor.json
@@ -1690,17 +1690,6 @@
           "fieldFlag": "distributor.reusable-ingester-push-workers",
           "fieldType": "int",
           "fieldCategory": "advanced"
-        },
-        {
-          "kind": "field",
-          "name": "start_time_quiet_zero",
-          "required": false,
-          "desc": "Change the implementation of Otel startTime from a real zero to a special NaN value.",
-          "fieldValue": null,
-          "fieldDefaultValue": false,
-          "fieldFlag": "distributor.otel-start-time-quiet-zero",
-          "fieldType": "boolean",
-          "fieldCategory": "advanced"
         }
       ],
       "fieldValue": null,
diff --git a/cmd/mimir/help-all.txt.tmpl b/cmd/mimir/help-all.txt.tmpl
index 90dbf5352a0..bd0256e3f6c 100644
--- a/cmd/mimir/help-all.txt.tmpl
+++ b/cmd/mimir/help-all.txt.tmpl
@@ -1393,8 +1393,6 @@ Usage of ./cmd/mimir/mimir:
     	Whether to enable automatic suffixes to names of metrics ingested through OTLP.
   -distributor.otel-promote-resource-attributes comma-separated-list-of-strings
     	[experimental] Optionally specify OTel resource attributes to promote to labels.
-  -distributor.otel-start-time-quiet-zero
-    	Change the implementation of Otel startTime from a real zero to a special NaN value.
   -distributor.remote-timeout duration
     	Timeout for downstream ingesters. (default 2s)
   -distributor.request-burst-size int
diff --git a/docs/sources/mimir/configure/configuration-parameters/index.md b/docs/sources/mimir/configure/configuration-parameters/index.md
index f228620f322..dfd84fbca61 100644
--- a/docs/sources/mimir/configure/configuration-parameters/index.md
+++ b/docs/sources/mimir/configure/configuration-parameters/index.md
@@ -956,11 +956,6 @@ instance_limits:
 # limiting feature.)
 # CLI flag: -distributor.reusable-ingester-push-workers
 [reusable_ingester_push_workers: <int> | default = 2000]
-
-# (advanced) Change the implementation of Otel startTime from a real zero to a
-# special NaN value.
-# CLI flag: -distributor.otel-start-time-quiet-zero
-[start_time_quiet_zero: <boolean> | default = false]
 ```
 
 ### ingester
diff --git a/pkg/distributor/distributor.go b/pkg/distributor/distributor.go
index 1db43cdbb88..4e55b298ef7 100644
--- a/pkg/distributor/distributor.go
+++ b/pkg/distributor/distributor.go
@@ -250,8 +250,8 @@ type Config struct {
 	// OTelResourceAttributePromotionConfig allows for specializing OTel resource attribute promotion.
 	OTelResourceAttributePromotionConfig OTelResourceAttributePromotionConfig `yaml:"-"`
 
-	// Change the implementation of Otel startTime from a real zero to a special NaN value.
-	EnableStartTimeQuietZero bool `yaml:"start_time_quiet_zero" category:"advanced"`
+	// Change the implementation of OTel startTime from a real zero to a special NaN value.
+	EnableStartTimeQuietZero bool `yaml:"start_time_quiet_zero" category:"advanced" doc:"hidden"`
 }
 
 // PushWrapper wraps around a push. It is similar to middleware.Interface.
@@ -270,7 +270,7 @@ func (cfg *Config) RegisterFlags(f *flag.FlagSet, logger log.Logger) {
 	f.DurationVar(&cfg.RemoteTimeout, "distributor.remote-timeout", 2*time.Second, "Timeout for downstream ingesters.")
 	f.BoolVar(&cfg.WriteRequestsBufferPoolingEnabled, "distributor.write-requests-buffer-pooling-enabled", true, "Enable pooling of buffers used for marshaling write requests.")
 	f.IntVar(&cfg.ReusableIngesterPushWorkers, "distributor.reusable-ingester-push-workers", 2000, "Number of pre-allocated workers used to forward push requests to the ingesters. If 0, no workers will be used and a new goroutine will be spawned for each ingester push request. If not enough workers available, new goroutine will be spawned. (Note: this is a performance optimization, not a limiting feature.)")
-	f.BoolVar(&cfg.EnableStartTimeQuietZero, "distributor.otel-start-time-quiet-zero", false, "Change the implementation of Otel startTime from a real zero to a special NaN value.")
+	f.BoolVar(&cfg.EnableStartTimeQuietZero, "distributor.otel-start-time-quiet-zero", false, "Change the implementation of OTel startTime from a real zero to a special NaN value.")
 
 	cfg.DefaultLimits.RegisterFlags(f)
 }

From b06b9566ade3c74ef3ff983fb52e76399188004f Mon Sep 17 00:00:00 2001
From: Jesus Vazquez <jesus.vazquez@grafana.com>
Date: Fri, 3 Jan 2025 11:27:30 +0100
Subject: [PATCH 8/8] Introduce changelog entry

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c7e16d25f6..c6d542b8ee0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
 * [ENHANCEMENT] Distributor: Add native histogram support for `electedReplicaPropagationTime` metric in ha_tracker. #10264
 * [ENHANCEMENT] Ingester: More efficient CPU/memory utilization-based read request limiting. #10325
 * [ENHANCEMENT] Dashboards: Add Query-Scheduler <-> Querier Inflight Requests row to Query Reads and Remote Ruler reads dashboards. #10290
+* [ENHANCEMENT] OTLP: In addition to the flag `-distributor.otel-created-timestamp-zero-ingestion-enabled` there is now `-distributor.otel-start-time-quiet-zero` to convert OTel start timestamps to Prometheus QuietZeroNaNs. This flag is to make the change rollout safe between Ingesters and Distributors. #10238
 * [BUGFIX] Distributor: Use a boolean to track changes while merging the ReplicaDesc components, rather than comparing the objects directly. #10185
 * [BUGFIX] Querier: fix timeout responding to query-frontend when response size is very close to `-querier.frontend-client.grpc-max-send-msg-size`. #10154
 * [BUGFIX] Query-frontend and querier: show warning/info annotations in some cases where they were missing (if a lazy querier was used). #10277