chore: test metricscache on postgres #16711
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
metricscache_test has been running tests against dbmem only, instead of against postgres. Unfortunately the implementations of GetTemplateAverageBuildTime have diverged between dbmem and postgres. This change gets the tests working on Postgres and test for the behaviour postgres provides.
DanielleMaywood
commented
Feb 26, 2025
Comment on lines
+418
to
+422
| SELECT templates.id AS template_id, COUNT(DISTINCT workspaces.owner_id) AS unique_owners_sum | ||
| FROM templates | ||
| LEFT JOIN workspaces ON workspaces.template_id = templates.id AND workspaces.deleted = false | ||
| WHERE templates.id = ANY(@template_ids :: uuid[]) | ||
| GROUP BY templates.id; |
There was a problem hiding this comment.
Rewrote this query as the test-suite expected this query to be able to return unique_owners_sum=0, however the previous implementation would return nothing if there were no workspaces.
DanielleMaywood
commented
Feb 26, 2025
| @@ -26,6 +27,7 @@ import ( | |||
| type Cache struct { | |||
| database database.Store | |||
| log slog.Logger | |||
| clock quartz.Clock | |||
There was a problem hiding this comment.
quartz.Clock has been added to make the tests more deterministic.
ethanndickson
approved these changes
Feb 27, 2025
coderd/metricscache/metricscache.go
Outdated
| CollectedAt: dbtime.Now(), | ||
| NextUpdateAt: dbtime.Now().Add(c.intervals.DeploymentStats), | ||
| CollectedAt: c.clock.Now(), | ||
| NextUpdateAt: c.clock.Now().Add(c.intervals.DeploymentStats), |
There was a problem hiding this comment.
Should these be wrapped in a dbtime.Time like above for the microsecond rounding?
There was a problem hiding this comment.
Yep, forgot to add that
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #16710
metricscache_test has been running tests against dbmem only, instead of against postgres. Unfortunately the implementations of GetTemplateAverageBuildTime have diverged between dbmem and postgres. This change gets the tests working on Postgres and test for the behaviour postgres provides.