Merge pull request #1277 from arghya88/use-go-logr-context

🌱Use go-logr context functions
kubernetes-sigs · Nov 30, 2020 · 6e74b4d · 6e74b4d
2 parents e2261d9 + 8b3bc7b
commit 6e74b4d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.15
 require (
 	github.com/evanphx/json-patch v4.9.0+incompatible
 	github.com/fsnotify/fsnotify v1.4.9
-	github.com/go-logr/logr v0.2.1
+	github.com/go-logr/logr v0.3.0
 	github.com/go-logr/zapr v0.2.0
 	github.com/google/go-cmp v0.5.2 // indirect
 	github.com/googleapis/gnostic v0.5.1 // indirect

diff --git a/go.sum b/go.sum
@@ -106,8 +106,8 @@ github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
 github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
-github.com/go-logr/logr v0.2.1 h1:fV3MLmabKIZ383XifUjFSwcoGee0v9qgPp8wy5svibE=
-github.com/go-logr/logr v0.2.1/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
+github.com/go-logr/logr v0.3.0 h1:q4c+kbcR0d5rSurhBR8dIgieOaYpXtsdTYfx22Cu6rs=
+github.com/go-logr/logr v0.3.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
 github.com/go-logr/zapr v0.2.0 h1:v6Ji8yBW77pva6NkJKQdHLAJKrIJKRHz0RXwPqCHSR4=
 github.com/go-logr/zapr v0.2.0/go.mod h1:qhKdvif7YF5GI9NWEpyxTSSBdGmzkNguibrdCNVPunU=
 github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI=

diff --git a/pkg/log/log.go b/pkg/log/log.go
@@ -39,10 +39,6 @@ import (
 	"github.com/go-logr/logr"
 )
 
-var (
-	contextKey = &struct{}{}
-)
-
 // SetLogger sets a concrete logging implementation for all deferred Loggers.
 func SetLogger(l logr.Logger) {
 	Log.Fulfill(l)
@@ -56,18 +52,16 @@ var Log = NewDelegatingLogger(NullLogger{})
 // FromContext returns a logger with predefined values from a context.Context.
 func FromContext(ctx context.Context, keysAndValues ...interface{}) logr.Logger {
 	var log logr.Logger = Log
-
 	if ctx != nil {
-		if lv := ctx.Value(contextKey); lv != nil {
-			log = lv.(logr.Logger)
+		if logger := logr.FromContext(ctx); logger != nil {
+			log = logger
 		}
 	}
-
 	return log.WithValues(keysAndValues...)
 }
 
 // IntoContext takes a context and sets the logger as one of its keys.
 // Use FromContext function to retrieve the logger.
 func IntoContext(ctx context.Context, log logr.Logger) context.Context {
-	return context.WithValue(ctx, contextKey, log)
+	return logr.NewContext(ctx, log)
 }