Merge pull request #20505 from chaodaiG/more-report-version

k8s-ci-robot · web-flow · commit c4c19e6d2072 · 2021-01-19T09:29:11.000-08:00
Move prow version prometheus metrics out of prowjob metrics, more prow components report this metric
diff --git a/prow/cmd/sinker/BUILD.bazel b/prow/cmd/sinker/BUILD.bazel
@@ -52,6 +52,7 @@ go_library(
         "//prow/logrusutil:go_default_library",
         "//prow/metrics:go_default_library",
         "//prow/pjutil:go_default_library",
+        "//prow/version:go_default_library",
         "@com_github_pkg_errors//:go_default_library",
         "@com_github_prometheus_client_golang//prometheus:go_default_library",
         "@com_github_sirupsen_logrus//:go_default_library",
diff --git a/prow/cmd/sinker/main.go b/prow/cmd/sinker/main.go
@@ -45,6 +45,7 @@ import (
 	"k8s.io/test-infra/prow/logrusutil"
 	"k8s.io/test-infra/prow/metrics"
 	"k8s.io/test-infra/prow/pjutil"
+	"k8s.io/test-infra/prow/version"
 )
 
 type options struct {
@@ -463,6 +464,7 @@ func (c *controller) clean() {
 	for k, v := range metrics.prowJobsCleaningErrors {
 		sinkerMetrics.prowJobsCleaningErrors.WithLabelValues(k).Set(float64(v))
 	}
+	version.GatherProwVersion(c.logger)
 	c.logger.Info("Sinker reconciliation complete.")
 }
 
diff --git a/prow/kube/BUILD.bazel b/prow/kube/BUILD.bazel
@@ -40,7 +40,6 @@ go_library(
         "//prow/apis/prowjobs/v1:go_default_library",
         "//prow/client/clientset/versioned:go_default_library",
         "//prow/client/clientset/versioned/typed/prowjobs/v1:go_default_library",
-        "//prow/version:go_default_library",
         "@com_github_prometheus_client_golang//prometheus:go_default_library",
         "@com_github_sirupsen_logrus//:go_default_library",
         "@io_k8s_api//core/v1:go_default_library",
diff --git a/prow/kube/metrics.go b/prow/kube/metrics.go
@@ -21,7 +21,6 @@ import (
 	"github.com/sirupsen/logrus"
 
 	prowapi "k8s.io/test-infra/prow/apis/prowjobs/v1"
-	"k8s.io/test-infra/prow/version"
 )
 
 var (
@@ -51,10 +50,6 @@ var (
 		Name: "prowjob_state_transitions",
 		Help: "Number of prowjobs transitioning states",
 	}, metricLabels)
-	prowVersion = prometheus.NewGauge(prometheus.GaugeOpts{
-		Name: "prow_version",
-		Help: "Prow version",
-	})
 )
 
 type jobLabel struct {
@@ -75,7 +70,6 @@ func (jl *jobLabel) values() []string {
 func init() {
 	prometheus.MustRegister(prowJobs)
 	prometheus.MustRegister(prowJobTransitions)
-	prometheus.MustRegister(prowVersion)
 }
 
 func getJobLabelMap(pjs []prowapi.ProwJob) map[jobLabel]float64 {
@@ -125,16 +119,6 @@ func GatherProwJobMetrics(l *logrus.Entry, current []prowapi.ProwJob) {
 	// stale metrics like triggered or pending jobs that are now complete.
 	prowJobs.Reset()
 
-	// record prow version
-	version, err := version.VersionTimestamp()
-	if err != nil {
-		// Not worth panicking
-		l.WithError(err).Debug("Failed to get version timestamp")
-		prowVersion.Set(-1)
-	} else {
-		prowVersion.Set(float64(version))
-	}
-
 	// record the current state of ProwJob CRs on the system
 	for jl, count := range getJobLabelMap(current) {
 		prowJobs.WithLabelValues(jl.values()...).Set(count)
diff --git a/prow/plank/BUILD.bazel b/prow/plank/BUILD.bazel
@@ -59,6 +59,7 @@ go_library(
         "//prow/kube:go_default_library",
         "//prow/pjutil:go_default_library",
         "//prow/pod-utils/decorate:go_default_library",
+        "//prow/version:go_default_library",
         "@com_github_sirupsen_logrus//:go_default_library",
         "@io_k8s_api//core/v1:go_default_library",
         "@io_k8s_apimachinery//pkg/api/errors:go_default_library",
diff --git a/prow/plank/controller.go b/prow/plank/controller.go
@@ -39,6 +39,7 @@ import (
 	"k8s.io/test-infra/prow/kube"
 	"k8s.io/test-infra/prow/pjutil"
 	"k8s.io/test-infra/prow/pod-utils/decorate"
+	"k8s.io/test-infra/prow/version"
 )
 
 // PodStatus constants
@@ -264,6 +265,7 @@ func (c *Controller) SyncMetrics() {
 	c.pjLock.RLock()
 	defer c.pjLock.RUnlock()
 	kube.GatherProwJobMetrics(c.log, c.pjs)
+	version.GatherProwVersion(c.log)
 }
 
 // terminateDupes aborts presubmits that have a newer version. It modifies pjs
diff --git a/prow/plank/reconciler.go b/prow/plank/reconciler.go
@@ -47,6 +47,7 @@ import (
 	"k8s.io/test-infra/prow/kube"
 	"k8s.io/test-infra/prow/pjutil"
 	"k8s.io/test-infra/prow/pod-utils/decorate"
+	"k8s.io/test-infra/prow/version"
 )
 
 const ControllerName = "plank"
@@ -161,6 +162,7 @@ func (r *reconciler) syncMetrics(ctx context.Context) error {
 				continue
 			}
 			kube.GatherProwJobMetrics(r.log, pjs.Items)
+			version.GatherProwVersion(r.log)
 		}
 	}
 }
diff --git a/prow/tide/BUILD.bazel b/prow/tide/BUILD.bazel
@@ -18,6 +18,7 @@ go_library(
         "//prow/pjutil:go_default_library",
         "//prow/tide/blockers:go_default_library",
         "//prow/tide/history:go_default_library",
+        "//prow/version:go_default_library",
         "@com_github_prometheus_client_golang//prometheus:go_default_library",
         "@com_github_shurcool_githubv4//:go_default_library",
         "@com_github_sirupsen_logrus//:go_default_library",
diff --git a/prow/tide/tide.go b/prow/tide/tide.go
@@ -46,6 +46,7 @@ import (
 	"k8s.io/test-infra/prow/pjutil"
 	"k8s.io/test-infra/prow/tide/blockers"
 	"k8s.io/test-infra/prow/tide/history"
+	"k8s.io/test-infra/prow/version"
 )
 
 // For mocking out sleep during unit tests.
@@ -358,6 +359,7 @@ func (c *Controller) Sync() error {
 		c.logger.WithField("duration", duration.String()).Info("Synced")
 		tideMetrics.syncDuration.Set(duration.Seconds())
 		tideMetrics.syncHeartbeat.WithLabelValues("sync").Inc()
+		version.GatherProwVersion(c.logger)
 	}()
 	defer c.changedFiles.prune()
 	c.config().BranchProtectionWarnings(c.logger, c.config().PresubmitsStatic)
diff --git a/prow/version/BUILD.bazel b/prow/version/BUILD.bazel
@@ -2,10 +2,17 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 
 go_library(
     name = "go_default_library",
-    srcs = ["doc.go"],
+    srcs = [
+        "doc.go",
+        "metrics.go",
+    ],
     importpath = "k8s.io/test-infra/prow/version",
     visibility = ["//visibility:public"],
     x_defs = {"Version": "{DOCKER_TAG}"},
+    deps = [
+        "@com_github_prometheus_client_golang//prometheus:go_default_library",
+        "@com_github_sirupsen_logrus//:go_default_library",
+    ],
 )
 
 go_test(
diff --git a/prow/version/metrics.go b/prow/version/metrics.go
@@ -0,0 +1,46 @@
+/*
+Copyright 2020 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package version
+
+import (
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/sirupsen/logrus"
+)
+
+var (
+	prowVersion = prometheus.NewGauge(prometheus.GaugeOpts{
+		Name: "prow_version",
+		Help: "Prow version",
+	})
+)
+
+func init() {
+	prometheus.MustRegister(prowVersion)
+}
+
+// GatherProwVersion reports prow version
+func GatherProwVersion(l *logrus.Entry) {
+	// record prow version
+	version, err := VersionTimestamp()
+	if err != nil {
+		// Not worth panicking
+		l.WithError(err).Debug("Failed to get version timestamp")
+		prowVersion.Set(-1)
+	} else {
+		prowVersion.Set(float64(version))
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ import (`
`45`	`45`	`"k8s.io/test-infra/prow/logrusutil"`
`46`	`46`	`"k8s.io/test-infra/prow/metrics"`
`47`	`47`	`"k8s.io/test-infra/prow/pjutil"`
	`48`	`+ "k8s.io/test-infra/prow/version"`
`48`	`49`	`)`
`49`	`50`
`50`	`51`	`type options struct {`
`@@ -463,6 +464,7 @@ func (c *controller) clean() {`
`463`	`464`	`for k, v := range metrics.prowJobsCleaningErrors {`
`464`	`465`	`sinkerMetrics.prowJobsCleaningErrors.WithLabelValues(k).Set(float64(v))`
`465`	`466`	`}`
	`467`	`+ version.GatherProwVersion(c.logger)`
`466`	`468`	`c.logger.Info("Sinker reconciliation complete.")`
`467`	`469`	`}`
`468`	`470`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ import (`
`39`	`39`	`"k8s.io/test-infra/prow/kube"`
`40`	`40`	`"k8s.io/test-infra/prow/pjutil"`
`41`	`41`	`"k8s.io/test-infra/prow/pod-utils/decorate"`
	`42`	`+ "k8s.io/test-infra/prow/version"`
`42`	`43`	`)`
`43`	`44`
`44`	`45`	`// PodStatus constants`
`@@ -264,6 +265,7 @@ func (c *Controller) SyncMetrics() {`
`264`	`265`	`c.pjLock.RLock()`
`265`	`266`	`defer c.pjLock.RUnlock()`
`266`	`267`	`kube.GatherProwJobMetrics(c.log, c.pjs)`
	`268`	`+ version.GatherProwVersion(c.log)`
`267`	`269`	`}`
`268`	`270`
`269`	`271`	`// terminateDupes aborts presubmits that have a newer version. It modifies pjs`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ import (`
`47`	`47`	`"k8s.io/test-infra/prow/kube"`
`48`	`48`	`"k8s.io/test-infra/prow/pjutil"`
`49`	`49`	`"k8s.io/test-infra/prow/pod-utils/decorate"`
	`50`	`+ "k8s.io/test-infra/prow/version"`
`50`	`51`	`)`
`51`	`52`
`52`	`53`	`const ControllerName = "plank"`
`@@ -161,6 +162,7 @@ func (r *reconciler) syncMetrics(ctx context.Context) error {`
`161`	`162`	`continue`
`162`	`163`	`}`
`163`	`164`	`kube.GatherProwJobMetrics(r.log, pjs.Items)`
	`165`	`+ version.GatherProwVersion(r.log)`
`164`	`166`	`}`
`165`	`167`	`}`
`166`	`168`	`}`