Bump Prometheus to include new label regex optimization (thanos-io#7232)

* bump Prometheus version to include new label matcher regex value optimization Signed-off-by: Ben Ye <[email protected]> * update Signed-off-by: Ben Ye <[email protected]> * fix again Signed-off-by: Ben Ye <[email protected]> * include latest fix Signed-off-by: Ben Ye <[email protected]> * update go mod Signed-off-by: Ben Ye <[email protected]> * fix explain test Signed-off-by: Ben Ye <[email protected]> * fix test again Signed-off-by: Ben Ye <[email protected]> * update again Signed-off-by: Ben Ye <[email protected]> * update Signed-off-by: Ben Ye <[email protected]> * fix tests so far Signed-off-by: Ben Ye <[email protected]> * fix compactor tests Signed-off-by: Ben Ye <[email protected]> * use own out of order chunk index Signed-off-by: Ben Ye <[email protected]> --------- Signed-off-by: Ben Ye <[email protected]>
junotx · Mar 28, 2024 · 4f664e3 · 4f664e3
1 parent 4d7a75f
commit 4f664e3
Show file tree

Hide file tree

Showing 20 changed files with 252 additions and 505 deletions.
diff --git a/cmd/thanos/main.go b/cmd/thanos/main.go
@@ -22,6 +22,7 @@ import (
  "github.com/pkg/errors"
  "github.com/prometheus/client_golang/prometheus"
  "github.com/prometheus/client_golang/prometheus/collectors"
+ versioncollector "github.com/prometheus/client_golang/prometheus/collectors/version"
  "github.com/prometheus/common/version"
  "go.uber.org/automaxprocs/maxprocs"
  "gopkg.in/alecthomas/kingpin.v2"
@@ -82,7 +83,7 @@ func main() {
 
  metrics := prometheus.NewRegistry()
  metrics.MustRegister(
- version.NewCollector("thanos"),
+ versioncollector.NewCollector("thanos"),
  collectors.NewGoCollector(
  collectors.WithGoCollectorRuntimeMetrics(collectors.GoRuntimeMetricsRule{Matcher: regexp.MustCompile("/.*")}),
  ),

diff --git a/go.mod b/go.mod
@@ -3,8 +3,8 @@ module github.com/thanos-io/thanos
 go 1.21
 
 require (
- cloud.google.com/go/storage v1.35.1 // indirect
- cloud.google.com/go/trace v1.10.4
+ cloud.google.com/go/storage v1.36.0 // indirect
+ cloud.google.com/go/trace v1.10.5
  github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.8.3
  github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9
  github.com/alicebob/miniredis/v2 v2.22.0
@@ -24,11 +24,11 @@ require (
  github.com/fortytw2/leaktest v1.3.0
  github.com/fsnotify/fsnotify v1.7.0
  github.com/go-kit/log v0.2.1
- github.com/go-openapi/strfmt v0.22.0
+ github.com/go-openapi/strfmt v0.22.2
  github.com/gogo/protobuf v1.3.2
  github.com/gogo/status v1.1.1
  github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da
- github.com/golang/protobuf v1.5.3
+ github.com/golang/protobuf v1.5.4
  github.com/golang/snappy v0.0.4
  github.com/googleapis/gax-go v2.0.2+incompatible
  github.com/gorilla/mux v1.8.0 // indirect
@@ -39,7 +39,7 @@ require (
  github.com/hashicorp/golang-lru v0.6.0
  github.com/jpillora/backoff v1.0.0
  github.com/json-iterator/go v1.1.12
- github.com/klauspost/compress v1.17.4
+ github.com/klauspost/compress v1.17.7
  github.com/leanovate/gopter v0.2.9
  github.com/lightstep/lightstep-tracer-go v0.25.0
  github.com/lovoo/gcloud-opentracing v0.3.0
@@ -55,42 +55,42 @@ require (
  github.com/opentracing/opentracing-go v1.2.0
  github.com/pkg/errors v0.9.1
  github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
- github.com/prometheus/alertmanager v0.26.0
- github.com/prometheus/client_golang v1.18.0
- github.com/prometheus/client_model v0.5.0
- github.com/prometheus/common v0.46.0
+ github.com/prometheus/alertmanager v0.27.0
+ github.com/prometheus/client_golang v1.19.0
+ github.com/prometheus/client_model v0.6.0
+ github.com/prometheus/common v0.49.1-0.20240306132007-4199f18c3e92
  github.com/prometheus/exporter-toolkit v0.11.0
  // Prometheus maps version 2.x.y to tags v0.x.y.
- github.com/prometheus/prometheus v0.50.0
+ github.com/prometheus/prometheus v0.51.1-0.20240325140356-78c0fd2f4d75
  github.com/sony/gobreaker v0.5.0
- github.com/stretchr/testify v1.8.4
+ github.com/stretchr/testify v1.9.0
  github.com/thanos-io/objstore v0.0.0-20240309075357-e8336a5fd5f3
- github.com/thanos-io/promql-engine v0.0.0-20240318110350-23714ea2522d
+ github.com/thanos-io/promql-engine v0.0.0-20240327143517-c5e4b2e6ef02
  github.com/uber/jaeger-client-go v2.30.0+incompatible
  github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
  github.com/vimeo/galaxycache v0.0.0-20210323154928-b7e5d71c067a
  github.com/weaveworks/common v0.0.0-20230728070032-dd9e68f319d5
  go.elastic.co/apm v1.11.0
  go.elastic.co/apm/module/apmot v1.11.0
- go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect
- go.opentelemetry.io/otel v1.22.0
+ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
+ go.opentelemetry.io/otel v1.24.0
  go.opentelemetry.io/otel/bridge/opentracing v1.21.0
- go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0
- go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.22.0
- go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0
- go.opentelemetry.io/otel/sdk v1.22.0
- go.opentelemetry.io/otel/trace v1.22.0
+ go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0
+ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0
+ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.24.0
+ go.opentelemetry.io/otel/sdk v1.24.0
+ go.opentelemetry.io/otel/trace v1.24.0
  go.uber.org/atomic v1.11.0
  go.uber.org/automaxprocs v1.5.3
  go.uber.org/goleak v1.3.0
- golang.org/x/crypto v0.19.0
- golang.org/x/net v0.21.0
+ golang.org/x/crypto v0.21.0
+ golang.org/x/net v0.22.0
  golang.org/x/sync v0.6.0
  golang.org/x/text v0.14.0
  golang.org/x/time v0.5.0
- google.golang.org/api v0.157.0 // indirect
- google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917 // indirect
- google.golang.org/grpc v1.61.0
+ google.golang.org/api v0.168.0 // indirect
+ google.golang.org/genproto v0.0.0-20240205150955-31a09d347014 // indirect
+ google.golang.org/grpc v1.62.1
  google.golang.org/grpc/examples v0.0.0-20211119005141-f45e61797429
  gopkg.in/alecthomas/kingpin.v2 v2.2.6
  gopkg.in/yaml.v2 v2.4.0
@@ -103,10 +103,10 @@ require (
 )
 
 require (
- cloud.google.com/go v0.111.0 // indirect
- cloud.google.com/go/compute v1.23.3 // indirect
- cloud.google.com/go/iam v1.1.5 // indirect
- github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.2 // indirect
+ cloud.google.com/go v0.112.0 // indirect
+ cloud.google.com/go/compute v1.23.4 // indirect
+ cloud.google.com/go/iam v1.1.6 // indirect
+ github.com/Azure/azure-sdk-for-go/sdk/azcore v1.10.0 // indirect
  github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1 // indirect
  github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.2 // indirect
  github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.0 // indirect
@@ -118,7 +118,7 @@ require (
 require (
  github.com/cortexproject/promqlsmith v0.0.0-20240326071418-c2a9ca1e89f5
  github.com/mitchellh/go-ps v1.0.0
- github.com/onsi/gomega v1.27.10
+ github.com/onsi/gomega v1.29.0
  github.com/prometheus-community/prom-label-proxy v0.8.1-0.20240127162815-c1195f9aabc0
  go.opentelemetry.io/contrib/propagators/autoprop v0.38.0
  go4.org/intern v0.0.0-20230525184215-6c62f75575cb
@@ -143,16 +143,16 @@ require (
  github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
  github.com/sercand/kuberesolver/v4 v4.0.0 // indirect
  github.com/zhangyunhao116/umap v0.0.0-20221211160557-cb7705fafa39 // indirect
- go.opentelemetry.io/collector/featuregate v1.0.1 // indirect
- go.opentelemetry.io/collector/pdata v1.0.1 // indirect
- go.opentelemetry.io/collector/semconv v0.93.0 // indirect
- go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
+ go.opentelemetry.io/collector/featuregate v1.3.0 // indirect
+ go.opentelemetry.io/collector/pdata v1.3.0 // indirect
+ go.opentelemetry.io/collector/semconv v0.96.0 // indirect
+ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
  go.opentelemetry.io/contrib/propagators/ot v1.13.0 // indirect
  go4.org/unsafe/assume-no-moving-gc v0.0.0-20230525183740-e7c30c78aeb2 // indirect
- google.golang.org/genproto/googleapis/api v0.0.0-20240116215550-a9fa1716bcac // indirect
- google.golang.org/genproto/googleapis/rpc v0.0.0-20240116215550-a9fa1716bcac // indirect
- k8s.io/apimachinery v0.28.6 // indirect
- k8s.io/client-go v0.28.6 // indirect
+ google.golang.org/genproto/googleapis/api v0.0.0-20240304212257-790db918fca8 // indirect
+ google.golang.org/genproto/googleapis/rpc v0.0.0-20240304161311-37d4d3c04a78 // indirect
+ k8s.io/apimachinery v0.29.3 // indirect
+ k8s.io/client-go v0.29.3 // indirect
  k8s.io/klog/v2 v2.120.1 // indirect
  k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
 )
@@ -167,7 +167,7 @@ require (
  github.com/aliyun/aliyun-oss-go-sdk v2.2.2+incompatible // indirect
  github.com/armon/go-radix v1.0.0 // indirect
  github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
- github.com/aws/aws-sdk-go v1.50.0 // indirect
+ github.com/aws/aws-sdk-go v1.50.32 // indirect
  github.com/aws/aws-sdk-go-v2 v1.16.0 // indirect
  github.com/aws/aws-sdk-go-v2/config v1.15.1 // indirect
  github.com/aws/aws-sdk-go-v2/credentials v1.11.0 // indirect
@@ -196,25 +196,25 @@ require (
  github.com/go-logr/stdr v1.2.2 // indirect
  github.com/go-ole/go-ole v1.2.6 // indirect
  github.com/go-openapi/analysis v0.22.2 // indirect
- github.com/go-openapi/errors v0.21.0 // indirect
+ github.com/go-openapi/errors v0.21.1 // indirect
  github.com/go-openapi/jsonpointer v0.20.2 // indirect
  github.com/go-openapi/jsonreference v0.20.4 // indirect
  github.com/go-openapi/loads v0.21.5 // indirect
  github.com/go-openapi/spec v0.20.14 // indirect
  github.com/go-openapi/swag v0.22.9 // indirect
- github.com/go-openapi/validate v0.22.6 // indirect
+ github.com/go-openapi/validate v0.23.0 // indirect
  github.com/gobwas/httphead v0.1.0 // indirect
  github.com/gobwas/pool v0.2.1 // indirect
  github.com/gobwas/ws v1.2.1 // indirect
  github.com/gofrs/flock v0.8.1 // indirect
  github.com/gogo/googleapis v1.4.0 // indirect
  github.com/google/go-cmp v0.6.0
  github.com/google/go-querystring v1.1.0 // indirect
- github.com/google/pprof v0.0.0-20240117000934-35fc243c5815 // indirect
+ github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7 // indirect
  github.com/google/uuid v1.6.0
  github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
- github.com/googleapis/gax-go/v2 v2.12.0 // indirect
- github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
+ github.com/googleapis/gax-go/v2 v2.12.2 // indirect
+ github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
  github.com/jmespath/go-jmespath v0.4.0 // indirect
  github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 // indirect
  github.com/josharian/intern v1.0.0 // indirect
@@ -243,7 +243,7 @@ require (
  github.com/shirou/gopsutil/v3 v3.22.9 // indirect
  github.com/sirupsen/logrus v1.9.3 // indirect
  github.com/spaolacci/murmur3 v1.1.0 // indirect
- github.com/stretchr/objx v0.5.0 // indirect
+ github.com/stretchr/objx v0.5.2 // indirect
  github.com/tencentyun/cos-go-sdk-v5 v0.7.40 // indirect
  github.com/tklauser/go-sysconf v0.3.10 // indirect
  github.com/tklauser/numcpus v0.4.0 // indirect
@@ -252,18 +252,18 @@ require (
  github.com/yusufpapurcu/wmi v1.2.2 // indirect
  go.elastic.co/apm/module/apmhttp v1.11.0 // indirect
  go.elastic.co/fastjson v1.1.0 // indirect
- go.mongodb.org/mongo-driver v1.13.1 // indirect
+ go.mongodb.org/mongo-driver v1.14.0 // indirect
  go.opencensus.io v0.24.0 // indirect
  go.opentelemetry.io/contrib/propagators/aws v1.13.0 // indirect
  go.opentelemetry.io/contrib/propagators/b3 v1.13.0 // indirect
  go.opentelemetry.io/contrib/propagators/jaeger v1.13.0 // indirect
- go.opentelemetry.io/otel/metric v1.22.0 // indirect
- go.opentelemetry.io/proto/otlp v1.0.0 // indirect
+ go.opentelemetry.io/otel/metric v1.24.0 // indirect
+ go.opentelemetry.io/proto/otlp v1.1.0 // indirect
  go.uber.org/multierr v1.11.0 // indirect
- golang.org/x/mod v0.14.0 // indirect
- golang.org/x/oauth2 v0.16.0 // indirect
- golang.org/x/sys v0.17.0 // indirect
- golang.org/x/tools v0.17.0 // indirect
+ golang.org/x/mod v0.16.0 // indirect
+ golang.org/x/oauth2 v0.18.0 // indirect
+ golang.org/x/sys v0.18.0 // indirect
+ golang.org/x/tools v0.19.0 // indirect
  gonum.org/v1/gonum v0.12.0 // indirect
  google.golang.org/appengine v1.6.8 // indirect
  google.golang.org/protobuf v1.33.0