*: cut 0.30.1 (thanos-io#6017)

* fix duplicate metrics registration in redis client (thanos-io#6009) * fix duplicate metrics registration in redis client Signed-off-by: Kama Huang <[email protected]> * fixed test Signed-off-by: Kama Huang <[email protected]> Signed-off-by: Kama Huang <[email protected]> * *: cut 0.30.1 Add CHANGELOG entry. Signed-off-by: Giedrius Statkevičius <[email protected]> Signed-off-by: Kama Huang <[email protected]> Signed-off-by: Giedrius Statkevičius <[email protected]> Co-authored-by: Kama Huang <[email protected]>
ngraham20 · Mar 16, 2023 · 4b53e22 · 4b53e22
1 parent 76f762c
commit 4b53e22
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,12 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re
 - [#5759](https://github.com/thanos-io/thanos/pull/5759) Compact: Fix missing duration log key.
 - [#5799](https://github.com/thanos-io/thanos/pull/5799) Query Frontend: Fixed sharding behaviour for vector matches. Now queries with sharding should work properly where the query looks like: `foo and without (lbl) bar`.
 
+## [v0.30.1](https://github.com/thanos-io/thanos/tree/release-0.30) - 4.01.2023
+
+### Fixed
+
+- [#6009](https://github.com/thanos-io/thanos/pull/6009) Query Frontend/Store: fix duplicate metrics registration in Redis client
+
 ## [v0.30.0](https://github.com/thanos-io/thanos/tree/release-0.30) - 2.01.2023
 
 NOTE: Querier's `query.promql-engine` flag enabling new PromQL engine is now unhidden. We encourage users to use new experimental PromQL engine for efficiency reasons.

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.30.0
+0.30.1
diff --git a/pkg/cacheutil/cacheutil_test.go b/pkg/cacheutil/cacheutil_test.go
@@ -16,7 +16,11 @@ import (
 )
 
 func TestMain(m *testing.M) {
-	goleak.VerifyTestMain(m)
+	goleak.VerifyTestMain(
+		m,
+		// https://github.com/rueian/rueidis/blob/v0.0.90/pipe.go#L204.
+		goleak.IgnoreTopFunction("github.com/rueian/rueidis.(*pipe).backgroundPing"),
+	)
 }
 
 func TestDoWithBatch(t *testing.T) {

diff --git a/pkg/cacheutil/redis_client.go b/pkg/cacheutil/redis_client.go
@@ -175,6 +175,10 @@ func NewRedisClientWithConfig(logger log.Logger, name string, config RedisClient
 		return nil, err
 	}
 
+	if reg != nil {
+		reg = prometheus.WrapRegistererWith(prometheus.Labels{"name": name}, reg)
+	}
+
 	var tlsConfig *tls.Config
 	if config.TLSEnabled {
 		userTLSConfig := config.TLSConfig

diff --git a/pkg/cacheutil/redis_client_test.go b/pkg/cacheutil/redis_client_test.go
@@ -212,3 +212,19 @@ func TestValidateRedisConfig(t *testing.T) {
 	}
 
 }
+
+func TestMultipleRedisClient(t *testing.T) {
+	s, err := miniredis.Run()
+	if err != nil {
+		testutil.Ok(t, err)
+	}
+	defer s.Close()
+	cfg := DefaultRedisClientConfig
+	cfg.Addr = s.Addr()
+	logger := log.NewLogfmtLogger(os.Stderr)
+	reg := prometheus.NewRegistry()
+	_, err = NewRedisClientWithConfig(logger, "test1", cfg, reg)
+	testutil.Ok(t, err)
+	_, err = NewRedisClientWithConfig(logger, "test2", cfg, reg)
+	testutil.Ok(t, err)
+}