From b1f61929c4a8e42622a88882fb93911b1a0ac898 Mon Sep 17 00:00:00 2001
From: Julien Duchesne <julien.duchesne@grafana.com>
Date: Mon, 16 Dec 2024 11:06:38 -0500
Subject: [PATCH] Update `mimir-prometheus` to latest version It was synced
 here: https://github.com/grafana/mimir-prometheus/pull/792

---
 CHANGELOG.md                                  |   2 +
 go.mod                                        |   6 +-
 go.sum                                        |  16 +-
 .../prometheus/common/config/http_config.go   |  48 +--
 .../prometheus/common/expfmt/encode.go        |   4 +-
 .../prometheus/common/expfmt/expfmt.go        |   4 +-
 .../common/expfmt/openmetrics_create.go       |   4 +-
 .../prometheus/common/expfmt/text_parse.go    |   2 +-
 .../prometheus/common/model/alert.go          |   7 +-
 .../prometheus/common/model/metric.go         |  31 +-
 .../prometheus/common/model/silence.go        |  17 +-
 .../prometheus/common/model/value_float.go    |   3 +-
 .../common/model/value_histogram.go           |   7 +-
 .../prometheus/common/promslog/slog.go        |  19 +-
 .../prometheus/common/version/info.go         |   8 +
 .../prometheus/prometheus/config/config.go    |  37 +-
 .../prometheus/model/labels/labels_common.go  |   6 +-
 .../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              |  29 +-
 .../storage/remote/queue_manager.go           |   4 +-
 .../prometheus/util/logging/dedupe.go         |   5 +-
 vendor/modules.txt                            |   8 +-
 31 files changed, 452 insertions(+), 321 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e83f0e4fdd..1ed71957cb8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,8 @@
 * [ENHANCEMENT] Distributor: discard float and histogram samples with duplicated timestamps from each timeseries in a request before the request is forwarded to ingesters. Discarded samples are tracked by the `cortex_discarded_samples_total` metrics with reason `sample_duplicate_timestamp`. #10145
 * [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] Ruler: fix indeterminate rules being always run concurrently (instead of never) when `-ruler.max-independent-rule-evaluation-concurrency` is set. https://github.com/prometheus/prometheus/pull/15560
+* [BUGFIX] PromQL: Fix various UTF-8 bugs related to quoting. https://github.com/prometheus/prometheus/pull/15531
 
 ### Mixin
 
diff --git a/go.mod b/go.mod
index fc1fe7180b8..5f985f5dd5e 100644
--- a/go.mod
+++ b/go.mod
@@ -36,7 +36,7 @@ require (
 	github.com/prometheus/alertmanager v0.27.0
 	github.com/prometheus/client_golang v1.20.5
 	github.com/prometheus/client_model v0.6.1
-	github.com/prometheus/common v0.60.1
+	github.com/prometheus/common v0.61.0
 	github.com/prometheus/prometheus v1.99.0
 	github.com/segmentio/fasthash v1.0.3
 	github.com/sirupsen/logrus v1.9.3
@@ -49,7 +49,7 @@ require (
 	golang.org/x/net v0.32.0
 	golang.org/x/sync v0.10.0
 	golang.org/x/time v0.8.0
-	google.golang.org/grpc v1.67.1
+	google.golang.org/grpc v1.68.1
 	gopkg.in/yaml.v2 v2.4.0
 	gopkg.in/yaml.v3 v3.0.1
 )
@@ -285,7 +285,7 @@ require (
 )
 
 // Using a fork of Prometheus with Mimir-specific changes.
-replace github.com/prometheus/prometheus => github.com/grafana/mimir-prometheus v0.0.0-20241210170917-0a0a41616520
+replace github.com/prometheus/prometheus => github.com/grafana/mimir-prometheus v0.0.0-20241216154007-6ce3249dcbb8
 
 // 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 75a930e41e8..ac22fae6850 100644
--- a/go.sum
+++ b/go.sum
@@ -931,8 +931,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=
@@ -1279,8 +1279,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-20241210170917-0a0a41616520 h1:FADazl5oVYBARbfVMtLkPQ9IfIwhiE9lrPrKNPOHBV4=
-github.com/grafana/mimir-prometheus v0.0.0-20241210170917-0a0a41616520/go.mod h1:NpYc1U0eC7m6xUh3t3Pq565KxaIc08Oaquiu71dEMi8=
+github.com/grafana/mimir-prometheus v0.0.0-20241216154007-6ce3249dcbb8 h1:wTPjkFjHVU0weI66T4qnVkS6241zgIZuLu5Nasg0wAY=
+github.com/grafana/mimir-prometheus v0.0.0-20241216154007-6ce3249dcbb8/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=
@@ -1390,8 +1390,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=
@@ -1611,8 +1611,8 @@ github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8b
 github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
 github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
 github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
-github.com/prometheus/common v0.60.1 h1:FUas6GcOw66yB/73KC+BOZoFJmbo/1pojoILArPAaSc=
-github.com/prometheus/common v0.60.1/go.mod h1:h0LYf1R1deLSKtD4Vdg8gy4RuOvENW2J/h19V5NADQw=
+github.com/prometheus/common v0.61.0 h1:3gv/GThfX0cV2lpO7gkTUwZru38mxevy90Bj8YFSRQQ=
+github.com/prometheus/common v0.61.0/go.mod h1:zr29OCN/2BsJRaFwG8QOBr41D6kkchKbpeNH7pAjb/s=
 github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4=
 github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI=
 github.com/prometheus/exporter-toolkit v0.13.1 h1:Evsh0gWQo2bdOHlnz9+0Nm7/OFfIwhE2Ws4A2jIlR04=
diff --git a/vendor/github.com/prometheus/common/config/http_config.go b/vendor/github.com/prometheus/common/config/http_config.go
index e6bdd4c035d..57ec252adff 100644
--- a/vendor/github.com/prometheus/common/config/http_config.go
+++ b/vendor/github.com/prometheus/common/config/http_config.go
@@ -357,33 +357,33 @@ func nonZeroCount[T comparable](values ...T) int {
 func (c *HTTPClientConfig) Validate() error {
 	// Backwards compatibility with the bearer_token field.
 	if len(c.BearerToken) > 0 && len(c.BearerTokenFile) > 0 {
-		return fmt.Errorf("at most one of bearer_token & bearer_token_file must be configured")
+		return errors.New("at most one of bearer_token & bearer_token_file must be configured")
 	}
 	if (c.BasicAuth != nil || c.OAuth2 != nil) && (len(c.BearerToken) > 0 || len(c.BearerTokenFile) > 0) {
-		return fmt.Errorf("at most one of basic_auth, oauth2, bearer_token & bearer_token_file must be configured")
+		return errors.New("at most one of basic_auth, oauth2, bearer_token & bearer_token_file must be configured")
 	}
 	if c.BasicAuth != nil && nonZeroCount(string(c.BasicAuth.Username) != "", c.BasicAuth.UsernameFile != "", c.BasicAuth.UsernameRef != "") > 1 {
-		return fmt.Errorf("at most one of basic_auth username, username_file & username_ref must be configured")
+		return errors.New("at most one of basic_auth username, username_file & username_ref must be configured")
 	}
 	if c.BasicAuth != nil && nonZeroCount(string(c.BasicAuth.Password) != "", c.BasicAuth.PasswordFile != "", c.BasicAuth.PasswordRef != "") > 1 {
-		return fmt.Errorf("at most one of basic_auth password, password_file & password_ref must be configured")
+		return errors.New("at most one of basic_auth password, password_file & password_ref must be configured")
 	}
 	if c.Authorization != nil {
 		if len(c.BearerToken) > 0 || len(c.BearerTokenFile) > 0 {
-			return fmt.Errorf("authorization is not compatible with bearer_token & bearer_token_file")
+			return errors.New("authorization is not compatible with bearer_token & bearer_token_file")
 		}
 		if nonZeroCount(string(c.Authorization.Credentials) != "", c.Authorization.CredentialsFile != "", c.Authorization.CredentialsRef != "") > 1 {
-			return fmt.Errorf("at most one of authorization credentials & credentials_file must be configured")
+			return errors.New("at most one of authorization credentials & credentials_file must be configured")
 		}
 		c.Authorization.Type = strings.TrimSpace(c.Authorization.Type)
 		if len(c.Authorization.Type) == 0 {
 			c.Authorization.Type = "Bearer"
 		}
 		if strings.ToLower(c.Authorization.Type) == "basic" {
-			return fmt.Errorf(`authorization type cannot be set to "basic", use "basic_auth" instead`)
+			return errors.New(`authorization type cannot be set to "basic", use "basic_auth" instead`)
 		}
 		if c.BasicAuth != nil || c.OAuth2 != nil {
-			return fmt.Errorf("at most one of basic_auth, oauth2 & authorization must be configured")
+			return errors.New("at most one of basic_auth, oauth2 & authorization must be configured")
 		}
 	} else {
 		if len(c.BearerToken) > 0 {
@@ -399,16 +399,16 @@ func (c *HTTPClientConfig) Validate() error {
 	}
 	if c.OAuth2 != nil {
 		if c.BasicAuth != nil {
-			return fmt.Errorf("at most one of basic_auth, oauth2 & authorization must be configured")
+			return errors.New("at most one of basic_auth, oauth2 & authorization must be configured")
 		}
 		if len(c.OAuth2.ClientID) == 0 {
-			return fmt.Errorf("oauth2 client_id must be configured")
+			return errors.New("oauth2 client_id must be configured")
 		}
 		if len(c.OAuth2.TokenURL) == 0 {
-			return fmt.Errorf("oauth2 token_url must be configured")
+			return errors.New("oauth2 token_url must be configured")
 		}
 		if nonZeroCount(len(c.OAuth2.ClientSecret) > 0, len(c.OAuth2.ClientSecretFile) > 0, len(c.OAuth2.ClientSecretRef) > 0) > 1 {
-			return fmt.Errorf("at most one of oauth2 client_secret, client_secret_file & client_secret_ref must be configured")
+			return errors.New("at most one of oauth2 client_secret, client_secret_file & client_secret_ref must be configured")
 		}
 	}
 	if err := c.ProxyConfig.Validate(); err != nil {
@@ -735,7 +735,7 @@ func (s *FileSecret) Fetch(ctx context.Context) (string, error) {
 }
 
 func (s *FileSecret) Description() string {
-	return fmt.Sprintf("file %s", s.file)
+	return "file " + s.file
 }
 
 func (s *FileSecret) Immutable() bool {
@@ -753,7 +753,7 @@ func (s *refSecret) Fetch(ctx context.Context) (string, error) {
 }
 
 func (s *refSecret) Description() string {
-	return fmt.Sprintf("ref %s", s.ref)
+	return "ref " + s.ref
 }
 
 func (s *refSecret) Immutable() bool {
@@ -1045,7 +1045,7 @@ func NewTLSConfigWithContext(ctx context.Context, cfg *TLSConfig, optFuncs ...TL
 
 	if cfg.MaxVersion != 0 && cfg.MinVersion != 0 {
 		if cfg.MaxVersion < cfg.MinVersion {
-			return nil, fmt.Errorf("tls_config.max_version must be greater than or equal to tls_config.min_version if both are specified")
+			return nil, errors.New("tls_config.max_version must be greater than or equal to tls_config.min_version if both are specified")
 		}
 	}
 
@@ -1144,19 +1144,19 @@ func (c *TLSConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
 // used.
 func (c *TLSConfig) Validate() error {
 	if nonZeroCount(len(c.CA) > 0, len(c.CAFile) > 0, len(c.CARef) > 0) > 1 {
-		return fmt.Errorf("at most one of ca, ca_file & ca_ref must be configured")
+		return errors.New("at most one of ca, ca_file & ca_ref must be configured")
 	}
 	if nonZeroCount(len(c.Cert) > 0, len(c.CertFile) > 0, len(c.CertRef) > 0) > 1 {
-		return fmt.Errorf("at most one of cert, cert_file & cert_ref must be configured")
+		return errors.New("at most one of cert, cert_file & cert_ref must be configured")
 	}
 	if nonZeroCount(len(c.Key) > 0, len(c.KeyFile) > 0, len(c.KeyRef) > 0) > 1 {
-		return fmt.Errorf("at most one of key and key_file must be configured")
+		return errors.New("at most one of key and key_file must be configured")
 	}
 
 	if c.usingClientCert() && !c.usingClientKey() {
-		return fmt.Errorf("exactly one of key or key_file must be configured when a client certificate is configured")
+		return errors.New("exactly one of key or key_file must be configured when a client certificate is configured")
 	} else if c.usingClientKey() && !c.usingClientCert() {
-		return fmt.Errorf("exactly one of cert or cert_file must be configured when a client key is configured")
+		return errors.New("exactly one of cert or cert_file must be configured when a client key is configured")
 	}
 
 	return nil
@@ -1460,16 +1460,16 @@ type ProxyConfig struct {
 // UnmarshalYAML implements the yaml.Unmarshaler interface.
 func (c *ProxyConfig) Validate() error {
 	if len(c.ProxyConnectHeader) > 0 && (!c.ProxyFromEnvironment && (c.ProxyURL.URL == nil || c.ProxyURL.String() == "")) {
-		return fmt.Errorf("if proxy_connect_header is configured, proxy_url or proxy_from_environment must also be configured")
+		return errors.New("if proxy_connect_header is configured, proxy_url or proxy_from_environment must also be configured")
 	}
 	if c.ProxyFromEnvironment && c.ProxyURL.URL != nil && c.ProxyURL.String() != "" {
-		return fmt.Errorf("if proxy_from_environment is configured, proxy_url must not be configured")
+		return errors.New("if proxy_from_environment is configured, proxy_url must not be configured")
 	}
 	if c.ProxyFromEnvironment && c.NoProxy != "" {
-		return fmt.Errorf("if proxy_from_environment is configured, no_proxy must not be configured")
+		return errors.New("if proxy_from_environment is configured, no_proxy must not be configured")
 	}
 	if c.ProxyURL.URL == nil && c.NoProxy != "" {
-		return fmt.Errorf("if no_proxy is configured, proxy_url must also be configured")
+		return errors.New("if no_proxy is configured, proxy_url must also be configured")
 	}
 	return nil
 }
diff --git a/vendor/github.com/prometheus/common/expfmt/encode.go b/vendor/github.com/prometheus/common/expfmt/encode.go
index cf0c150c2e1..d7f3d76f55d 100644
--- a/vendor/github.com/prometheus/common/expfmt/encode.go
+++ b/vendor/github.com/prometheus/common/expfmt/encode.go
@@ -68,7 +68,7 @@ func Negotiate(h http.Header) Format {
 		if escapeParam := ac.Params[model.EscapingKey]; escapeParam != "" {
 			switch Format(escapeParam) {
 			case model.AllowUTF8, model.EscapeUnderscores, model.EscapeDots, model.EscapeValues:
-				escapingScheme = Format(fmt.Sprintf("; escaping=%s", escapeParam))
+				escapingScheme = Format("; escaping=" + escapeParam)
 			default:
 				// If the escaping parameter is unknown, ignore it.
 			}
@@ -101,7 +101,7 @@ func NegotiateIncludingOpenMetrics(h http.Header) Format {
 		if escapeParam := ac.Params[model.EscapingKey]; escapeParam != "" {
 			switch Format(escapeParam) {
 			case model.AllowUTF8, model.EscapeUnderscores, model.EscapeDots, model.EscapeValues:
-				escapingScheme = Format(fmt.Sprintf("; escaping=%s", escapeParam))
+				escapingScheme = Format("; escaping=" + escapeParam)
 			default:
 				// If the escaping parameter is unknown, ignore it.
 			}
diff --git a/vendor/github.com/prometheus/common/expfmt/expfmt.go b/vendor/github.com/prometheus/common/expfmt/expfmt.go
index d942af8edd4..b26886560d7 100644
--- a/vendor/github.com/prometheus/common/expfmt/expfmt.go
+++ b/vendor/github.com/prometheus/common/expfmt/expfmt.go
@@ -15,7 +15,7 @@
 package expfmt
 
 import (
-	"fmt"
+	"errors"
 	"strings"
 
 	"github.com/prometheus/common/model"
@@ -109,7 +109,7 @@ func NewOpenMetricsFormat(version string) (Format, error) {
 	if version == OpenMetricsVersion_1_0_0 {
 		return FmtOpenMetrics_1_0_0, nil
 	}
-	return FmtUnknown, fmt.Errorf("unknown open metrics version string")
+	return FmtUnknown, errors.New("unknown open metrics version string")
 }
 
 // WithEscapingScheme returns a copy of Format with the specified escaping
diff --git a/vendor/github.com/prometheus/common/expfmt/openmetrics_create.go b/vendor/github.com/prometheus/common/expfmt/openmetrics_create.go
index 11c8ff4b9db..f1c495dd606 100644
--- a/vendor/github.com/prometheus/common/expfmt/openmetrics_create.go
+++ b/vendor/github.com/prometheus/common/expfmt/openmetrics_create.go
@@ -152,8 +152,8 @@ func MetricFamilyToOpenMetrics(out io.Writer, in *dto.MetricFamily, options ...E
 	if metricType == dto.MetricType_COUNTER && strings.HasSuffix(compliantName, "_total") {
 		compliantName = name[:len(name)-6]
 	}
-	if toOM.withUnit && in.Unit != nil && !strings.HasSuffix(compliantName, fmt.Sprintf("_%s", *in.Unit)) {
-		compliantName = compliantName + fmt.Sprintf("_%s", *in.Unit)
+	if toOM.withUnit && in.Unit != nil && !strings.HasSuffix(compliantName, "_"+*in.Unit) {
+		compliantName = compliantName + "_" + *in.Unit
 	}
 
 	// Comments, first HELP, then TYPE.
diff --git a/vendor/github.com/prometheus/common/expfmt/text_parse.go b/vendor/github.com/prometheus/common/expfmt/text_parse.go
index f085a923f6c..b4607fe4d27 100644
--- a/vendor/github.com/prometheus/common/expfmt/text_parse.go
+++ b/vendor/github.com/prometheus/common/expfmt/text_parse.go
@@ -895,7 +895,7 @@ func histogramMetricName(name string) string {
 
 func parseFloat(s string) (float64, error) {
 	if strings.ContainsAny(s, "pP_") {
-		return 0, fmt.Errorf("unsupported character in float")
+		return 0, errors.New("unsupported character in float")
 	}
 	return strconv.ParseFloat(s, 64)
 }
diff --git a/vendor/github.com/prometheus/common/model/alert.go b/vendor/github.com/prometheus/common/model/alert.go
index 80d1fe944ea..bd3a39e3e14 100644
--- a/vendor/github.com/prometheus/common/model/alert.go
+++ b/vendor/github.com/prometheus/common/model/alert.go
@@ -14,6 +14,7 @@
 package model
 
 import (
+	"errors"
 	"fmt"
 	"time"
 )
@@ -89,16 +90,16 @@ func (a *Alert) StatusAt(ts time.Time) AlertStatus {
 // Validate checks whether the alert data is inconsistent.
 func (a *Alert) Validate() error {
 	if a.StartsAt.IsZero() {
-		return fmt.Errorf("start time missing")
+		return errors.New("start time missing")
 	}
 	if !a.EndsAt.IsZero() && a.EndsAt.Before(a.StartsAt) {
-		return fmt.Errorf("start time must be before end time")
+		return errors.New("start time must be before end time")
 	}
 	if err := a.Labels.Validate(); err != nil {
 		return fmt.Errorf("invalid label set: %w", err)
 	}
 	if len(a.Labels) == 0 {
-		return fmt.Errorf("at least one label pair required")
+		return errors.New("at least one label pair required")
 	}
 	if err := a.Annotations.Validate(); err != nil {
 		return fmt.Errorf("invalid annotations: %w", err)
diff --git a/vendor/github.com/prometheus/common/model/metric.go b/vendor/github.com/prometheus/common/model/metric.go
index f50966bc494..0daca836afa 100644
--- a/vendor/github.com/prometheus/common/model/metric.go
+++ b/vendor/github.com/prometheus/common/model/metric.go
@@ -14,9 +14,11 @@
 package model
 
 import (
+	"errors"
 	"fmt"
 	"regexp"
 	"sort"
+	"strconv"
 	"strings"
 	"unicode/utf8"
 
@@ -269,10 +271,6 @@ func metricNeedsEscaping(m *dto.Metric) bool {
 	return false
 }
 
-const (
-	lowerhex = "0123456789abcdef"
-)
-
 // EscapeName escapes the incoming name according to the provided escaping
 // scheme. Depending on the rules of escaping, this may cause no change in the
 // string that is returned. (Especially NoEscaping, which by definition is a
@@ -307,7 +305,7 @@ func EscapeName(name string, scheme EscapingScheme) string {
 			} else if isValidLegacyRune(b, i) {
 				escaped.WriteRune(b)
 			} else {
-				escaped.WriteRune('_')
+				escaped.WriteString("__")
 			}
 		}
 		return escaped.String()
@@ -317,21 +315,15 @@ func EscapeName(name string, scheme EscapingScheme) string {
 		}
 		escaped.WriteString("U__")
 		for i, b := range name {
-			if isValidLegacyRune(b, i) {
+			if b == '_' {
+				escaped.WriteString("__")
+			} else if isValidLegacyRune(b, i) {
 				escaped.WriteRune(b)
 			} else if !utf8.ValidRune(b) {
 				escaped.WriteString("_FFFD_")
-			} else if b < 0x100 {
-				escaped.WriteRune('_')
-				for s := 4; s >= 0; s -= 4 {
-					escaped.WriteByte(lowerhex[b>>uint(s)&0xF])
-				}
-				escaped.WriteRune('_')
-			} else if b < 0x10000 {
+			} else {
 				escaped.WriteRune('_')
-				for s := 12; s >= 0; s -= 4 {
-					escaped.WriteByte(lowerhex[b>>uint(s)&0xF])
-				}
+				escaped.WriteString(strconv.FormatInt(int64(b), 16))
 				escaped.WriteRune('_')
 			}
 		}
@@ -389,8 +381,9 @@ func UnescapeName(name string, scheme EscapingScheme) string {
 			// We think we are in a UTF-8 code, process it.
 			var utf8Val uint
 			for j := 0; i < len(escapedName); j++ {
-				// This is too many characters for a utf8 value.
-				if j > 4 {
+				// This is too many characters for a utf8 value based on the MaxRune
+				// value of '\U0010FFFF'.
+				if j >= 6 {
 					return name
 				}
 				// Found a closing underscore, convert to a rune, check validity, and append.
@@ -443,7 +436,7 @@ func (e EscapingScheme) String() string {
 
 func ToEscapingScheme(s string) (EscapingScheme, error) {
 	if s == "" {
-		return NoEscaping, fmt.Errorf("got empty string instead of escaping scheme")
+		return NoEscaping, errors.New("got empty string instead of escaping scheme")
 	}
 	switch s {
 	case AllowUTF8:
diff --git a/vendor/github.com/prometheus/common/model/silence.go b/vendor/github.com/prometheus/common/model/silence.go
index 910b0b71fcc..8f91a9702e0 100644
--- a/vendor/github.com/prometheus/common/model/silence.go
+++ b/vendor/github.com/prometheus/common/model/silence.go
@@ -15,6 +15,7 @@ package model
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"regexp"
 	"time"
@@ -34,7 +35,7 @@ func (m *Matcher) UnmarshalJSON(b []byte) error {
 	}
 
 	if len(m.Name) == 0 {
-		return fmt.Errorf("label name in matcher must not be empty")
+		return errors.New("label name in matcher must not be empty")
 	}
 	if m.IsRegex {
 		if _, err := regexp.Compile(m.Value); err != nil {
@@ -77,7 +78,7 @@ type Silence struct {
 // Validate returns true iff all fields of the silence have valid values.
 func (s *Silence) Validate() error {
 	if len(s.Matchers) == 0 {
-		return fmt.Errorf("at least one matcher required")
+		return errors.New("at least one matcher required")
 	}
 	for _, m := range s.Matchers {
 		if err := m.Validate(); err != nil {
@@ -85,22 +86,22 @@ func (s *Silence) Validate() error {
 		}
 	}
 	if s.StartsAt.IsZero() {
-		return fmt.Errorf("start time missing")
+		return errors.New("start time missing")
 	}
 	if s.EndsAt.IsZero() {
-		return fmt.Errorf("end time missing")
+		return errors.New("end time missing")
 	}
 	if s.EndsAt.Before(s.StartsAt) {
-		return fmt.Errorf("start time must be before end time")
+		return errors.New("start time must be before end time")
 	}
 	if s.CreatedBy == "" {
-		return fmt.Errorf("creator information missing")
+		return errors.New("creator information missing")
 	}
 	if s.Comment == "" {
-		return fmt.Errorf("comment missing")
+		return errors.New("comment missing")
 	}
 	if s.CreatedAt.IsZero() {
-		return fmt.Errorf("creation timestamp missing")
+		return errors.New("creation timestamp missing")
 	}
 	return nil
 }
diff --git a/vendor/github.com/prometheus/common/model/value_float.go b/vendor/github.com/prometheus/common/model/value_float.go
index ae35cc2ab4b..6bfc757d18b 100644
--- a/vendor/github.com/prometheus/common/model/value_float.go
+++ b/vendor/github.com/prometheus/common/model/value_float.go
@@ -15,6 +15,7 @@ package model
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"math"
 	"strconv"
@@ -39,7 +40,7 @@ func (v SampleValue) MarshalJSON() ([]byte, error) {
 // UnmarshalJSON implements json.Unmarshaler.
 func (v *SampleValue) UnmarshalJSON(b []byte) error {
 	if len(b) < 2 || b[0] != '"' || b[len(b)-1] != '"' {
-		return fmt.Errorf("sample value must be a quoted string")
+		return errors.New("sample value must be a quoted string")
 	}
 	f, err := strconv.ParseFloat(string(b[1:len(b)-1]), 64)
 	if err != nil {
diff --git a/vendor/github.com/prometheus/common/model/value_histogram.go b/vendor/github.com/prometheus/common/model/value_histogram.go
index 54bb038cfff..895e6a3e839 100644
--- a/vendor/github.com/prometheus/common/model/value_histogram.go
+++ b/vendor/github.com/prometheus/common/model/value_histogram.go
@@ -15,6 +15,7 @@ package model
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"strconv"
 	"strings"
@@ -32,7 +33,7 @@ func (v FloatString) MarshalJSON() ([]byte, error) {
 
 func (v *FloatString) UnmarshalJSON(b []byte) error {
 	if len(b) < 2 || b[0] != '"' || b[len(b)-1] != '"' {
-		return fmt.Errorf("float value must be a quoted string")
+		return errors.New("float value must be a quoted string")
 	}
 	f, err := strconv.ParseFloat(string(b[1:len(b)-1]), 64)
 	if err != nil {
@@ -141,7 +142,7 @@ type SampleHistogramPair struct {
 
 func (s SampleHistogramPair) MarshalJSON() ([]byte, error) {
 	if s.Histogram == nil {
-		return nil, fmt.Errorf("histogram is nil")
+		return nil, errors.New("histogram is nil")
 	}
 	t, err := json.Marshal(s.Timestamp)
 	if err != nil {
@@ -164,7 +165,7 @@ func (s *SampleHistogramPair) UnmarshalJSON(buf []byte) error {
 		return fmt.Errorf("wrong number of fields: %d != %d", gotLen, wantLen)
 	}
 	if s.Histogram == nil {
-		return fmt.Errorf("histogram is null")
+		return errors.New("histogram is null")
 	}
 	return nil
 }
diff --git a/vendor/github.com/prometheus/common/promslog/slog.go b/vendor/github.com/prometheus/common/promslog/slog.go
index 1677605af1e..6e8fbabce5d 100644
--- a/vendor/github.com/prometheus/common/promslog/slog.go
+++ b/vendor/github.com/prometheus/common/promslog/slog.go
@@ -68,13 +68,16 @@ var (
 
 		return a
 	}
-	truncateSourceAttrFunc = func(groups []string, a slog.Attr) slog.Attr {
-		if a.Key != slog.SourceKey {
-			return a
-		}
-
-		if src, ok := a.Value.Any().(*slog.Source); ok {
+	defaultReplaceAttrFunc = func(groups []string, a slog.Attr) slog.Attr {
+		key := a.Key
+		switch key {
+		case slog.TimeKey:
+			t := a.Value.Time()
+			a.Value = slog.TimeValue(t.UTC())
+		case slog.SourceKey:
+			src, _ := a.Value.Any().(*slog.Source)
 			a.Value = slog.StringValue(filepath.Base(src.File) + ":" + strconv.Itoa(src.Line))
+		default:
 		}
 
 		return a
@@ -115,7 +118,7 @@ func (l *AllowedLevel) Set(s string) error {
 		l.lvl = &slog.LevelVar{}
 	}
 
-	switch s {
+	switch strings.ToLower(s) {
 	case "debug":
 		l.lvl.Set(slog.LevelDebug)
 		callerAddFunc = true
@@ -178,7 +181,7 @@ func New(config *Config) *slog.Logger {
 	logHandlerOpts := &slog.HandlerOptions{
 		Level:       config.Level.lvl,
 		AddSource:   true,
-		ReplaceAttr: truncateSourceAttrFunc,
+		ReplaceAttr: defaultReplaceAttrFunc,
 	}
 
 	if config.Style == GoKitStyle {
diff --git a/vendor/github.com/prometheus/common/version/info.go b/vendor/github.com/prometheus/common/version/info.go
index 197d95e5c8b..61ed1ba314b 100644
--- a/vendor/github.com/prometheus/common/version/info.go
+++ b/vendor/github.com/prometheus/common/version/info.go
@@ -90,6 +90,14 @@ func GetTags() string {
 	return computedTags
 }
 
+func PrometheusUserAgent() string {
+	return ComponentUserAgent("Prometheus")
+}
+
+func ComponentUserAgent(component string) string {
+	return component + "/" + Version
+}
+
 func init() {
 	computedRevision, computedTags = computeRevision()
 }
diff --git a/vendor/github.com/prometheus/prometheus/config/config.go b/vendor/github.com/prometheus/prometheus/config/config.go
index 86d8563536a..83a4f5860dc 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 {
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/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..b5e07b02bd2 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
@@ -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/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/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 0a6635a1eb9..12ac640da1b 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -997,7 +997,7 @@ github.com/prometheus/client_golang/prometheus/testutil/promlint/validations
 # github.com/prometheus/client_model v0.6.1
 ## explicit; go 1.19
 github.com/prometheus/client_model/go
-# github.com/prometheus/common v0.60.1
+# github.com/prometheus/common v0.61.0
 ## explicit; go 1.21
 github.com/prometheus/common/config
 github.com/prometheus/common/expfmt
@@ -1017,7 +1017,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-20241210170917-0a0a41616520
+# github.com/prometheus/prometheus v1.99.0 => github.com/grafana/mimir-prometheus v0.0.0-20241216154007-6ce3249dcbb8
 ## explicit; go 1.22.0
 github.com/prometheus/prometheus/config
 github.com/prometheus/prometheus/discovery
@@ -1494,7 +1494,7 @@ google.golang.org/genproto/googleapis/api/annotations
 google.golang.org/genproto/googleapis/rpc/code
 google.golang.org/genproto/googleapis/rpc/errdetails
 google.golang.org/genproto/googleapis/rpc/status
-# google.golang.org/grpc v1.67.1 => google.golang.org/grpc v1.65.0
+# google.golang.org/grpc v1.68.1 => google.golang.org/grpc v1.65.0
 ## explicit; go 1.21
 google.golang.org/grpc
 google.golang.org/grpc/attributes
@@ -1688,7 +1688,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-20241210170917-0a0a41616520
+# github.com/prometheus/prometheus => github.com/grafana/mimir-prometheus v0.0.0-20241216154007-6ce3249dcbb8
 # 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