File tree 3 files changed +6
-12
lines changed
3 files changed +6
-12
lines changed Original file line number Diff line number Diff line change 5
5
require (
6
6
github.com/evanphx/json-patch v4.9.0+incompatible
7
7
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
9
9
github.com/go-logr/zapr v0.2.0
10
10
github.com/google/go-cmp v0.5.2 // indirect
11
11
github.com/googleapis/gnostic v0.5.1 // indirect
Original file line number Diff line number Diff line change @@ -106,8 +106,8 @@ github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9
106
106
github.com/go-logfmt/logfmt v0.4.0 /go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk =
107
107
github.com/go-logr/logr v0.1.0 /go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas =
108
108
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 =
111
111
github.com/go-logr/zapr v0.2.0 h1:v6Ji8yBW77pva6NkJKQdHLAJKrIJKRHz0RXwPqCHSR4 =
112
112
github.com/go-logr/zapr v0.2.0 /go.mod h1:qhKdvif7YF5GI9NWEpyxTSSBdGmzkNguibrdCNVPunU =
113
113
github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277 /go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI =
Original file line number Diff line number Diff line change @@ -39,10 +39,6 @@ import (
39
39
"github.com/go-logr/logr"
40
40
)
41
41
42
- var (
43
- contextKey = & struct {}{}
44
- )
45
-
46
42
// SetLogger sets a concrete logging implementation for all deferred Loggers.
47
43
func SetLogger (l logr.Logger ) {
48
44
Log .Fulfill (l )
@@ -56,18 +52,16 @@ var Log = NewDelegatingLogger(NullLogger{})
56
52
// FromContext returns a logger with predefined values from a context.Context.
57
53
func FromContext (ctx context.Context , keysAndValues ... interface {}) logr.Logger {
58
54
var log logr.Logger = Log
59
-
60
55
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
63
58
}
64
59
}
65
-
66
60
return log .WithValues (keysAndValues ... )
67
61
}
68
62
69
63
// IntoContext takes a context and sets the logger as one of its keys.
70
64
// Use FromContext function to retrieve the logger.
71
65
func IntoContext (ctx context.Context , log logr.Logger ) context.Context {
72
- return context . WithValue (ctx , contextKey , log )
66
+ return logr . NewContext (ctx , log )
73
67
}
You can’t perform that action at this time.
0 commit comments