Skip to content

Show template average build #4545

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 9 commits into from
Closed

Show template average build #4545

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4f33078
Compute template average build time
iskhakovt Sep 11, 2022
d0abdbe
Improve sql query & add front end
iskhakovt Sep 11, 2022
5bac9fc
sql style
iskhakovt Sep 11, 2022
151a76b
Simplify sql query
iskhakovt Sep 12, 2022
96b358f
Use humanised duration
iskhakovt Sep 12, 2022
94efda5
Merge branch 'main' into ti/template-build-avg-time
ammario Oct 13, 2022
5c4227a
Write and test metricscache
ammario Oct 14, 2022
0f5f07b
Complete tests
ammario Oct 14, 2022
4cc4a45
Merge remote-tracking branch 'origin/main' into ti/template-build-avg…
ammario Oct 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Complete tests
  • Loading branch information
@ammario
ammario committed Oct 14, 2022
commit 0f5f07bbc7c4c89a1a3d651985165547463b4ee7
2 changes: 1 addition & 1 deletion coderd/database/queries.sql.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion coderd/database/queries/templates.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ JOIN provisioner_jobs pj ON
workspace_builds.job_id = pj.id
WHERE
template_versions.template_id = @template_id AND
(workspace_builds.transition = "start") AND
(workspace_builds.transition = 'start') AND
(pj.completed_at IS NOT NULL) AND (pj.started_at IS NOT NULL) AND
(pj.started_at > @start_time) AND
(pj.canceled_at IS NULL) AND
Expand Down
12 changes: 10 additions & 2 deletions coderd/templates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,7 +772,15 @@ func (api *API) convertTemplate(
template database.Template, workspaceOwnerCount uint32, createdByName string,
) codersdk.Template {
activeCount, _ := api.metricsCache.TemplateUniqueUsers(template.ID)
averageBuildTime, _ := api.metricsCache.TemplateAverageBuildTimeSec(template.ID)

var averageBuildTimeMillis int64
averageBuildTime, ok := api.metricsCache.TemplateAverageBuildTime(template.ID)
if !ok {
averageBuildTimeMillis = -1
} else {
averageBuildTimeMillis = int64(averageBuildTime / time.Millisecond)
}

return codersdk.Template{
ID: template.ID,
CreatedAt: template.CreatedAt,
Expand All @@ -783,7 +791,7 @@ func (api *API) convertTemplate(
ActiveVersionID: template.ActiveVersionID,
WorkspaceOwnerCount: workspaceOwnerCount,
ActiveUserCount: activeCount,
AverageBuildTimeMillis: int64(averageBuildTime / time.Millisecond),
AverageBuildTimeMillis: averageBuildTimeMillis,
Description: template.Description,
Icon: template.Icon,
MaxTTLMillis: time.Duration(template.MaxTtl).Milliseconds(),
Expand Down
4 changes: 3 additions & 1 deletion coderd/templates_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@ func TestDeleteTemplate(t *testing.T) {
})
}

func TestTemplateDAUs(t *testing.T) {
func TestTemplateMetrics(t *testing.T) {
t.Parallel()

client := coderdtest.New(t, &coderdtest.Options{
Expand Down Expand Up @@ -594,6 +594,7 @@ func TestTemplateDAUs(t *testing.T) {
})
template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
require.Equal(t, -1, template.ActiveUserCount)
require.EqualValues(t, -1, template.AverageBuildTimeMillis)

coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
workspace := coderdtest.CreateWorkspace(t, client, user.OrganizationID, template.ID)
Expand Down Expand Up @@ -660,6 +661,7 @@ func TestTemplateDAUs(t *testing.T) {
template, err = client.Template(ctx, template.ID)
require.NoError(t, err)
require.Equal(t, 1, template.ActiveUserCount)
require.Greater(t, template.AverageBuildTimeMillis, int64(1))

workspaces, err = client.Workspaces(ctx, codersdk.WorkspaceFilter{})
require.NoError(t, err)
Expand Down