cleanup trace spans

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>

tracer.go

@@ -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,10 +53,10 @@ 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) {
-		sctx, span := h.tr.Start(ctx, "redis.dial", h.opts...)
+		_, span := h.tr.Start(ctx, "redis.dial", h.opts...)
 		defer span.Finish()
 
-		conn, err := hook(sctx, network, addr)
+		conn, err := hook(ctx, network, addr)
 		recordError(span, err)
 
 		return conn, err
@@ -68,12 +66,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
 
-		sctx, 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(sctx, cmd)
-		recordError(span, err)
+		err = hook(ctx, cmd)
 
 		return err
 	}
@@ -88,10 +94,10 @@ func (h *tracingHook) ProcessPipelineHook(hook redis.ProcessPipelineHook) redis.
 			"db.statement", cmdsString,
 		))
 
-		sctx, span := h.tr.Start(ctx, "redis.process_pipeline", opts...)
+		_, span := h.tr.Start(ctx, "redis.process_pipeline", opts...)
 		defer span.Finish()
 
-		err := hook(sctx, cmds)
+		err := hook(ctx, cmds)
 		recordError(span, err)
 
 		return err