update atomic operation

go.mod

@@ -5,9 +5,9 @@ go 1.22
 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.7.0
-	github.com/redis/go-redis/v9 v9.6.2
+	github.com/redis/go-redis/v9 v9.7.0
-	go.unistack.org/micro/v3 v3.10.97
+	go.unistack.org/micro/v3 v3.10.105
 )
 
 require (
@@ -15,5 +15,5 @@ require (
 	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
+	google.golang.org/protobuf v1.35.2 // indirect
 )

go.sum

@@ -8,13 +8,13 @@ github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/r
 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/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/redis/go-redis/extra/rediscmd/v9 v9.6.2 h1:oBlErygFka9FAVfowzW7sRUfB7n31YX0aFzfaOflM3w=
+github.com/redis/go-redis/extra/rediscmd/v9 v9.7.0 h1:BIx9TNZH/Jsr4l1i7VVxnV0JPiwYj8qyrHyuL0fGZrk=
-github.com/redis/go-redis/extra/rediscmd/v9 v9.6.2/go.mod h1:jYLUE5tC8UsFnpSclhEjZlFLMMtHH4jTfFMnshNWkoo=
+github.com/redis/go-redis/extra/rediscmd/v9 v9.7.0/go.mod h1:eTg/YQtGYAZD5r3DlGlJptJ45AHA+/G+2NPn30PKzik=
-github.com/redis/go-redis/v9 v9.6.2 h1:w0uvkRbc9KpgD98zcvo5IrVUsn0lXpRMuhNgiHDJzdk=
+github.com/redis/go-redis/v9 v9.7.0 h1:HhLSs+B6O021gwzl+locl0zEDnyNkxMtf/Z3NNBMa9E=
-github.com/redis/go-redis/v9 v9.6.2/go.mod h1:0C0c6ycQsdpVNQpxb1njEQIqkx5UcsM8FJCQLgE9+RA=
+github.com/redis/go-redis/v9 v9.7.0/go.mod h1:f6zhXITC7JUJIlPEiBOTXxJgPLdZcA93GewI7inzyWw=
 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.105 h1:JYNV0d+fnR7Hy8d4/sjr+25DbSNqq1Z7IPeDDdB+f1I=
-go.unistack.org/micro/v3 v3.10.97/go.mod h1:YzMldzHN9Ei+zy5t/Psu7RUWDZwUfrNYiStSQtTz90g=
+go.unistack.org/micro/v3 v3.10.105/go.mod h1:YzMldzHN9Ei+zy5t/Psu7RUWDZwUfrNYiStSQtTz90g=
-google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
+google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
-google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=

redis.go

@@ -2,9 +2,9 @@ package redis
 
 import (
 	"context"
-	"errors"
 	"reflect"
 	"strings"
+	"sync/atomic"
 	"time"
 
 	goredis "github.com/redis/go-redis/v9"
@@ -55,19 +55,22 @@ var (
 )
 
 type Store struct {
-	opts store.Options
+	opts        store.Options
-	cli  goredis.UniversalClient
+	cli         goredis.UniversalClient
-	done chan struct{}
+	done        chan struct{}
-	pool *pool.StringsPool
+	pool        *pool.StringsPool
+	isConnected atomic.Int32
 }
 
 func (r *Store) Connect(ctx context.Context) error {
 	if r.cli == nil {
 		return store.ErrNotConnected
 	}
-	err := r.cli.Ping(ctx).Err()
+	if r.opts.LazyConnect {
-	setSpanError(ctx, err)
+		return nil
-	return err
+	}
+	return r.connect(ctx)
+
 }
 
 func (r *Store) Init(opts ...store.Option) error {
@@ -108,7 +111,9 @@ func (r *Store) Disconnect(ctx context.Context) error {
 		return err
 	default:
 		if r.cli != nil {
-			err = r.cli.Close()
+			if err = r.cli.Close(); err != nil {
+				r.isConnected.Store(0)
+			}
 		}
 		close(r.done)
 		return err
@@ -116,11 +121,13 @@ func (r *Store) Disconnect(ctx context.Context) error {
 }
 
 func (r *Store) Exists(ctx context.Context, key string, opts ...store.ExistsOption) error {
+	if err := r.connect(ctx); err != nil {
+		return err
+	}
+
 	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 {
@@ -135,22 +142,21 @@ func (r *Store) Exists(ctx context.Context, key string, opts ...store.ExistsOpti
 
 	rkey := r.getKey(b, r.opts.Namespace, options.Namespace, key)
 
-	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()
 	setSpanError(ctx, err)
 	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 == goredis.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()
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "failure").Inc()
 		return err
 	}
 
@@ -158,12 +164,14 @@ 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 {
+	if err := r.connect(ctx); err != nil {
+		return err
+	}
+
 	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 {
@@ -178,21 +186,21 @@ func (r *Store) Read(ctx context.Context, key string, val interface{}, opts ...s
 
 	rkey := r.getKey(b, r.opts.Namespace, options.Namespace, key)
 
-	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()
 	setSpanError(ctx, err)
 	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 == goredis.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()
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "failure").Inc()
 		return err
 	}
 
@@ -211,6 +219,10 @@ func (r *Store) Read(ctx context.Context, key string, val interface{}, opts ...s
 }
 
 func (r *Store) MRead(ctx context.Context, keys []string, vals interface{}, opts ...store.ReadOption) error {
+	if err := r.connect(ctx); err != nil {
+		return err
+	}
+
 	options := store.NewReadOptions(opts...)
 
 	timeout := r.opts.Timeout
@@ -310,6 +322,10 @@ func (r *Store) MRead(ctx context.Context, keys []string, vals interface{}, opts
 }
 
 func (r *Store) MDelete(ctx context.Context, keys []string, opts ...store.DeleteOption) error {
+	if err := r.connect(ctx); err != nil {
+		return err
+	}
+
 	options := store.NewDeleteOptions(opts...)
 
 	timeout := r.opts.Timeout
@@ -365,12 +381,14 @@ 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 {
+	if err := r.connect(ctx); err != nil {
+		return err
+	}
+
 	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 +401,21 @@ func (r *Store) Delete(ctx context.Context, key string, opts ...store.DeleteOpti
 		defer cancel()
 	}
 
-	r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).Inc()
+	r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Inc()
 	ts := time.Now()
 	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, "name", options.Name).Dec()
-	r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).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 == goredis.Nil {
-	if errors.Is(err, goredis.Nil) {
+		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()
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "failure").Inc()
 		return err
 	}
 
@@ -406,6 +423,10 @@ func (r *Store) Delete(ctx context.Context, key string, opts ...store.DeleteOpti
 }
 
 func (r *Store) MWrite(ctx context.Context, keys []string, vals []interface{}, opts ...store.WriteOption) error {
+	if err := r.connect(ctx); err != nil {
+		return err
+	}
+
 	options := store.NewWriteOptions(opts...)
 
 	timeout := r.opts.Timeout
@@ -489,12 +510,14 @@ 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 {
+	if err := r.connect(ctx); err != nil {
+		return err
+	}
+
 	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 {
@@ -523,22 +546,22 @@ func (r *Store) Write(ctx context.Context, key string, val interface{}, opts ...
 		}
 	}
 
-	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()
 	te := time.Since(ts)
 	setSpanError(ctx, err)
 
-	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) {
+	if err == goredis.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()
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "failure").Inc()
 		return err
 	}
 
@@ -546,6 +569,10 @@ func (r *Store) Write(ctx context.Context, key string, val interface{}, opts ...
 }
 
 func (r *Store) List(ctx context.Context, opts ...store.ListOption) ([]string, error) {
+	if err := r.connect(ctx); err != nil {
+		return nil, err
+	}
+
 	b := r.pool.Get()
 	defer r.pool.Put(b)
 
@@ -742,3 +769,14 @@ func (r *Store) getKey(b *strings.Builder, mainNamespace string, opNamespace str
 	b.WriteString(key)
 	return b.String()
 }
+
+func (r *Store) connect(ctx context.Context) (err error) {
+	if r.isConnected.Load() == 0 {
+		if err = r.cli.Ping(ctx).Err(); err != nil {
+			setSpanError(ctx, err)
+			return err
+		}
+	}
+	r.isConnected.Store(1)
+	return err
+}

redis_test.go

@@ -12,26 +12,6 @@ import (
 	"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()
 

tracer.go

@@ -73,7 +73,7 @@ func (h *tracingHook) ProcessHook(hook goredis.ProcessHook) goredis.ProcessHook
 		case "cluster slots":
 			break
 		default:
-			_, span := h.tr.Start(ctx, "sdk.database", append(h.opts, tracer.WithSpanLabels("db.statement", cmdString))...)
+			_, span := h.tr.Start(ctx, "goredis.process", append(h.opts, tracer.WithSpanLabels("db.statement", cmdString))...)
 			defer func() {
 				recordError(span, err)
 				span.Finish()
@@ -91,11 +91,11 @@ func (h *tracingHook) ProcessPipelineHook(hook goredis.ProcessPipelineHook) gore
 		_, cmdsString := rediscmd.CmdsString(cmds)
 
 		opts := append(h.opts, tracer.WithSpanLabels(
-			"db.database.num_cmd", strconv.Itoa(len(cmds)),
+			"db.goredis.num_cmd", strconv.Itoa(len(cmds)),
 			"db.statement", cmdsString,
 		))
 
-		_, span := h.tr.Start(ctx, "sdk.database", opts...)
+		_, span := h.tr.Start(ctx, "goredis.process_pipeline", opts...)
 		defer span.Finish()
 
 		err := hook(ctx, cmds)