.gitignore

@@ -1 +0,0 @@
-.idea

go.mod

@@ -1,19 +1,16 @@
 module go.unistack.org/micro-store-redis/v3
 
-go 1.22
+go 1.21
 
 toolchain go1.22.4
 
 require (
-	github.com/redis/go-redis/extra/rediscmd/v9 v9.6.2
+	github.com/redis/go-redis/extra/rediscmd/v9 v9.5.3
-	github.com/redis/go-redis/v9 v9.6.2
+	github.com/redis/go-redis/v9 v9.5.3
-	go.unistack.org/micro/v3 v3.10.97
+	go.unistack.org/micro/v3 v3.10.80
 )
 
 require (
-	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
-	github.com/google/go-cmp v0.6.0 // indirect
-	go.unistack.org/micro-proto/v3 v3.4.1 // indirect
-	google.golang.org/protobuf v1.35.1 // indirect
 )

go.sum

@@ -2,19 +2,13 @@ github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
 github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
 github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
 github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
-github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
+github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
-github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/redis/go-redis/extra/rediscmd/v9 v9.5.3 h1:1/BDligzCa40GTllkDnY3Y5DTHuKCONbB2JcRyIfl20=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/redis/go-redis/extra/rediscmd/v9 v9.5.3/go.mod h1:3dZmcLn3Qw6FLlWASn1g4y+YO9ycEFUOM+bhBmzLVKQ=
-github.com/redis/go-redis/extra/rediscmd/v9 v9.6.2 h1:oBlErygFka9FAVfowzW7sRUfB7n31YX0aFzfaOflM3w=
+github.com/redis/go-redis/v9 v9.5.3 h1:fOAp1/uJG+ZtcITgZOfYFmTKPE7n4Vclj1wZFgRciUU=
-github.com/redis/go-redis/extra/rediscmd/v9 v9.6.2/go.mod h1:jYLUE5tC8UsFnpSclhEjZlFLMMtHH4jTfFMnshNWkoo=
+github.com/redis/go-redis/v9 v9.5.3/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M=
-github.com/redis/go-redis/v9 v9.6.2 h1:w0uvkRbc9KpgD98zcvo5IrVUsn0lXpRMuhNgiHDJzdk=
+go.unistack.org/micro/v3 v3.10.80 h1:A0zWNoM9MOcMg9gdFFgVkgbT3uSYVIINhuvumX9nP2o=
-github.com/redis/go-redis/v9 v9.6.2/go.mod h1:0C0c6ycQsdpVNQpxb1njEQIqkx5UcsM8FJCQLgE9+RA=
+go.unistack.org/micro/v3 v3.10.80/go.mod h1:erMgt3Bl7vQQ0e9UpQyR5NlLiZ9pKeEJ9+1tfYFaqUg=
-go.unistack.org/micro-proto/v3 v3.4.1 h1:UTjLSRz2YZuaHk9iSlVqqsA50JQNAEK2ZFboGqtEa9Q=
-go.unistack.org/micro-proto/v3 v3.4.1/go.mod h1:okx/cnOhzuCX0ggl/vToatbCupi0O44diiiLLsZ93Zo=
-go.unistack.org/micro/v3 v3.10.97 h1:8l7fv+i06/PjPrBBhRC/ZQkWGIOuHPg3jJN0vktYE78=
-go.unistack.org/micro/v3 v3.10.97/go.mod h1:YzMldzHN9Ei+zy5t/Psu7RUWDZwUfrNYiStSQtTz90g=
-google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
-google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=

options.go

@@ -1,7 +1,9 @@
 package redis
 
 import (
-	goredis "github.com/redis/go-redis/v9"
+	"time"
+
+	"github.com/redis/go-redis/v9"
 	"go.unistack.org/micro/v3/logger"
 	"go.unistack.org/micro/v3/meter"
 	"go.unistack.org/micro/v3/store"
@@ -10,25 +12,21 @@ import (
 
 type configKey struct{}
 
-func Config(c *goredis.Options) store.Option {
+func Config(c *redis.Options) store.Option {
 	return store.SetOption(configKey{}, c)
 }
 
 type clusterConfigKey struct{}
 
-func ClusterConfig(c *goredis.ClusterOptions) store.Option {
+func ClusterConfig(c *redis.ClusterOptions) store.Option {
 	return store.SetOption(clusterConfigKey{}, c)
 }
 
-type universalConfigKey struct{}
-
-func UniversalConfig(c *goredis.UniversalOptions) store.Option {
-	return store.SetOption(universalConfigKey{}, c)
-}
-
 var (
-	labelHost = "redis_host"
+	// DefaultMeterStatsInterval holds default stats interval
-	labelName = "redis_name"
+	DefaultMeterStatsInterval = 5 * time.Second
+	// DefaultMeterMetricPrefix holds default metric prefix
+	DefaultMeterMetricPrefix = "micro_store_"
 )
 
 // Options struct holds wrapper options
@@ -36,8 +34,8 @@ type Options struct {
 	Logger             logger.Logger
 	Meter              meter.Meter
 	Tracer             tracer.Tracer
-	RedisHost string
+	MeterMetricPrefix  string
-	RedisName string
+	MeterStatsInterval time.Duration
 }
 
 // Option func signature
@@ -49,6 +47,8 @@ func NewOptions(opts ...Option) Options {
 		Logger:             logger.DefaultLogger,
 		Meter:              meter.DefaultMeter,
 		Tracer:             tracer.DefaultTracer,
+		MeterStatsInterval: DefaultMeterStatsInterval,
+		MeterMetricPrefix:  DefaultMeterMetricPrefix,
 	}
 
 	for _, o := range opts {
@@ -56,12 +56,24 @@ func NewOptions(opts ...Option) Options {
 	}
 
 	options.Meter = options.Meter.Clone(
-		meter.Labels(
+		meter.MetricPrefix(options.MeterMetricPrefix),
-			labelHost, options.RedisHost,
-			labelName, options.RedisName),
 	)
 
-	options.Logger = options.Logger.Clone(logger.WithAddCallerSkipCount(1))
+	options.Logger = options.Logger.Clone(logger.WithCallerSkipCount(1))
 
 	return options
 }
+
+// MetricInterval specifies stats interval for *sql.DB
+func MetricInterval(td time.Duration) Option {
+	return func(o *Options) {
+		o.MeterStatsInterval = td
+	}
+}
+
+// MetricPrefix specifies prefix for each metric
+func MetricPrefix(pref string) Option {
+	return func(o *Options) {
+		o.MeterMetricPrefix = pref
+	}
+}

redis.go

@@ -2,21 +2,22 @@ package redis
 
 import (
 	"context"
-	"errors"
+	"fmt"
 	"reflect"
 	"strings"
 	"time"
 
-	goredis "github.com/redis/go-redis/v9"
+	redis "github.com/redis/go-redis/v9"
 	"go.unistack.org/micro/v3/semconv"
 	"go.unistack.org/micro/v3/store"
+	"go.unistack.org/micro/v3/tracer"
 	pool "go.unistack.org/micro/v3/util/xpool"
 )
 
 var (
 	DefaultPathSeparator = "/"
 
-	DefaultUniversalOptions = &goredis.UniversalOptions{
+	DefaultClusterOptions = &redis.ClusterOptions{
 		Username:        "",
 		Password:        "", // no password set
 		MaxRetries:      2,
@@ -28,19 +29,7 @@ var (
 		MinIdleConns:    10,
 	}
 
-	DefaultClusterOptions = &goredis.ClusterOptions{
+	DefaultOptions = &redis.Options{
-		Username:        "",
-		Password:        "", // no password set
-		MaxRetries:      2,
-		MaxRetryBackoff: 256 * time.Millisecond,
-		DialTimeout:     1 * time.Second,
-		ReadTimeout:     1 * time.Second,
-		WriteTimeout:    1 * time.Second,
-		PoolTimeout:     1 * time.Second,
-		MinIdleConns:    10,
-	}
-
-	DefaultOptions = &goredis.Options{
 		Username:        "",
 		Password:        "", // no password set
 		DB:              0,  // use default DB
@@ -56,18 +45,21 @@ var (
 
 type Store struct {
 	opts store.Options
-	cli  goredis.UniversalClient
+	cli  *wrappedClient
 	done chan struct{}
-	pool *pool.StringsPool
+	pool pool.Pool[*strings.Builder]
+}
+
+type wrappedClient struct {
+	*redis.Client
+	*redis.ClusterClient
 }
 
 func (r *Store) Connect(ctx context.Context) error {
-	if r.cli == nil {
+	if r.cli.Client != nil {
-		return store.ErrNotConnected
+		return r.cli.Client.Ping(ctx).Err()
 	}
-	err := r.cli.Ping(ctx).Err()
+	return r.cli.ClusterClient.Ping(ctx).Err()
-	setSpanError(ctx, err)
-	return err
 }
 
 func (r *Store) Init(opts ...store.Option) error {
@@ -83,20 +75,16 @@ func (r *Store) Init(opts ...store.Option) error {
 	return nil
 }
 
-func (r *Store) Client() *goredis.Client {
+func (r *Store) Client() *redis.Client {
-	if c, ok := r.cli.(*goredis.Client); ok {
+	if r.cli.Client != nil {
-		return c
+		return r.cli.Client
 	}
 	return nil
 }
 
-func (r *Store) UniversalClient() goredis.UniversalClient {
+func (r *Store) ClusterClient() *redis.ClusterClient {
-	return r.cli
+	if r.cli.ClusterClient != nil {
-}
+		return r.cli.ClusterClient
-
-func (r *Store) ClusterClient() *goredis.ClusterClient {
-	if c, ok := r.cli.(*goredis.ClusterClient); ok {
-		return c
 	}
 	return nil
 }
@@ -107,20 +95,20 @@ func (r *Store) Disconnect(ctx context.Context) error {
 	case <-r.done:
 		return err
 	default:
-		if r.cli != nil {
+		if r.cli.Client != nil {
-			err = r.cli.Close()
+			err = r.cli.Client.Close()
+		} else if r.cli.ClusterClient != nil {
+			err = r.cli.ClusterClient.Close()
 		}
 		close(r.done)
 		return err
 	}
+
+	return err
 }
 
 func (r *Store) Exists(ctx context.Context, key string, opts ...store.ExistsOption) error {
-	b := r.pool.Get()
-	defer r.pool.Put(b)
 	options := store.NewExistsOptions(opts...)
-	labels := make([]string, 0, 6)
-	labels = append(labels, "name", options.Name, "statement", "exists")
 
 	timeout := r.opts.Timeout
 	if options.Timeout > 0 {
@@ -133,24 +121,31 @@ func (r *Store) Exists(ctx context.Context, key string, opts ...store.ExistsOpti
 		defer cancel()
 	}
 
-	rkey := r.getKey(b, r.opts.Namespace, options.Namespace, key)
+	rkey := r.getKey(r.opts.Namespace, options.Namespace, key)
+	ctx, sp := r.opts.Tracer.Start(ctx, "cache exists "+rkey)
+	defer sp.Finish()
 
-	r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).Inc()
+	r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Inc()
 	ts := time.Now()
-	val, err := r.cli.Exists(ctx, rkey).Result()
+	var err error
-	setSpanError(ctx, err)
+	var val int64
+	if r.cli.Client != nil {
+		val, err = r.cli.Client.Exists(ctx, rkey).Result()
+	} else {
+		val, err = r.cli.ClusterClient.Exists(ctx, rkey).Result()
+	}
 	te := time.Since(ts)
-	r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).Dec()
+	r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Dec()
-
+	r.opts.Meter.Summary(semconv.StoreRequestLatencyMicroseconds, "name", options.Name).Update(te.Seconds())
-	r.opts.Meter.Summary(semconv.StoreRequestLatencyMicroseconds, labels...).Update(te.Seconds())
+	r.opts.Meter.Histogram(semconv.StoreRequestDurationSeconds, "name", options.Name).Update(te.Seconds())
-	r.opts.Meter.Histogram(semconv.StoreRequestDurationSeconds, labels...).Update(te.Seconds())
+	if err == redis.Nil || (err == nil && val == 0) {
-	if errors.Is(err, goredis.Nil) || (err == nil && val == 0) {
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "miss").Inc()
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "miss")...).Inc()
 		return store.ErrNotFound
 	} else if err == nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "hit")...).Inc()
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "hit").Inc()
 	} else if err != nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "failure")...).Inc()
+		sp.SetStatus(tracer.SpanStatusError, err.Error())
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "failure").Inc()
 		return err
 	}
 
@@ -158,12 +153,7 @@ func (r *Store) Exists(ctx context.Context, key string, opts ...store.ExistsOpti
 }
 
 func (r *Store) Read(ctx context.Context, key string, val interface{}, opts ...store.ReadOption) error {
-	b := r.pool.Get()
-	defer r.pool.Put(b)
-
 	options := store.NewReadOptions(opts...)
-	labels := make([]string, 0, 6)
-	labels = append(labels, "name", options.Name, "statement", "read")
 
 	timeout := r.opts.Timeout
 	if options.Timeout > 0 {
@@ -176,23 +166,31 @@ func (r *Store) Read(ctx context.Context, key string, val interface{}, opts ...s
 		defer cancel()
 	}
 
-	rkey := r.getKey(b, r.opts.Namespace, options.Namespace, key)
+	rkey := r.getKey(r.opts.Namespace, options.Namespace, key)
+	ctx, sp := r.opts.Tracer.Start(ctx, "cache read "+rkey)
+	defer sp.Finish()
 
-	r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).Inc()
+	r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Inc()
 	ts := time.Now()
-	buf, err := r.cli.Get(ctx, rkey).Bytes()
+	var buf []byte
-	setSpanError(ctx, err)
+	var err error
+	if r.cli.Client != nil {
+		buf, err = r.cli.Client.Get(ctx, rkey).Bytes()
+	} else {
+		buf, err = r.cli.ClusterClient.Get(ctx, rkey).Bytes()
+	}
 	te := time.Since(ts)
-	r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).Dec()
+	r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Dec()
-	r.opts.Meter.Summary(semconv.StoreRequestLatencyMicroseconds, labels...).Update(te.Seconds())
+	r.opts.Meter.Summary(semconv.StoreRequestLatencyMicroseconds, "name", options.Name).Update(te.Seconds())
-	r.opts.Meter.Histogram(semconv.StoreRequestDurationSeconds, labels...).Update(te.Seconds())
+	r.opts.Meter.Histogram(semconv.StoreRequestDurationSeconds, "name", options.Name).Update(te.Seconds())
-	if errors.Is(err, goredis.Nil) || (err == nil && buf == nil) {
+	if err == redis.Nil || (err == nil && buf == nil) {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "miss")...).Inc()
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "miss").Inc()
 		return store.ErrNotFound
 	} else if err == nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "hit")...).Inc()
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "hit").Inc()
 	} else if err != nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "failure")...).Inc()
+		sp.SetStatus(tracer.SpanStatusError, err.Error())
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "failure").Inc()
 		return err
 	}
 
@@ -203,7 +201,7 @@ func (r *Store) Read(ctx context.Context, key string, val interface{}, opts ...s
 		*b = string(buf)
 	default:
 		if err = r.opts.Codec.Unmarshal(buf, val); err != nil {
-			setSpanError(ctx, err)
+			sp.SetStatus(tracer.SpanStatusError, err.Error())
 		}
 	}
 
@@ -224,41 +222,35 @@ func (r *Store) MRead(ctx context.Context, keys []string, vals interface{}, opts
 		defer cancel()
 	}
 
-	var rkeys []string
-	var pools []*strings.Builder
 	if r.opts.Namespace != "" || options.Namespace != "" {
-		rkeys = make([]string, len(keys))
-		pools = make([]*strings.Builder, len(keys))
 		for idx, key := range keys {
-			b := r.pool.Get()
+			keys[idx] = r.getKey(r.opts.Namespace, options.Namespace, key)
-			pools[idx] = b
-			rkeys[idx] = r.getKey(b, r.opts.Namespace, options.Namespace, key)
 		}
 	}
 
+	ctx, sp := r.opts.Tracer.Start(ctx, fmt.Sprintf("cache mread %v", keys))
+	defer sp.Finish()
+
 	r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Inc()
 	ts := time.Now()
 	var rvals []interface{}
 	var err error
-	if r.opts.Namespace != "" || options.Namespace != "" {
+	if r.cli.Client != nil {
-		rvals, err = r.cli.MGet(ctx, rkeys...).Result()
+		rvals, err = r.cli.Client.MGet(ctx, keys...).Result()
-		for idx := range pools {
-			r.pool.Put(pools[idx])
-		}
 	} else {
-		rvals, err = r.cli.MGet(ctx, keys...).Result()
+		rvals, err = r.cli.ClusterClient.MGet(ctx, keys...).Result()
 	}
-	setSpanError(ctx, err)
 	te := time.Since(ts)
 	r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Dec()
 	r.opts.Meter.Summary(semconv.StoreRequestLatencyMicroseconds, "name", options.Name).Update(te.Seconds())
 	r.opts.Meter.Histogram(semconv.StoreRequestDurationSeconds, "name", options.Name).Update(te.Seconds())
-	if err == goredis.Nil || (len(rvals) == 0) {
+	if err == redis.Nil || (len(rvals) == 0) {
 		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "miss").Inc()
 		return store.ErrNotFound
 	} else if err == nil {
 		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "hit").Inc()
 	} else if err != nil {
+		sp.SetStatus(tracer.SpanStatusError, err.Error())
 		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "failure").Inc()
 		return err
 	}
@@ -300,7 +292,7 @@ func (r *Store) MRead(ctx context.Context, keys []string, vals interface{}, opts
 
 		itm.Set(reflect.New(vt.Elem()))
 		if err = r.opts.Codec.Unmarshal(buf, itm.Interface()); err != nil {
-			setSpanError(ctx, err)
+			sp.SetStatus(tracer.SpanStatusError, err.Error())
 			return err
 		}
 	}
@@ -323,40 +315,34 @@ func (r *Store) MDelete(ctx context.Context, keys []string, opts ...store.Delete
 		defer cancel()
 	}
 
-	var rkeys []string
-	var pools []*strings.Builder
 	if r.opts.Namespace != "" || options.Namespace != "" {
-		rkeys = make([]string, len(keys))
-		pools = make([]*strings.Builder, len(keys))
 		for idx, key := range keys {
-			b := r.pool.Get()
+			keys[idx] = r.getKey(r.opts.Namespace, options.Namespace, key)
-			pools[idx] = b
-			rkeys[idx] = r.getKey(b, r.opts.Namespace, options.Namespace, key)
 		}
 	}
 
+	ctx, sp := r.opts.Tracer.Start(ctx, fmt.Sprintf("cache mdelete %v", keys))
+	defer sp.Finish()
+
 	r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Inc()
 	ts := time.Now()
 	var err error
-	if r.opts.Namespace != "" || options.Namespace != "" {
+	if r.cli.Client != nil {
-		err = r.cli.Del(ctx, rkeys...).Err()
+		err = r.cli.Client.Del(ctx, keys...).Err()
-		for idx := range pools {
-			r.pool.Put(pools[idx])
-		}
 	} else {
-		err = r.cli.Del(ctx, keys...).Err()
+		err = r.cli.ClusterClient.Del(ctx, keys...).Err()
 	}
-	setSpanError(ctx, err)
 	te := time.Since(ts)
 	r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Dec()
 	r.opts.Meter.Summary(semconv.StoreRequestLatencyMicroseconds, "name", options.Name).Update(te.Seconds())
 	r.opts.Meter.Histogram(semconv.StoreRequestDurationSeconds, "name", options.Name).Update(te.Seconds())
-	if err == goredis.Nil {
+	if err == redis.Nil {
 		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "miss").Inc()
 		return store.ErrNotFound
 	} else if err == nil {
 		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "hit").Inc()
 	} else if err != nil {
+		sp.SetStatus(tracer.SpanStatusError, err.Error())
 		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "failure").Inc()
 		return err
 	}
@@ -365,12 +351,7 @@ func (r *Store) MDelete(ctx context.Context, keys []string, opts ...store.Delete
 }
 
 func (r *Store) Delete(ctx context.Context, key string, opts ...store.DeleteOption) error {
-	b := r.pool.Get()
-	defer r.pool.Put(b)
-
 	options := store.NewDeleteOptions(opts...)
-	labels := make([]string, 0, 6)
-	labels = append(labels, "name", options.Name, "statement", "delete")
 
 	timeout := r.opts.Timeout
 	if options.Timeout > 0 {
@@ -383,22 +364,29 @@ func (r *Store) Delete(ctx context.Context, key string, opts ...store.DeleteOpti
 		defer cancel()
 	}
 
-	r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).Inc()
+	ctx, sp := r.opts.Tracer.Start(ctx, fmt.Sprintf("cache delete %v", key))
-	ts := time.Now()
+	defer sp.Finish()
-	err := r.cli.Del(ctx, r.getKey(b, r.opts.Namespace, options.Namespace, key)).Err()
-	te := time.Since(ts)
-	setSpanError(ctx, err)
 
-	r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).Dec()
+	r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Inc()
-	r.opts.Meter.Summary(semconv.StoreRequestLatencyMicroseconds, labels...).Update(te.Seconds())
+	ts := time.Now()
-	r.opts.Meter.Histogram(semconv.StoreRequestDurationSeconds, labels...).Update(te.Seconds())
+	var err error
-	if errors.Is(err, goredis.Nil) {
+	if r.cli.Client != nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "miss")...).Inc()
+		err = r.cli.Client.Del(ctx, r.getKey(r.opts.Namespace, options.Namespace, key)).Err()
+	} else {
+		err = r.cli.ClusterClient.Del(ctx, r.getKey(r.opts.Namespace, options.Namespace, key)).Err()
+	}
+	te := time.Since(ts)
+	r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Dec()
+	r.opts.Meter.Summary(semconv.StoreRequestLatencyMicroseconds, "name", options.Name).Update(te.Seconds())
+	r.opts.Meter.Histogram(semconv.StoreRequestDurationSeconds, "name", options.Name).Update(te.Seconds())
+	if err == redis.Nil {
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "miss").Inc()
 		return store.ErrNotFound
 	} else if err == nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "hit")...).Inc()
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "hit").Inc()
 	} else if err != nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "failure")...).Inc()
+		sp.SetStatus(tracer.SpanStatusError, err.Error())
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "failure").Inc()
 		return err
 	}
 
@@ -419,12 +407,13 @@ func (r *Store) MWrite(ctx context.Context, keys []string, vals []interface{}, o
 		defer cancel()
 	}
 
+	ctx, sp := r.opts.Tracer.Start(ctx, fmt.Sprintf("cache mwrite %v", keys))
+	defer sp.Finish()
+
 	kvs := make([]string, 0, len(keys)*2)
-	pools := make([]*strings.Builder, len(keys))
+
 	for idx, key := range keys {
-		b := r.pool.Get()
+		kvs = append(kvs, r.getKey(r.opts.Namespace, options.Namespace, key))
-		pools[idx] = b
-		kvs = append(kvs, r.getKey(b, r.opts.Namespace, options.Namespace, key))
 
 		switch vt := vals[idx].(type) {
 		case string:
@@ -434,6 +423,7 @@ func (r *Store) MWrite(ctx context.Context, keys []string, vals []interface{}, o
 		default:
 			buf, err := r.opts.Codec.Marshal(vt)
 			if err != nil {
+				sp.SetStatus(tracer.SpanStatusError, err.Error())
 				return err
 			}
 			kvs = append(kvs, string(buf))
@@ -441,45 +431,48 @@ func (r *Store) MWrite(ctx context.Context, keys []string, vals []interface{}, o
 	}
 
 	r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Inc()
+	ts := time.Now()
 
-	pipeliner := func(pipe goredis.Pipeliner) error {
+	pipeliner := func(pipe redis.Pipeliner) error {
 		for idx := 0; idx < len(kvs); idx += 2 {
 			if _, err := pipe.Set(ctx, kvs[idx], kvs[idx+1], options.TTL).Result(); err != nil {
-				setSpanError(ctx, err)
 				return err
 			}
 		}
 		return nil
 	}
 
-	ts := time.Now()
+	var err error
-	cmds, err := r.cli.Pipelined(ctx, pipeliner)
+	var cmds []redis.Cmder
-	for idx := range pools {
-		r.pool.Put(pools[idx])
-	}
-	te := time.Since(ts)
-	setSpanError(ctx, err)
 
+	if r.cli.Client != nil {
+		cmds, err = r.cli.Client.Pipelined(ctx, pipeliner)
+	} else {
+		cmds, err = r.cli.ClusterClient.Pipelined(ctx, pipeliner)
+	}
+
+	te := time.Since(ts)
 	r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Dec()
 	r.opts.Meter.Summary(semconv.StoreRequestLatencyMicroseconds, "name", options.Name).Update(te.Seconds())
 	r.opts.Meter.Histogram(semconv.StoreRequestDurationSeconds, "name", options.Name).Update(te.Seconds())
-	if err == goredis.Nil {
+	if err == redis.Nil {
 		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "miss").Inc()
 		return store.ErrNotFound
 	} else if err == nil {
 		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "hit").Inc()
 	} else if err != nil {
+		sp.SetStatus(tracer.SpanStatusError, err.Error())
 		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "failure").Inc()
 		return err
 	}
 
 	for _, cmd := range cmds {
 		if err = cmd.Err(); err != nil {
-			if err == goredis.Nil {
+			if err == redis.Nil {
 				r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "miss").Inc()
 				return store.ErrNotFound
 			}
-			setSpanError(ctx, err)
+			sp.SetStatus(tracer.SpanStatusError, err.Error())
 			r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "failure").Inc()
 			return err
 		}
@@ -489,12 +482,7 @@ func (r *Store) MWrite(ctx context.Context, keys []string, vals []interface{}, o
 }
 
 func (r *Store) Write(ctx context.Context, key string, val interface{}, opts ...store.WriteOption) error {
-	b := r.pool.Get()
-	defer r.pool.Put(b)
-
 	options := store.NewWriteOptions(opts...)
-	labels := make([]string, 0, 6)
-	labels = append(labels, "name", options.Name, "statement", "write")
 
 	timeout := r.opts.Timeout
 	if options.Timeout > 0 {
@@ -507,7 +495,9 @@ func (r *Store) Write(ctx context.Context, key string, val interface{}, opts ...
 		defer cancel()
 	}
 
-	rkey := r.getKey(b, r.opts.Namespace, options.Namespace, key)
+	rkey := r.getKey(r.opts.Namespace, options.Namespace, key)
+	ctx, sp := r.opts.Tracer.Start(ctx, fmt.Sprintf("cache write %v", rkey))
+	defer sp.Finish()
 
 	var buf []byte
 	switch vt := val.(type) {
@@ -519,26 +509,31 @@ func (r *Store) Write(ctx context.Context, key string, val interface{}, opts ...
 		var err error
 		buf, err = r.opts.Codec.Marshal(val)
 		if err != nil {
+			sp.SetStatus(tracer.SpanStatusError, err.Error())
 			return err
 		}
 	}
 
-	r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).Inc()
+	r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Inc()
 	ts := time.Now()
-	err := r.cli.Set(ctx, rkey, buf, options.TTL).Err()
+	var err error
+	if r.cli.Client != nil {
+		err = r.cli.Client.Set(ctx, rkey, buf, options.TTL).Err()
+	} else {
+		err = r.cli.ClusterClient.Set(ctx, rkey, buf, options.TTL).Err()
+	}
 	te := time.Since(ts)
-	setSpanError(ctx, err)
+	r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Dec()
-
+	r.opts.Meter.Summary(semconv.StoreRequestLatencyMicroseconds, "name", options.Name).Update(te.Seconds())
-	r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).Dec()
+	r.opts.Meter.Histogram(semconv.StoreRequestDurationSeconds, "name", options.Name).Update(te.Seconds())
-	r.opts.Meter.Summary(semconv.StoreRequestLatencyMicroseconds, labels...).Update(te.Seconds())
+	if err == redis.Nil {
-	r.opts.Meter.Histogram(semconv.StoreRequestDurationSeconds, labels...).Update(te.Seconds())
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "miss").Inc()
-	if errors.Is(err, goredis.Nil) {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "miss")...).Inc()
 		return store.ErrNotFound
 	} else if err == nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "hit")...).Inc()
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "hit").Inc()
 	} else if err != nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "failure")...).Inc()
+		sp.SetStatus(tracer.SpanStatusError, err.Error())
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "failure").Inc()
 		return err
 	}
 
@@ -546,15 +541,12 @@ func (r *Store) Write(ctx context.Context, key string, val interface{}, opts ...
 }
 
 func (r *Store) List(ctx context.Context, opts ...store.ListOption) ([]string, error) {
-	b := r.pool.Get()
-	defer r.pool.Put(b)
-
 	options := store.NewListOptions(opts...)
 	if len(options.Namespace) == 0 {
 		options.Namespace = r.opts.Namespace
 	}
 
-	rkey := r.getKey(b, options.Namespace, "", options.Prefix+"*")
+	rkey := r.getKey(options.Namespace, "", options.Prefix+"*")
 	if options.Suffix != "" {
 		rkey += options.Suffix
 	}
@@ -570,14 +562,19 @@ func (r *Store) List(ctx context.Context, opts ...store.ListOption) ([]string, e
 		defer cancel()
 	}
 
+	ctx, sp := r.opts.Tracer.Start(ctx, fmt.Sprintf("cache list %v", rkey))
+	defer sp.Finish()
+
 	// TODO: add support for prefix/suffix/limit
 	r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Inc()
 	ts := time.Now()
 	var keys []string
 	var err error
 
-	if c, ok := r.cli.(*goredis.ClusterClient); ok {
+	if r.cli.Client != nil {
-		err = c.ForEachMaster(ctx, func(nctx context.Context, cli *goredis.Client) error {
+		keys, err = r.cli.Client.Keys(ctx, rkey).Result()
+	} else {
+		err = r.cli.ClusterClient.ForEachMaster(ctx, func(nctx context.Context, cli *redis.Client) error {
 			nkeys, nerr := cli.Keys(nctx, rkey).Result()
 			if nerr != nil {
 				return nerr
@@ -585,21 +582,18 @@ func (r *Store) List(ctx context.Context, opts ...store.ListOption) ([]string, e
 			keys = append(keys, nkeys...)
 			return nil
 		})
-	} else {
-		keys, err = r.cli.Keys(ctx, rkey).Result()
 	}
 	te := time.Since(ts)
-	setSpanError(ctx, err)
-
 	r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Dec()
 	r.opts.Meter.Summary(semconv.StoreRequestLatencyMicroseconds, "name", options.Name).Update(te.Seconds())
 	r.opts.Meter.Histogram(semconv.StoreRequestDurationSeconds, "name", options.Name).Update(te.Seconds())
-	if err == goredis.Nil {
+	if err == redis.Nil {
 		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "miss").Inc()
 		return nil, store.ErrNotFound
 	} else if err == nil {
 		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "hit").Inc()
 	} else if err != nil {
+		sp.SetStatus(tracer.SpanStatusError, err.Error())
 		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "failure").Inc()
 		return nil, err
 	}
@@ -636,102 +630,79 @@ func NewStore(opts ...store.Option) *Store {
 }
 
 func (r *Store) configure() error {
+	var redisOptions *redis.Options
+	var redisClusterOptions *redis.ClusterOptions
+	var err error
+
+	nodes := r.opts.Addrs
+
+	if len(nodes) == 0 {
+		nodes = []string{"redis://127.0.0.1:6379"}
+	}
+
 	if r.cli != nil && r.opts.Context == nil {
 		return nil
 	}
 
-	universalOptions := DefaultUniversalOptions
-
 	if r.opts.Context != nil {
-		if o, ok := r.opts.Context.Value(configKey{}).(*goredis.Options); ok {
+		if c, ok := r.opts.Context.Value(configKey{}).(*redis.Options); ok {
-			universalOptions.Addrs = []string{o.Addr}
+			redisOptions = c
-			universalOptions.Dialer = o.Dialer
-			universalOptions.OnConnect = o.OnConnect
-			universalOptions.Username = o.Username
-			universalOptions.Password = o.Password
-
-			universalOptions.MaxRetries = o.MaxRetries
-			universalOptions.MinRetryBackoff = o.MinRetryBackoff
-			universalOptions.MaxRetryBackoff = o.MaxRetryBackoff
-
-			universalOptions.DialTimeout = o.DialTimeout
-			universalOptions.ReadTimeout = o.ReadTimeout
-			universalOptions.WriteTimeout = o.WriteTimeout
-			universalOptions.ContextTimeoutEnabled = o.ContextTimeoutEnabled
-
-			universalOptions.PoolFIFO = o.PoolFIFO
-
-			universalOptions.PoolSize = o.PoolSize
-			universalOptions.PoolTimeout = o.PoolTimeout
-			universalOptions.MinIdleConns = o.MinIdleConns
-			universalOptions.MaxIdleConns = o.MaxIdleConns
-			universalOptions.ConnMaxIdleTime = o.ConnMaxIdleTime
-			universalOptions.ConnMaxLifetime = o.ConnMaxLifetime
-
 			if r.opts.TLSConfig != nil {
-				universalOptions.TLSConfig = r.opts.TLSConfig
+				redisOptions.TLSConfig = r.opts.TLSConfig
 			}
 		}
 
-		if o, ok := r.opts.Context.Value(clusterConfigKey{}).(*goredis.ClusterOptions); ok {
+		if c, ok := r.opts.Context.Value(clusterConfigKey{}).(*redis.ClusterOptions); ok {
-			universalOptions.Addrs = o.Addrs
+			redisClusterOptions = c
-			universalOptions.Dialer = o.Dialer
-			universalOptions.OnConnect = o.OnConnect
-			universalOptions.Username = o.Username
-			universalOptions.Password = o.Password
-
-			universalOptions.MaxRedirects = o.MaxRedirects
-			universalOptions.ReadOnly = o.ReadOnly
-			universalOptions.RouteByLatency = o.RouteByLatency
-			universalOptions.RouteRandomly = o.RouteRandomly
-
-			universalOptions.MaxRetries = o.MaxRetries
-			universalOptions.MinRetryBackoff = o.MinRetryBackoff
-			universalOptions.MaxRetryBackoff = o.MaxRetryBackoff
-
-			universalOptions.DialTimeout = o.DialTimeout
-			universalOptions.ReadTimeout = o.ReadTimeout
-			universalOptions.WriteTimeout = o.WriteTimeout
-			universalOptions.ContextTimeoutEnabled = o.ContextTimeoutEnabled
-
-			universalOptions.PoolFIFO = o.PoolFIFO
-
-			universalOptions.PoolSize = o.PoolSize
-			universalOptions.PoolTimeout = o.PoolTimeout
-			universalOptions.MinIdleConns = o.MinIdleConns
-			universalOptions.MaxIdleConns = o.MaxIdleConns
-			universalOptions.ConnMaxIdleTime = o.ConnMaxIdleTime
-			universalOptions.ConnMaxLifetime = o.ConnMaxLifetime
 			if r.opts.TLSConfig != nil {
-				universalOptions.TLSConfig = r.opts.TLSConfig
+				redisClusterOptions.TLSConfig = r.opts.TLSConfig
-			}
-		}
-
-		if o, ok := r.opts.Context.Value(universalConfigKey{}).(*goredis.UniversalOptions); ok {
-			universalOptions = o
-			if r.opts.TLSConfig != nil {
-				universalOptions.TLSConfig = r.opts.TLSConfig
 			}
 		}
 	}
 
-	if len(r.opts.Addrs) > 0 {
+	if redisOptions != nil && redisClusterOptions != nil {
-		universalOptions.Addrs = r.opts.Addrs
+		return fmt.Errorf("must specify only one option Config or ClusterConfig")
-	} else {
-		universalOptions.Addrs = []string{"127.0.0.1:6379"}
 	}
 
-	r.cli = goredis.NewUniversalClient(universalOptions)
+	if redisOptions == nil && redisClusterOptions == nil && r.cli != nil {
-	setTracing(r.cli, r.opts.Tracer)
+		return nil
+	}
 
-	r.pool = pool.NewStringsPool(50)
+	if redisOptions == nil && redisClusterOptions == nil && len(nodes) == 1 {
+		redisOptions, err = redis.ParseURL(nodes[0])
+		if err != nil {
+			redisOptions = DefaultOptions
+			redisOptions.Addr = r.opts.Addrs[0]
+			redisOptions.TLSConfig = r.opts.TLSConfig
+		}
+	} else if redisOptions == nil && redisClusterOptions == nil && len(nodes) > 1 {
+		redisClusterOptions = DefaultClusterOptions
+		redisClusterOptions.Addrs = r.opts.Addrs
+		redisClusterOptions.TLSConfig = r.opts.TLSConfig
+	}
+
+	if redisOptions != nil {
+		c := redis.NewClient(redisOptions)
+		setTracing(c, r.opts.Tracer)
+		r.cli = &wrappedClient{Client: c}
+	} else if redisClusterOptions != nil {
+		c := redis.NewClusterClient(redisClusterOptions)
+		setTracing(c, r.opts.Tracer)
+		r.cli = &wrappedClient{ClusterClient: c}
+	}
+
+	r.pool = pool.NewPool(func() *strings.Builder { return &strings.Builder{} })
 
 	r.statsMeter()
 
 	return nil
 }
 
-func (r *Store) getKey(b *strings.Builder, mainNamespace string, opNamespace string, key string) string {
+func (r *Store) getKey(mainNamespace string, opNamespace string, key string) string {
+	b := r.pool.Get()
+	defer r.pool.Put(b)
+	b.Reset()
+
 	if opNamespace == "" {
 		opNamespace = mainNamespace
 	}

redis_test.go

@@ -7,31 +7,10 @@ import (
 	"testing"
 	"time"
 
-	goredis "github.com/redis/go-redis/v9"
 	"go.unistack.org/micro/v3/store"
 	"go.unistack.org/micro/v3/tracer"
 )
 
-func TestLazyConnect(t *testing.T) {
-	ctx := context.Background()
-	var err error
-
-	r := NewStore()
-
-	if err = r.Init(); err != nil {
-		t.Fatal(err)
-	}
-	if err = r.Connect(ctx); err != nil {
-		t.Logf("connect failed %v", err)
-	}
-
-	for {
-		if err = r.Write(ctx, "mykey", "myval"); err != nil {
-			t.Logf("failed to write %v", err)
-		}
-	}
-}
-
 func TestKeepTTL(t *testing.T) {
 	ctx := context.Background()
 
@@ -62,7 +41,7 @@ func TestKeepTTL(t *testing.T) {
 func Test_rkv_configure(t *testing.T) {
 	type fields struct {
 		options store.Options
-		Client  goredis.UniversalClient
+		Client  *wrappedClient
 	}
 	type wantValues struct {
 		username string

stats.go

@@ -3,8 +3,7 @@ package redis
 import (
 	"time"
 
-	goredis "github.com/redis/go-redis/v9"
+	"github.com/redis/go-redis/v9"
-	"go.unistack.org/micro/v3/meter"
 )
 
 var (
@@ -14,26 +13,34 @@ var (
 	PoolConnTotalCurrent = "pool_conn_total_current"
 	PoolConnIdleCurrent  = "pool_conn_idle_current"
 	PoolConnStaleTotal   = "pool_conn_stale_total"
+
+	meterRequestTotal               = "request_total"
+	meterRequestLatencyMicroseconds = "latency_microseconds"
+	meterRequestDurationSeconds     = "request_duration_seconds"
 )
 
 type Statser interface {
-	PoolStats() *goredis.PoolStats
+	PoolStats() *redis.PoolStats
 }
 
 func (r *Store) statsMeter() {
 	var st Statser
 
-	if r.cli != nil {
+	if r.cli.Client != nil {
-		st = r.cli
+		st = r.cli.Client
+	} else if r.cli.ClusterClient != nil {
+		st = r.cli.ClusterClient
 	} else {
 		return
 	}
 
 	go func() {
-		ticker := time.NewTicker(meter.DefaultMeterStatsInterval)
+		ticker := time.NewTicker(DefaultMeterStatsInterval)
 		defer ticker.Stop()
 
-		for _ = range ticker.C {
+		for {
+			select {
+			case <-ticker.C:
 				if st == nil {
 					return
 				}
@@ -45,5 +52,6 @@ func (r *Store) statsMeter() {
 				r.opts.Meter.Counter(PoolConnIdleCurrent).Set(uint64(stats.IdleConns))
 				r.opts.Meter.Counter(PoolConnStaleTotal).Set(uint64(stats.StaleConns))
 			}
+		}
 	}()
 }

tracer.go

@@ -6,28 +6,33 @@ import (
 	"net"
 	"strconv"
 
-	rediscmd "github.com/redis/go-redis/extra/rediscmd/v9"
+	"github.com/redis/go-redis/extra/rediscmd/v9"
-	goredis "github.com/redis/go-redis/v9"
+	"github.com/redis/go-redis/v9"
 	"go.unistack.org/micro/v3/tracer"
 )
 
-func setTracing(rdb goredis.UniversalClient, tr tracer.Tracer, opts ...tracer.SpanOption) {
+func setTracing(rdb redis.UniversalClient, tr tracer.Tracer, opts ...tracer.SpanOption) {
 	switch rdb := rdb.(type) {
-	case *goredis.Client:
+	case *redis.Client:
 		opt := rdb.Options()
 		connString := formatDBConnString(opt.Network, opt.Addr)
-		rdb.AddHook(newTracingHook(connString, tr))
+		opts = addServerAttributes(opts, opt.Addr)
-	case *goredis.ClusterClient:
+		rdb.AddHook(newTracingHook(connString, tr, opts...))
-		rdb.OnNewNode(func(rdb *goredis.Client) {
+	case *redis.ClusterClient:
+		rdb.AddHook(newTracingHook("", tr, opts...))
+		rdb.OnNewNode(func(rdb *redis.Client) {
 			opt := rdb.Options()
+			opts = addServerAttributes(opts, opt.Addr)
 			connString := formatDBConnString(opt.Network, opt.Addr)
-			rdb.AddHook(newTracingHook(connString, tr))
+			rdb.AddHook(newTracingHook(connString, tr, opts...))
 		})
-	case *goredis.Ring:
+	case *redis.Ring:
-		rdb.OnNewNode(func(rdb *goredis.Client) {
+		rdb.AddHook(newTracingHook("", tr, opts...))
+		rdb.OnNewNode(func(rdb *redis.Client) {
 			opt := rdb.Options()
+			opts = addServerAttributes(opts, opt.Addr)
 			connString := formatDBConnString(opt.Network, opt.Addr)
-			rdb.AddHook(newTracingHook(connString, tr))
+			rdb.AddHook(newTracingHook(connString, tr, opts...))
 		})
 	}
 }
@@ -37,7 +42,7 @@ type tracingHook struct {
 	opts []tracer.SpanOption
 }
 
-var _ goredis.Hook = (*tracingHook)(nil)
+var _ redis.Hook = (*tracingHook)(nil)
 
 func newTracingHook(connString string, tr tracer.Tracer, opts ...tracer.SpanOption) *tracingHook {
 	opts = append(opts, tracer.WithSpanKind(tracer.SpanKindClient))
@@ -51,71 +56,59 @@ func newTracingHook(connString string, tr tracer.Tracer, opts ...tracer.SpanOpti
 	}
 }
 
-func (h *tracingHook) DialHook(hook goredis.DialHook) goredis.DialHook {
+func (h *tracingHook) DialHook(hook redis.DialHook) redis.DialHook {
 	return func(ctx context.Context, network, addr string) (net.Conn, error) {
-		/*
+		ctx, span := h.tr.Start(ctx, "redis.dial", h.opts...)
-			_, span := h.tr.Start(ctx, "goredis.dial", h.opts...)
 		defer span.Finish()
-		*/
+
 		conn, err := hook(ctx, network, addr)
-		// recordError(span, err)
+		if err != nil {
-
-		return conn, err
-	}
-}
-
-func (h *tracingHook) ProcessHook(hook goredis.ProcessHook) goredis.ProcessHook {
-	return func(ctx context.Context, cmd goredis.Cmder) error {
-		cmdString := rediscmd.CmdString(cmd)
-		var err error
-
-		switch cmdString {
-		case "cluster slots":
-			break
-		default:
-			_, span := h.tr.Start(ctx, "sdk.database", append(h.opts, tracer.WithSpanLabels("db.statement", cmdString))...)
-			defer func() {
 			recordError(span, err)
-				span.Finish()
+			return nil, err
-			}()
+		}
+		return conn, nil
+	}
 }
 
-		err = hook(ctx, cmd)
+func (h *tracingHook) ProcessHook(hook redis.ProcessHook) redis.ProcessHook {
+	return func(ctx context.Context, cmd redis.Cmder) error {
+		cmdString := rediscmd.CmdString(cmd)
 
+		ctx, span := h.tr.Start(ctx, cmd.FullName(), append(h.opts, tracer.WithSpanLabels("db.statement", cmdString))...)
+		defer span.Finish()
+
+		if err := hook(ctx, cmd); err != nil {
+			recordError(span, err)
 			return err
 		}
+		return nil
+	}
 }
 
-func (h *tracingHook) ProcessPipelineHook(hook goredis.ProcessPipelineHook) goredis.ProcessPipelineHook {
+func (h *tracingHook) ProcessPipelineHook(
-	return func(ctx context.Context, cmds []goredis.Cmder) error {
+	hook redis.ProcessPipelineHook,
-		_, cmdsString := rediscmd.CmdsString(cmds)
+) redis.ProcessPipelineHook {
+	return func(ctx context.Context, cmds []redis.Cmder) error {
+		summary, cmdsString := rediscmd.CmdsString(cmds)
 
 		opts := append(h.opts, tracer.WithSpanLabels(
-			"db.database.num_cmd", strconv.Itoa(len(cmds)),
+			"db.redis.num_cmd", strconv.Itoa(len(cmds)),
 			"db.statement", cmdsString,
 		))
 
-		_, span := h.tr.Start(ctx, "sdk.database", opts...)
+		ctx, span := h.tr.Start(ctx, "redis.pipeline "+summary, opts...)
 		defer span.Finish()
 
-		err := hook(ctx, cmds)
+		if err := hook(ctx, cmds); err != nil {
 			recordError(span, err)
-
 			return err
 		}
-}
+		return nil
-
-func setSpanError(ctx context.Context, err error) {
-	if err == nil || err == goredis.Nil {
-		return
-	}
-	if sp, ok := tracer.SpanFromContext(ctx); !ok && sp != nil {
-		sp.SetStatus(tracer.SpanStatusError, err.Error())
 	}
 }
 
 func recordError(span tracer.Span, err error) {
-	if err != nil && err != goredis.Nil {
+	if err != redis.Nil {
 		span.SetStatus(tracer.SpanStatusError, err.Error())
 	}
 }
@@ -126,3 +119,24 @@ func formatDBConnString(network, addr string) string {
 	}
 	return fmt.Sprintf("%s://%s", network, addr)
 }
+
+// Database span attributes semantic conventions recommended server address and port
+// https://opentelemetry.io/docs/specs/semconv/database/database-spans/#connection-level-attributes
+func addServerAttributes(opts []tracer.SpanOption, addr string) []tracer.SpanOption {
+	host, portString, err := net.SplitHostPort(addr)
+	if err != nil {
+		return opts
+	}
+
+	opts = append(opts, tracer.WithSpanLabels("server.address", host))
+
+	// Parse the port string to an integer
+	port, err := strconv.Atoi(portString)
+	if err != nil {
+		return opts
+	}
+
+	opts = append(opts, tracer.WithSpanLabels("server.port", port))
+
+	return opts
+}