Fixes

mtojek · mtojek · commit 0c81a7a564a8 · 2023-10-18T12:50:08.000+02:00
diff --git a/coderd/prometheusmetrics/insights/metricscollector.go b/coderd/prometheusmetrics/insights/metricscollector.go
@@ -16,7 +16,7 @@ import (
 )
 
 var (
-	activeUsersDesc = prometheus.NewDesc("coderd_insights_active_users", "The number of active users of the template.", []string{"template_name"}, nil)
+	templatesActiveUsersDesc = prometheus.NewDesc("coderd_insights_templates_active_users", "The number of active users of the template.", []string{"template_name"}, nil)
 )
 
 type MetricsCollector struct {
@@ -101,6 +101,7 @@ func (mc *MetricsCollector) Run(ctx context.Context) (func(), error) {
 
 		templateNames := onlyTemplateNames(templates)
 
+		// Refresh the collector state
 		mc.data.Store(&insightsData{
 			templates: templateInsights,
 
@@ -127,7 +128,7 @@ func (mc *MetricsCollector) Run(ctx context.Context) (func(), error) {
 }
 
 func (*MetricsCollector) Describe(descCh chan<- *prometheus.Desc) {
-	descCh <- activeUsersDesc
+	descCh <- templatesActiveUsersDesc
 }
 
 func (mc *MetricsCollector) Collect(metricsCh chan<- prometheus.Metric) {
@@ -139,7 +140,7 @@ func (mc *MetricsCollector) Collect(metricsCh chan<- prometheus.Metric) {
 	}
 
 	for _, templateRow := range data.templates {
-		metricsCh <- prometheus.MustNewConstMetric(activeUsersDesc, prometheus.GaugeValue, float64(templateRow.ActiveUsers), data.templateNames[templateRow.TemplateID])
+		metricsCh <- prometheus.MustNewConstMetric(templatesActiveUsersDesc, prometheus.GaugeValue, float64(templateRow.ActiveUsers), data.templateNames[templateRow.TemplateID])
 	}
 }
 
@@ -155,6 +156,7 @@ func uniqueTemplateIDs(templateInsights []database.GetTemplateInsightsByTemplate
 	var i int
 	for t := range tids {
 		uniqueUUIDs[i] = t
+		i++
 	}
 	return uniqueUUIDs
 }

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ import (`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`var (`
`19`		`- activeUsersDesc = prometheus.NewDesc("coderd_insights_active_users", "The number of active users of the template.", []string{"template_name"}, nil)`
	`19`	`+ templatesActiveUsersDesc = prometheus.NewDesc("coderd_insights_templates_active_users", "The number of active users of the template.", []string{"template_name"}, nil)`
`20`	`20`	`)`
`21`	`21`
`22`	`22`	`type MetricsCollector struct {`
`@@ -101,6 +101,7 @@ func (mc *MetricsCollector) Run(ctx context.Context) (func(), error) {`
`101`	`101`
`102`	`102`	`templateNames := onlyTemplateNames(templates)`
`103`	`103`
	`104`	`+ // Refresh the collector state`
`104`	`105`	`mc.data.Store(&insightsData{`
`105`	`106`	`templates: templateInsights,`
`106`	`107`
`@@ -127,7 +128,7 @@ func (mc *MetricsCollector) Run(ctx context.Context) (func(), error) {`
`127`	`128`	`}`
`128`	`129`
`129`	`130`	`func (MetricsCollector) Describe(descCh chan<- prometheus.Desc) {`
`130`		`- descCh <- activeUsersDesc`
	`131`	`+ descCh <- templatesActiveUsersDesc`
`131`	`132`	`}`
`132`	`133`
`133`	`134`	`func (mc *MetricsCollector) Collect(metricsCh chan<- prometheus.Metric) {`
`@@ -139,7 +140,7 @@ func (mc *MetricsCollector) Collect(metricsCh chan<- prometheus.Metric) {`
`139`	`140`	`}`
`140`	`141`
`141`	`142`	`for _, templateRow := range data.templates {`
`142`		`- metricsCh <- prometheus.MustNewConstMetric(activeUsersDesc, prometheus.GaugeValue, float64(templateRow.ActiveUsers), data.templateNames[templateRow.TemplateID])`
	`143`	`+ metricsCh <- prometheus.MustNewConstMetric(templatesActiveUsersDesc, prometheus.GaugeValue, float64(templateRow.ActiveUsers), data.templateNames[templateRow.TemplateID])`
`143`	`144`	`}`
`144`	`145`	`}`
`145`	`146`
`@@ -155,6 +156,7 @@ func uniqueTemplateIDs(templateInsights []database.GetTemplateInsightsByTemplate`
`155`	`156`	`var i int`
`156`	`157`	`for t := range tids {`
`157`	`158`	`uniqueUUIDs[i] = t`
	`159`	`+ i++`
`158`	`160`	`}`
`159`	`161`	`return uniqueUUIDs`
`160`	`162`	`}`