Fixes

mtojek · mtojek · commit f8f11ebef255 · 2023-04-14T14:43:20.000+02:00
diff --git a/coderd/prometheusmetrics/prometheusmetrics.go b/coderd/prometheusmetrics/prometheusmetrics.go
@@ -191,8 +191,9 @@ func Agents(ctx context.Context, logger slog.Logger, registerer prometheus.Regis
 		return nil, err
 	}
 
+	ctx, cancelFunc := context.WithCancel(ctx)
 	// nolint:gocritic // Prometheus must collect metrics for all Coder users.
-	ctx, cancelFunc := context.WithCancel(dbauthz.AsSystemRestricted(ctx))
+	ctx = dbauthz.AsSystemRestricted(ctx)
 	done := make(chan struct{})
 
 	ticker := time.NewTicker(duration)
diff --git a/coderd/prometheusmetrics/prometheusmetrics_test.go b/coderd/prometheusmetrics/prometheusmetrics_test.go
@@ -305,8 +305,11 @@ func TestAgents(t *testing.T) {
 	agentInactiveDisconnectTimeout := 1 * time.Hour // don't need to focus on this value in tests
 	registry := prometheus.NewRegistry()
 
+	ctx, cancelFunc := context.WithCancel(context.Background())
+	defer cancelFunc()
+
 	// when
-	closeFunc, err := prometheusmetrics.Agents(context.Background(), slogtest.Make(t, nil), registry, db, &coordinatorPtr, derpMap, agentInactiveDisconnectTimeout, time.Millisecond)
+	closeFunc, err := prometheusmetrics.Agents(ctx, slogtest.Make(t, nil), registry, db, &coordinatorPtr, derpMap, agentInactiveDisconnectTimeout, 50*time.Millisecond)
 	require.NoError(t, err)
 	t.Cleanup(closeFunc)
 

Original file line number	Diff line number	Diff line change
`@@ -191,8 +191,9 @@ func Agents(ctx context.Context, logger slog.Logger, registerer prometheus.Regis`
`191`	`191`	`return nil, err`
`192`	`192`	`}`
`193`	`193`
	`194`	`+ ctx, cancelFunc := context.WithCancel(ctx)`
`194`	`195`	`// nolint:gocritic // Prometheus must collect metrics for all Coder users.`
`195`		`- ctx, cancelFunc := context.WithCancel(dbauthz.AsSystemRestricted(ctx))`
	`196`	`+ ctx = dbauthz.AsSystemRestricted(ctx)`
`196`	`197`	`done := make(chan struct{})`
`197`	`198`
`198`	`199`	`ticker := time.NewTicker(duration)`