redis/go-redis
1
0
Fork 0
mirror of https://github.com/redis/go-redis.git synced 2025-07-29 17:41:15 +03:00
Code Activity

Update to otel v0.14

Browse Source
This commit is contained in:
Vladimir Mihailenco
2020-11-21 09:56:52 +02:00
parent 015c456597
commit 3921cd497c
14 changed files with 208 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
internal/pool/conn.go
View File

@ -9,7 +9,7 @@ import (
"github.com/go-redis/redis/v8/internal"
"github.com/go-redis/redis/v8/internal/proto"
"go.opentelemetry.io/otel/api/trace"
"go.opentelemetry.io/otel/trace"
)
var noDeadline = time.Time{}
@ -68,10 +68,10 @@ func (cn *Conn) RemoteAddr() net.Addr {
func (cn *Conn) WithReader(ctx context.Context, timeout time.Duration, fn func(rd *proto.Reader) error) error {
return internal.WithSpan(ctx, "redis.with_reader", func(ctx context.Context, span trace.Span) error {
if err := cn.netConn.SetReadDeadline(cn.deadline(ctx, timeout)); err != nil {
return internal.RecordError(ctx, err)
return internal.RecordError(ctx, span, err)
}
if err := fn(cn.rd); err != nil {
return internal.RecordError(ctx, err)
return internal.RecordError(ctx, span, err)
}
return nil
})
@ -82,7 +82,7 @@ func (cn *Conn) WithWriter(
) error {
return internal.WithSpan(ctx, "redis.with_writer", func(ctx context.Context, span trace.Span) error {
if err := cn.netConn.SetWriteDeadline(cn.deadline(ctx, timeout)); err != nil {
return internal.RecordError(ctx, err)
return internal.RecordError(ctx, span, err)
}
if cn.bw.Buffered() > 0 {
@ -90,11 +90,11 @@ func (cn *Conn) WithWriter(
}
if err := fn(cn.wr); err != nil {
return internal.RecordError(ctx, err)
return internal.RecordError(ctx, span, err)
}
if err := cn.bw.Flush(); err != nil {
return internal.RecordError(ctx, err)
return internal.RecordError(ctx, span, err)
}
internal.WritesCounter.Add(ctx, 1)