Merge pull request #9 from yancl/master

all: add SpanKindClient to all spans

Author: Emmanuel T Odeke

redis/conn.go

@@ -341,7 +341,7 @@ func NewConn(netConn net.Conn, readTimeout, writeTimeout time.Duration) Conn {
 }
 
 func (c *conn) CloseContext(ctx context.Context) error {
-	ctx, span := trace.StartSpan(ctx, "redis.(*Conn).Close")
+	ctx, span := trace.StartSpan(ctx, "redis.(*Conn).Close", trace.WithSpanKind(trace.SpanKindClient))
 	if len(c.options.DefaultAttributes) > 0 {
 		span.AddAttributes(c.options.DefaultAttributes...)
 	}
@@ -618,7 +618,7 @@ func (c *conn) Send(cmd string, args ...interface{}) error {
 }
 
 func (c *conn) SendContext(ctx context.Context, cmd string, args ...interface{}) error {
-	_, span := trace.StartSpan(ctx, "redis.(*Conn).Send")
+	_, span := trace.StartSpan(ctx, "redis.(*Conn).Send", trace.WithSpanKind(trace.SpanKindClient))
 	defer span.End()
 	if len(c.options.DefaultAttributes) > 0 {
 		span.AddAttributes(c.options.DefaultAttributes...)
@@ -646,7 +646,7 @@ func (c *conn) SendContext(ctx context.Context, cmd string, args ...interface{})
 func (c *conn) FlushContext(ctx context.Context) error {
 	startTime := time.Now()
 	ctx, _ = tag.New(ctx, tag.Upsert(observability.KeyCommandName, "flush"))
-	ctx, span := trace.StartSpan(ctx, "redis.(*Conn).Flush")
+	ctx, span := trace.StartSpan(ctx, "redis.(*Conn).Flush", trace.WithSpanKind(trace.SpanKindClient))
 
 	defer func() {
 		// At the very end we need to record the overall latency
@@ -687,7 +687,7 @@ func (c *conn) ReceiveWithTimeout(timeout time.Duration) (reply interface{}, err
 }
 
 func (c *conn) receive(ctx context.Context, timeout time.Duration) (reply interface{}, err error) {
-	_, span := trace.StartSpan(ctx, "redis.(*Conn).Receive")
+	_, span := trace.StartSpan(ctx, "redis.(*Conn).Receive", trace.WithSpanKind(trace.SpanKindClient))
 	defer span.End()
 
 	if len(c.options.DefaultAttributes) > 0 {
@@ -756,7 +756,7 @@ func (c *conn) do(ctx context.Context, readTimeout time.Duration, cmd string, ar
 
 	startTime := time.Now()
 	ctx, _ = tag.New(ctx, tag.Upsert(observability.KeyCommandName, spanName))
-	ctx, span := trace.StartSpan(ctx, "redis.(*Conn)."+spanName)
+	ctx, span := trace.StartSpan(ctx, "redis.(*Conn)."+spanName, trace.WithSpanKind(trace.SpanKindClient))
 
 	defer func() {
 		// At the very end we need to record the overall latency
@@ -809,7 +809,7 @@ func (c *conn) do(ctx context.Context, readTimeout time.Duration, cmd string, ar
 		}
 	}()
 
-	_, readSpan := trace.StartSpan(ctx, "redis.(*Conn).readReplies")
+	_, readSpan := trace.StartSpan(ctx, "redis.(*Conn).readReplies", trace.WithSpanKind(trace.SpanKindClient))
 	defer readSpan.End()
 
 	if len(c.options.DefaultAttributes) > 0 {

redis/pool.go

@@ -188,7 +188,7 @@ func (p *Pool) Get() Conn {
 }
 
 func (p *Pool) GetWithContext(ctx context.Context) Conn {
-	ctx, span := trace.StartSpan(ctx, "redis.(*Pool).Get")
+	ctx, span := trace.StartSpan(ctx, "redis.(*Pool).Get", trace.WithSpanKind(trace.SpanKindClient))
 	defer span.End()
 
 	pc, err := p.get(ctx)

redis/script.go

@@ -76,7 +76,7 @@ func (s *Script) Do(c ConnWithContext, keysAndArgs ...interface{}) (interface{},
 // not loaded, then DoContext evaluates the script using the EVAL command (thus
 // causing the script to load).
 func (s *Script) DoContext(ctx context.Context, c ConnWithContext, keysAndArgs ...interface{}) (interface{}, error) {
-	ctx, span := trace.StartSpan(ctx, "redis.(*Script).DoContext")
+	ctx, span := trace.StartSpan(ctx, "redis.(*Script).DoContext", trace.WithSpanKind(trace.SpanKindClient))
 	defer span.End()
 
 	v, err := c.DoContext(ctx, "EVALSHA", s.args(s.hash, keysAndArgs)...)