synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-13 21:36:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix TestServer/Prometheus/DBMetricsDisabled test flake (#13453)

Browse Source 
See: https://github.com/coder/coder/actions/runs/9352137263/job/25739550487#step:5:368
This commit is contained in:
Colin Adler
2024-06-03 15:38:59 -05:00
committed by GitHub
parent 2806752c7d
commit 40390ecc30
2 changed files with 44 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
cli/server_test.go
View File

@ -967,8 +967,9 @@ func TestServer(t *testing.T) {
assert.NoError(t, err) assert.NoError(t, err)
// nolint:bodyclose // nolint:bodyclose
res, err = http.DefaultClient.Do(req) res, err = http.DefaultClient.Do(req)
return err == nil if err != nil {
}, testutil.WaitShort, testutil.IntervalFast) return false
}
defer res.Body.Close() defer res.Body.Close()
scanner := bufio.NewScanner(res.Body) scanner := bufio.NewScanner(res.Body)
@ -985,8 +986,13 @@ func TestServer(t *testing.T) {
} }
t.Logf("scanned %s", scanner.Text()) t.Logf("scanned %s", scanner.Text())
} }
require.NoError(t, scanner.Err()) if scanner.Err() != nil {
require.True(t, hasActiveUsers) t.Logf("scanner err: %s", scanner.Err().Error())
return false
}
return hasActiveUsers
}, testutil.WaitShort, testutil.IntervalFast, "didn't find coderd_api_active_users_duration_hour in time")
}) })
t.Run("DBMetricsEnabled", func(t *testing.T) { t.Run("DBMetricsEnabled", func(t *testing.T) {
@ -1017,8 +1023,9 @@ func TestServer(t *testing.T) {
assert.NoError(t, err) assert.NoError(t, err)
// nolint:bodyclose // nolint:bodyclose
res, err = http.DefaultClient.Do(req) res, err = http.DefaultClient.Do(req)
return err == nil if err != nil {
}, testutil.WaitShort, testutil.IntervalFast) return false
}
defer res.Body.Close() defer res.Body.Close()
scanner := bufio.NewScanner(res.Body) scanner := bufio.NewScanner(res.Body)
@ -1029,8 +1036,12 @@ func TestServer(t *testing.T) {
} }
t.Logf("scanned %s", scanner.Text()) t.Logf("scanned %s", scanner.Text())
} }
require.NoError(t, scanner.Err()) if scanner.Err() != nil {
require.True(t, hasDBMetrics) t.Logf("scanner err: %s", scanner.Err().Error())
return false
}
return hasDBMetrics
}, testutil.WaitShort, testutil.IntervalFast, "didn't find coderd_db_query_latencies_seconds in time")
}) })
}) })
t.Run("GitHubOAuth", func(t *testing.T) { t.Run("GitHubOAuth", func(t *testing.T) {
@ -1347,7 +1358,7 @@ func TestServer(t *testing.T) {
} }
return lastStat.Size() > 0 return lastStat.Size() > 0
}, },
testutil.WaitShort, dur, //nolint:gocritic
testutil.IntervalFast, testutil.IntervalFast,
"file at %s should exist, last stat: %+v", "file at %s should exist, last stat: %+v",
fiName, lastStat, fiName, lastStat,

4
coderd/prometheusmetrics/prometheusmetrics.go
View File

@ -120,9 +120,9 @@ func Workspaces(ctx context.Context, logger slog.Logger, registerer prometheus.R
if errors.Is(err, sql.ErrNoRows) { if errors.Is(err, sql.ErrNoRows) {
// clear all series if there are no database entries // clear all series if there are no database entries
workspaceLatestBuildTotals.Reset() workspaceLatestBuildTotals.Reset()
} } else {
logger.Warn(ctx, "failed to load latest workspace builds", slog.Error(err)) logger.Warn(ctx, "failed to load latest workspace builds", slog.Error(err))
}
return return
} }
jobIDs := make([]uuid.UUID, 0, len(builds)) jobIDs := make([]uuid.UUID, 0, len(builds))