Skip to content

Commit b114d2b

Browse files
MichaHoffmannMichaHoffmann
authored
Changelog: cut release 0.38.0-rc.1 (#8180)
* Query: fix endpointset setup This commit fixes an issue where we add non-strict, non-group endpoints to the endpointset twice, once with resolved addresses from the dns provider and once with its dns prefix. Signed-off-by: Michael Hoffmann <mhoffmann@cloudflare.com> * deps: bump promql-engine (#8181) Signed-off-by: Michael Hoffmann <mhoffmann@cloudflare.com> * Changelog: cut release 0.38-rc.1 Signed-off-by: Michael Hoffmann <mhoffmann@cloudflare.com> --------- Signed-off-by: Michael Hoffmann <mhoffmann@cloudflare.com>
1 parent e7d8887 commit b114d2b

File tree

11 files changed

+41
-89
lines changed

11 files changed

+41
-89
lines changed

‎CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re
1818

1919
### Fixed
2020

21-
## [v0.38.0-rc.0] https://github.com/thanos-io/thanos/tree/release-0.38)
21+
## [v0.38.0-rc.1] https://github.com/thanos-io/thanos/tree/release-0.38)
2222

2323
### Fixed
2424
- [#8091](https://github.com/thanos-io/thanos/pull/8091) *: Add POST into allowed CORS methods header
@@ -45,6 +45,7 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re
4545
- [#7012](https://github.com/thanos-io/thanos/pull/7012) Query: Automatically adjust `max_source_resolution` based on promql query to avoid querying data from higher resolution resulting empty results.
4646
- [#8118](https://github.com/thanos-io/thanos/pull/8118) Query: Bumped promql-engine
4747
- [#8135](https://github.com/thanos-io/thanos/pull/8135) Query: respect partial response in distributed engine
48+
- [#8181](https://github.com/thanos-io/thanos/pull/8181) Deps: bump promql engine
4849

4950
### Removed
5051

@@ -54,6 +55,7 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re
5455

5556
- [#7970](https://github.com/thanos-io/thanos/pull/7970) Sidecar: Respect min-time setting.
5657
- [#7962](https://github.com/thanos-io/thanos/pull/7962) Store: Fix potential deadlock in hedging request.
58+
- [#8175](https://github.com/thanos-io/thanos/pull/8175) Query: fix endpointset setup
5759

5860
### Added
5961

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.38.0-rc.0
1+
0.38.0-rc.1

‎cmd/thanos/endpointset.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -298,8 +298,7 @@ func setupEndpointSet(
298298

299299
addresses := make([]string, 0, len(endpointConfig.Endpoints))
300300
for _, ecfg := range endpointConfig.Endpoints {
301-
if addr := ecfg.Address; !ecfg.Group && !ecfg.Strict {
302-
// originally only "--endpoint" addresses got resolved
301+
if addr := ecfg.Address; dns.IsDynamicNode(addr) && !ecfg.Group {
303302
addresses = append(addresses, addr)
304303
}
305304
}
@@ -318,14 +317,16 @@ func setupEndpointSet(
318317
endpointConfig := configProvider.config()
319318

320319
specs := make([]*query.GRPCEndpointSpec, 0)
320+
// groups and non dynamic endpoints
321321
for _, ecfg := range endpointConfig.Endpoints {
322322
strict, group, addr := ecfg.Strict, ecfg.Group, ecfg.Address
323323
if group {
324324
specs = append(specs, query.NewGRPCEndpointSpec(fmt.Sprintf("thanos:///%s", addr), strict, append(dialOpts, extgrpc.EndpointGroupGRPCOpts()...)...))
325-
} else {
325+
} else if !dns.IsDynamicNode(addr) {
326326
specs = append(specs, query.NewGRPCEndpointSpec(addr, strict, dialOpts...))
327327
}
328328
}
329+
// dynamic endpoints
329330
for _, addr := range dnsEndpointProvider.Addresses() {
330331
specs = append(specs, query.NewGRPCEndpointSpec(addr, false, dialOpts...))
331332
}

‎go.mod

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ require (
6969
github.com/sony/gobreaker v0.5.0
7070
github.com/stretchr/testify v1.10.0
7171
github.com/thanos-io/objstore v0.0.0-20241111205755-d1dd89d41f97
72-
github.com/thanos-io/promql-engine v0.0.0-20250302135832-accbf0891a16
72+
github.com/thanos-io/promql-engine v0.0.0-20250329215917-4055a112d1ea
7373
github.com/uber/jaeger-client-go v2.30.0+incompatible
7474
github.com/vimeo/galaxycache v0.0.0-20210323154928-b7e5d71c067a
7575
github.com/weaveworks/common v0.0.0-20230728070032-dd9e68f319d5
@@ -89,10 +89,10 @@ require (
8989
go.uber.org/automaxprocs v1.6.0
9090
go.uber.org/goleak v1.3.0
9191
go4.org/intern v0.0.0-20230525184215-6c62f75575cb
92-
golang.org/x/crypto v0.32.0
93-
golang.org/x/net v0.34.0
94-
golang.org/x/sync v0.10.0
95-
golang.org/x/text v0.21.0
92+
golang.org/x/crypto v0.36.0
93+
golang.org/x/net v0.37.0
94+
golang.org/x/sync v0.12.0
95+
golang.org/x/text v0.23.0
9696
golang.org/x/time v0.8.0
9797
google.golang.org/grpc v1.69.4
9898
google.golang.org/grpc/examples v0.0.0-20211119005141-f45e61797429
@@ -269,11 +269,11 @@ require (
269269
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
270270
go.uber.org/multierr v1.11.0 // indirect
271271
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
272-
golang.org/x/mod v0.22.0 // indirect
272+
golang.org/x/mod v0.24.0 // indirect
273273
golang.org/x/oauth2 v0.24.0 // indirect
274-
golang.org/x/sys v0.30.0 // indirect
275-
golang.org/x/tools v0.28.0 // indirect
276-
gonum.org/v1/gonum v0.15.0 // indirect
274+
golang.org/x/sys v0.31.0 // indirect
275+
golang.org/x/tools v0.31.0 // indirect
276+
gonum.org/v1/gonum v0.15.1 // indirect
277277
google.golang.org/api v0.213.0 // indirect
278278
google.golang.org/genproto v0.0.0-20240823204242-4ba0660f739c // indirect
279279
howett.net/plist v0.0.0-20181124034731-591f970eefbb // indirect

‎go.sum

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2259,8 +2259,8 @@ github.com/thanos-community/galaxycache v0.0.0-20211122094458-3a32041a1f1e h1:f1
22592259
github.com/thanos-community/galaxycache v0.0.0-20211122094458-3a32041a1f1e/go.mod h1:jXcofnrSln/cLI6/dhlBxPQZEEQHVPCcFaH75M+nSzM=
22602260
github.com/thanos-io/objstore v0.0.0-20241111205755-d1dd89d41f97 h1:VjG0mwhN1DkncwDHFvrpd12/2TLfgYNRmEQA48ikp+0=
22612261
github.com/thanos-io/objstore v0.0.0-20241111205755-d1dd89d41f97/go.mod h1:vyzFrBXgP+fGNG2FopEGWOO/zrIuoy7zt3LpLeezRsw=
2262-
github.com/thanos-io/promql-engine v0.0.0-20250302135832-accbf0891a16 h1:ezd8hNCWiGQr4kdfCHFa0VCSi+LAO/28Mna264nDs2c=
2263-
github.com/thanos-io/promql-engine v0.0.0-20250302135832-accbf0891a16/go.mod h1:aHSV5hL94fNb7PklN9L0V10j+/RGIlzqbw7OLdNgZFs=
2262+
github.com/thanos-io/promql-engine v0.0.0-20250329215917-4055a112d1ea h1:5dtnkBPOaW5seKSOzefJH4pJCSTUTI9BaWOHpQby48Y=
2263+
github.com/thanos-io/promql-engine v0.0.0-20250329215917-4055a112d1ea/go.mod h1:mRXbmLU+mCzHH16qDGFYYEviXbxxsHFQuAe66rp6sNM=
22642264
github.com/themihai/gomemcache v0.0.0-20180902122335-24332e2d58ab h1:7ZR3hmisBWw77ZpO1/o86g+JV3VKlk3d48jopJxzTjU=
22652265
github.com/themihai/gomemcache v0.0.0-20180902122335-24332e2d58ab/go.mod h1:eheTFp954zcWZXCU8d0AT76ftsQOTo4DTqkN/h3k1MY=
22662266
github.com/tinylib/msgp v1.1.5 h1:2gXmtWueD2HefZHQe1QOy9HVzmFrLOVvsXwXBQ0ayy0=
@@ -2424,8 +2424,8 @@ golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq
24242424
golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
24252425
golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
24262426
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
2427-
golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
2428-
golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
2427+
golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
2428+
golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
24292429
golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
24302430
golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
24312431
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -2492,8 +2492,8 @@ golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
24922492
golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
24932493
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
24942494
golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
2495-
golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
2496-
golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
2495+
golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
2496+
golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
24972497
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
24982498
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
24992499
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -2570,8 +2570,8 @@ golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
25702570
golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
25712571
golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
25722572
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
2573-
golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
2574-
golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
2573+
golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c=
2574+
golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
25752575
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
25762576
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
25772577
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -2628,8 +2628,8 @@ golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
26282628
golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
26292629
golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
26302630
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
2631-
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
2632-
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
2631+
golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
2632+
golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
26332633
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
26342634
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
26352635
golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -2741,8 +2741,8 @@ golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
27412741
golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
27422742
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
27432743
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
2744-
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
2745-
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
2744+
golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
2745+
golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
27462746
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
27472747
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
27482748
golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -2761,8 +2761,8 @@ golang.org/x/term v0.14.0/go.mod h1:TySc+nGkYR6qt8km8wUhuFRTVSMIX3XPR58y2lC8vww=
27612761
golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
27622762
golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=
27632763
golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
2764-
golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
2765-
golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
2764+
golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y=
2765+
golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g=
27662766
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
27672767
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
27682768
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -2783,8 +2783,8 @@ golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
27832783
golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
27842784
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
27852785
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
2786-
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
2787-
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
2786+
golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
2787+
golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
27882788
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
27892789
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
27902790
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -2866,8 +2866,8 @@ golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
28662866
golang.org/x/tools v0.10.0/go.mod h1:UJwyiVBsOA2uwvK/e5OY3GTpDUJriEd+/YlqAwLPmyM=
28672867
golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
28682868
golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg=
2869-
golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8=
2870-
golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw=
2869+
golang.org/x/tools v0.31.0 h1:0EedkvKDbh+qistFTd0Bcwe/YLh4vHwWEkiI0toFIBU=
2870+
golang.org/x/tools v0.31.0/go.mod h1:naFTU+Cev749tSJRXJlna0T3WxKvb1kWEx15xA4SdmQ=
28712871
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
28722872
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
28732873
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -2882,8 +2882,8 @@ gonum.org/v1/gonum v0.8.2/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0=
28822882
gonum.org/v1/gonum v0.9.3/go.mod h1:TZumC3NeyVQskjXqmyWt4S3bINhy7B4eYwW69EbyX+0=
28832883
gonum.org/v1/gonum v0.11.0/go.mod h1:fSG4YDCxxUZQJ7rKsQrj0gMOg00Il0Z96/qMA4bVQhA=
28842884
gonum.org/v1/gonum v0.12.0/go.mod h1:73TDxJfAAHeA8Mk9mf8NlIppyhQNo5GLTcYeqgo2lvY=
2885-
gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ=
2886-
gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo=
2885+
gonum.org/v1/gonum v0.15.1 h1:FNy7N6OUZVUaWG9pTiD+jlhdQ3lMP+/LcTpJ6+a8sQ0=
2886+
gonum.org/v1/gonum v0.15.1/go.mod h1:eZTZuRFrzu5pcyjN5wJhcIhnUdNijYxX1T2IcrOGY0o=
28872887
gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
28882888
gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc=
28892889
gonum.org/v1/plot v0.9.0/go.mod h1:3Pcqqmp6RHvJI72kgb8fThyUnav364FOsdDo2aGW5lY=

‎test/e2e/e2ethanos/services.go

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -272,11 +272,7 @@ type QuerierBuilder struct {
272272
proxyStrategy string
273273
disablePartialResponses bool
274274
fileSDStoreAddresses []string
275-
ruleAddresses []string
276-
metadataAddresses []string
277275
envVars map[string]string
278-
targetAddresses []string
279-
exemplarAddresses []string
280276
enableFeatures []string
281277
endpoints []string
282278
strictEndpoints []string
@@ -340,26 +336,6 @@ func (q *QuerierBuilder) WithFileSDStoreAddresses(fileSDStoreAddresses ...string
340336
return q
341337
}
342338

343-
func (q *QuerierBuilder) WithRuleAddresses(ruleAddresses ...string) *QuerierBuilder {
344-
q.ruleAddresses = ruleAddresses
345-
return q
346-
}
347-
348-
func (q *QuerierBuilder) WithTargetAddresses(targetAddresses ...string) *QuerierBuilder {
349-
q.targetAddresses = targetAddresses
350-
return q
351-
}
352-
353-
func (q *QuerierBuilder) WithExemplarAddresses(exemplarAddresses ...string) *QuerierBuilder {
354-
q.exemplarAddresses = exemplarAddresses
355-
return q
356-
}
357-
358-
func (q *QuerierBuilder) WithMetadataAddresses(metadataAddresses ...string) *QuerierBuilder {
359-
q.metadataAddresses = metadataAddresses
360-
return q
361-
}
362-
363339
func (q *QuerierBuilder) WithEndpoints(endpoints ...string) *QuerierBuilder {
364340
q.endpoints = endpoints
365341
return q
@@ -475,18 +451,6 @@ func (q *QuerierBuilder) collectArgs() ([]string, error) {
475451
for _, addr := range q.storeAddresses {
476452
args = append(args, "--endpoint="+addr)
477453
}
478-
for _, addr := range q.ruleAddresses {
479-
args = append(args, "--endpoint="+addr)
480-
}
481-
for _, addr := range q.targetAddresses {
482-
args = append(args, "--endpoint="+addr)
483-
}
484-
for _, addr := range q.metadataAddresses {
485-
args = append(args, "--endpoint="+addr)
486-
}
487-
for _, addr := range q.exemplarAddresses {
488-
args = append(args, "--endpoint="+addr)
489-
}
490454
for _, feature := range q.enableFeatures {
491455
args = append(args, "--enable-feature="+feature)
492456
}

‎test/e2e/exemplars_api_test.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ config:
6969

7070
qBuilder = qBuilder.
7171
WithStoreAddresses(stores...).
72-
WithExemplarAddresses(stores...).
7372
WithTracingConfig(tracingCfg)
7473

7574
q := qBuilder.Init()
@@ -82,7 +81,6 @@ config:
8281
t.Cleanup(cancel)
8382

8483
testutil.Ok(t, q.WaitSumMetricsWithOptions(e2emon.Equals(2), []string{"thanos_store_nodes_grpc_connections"}, e2emon.WaitMissingMetrics()))
85-
testutil.Ok(t, q.WaitSumMetricsWithOptions(e2emon.Equals(2), []string{"thanos_query_endpoints_dns_provider_results"}, e2emon.WaitMissingMetrics()))
8684

8785
now := time.Now()
8886
start := timestamp.FromTime(now.Add(-time.Hour))

‎test/e2e/info_api_test.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,10 @@ func TestInfo(t *testing.T) {
5454
testutil.Ok(t, e2e.StartAndWaitReady(store))
5555

5656
// Register `sidecar1` in all flags (i.e. '--store', '--rule', '--target', '--metadata', '--exemplar', '--endpoint') to verify
57-
// '--endpoint' flag works properly works together with other flags ('--target', '--metadata' etc.).
57+
// '--endpoint' flag works properly
5858
// Register 2 sidecars and 1 storeGW using '--endpoint'.
5959
// Register `sidecar3` twice to verify it is deduplicated.
6060
q := e2ethanos.NewQuerierBuilder(e, "1", sidecar1.InternalEndpoint("grpc")).
61-
WithTargetAddresses(sidecar1.InternalEndpoint("grpc")).
62-
WithMetadataAddresses(sidecar1.InternalEndpoint("grpc")).
63-
WithExemplarAddresses(sidecar1.InternalEndpoint("grpc")).
64-
WithRuleAddresses(sidecar1.InternalEndpoint("grpc")).
6561
WithEndpoints(
6662
sidecar1.InternalEndpoint("grpc"),
6763
sidecar2.InternalEndpoint("grpc"),

‎test/e2e/metadata_api_test.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,17 +46,13 @@ func TestMetadataAPI_Fanout(t *testing.T) {
4646
testutil.Ok(t, e2e.StartAndWaitReady(prom1, sidecar1, prom2, sidecar2))
4747

4848
stores := []string{sidecar1.InternalEndpoint("grpc"), sidecar2.InternalEndpoint("grpc")}
49-
q := e2ethanos.NewQuerierBuilder(
50-
e, "query", stores...).
51-
WithMetadataAddresses(stores...).
52-
Init()
49+
q := e2ethanos.NewQuerierBuilder(e, "query", stores...).Init()
5350
testutil.Ok(t, e2e.StartAndWaitReady(q))
5451

5552
ctx, cancel := context.WithTimeout(context.Background(), 1*time.Minute)
5653
t.Cleanup(cancel)
5754

5855
testutil.Ok(t, q.WaitSumMetricsWithOptions(e2emon.Equals(2), []string{"thanos_store_nodes_grpc_connections"}, e2emon.WaitMissingMetrics()))
59-
testutil.Ok(t, q.WaitSumMetricsWithOptions(e2emon.Equals(2), []string{"thanos_query_endpoints_dns_provider_results"}, e2emon.WaitMissingMetrics()))
6056

6157
var promMeta map[string][]metadatapb.Meta
6258
// Wait metadata response to be ready as Prometheus gets metadata after scrape.

‎test/e2e/rules_api_test.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,7 @@ func TestRulesAPI_Fanout(t *testing.T) {
8484
testutil.Ok(t, e2e.StartAndWaitReady(r1, r2))
8585

8686
stores := []string{sidecar1.InternalEndpoint("grpc"), sidecar2.InternalEndpoint("grpc"), r1.InternalEndpoint("grpc"), r2.InternalEndpoint("grpc")}
87-
q := qBuilder.
88-
WithStoreAddresses(stores...).
89-
WithRuleAddresses(stores...).
90-
Init()
87+
q := qBuilder.WithStoreAddresses(stores...).Init()
9188
testutil.Ok(t, e2e.StartAndWaitReady(q))
9289

9390
ctx, cancel := context.WithTimeout(context.Background(), 1*time.Minute)

‎test/e2e/targets_api_test.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,7 @@ func TestTargetsAPI_Fanout(t *testing.T) {
5050
testutil.Ok(t, e2e.StartAndWaitReady(prom1, sidecar1, prom2, sidecar2))
5151

5252
stores := []string{sidecar1.InternalEndpoint("grpc"), sidecar2.InternalEndpoint("grpc")}
53-
q := e2ethanos.NewQuerierBuilder(e, "query", stores...).
54-
WithTargetAddresses(stores...).
55-
Init()
53+
q := e2ethanos.NewQuerierBuilder(e, "query", stores...).Init()
5654
testutil.Ok(t, err)
5755
testutil.Ok(t, e2e.StartAndWaitReady(q))
5856

0 commit comments

Comments
 (0)