fix reportstats

coadler · coadler · commit 3bdb07d38e87 · 2023-02-09T13:35:08.000-06:00
diff --git a/codersdk/agentsdk/agentsdk.go b/codersdk/agentsdk/agentsdk.go
@@ -371,6 +371,7 @@ func (c *Client) AuthAzureInstanceIdentity(ctx context.Context) (AuthenticateRes
 func (c *Client) ReportStats(ctx context.Context, log slog.Logger, statsChan <-chan *Stats, setInterval func(time.Duration)) (io.Closer, error) {
 	var interval time.Duration
 	ctx, cancel := context.WithCancel(ctx)
+	exited := make(chan struct{})
 
 	postStat := func(stat *Stats) {
 		var nextInterval time.Duration
@@ -387,7 +388,7 @@ func (c *Client) ReportStats(ctx context.Context, log slog.Logger, statsChan <-c
 			break
 		}
 
-		if interval != nextInterval {
+		if nextInterval != 0 && interval != nextInterval {
 			setInterval(nextInterval)
 		}
 		interval = nextInterval
@@ -397,6 +398,8 @@ func (c *Client) ReportStats(ctx context.Context, log slog.Logger, statsChan <-c
 	postStat(&Stats{ConnsByProto: map[string]int64{}})
 
 	go func() {
+		defer close(exited)
+
 		for {
 			select {
 			case <-ctx.Done():
@@ -413,6 +416,7 @@ func (c *Client) ReportStats(ctx context.Context, log slog.Logger, statsChan <-c
 
 	return closeFunc(func() error {
 		cancel()
+		<-exited
 		return nil
 	}), nil
 }
diff --git a/codersdk/workspaceagents_test.go b/codersdk/workspaceagents_test.go
@@ -91,5 +91,6 @@ func TestAgentReportStats(t *testing.T) {
 		func() bool { return numReports.Load() >= 3 },
 		testutil.WaitMedium, testutil.IntervalFast,
 	)
+	closeStream.Close()
 	require.Equal(t, int64(1), numIntervalCalls.Load())
 }

Original file line number	Diff line number	Diff line change
`@@ -91,5 +91,6 @@ func TestAgentReportStats(t *testing.T) {`
`91`	`91`	`func() bool { return numReports.Load() >= 3 },`
`92`	`92`	`testutil.WaitMedium, testutil.IntervalFast,`
`93`	`93`	`)`
	`94`	`+ closeStream.Close()`
`94`	`95`	`require.Equal(t, int64(1), numIntervalCalls.Load())`
`95`	`96`	`}`