From 1f9e3d92b7bfd0326304646a59be0f77a20ac064 Mon Sep 17 00:00:00 2001
From: Matt Moore <mattmoor@vmware.com>
Date: Thu, 6 Aug 2020 08:08:29 -0700
Subject: [PATCH] [master] Auto-update dependencies (#303)

Produced via:
  `./hack/update-deps.sh --upgrade && ./hack/update-codegen.sh`
/assign n3wscott vagababov
/cc n3wscott vagababov
---
 go.mod                                            |  2 +-
 go.sum                                            |  4 ++--
 .../pkg/metrics/config_observability.go           | 15 +++++++++++++++
 vendor/modules.txt                                |  2 +-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/go.mod b/go.mod
index 00778e23..45483215 100644
--- a/go.mod
+++ b/go.mod
@@ -16,7 +16,7 @@ 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-20200805045628-bb91a15b1a18
+	knative.dev/pkg v0.0.0-20200806022228-2aae6f373dda
 	knative.dev/test-infra v0.0.0-20200803175002-5efff0c4bd0a
 )
 
diff --git a/go.sum b/go.sum
index 08543b74..3ed8682a 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-20200805045628-bb91a15b1a18 h1:ywpZa098+kSsHZe8aGjJkgzjcZUOLWgao+rGE6OW6rY=
-knative.dev/pkg v0.0.0-20200805045628-bb91a15b1a18/go.mod h1:0y8OGCR6F0bIaIT+pK8NXE/KtqfeXKAzDW56t7T0ENk=
+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/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=
diff --git a/vendor/knative.dev/pkg/metrics/config_observability.go b/vendor/knative.dev/pkg/metrics/config_observability.go
index 5bedbac0..d17fba89 100644
--- a/vendor/knative.dev/pkg/metrics/config_observability.go
+++ b/vendor/knative.dev/pkg/metrics/config_observability.go
@@ -18,6 +18,7 @@ package metrics
 
 import (
 	"os"
+	"strings"
 	texttemplate "text/template"
 
 	corev1 "k8s.io/api/core/v1"
@@ -59,6 +60,9 @@ type ObservabilityConfig struct {
 	// EnableProfiling indicates whether it is allowed to retrieve runtime profiling data from
 	// the pods via an HTTP server in the format expected by the pprof visualization tool.
 	EnableProfiling bool
+
+	// EnableRequestLog enables activator/queue-proxy to write request logs.
+	EnableRequestLog bool
 }
 
 func defaultConfig() *ObservabilityConfig {
@@ -83,6 +87,17 @@ func NewObservabilityConfigFromConfigMap(configMap *corev1.ConfigMap) (*Observab
 		return nil, err
 	}
 
+	if raw, ok := configMap.Data["logging.enable-request-log"]; ok {
+		if strings.EqualFold(raw, "true") && oc.RequestLogTemplate != "" {
+			oc.EnableRequestLog = true
+		}
+	} else if oc.RequestLogTemplate != "" {
+		// TODO: remove this after 0.17 cuts, this is meant only for smooth transition to the new flag.
+		// Once 0.17 cuts we should set a proper default value and users will need to set the flag explicitly
+		// to enable request logging.
+		oc.EnableRequestLog = true
+	}
+
 	if oc.RequestLogTemplate != "" {
 		// Verify that we get valid templates.
 		if _, err := texttemplate.New("requestLog").Parse(oc.RequestLogTemplate); err != nil {
diff --git a/vendor/modules.txt b/vendor/modules.txt
index e20620e8..64e7b761 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-20200805045628-bb91a15b1a18
+# knative.dev/pkg v0.0.0-20200806022228-2aae6f373dda
 ## explicit
 knative.dev/pkg/apis
 knative.dev/pkg/apis/duck/ducktypes