[Chore] Update Prometheus (thanos-io#7416)

* Uupdate Prometheus Signed-off-by: alanprot <[email protected]> * Updating prometheus to 4e664035e84e Signed-off-by: alanprot <[email protected]> * Temporarily pinning prometheus common Signed-off-by: alanprot <[email protected]> * fixing lint Signed-off-by: alanprot <[email protected]> * Using jsoniter to encode promql responses Signed-off-by: alanprot <[email protected]> * Removing e2e test case with unvalid hifen on a matcher -> prometheus now support this use case Signed-off-by: alanprot <[email protected]> * Updating prometheus to v0.52.2-0.20240606174736-edd558884b24 Signed-off-by: alanprot <[email protected]> * pinning grpc to v1.63.2 Signed-off-by: alanprot <[email protected]> --------- Signed-off-by: alanprot <[email protected]> Co-authored-by: EC2 Default User <[email protected]>
junotx · Jun 10, 2024 · 882d6a1 · 882d6a1
1 parent 8aa42c8
commit 882d6a1
Show file tree

Hide file tree

Showing 17 changed files with 1,322 additions and 246 deletions.
diff --git a/go.mod b/go.mod
@@ -3,15 +3,15 @@ module github.com/thanos-io/thanos
 go 1.21
 
 require (
- cloud.google.com/go/storage v1.36.0 // indirect
- cloud.google.com/go/trace v1.10.5
+ cloud.google.com/go/storage v1.40.0 // indirect
+ cloud.google.com/go/trace v1.10.7
  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
  github.com/blang/semver/v4 v4.0.0
  github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b
  github.com/cespare/xxhash v1.1.0
- github.com/cespare/xxhash/v2 v2.2.0
+ github.com/cespare/xxhash/v2 v2.3.0
  github.com/chromedp/cdproto v0.0.0-20230802225258-3cf4e6d46a89
  github.com/chromedp/chromedp v0.9.2
  github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
@@ -24,23 +24,23 @@ 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.2
+ github.com/go-openapi/strfmt v0.23.0
  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.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
- github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd // indirect
+ github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
  github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0
  github.com/jpillora/backoff v1.0.0
  github.com/json-iterator/go v1.1.12
- github.com/klauspost/compress v1.17.7
+ github.com/klauspost/compress v1.17.8
  github.com/leanovate/gopter v0.2.9
  github.com/lightstep/lightstep-tracer-go v0.25.0
  github.com/lovoo/gcloud-opentracing v0.3.0
- github.com/miekg/dns v1.1.58
+ github.com/miekg/dns v1.1.59
  github.com/minio/minio-go/v7 v7.0.70 // indirect
  github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f
  github.com/oklog/run v1.1.0
@@ -53,12 +53,12 @@ require (
  github.com/pkg/errors v0.9.1
  github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
  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/client_golang v1.19.1
+ github.com/prometheus/client_model v0.6.1
+ github.com/prometheus/common v0.54.0
  github.com/prometheus/exporter-toolkit v0.11.0
  // Prometheus maps version 2.x.y to tags v0.x.y.
- github.com/prometheus/prometheus v0.51.1-0.20240325140356-78c0fd2f4d75
+ github.com/prometheus/prometheus v0.52.2-0.20240606174736-edd558884b24
  github.com/sony/gobreaker v0.5.0
  github.com/stretchr/testify v1.9.0
  github.com/thanos-io/objstore v0.0.0-20240309075357-e8336a5fd5f3
@@ -69,25 +69,25 @@ require (
  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.49.0 // indirect
- go.opentelemetry.io/otel v1.24.0
+ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect
+ go.opentelemetry.io/otel v1.27.0
  go.opentelemetry.io/otel/bridge/opentracing v1.21.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.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0
+ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0
+ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.27.0
+ go.opentelemetry.io/otel/sdk v1.27.0
+ go.opentelemetry.io/otel/trace v1.27.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.22.0
- golang.org/x/net v0.24.0
- golang.org/x/sync v0.6.0
- golang.org/x/text v0.14.0
+ golang.org/x/crypto v0.24.0
+ golang.org/x/net v0.26.0
+ golang.org/x/sync v0.7.0
+ golang.org/x/text v0.16.0
  golang.org/x/time v0.5.0
- google.golang.org/api v0.168.0 // indirect
- google.golang.org/genproto v0.0.0-20240205150955-31a09d347014 // indirect
- google.golang.org/grpc v1.63.2
+ google.golang.org/api v0.183.0 // indirect
+ google.golang.org/genproto v0.0.0-20240528184218-531527333157 // indirect
+ google.golang.org/grpc v1.64.0
  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
@@ -100,14 +100,13 @@ require (
 )
 
 require (
- 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
+ cloud.google.com/go v0.114.0 // indirect
+ cloud.google.com/go/iam v1.1.8 // indirect
+ github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1 // indirect
+ github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.2 // indirect
+ github.com/Azure/azure-sdk-for-go/sdk/internal v1.6.0 // indirect
  github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.0 // indirect
- github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1 // indirect
+ github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
  go.opentelemetry.io/contrib/samplers/jaegerremote v0.7.0
  go.opentelemetry.io/otel/exporters/jaeger v1.16.0
 )
@@ -125,6 +124,8 @@ require (
 )
 
 require (
+ cloud.google.com/go/auth v0.5.1 // indirect
+ cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect
  github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect
  github.com/bboreham/go-loser v0.0.0-20230920113527-fcc2c21820a3 // indirect
  github.com/cilium/ebpf v0.11.0 // indirect
@@ -133,9 +134,8 @@ require (
  github.com/go-openapi/runtime v0.27.1 // indirect
  github.com/goccy/go-json v0.10.2 // indirect
  github.com/godbus/dbus/v5 v5.0.4 // indirect
- github.com/golang-jwt/jwt/v5 v5.2.0 // indirect
+ github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
  github.com/google/s2a-go v0.1.7 // indirect
- github.com/hashicorp/go-version v1.6.0 // indirect
  github.com/huaweicloud/huaweicloud-sdk-go-obs v3.23.3+incompatible // indirect
  github.com/metalmatze/signal v0.0.0-20210307161603-1c9aa721a97a // indirect
  github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
@@ -144,31 +144,30 @@ 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.3.0 // indirect
- go.opentelemetry.io/collector/pdata v1.3.0 // indirect
- go.opentelemetry.io/collector/semconv v0.96.0 // indirect
+ go.opentelemetry.io/collector/pdata v1.8.0 // indirect
+ go.opentelemetry.io/collector/semconv v0.101.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-20240304212257-790db918fca8 // indirect
- google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be // indirect
+ google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
+ google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // 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
 )
 
 require (
- cloud.google.com/go/compute/metadata v0.2.3 // indirect
+ cloud.google.com/go/compute/metadata v0.3.0 // indirect
  github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.32.3 // indirect
- github.com/KimMachineGun/automemlimit v0.5.0
+ github.com/KimMachineGun/automemlimit v0.6.1
  github.com/OneOfOne/xxhash v1.2.6 // indirect
  github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
  github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a // indirect
  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.32 // indirect
+ github.com/aws/aws-sdk-go v1.53.16 // 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
@@ -182,7 +181,7 @@ require (
  github.com/aws/smithy-go v1.11.1 // indirect
  github.com/baidubce/bce-sdk-go v0.9.111 // indirect
  github.com/beorn7/perks v1.0.1 // indirect
- github.com/cenkalti/backoff/v4 v4.2.1 // indirect
+ github.com/cenkalti/backoff/v4 v4.3.0 // indirect
  github.com/chromedp/sysutil v1.0.0 // indirect
  github.com/clbanning/mxj v1.8.4 // indirect
  github.com/coreos/go-systemd/v22 v22.5.0 // indirect
@@ -196,7 +195,7 @@ 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.1 // indirect
+ github.com/go-openapi/errors v0.22.0 // 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
@@ -210,11 +209,11 @@ require (
  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-20240227163752-401108e1b7e7 // indirect
+ github.com/google/pprof v0.0.0-20240528025155-186aa0362fba // 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.2 // indirect
- github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
+ github.com/googleapis/gax-go/v2 v2.12.4 // indirect
+ github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.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
@@ -235,7 +234,7 @@ require (
  github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
  github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
  github.com/prometheus/common/sigv4 v0.1.0 // indirect
- github.com/prometheus/procfs v0.12.0 // indirect
+ github.com/prometheus/procfs v0.15.1 // indirect
  github.com/redis/rueidis v1.0.14-go1.18
  github.com/rivo/uniseg v0.2.0 // indirect
  github.com/rs/xid v1.5.0 // indirect
@@ -257,16 +256,15 @@ require (
  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.24.0 // indirect
- go.opentelemetry.io/proto/otlp v1.1.0 // indirect
+ go.opentelemetry.io/otel/metric v1.27.0 // indirect
+ go.opentelemetry.io/proto/otlp v1.2.0 // indirect
  go.uber.org/multierr v1.11.0 // indirect
- golang.org/x/mod v0.16.0 // indirect
- golang.org/x/oauth2 v0.18.0 // indirect
- golang.org/x/sys v0.19.0 // indirect
- golang.org/x/tools v0.19.0 // indirect
+ golang.org/x/mod v0.18.0 // indirect
+ golang.org/x/oauth2 v0.21.0 // indirect
+ golang.org/x/sys v0.21.0 // indirect
+ golang.org/x/tools v0.22.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
+ google.golang.org/protobuf v1.34.1
  gopkg.in/ini.v1 v1.67.0 // indirect
  howett.net/plist v0.0.0-20181124034731-591f970eefbb // indirect
 )
@@ -276,10 +274,16 @@ replace (
  // Required by Cortex https://github.com/cortexproject/cortex/pull/3051.
  github.com/bradfitz/gomemcache => github.com/themihai/gomemcache v0.0.0-20180902122335-24332e2d58ab
 
+ // Temporarily pinning prometheus common: see https://github.com/thanos-io/thanos/pull/7416#issuecomment-2150585994
+ github.com/prometheus/common v0.54.0 => github.com/prometheus/common v0.53.0
+
+ // Pin kuberesolver/v5 to support new grpc version. Need to upgrade kuberesolver version on weaveworks/common.
+ github.com/sercand/kuberesolver/v4 => github.com/sercand/kuberesolver/v5 v5.1.1
+
  github.com/vimeo/galaxycache => github.com/thanos-community/galaxycache v0.0.0-20211122094458-3a32041a1f1e
 
- // Override due to https://github.com/weaveworks/common/issues/239
- google.golang.org/grpc => google.golang.org/grpc v1.57.2
+ // Pinning grpc due https://github.com/grpc/grpc-go/issues/7314
+ google.golang.org/grpc => google.golang.org/grpc v1.63.2
 
  // Overriding to use latest commit.
  gopkg.in/alecthomas/kingpin.v2 => github.com/alecthomas/kingpin v1.3.8-0.20210301060133-17f40c25f497