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

Merge pull request #1567 from go-redis/feature/otel-0.14

Browse Source 
Update to otel v0.14
This commit is contained in:
Vladimir Mihailenco
2020-11-21 10:12:54 +02:00
committed by GitHub
parent 94de9f93b8 3921cd497c
commit 55a8f1a601
13 changed files with 206 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
internal/util.go
View File

@ -6,8 +6,8 @@ import (
"github.com/go-redis/redis/v8/internal/proto"
"github.com/go-redis/redis/v8/internal/util"
"go.opentelemetry.io/otel/api/global"
"go.opentelemetry.io/otel/api/trace"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/trace"
)
func Sleep(ctx context.Context, dur time.Duration) error {
@ -52,20 +52,22 @@ func isLower(s string) bool {
//------------------------------------------------------------------------------
var tracer = otel.Tracer("github.com/go-redis/redis")
func WithSpan(ctx context.Context, name string, fn func(context.Context, trace.Span) error) error {
if span := trace.SpanFromContext(ctx); !span.IsRecording() {
return fn(ctx, span)
}
ctx, span := global.Tracer("github.com/go-redis/redis").Start(ctx, name)
ctx, span := tracer.Start(ctx, name)
defer span.End()
return fn(ctx, span)
}
func RecordError(ctx context.Context, err error) error {
func RecordError(ctx context.Context, span trace.Span, err error) error {
if err != proto.Nil {
trace.SpanFromContext(ctx).RecordError(ctx, err)
span.RecordError(err)
}
return err
}