From e5d714c2bfc5f6027ab8b5df1de9c704fa1660e6 Mon Sep 17 00:00:00 2001 From: knative-automation Date: Thu, 30 Mar 2023 08:16:02 -0400 Subject: [PATCH] upgrade to latest dependencies (#735) bumping knative.dev/pkg 645afb2...696cac8: > 696cac8 Expose queue proxy request metrics reporting period (# 2362) > bd3cf51 Printf log message with the right type when showing port (# 2709) > 4c84b1b Update actions (# 2707) > 3290ddf Update community files (# 2706) > 53fc6ab Update actions (# 2705) > b769fef drop eventing natss from downstream tests (# 2703) > 511b394 potential fix for flakey tlsBackoff (# 2702) > 0902ea8 Parameterize WEBHOOK_NAME env key in error message (# 2701) > c5dd1d1 Update community files (# 2700) > b77a78c upgrade to latest dependencies (# 2698) > 310274d bump golang version in downstream tests (# 2697) > fd00e03 Add certs secret name read from env (# 2685) bumping knative.dev/hack 3de51af...3b8ef01: > 3b8ef01 Update community files (# 279) > 1eebfb3 Update community files (# 278) Signed-off-by: Knative Automation --- go.mod | 4 +-- go.sum | 8 ++--- .../knative.dev/pkg/injection/health_check.go | 2 +- vendor/knative.dev/pkg/metrics/config.go | 22 ++++++------ .../pkg/metrics/config_observability.go | 35 +++++++++++++++++++ vendor/modules.txt | 4 +-- 6 files changed, 56 insertions(+), 19 deletions(-) diff --git a/go.mod b/go.mod index 3931cef1..70964935 100644 --- a/go.mod +++ b/go.mod @@ -11,8 +11,8 @@ require ( k8s.io/client-go v0.25.4 k8s.io/code-generator v0.25.4 k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 - knative.dev/hack v0.0.0-20230228173453-3de51aff69a3 - knative.dev/pkg v0.0.0-20230224190030-645afb2d5dad + knative.dev/hack v0.0.0-20230317131237-3b8ef01d7c4f + knative.dev/pkg v0.0.0-20230329200100-696cac83c169 ) require ( diff --git a/go.sum b/go.sum index 9b4416d9..dc962e44 100644 --- a/go.sum +++ b/go.sum @@ -798,10 +798,10 @@ k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 h1:MQ8BAZPZlWk3S9K4a9NCkI k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1/go.mod h1:C/N6wCaBHeBHkHUesQOQy2/MZqGgMAFPqGsGQLdbZBU= k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 h1:GfD9OzL11kvZN5iArC6oTS7RTj7oJOIfnislxYlqTj8= k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -knative.dev/hack v0.0.0-20230228173453-3de51aff69a3 h1:Jt3n+AZsZHZaFhk/A1NnboAvgjV+hvvyeyyuIX/hUx0= -knative.dev/hack v0.0.0-20230228173453-3de51aff69a3/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q= -knative.dev/pkg v0.0.0-20230224190030-645afb2d5dad h1:RIjysOocoRfalLJgaSBkKHf6NrgdvAagF1x2CNihjqc= -knative.dev/pkg v0.0.0-20230224190030-645afb2d5dad/go.mod h1:TlO24rbgdsfqpkwZi1Ddue/LiVbvzankhaXpVdP+Nok= +knative.dev/hack v0.0.0-20230317131237-3b8ef01d7c4f h1:rDAppvqjU9jqa3D/eZJ/MuplGyPXqfFUEwG506obNVQ= +knative.dev/hack v0.0.0-20230317131237-3b8ef01d7c4f/go.mod h1:yk2OjGDsbEnQjfxdm0/HJKS2WqTLEFg/N6nUs6Rqx3Q= +knative.dev/pkg v0.0.0-20230329200100-696cac83c169 h1:kMn1q/pvNf88HsfOfC2Xbx3D38JSueKu2vfQTDrO6O4= +knative.dev/pkg v0.0.0-20230329200100-696cac83c169/go.mod h1:S+KfTInuwEkZSTwvWqrWZV/TEw6ps51GUGaSC1Fnbe0= 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= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/vendor/knative.dev/pkg/injection/health_check.go b/vendor/knative.dev/pkg/injection/health_check.go index 2899c7e3..d4eb7fd4 100644 --- a/vendor/knative.dev/pkg/injection/health_check.go +++ b/vendor/knative.dev/pkg/injection/health_check.go @@ -40,7 +40,7 @@ func ServeHealthProbes(ctx context.Context, port int) error { }() // start the web server on port and accept requests - logger.Infof("Probes server listening on port %s", port) + logger.Infof("Probes server listening on port %d", port) if err := server.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) { return err } diff --git a/vendor/knative.dev/pkg/metrics/config.go b/vendor/knative.dev/pkg/metrics/config.go index 3fe3c173..ce5e7f87 100644 --- a/vendor/knative.dev/pkg/metrics/config.go +++ b/vendor/knative.dev/pkg/metrics/config.go @@ -41,19 +41,21 @@ const ( DomainEnv = "METRICS_DOMAIN" // The following keys are used to configure metrics reporting. - // See https://github.com/knative/serving/blob/main/config/config-observability.yaml + // See https://github.com/knative/serving/blob/main/config/core/configmaps/observability.yaml // for details. collectorAddressKey = "metrics.opencensus-address" collectorSecureKey = "metrics.opencensus-require-tls" reportingPeriodKey = "metrics.reporting-period-seconds" - defaultBackendEnvName = "DEFAULT_METRICS_BACKEND" - defaultPrometheusPort = 9090 - maxPrometheusPort = 65535 - minPrometheusPort = 1024 - defaultPrometheusHost = "0.0.0.0" - prometheusPortEnvName = "METRICS_PROMETHEUS_PORT" - prometheusHostEnvName = "METRICS_PROMETHEUS_HOST" + defaultBackendEnvName = "DEFAULT_METRICS_BACKEND" + defaultPrometheusPort = 9090 + defaultPrometheusReportingPeriod = 5 + defaultOpenCensusReportingPeriod = 60 + maxPrometheusPort = 65535 + minPrometheusPort = 1024 + defaultPrometheusHost = "0.0.0.0" + prometheusPortEnvName = "METRICS_PROMETHEUS_PORT" + prometheusHostEnvName = "METRICS_PROMETHEUS_HOST" ) var ( @@ -206,9 +208,9 @@ func createMetricsConfig(_ context.Context, ops ExporterOptions) (*metricsConfig } else { switch mc.backendDestination { case openCensus: - mc.reportingPeriod = time.Minute + mc.reportingPeriod = defaultOpenCensusReportingPeriod * time.Second case prometheus: - mc.reportingPeriod = 5 * time.Second + mc.reportingPeriod = defaultPrometheusReportingPeriod * time.Second } } return &mc, nil diff --git a/vendor/knative.dev/pkg/metrics/config_observability.go b/vendor/knative.dev/pkg/metrics/config_observability.go index b6affd29..e766b071 100644 --- a/vendor/knative.dev/pkg/metrics/config_observability.go +++ b/vendor/knative.dev/pkg/metrics/config_observability.go @@ -71,6 +71,10 @@ type ObservabilityConfig struct { // OpenCensus. "None" disables all backends. RequestMetricsBackend string + // RequestMetricsReportingPeriodSeconds specifies the request metrics reporting period in sec at queue proxy, eg 1. + // If a zero or negative value is passed the default reporting period is used (10 secs). + RequestMetricsReportingPeriodSeconds int + // 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 @@ -114,6 +118,12 @@ func NewObservabilityConfigFromConfigMap(configMap *corev1.ConfigMap) (*Observab return oc, nil } + defaultRequestMetricsReportingPeriod, err := getDefaultRequestMetricsReportingPeriod(configMap.Data) + if err != nil { + return nil, err + } + oc.RequestMetricsReportingPeriodSeconds = defaultRequestMetricsReportingPeriod + if err := cm.Parse(configMap.Data, cm.AsBool("logging.enable-var-log-collection", &oc.EnableVarLogCollection), cm.AsString("logging.revision-url-template", &oc.LoggingURLTemplate), @@ -121,6 +131,7 @@ func NewObservabilityConfigFromConfigMap(configMap *corev1.ConfigMap) (*Observab cm.AsBool(EnableReqLogKey, &oc.EnableRequestLog), cm.AsBool(EnableProbeReqLogKey, &oc.EnableProbeRequestLog), cm.AsString("metrics.request-metrics-backend-destination", &oc.RequestMetricsBackend), + cm.AsInt("metrics.request-metrics-reporting-period-seconds", &oc.RequestMetricsReportingPeriodSeconds), cm.AsBool("profiling.enable", &oc.EnableProfiling), cm.AsString("metrics.opencensus-address", &oc.MetricsCollectorAddress), ); err != nil { @@ -163,3 +174,27 @@ func ConfigMapName() string { } return "config-observability" } + +// Use the same as `metrics.reporting-period-seconds` for the default +// of `metrics.request-metrics-reporting-period-seconds` +func getDefaultRequestMetricsReportingPeriod(data map[string]string) (int, error) { + // Default backend is prometheus + period := defaultPrometheusReportingPeriod + if repStr := data[reportingPeriodKey]; repStr != "" { + repInt, err := strconv.Atoi(repStr) + if err != nil { + return -1, fmt.Errorf("invalid %s value %q", reportingPeriodKey, repStr) + } + period = repInt + } else { + if raw, ok := data["metrics.request-metrics-backend-destination"]; ok { + switch metricsBackend(raw) { + case prometheus: + period = defaultPrometheusReportingPeriod + case openCensus: + period = defaultOpenCensusReportingPeriod + } + } + } + return period, nil +} diff --git a/vendor/modules.txt b/vendor/modules.txt index 7a8cf9dd..686191df 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -687,10 +687,10 @@ k8s.io/utils/internal/third_party/forked/golang/net k8s.io/utils/net k8s.io/utils/strings/slices k8s.io/utils/trace -# knative.dev/hack v0.0.0-20230228173453-3de51aff69a3 +# knative.dev/hack v0.0.0-20230317131237-3b8ef01d7c4f ## explicit; go 1.18 knative.dev/hack -# knative.dev/pkg v0.0.0-20230224190030-645afb2d5dad +# knative.dev/pkg v0.0.0-20230329200100-696cac83c169 ## explicit; go 1.18 knative.dev/pkg/apis knative.dev/pkg/apis/duck