Skip to content

Commit 3339b5f

Browse files
committed
Upgrade thanos and promql-engine to latest main
Signed-off-by: Paurush Garg <paurushg@amazon.com>
1 parent 8e750ff commit 3339b5f

41 files changed

Lines changed: 1253 additions & 835 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎go.mod‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ require (
5050
github.com/spf13/afero v1.15.0
5151
github.com/stretchr/testify v1.11.1
5252
github.com/thanos-io/objstore v0.0.0-20250804093838-71d60dfee488
53-
github.com/thanos-io/promql-engine v0.0.0-20260513095632-c5f6038078e3
54-
github.com/thanos-io/thanos v0.42.0
53+
github.com/thanos-io/promql-engine v0.0.0-20260729073658-f8bd3f940687
54+
github.com/thanos-io/thanos v0.42.1-0.20260727122508-92397939e4cc
5555
github.com/uber/jaeger-client-go v2.30.0+incompatible
5656
github.com/weaveworks/common v0.0.0-20230728070032-dd9e68f319d5
5757
go.etcd.io/etcd/api/v3 v3.5.17
@@ -302,8 +302,6 @@ require (
302302
go.uber.org/zap v1.27.1 // indirect
303303
go.yaml.in/yaml/v2 v2.4.4 // indirect
304304
go.yaml.in/yaml/v3 v3.0.4 // indirect
305-
go4.org/intern v0.0.0-20230525184215-6c62f75575cb // indirect
306-
go4.org/unsafe/assume-no-moving-gc v0.0.0-20231121144256-b99613f794b6 // indirect
307305
golang.org/x/crypto v0.53.0 // indirect
308306
golang.org/x/exp v0.0.0-20260218203240-3dfff04db8fa // indirect
309307
golang.org/x/mod v0.36.0 // indirect

‎go.sum‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -877,7 +877,7 @@ github.com/prometheus-community/parquet-common v0.0.0-20260614025832-5f32460b537
877877
github.com/prometheus-community/parquet-common v0.0.0-20260614025832-5f32460b5373/go.mod h1:gewN7ZuOXJh0X2I57iGHyDLbLvL891P2Ynko2QM5axY=
878878
github.com/prometheus-community/prom-label-proxy v0.11.1 h1:jX+m+BQCNM0z3/P6V6jVxbiDKgugvk91SaICD6bVhT4=
879879
github.com/prometheus-community/prom-label-proxy v0.11.1/go.mod h1:uTeQW+wZ/VPV1LL3IPfvUE++wR2nPLex+Y4RE38Cpis=
880-
github.com/prometheus/alertmanager v0.33.0 h1:AAVa3wpCsaDxisTUUPXx+1qhnA2mx0f8Cc+smpAtN7w=
880+
github.com/prometheus/alertmanager v0.33.0 h1:Ea0jsa4kCLwz2E/9PGhkkBTIam8yFBPwvgsKZnJbojo=
881881
github.com/prometheus/alertmanager v0.33.0/go.mod h1:V06Uc8EZ5X5wLOJRGhtXx+EE2LgrinFIADbKWMVm1RY=
882882
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
883883
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
@@ -997,10 +997,10 @@ github.com/thanos-community/galaxycache v0.0.0-20211122094458-3a32041a1f1e h1:f1
997997
github.com/thanos-community/galaxycache v0.0.0-20211122094458-3a32041a1f1e/go.mod h1:jXcofnrSln/cLI6/dhlBxPQZEEQHVPCcFaH75M+nSzM=
998998
github.com/thanos-io/objstore v0.0.0-20250804093838-71d60dfee488 h1:khBsQLLRoF1KzXgTlwFZa6mC32bwYUUAu/AeP49V7UM=
999999
github.com/thanos-io/objstore v0.0.0-20250804093838-71d60dfee488/go.mod h1:uDHLkMKOGDAnlN75EAz8VrRzob1+VbgYSuUleatWuF0=
1000-
github.com/thanos-io/promql-engine v0.0.0-20260513095632-c5f6038078e3 h1:vO9SBpSzzp7jlDaWqJ34Y7zumD5OrPTcCZcWgDgzC6M=
1001-
github.com/thanos-io/promql-engine v0.0.0-20260513095632-c5f6038078e3/go.mod h1:uzn40oZHPXvfdP498h+MiRL2fN7RF519gNaV3LyhChc=
1002-
github.com/thanos-io/thanos v0.42.0 h1:9d+cAEq/lCuhQY6VK3FzxFmXhE/1Qy0Gv45xSYn1EAM=
1003-
github.com/thanos-io/thanos v0.42.0/go.mod h1:9BZsUdHl3x8L/zTrc9+kCEupUHglPi6ldBZvHLj1q6o=
1000+
github.com/thanos-io/promql-engine v0.0.0-20260729073658-f8bd3f940687 h1:r9VYttKGve+nctb6dGlQ9mhusOzdpt5DWM3q7secn2Q=
1001+
github.com/thanos-io/promql-engine v0.0.0-20260729073658-f8bd3f940687/go.mod h1:uzn40oZHPXvfdP498h+MiRL2fN7RF519gNaV3LyhChc=
1002+
github.com/thanos-io/thanos v0.42.1-0.20260727122508-92397939e4cc h1:Sx5AfjHy6OspiLdJTFUO8DsfndpMNM8mbkMBMXtVFqc=
1003+
github.com/thanos-io/thanos v0.42.1-0.20260727122508-92397939e4cc/go.mod h1:GH7XiOiHgMLvIST9qgcy/UuhtV22umoBCXAceOFMzCA=
10041004
github.com/tinylib/msgp v1.6.1 h1:ESRv8eL3u+DNHUoSAAQRE50Hm162zqAnBoGv9PzScPY=
10051005
github.com/tinylib/msgp v1.6.1/go.mod h1:RSp0LW9oSxFut3KzESt5Voq4GVWyS+PSulT77roAqEA=
10061006
github.com/tjhop/slog-gokit v0.2.0 h1:tUNkuukDjpswQ2abhsugEobRRxN1aHEW8h4rvwdHMqU=
@@ -1169,11 +1169,6 @@ go.yaml.in/yaml/v2 v2.4.4 h1:tuyd0P+2Ont/d6e2rl3be67goVK4R6deVxCUX5vyPaQ=
11691169
go.yaml.in/yaml/v2 v2.4.4/go.mod h1:gMZqIpDtDqOfM0uNfy0SkpRhvUryYH0Z6wdMYcacYXQ=
11701170
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
11711171
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
1172-
go4.org/intern v0.0.0-20230525184215-6c62f75575cb h1:ae7kzL5Cfdmcecbh22ll7lYP3iuUdnfnhiPcSaDgH/8=
1173-
go4.org/intern v0.0.0-20230525184215-6c62f75575cb/go.mod h1:Ycrt6raEcnF5FTsLiLKkhBTO6DPX3RCUCUVnks3gFJU=
1174-
go4.org/unsafe/assume-no-moving-gc v0.0.0-20230525183740-e7c30c78aeb2/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E=
1175-
go4.org/unsafe/assume-no-moving-gc v0.0.0-20231121144256-b99613f794b6 h1:lGdhQUN/cnWdSH3291CUuxSEqc+AsGTiDxPP3r2J0l4=
1176-
go4.org/unsafe/assume-no-moving-gc v0.0.0-20231121144256-b99613f794b6/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E=
11771172
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
11781173
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
11791174
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=

‎pkg/querier/blocks_store_queryable.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1203,7 +1203,7 @@ func convertBlockHintsToULIDs(hints []hintspb.Block) ([]ulid.ULID, error) {
12031203
// detachSeriesFromBuffer re-allocates label strings and chunk data byte slices
12041204
// so that the series no longer references the gRPC unmarshal buffer.
12051205
func detachSeriesFromBuffer(s *storepb.Series) {
1206-
labelpb.ReAllocZLabelsStrings(&s.Labels, false)
1206+
labelpb.ReAllocZLabelsStrings(&s.Labels)
12071207
for i := range s.Chunks {
12081208
if s.Chunks[i].Raw != nil && len(s.Chunks[i].Raw.Data) > 0 {
12091209
s.Chunks[i].Raw.Data = append([]byte(nil), s.Chunks[i].Raw.Data...)

‎vendor/github.com/thanos-io/promql-engine/api/remote.go‎

Lines changed: 46 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/thanos-io/promql-engine/engine/distributed.go‎

Lines changed: 24 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/thanos-io/promql-engine/execution/binary/utils.go‎

Lines changed: 10 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)