diff --git a/go.mod b/go.mod index 45483215..9c59605c 100644 --- a/go.mod +++ b/go.mod @@ -16,8 +16,8 @@ require ( k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible k8s.io/code-generator v0.18.6 k8s.io/kube-openapi v0.0.0-20200410145947-bcb3869e6f29 - knative.dev/pkg v0.0.0-20200806022228-2aae6f373dda - knative.dev/test-infra v0.0.0-20200803175002-5efff0c4bd0a + knative.dev/pkg v0.0.0-20200806230728-62f2560aa795 + knative.dev/test-infra v0.0.0-20200806191129-68b7defbd189 ) replace ( diff --git a/go.sum b/go.sum index 3ed8682a..c2282c90 100644 --- a/go.sum +++ b/go.sum @@ -1867,8 +1867,8 @@ knative.dev/pkg v0.0.0-20200505191044-3da93ebb24c2/go.mod h1:Q6sL35DdGs8hIQZKdaC knative.dev/pkg v0.0.0-20200515002500-16d7b963416f/go.mod h1:tMOHGbxtRz8zYFGEGpV/bpoTEM1o89MwYFC4YJXl3GY= knative.dev/pkg v0.0.0-20200528142800-1c6815d7e4c9/go.mod h1:QgNZTxnwpB/oSpNcfnLVlw+WpEwwyKAvJlvR3hgeltA= knative.dev/pkg v0.0.0-20200711004937-22502028e31a/go.mod h1:AqAJV6rYi8IGikDjJ/9ZQd9qKdkXVlesVnVjwx62YB8= -knative.dev/pkg v0.0.0-20200806022228-2aae6f373dda h1:lQEtosYg5+6F37MVx3FQYVRwUaz3Ie2xpzhz2yOdvfo= -knative.dev/pkg v0.0.0-20200806022228-2aae6f373dda/go.mod h1:0y8OGCR6F0bIaIT+pK8NXE/KtqfeXKAzDW56t7T0ENk= +knative.dev/pkg v0.0.0-20200806230728-62f2560aa795 h1:7WSZvSc8SR2xLCjBUp5S0dg9e1AySM/xmOdpLGOMAtI= +knative.dev/pkg v0.0.0-20200806230728-62f2560aa795/go.mod h1:0y8OGCR6F0bIaIT+pK8NXE/KtqfeXKAzDW56t7T0ENk= knative.dev/test-infra v0.0.0-20200407185800-1b88cb3b45a5/go.mod h1:xcdUkMJrLlBswIZqL5zCuBFOC22WIPMQoVX1L35i0vQ= knative.dev/test-infra v0.0.0-20200505052144-5ea2f705bb55/go.mod h1:WqF1Azka+FxPZ20keR2zCNtiQA1MP9ZB4BH4HuI+SIU= knative.dev/test-infra v0.0.0-20200513011557-d03429a76034/go.mod h1:aMif0KXL4g19YCYwsy4Ocjjz5xgPlseYV+B95Oo4JGE= @@ -1876,6 +1876,8 @@ knative.dev/test-infra v0.0.0-20200519015156-82551620b0a9/go.mod h1:A5b2OAXTOeHT knative.dev/test-infra v0.0.0-20200707183444-aed09e56ddc7/go.mod h1:RjYAhXnZqeHw9+B0zsbqSPlae0lCvjekO/nw5ZMpLCs= knative.dev/test-infra v0.0.0-20200803175002-5efff0c4bd0a h1:0woae+DQoLaB8PBL1V2LKoPVOm3rldG4G1HYGROo1bo= knative.dev/test-infra v0.0.0-20200803175002-5efff0c4bd0a/go.mod h1:Pmg2c7Z7q7BGFUV/GOpU5BlrD3ePJft4MPqx8AYBplc= +knative.dev/test-infra v0.0.0-20200806191129-68b7defbd189 h1:PkTuK9kgtsdwrIxUAmaCmDwfRKBoXujiqNRDWO1r8cc= +knative.dev/test-infra v0.0.0-20200806191129-68b7defbd189/go.mod h1:Pmg2c7Z7q7BGFUV/GOpU5BlrD3ePJft4MPqx8AYBplc= modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw= modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk= modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k= diff --git a/vendor/knative.dev/pkg/controller/controller.go b/vendor/knative.dev/pkg/controller/controller.go index e32db29b..121db856 100644 --- a/vendor/knative.dev/pkg/controller/controller.go +++ b/vendor/knative.dev/pkg/controller/controller.go @@ -262,7 +262,9 @@ func (c *Impl) EnqueueAfter(obj interface{}, after time.Duration) { // and enqueues that key in the slow lane. func (c *Impl) EnqueueSlowKey(key types.NamespacedName) { c.workQueue.SlowLane().Add(key) - c.logger.Debugf("Adding to the slow queue %s (depth(total/slow): %d/%d)", safeKey(key), c.workQueue.Len(), c.workQueue.SlowLane().Len()) + c.logger.With(zap.Object(logkey.Key, logging.NamespacedName(key))). + Debug("Adding to the slow queue %s (depth(total/slow): %d/%d)", + safeKey(key), c.workQueue.Len(), c.workQueue.SlowLane().Len()) } // EnqueueSlow extracts namesspeced name from the object and enqueues it on the slow @@ -388,7 +390,8 @@ func (c *Impl) EnqueueNamespaceOf(obj interface{}) { // EnqueueKey takes a namespace/name string and puts it onto the work queue. func (c *Impl) EnqueueKey(key types.NamespacedName) { c.workQueue.Add(key) - c.logger.Debugf("Adding to queue %s (depth: %d)", safeKey(key), c.workQueue.Len()) + c.logger.With(zap.Object(logkey.Key, logging.NamespacedName(key))). + Debugf("Adding to queue %s (depth: %d)", safeKey(key), c.workQueue.Len()) } // MaybeEnqueueBucketKey takes a Bucket and namespace/name string and puts it onto @@ -403,7 +406,8 @@ func (c *Impl) MaybeEnqueueBucketKey(bkt reconciler.Bucket, key types.Namespaced // the work queue after given delay. func (c *Impl) EnqueueKeyAfter(key types.NamespacedName, delay time.Duration) { c.workQueue.AddAfter(key, delay) - c.logger.Debugf("Adding to queue %s (delay: %v, depth: %d)", safeKey(key), delay, c.workQueue.Len()) + c.logger.With(zap.Object(logkey.Key, logging.NamespacedName(key))). + Debugf("Adding to queue %s (delay: %v, depth: %d)", safeKey(key), delay, c.workQueue.Len()) } // RunContext starts the controller's worker threads, the number of which is threadiness. diff --git a/vendor/knative.dev/pkg/metrics/stackdriver_exporter.go b/vendor/knative.dev/pkg/metrics/stackdriver_exporter.go index 44ae68b6..befb95db 100644 --- a/vendor/knative.dev/pkg/metrics/stackdriver_exporter.go +++ b/vendor/knative.dev/pkg/metrics/stackdriver_exporter.go @@ -21,6 +21,7 @@ import ( "fmt" "path" "sync" + "time" sd "contrib.go.opencensus.io/exporter/stackdriver" "go.opencensus.io/resource" @@ -49,6 +50,8 @@ const ( StackdriverSecretNameDefault = "stackdriver-service-account-key" // secretDataFieldKey is the name of the k8s Secret field that contains the Secret's key. secretDataFieldKey = "key.json" + // stackdriverApiTimeout is the timeout value of Stackdriver API service side. + stackdriverApiTimeout = 12 * time.Second ) var ( @@ -186,6 +189,7 @@ func newStackdriverExporter(config *metricsConfig, logger *zap.SugaredLogger) (v GetMetricPrefix: mpf, ReportingInterval: config.reportingPeriod, DefaultMonitoringLabels: &sd.Labels{}, + Timeout: stackdriverApiTimeout, }) if err != nil { logger.Errorw("Failed to create the Stackdriver exporter: ", zap.Error(err)) diff --git a/vendor/modules.txt b/vendor/modules.txt index 64e7b761..c5e2b229 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -752,7 +752,7 @@ k8s.io/kube-openapi/pkg/util/sets k8s.io/utils/buffer k8s.io/utils/integer k8s.io/utils/trace -# knative.dev/pkg v0.0.0-20200806022228-2aae6f373dda +# knative.dev/pkg v0.0.0-20200806230728-62f2560aa795 ## explicit knative.dev/pkg/apis knative.dev/pkg/apis/duck/ducktypes @@ -776,7 +776,7 @@ knative.dev/pkg/metrics/metricskey knative.dev/pkg/network knative.dev/pkg/reconciler knative.dev/pkg/system -# knative.dev/test-infra v0.0.0-20200803175002-5efff0c4bd0a +# knative.dev/test-infra v0.0.0-20200806191129-68b7defbd189 ## explicit knative.dev/test-infra/scripts knative.dev/test-infra/tools/dep-collector