fixup set connected in hook

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2024-11-28 09:53:03 +03:00 · 2024-11-28 09:49:29 +03:00 · 2024-11-27 01:57:39 +03:00 · 2024-11-22 16:06:59 +03:00 · 2024-11-19 00:34:04 +03:00
6 changed files with 207 additions and 129 deletions
--- a/event.go
+++ b/event.go
@@ -0,0 +1,70 @@
+package redis
+
+import (
+	"context"
+	"errors"
+	"net"
+	"sync/atomic"
+
+	goredis "github.com/redis/go-redis/v9"
+)
+
+type eventHook struct {
+	connected *atomic.Bool
+}
+
+var _ goredis.Hook = (*eventHook)(nil)
+
+func newEventHook(connected *atomic.Bool) *eventHook {
+	return &eventHook{connected: connected}
+}
+
+func (h *eventHook) DialHook(hook goredis.DialHook) goredis.DialHook {
+	return func(ctx context.Context, network, addr string) (net.Conn, error) {
+		conn, err := hook(ctx, network, addr)
+		if err != nil {
+			if !isRedisError(err) {
+				h.connected.Store(false)
+			}
+			h.connected.Store(true)
+		} else {
+			h.connected.Store(true)
+		}
+		return conn, err
+	}
+}
+
+func (h *eventHook) ProcessHook(hook goredis.ProcessHook) goredis.ProcessHook {
+	return func(ctx context.Context, cmd goredis.Cmder) error {
+		err := hook(ctx, cmd)
+		if err != nil {
+			if !isRedisError(err) {
+				h.connected.Store(false)
+			}
+			h.connected.Store(true)
+		} else {
+			h.connected.Store(true)
+		}
+		return err
+	}
+}
+
+func (h *eventHook) ProcessPipelineHook(hook goredis.ProcessPipelineHook) goredis.ProcessPipelineHook {
+	return func(ctx context.Context, cmds []goredis.Cmder) error {
+		err := hook(ctx, cmds)
+		if err != nil {
+			if !isRedisError(err) {
+				h.connected.Store(false)
+			}
+			h.connected.Store(true)
+		} else {
+			h.connected.Store(true)
+		}
+		return err
+	}
+}
+
+func isRedisError(err error) bool {
+	var rerr goredis.Error
+	return errors.As(err, &rerr)
+}
--- a/go.mod
+++ b/go.mod
@@ -7,7 +7,7 @@ toolchain go1.22.4
 require (
 	github.com/redis/go-redis/extra/rediscmd/v9 v9.7.0
 	github.com/redis/go-redis/v9 v9.7.0
-	go.unistack.org/micro/v3 v3.10.105
+	go.unistack.org/micro/v3 v3.10.106
 )

 require (
--- a/go.sum
+++ b/go.sum
@@ -14,7 +14,7 @@ github.com/redis/go-redis/v9 v9.7.0 h1:HhLSs+B6O021gwzl+locl0zEDnyNkxMtf/Z3NNBMa
 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.105 h1:JYNV0d+fnR7Hy8d4/sjr+25DbSNqq1Z7IPeDDdB+f1I=
-go.unistack.org/micro/v3 v3.10.105/go.mod h1:YzMldzHN9Ei+zy5t/Psu7RUWDZwUfrNYiStSQtTz90g=
+go.unistack.org/micro/v3 v3.10.106 h1:ya4+n58l4PImtrIKrJi1GgkUuJ1gmzLYa9WKYI1JFLs=
+go.unistack.org/micro/v3 v3.10.106/go.mod h1:YzMldzHN9Ei+zy5t/Psu7RUWDZwUfrNYiStSQtTz90g=
 google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
 google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
--- a/redis.go
+++ b/redis.go
@@ -2,6 +2,7 @@ package redis

 import (
 	"context"
+	"errors"
 	"reflect"
 	"strings"
 	"sync/atomic"
@@ -55,22 +56,28 @@ var (
 )

 type Store struct {
-	opts        store.Options
-	cli         goredis.UniversalClient
-	done        chan struct{}
-	pool        *pool.StringsPool
-	isConnected atomic.Int32
+	cli       goredis.UniversalClient
+	pool      *pool.StringsPool
+	connected *atomic.Bool
+	opts      store.Options
 }

 func (r *Store) Connect(ctx context.Context) error {
+	if r.connected.Load() {
+		return nil
+	}
 	if r.cli == nil {
 		return store.ErrNotConnected
 	}
 	if r.opts.LazyConnect {
 		return nil
 	}
-	return r.connect(ctx)
-
+	if err := r.cli.Ping(ctx).Err(); err != nil {
+		setSpanError(ctx, err)
+		return err
+	}
+	r.connected.Store(true)
+	return nil
 }

 func (r *Store) Init(opts ...store.Option) error {
@@ -105,29 +112,26 @@ func (r *Store) ClusterClient() *goredis.ClusterClient {
 }

 func (r *Store) Disconnect(ctx context.Context) error {
-	var err error
-	select {
-	case <-r.done:
-		return err
-	default:
-		if r.cli != nil {
-			if err = r.cli.Close(); err != nil {
-				r.isConnected.Store(0)
-			}
-		}
-		close(r.done)
-		return err
+	if !r.connected.Load() {
+		return nil
 	}
+
+	if r.cli != nil {
+		if err := r.cli.Close(); err != nil {
+			return err
+		}
+	}
+
+	r.connected.Store(false)
+	return nil
 }

 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 {
@@ -142,21 +146,22 @@ 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, "name", options.Name).Inc()
+	r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).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, "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 || (err == nil && val == 0) {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "miss").Inc()
+	r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).Dec()
+
+	r.opts.Meter.Summary(semconv.StoreRequestLatencyMicroseconds, labels...).Update(te.Seconds())
+	r.opts.Meter.Histogram(semconv.StoreRequestDurationSeconds, labels...).Update(te.Seconds())
+	if errors.Is(err, goredis.Nil) || (err == nil && val == 0) {
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "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 {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "failure").Inc()
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "hit")...).Inc()
+	} else {
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "failure")...).Inc()
 		return err
 	}

@@ -164,14 +169,12 @@ 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 {
@@ -186,21 +189,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, "name", options.Name).Inc()
+	r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).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, "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 || (err == nil && buf == nil) {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "miss").Inc()
+	r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).Dec()
+	r.opts.Meter.Summary(semconv.StoreRequestLatencyMicroseconds, labels...).Update(te.Seconds())
+	r.opts.Meter.Histogram(semconv.StoreRequestDurationSeconds, labels...).Update(te.Seconds())
+	if errors.Is(err, goredis.Nil) || (err == nil && buf == 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, "name", options.Name, "status", "hit").Inc()
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "hit")...).Inc()
 	} else if err != nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "failure").Inc()
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "failure")...).Inc()
 		return err
 	}

@@ -219,10 +222,6 @@ 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
@@ -322,11 +321,9 @@ 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...)
+	labels := make([]string, 0, 6)
+	labels = append(labels, "name", options.Name, "statement", "delete")

 	timeout := r.opts.Timeout
 	if options.Timeout > 0 {
@@ -351,7 +348,7 @@ func (r *Store) MDelete(ctx context.Context, keys []string, opts ...store.Delete
 		}
 	}

-	r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Inc()
+	r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).Inc()
 	ts := time.Now()
 	var err error
 	if r.opts.Namespace != "" || options.Namespace != "" {
@@ -364,16 +361,16 @@ func (r *Store) MDelete(ctx context.Context, keys []string, opts ...store.Delete
 	}
 	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())
+	r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).Dec()
+	r.opts.Meter.Summary(semconv.StoreRequestLatencyMicroseconds, labels...).Update(te.Seconds())
+	r.opts.Meter.Histogram(semconv.StoreRequestDurationSeconds, labels...).Update(te.Seconds())
 	if 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, "name", options.Name, "status", "hit").Inc()
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "hit")...).Inc()
 	} else if err != nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "failure").Inc()
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "failure")...).Inc()
 		return err
 	}

@@ -381,14 +378,12 @@ 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 {
@@ -401,21 +396,22 @@ func (r *Store) Delete(ctx context.Context, key string, opts ...store.DeleteOpti
 		defer cancel()
 	}

-	r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Inc()
+	r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).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.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 {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "miss").Inc()
+
+	r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).Dec()
+	r.opts.Meter.Summary(semconv.StoreRequestLatencyMicroseconds, labels...).Update(te.Seconds())
+	r.opts.Meter.Histogram(semconv.StoreRequestDurationSeconds, labels...).Update(te.Seconds())
+	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, "name", options.Name, "status", "hit").Inc()
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "hit")...).Inc()
 	} else if err != nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "failure").Inc()
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "failure")...).Inc()
 		return err
 	}

@@ -423,11 +419,9 @@ 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...)
+	labels := make([]string, 0, 6)
+	labels = append(labels, "name", options.Name, "statement", "write")

 	timeout := r.opts.Timeout
 	if options.Timeout > 0 {
@@ -461,7 +455,7 @@ func (r *Store) MWrite(ctx context.Context, keys []string, vals []interface{}, o
 		}
 	}

-	r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Inc()
+	r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).Inc()

 	pipeliner := func(pipe goredis.Pipeliner) error {
 		for idx := 0; idx < len(kvs); idx += 2 {
@@ -481,27 +475,27 @@ func (r *Store) MWrite(ctx context.Context, keys []string, vals []interface{}, o
 	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())
+	r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).Dec()
+	r.opts.Meter.Summary(semconv.StoreRequestLatencyMicroseconds, labels...).Update(te.Seconds())
+	r.opts.Meter.Histogram(semconv.StoreRequestDurationSeconds, labels...).Update(te.Seconds())
 	if 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, "name", options.Name, "status", "hit").Inc()
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "hit")...).Inc()
 	} else if err != nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "failure").Inc()
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "failure")...).Inc()
 		return err
 	}

 	for _, cmd := range cmds {
 		if err = cmd.Err(); err != nil {
 			if 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
 			}
 			setSpanError(ctx, err)
-			r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "failure").Inc()
+			r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "failure")...).Inc()
 			return err
 		}
 	}
@@ -510,14 +504,12 @@ 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 {
@@ -546,22 +538,22 @@ func (r *Store) Write(ctx context.Context, key string, val interface{}, opts ...
 		}
 	}

-	r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Inc()
+	r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).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, "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 {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "miss").Inc()
+	r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).Dec()
+	r.opts.Meter.Summary(semconv.StoreRequestLatencyMicroseconds, labels...).Update(te.Seconds())
+	r.opts.Meter.Histogram(semconv.StoreRequestDurationSeconds, labels...).Update(te.Seconds())
+	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, "name", options.Name, "status", "hit").Inc()
-	} else if err != nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "failure").Inc()
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "hit")...).Inc()
+	} else {
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "failure")...).Inc()
 		return err
 	}

@@ -569,14 +561,13 @@ 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)

 	options := store.NewListOptions(opts...)
+	labels := make([]string, 0, 6)
+	labels = append(labels, "name", options.Name, "statement", "list")
+
 	if len(options.Namespace) == 0 {
 		options.Namespace = r.opts.Namespace
 	}
@@ -598,7 +589,7 @@ func (r *Store) List(ctx context.Context, opts ...store.ListOption) ([]string, e
 	}

 	// TODO: add support for prefix/suffix/limit
-	r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Inc()
+	r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).Inc()
 	ts := time.Now()
 	var keys []string
 	var err error
@@ -618,16 +609,16 @@ func (r *Store) List(ctx context.Context, opts ...store.ListOption) ([]string, e
 	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())
+	r.opts.Meter.Counter(semconv.StoreRequestInflight, labels...).Dec()
+	r.opts.Meter.Summary(semconv.StoreRequestLatencyMicroseconds, labels...).Update(te.Seconds())
+	r.opts.Meter.Histogram(semconv.StoreRequestDurationSeconds, labels...).Update(te.Seconds())
 	if 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 nil, store.ErrNotFound
 	} else if err == nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "hit").Inc()
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "git")...).Inc()
 	} else if err != nil {
-		r.opts.Meter.Counter(semconv.StoreRequestTotal, "name", options.Name, "status", "failure").Inc()
+		r.opts.Meter.Counter(semconv.StoreRequestTotal, append(labels, "status", "failure")...).Inc()
 		return nil, err
 	}

@@ -659,7 +650,11 @@ func (r *Store) String() string {
 }

 func NewStore(opts ...store.Option) *Store {
-	return &Store{done: make(chan struct{}), opts: store.NewOptions(opts...)}
+	b := atomic.Bool{}
+	return &Store{
+		opts:      store.NewOptions(opts...),
+		connected: &b,
+	}
 }

 func (r *Store) configure() error {
@@ -750,6 +745,7 @@ func (r *Store) configure() error {

 	r.cli = goredis.NewUniversalClient(universalOptions)
 	setTracing(r.cli, r.opts.Tracer)
+	r.cli.AddHook(newEventHook(r.connected))

 	r.pool = pool.NewStringsPool(50)

@@ -769,14 +765,3 @@ func (r *Store) getKey(b *strings.Builder, mainNamespace string, opNamespace str
 	b.WriteString(key)
 	return b.String()
 }
-
-func (r *Store) connect(ctx context.Context) 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 nil
-}
--- a/redis_test.go
+++ b/redis_test.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"os"
+	"sync/atomic"
 	"testing"
 	"time"

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

@@ -20,7 +41,7 @@ func TestKeepTTL(t *testing.T) {
 	}
 	r := NewStore(store.Addrs(os.Getenv("STORE_NODES")))

-	if err := r.Init(); err != nil {
+	if err := r.Init(store.LazyConnect(true)); err != nil {
 		t.Fatal(err)
 	}
 	if err := r.Connect(ctx); err != nil {
@@ -99,9 +120,11 @@ func Test_rkv_configure(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+			b := atomic.Bool{}
 			rc := &Store{
-				opts: tt.fields.options,
-				cli:  tt.fields.Client,
+				opts:      tt.fields.options,
+				cli:       tt.fields.Client,
+				connected: &b,
 			}
 			err := rc.configure()
 			if (err != nil) != tt.wantErr {
--- a/tracer.go
+++ b/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, "goredis.process", append(h.opts, tracer.WithSpanLabels("db.statement", cmdString))...)
+			_, span := h.tr.Start(ctx, "sdk.database", 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.goredis.num_cmd", strconv.Itoa(len(cmds)),
+			"db.database.num_cmd", strconv.Itoa(len(cmds)),
 			"db.statement", cmdsString,
 		))

-		_, span := h.tr.Start(ctx, "goredis.process_pipeline", opts...)
+		_, span := h.tr.Start(ctx, "sdk.database", opts...)
 		defer span.Finish()

 		err := hook(ctx, cmds)
Author	SHA1	Message	Date
Vasiliy Tolstov	cbf00a0981	fixup set connected in hook Some checks failed codeql / analyze (go) (push) Failing after 48s Details build / test (push) Failing after 4m57s Details build / lint (push) Successful in 9m38s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2024-11-28 09:53:03 +03:00
Vasiliy Tolstov	7fc5a26347	fixup set connected in hook Some checks failed codeql / analyze (go) (push) Failing after 46s Details build / test (push) Has been cancelled Details build / lint (push) Has been cancelled Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2024-11-28 09:49:29 +03:00
Evstigneev Denis	24f9f41de4	add using lazy connect (#122 ) Some checks failed codeql / analyze (go) (push) Failing after 1m2s Details build / test (push) Failing after 5m0s Details build / lint (push) Successful in 9m35s Details Co-authored-by: Vasiliy Tolstov <v.tolstov@unistack.org> Reviewed-on: #122 Co-authored-by: Evstigneev Denis <danteevstigneev@yandex.ru> Co-committed-by: Evstigneev Denis <danteevstigneev@yandex.ru>	2024-11-27 01:57:39 +03:00
Vasiliy Tolstov	77fe9cbef6	fixup trace span names Some checks failed build / test (push) Failing after 1s Details build / lint (push) Failing after 0s Details codeql / analyze (go) (push) Failing after 0s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2024-11-22 16:06:59 +03:00
Evstigneev Denis	c59902201d	add_labels (#120 ) Some checks failed codeql / analyze (go) (push) Failing after 56s Details build / test (push) Failing after 4m59s Details build / lint (push) Successful in 9m34s Details closes #119 Reviewed-on: #120 Co-authored-by: Evstigneev Denis <danteevstigneev@yandex.ru> Co-committed-by: Evstigneev Denis <danteevstigneev@yandex.ru>	2024-11-19 00:34:04 +03:00