fix

mtojek · mtojek · commit c90a41f8f485 · 2024-01-25T11:48:09.000+01:00
diff --git a/coderd/prometheusmetrics/aggregator.go b/coderd/prometheusmetrics/aggregator.go
@@ -26,7 +26,7 @@ const (
 	loggerName = "prometheusmetrics"
 
 	sizeCollectCh = 10
-	sizeUpdateCh  = 1024
+	sizeUpdateCh  = 4096
 
 	defaultMetricsCleanupInterval = 2 * time.Minute
 )
diff --git a/coderd/prometheusmetrics/aggregator_test.go b/coderd/prometheusmetrics/aggregator_test.go
@@ -131,36 +131,9 @@ func verifyCollectedMetrics(t *testing.T, expected []*agentproto.Stats_Metric, a
 		return false
 	}
 
-	prometheusMetricString := func(m prometheus.Metric) string {
-		var sb strings.Builder
-
-		desc := m.Desc()
-		_, _ = sb.WriteString(desc.String())
-		_ = sb.WriteByte('|')
-
-		var d dto.Metric
-		err := m.Write(&d)
-		require.NoError(t, err)
-		dtoLabels := asMetricAgentLabels(d.GetLabel())
-		sort.Slice(dtoLabels, func(i, j int) bool {
-			return dtoLabels[i].Name < dtoLabels[j].Name
-		})
-
-		for i, dtoLabel := range dtoLabels {
-			_, _ = sb.WriteString(dtoLabel.Name)
-			_ = sb.WriteByte('=')
-			_, _ = sb.WriteString(dtoLabel.Value)
-
-			if i-1 != len(dtoLabels) {
-				_ = sb.WriteByte(',')
-			}
-		}
-		return sb.String()
-	}
-
 	sort.Slice(actual, func(i, j int) bool {
-		m1 := prometheusMetricString(actual[i])
-		m2 := prometheusMetricString(actual[j])
+		m1 := prometheusMetricToString(t, actual[i])
+		m2 := prometheusMetricToString(t, actual[j])
 		return m1 < m2
 	})
 
@@ -190,6 +163,33 @@ func verifyCollectedMetrics(t *testing.T, expected []*agentproto.Stats_Metric, a
 	return true
 }
 
+func prometheusMetricToString(t *testing.T, m prometheus.Metric) string {
+	var sb strings.Builder
+
+	desc := m.Desc()
+	_, _ = sb.WriteString(desc.String())
+	_ = sb.WriteByte('|')
+
+	var d dto.Metric
+	err := m.Write(&d)
+	require.NoError(t, err)
+	dtoLabels := asMetricAgentLabels(d.GetLabel())
+	sort.Slice(dtoLabels, func(i, j int) bool {
+		return dtoLabels[i].Name < dtoLabels[j].Name
+	})
+
+	for i, dtoLabel := range dtoLabels {
+		_, _ = sb.WriteString(dtoLabel.Name)
+		_ = sb.WriteByte('=')
+		_, _ = sb.WriteString(dtoLabel.Value)
+
+		if i-1 != len(dtoLabels) {
+			_ = sb.WriteByte(',')
+		}
+	}
+	return sb.String()
+}
+
 func asMetricAgentLabels(dtoLabels []*dto.LabelPair) []*agentproto.Stats_Metric_Label {
 	metricLabels := make([]*agentproto.Stats_Metric_Label, 0, len(dtoLabels))
 	for _, dtoLabel := range dtoLabels {

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ const (`
`26`	`26`	`loggerName = "prometheusmetrics"`
`27`	`27`
`28`	`28`	`sizeCollectCh = 10`
`29`		`- sizeUpdateCh = 1024`
	`29`	`+ sizeUpdateCh = 4096`
`30`	`30`
`31`	`31`	`defaultMetricsCleanupInterval = 2 * time.Minute`
`32`	`32`	`)`