Skip to content

Commit 6e74b4d

Browse files
authored
Merge pull request #1277 from arghya88/use-go-logr-context
🌱Use go-logr context functions
2 parents e2261d9 + 8b3bc7b commit 6e74b4d

File tree

3 files changed

+6
-12
lines changed

3 files changed

+6
-12
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.15
55
require (
66
github.com/evanphx/json-patch v4.9.0+incompatible
77
github.com/fsnotify/fsnotify v1.4.9
8-
github.com/go-logr/logr v0.2.1
8+
github.com/go-logr/logr v0.3.0
99
github.com/go-logr/zapr v0.2.0
1010
github.com/google/go-cmp v0.5.2 // indirect
1111
github.com/googleapis/gnostic v0.5.1 // indirect

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9
106106
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
107107
github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
108108
github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
109-
github.com/go-logr/logr v0.2.1 h1:fV3MLmabKIZ383XifUjFSwcoGee0v9qgPp8wy5svibE=
110-
github.com/go-logr/logr v0.2.1/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
109+
github.com/go-logr/logr v0.3.0 h1:q4c+kbcR0d5rSurhBR8dIgieOaYpXtsdTYfx22Cu6rs=
110+
github.com/go-logr/logr v0.3.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
111111
github.com/go-logr/zapr v0.2.0 h1:v6Ji8yBW77pva6NkJKQdHLAJKrIJKRHz0RXwPqCHSR4=
112112
github.com/go-logr/zapr v0.2.0/go.mod h1:qhKdvif7YF5GI9NWEpyxTSSBdGmzkNguibrdCNVPunU=
113113
github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI=

pkg/log/log.go

+3-9
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@ import (
3939
"github.com/go-logr/logr"
4040
)
4141

42-
var (
43-
contextKey = &struct{}{}
44-
)
45-
4642
// SetLogger sets a concrete logging implementation for all deferred Loggers.
4743
func SetLogger(l logr.Logger) {
4844
Log.Fulfill(l)
@@ -56,18 +52,16 @@ var Log = NewDelegatingLogger(NullLogger{})
5652
// FromContext returns a logger with predefined values from a context.Context.
5753
func FromContext(ctx context.Context, keysAndValues ...interface{}) logr.Logger {
5854
var log logr.Logger = Log
59-
6055
if ctx != nil {
61-
if lv := ctx.Value(contextKey); lv != nil {
62-
log = lv.(logr.Logger)
56+
if logger := logr.FromContext(ctx); logger != nil {
57+
log = logger
6358
}
6459
}
65-
6660
return log.WithValues(keysAndValues...)
6761
}
6862

6963
// IntoContext takes a context and sets the logger as one of its keys.
7064
// Use FromContext function to retrieve the logger.
7165
func IntoContext(ctx context.Context, log logr.Logger) context.Context {
72-
return context.WithValue(ctx, contextKey, log)
66+
return logr.NewContext(ctx, log)
7367
}

0 commit comments

Comments
 (0)