Bump github.com/go-redis/redis from v6 to v8

Author: spenceral

buckets/redis/bucket.go

@@ -10,7 +10,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/go-redis/redis"
+	"github.com/go-redis/redis/v8"
 
 	"github.com/opentracing/opentracing-go"
 	"github.com/pkg/errors"
@@ -80,7 +80,7 @@ func (a *abstractBucket) Take(ctx context.Context, requested int64, maxWaitTime
 func (a *abstractBucket) takeFromRedis(ctx context.Context, client redis.UniversalClient, args []interface{}) *redis.Cmd {
 	span, ctx := opentracing.StartSpanFromContext(ctx, "script.Run")
 	defer span.Finish()
-	return a.factory.script.Run(client, a.keys, args...)
+	return a.factory.script.Run(ctx, client, a.keys, args...)
 }
 
 var _ quotaservice.Bucket = (*staticBucket)(nil)

buckets/redis/bucket_factory.go

@@ -6,12 +6,13 @@
 package redis
 
 import (
+	"context"
 	"fmt"
 	"strconv"
 	"sync"
 	"time"
 
-	"github.com/go-redis/redis"
+	"github.com/go-redis/redis/v8"
 
 	"github.com/pkg/errors"
 	"github.com/square/quotaservice"
@@ -190,7 +191,7 @@ func (bf *bucketFactory) connectToRedisLocked() {
 		logging.Fatal("Cannot connect to Redis because no connection options have been provided.")
 	}
 
-	_, err := bf.client.Touch("areYouAlive?").Result()
+	_, err := bf.client.Touch(context.TODO(), "areYouAlive?").Result()
 	if err != nil {
 		logging.Printf("Cannot connect to Redis. TOUCH returned %v", err)
 	} else {
@@ -238,7 +239,7 @@ func (bf *bucketFactory) establishNewConnectionToRedis(oldClient redis.Universal
 			bf.reconnectToRedis(client)
 
 			client = bf.Client().(redis.UniversalClient)
-			_, err := client.Ping().Result()
+			_, err := client.Ping(context.TODO()).Result()
 			if err == nil {
 				disconnected = false
 				break

buckets/redis/bucket_test.go

@@ -9,11 +9,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/go-redis/redis"
+	"github.com/go-redis/redis/v8"
 
 	"github.com/square/quotaservice/buckets"
 	"github.com/square/quotaservice/config"
-	"github.com/square/quotaservice/protos/config"
+	quotaservice_configs "github.com/square/quotaservice/protos/config"
 )
 
 const (
@@ -48,7 +48,7 @@ func setUp() {
 func TestScriptLoaded(t *testing.T) {
 	bucket.Take(context.Background(), 1, 50*time.Millisecond)
 
-	exists := bucket.factory.script.Exists(bucket.factory.client)
+	exists := bucket.factory.script.Exists(context.TODO(), bucket.factory.client)
 	if err := exists.Err(); err != nil {
 		t.Fatal("Error checking if script was loaded into Redis: ", err)
 	} else if !exists.Val()[0] {

go.mod

@@ -10,29 +10,27 @@ require (
 	github.com/alecthomas/repr v0.0.0-20181024024818-d37bc2a10ba1 // indirect
 	github.com/alecthomas/template v0.0.0-20150530000104-b867cc6ab45c // indirect
 	github.com/alecthomas/units v0.0.0-20150109002421-6b4e7dc5e314 // indirect
-	github.com/go-redis/redis v6.15.2+incompatible
+	github.com/go-redis/redis/v8 v8.11.5
 	github.com/go-sql-driver/mysql v1.4.1
 	github.com/go-zookeeper/zk v1.0.2
-	github.com/golang/protobuf v1.2.0
+	github.com/golang/protobuf v1.5.2
 	github.com/googleapis/gax-go v0.0.0-20170305230405-8c5154c0fe5b // indirect
 	github.com/kr/pretty v0.1.0 // indirect
 	github.com/lib/pq v1.0.0 // indirect
 	github.com/mattn/go-isatty v0.0.4 // indirect
 	github.com/mattn/go-sqlite3 v1.9.0 // indirect
-	github.com/onsi/ginkgo v1.7.0 // indirect
-	github.com/onsi/gomega v1.4.3 // indirect
 	github.com/opentracing/opentracing-go v1.0.2
 	github.com/ory/dockertest/v3 v3.6.0
 	github.com/pkg/errors v0.8.1
 	github.com/sergi/go-diff v1.0.0 // indirect
-	github.com/stretchr/testify v1.4.0
-	golang.org/x/net v0.0.0-20191003171128-d98b1b443823
+	github.com/stretchr/testify v1.5.1
+	golang.org/x/net v0.0.0-20210428140749-89ef3d95e781
 	golang.org/x/oauth2 v0.0.0-20170302202304-efb10a30610e // indirect
 	google.golang.org/api v0.0.0-20170308235209-f093df3d954a
 	google.golang.org/appengine v1.0.0 // indirect
 	google.golang.org/genproto v0.0.0-20170303204730-1e95789587db // indirect
 	google.golang.org/grpc v0.0.0-20170307005400-4eaacfed9779
 	gopkg.in/alecthomas/kingpin.v2 v2.2.3
 	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
-	gopkg.in/yaml.v2 v2.2.7
+	gopkg.in/yaml.v2 v2.4.0
 )

go.sum

@@ -4,11 +4,12 @@
 package stats
 
 import (
+	"context"
 	"fmt"
 	"sync"
 	"time"
 
-	"github.com/go-redis/redis"
+	"github.com/go-redis/redis/v8"
 
 	"github.com/square/quotaservice/events"
 	"github.com/square/quotaservice/logging"
@@ -28,7 +29,7 @@ type redisListener struct {
 // by a standalone Redis instance.
 func NewRedisStatsListener(redisOpts *redis.Options, statsBatchSize int, statsBatchDeadline time.Duration) Listener {
 	client := redis.NewClient(redisOpts)
-	_, err := client.Ping().Result()
+	_, err := client.Ping(context.TODO()).Result()
 
 	if err != nil {
 		logging.Fatalf("RedisStatsListener: cannot connect to Redis, %v", err)
@@ -53,7 +54,7 @@ func NewRedisStatsListener(redisOpts *redis.Options, statsBatchSize int, statsBa
 // by a Redis cluster.
 func NewRedisClusterStatsListener(redisClusterOpts *redis.ClusterOptions, statsBatchSize int, statsBatchDeadline time.Duration) Listener {
 	client := redis.NewClusterClient(redisClusterOpts)
-	_, err := client.Ping().Result()
+	_, err := client.Ping(context.TODO()).Result()
 
 	if err != nil {
 		logging.Fatalf("RedisStatsListener: cannot connect to Redis, %v", err)
@@ -75,7 +76,7 @@ func NewRedisClusterStatsListener(redisClusterOpts *redis.ClusterOptions, statsB
 }
 
 func (l *redisListener) redisTopList(key string) []*BucketScore {
-	results, err := l.client.ZRevRangeWithScores(key, 0, 10).Result()
+	results, err := l.client.ZRevRangeWithScores(context.TODO(), key, 0, 10).Result()
 
 	if err != nil && err.Error() != "redis: nil" {
 		logging.Printf("RedisStatsListener.TopList error (%s) %v", key, err)
@@ -115,15 +116,15 @@ func (l *redisListener) TopMisses(namespace string) []*BucketScore {
 func (l *redisListener) Get(namespace, bucket string) *BucketScores {
 	scores := &BucketScores{0, 0}
 
-	value, err := l.client.ZScore(statsNamespace("misses", namespace), bucket).Result()
+	value, err := l.client.ZScore(context.TODO(), statsNamespace("misses", namespace), bucket).Result()
 
 	if err != nil && err.Error() != "redis: nil" {
 		logging.Printf("RedisStatsListener.Get error (%s, %s) %v", namespace, bucket, err)
 	} else {
 		scores.Misses = int64(value)
 	}
 
-	value, err = l.client.ZScore(statsNamespace("hits", namespace), bucket).Result()
+	value, err = l.client.ZScore(context.TODO(), statsNamespace("hits", namespace), bucket).Result()
 
 	if err != nil && err.Error() != "redis: nil" {
 		logging.Printf("RedisStatsListener.Get error (%s, %s) %v", namespace, bucket, err)
@@ -168,8 +169,8 @@ func (l *redisListener) HandleEvent(event events.Event) {
 func (l *redisListener) queueStatsUpdate(namespace string, numTokens int64, bucket string) {
 	l.statsUpdatesLock.Lock()
 
-	l.pipe.ZIncrBy(namespace, float64(numTokens), bucket)
-	l.pipe.ExpireAt(namespace, nearestHour())
+	l.pipe.ZIncrBy(context.TODO(), namespace, float64(numTokens), bucket)
+	l.pipe.ExpireAt(context.TODO(), namespace, nearestHour())
 
 	l.queuedUpdates++
 
@@ -231,7 +232,7 @@ func (l *redisListener) batcher() {
 
 // submitBatch executes the provided pipeline and checks for errors.
 func (l *redisListener) submitBatch(pipe redis.Pipeliner) {
-	cmds, err := pipe.Exec()
+	cmds, err := pipe.Exec(context.TODO())
 	if err != nil {
 		logging.Printf("RedisStatsListener.HandleEvent pipeline error %v", err)
 	}

stats/redis.go

@@ -4,12 +4,13 @@
 package stats
 
 import (
+	"context"
 	"math/rand"
 	"reflect"
 	"testing"
 	"time"
 
-	"github.com/go-redis/redis"
+	"github.com/go-redis/redis/v8"
 
 	"github.com/square/quotaservice/events"
 )
@@ -43,7 +44,7 @@ func setUp() Listener {
 }
 
 func teardown(listener Listener) {
-	listener.(*redisListener).client.FlushDB()
+	listener.(*redisListener).client.FlushDB(context.TODO())
 }
 
 func TestRedisHandleNewHitBucket(t *testing.T) {