Aggregator

mtojek · mtojek · commit b7011ae4d8af · 2023-04-26T13:16:14.000+02:00
diff --git a/coderd/prometheusmetrics/aggregator.go b/coderd/prometheusmetrics/aggregator.go
@@ -164,7 +164,7 @@ func (ma *MetricsAggregator) Run(ctx context.Context) func() {
 
 				var hasExpiredMetrics bool
 				for _, m := range ma.queue {
-					if m.expiryDate.After(now) {
+					if now.After(m.expiryDate) {
 						hasExpiredMetrics = true
 						break
 					}
diff --git a/coderd/prometheusmetrics/aggregator_test.go b/coderd/prometheusmetrics/aggregator_test.go
@@ -38,20 +38,20 @@ func TestUpdateMetrics_MetricsDoNotExpire(t *testing.T) {
 
 	given1 := []agentsdk.AgentMetric{
 		{Name: "a_counter_one", Type: agentsdk.AgentMetricTypeCounter, Value: 1},
-		{Name: "b_gauge_three", Type: agentsdk.AgentMetricTypeCounter, Value: 2},
-		{Name: "c_gauge_four", Type: agentsdk.AgentMetricTypeCounter, Value: 3},
+		{Name: "b_counter_two", Type: agentsdk.AgentMetricTypeCounter, Value: 2},
+		{Name: "c_gauge_three", Type: agentsdk.AgentMetricTypeGauge, Value: 3},
 	}
 
 	given2 := []agentsdk.AgentMetric{
-		{Name: "b_gauge_three", Type: agentsdk.AgentMetricTypeCounter, Value: 4},
-		{Name: "d_gauge_four", Type: agentsdk.AgentMetricTypeCounter, Value: 6},
+		{Name: "b_counter_two", Type: agentsdk.AgentMetricTypeCounter, Value: 4},
+		{Name: "d_gauge_four", Type: agentsdk.AgentMetricTypeGauge, Value: 6},
 	}
 
 	expected := []agentsdk.AgentMetric{
 		{Name: "a_counter_one", Type: agentsdk.AgentMetricTypeCounter, Value: 1},
-		{Name: "b_gauge_three", Type: agentsdk.AgentMetricTypeCounter, Value: 4},
-		{Name: "c_gauge_four", Type: agentsdk.AgentMetricTypeCounter, Value: 3},
-		{Name: "d_gauge_four", Type: agentsdk.AgentMetricTypeCounter, Value: 6},
+		{Name: "b_counter_two", Type: agentsdk.AgentMetricTypeCounter, Value: 4},
+		{Name: "c_gauge_three", Type: agentsdk.AgentMetricTypeGauge, Value: 3},
+		{Name: "d_gauge_four", Type: agentsdk.AgentMetricTypeGauge, Value: 6},
 	}
 
 	// when
@@ -62,14 +62,20 @@ func TestUpdateMetrics_MetricsDoNotExpire(t *testing.T) {
 	require.Eventually(t, func() bool {
 		var actual []prometheus.Metric
 		metricsCh := make(chan prometheus.Metric)
+
+		done := make(chan struct{}, 1)
+		defer close(done)
 		go func() {
 			for m := range metricsCh {
 				actual = append(actual, m)
 			}
+			done <- struct{}{}
 		}()
 		metricsAggregator.Collect(metricsCh)
+		close(metricsCh)
+		<-done
 		return verifyCollectedMetrics(t, expected, actual)
-	}, testutil.WaitMedium, testutil.IntervalFast)
+	}, testutil.WaitMedium, testutil.IntervalSlow)
 }
 
 func verifyCollectedMetrics(t *testing.T, expected []agentsdk.AgentMetric, actual []prometheus.Metric) bool {
@@ -131,12 +137,18 @@ func TestUpdateMetrics_MetricsExpire(t *testing.T) {
 	require.Eventually(t, func() bool {
 		var actual []prometheus.Metric
 		metricsCh := make(chan prometheus.Metric)
+
+		done := make(chan struct{}, 1)
+		defer close(done)
 		go func() {
 			for m := range metricsCh {
 				actual = append(actual, m)
 			}
+			done <- struct{}{}
 		}()
 		metricsAggregator.Collect(metricsCh)
+		close(metricsCh)
+		<-done
 		return len(actual) == 0
 	}, testutil.WaitShort, testutil.IntervalFast)
 }

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ func (ma *MetricsAggregator) Run(ctx context.Context) func() {`
`164`	`164`
`165`	`165`	`var hasExpiredMetrics bool`
`166`	`166`	`for _, m := range ma.queue {`
`167`		`- if m.expiryDate.After(now) {`
	`167`	`+ if now.After(m.expiryDate) {`
`168`	`168`	`hasExpiredMetrics = true`
`169`	`169`	`break`
`170`	`170`	`}`