upgrade to latest dependencies (#432)

bumping knative.dev/caching 3657044...ba2835b: > ba2835b upgrade to latest dependencies (# 415) bumping knative.dev/eventing 0f2f567...b10d720: > b10d720 [# 4744] Bump test zipkin version (# 4755) > 2b95f45 upgrade to latest dependencies (# 4747) > d395f6f Cleanup channel template internal types (# 4749) > 8e0e286 💽 Change KIND's k8s to 1.19.4 and add 1.20.0 (# 4729) bumping knative.dev/pkg f0ea5e6...75d66b5: > 75d66b5 preserve the stable webhook logger names we had before (# 1994) > 22f4898 upgrade to latest dependencies (# 1990) > 5bb97df fix duration logging (# 1992) > a74906c Use structured logging to augment our logger vs. naming (# 1991) Signed-off-by: Knative Automation <[email protected]>
knative · Jan 19, 2021 · 0876259 · 0876259
1 parent b1f84d6
commit 0876259
Show file tree

Hide file tree

Showing 9 changed files with 63 additions and 30 deletions.
diff --git a/go.mod b/go.mod
@@ -17,10 +17,10 @@ require (
 	k8s.io/apimachinery v0.19.0
 	k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible
 	k8s.io/code-generator v0.18.12
-	knative.dev/caching v0.0.0-20210115031420-3657044850e6
-	knative.dev/eventing v0.20.1-0.20210115075320-0f2f5671d738
+	knative.dev/caching v0.0.0-20210118144121-ba2835b006fb
+	knative.dev/eventing v0.20.1-0.20210119133921-b10d7208c941
 	knative.dev/hack v0.0.0-20210114150620-4422dcadb3c8
-	knative.dev/pkg v0.0.0-20210114223020-f0ea5e6b9c4e
+	knative.dev/pkg v0.0.0-20210118192521-75d66b58948d
 	sigs.k8s.io/yaml v1.2.0
 )
 

diff --git a/go.sum b/go.sum
@@ -1175,23 +1175,20 @@ k8s.io/kube-openapi v0.0.0-20200410145947-bcb3869e6f29/go.mod h1:F+5wygcW0wmRTnM
 k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
 k8s.io/utils v0.0.0-20200603063816-c1c6865ac451 h1:v8ud2Up6QK1lNOKFgiIVrZdMg7MpmSnvtrOieolJKoE=
 k8s.io/utils v0.0.0-20200603063816-c1c6865ac451/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
-knative.dev/caching v0.0.0-20210115031420-3657044850e6 h1:hjE/NB1owWb4PAdQD3Qk2FkhhydEHcndtK3nx7IblKA=
-knative.dev/caching v0.0.0-20210115031420-3657044850e6/go.mod h1:WtXBkTQRHxY9OYgYMnxy1c3439hWc949h5NyAY6ooMU=
-knative.dev/eventing v0.20.1-0.20210115075320-0f2f5671d738 h1:AotY9jbGma1J4k6pbBQLPvOl2WlWAh7ErHGn/pQ/y/0=
-knative.dev/eventing v0.20.1-0.20210115075320-0f2f5671d738/go.mod h1:HdS7UgtDbKQuCuEwgS3+jxtHvpm+PPp/eEsjaQwfWl8=
+knative.dev/caching v0.0.0-20210118144121-ba2835b006fb h1:a48+5B0mgzj+GA08K0qLJ3gp7NquTH2r1x5KdXaJvEQ=
+knative.dev/caching v0.0.0-20210118144121-ba2835b006fb/go.mod h1:JXP6YxGxWXWXROj77ZvNvI0M8+Mb38G8KVGeepJWbsw=
+knative.dev/eventing v0.20.1-0.20210119133921-b10d7208c941 h1:4rnPNtnYc2dHfV2CijqUFnZk9/HN4UX8Zfaz54hNuts=
+knative.dev/eventing v0.20.1-0.20210119133921-b10d7208c941/go.mod h1:2Tca4wZz6BtaUSdKHjzKS8BS3wzhKNv83eiNlHT7ZLw=
 knative.dev/hack v0.0.0-20201214230143-4ed1ecb8db24 h1:kIztWfvnIFV8Lhlea02K3YO2mIzcDyQNzrBLn0Oq9sA=
 knative.dev/hack v0.0.0-20201214230143-4ed1ecb8db24/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
-knative.dev/hack v0.0.0-20210112093330-d946d2557383 h1:YDYKfHaplhMelgOVP8eRvHlYf5elgZveo36GBDFfDqA=
-knative.dev/hack v0.0.0-20210112093330-d946d2557383/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
 knative.dev/hack v0.0.0-20210114150620-4422dcadb3c8 h1:N/Kt6C5zZzTtFcTntRThB+vEJ7WcLKaZ5Q2Jm7b23vw=
 knative.dev/hack v0.0.0-20210114150620-4422dcadb3c8/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
-knative.dev/pkg v0.0.0-20210107022335-51c72e24c179 h1:lkrgrv69iUk2qhOG9symy15kJUaJZmMybSloi7C3gIw=
-knative.dev/pkg v0.0.0-20210107022335-51c72e24c179/go.mod h1:hckgW978SdzPA2H5EDvRPY8xsnPuDZLJLbPf8Jte7Q0=
-knative.dev/pkg v0.0.0-20210112143930-acbf2af596cf h1:6/VyHMk6pa395xWho0KLfVj+7NNrmlO7Ki9jLbVjoaI=
-knative.dev/pkg v0.0.0-20210112143930-acbf2af596cf/go.mod h1:hckgW978SdzPA2H5EDvRPY8xsnPuDZLJLbPf8Jte7Q0=
 knative.dev/pkg v0.0.0-20210114223020-f0ea5e6b9c4e h1:3k5tzvlM9VGZFiXRj8UKc3CUpMGpqBlEbIY0Dp3F3NU=
 knative.dev/pkg v0.0.0-20210114223020-f0ea5e6b9c4e/go.mod h1:hckgW978SdzPA2H5EDvRPY8xsnPuDZLJLbPf8Jte7Q0=
-knative.dev/reconciler-test v0.0.0-20210111135237-9b251467ccb6/go.mod h1:rmQpZseeqDpg6/ToFzIeV5hTRkOJujaXBCK7iYL7M4E=
+knative.dev/pkg v0.0.0-20210115202020-5bb97df49b44/go.mod h1:hckgW978SdzPA2H5EDvRPY8xsnPuDZLJLbPf8Jte7Q0=
+knative.dev/pkg v0.0.0-20210118192521-75d66b58948d h1:EY2H22iv1MuvuSZzXwode/quaZQKx0utiNkC2SSOm5k=
+knative.dev/pkg v0.0.0-20210118192521-75d66b58948d/go.mod h1:cZdMjcJE6JGSNaEypgbUigX1TjteMIwQsW2woNBPVCA=
+knative.dev/reconciler-test v0.0.0-20210115075620-6fe6ef693370/go.mod h1:A5ZaQo+1lWGw2OoSc06wSyReX6huzBPJ2ra/R48s1yo=
 pgregory.net/rapid v0.3.3/go.mod h1:UYpPVyjFHzYBGHIxLFoupi8vwk6rXNzRY9OMvVxFIOU=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=

diff --git a/pkg/client/injection/reconciler/operator/v1alpha1/knativeeventing/controller.go b/pkg/client/injection/reconciler/operator/v1alpha1/knativeeventing/controller.go
diff --git a/pkg/client/injection/reconciler/operator/v1alpha1/knativeserving/controller.go b/pkg/client/injection/reconciler/operator/v1alpha1/knativeserving/controller.go
diff --git a/vendor/knative.dev/pkg/apis/duck/ABOUT.md b/vendor/knative.dev/pkg/apis/duck/ABOUT.md
@@ -301,7 +301,8 @@ is used with duck types:
                 Base:             reconciler.NewBase(opt, controllerAgentName),
                 ...
         }
-        impl := controller.NewImpl(c, c.Logger, "Revisions")
+        logger := c.Logger.Named("Revisions")
+        impl := controller.NewImpl(c, logger, "Revisions")
 
         // Calls to Track create a 30 minute lease before they must be renewed.
         // Coordinate this value with controller resync periods.

diff --git a/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/reconciler_controller.go b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/reconciler_controller.go
@@ -170,6 +170,18 @@ func (g *reconcilerControllerGenerator) GenerateType(c *generator.Context, t *ty
 			Package: "fmt",
 			Name:    "Sprintf",
 		}),
+		"logkeyControllerType": c.Universe.Constant(types.Name{
+			Package: "knative.dev/pkg/logging/logkey",
+			Name:    "ControllerType",
+		}),
+		"logkeyControllerKind": c.Universe.Constant(types.Name{
+			Package: "knative.dev/pkg/logging/logkey",
+			Name:    "Kind",
+		}),
+		"zapString": c.Universe.Function(types.Name{
+			Package: "go.uber.org/zap",
+			Name:    "String",
+		}),
 	}
 
 	sw.Do(reconcilerControllerNewImpl, m)
@@ -227,10 +239,17 @@ func NewImpl(ctx {{.contextContext|raw}}, r Interface{{if .hasClass}}, classValu
 		{{if .hasClass}}classValue: classValue,{{end}}
 	}
 
-	t := {{.reflectTypeOf|raw}}(r).Elem()
-	queueName := {{.fmtSprintf|raw}}("%s.%s", {{.stringsReplaceAll|raw}}(t.PkgPath(), "/", "-"), t.Name())
+	ctrType := {{.reflectTypeOf|raw}}(r).Elem()
+	ctrTypeName := {{.fmtSprintf|raw}}("%s.%s", ctrType.PkgPath(), ctrType.Name())
+	ctrTypeName = {{.stringsReplaceAll|raw}}(ctrTypeName, "/", ".")
+
+	logger = logger.With(
+			{{.zapString|raw}}({{.logkeyControllerType|raw}}, ctrTypeName),
+			{{.zapString|raw}}({{.logkeyControllerKind|raw}}, "{{ printf "%s.%s" .group .type.Name.Name }}"),
+	)
+
 
-	impl := {{.controllerNewImpl|raw}}(rec, logger, queueName)
+	impl := {{.controllerNewImpl|raw}}(rec, logger, ctrTypeName)
 	agentName := defaultControllerAgentName
 
 	// Pass impl to the options. Save any optional results.

diff --git a/vendor/knative.dev/pkg/controller/controller.go b/vendor/knative.dev/pkg/controller/controller.go
@@ -230,7 +230,6 @@ func NewImplWithStats(r Reconciler, logger *zap.SugaredLogger, workQueueName str
 
 // NewImplFull accepts the full set of options available to all controllers.
 func NewImplFull(r Reconciler, options ControllerOptions) *Impl {
-	logger := options.Logger.Named(options.WorkQueueName)
 	if options.RateLimiter == nil {
 		options.RateLimiter = workqueue.DefaultControllerRateLimiter()
 	}
@@ -241,7 +240,7 @@ func NewImplFull(r Reconciler, options ControllerOptions) *Impl {
 		Name:          options.WorkQueueName,
 		Reconciler:    r,
 		workQueue:     newTwoLaneWorkQueue(options.WorkQueueName, options.RateLimiter),
-		logger:        logger,
+		logger:        options.Logger,
 		statsReporter: options.Reporter,
 	}
 }
@@ -528,7 +527,7 @@ func (c *Impl) processNextWorkItem() bool {
 	// Finally, if no error occurs we Forget this item so it does not
 	// have any delay when another change happens.
 	c.workQueue.Forget(key)
-	logger.Info("Reconcile succeeded. Time taken: ", zap.Duration("duration", time.Since(startTime)))
+	logger.Infow("Reconcile succeeded", zap.Duration("duration", time.Since(startTime)))
 
 	return true
 }

diff --git a/vendor/knative.dev/pkg/injection/README.md b/vendor/knative.dev/pkg/injection/README.md
@@ -138,6 +138,7 @@ func NewController(ctx context.Context, cmw configmap.Watcher) *controller.Impl
 		Client:        kubeclient.Get(ctx),
 		ServiceLister: svcInformer.Lister(),
 	}
+	logger = logger.Named("NameOfController")
 	impl := controller.NewImpl(c, logger, "NameOfController")
 
 	// Set up event handlers.

diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -771,19 +771,19 @@ k8s.io/utils/buffer
 k8s.io/utils/integer
 k8s.io/utils/pointer
 k8s.io/utils/trace
-# knative.dev/caching v0.0.0-20210115031420-3657044850e6
+# knative.dev/caching v0.0.0-20210118144121-ba2835b006fb
 ## explicit
 knative.dev/caching/pkg/apis/caching
 knative.dev/caching/pkg/apis/caching/v1alpha1
-# knative.dev/eventing v0.20.1-0.20210115075320-0f2f5671d738
+# knative.dev/eventing v0.20.1-0.20210119133921-b10d7208c941
 ## explicit
 knative.dev/eventing/pkg/apis/config
 knative.dev/eventing/pkg/apis/duck/v1
 knative.dev/eventing/pkg/apis/eventing
 # knative.dev/hack v0.0.0-20210114150620-4422dcadb3c8
 ## explicit
 knative.dev/hack
-# knative.dev/pkg v0.0.0-20210114223020-f0ea5e6b9c4e
+# knative.dev/pkg v0.0.0-20210118192521-75d66b58948d
 ## explicit
 knative.dev/pkg/apis
 knative.dev/pkg/apis/duck