Address PR comments

mtojek · mtojek · commit 8e10d6dd7e6b · 2023-05-24T10:12:34.000+02:00
diff --git a/agent/agent_test.go b/agent/agent_test.go
@@ -2066,25 +2066,28 @@ func TestAgent_Metrics_SSH(t *testing.T) {
 	}, testutil.WaitLong, testutil.IntervalFast)
 
 	require.Len(t, actual, len(expected))
-	verifyCollectedMetrics(t, expected, actual)
+	collected := verifyCollectedMetrics(t, expected, actual)
+	require.True(t, collected, "expected metrics were not collected")
 
 	_ = stdin.Close()
 	err = session.Wait()
 	require.NoError(t, err)
 }
 
 func verifyCollectedMetrics(t *testing.T, expected []agentsdk.AgentMetric, actual []*promgo.MetricFamily) bool {
+	t.Helper()
+
 	for i, e := range expected {
-		require.Equal(t, e.Name, actual[i].GetName())
-		require.Equal(t, string(e.Type), strings.ToLower(actual[i].GetType().String()))
+		assert.Equal(t, e.Name, actual[i].GetName())
+		assert.Equal(t, string(e.Type), strings.ToLower(actual[i].GetType().String()))
 
 		for _, m := range actual[i].GetMetric() {
-			require.Equal(t, e.Value, m.Counter.GetValue())
+			assert.Equal(t, e.Value, m.Counter.GetValue())
 
 			if len(m.GetLabel()) > 0 {
 				for j, lbl := range m.GetLabel() {
-					require.Equal(t, e.Labels[j].Name, lbl.GetName())
-					require.Equal(t, e.Labels[j].Value, lbl.GetValue())
+					assert.Equal(t, e.Labels[j].Name, lbl.GetName())
+					assert.Equal(t, e.Labels[j].Value, lbl.GetValue())
 				}
 			}
 			m.GetLabel()
diff --git a/coderd/prometheusmetrics/aggregator_test.go b/coderd/prometheusmetrics/aggregator_test.go
@@ -115,11 +115,11 @@ func verifyCollectedMetrics(t *testing.T, expected []agentsdk.AgentMetric, actua
 		require.NoError(t, err)
 
 		require.Equal(t, "agent_name", *d.Label[0].Name, d.String())
-		require.Equal(t, testAgentName, *d.Label[0].Value)
-		require.Equal(t, "username", *d.Label[1].Name)
-		require.Equal(t, testUsername, *d.Label[1].Value)
-		require.Equal(t, "workspace_name", *d.Label[2].Name)
-		require.Equal(t, testWorkspaceName, *d.Label[2].Value)
+		require.Equal(t, testAgentName, *d.Label[0].Value, d.String())
+		require.Equal(t, "username", *d.Label[1].Name, d.String())
+		require.Equal(t, testUsername, *d.Label[1].Value, d.String())
+		require.Equal(t, "workspace_name", *d.Label[2].Name, d.String())
+		require.Equal(t, testWorkspaceName, *d.Label[2].Value, d.String())
 
 		if e.Type == agentsdk.AgentMetricTypeCounter {
 			require.Equal(t, e.Value, *d.Counter.Value)
