Merge branch 'master' into add-conn-pool-wait-stats

lzakharov · web-flow · commit 519bcc2b77b6 · 2024-01-09T15:36:52.000+03:00
diff --git a/commands_test.go b/commands_test.go
@@ -291,6 +291,17 @@ var _ = Describe("Commands", func() {
 				}()
 				pipe.ClientSetInfo(ctx, libInfo)
 			}).To(Panic())
+			// Test setting the default options for libName, libName suffix and libVer
+			clientInfo := client.ClientInfo(ctx).Val()
+			Expect(clientInfo.LibName).To(ContainSubstring("go-redis(go-redis,"))
+			// Test setting the libName suffix in options
+			opt := redisOptions()
+			opt.IdentitySuffix = "suffix"
+			client2 := redis.NewClient(opt)
+			defer client2.Close()
+			clientInfo = client2.ClientInfo(ctx).Val()
+			Expect(clientInfo.LibName).To(ContainSubstring("go-redis(suffix,"))
+
 		})
 
 		It("should ConfigGet", func() {
@@ -3722,28 +3733,28 @@ var _ = Describe("Commands", func() {
 		It("should ZAdd bytes", func() {
 			added, err := client.ZAdd(ctx, "zset", redis.Z{
 				Score:  1,
-				Member: "one",
+				Member: []byte("one"),
 			}).Result()
 			Expect(err).NotTo(HaveOccurred())
 			Expect(added).To(Equal(int64(1)))
 
 			added, err = client.ZAdd(ctx, "zset", redis.Z{
 				Score:  1,
-				Member: "uno",
+				Member: []byte("uno"),
 			}).Result()
 			Expect(err).NotTo(HaveOccurred())
 			Expect(added).To(Equal(int64(1)))
 
 			added, err = client.ZAdd(ctx, "zset", redis.Z{
 				Score:  2,
-				Member: "two",
+				Member: []byte("two"),
 			}).Result()
 			Expect(err).NotTo(HaveOccurred())
 			Expect(added).To(Equal(int64(1)))
 
 			added, err = client.ZAdd(ctx, "zset", redis.Z{
 				Score:  3,
-				Member: "two",
+				Member: []byte("two"),
 			}).Result()
 			Expect(err).NotTo(HaveOccurred())
 			Expect(added).To(Equal(int64(0)))
diff --git a/example/del-keys-without-ttl/go.mod b/example/del-keys-without-ttl/go.mod
@@ -5,7 +5,7 @@ go 1.18
 replace github.com/redis/go-redis/v9 => ../..
 
 require (
-	github.com/redis/go-redis/v9 v9.3.1
+	github.com/redis/go-redis/v9 v9.4.0
 	go.uber.org/zap v1.24.0
 )
 
diff --git a/example/hll/go.mod b/example/hll/go.mod
@@ -4,7 +4,7 @@ go 1.18
 
 replace github.com/redis/go-redis/v9 => ../..
 
-require github.com/redis/go-redis/v9 v9.3.1
+require github.com/redis/go-redis/v9 v9.4.0
 
 require (
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
diff --git a/example/lua-scripting/go.mod b/example/lua-scripting/go.mod
@@ -4,7 +4,7 @@ go 1.18
 
 replace github.com/redis/go-redis/v9 => ../..
 
-require github.com/redis/go-redis/v9 v9.3.1
+require github.com/redis/go-redis/v9 v9.4.0
 
 require (
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
diff --git a/example/otel/go.mod b/example/otel/go.mod
@@ -9,8 +9,8 @@ replace github.com/redis/go-redis/extra/redisotel/v9 => ../../extra/redisotel
 replace github.com/redis/go-redis/extra/rediscmd/v9 => ../../extra/rediscmd
 
 require (
-	github.com/redis/go-redis/extra/redisotel/v9 v9.3.1
-	github.com/redis/go-redis/v9 v9.3.1
+	github.com/redis/go-redis/extra/redisotel/v9 v9.4.0
+	github.com/redis/go-redis/v9 v9.4.0
 	github.com/uptrace/uptrace-go v1.16.0
 	go.opentelemetry.io/otel v1.16.0
 )
@@ -23,7 +23,7 @@ require (
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.2 // indirect
-	github.com/redis/go-redis/extra/rediscmd/v9 v9.3.1 // indirect
+	github.com/redis/go-redis/extra/rediscmd/v9 v9.4.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/runtime v0.42.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.39.0 // indirect
diff --git a/example/redis-bloom/go.mod b/example/redis-bloom/go.mod
@@ -4,7 +4,7 @@ go 1.18
 
 replace github.com/redis/go-redis/v9 => ../..
 
-require github.com/redis/go-redis/v9 v9.3.1
+require github.com/redis/go-redis/v9 v9.4.0
 
 require (
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
diff --git a/example/scan-struct/go.mod b/example/scan-struct/go.mod
@@ -6,7 +6,7 @@ replace github.com/redis/go-redis/v9 => ../..
 
 require (
 	github.com/davecgh/go-spew v1.1.1
-	github.com/redis/go-redis/v9 v9.3.1
+	github.com/redis/go-redis/v9 v9.4.0
 )
 
 require (
diff --git a/extra/rediscensus/go.mod b/extra/rediscensus/go.mod
@@ -8,7 +8,7 @@ replace github.com/redis/go-redis/extra/rediscmd/v9 => ../rediscmd
 
 require (
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/redis/go-redis/extra/rediscmd/v9 v9.3.1
-	github.com/redis/go-redis/v9 v9.3.1
+	github.com/redis/go-redis/extra/rediscmd/v9 v9.4.0
+	github.com/redis/go-redis/v9 v9.4.0
 	go.opencensus.io v0.24.0
 )
diff --git a/extra/rediscmd/go.mod b/extra/rediscmd/go.mod
@@ -7,5 +7,5 @@ replace github.com/redis/go-redis/v9 => ../..
 require (
 	github.com/bsm/ginkgo/v2 v2.7.0
 	github.com/bsm/gomega v1.26.0
-	github.com/redis/go-redis/v9 v9.3.1
+	github.com/redis/go-redis/v9 v9.4.0
 )
diff --git a/extra/redisotel/go.mod b/extra/redisotel/go.mod
@@ -7,8 +7,8 @@ replace github.com/redis/go-redis/v9 => ../..
 replace github.com/redis/go-redis/extra/rediscmd/v9 => ../rediscmd
 
 require (
-	github.com/redis/go-redis/extra/rediscmd/v9 v9.3.1
-	github.com/redis/go-redis/v9 v9.3.1
+	github.com/redis/go-redis/extra/rediscmd/v9 v9.4.0
+	github.com/redis/go-redis/v9 v9.4.0
 	go.opentelemetry.io/otel v1.16.0
 	go.opentelemetry.io/otel/metric v1.16.0
 	go.opentelemetry.io/otel/sdk v1.16.0
diff --git a/extra/redisprometheus/go.mod b/extra/redisprometheus/go.mod
@@ -6,7 +6,7 @@ replace github.com/redis/go-redis/v9 => ../..
 
 require (
 	github.com/prometheus/client_golang v1.14.0
-	github.com/redis/go-redis/v9 v9.3.1
+	github.com/redis/go-redis/v9 v9.4.0
 )
 
 require (
diff --git a/options.go b/options.go
@@ -144,6 +144,9 @@ type Options struct {
 
 	// Disable set-lib on connect. Default is false.
 	DisableIndentity bool
+
+	// Add suffix to client name. Default is empty.
+	IdentitySuffix string
 }
 
 func (opt *Options) init() {
diff --git a/osscluster.go b/osscluster.go
@@ -86,6 +86,8 @@ type ClusterOptions struct {
 
 	TLSConfig        *tls.Config
 	DisableIndentity bool // Disable set-lib on connect. Default is false.
+
+	IdentitySuffix string // Add suffix to client name. Default is empty.
 }
 
 func (opt *ClusterOptions) init() {
@@ -291,6 +293,7 @@ func (opt *ClusterOptions) clientOptions() *Options {
 		ConnMaxIdleTime:  opt.ConnMaxIdleTime,
 		ConnMaxLifetime:  opt.ConnMaxLifetime,
 		DisableIndentity: opt.DisableIndentity,
+		IdentitySuffix:   opt.IdentitySuffix,
 		TLSConfig:        opt.TLSConfig,
 		// If ClusterSlots is populated, then we probably have an artificial
 		// cluster whose nodes are not in clustering mode (otherwise there isn't
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "redis",
-  "version": "9.3.1",
+  "version": "9.4.0",
   "main": "index.js",
   "repository": "git@github.com:redis/go-redis.git",
   "author": "Vladimir Mihailenco <vladimir.webdev@gmail.com>",
diff --git a/redis.go b/redis.go
@@ -315,6 +315,9 @@ func (c *baseClient) initConn(ctx context.Context, cn *pool.Conn) error {
 	if !c.opt.DisableIndentity {
 		libName := ""
 		libVer := Version()
+		if c.opt.IdentitySuffix != "" {
+			libName = c.opt.IdentitySuffix
+		}
 		libInfo := LibraryInfo{LibName: &libName}
 		conn.ClientSetInfo(ctx, libInfo)
 		libInfo = LibraryInfo{LibVer: &libVer}
diff --git a/ring.go b/ring.go
@@ -99,6 +99,7 @@ type RingOptions struct {
 	Limiter   Limiter
 
 	DisableIndentity bool
+	IdentitySuffix   string
 }
 
 func (opt *RingOptions) init() {
@@ -166,6 +167,7 @@ func (opt *RingOptions) clientOptions() *Options {
 		Limiter:   opt.Limiter,
 
 		DisableIndentity: opt.DisableIndentity,
+		IdentitySuffix:   opt.IdentitySuffix,
 	}
 }
 
diff --git a/sentinel.go b/sentinel.go
@@ -81,6 +81,7 @@ type FailoverOptions struct {
 	TLSConfig *tls.Config
 
 	DisableIndentity bool
+	IdentitySuffix   string
 }
 
 func (opt *FailoverOptions) clientOptions() *Options {
@@ -117,6 +118,7 @@ func (opt *FailoverOptions) clientOptions() *Options {
 		TLSConfig: opt.TLSConfig,
 
 		DisableIndentity: opt.DisableIndentity,
+		IdentitySuffix:   opt.IdentitySuffix,
 	}
 }
 
diff --git a/sortedset_commands.go b/sortedset_commands.go
@@ -727,7 +727,7 @@ func (c cmdable) ZScan(ctx context.Context, key string, cursor uint64, match str
 // Z represents sorted set member.
 type Z struct {
 	Score  float64
-	Member string
+	Member interface{}
 }
 
 // ZWithKey represents sorted set member including the name of the key where it was popped.
diff --git a/universal.go b/universal.go
@@ -67,6 +67,7 @@ type UniversalOptions struct {
 	MasterName string
 
 	DisableIndentity bool
+	IdentitySuffix   string
 }
 
 // Cluster returns cluster options created from the universal options.
@@ -112,6 +113,7 @@ func (o *UniversalOptions) Cluster() *ClusterOptions {
 		TLSConfig: o.TLSConfig,
 
 		DisableIndentity: o.DisableIndentity,
+		IdentitySuffix:   o.IdentitySuffix,
 	}
 }
 
@@ -157,6 +159,7 @@ func (o *UniversalOptions) Failover() *FailoverOptions {
 		TLSConfig: o.TLSConfig,
 
 		DisableIndentity: o.DisableIndentity,
+		IdentitySuffix:   o.IdentitySuffix,
 	}
 }
 
@@ -199,6 +202,7 @@ func (o *UniversalOptions) Simple() *Options {
 		TLSConfig: o.TLSConfig,
 
 		DisableIndentity: o.DisableIndentity,
+		IdentitySuffix:   o.IdentitySuffix,
 	}
 }
 
diff --git a/version.go b/version.go
@@ -2,5 +2,5 @@ package redis
 
 // Version is the current release version.
 func Version() string {
-	return "9.3.1"
+	return "9.4.0"
 }

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ go 1.18`
`5`	`5`	`replace github.com/redis/go-redis/v9 => ../..`
`6`	`6`
`7`	`7`	`require (`
`8`		`- github.com/redis/go-redis/v9 v9.3.1`
	`8`	`+ github.com/redis/go-redis/v9 v9.4.0`
`9`	`9`	`go.uber.org/zap v1.24.0`
`10`	`10`	`)`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ replace github.com/redis/go-redis/v9 => ../..`
`6`	`6`
`7`	`7`	`require (`
`8`	`8`	`github.com/davecgh/go-spew v1.1.1`
`9`		`- github.com/redis/go-redis/v9 v9.3.1`
	`9`	`+ github.com/redis/go-redis/v9 v9.4.0`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`require (`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ replace github.com/redis/go-redis/extra/rediscmd/v9 => ../rediscmd`
`8`	`8`
`9`	`9`	`require (`
`10`	`10`	`github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect`
`11`		`- github.com/redis/go-redis/extra/rediscmd/v9 v9.3.1`
`12`		`- github.com/redis/go-redis/v9 v9.3.1`
	`11`	`+ github.com/redis/go-redis/extra/rediscmd/v9 v9.4.0`
	`12`	`+ github.com/redis/go-redis/v9 v9.4.0`
`13`	`13`	`go.opencensus.io v0.24.0`
`14`	`14`	`)`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,5 @@ replace github.com/redis/go-redis/v9 => ../..`
`7`	`7`	`require (`
`8`	`8`	`github.com/bsm/ginkgo/v2 v2.7.0`
`9`	`9`	`github.com/bsm/gomega v1.26.0`
`10`		`- github.com/redis/go-redis/v9 v9.3.1`
	`10`	`+ github.com/redis/go-redis/v9 v9.4.0`
`11`	`11`	`)`