Merge remote-tracking branch 'upstream/master' into add-metrics

Author: ofekshenawa

.github/wordlist.txt

@@ -76,3 +76,4 @@ oauth
 entraid
 MiB
 KiB
+oldstable

.github/workflows/build.yml

@@ -22,8 +22,10 @@ jobs:
           - "8.2.x" # Redis CE 8.2
           - "8.0.x" # Redis CE 8.0
         go-version:
+          - "1.21.x"
           - "1.23.x"
-          - "1.24.x"
+          - oldstable
+          - stable
 
     steps:
       - name: Set up ${{ matrix.go-version }}
@@ -78,8 +80,10 @@ jobs:
             - "8.2.x" # Redis CE 8.2
             - "8.0.x" # Redis CE 8.0
           go-version:
+            - "1.21.x"
             - "1.23.x"
-            - "1.24.x"
+            - oldstable
+            - stable
 
     steps:
       - name: Checkout code

.github/workflows/golangci-lint.yml

@@ -22,7 +22,7 @@ jobs:
     steps:
       - uses: actions/checkout@v6
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v9.1.0
+        uses: golangci/golangci-lint-action@v9.2.0
         with:
           verify: true 
 

README.md

@@ -21,13 +21,12 @@ In `go-redis` we are aiming to support the last three releases of Redis. Current
 - [Redis 8.2](https://github.com/redis/redis/8.2/00-RELEASENOTES) - using Redis CE 8.2 
 - [Redis 8.4](https://github.com/redis/redis/8.4/00-RELEASENOTES) - using Redis CE 8.4
 
-Although the `go.mod` states it requires at minimum `go 1.18`, our CI is configured to run the tests against all three
-versions of Redis and latest two versions of Go ([1.23](https://go.dev/doc/devel/release#go1.23.0),
-[1.24](https://go.dev/doc/devel/release#go1.24.0)). We observe that some modules related test may not pass with
+Although the `go.mod` states it requires at minimum `go 1.21`, our CI is configured to run the tests against all three
+versions of Redis and multiple versions of Go ([1.21](https://go.dev/doc/devel/release#go1.21.0),
+[1.23](https://go.dev/doc/devel/release#go1.23.0), oldstable, and stable). We observe that some modules related test may not pass with
 Redis Stack 7.2 and some commands are changed with Redis CE 8.0.
 Although it is not officially supported, `go-redis/v9`  should be able to work with any Redis 7.0+.
-Please do refer to the documentation and the tests if you experience any issues. We do plan to update the go version
-in the `go.mod` to `go 1.24` in one of the next releases.
+Please do refer to the documentation and the tests if you experience any issues.
 
 ## How do I Redis?
 

RELEASE-NOTES.md

@@ -1,5 +1,46 @@
 # Release Notes
 
+# 9.18.0-beta.2 (2025-12-09)
+
+## 🚀 Highlights
+
+### Go Version Update
+
+This release updates the minimum required Go version to 1.21. This is part of a gradual migration strategy where the minimum supported Go version will be three versions behind the latest release. With each new Go version release, we will bump the minimum version by one, ensuring compatibility while staying current with the Go ecosystem.
+
+### Stability Improvements
+
+This release includes several important stability fixes:
+- Fixed a critical panic in the handoff worker manager that could occur when handling nil errors
+- Improved test reliability for Smart Client Handoff functionality
+- Fixed logging format issues that could cause runtime errors
+
+## ✨ New Features
+
+- OpenTelemetry metrics improvements for nil response handling ([#3638](https://github.com/redis/go-redis/pull/3638)) by [@fengve](https://github.com/fengve)
+
+## 🐛 Bug Fixes
+
+- Fixed panic on nil error in handoffWorkerManager closeConnFromRequest ([#3633](https://github.com/redis/go-redis/pull/3633)) by [@ccoVeille](https://github.com/ccoVeille)
+- Fixed bad sprintf syntax in logging ([#3632](https://github.com/redis/go-redis/pull/3632)) by [@ccoVeille](https://github.com/ccoVeille)
+
+## 🧰 Maintenance
+
+- Updated minimum Go version to 1.21 ([#3640](https://github.com/redis/go-redis/pull/3640)) by [@ndyakov](https://github.com/ndyakov)
+- Use Go 1.20 idiomatic string<->byte conversion ([#3435](https://github.com/redis/go-redis/pull/3435)) by [@justinhwang](https://github.com/justinhwang)
+- Reduce flakiness of Smart Client Handoff test ([#3641](https://github.com/redis/go-redis/pull/3641)) by [@kiryazovi-redis](https://github.com/kiryazovi-redis)
+- Revert PR #3634 (Observability metrics phase1) ([#3635](https://github.com/redis/go-redis/pull/3635)) by [@ofekshenawa](https://github.com/ofekshenawa)
+
+## 👥 Contributors
+
+We'd like to thank all the contributors who worked on this release!
+
+[@justinhwang](https://github.com/justinhwang), [@ndyakov](https://github.com/ndyakov), [@kiryazovi-redis](https://github.com/kiryazovi-redis), [@fengve](https://github.com/fengve), [@ccoVeille](https://github.com/ccoVeille), [@ofekshenawa](https://github.com/ofekshenawa)
+
+---
+
+**Full Changelog**: https://github.com/redis/go-redis/compare/v9.18.0-beta.1...v9.18.0-beta.2
+
 # 9.18.0-beta.1 (2025-12-01)
 
 ## 🚀 Highlights

doctests/timeseries_tut_test.go

@@ -5,16 +5,24 @@ package example_commands_test
 import (
 	"context"
 	"fmt"
-	"maps"
 	"math"
-	"slices"
 	"sort"
 
 	"github.com/redis/go-redis/v9"
 )
 
 // HIDE_END
 
+// mapKeys returns a slice of all keys from the map (Go 1.21 compatible)
+// TODO: Once minimum Go version is upgraded to 1.23+, replace with slices.Collect(maps.Keys(m))
+func mapKeys[K comparable, V any](m map[K]V) []K {
+	keys := make([]K, 0, len(m))
+	for k := range m {
+		keys = append(keys, k)
+	}
+	return keys
+}
+
 func ExampleClient_timeseries_create() {
 	ctx := context.Background()
 
@@ -417,7 +425,7 @@ func ExampleClient_timeseries_query_multi() {
 		panic(err)
 	}
 
-	res28Keys := slices.Collect(maps.Keys(res28))
+	res28Keys := mapKeys(res28)
 	sort.Strings(res28Keys)
 
 	for _, k := range res28Keys {
@@ -457,7 +465,7 @@ func ExampleClient_timeseries_query_multi() {
 		panic(err)
 	}
 
-	res29Keys := slices.Collect(maps.Keys(res29))
+	res29Keys := mapKeys(res29)
 	sort.Strings(res29Keys)
 
 	for _, k := range res29Keys {
@@ -505,7 +513,7 @@ func ExampleClient_timeseries_query_multi() {
 		panic(err)
 	}
 
-	res30Keys := slices.Collect(maps.Keys(res30))
+	res30Keys := mapKeys(res30)
 	sort.Strings(res30Keys)
 
 	for _, k := range res30Keys {
@@ -550,7 +558,7 @@ func ExampleClient_timeseries_query_multi() {
 		panic(err)
 	}
 
-	res31Keys := slices.Collect(maps.Keys(res31))
+	res31Keys := mapKeys(res31)
 	sort.Strings(res31Keys)
 
 	for _, k := range res31Keys {
@@ -857,7 +865,7 @@ func ExampleClient_timeseries_aggmulti() {
 		panic(err)
 	}
 
-	res44Keys := slices.Collect(maps.Keys(res44))
+	res44Keys := mapKeys(res44)
 	sort.Strings(res44Keys)
 
 	for _, k := range res44Keys {
@@ -905,7 +913,7 @@ func ExampleClient_timeseries_aggmulti() {
 		panic(err)
 	}
 
-	res45Keys := slices.Collect(maps.Keys(res45))
+	res45Keys := mapKeys(res45)
 	sort.Strings(res45Keys)
 
 	for _, k := range res45Keys {

error.go

@@ -124,6 +124,9 @@ func shouldRetry(err error, retryTimeout bool) bool {
 	if proto.IsTryAgainError(err) {
 		return true
 	}
+	if proto.IsNoReplicasError(err) {
+		return true
+	}
 
 	// Fallback to string checking for backward compatibility with plain errors
 	s := err.Error()
@@ -145,6 +148,9 @@ func shouldRetry(err error, retryTimeout bool) bool {
 	if strings.HasPrefix(s, "MASTERDOWN ") {
 		return true
 	}
+	if strings.HasPrefix(s, "NOREPLICAS ") {
+		return true
+	}
 
 	return false
 }
@@ -342,6 +348,14 @@ func IsOOMError(err error) bool {
 	return proto.IsOOMError(err)
 }
 
+// IsNoReplicasError checks if an error is a Redis NOREPLICAS error, even if wrapped.
+// NOREPLICAS errors occur when not enough replicas acknowledge a write operation.
+// This typically happens with WAIT/WAITAOF commands or CLUSTER SETSLOT with synchronous
+// replication when the required number of replicas cannot confirm the write within the timeout.
+func IsNoReplicasError(err error) bool {
+	return proto.IsNoReplicasError(err)
+}
+
 //------------------------------------------------------------------------------
 
 type timeoutError interface {

error_test.go

@@ -45,7 +45,8 @@ var _ = Describe("error", func() {
 			proto.ParseErrorReply([]byte("-READONLY You can't write against a read only replica")):   true,
 			proto.ParseErrorReply([]byte("-CLUSTERDOWN The cluster is down")):                        true,
 			proto.ParseErrorReply([]byte("-TRYAGAIN Command cannot be processed, please try again")): true,
-			proto.ParseErrorReply([]byte("-ERR other")): false,
+			proto.ParseErrorReply([]byte("-NOREPLICAS Not enough good replicas to write")):           true,
+			proto.ParseErrorReply([]byte("-ERR other")):                                              false,
 		}
 
 		for err, expected := range data {

error_wrapping_test.go

@@ -239,10 +239,10 @@ func TestErrorWrappingInHookScenario(t *testing.T) {
 // TestShouldRetryWithTypedErrors tests that shouldRetry works with typed errors
 func TestShouldRetryWithTypedErrors(t *testing.T) {
 	tests := []struct {
-		name          string
-		errorMsg      string
-		shouldRetry   bool
-		retryTimeout  bool
+		name         string
+		errorMsg     string
+		shouldRetry  bool
+		retryTimeout bool
 	}{
 		{
 			name:         "LOADING error should retry",
@@ -280,6 +280,12 @@ func TestShouldRetryWithTypedErrors(t *testing.T) {
 			shouldRetry:  true,
 			retryTimeout: false,
 		},
+		{
+			name:         "NOREPLICAS error should retry",
+			errorMsg:     "NOREPLICAS Not enough good replicas to write",
+			shouldRetry:  true,
+			retryTimeout: false,
+		},
 	}
 
 	for _, tt := range tests {

example/cluster-mget/go.mod

@@ -1,6 +1,6 @@
 module github.com/redis/go-redis/example/cluster-mget
 
-go 1.18
+go 1.21
 
 replace github.com/redis/go-redis/v9 => ../..