Cut release candidate 0.36.0 rc.1 (thanos-io#7510)

* *: fix server grpc histograms (thanos-io#7493) Signed-off-by: Michael Hoffmann <[email protected]> * Close endpoints after the gRPC server has terminated (thanos-io#7509) Endpoints are currently closed as soon as we receive a SIGTERM or SIGINT. This causes in-flight queries to get cancelled since outgoing connections get closed instantly. This commit moves the endpoints.Close call after the grpc server shutdown to make sure connections are available as long as the server is running. Signed-off-by: Filip Petkovski <[email protected]> * Cut release candidate v0.36.0-rc.1 Signed-off-by: Michael Hoffmann <[email protected]> --------- Signed-off-by: Michael Hoffmann <[email protected]> Signed-off-by: Filip Petkovski <[email protected]> Co-authored-by: Filip Petkovski <[email protected]>
databricks · Aug 22, 2024 · e64cac8 · e64cac8
1 parent 7595994
commit e64cac8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,7 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re
 - [#7484](https://github.com/thanos-io/thanos/pull/7484) Proxy: fix panic in lazy response set
 - [#6948](https://github.com/thanos-io/thanos/pull/6948) Receive: fix goroutines leak during series requests to thanos store api.
 - [#7392](https://github.com/thanos-io/thanos/pull/7392) Query: fix broken min, max for pre 0.34.1 sidecars
+- [#7493](https://github.com/thanos-io/thanos/pull/7493) *: fix server grpc histograms
 
 ### Added
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.36.0-rc.0
+0.36.0-rc.1
diff --git a/cmd/thanos/query.go b/cmd/thanos/query.go
@@ -851,6 +851,7 @@ func runQuery(
 		}, func(error) {
 			statusProber.NotReady(err)
 			s.Shutdown(err)
+			endpoints.Close()
 		})
 	}
 
@@ -949,7 +950,6 @@ func prepareEndpointSet(
 			})
 		}, func(error) {
 			cancel()
-			endpointSet.Close()
 		})
 	}
 

diff --git a/pkg/server/grpc/grpc.go b/pkg/server/grpc/grpc.go
@@ -59,10 +59,10 @@ func New(logger log.Logger, reg prometheus.Registerer, tracer opentracing.Tracer
 
 	met := grpc_prometheus.NewServerMetrics(
 		grpc_prometheus.WithServerHandlingTimeHistogram(
-			grpc_prometheus.WithHistogramBuckets([]float64{0.001, 0.01, 0.1, 0.3, 0.6, 1, 3, 6, 9, 20, 30, 60, 90, 120}),
 			grpc_prometheus.WithHistogramOpts(&prometheus.HistogramOpts{
-				NativeHistogramBucketFactor:    1.1,
+				Buckets:                        []float64{0.001, 0.01, 0.1, 0.3, 0.6, 1, 3, 6, 9, 20, 30, 60, 90, 120},
 				NativeHistogramMaxBucketNumber: 256,
+				NativeHistogramBucketFactor:    1.1,
 			}),
 		),
 	)