Add ctx as first arg

internal/pool/conn.go

@@ -6,6 +6,7 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/go-redis/redis/v7/internal"
 	"github.com/go-redis/redis/v7/internal/proto"
 )
 
@@ -58,31 +59,35 @@ func (cn *Conn) RemoteAddr() net.Addr {
 }
 
 func (cn *Conn) WithReader(ctx context.Context, timeout time.Duration, fn func(rd *proto.Reader) error) error {
-	err := cn.netConn.SetReadDeadline(cn.deadline(ctx, timeout))
-	if err != nil {
-		return err
-	}
-	return fn(cn.rd)
+	return internal.WithSpan(ctx, "with_reader", func(ctx context.Context) error {
+		err := cn.netConn.SetReadDeadline(cn.deadline(ctx, timeout))
+		if err != nil {
+			return err
+		}
+		return fn(cn.rd)
+	})
 }
 
 func (cn *Conn) WithWriter(
 	ctx context.Context, timeout time.Duration, fn func(wr *proto.Writer) error,
 ) error {
-	err := cn.netConn.SetWriteDeadline(cn.deadline(ctx, timeout))
-	if err != nil {
-		return err
-	}
+	return internal.WithSpan(ctx, "with_writer", func(ctx context.Context) error {
+		err := cn.netConn.SetWriteDeadline(cn.deadline(ctx, timeout))
+		if err != nil {
+			return err
+		}
 
-	if cn.wr.Buffered() > 0 {
-		cn.wr.Reset(cn.netConn)
-	}
+		if cn.wr.Buffered() > 0 {
+			cn.wr.Reset(cn.netConn)
+		}
 
-	err = fn(cn.wr)
-	if err != nil {
-		return err
-	}
+		err = fn(cn.wr)
+		if err != nil {
+			return err
+		}
 
-	return cn.wr.Flush()
+		return cn.wr.Flush()
+	})
 }
 
 func (cn *Conn) Close() error {

internal/util.go

@@ -2,21 +2,28 @@ package internal
 
 import (
 	"context"
+	"reflect"
 	"time"
 
 	"github.com/go-redis/redis/v7/internal/util"
+	"go.opentelemetry.io/otel/api/core"
+	"go.opentelemetry.io/otel/api/global"
+	"go.opentelemetry.io/otel/api/trace"
+	"google.golang.org/grpc/codes"
 )
 
 func Sleep(ctx context.Context, dur time.Duration) error {
-	t := time.NewTimer(dur)
-	defer t.Stop()
+	return WithSpan(ctx, "sleep", func(ctx context.Context) error {
+		t := time.NewTimer(dur)
+		defer t.Stop()
 
-	select {
-	case <-t.C:
-		return nil
-	case <-ctx.Done():
-		return ctx.Err()
-	}
+		select {
+		case <-t.C:
+			return nil
+		case <-ctx.Done():
+			return ctx.Err()
+		}
+	})
 }
 
 func ToLower(s string) string {
@@ -54,3 +61,27 @@ func Unwrap(err error) error {
 	}
 	return u.Unwrap()
 }
+
+var (
+	logTypeKey    = core.Key("log.type")
+	logMessageKey = core.Key("log.message")
+)
+
+func WithSpan(ctx context.Context, name string, fn func(context.Context) error) error {
+	if !trace.SpanFromContext(ctx).IsRecording() {
+		return fn(ctx)
+	}
+
+	ctx, span := global.TraceProvider().Tracer("go-redis").Start(ctx, name)
+	defer span.End()
+
+	if err := fn(ctx); err != nil {
+		span.SetStatus(codes.Internal)
+		span.AddEvent(ctx, "error",
+			logTypeKey.String(reflect.TypeOf(err).String()),
+			logMessageKey.String(err.Error()),
+		)
+		return err
+	}
+	return nil
+}