sum session counts during usagestatsandlabels

ethanndickson · ethanndickson · commit a5f0272472ec · 2024-09-17T15:05:05.000Z
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -5829,12 +5829,10 @@ func (q *FakeQuerier) GetWorkspaceAgentUsageStatsAndLabels(_ context.Context, cr
 			if !ok {
 				latestAgentStats[key] = agentStat
 			} else {
-				if agentStat.CreatedAt.After(val.CreatedAt) || agentStat.CreatedAt.Equal(val.CreatedAt) {
-					val.SessionCountVSCode = agentStat.SessionCountVSCode
-					val.SessionCountJetBrains = agentStat.SessionCountJetBrains
-					val.SessionCountReconnectingPTY = agentStat.SessionCountReconnectingPTY
-					val.SessionCountSSH = agentStat.SessionCountSSH
-				}
+				val.SessionCountVSCode += agentStat.SessionCountVSCode
+				val.SessionCountJetBrains += agentStat.SessionCountJetBrains
+				val.SessionCountReconnectingPTY += agentStat.SessionCountReconnectingPTY
+				val.SessionCountSSH += agentStat.SessionCountSSH
 				val.ConnectionCount += agentStat.ConnectionCount
 				latestAgentStats[key] = val
 			}
diff --git a/coderd/database/querier_test.go b/coderd/database/querier_test.go
@@ -372,7 +372,7 @@ func TestGetWorkspaceAgentUsageStatsAndLabels(t *testing.T) {
 		WorkspaceName:             workspace1.Name,
 		RxBytes:                   3,
 		TxBytes:                   3,
-		SessionCountVSCode:        2,
+		SessionCountVSCode:        3,
 		ConnectionMedianLatencyMS: 1,
 	})
 
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/workspaceagentstats.sql b/coderd/database/queries/workspaceagentstats.sql
@@ -329,12 +329,8 @@ WITH agent_stats AS (
 		coalesce(SUM(session_count_jetbrains), 0)::bigint AS session_count_jetbrains,
 		coalesce(SUM(session_count_reconnecting_pty), 0)::bigint AS session_count_reconnecting_pty,
 		coalesce(SUM(connection_count), 0)::bigint AS connection_count
-	FROM (
-		SELECT *, ROW_NUMBER() OVER (PARTITION BY user_id, agent_id, workspace_id ORDER BY created_at DESC) AS rn
-		FROM workspace_agent_stats
-		WHERE usage = true
-	) as a
-	WHERE a.rn = 1
+	FROM workspace_agent_stats
+	WHERE usage = true
 	GROUP BY user_id, agent_id, workspace_id
 ), latest_agent_latencies AS (
 	SELECT
