feat(coderd/database): rewrite GetTemplateAppInsightsByTemplate to use template_usage_stats

mafredri · mafredri · commit 56e1cb8cd44a · 2024-03-18T20:27:21.000+02:00
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -3275,7 +3275,7 @@ func (q *FakeQuerier) GetTemplateAppInsightsByTemplate(ctx context.Context, arg
 	for _, usageKey := range usageKeys {
 		r := database.GetTemplateAppInsightsByTemplateRow{
 			TemplateID:  usageKey.TemplateID,
-			DisplayName: sql.NullString{String: usageKey.DisplayName, Valid: true},
+			DisplayName: usageKey.DisplayName,
 			SlugOrPort:  usageKey.Slug,
 		}
 		for _, mUserUsage := range usageByTemplateAppUser[usageKey] {
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/insights.sql b/coderd/database/queries/insights.sql
@@ -273,51 +273,54 @@ GROUP BY
 	t.template_ids, ai.app_name, ai.display_name, ai.icon, ai.is_app;
 
 -- name: GetTemplateAppInsightsByTemplate :many
-WITH app_stats_by_user_and_agent AS (
+SELECT
+	tus.template_id,
+	COUNT(DISTINCT tus.user_id) AS active_users,
+	app_usage.key::text AS slug_or_port,
+	COALESCE(wa.display_name, '') AS display_name,
+	(SUM(app_usage.value::int) * 60)::bigint AS usage_seconds
+FROM
+	template_usage_stats AS tus, jsonb_each(app_usage_mins) AS app_usage
+LEFT JOIN LATERAL (
+	-- Fetch the latest app info for each app based on slug and template.
 	SELECT
-		s.start_time,
-		60 as seconds,
-		w.template_id,
-		was.user_id,
-		was.agent_id,
-		was.slug_or_port,
-		wa.display_name,
-		(wa.slug IS NOT NULL)::boolean AS is_app
-	FROM workspace_app_stats was
-	JOIN workspaces w ON (
-		w.id = was.workspace_id
-	)
-	-- We do a left join here because we want to include user IDs that have used
-	-- e.g. ports when counting active users.
-	LEFT JOIN workspace_apps wa ON (
-		wa.agent_id = was.agent_id
-		AND wa.slug = was.slug_or_port
-	)
-	-- This table contains both 1 minute entries and >1 minute entries,
-	-- to calculate this with our uniqueness constraints, we generate series
-	-- for the longer intervals.
-	CROSS JOIN LATERAL generate_series(
-		date_trunc('minute', was.session_started_at),
-		-- Subtract 1 microsecond to avoid creating an extra series.
-		date_trunc('minute', was.session_ended_at - '1 microsecond'::interval),
-		'1 minute'::interval
-	) s(start_time)
+		app.display_name,
+		app.slug
+	FROM
+		workspace_apps AS app
+	JOIN
+		workspace_agents AS agent
+	ON
+		agent.id = app.agent_id
+	JOIN
+		workspace_resources AS resource
+	ON
+		resource.id = agent.resource_id
+	JOIN
+		workspace_builds AS build
+	ON
+		build.job_id = resource.job_id
+	JOIN
+		workspaces AS workspace
+	ON
+		workspace.id = build.workspace_id
 	WHERE
-		s.start_time >= @start_time::timestamptz
-		-- Subtract one minute because the series only contains the start time.
-		AND s.start_time < (@end_time::timestamptz) - '1 minute'::interval
-	GROUP BY s.start_time, w.template_id, was.user_id, was.agent_id, was.slug_or_port, wa.display_name, wa.slug
-)
-
-SELECT
-	template_id,
-	display_name,
-	slug_or_port,
-	COALESCE(COUNT(DISTINCT user_id))::bigint AS active_users,
-	SUM(seconds) AS usage_seconds
-FROM app_stats_by_user_and_agent
-WHERE is_app IS TRUE
-GROUP BY template_id, display_name, slug_or_port;
+		-- Requires lateral join.
+		app.slug = app_usage.key
+		AND workspace.owner_id = tus.user_id
+		AND workspace.template_id = tus.template_id
+	ORDER BY
+		app.created_at DESC
+	LIMIT 1
+) wa
+ON
+	true
+WHERE
+	tus.start_time >= @start_time::timestamptz
+	AND tus.end_time <= @end_time::timestamptz
+	AND wa.slug IS NOT NULL -- Check is_app.
+GROUP BY
+	tus.template_id, app_usage.key::text, wa.display_name;
 
 -- name: GetTemplateInsightsByInterval :many
 -- GetTemplateInsightsByInterval returns all intervals between start and end
diff --git a/coderd/prometheusmetrics/insights/metricscollector.go b/coderd/prometheusmetrics/insights/metricscollector.go
@@ -194,7 +194,7 @@ func (mc *MetricsCollector) Collect(metricsCh chan<- prometheus.Metric) {
 	// Custom apps
 	for _, appRow := range data.apps {
 		metricsCh <- prometheus.MustNewConstMetric(applicationsUsageSecondsDesc, prometheus.GaugeValue, float64(appRow.UsageSeconds), data.templateNames[appRow.TemplateID],
-			appRow.DisplayName.String, appRow.SlugOrPort)
+			appRow.DisplayName, appRow.SlugOrPort)
 	}
 
 	// Built-in apps

Original file line number	Diff line number	Diff line change
`@@ -3275,7 +3275,7 @@ func (q *FakeQuerier) GetTemplateAppInsightsByTemplate(ctx context.Context, arg`
`3275`	`3275`	`for _, usageKey := range usageKeys {`
`3276`	`3276`	`r := database.GetTemplateAppInsightsByTemplateRow{`
`3277`	`3277`	`TemplateID: usageKey.TemplateID,`
`3278`		`- DisplayName: sql.NullString{String: usageKey.DisplayName, Valid: true},`
	`3278`	`+ DisplayName: usageKey.DisplayName,`
`3279`	`3279`	`SlugOrPort: usageKey.Slug,`
`3280`	`3280`	`}`
`3281`	`3281`	`for _, mUserUsage := range usageByTemplateAppUser[usageKey] {`
Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ func (mc *MetricsCollector) Collect(metricsCh chan<- prometheus.Metric) {`
`194`	`194`	`// Custom apps`
`195`	`195`	`for _, appRow := range data.apps {`
`196`	`196`	`metricsCh <- prometheus.MustNewConstMetric(applicationsUsageSecondsDesc, prometheus.GaugeValue, float64(appRow.UsageSeconds), data.templateNames[appRow.TemplateID],`
`197`		`- appRow.DisplayName.String, appRow.SlugOrPort)`
	`197`	`+ appRow.DisplayName, appRow.SlugOrPort)`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	`// Built-in apps`