Collector adjustments

mtojek · mtojek · commit 0c6d00e4819f · 2023-10-12T12:49:17.000+02:00
diff --git a/enterprise/coderd/coderd.go b/enterprise/coderd/coderd.go
@@ -100,7 +100,7 @@ func New(ctx context.Context, options *Options) (_ *API, err error) {
 			psk:        options.ProvisionerDaemonPSK,
 			authorizer: options.Authorizer,
 		},
-		licenseMetricsCollector: new(license.MetricsCollector),
+		licenseMetricsCollector: license.NewMetricsCollector(),
 	}
 	defer func() {
 		if err != nil {
diff --git a/enterprise/coderd/license/metricscollector.go b/enterprise/coderd/license/metricscollector.go
@@ -63,16 +63,15 @@ func (mc *MetricsCollector) Collect(metricsCh chan<- prometheus.Metric) {
 		enabled = 1
 	}
 	mc.userLimitEnabledGauge.Set(enabled)
+	metricsCh <- mc.userLimitEnabledGauge
 
 	if userLimitEntitlement.Actual != nil {
 		mc.activeUsersGauge.Set(float64(*userLimitEntitlement.Actual))
+		metricsCh <- mc.activeUsersGauge
 	}
 
 	if userLimitEntitlement.Limit != nil {
 		mc.limitUsersGauge.Set(float64(*userLimitEntitlement.Limit))
+		metricsCh <- mc.limitUsersGauge
 	}
-
-	metricsCh <- mc.activeUsersGauge
-	metricsCh <- mc.limitUsersGauge
-	metricsCh <- mc.userLimitEnabledGauge
 }

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ func New(ctx context.Context, options Options) (_ API, err error) {`
`100`	`100`	`psk: options.ProvisionerDaemonPSK,`
`101`	`101`	`authorizer: options.Authorizer,`
`102`	`102`	`},`
`103`		`- licenseMetricsCollector: new(license.MetricsCollector),`
	`103`	`+ licenseMetricsCollector: license.NewMetricsCollector(),`
`104`	`104`	`}`
`105`	`105`	`defer func() {`
`106`	`106`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -63,16 +63,15 @@ func (mc *MetricsCollector) Collect(metricsCh chan<- prometheus.Metric) {`
`63`	`63`	`enabled = 1`
`64`	`64`	`}`
`65`	`65`	`mc.userLimitEnabledGauge.Set(enabled)`
	`66`	`+ metricsCh <- mc.userLimitEnabledGauge`
`66`	`67`
`67`	`68`	`if userLimitEntitlement.Actual != nil {`
`68`	`69`	`mc.activeUsersGauge.Set(float64(*userLimitEntitlement.Actual))`
	`70`	`+ metricsCh <- mc.activeUsersGauge`
`69`	`71`	`}`
`70`	`72`
`71`	`73`	`if userLimitEntitlement.Limit != nil {`
`72`	`74`	`mc.limitUsersGauge.Set(float64(*userLimitEntitlement.Limit))`
	`75`	`+ metricsCh <- mc.limitUsersGauge`
`73`	`76`	`}`
`74`		`-`
`75`		`- metricsCh <- mc.activeUsersGauge`
`76`		`- metricsCh <- mc.limitUsersGauge`
`77`		`- metricsCh <- mc.userLimitEnabledGauge`
`78`	`77`	`}`