Merge branch 'master' into master

Author: ofekshenawa

.github/workflows/build.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go-version: [1.20.x, 1.21.x]
+        go-version: [1.19.x, 1.20.x, 1.21.x]
 
     services:
       redis:

.github/workflows/test-redis-enterprise.yml

@@ -37,13 +37,11 @@ jobs:
         working-directory: redis-ee
         env:
           IMAGE: "redislabs/redis:${{ matrix.re-build }}"
-          RE_USERNAME: ${{ secrets.RE_USERNAME }}
-          RE_PASS: ${{ secrets.RE_PASS }}
-          RE_CLUSTER_NAME: ${{ secrets.RE_CLUSTER_NAME }}
+          RE_USERNAME: [email protected]
+          RE_PASS: 12345
+          RE_CLUSTER_NAME: re-test
           RE_USE_OSS_CLUSTER: false
-          RE_DB_PORT: ${{ secrets.RE_DB_PORT }}
-          DOCKER_ACCESS_TOKEN: ${{ secrets.DOCKER_ACCESS_TOKEN }}
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          RE_DB_PORT: 6379
         run: ./build.sh
 
       - name: Test

Makefile

@@ -1,7 +1,12 @@
 GO_MOD_DIRS := $(shell find . -type f -name 'go.mod' -exec dirname {} \; | sort)
 
 test: testdeps
+	$(eval GO_VERSION := $(shell go version | cut -d " " -f 3 | cut -d. -f2))
 	set -e; for dir in $(GO_MOD_DIRS); do \
+	  if echo "$${dir}" | grep -q "./example" && [ "$(GO_VERSION)" = "19" ]; then \
+	    echo "Skipping go test in $${dir} due to Go version 1.19 and dir contains ./example"; \
+	    continue; \
+	  fi; \
 	  echo "go test in $${dir}"; \
 	  (cd "$${dir}" && \
 	    go mod tidy -compat=1.18 && \

command.go

@@ -5454,9 +5454,12 @@ func (cmd *MonitorCmd) readMonitor(rd *proto.Reader, cancel context.CancelFunc)
 	for {
 		cmd.mu.Lock()
 		st := cmd.status
+		pk, _ := rd.Peek(1)
 		cmd.mu.Unlock()
-		if pk, _ := rd.Peek(1); len(pk) != 0 && st == monitorStatusStart {
+		if len(pk) != 0 && st == monitorStatusStart {
+			cmd.mu.Lock()
 			line, err := rd.ReadString()
+			cmd.mu.Unlock()
 			if err != nil {
 				return err
 			}

example/otel/go.mod

@@ -25,8 +25,6 @@ require (
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
 	github.com/redis/go-redis/extra/rediscmd/v9 v9.5.1 // indirect
 	go.opentelemetry.io/contrib/instrumentation/runtime v0.46.1 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.17.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.43.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.44.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 // indirect
@@ -43,5 +41,5 @@ require (
 	google.golang.org/genproto/googleapis/api v0.0.0-20240108191215-35c7eff3a6b1 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1 // indirect
 	google.golang.org/grpc v1.60.1 // indirect
-	google.golang.org/protobuf v1.32.0 // indirect
+	google.golang.org/protobuf v1.33.0 // indirect
 )

example/otel/go.sum

@@ -19,5 +19,5 @@ require (
 	github.com/prometheus/common v0.39.0 // indirect
 	github.com/prometheus/procfs v0.9.0 // indirect
 	golang.org/x/sys v0.4.0 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
+	google.golang.org/protobuf v1.33.0 // indirect
 )

extra/redisprometheus/go.mod

@@ -2,8 +2,11 @@ package redis_test
 
 import (
 	"context"
+	"strings"
 	"time"
 
+	"testing"
+
 	. "github.com/bsm/ginkgo/v2"
 	. "github.com/bsm/gomega"
 
@@ -46,3 +49,52 @@ var _ = Describe("Monitor command", Label("monitor"), func() {
 		Expect(lst[3]).To(ContainSubstring(`"set" "bap" "8"`))
 	})
 })
+
+func TestMonitorCommand(t *testing.T) {
+	ctx := context.TODO()
+	client := redis.NewClient(&redis.Options{Addr: ":6379"})
+	if err := client.FlushDB(ctx).Err(); err != nil {
+		t.Fatalf("FlushDB failed: %v", err)
+	}
+
+	defer func() {
+		if err := client.Close(); err != nil {
+			t.Fatalf("Close failed: %v", err)
+		}
+	}()
+
+	ress := make(chan string, 10)                             // Buffer to prevent blocking
+	client1 := redis.NewClient(&redis.Options{Addr: ":6379"}) // Adjust the Addr field as necessary
+	mn := client1.Monitor(ctx, ress)
+	mn.Start()
+	// Wait for the Redis server to be in monitoring mode.
+	time.Sleep(100 * time.Millisecond)
+	client.Set(ctx, "foo", "bar", 0)
+	client.Set(ctx, "bar", "baz", 0)
+	client.Set(ctx, "bap", 8, 0)
+	client.Get(ctx, "bap")
+	mn.Stop()
+	var lst []string
+	for i := 0; i < 5; i++ {
+		s := <-ress
+		lst = append(lst, s)
+	}
+
+	// Assertions
+	if !containsSubstring(lst[0], "OK") {
+		t.Errorf("Expected lst[0] to contain 'OK', got %s", lst[0])
+	}
+	if !containsSubstring(lst[1], `"set" "foo" "bar"`) {
+		t.Errorf(`Expected lst[1] to contain '"set" "foo" "bar"', got %s`, lst[1])
+	}
+	if !containsSubstring(lst[2], `"set" "bar" "baz"`) {
+		t.Errorf(`Expected lst[2] to contain '"set" "bar" "baz"', got %s`, lst[2])
+	}
+	if !containsSubstring(lst[3], `"set" "bap" "8"`) {
+		t.Errorf(`Expected lst[3] to contain '"set" "bap" "8"', got %s`, lst[3])
+	}
+}
+
+func containsSubstring(s, substr string) bool {
+	return strings.Contains(s, substr)
+}