Merge pull request #7980 from saswatamcode/cut-release-0.37.2

* Fix potential deadlock in hedging request (#7962) Signed-off-by: SungJin1212 <[email protected]> * sidecar: fix limit mintime (#7970) Signed-off-by: Michael Hoffmann <[email protected]> Signed-off-by: Saswata Mukherjee <[email protected]> * Cut patch release v0.37.2 Signed-off-by: Saswata Mukherjee <[email protected]> * Fix changelog Signed-off-by: Saswata Mukherjee <[email protected]> --------- Signed-off-by: SungJin1212 <[email protected]> Signed-off-by: Michael Hoffmann <[email protected]> Signed-off-by: Saswata Mukherjee <[email protected]> Co-authored-by: SungJin1212 <[email protected]> Co-authored-by: Michael Hoffmann <[email protected]>
thanos-io · Dec 11, 2024 · 18291a7 · 18291a7
2 parents e0812e2 + c071d51
commit 18291a7
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,7 +8,20 @@ NOTE: As semantic versioning states all 0.y.z releases can contain breaking chan
 
 We use *breaking :warning:* to mark changes that are not backward compatible (relates only to v0.y.z releases.)
 
-## [v0.37.1](https://github.com/thanos-io/thanos/tree/release-0.37) - 03.12.2024
+## [v0.37.2](https://github.com/thanos-io/thanos/tree/release-0.37) - 11.12.2024
+
+### Fixed
+
+- [#7970](https://github.com/thanos-io/thanos/pull/7970) Sidecar: Respect min-time setting.
+- [#7962](https://github.com/thanos-io/thanos/pull/7962) Store: Fix potential deadlock in hedging request.
+
+### Added
+
+### Changed
+
+### Removed
+
+## [v0.37.1](https://github.com/thanos-io/thanos/tree/release-0.37) - 04.12.2024
 
 ### Fixed
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.37.1
+0.37.2
diff --git a/cmd/thanos/sidecar.go b/cmd/thanos/sidecar.go
@@ -505,7 +505,7 @@ func (s *promMetadata) UpdateTimestamps(ctx context.Context) error {
 		return err
 	}
 
-	s.mint = min(s.limitMinTime.PrometheusTimestamp(), mint)
+	s.mint = max(s.limitMinTime.PrometheusTimestamp(), mint)
 	s.maxt = math.MaxInt64
 
 	return nil

diff --git a/pkg/exthttp/hedging.go b/pkg/exthttp/hedging.go
@@ -48,11 +48,11 @@ func (hrt *hedgingRoundTripper) RoundTrip(req *http.Request) (*http.Response, er
 	}
 	duration := float64(time.Since(start).Milliseconds())
 	hrt.mu.Lock()
+	defer hrt.mu.Unlock()
 	err = hrt.TDigest.Add(duration)
 	if err != nil {
 		return nil, err
 	}
-	hrt.mu.Unlock()
 	return resp, err
 }