Address PR comments

mtojek · mtojek · commit 29a870206f80 · 2023-04-26T17:18:39.000+02:00
diff --git a/cli/server.go b/cli/server.go
@@ -733,7 +733,10 @@ func (r *RootCmd) Server(newAPI func(context.Context, *coderd.Options) (*coderd.
 					defer cancelMetricsAggregator()
 
 					options.UpdateAgentMetrics = metricsAggregator.Update
-					options.PrometheusRegistry.MustRegister(metricsAggregator)
+					err = options.PrometheusRegistry.Register(metricsAggregator)
+					if err != nil {
+						return xerrors.Errorf("can't register metrics aggregator as collector: %w", err)
+					}
 				}
 
 				//nolint:revive
diff --git a/coderd/prometheusmetrics/aggregator.go b/coderd/prometheusmetrics/aggregator.go
@@ -17,7 +17,7 @@ const (
 	// messages. This is because a registry cannot have conflicting
 	// help messages for the same metric in a "gather". If our coder agents are
 	// on different versions, this is a possible scenario.
-	metricHelpForAgent = "Metric is forwarded from workspace agent connected to this instance of coderd."
+	metricHelpForAgent = "Metrics are forwarded from workspace agents connected to this instance of coderd."
 )
 
 const (
@@ -172,14 +172,13 @@ func (ma *MetricsAggregator) Run(ctx context.Context) func() {
 
 				if hasExpiredMetrics {
 					var j int
-					fresh := make([]annotatedMetric, len(ma.queue))
+					fresh := make([]annotatedMetric, 0, len(ma.queue))
 					for _, m := range ma.queue {
 						if m.expiryDate.After(now) {
 							fresh[j] = m
 							j++
 						}
 					}
-					fresh = fresh[:j]
 					ma.queue = fresh
 				}
 

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ const (`
`17`	`17`	`// messages. This is because a registry cannot have conflicting`
`18`	`18`	`// help messages for the same metric in a "gather". If our coder agents are`
`19`	`19`	`// on different versions, this is a possible scenario.`
`20`		`- metricHelpForAgent = "Metric is forwarded from workspace agent connected to this instance of coderd."`
	`20`	`+ metricHelpForAgent = "Metrics are forwarded from workspace agents connected to this instance of coderd."`
`21`	`21`	`)`
`22`	`22`
`23`	`23`	`const (`
`@@ -172,14 +172,13 @@ func (ma *MetricsAggregator) Run(ctx context.Context) func() {`
`172`	`172`
`173`	`173`	`if hasExpiredMetrics {`
`174`	`174`	`var j int`
`175`		`- fresh := make([]annotatedMetric, len(ma.queue))`
	`175`	`+ fresh := make([]annotatedMetric, 0, len(ma.queue))`
`176`	`176`	`for _, m := range ma.queue {`
`177`	`177`	`if m.expiryDate.After(now) {`
`178`	`178`	`fresh[j] = m`
`179`	`179`	`j++`
`180`	`180`	`}`
`181`	`181`	`}`
`182`		`- fresh = fresh[:j]`
`183`	`182`	`ma.queue = fresh`
`184`	`183`	`}`
`185`	`184`