diff --git a/go.mod b/go.mod index 2a4903e6..080e9ad7 100644 --- a/go.mod +++ b/go.mod @@ -18,5 +18,5 @@ require ( k8s.io/code-generator v0.18.12 k8s.io/kube-openapi v0.0.0-20200410145947-bcb3869e6f29 knative.dev/hack v0.0.0-20210114150620-4422dcadb3c8 - knative.dev/pkg v0.0.0-20210114223020-f0ea5e6b9c4e + knative.dev/pkg v0.0.0-20210115202020-5bb97df49b44 ) diff --git a/go.sum b/go.sum index 30f675ac..870c84ab 100644 --- a/go.sum +++ b/go.sum @@ -1174,8 +1174,8 @@ knative.dev/hack v0.0.0-20201214230143-4ed1ecb8db24 h1:kIztWfvnIFV8Lhlea02K3YO2m knative.dev/hack v0.0.0-20201214230143-4ed1ecb8db24/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-20210114223020-f0ea5e6b9c4e h1:3k5tzvlM9VGZFiXRj8UKc3CUpMGpqBlEbIY0Dp3F3NU= -knative.dev/pkg v0.0.0-20210114223020-f0ea5e6b9c4e/go.mod h1:hckgW978SdzPA2H5EDvRPY8xsnPuDZLJLbPf8Jte7Q0= +knative.dev/pkg v0.0.0-20210115202020-5bb97df49b44 h1:20uY2rKXoaAG7M86G7QPE7FhtOq1B0DeJ6Ron/AFPsQ= +knative.dev/pkg v0.0.0-20210115202020-5bb97df49b44/go.mod h1:hckgW978SdzPA2H5EDvRPY8xsnPuDZLJLbPf8Jte7Q0= 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/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 index 9260fe87..0f0f417e 100644 --- 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, "/", ".") - impl := {{.controllerNewImpl|raw}}(rec, logger, queueName) + logger = logger.With( + {{.zapString|raw}}({{.logkeyControllerType|raw}}, ctrTypeName), + {{.zapString|raw}}({{.logkeyControllerKind|raw}}, "{{ printf "%s.%s" .group .type.Name.Name }}"), + ) + + + 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 index 953e5ea0..26030626 100644 --- 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/modules.txt b/vendor/modules.txt index 488bdcfb..e5495ec5 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -655,7 +655,7 @@ k8s.io/utils/trace # 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-20210115202020-5bb97df49b44 ## explicit knative.dev/pkg/apis knative.dev/pkg/apis/duck