Merge branch 'master' into should-be-able-to-create-a-ring-from-universal-options

Author: peczenyj

.github/workflows/stale-issues.yml

@@ -12,7 +12,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/stale@v3
+    - uses: actions/stale@v8
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-issue-message: 'This issue is marked stale. It will be closed in 30 days if it is not updated.'

README.md

@@ -10,8 +10,8 @@
 > use it to monitor applications and set up automatic alerts to receive notifications via email,
 > Slack, Telegram, and others.
 >
-> See [OpenTelemetry](example/otel) example which demonstrates how you can use Uptrace to monitor
-> go-redis.
+> See [OpenTelemetry](https://github.com/redis/go-redis/tree/master/example/otel) example which
+> demonstrates how you can use Uptrace to monitor go-redis.
 
 ## Documentation
 
@@ -107,7 +107,8 @@ func ExampleClient() {
 }
 ```
 
-The above can be modified to specify the version of the RESP protocol by adding the `protocol` option to the `Options` struct:
+The above can be modified to specify the version of the RESP protocol by adding the `protocol`
+option to the `Options` struct:
 
 ```go
     rdb := redis.NewClient(&redis.Options{
@@ -121,7 +122,10 @@ The above can be modified to specify the version of the RESP protocol by adding
 
 ### Connecting via a redis url
 
-go-redis also supports connecting via the [redis uri specification](https://github.com/redis/redis-specifications/tree/master/uri/redis.txt). The example below demonstrates how the connection can easily be configured using a string, adhering to this specification.
+go-redis also supports connecting via the
+[redis uri specification](https://github.com/redis/redis-specifications/tree/master/uri/redis.txt).
+The example below demonstrates how the connection can easily be configured using a string, adhering
+to this specification.
 
 ```go
 import (
@@ -208,7 +212,8 @@ Lastly, run:
 go test
 ```
 
-Another option is to run your specific tests with an already running redis. The example below, tests against a redis running on port 9999.:
+Another option is to run your specific tests with an already running redis. The example below, tests
+against a redis running on port 9999.:
 
 ```shell
 REDIS_PORT=9999 go test <your options>

commands.go

@@ -224,6 +224,7 @@ type Cmdable interface {
 	GearsCmdable
 	ProbabilisticCmdable
 	TimeseriesCmdable
+	StreamCmdable
 }
 
 type StatefulCmdable interface {

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.2.0
+	github.com/redis/go-redis/v9 v9.2.1
 	go.uber.org/zap v1.24.0
 )
 

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.2.0
+require github.com/redis/go-redis/v9 v9.2.1
 
 require (
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect

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.2.0
+require github.com/redis/go-redis/v9 v9.2.1
 
 require (
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect

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.2.0
-	github.com/redis/go-redis/v9 v9.2.0
+	github.com/redis/go-redis/extra/redisotel/v9 v9.2.1
+	github.com/redis/go-redis/v9 v9.2.1
 	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.2.0 // indirect
+	github.com/redis/go-redis/extra/rediscmd/v9 v9.2.1 // 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

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.2.0
+require github.com/redis/go-redis/v9 v9.2.1
 
 require (
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect

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.2.0
+	github.com/redis/go-redis/v9 v9.2.1
 )
 
 require (

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.2.0
-	github.com/redis/go-redis/v9 v9.2.0
+	github.com/redis/go-redis/extra/rediscmd/v9 v9.2.1
+	github.com/redis/go-redis/v9 v9.2.1
 	go.opencensus.io v0.24.0
 )

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.2.0
+	github.com/redis/go-redis/v9 v9.2.1
 )

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.2.0
-	github.com/redis/go-redis/v9 v9.2.0
+	github.com/redis/go-redis/extra/rediscmd/v9 v9.2.1
+	github.com/redis/go-redis/v9 v9.2.1
 	go.opentelemetry.io/otel v1.16.0
 	go.opentelemetry.io/otel/metric v1.16.0
 	go.opentelemetry.io/otel/sdk v1.16.0

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.2.0
+	github.com/redis/go-redis/v9 v9.2.1
 )
 
 require (

gears_commands.go

@@ -110,15 +110,11 @@ func (c cmdable) TFCallArgs(ctx context.Context, libName string, funcName string
 	lf := libName + "." + funcName
 	args := []interface{}{"TFCALL", lf, numKeys}
 	if options != nil {
-		if options.Keys != nil {
-			for _, key := range options.Keys {
-				args = append(args, key)
-			}
+		for _, key := range options.Keys {
+			args = append(args, key)
 		}
-		if options.Arguments != nil {
-			for _, key := range options.Arguments {
-				args = append(args, key)
-			}
+		for _, key := range options.Arguments {
+			args = append(args, key)
 		}
 	}
 	cmd := NewCmd(ctx, args...)
@@ -140,15 +136,11 @@ func (c cmdable) TFCallASYNCArgs(ctx context.Context, libName string, funcName s
 	lf := fmt.Sprintf("%s.%s", libName, funcName)
 	args := []interface{}{"TFCALLASYNC", lf, numKeys}
 	if options != nil {
-		if options.Keys != nil {
-			for _, key := range options.Keys {
-				args = append(args, key)
-			}
+		for _, key := range options.Keys {
+			args = append(args, key)
 		}
-		if options.Arguments != nil {
-			for _, key := range options.Arguments {
-				args = append(args, key)
-			}
+		for _, key := range options.Arguments {
+			args = append(args, key)
 		}
 	}
 	cmd := NewCmd(ctx, args...)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "redis",
-  "version": "9.2.0",
+  "version": "9.2.1",
   "main": "index.js",
   "repository": "[email protected]:redis/go-redis.git",
   "author": "Vladimir Mihailenco <[email protected]>",

version.go

@@ -2,5 +2,5 @@ package redis
 
 // Version is the current release version.
 func Version() string {
-	return "9.2.0"
+	return "9.2.1"
 }