From 0b6be62b7175a3bf958962bcf39936af3bc90869 Mon Sep 17 00:00:00 2001
From: ofekshenawa <104765379+ofekshenawa@users.noreply.github.com>
Date: Wed, 20 Sep 2023 10:33:09 +0300
Subject: [PATCH] Identify client on connect (#2708)

* Update CLIENT-SETINFO to support suffixes

* Update CLIENT-SETINFO

* fix acl log test

* add setinfo option to cluster

* change to DisableIndentity

* change to DisableIndentity
---
 bench_decode_test.go |  3 +++
 cluster.go           | 21 +++++++++++----------
 commands.go          |  5 ++++-
 commands_test.go     |  3 +--
 options.go           |  3 +++
 redis.go             |  9 ++++++++-
 6 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/bench_decode_test.go b/bench_decode_test.go
index de53064f..50e33908 100644
--- a/bench_decode_test.go
+++ b/bench_decode_test.go
@@ -30,6 +30,7 @@ func NewClientStub(resp []byte) *ClientStub {
 		Dialer: func(ctx context.Context, network, addr string) (net.Conn, error) {
 			return stub.stubConn(initHello), nil
 		},
+		DisableIndentity: true,
 	})
 	return stub
 }
@@ -45,6 +46,8 @@ func NewClusterClientStub(resp []byte) *ClientStub {
 		Dialer: func(ctx context.Context, network, addr string) (net.Conn, error) {
 			return stub.stubConn(initHello), nil
 		},
+		DisableIndentity: true,
+
 		ClusterSlots: func(_ context.Context) ([]ClusterSlot, error) {
 			return []ClusterSlot{
 				{
diff --git a/cluster.go b/cluster.go
index 941838dd..b30e2263 100644
--- a/cluster.go
+++ b/cluster.go
@@ -83,7 +83,8 @@ type ClusterOptions struct {
 	ConnMaxIdleTime time.Duration
 	ConnMaxLifetime time.Duration
 
-	TLSConfig *tls.Config
+	TLSConfig        *tls.Config
+	DisableIndentity bool // Disable set-lib on connect. Default is false.
 }
 
 func (opt *ClusterOptions) init() {
@@ -277,15 +278,15 @@ func (opt *ClusterOptions) clientOptions() *Options {
 		ReadTimeout:  opt.ReadTimeout,
 		WriteTimeout: opt.WriteTimeout,
 
-		PoolFIFO:        opt.PoolFIFO,
-		PoolSize:        opt.PoolSize,
-		PoolTimeout:     opt.PoolTimeout,
-		MinIdleConns:    opt.MinIdleConns,
-		MaxIdleConns:    opt.MaxIdleConns,
-		ConnMaxIdleTime: opt.ConnMaxIdleTime,
-		ConnMaxLifetime: opt.ConnMaxLifetime,
-
-		TLSConfig: opt.TLSConfig,
+		PoolFIFO:         opt.PoolFIFO,
+		PoolSize:         opt.PoolSize,
+		PoolTimeout:      opt.PoolTimeout,
+		MinIdleConns:     opt.MinIdleConns,
+		MaxIdleConns:     opt.MaxIdleConns,
+		ConnMaxIdleTime:  opt.ConnMaxIdleTime,
+		ConnMaxLifetime:  opt.ConnMaxLifetime,
+		DisableIndentity: opt.DisableIndentity,
+		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
 		// much use for ClusterSlots config).  This means we cannot execute the
diff --git a/commands.go b/commands.go
index 4a3cd9ac..2b2abfb7 100644
--- a/commands.go
+++ b/commands.go
@@ -4,9 +4,11 @@ import (
 	"context"
 	"encoding"
 	"errors"
+	"fmt"
 	"io"
 	"net"
 	"reflect"
+	"runtime"
 	"strings"
 	"time"
 
@@ -584,7 +586,8 @@ func (c statefulCmdable) ClientSetInfo(ctx context.Context, info LibraryInfo) *S
 
 	var cmd *StatusCmd
 	if info.LibName != nil {
-		cmd = NewStatusCmd(ctx, "client", "setinfo", "LIB-NAME", *info.LibName)
+		libName := fmt.Sprintf("go-redis(%s,%s)", *info.LibName, runtime.Version())
+		cmd = NewStatusCmd(ctx, "client", "setinfo", "LIB-NAME", libName)
 	} else {
 		cmd = NewStatusCmd(ctx, "client", "setinfo", "LIB-VER", *info.LibVer)
 	}
diff --git a/commands_test.go b/commands_test.go
index c8ea0f7b..b7744768 100644
--- a/commands_test.go
+++ b/commands_test.go
@@ -2052,10 +2052,9 @@ var _ = Describe("Commands", func() {
 
 			logEntries, err := client.ACLLog(ctx, 10).Result()
 			Expect(err).NotTo(HaveOccurred())
-			Expect(len(logEntries)).To(Equal(3))
+			Expect(len(logEntries)).To(Equal(4))
 
 			for _, entry := range logEntries {
-				Expect(entry.Count).To(BeNumerically("==", 1))
 				Expect(entry.Reason).To(Equal("command"))
 				Expect(entry.Context).To(Equal("toplevel"))
 				Expect(entry.Object).NotTo(BeEmpty())
diff --git a/options.go b/options.go
index bb4816b2..f10bad38 100644
--- a/options.go
+++ b/options.go
@@ -136,6 +136,9 @@ type Options struct {
 
 	// Enables read only queries on slave/follower nodes.
 	readOnly bool
+
+	// // Disable set-lib on connect. Default is false.
+	DisableIndentity bool
 }
 
 func (opt *Options) init() {
diff --git a/redis.go b/redis.go
index c7fbd0de..9430eb75 100644
--- a/redis.go
+++ b/redis.go
@@ -299,7 +299,14 @@ func (c *baseClient) initConn(ctx context.Context, cn *pool.Conn) error {
 		// difficult to rely on error strings to determine all results.
 		return err
 	}
-
+	if !c.opt.DisableIndentity {
+		libName := ""
+		libVer := Version()
+		libInfo := LibraryInfo{LibName: &libName}
+		conn.ClientSetInfo(ctx, libInfo)
+		libInfo = LibraryInfo{LibVer: &libVer}
+		conn.ClientSetInfo(ctx, libInfo)
+	}
 	_, err := conn.Pipelined(ctx, func(pipe Pipeliner) error {
 		if !auth && password != "" {
 			if username != "" {