Merge pull request #1342 from openshift-cherrypick-robot/cherry-pick-1340-to-release-4.4

openshift-merge-robot · web-flow · commit 8cb4ed8e0960 · 2020-03-06T17:12:36.000+01:00
[release-4.4] Bug 1809646: Update subscription_sync_count to include the package name
diff --git a/pkg/controller/operators/catalog/subscription/syncer.go b/pkg/controller/operators/catalog/subscription/syncer.go
@@ -91,7 +91,7 @@ func (s *subscriptionSyncer) recordMetrics(sub *v1alpha1.Subscription) {
 		return
 	}
 
-	metrics.CounterForSubscription(sub.GetName(), sub.Status.InstalledCSV, sub.Spec.Channel).Inc()
+	metrics.CounterForSubscription(sub.GetName(), sub.Status.InstalledCSV, sub.Spec.Channel, sub.Spec.Package).Inc()
 }
 
 func (s *subscriptionSyncer) Notify(event kubestate.ResourceEvent) {
diff --git a/pkg/metrics/metrics.go b/pkg/metrics/metrics.go
@@ -18,6 +18,7 @@ const (
 	VERSION_LABEL   = "version"
 	PHASE_LABEL     = "phase"
 	REASON_LABEL    = "reason"
+	PACKAGE_LABEL   = "package"
 )
 
 // TODO(alecmerdler): Can we use this to emit Kubernetes events?
@@ -149,7 +150,7 @@ var (
 			Name: "subscription_sync_total",
 			Help: "Monotonic count of subscription syncs",
 		},
-		[]string{NAME_LABEL, INSTALLED_LABEL, CHANNEL_LABEL},
+		[]string{NAME_LABEL, INSTALLED_LABEL, CHANNEL_LABEL, PACKAGE_LABEL},
 	)
 
 	csvSucceeded = prometheus.NewGaugeVec(
@@ -183,8 +184,8 @@ func RegisterCatalog() {
 	prometheus.MustRegister(SubscriptionSyncCount)
 }
 
-func CounterForSubscription(name, installedCSV, channelName string) prometheus.Counter {
-	return SubscriptionSyncCount.WithLabelValues(name, installedCSV, channelName)
+func CounterForSubscription(name, installedCSV, channelName, packageName string) prometheus.Counter {
+	return SubscriptionSyncCount.WithLabelValues(name, installedCSV, channelName, packageName)
 }
 
 func EmitCSVMetric(oldCSV *olmv1alpha1.ClusterServiceVersion, newCSV *olmv1alpha1.ClusterServiceVersion) {

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ func (s subscriptionSyncer) recordMetrics(sub v1alpha1.Subscription) {`
`91`	`91`	`return`
`92`	`92`	`}`
`93`	`93`
`94`		`- metrics.CounterForSubscription(sub.GetName(), sub.Status.InstalledCSV, sub.Spec.Channel).Inc()`
	`94`	`+ metrics.CounterForSubscription(sub.GetName(), sub.Status.InstalledCSV, sub.Spec.Channel, sub.Spec.Package).Inc()`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`func (s *subscriptionSyncer) Notify(event kubestate.ResourceEvent) {`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ const (`
`18`	`18`	`VERSION_LABEL = "version"`
`19`	`19`	`PHASE_LABEL = "phase"`
`20`	`20`	`REASON_LABEL = "reason"`
	`21`	`+ PACKAGE_LABEL = "package"`
`21`	`22`	`)`
`22`	`23`
`23`	`24`	`// TODO(alecmerdler): Can we use this to emit Kubernetes events?`
`@@ -149,7 +150,7 @@ var (`
`149`	`150`	`Name: "subscription_sync_total",`
`150`	`151`	`Help: "Monotonic count of subscription syncs",`
`151`	`152`	`},`
`152`		`- []string{NAME_LABEL, INSTALLED_LABEL, CHANNEL_LABEL},`
	`153`	`+ []string{NAME_LABEL, INSTALLED_LABEL, CHANNEL_LABEL, PACKAGE_LABEL},`
`153`	`154`	`)`
`154`	`155`
`155`	`156`	`csvSucceeded = prometheus.NewGaugeVec(`
`@@ -183,8 +184,8 @@ func RegisterCatalog() {`
`183`	`184`	`prometheus.MustRegister(SubscriptionSyncCount)`
`184`	`185`	`}`
`185`	`186`
`186`		`-func CounterForSubscription(name, installedCSV, channelName string) prometheus.Counter {`
`187`		`- return SubscriptionSyncCount.WithLabelValues(name, installedCSV, channelName)`
	`187`	`+func CounterForSubscription(name, installedCSV, channelName, packageName string) prometheus.Counter {`
	`188`	`+ return SubscriptionSyncCount.WithLabelValues(name, installedCSV, channelName, packageName)`
`188`	`189`	`}`
`189`	`190`
`190`	`191`	`func EmitCSVMetric(oldCSV olmv1alpha1.ClusterServiceVersion, newCSV olmv1alpha1.ClusterServiceVersion) {`