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

Log with context to associate all log by traceID (#1413)

Browse Source 
* Log with context to associate all log by traceID
This commit is contained in:
刘青
2020-07-18 14:04:36 +08:00
committed by GitHub
parent f2645d373d
commit 8a3f304b25
8 changed files with 66 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/instruments.go
View File

@ -1,6 +1,8 @@
package internal
import (
"context"
"go.opentelemetry.io/otel/api/global"
"go.opentelemetry.io/otel/api/metric"
)
@ -15,7 +17,7 @@ var (
func init() {
defer func() {
if r := recover(); r != nil {
Logger.Printf("Error creating meter github.com/go-redis/redis for Instruments", r)
Logger.Printf(context.Background(), "Error creating meter github.com/go-redis/redis for Instruments", r)
}
}()

16
internal/log.go
View File

@ -1,12 +1,24 @@
package internal
import (
"context"
"fmt"
"log"
"os"
)
type Logging interface {
Printf(format string, v ...interface{})
Printf(ctx context.Context, format string, v ...interface{})
}
var Logger Logging = log.New(os.Stderr, "redis: ", log.LstdFlags|log.Lshortfile)
type logger struct {
log *log.Logger
}
func (l *logger) Printf(ctx context.Context, format string, v ...interface{}) {
_ = l.log.Output(2, fmt.Sprintf(format, v...))
}
var Logger Logging = &logger{
log: log.New(os.Stderr, "redis: ", log.LstdFlags|log.Lshortfile),
}

4
internal/pool/pool.go
View File

@ -320,7 +320,7 @@ func (p *ConnPool) popIdle() *Conn {
func (p *ConnPool) Put(cn *Conn) {
if cn.rd.Buffered() > 0 {
internal.Logger.Printf("Conn has unread data")
internal.Logger.Printf(context.Background(), "Conn has unread data")
p.Remove(cn, BadConnError{})
return
}
@ -458,7 +458,7 @@ func (p *ConnPool) reaper(frequency time.Duration) {
}
_, err := p.ReapStaleConns()
if err != nil {
internal.Logger.Printf("ReapStaleConns failed: %s", err)
internal.Logger.Printf(context.Background(), "ReapStaleConns failed: %s", err)
continue
}
case <-p.closedCh: