coder
diff --git a/‎coderd/database/databasefake/databasefake.go
Lines changed: 27 additions & 0 deletions b/‎coderd/database/databasefake/databasefake.go
Lines changed: 27 additions & 0 deletions
diff --git a/‎coderd/database/querier.go
Lines changed: 1 addition & 0 deletions b/‎coderd/database/querier.go
Lines changed: 1 addition & 0 deletions
diff --git a/‎coderd/database/queries.sql.go
Lines changed: 19 additions & 0 deletions b/‎coderd/database/queries.sql.go
Lines changed: 19 additions & 0 deletions
diff --git a/‎coderd/database/queries/agentstats.sql
Lines changed: 3 additions & 0 deletions b/‎coderd/database/queries/agentstats.sql
Lines changed: 3 additions & 0 deletions
diff --git a/‎coderd/workspaceagents.go
Lines changed: 13 additions & 1 deletion b/‎coderd/workspaceagents.go
Lines changed: 13 additions & 1 deletion
@@ -159,6 +159,33 @@ func (q *fakeQuerier) InsertAgentStat(_ context.Context, p database.InsertAgentS
 	return stat, nil
 }
 
+func (q *fakeQuerier) GetLatestAgentStat(_ context.Context, agentID uuid.UUID) (database.AgentStat, error) {
+	q.mutex.RLock()
+	defer q.mutex.RUnlock()
+
+	found := false
+	latest := database.AgentStat{}
+	for _, agentStat := range q.agentStats {
+		if agentStat.AgentID != agentID {
+			continue
+		}
+		if !found {
+			latest = agentStat
+			found = true
+			continue
+		}
+		if agentStat.CreatedAt.After(latest.CreatedAt) {
+			latest = agentStat
+			found = true
+			continue
+		}
+	}
+	if !found {
+		return database.AgentStat{}, sql.ErrNoRows
+	}
+	return latest, nil
+}
+
 func (q *fakeQuerier) GetTemplateDAUs(_ context.Context, templateID uuid.UUID) ([]database.GetTemplateDAUsRow, error) {
 	q.mutex.Lock()
 	defer q.mutex.Unlock()
 
@@ -12,6 +12,9 @@ INSERT INTO
 VALUES
 	($1, $2, $3, $4, $5, $6, $7) RETURNING *;
 
+-- name: GetLatestAgentStat :one
+SELECT * FROM agent_stats WHERE agent_id = $1 ORDER BY created_at DESC LIMIT 1; 
+
 -- name: GetTemplateDAUs :many
 select
 	(created_at at TIME ZONE 'UTC')::date as date,
 
@@ -795,10 +795,22 @@ func (api *API) workspaceAgentReportStats(rw http.ResponseWriter, r *http.Reques
 	}
 	defer conn.Close(websocket.StatusAbnormalClosure, "")
 
+	var lastReport codersdk.AgentStatsReportResponse
+	latestStat, err := api.Database.GetLatestAgentStat(r.Context(), workspaceAgent.ID)
+	if err == nil {
+		err = json.Unmarshal(latestStat.Payload, &lastReport)
+		if err != nil {
+			httpapi.Write(rw, http.StatusInternalServerError, codersdk.Response{
+				Message: "Failed to unmarshal stat payload.",
+				Detail:  err.Error(),
+			})
+			return
+		}
+	}
+
 	// Allow overriding the stat interval for debugging and testing purposes.
 	ctx := r.Context()
 	timer := time.NewTicker(api.AgentStatsRefreshInterval)
-	var lastReport codersdk.AgentStatsReportResponse
 	for {
 		err := wsjson.Write(ctx, conn, codersdk.AgentStatsReportRequest{})
 		if err != nil {