Merge pull request 'changed MetricPrefix to Labels' (#112) from devstigneev/micro-store-redis:v3 into v3

Reviewed-on: #112
Reviewed-by: Василий Толстов <v.tolstov@unistack.org>

.gitignore

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

options.go

@@ -27,6 +27,9 @@ var (
 	DefaultMeterStatsInterval = 5 * time.Second
 	// DefaultMeterMetricPrefix holds default metric prefix
 	DefaultMeterMetricPrefix = "micro_store_"
+
+	labelHost = "redis_host"
+	labelName = "redis_name"
 )
 
 // Options struct holds wrapper options
@@ -36,6 +39,8 @@ type Options struct {
 	Tracer             tracer.Tracer
 	MeterMetricPrefix  string
 	MeterStatsInterval time.Duration
+	RedisHost          string
+	RedisName          string
 }
 
 // Option func signature
@@ -56,7 +61,9 @@ func NewOptions(opts ...Option) Options {
 	}
 
 	options.Meter = options.Meter.Clone(
-		meter.MetricPrefix(options.MeterMetricPrefix),
+		meter.Labels(
+			labelHost, options.RedisHost,
+			labelName, options.RedisName),
 	)
 
 	options.Logger = options.Logger.Clone(logger.WithCallerSkipCount(1))

tracer.go

@@ -6,7 +6,7 @@ import (
 	"net"
 	"strconv"
 
-	"github.com/redis/go-redis/extra/rediscmd/v9"
+	rediscmd "github.com/redis/go-redis/extra/rediscmd/v9"
 	"github.com/redis/go-redis/v9"
 	"go.unistack.org/micro/v3/tracer"
 )
@@ -18,14 +18,12 @@ func setTracing(rdb redis.UniversalClient, tr tracer.Tracer, opts ...tracer.Span
 		connString := formatDBConnString(opt.Network, opt.Addr)
 		rdb.AddHook(newTracingHook(connString, tr))
 	case *redis.ClusterClient:
-		rdb.AddHook(newTracingHook("", tr, opts...))
 		rdb.OnNewNode(func(rdb *redis.Client) {
 			opt := rdb.Options()
 			connString := formatDBConnString(opt.Network, opt.Addr)
 			rdb.AddHook(newTracingHook(connString, tr))
 		})
 	case *redis.Ring:
-		rdb.AddHook(newTracingHook("", tr, opts...))
 		rdb.OnNewNode(func(rdb *redis.Client) {
 			opt := rdb.Options()
 			connString := formatDBConnString(opt.Network, opt.Addr)
@@ -55,11 +53,12 @@ func newTracingHook(connString string, tr tracer.Tracer, opts ...tracer.SpanOpti
 
 func (h *tracingHook) DialHook(hook redis.DialHook) redis.DialHook {
 	return func(ctx context.Context, network, addr string) (net.Conn, error) {
-		_, span := h.tr.Start(ctx, "redis.dial", h.opts...)
-		defer span.Finish()
-
+		/*
+			_, span := h.tr.Start(ctx, "redis.dial", h.opts...)
+			defer span.Finish()
+		*/
 		conn, err := hook(ctx, network, addr)
-		recordError(span, err)
+		// recordError(span, err)
 
 		return conn, err
 	}
@@ -68,12 +67,20 @@ func (h *tracingHook) DialHook(hook redis.DialHook) redis.DialHook {
 func (h *tracingHook) ProcessHook(hook redis.ProcessHook) redis.ProcessHook {
 	return func(ctx context.Context, cmd redis.Cmder) error {
 		cmdString := rediscmd.CmdString(cmd)
+		var err error
 
-		_, span := h.tr.Start(ctx, "redis.process", append(h.opts, tracer.WithSpanLabels("db.statement", cmdString))...)
-		defer span.Finish()
+		switch cmdString {
+		case "cluster slots":
+			break
+		default:
+			_, span := h.tr.Start(ctx, "redis.process", append(h.opts, tracer.WithSpanLabels("db.statement", cmdString))...)
+			defer func() {
+				recordError(span, err)
+				span.Finish()
+			}()
+		}
 
-		err := hook(ctx, cmd)
-		recordError(span, err)
+		err = hook(ctx, cmd)
 
 		return err
 	}