feat: implement deadline bumping from workspace app activity

Emyrk · Emyrk · commit 5cec68b3175e · 2024-04-09T12:58:37.000-05:00
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -541,7 +541,7 @@ func New(options *Options) *API {
 		options.WorkspaceAppsStatsCollectorOptions.Logger = &named
 	}
 	if options.WorkspaceAppsStatsCollectorOptions.Reporter == nil {
-		options.WorkspaceAppsStatsCollectorOptions.Reporter = workspaceapps.NewStatsDBReporter(options.Database, workspaceapps.DefaultStatsDBReporterBatchSize)
+		options.WorkspaceAppsStatsCollectorOptions.Reporter = workspaceapps.NewStatsDBReporter(options.Database, options.Logger.Named("stats-reporter"), workspaceapps.DefaultStatsDBReporterBatchSize)
 	}
 
 	api.workspaceAppServer = &workspaceapps.Server{
diff --git a/coderd/insights_test.go b/coderd/insights_test.go
@@ -735,7 +735,7 @@ func TestTemplateInsights_Golden(t *testing.T) {
 				})
 			}
 		}
-		reporter := workspaceapps.NewStatsDBReporter(db, workspaceapps.DefaultStatsDBReporterBatchSize)
+		reporter := workspaceapps.NewStatsDBReporter(db, slogtest.Make(t, nil), workspaceapps.DefaultStatsDBReporterBatchSize)
 		//nolint:gocritic // This is a test.
 		err = reporter.Report(dbauthz.AsSystemRestricted(ctx), stats)
 		require.NoError(t, err, "want no error inserting app stats")
@@ -1631,7 +1631,7 @@ func TestUserActivityInsights_Golden(t *testing.T) {
 				})
 			}
 		}
-		reporter := workspaceapps.NewStatsDBReporter(db, workspaceapps.DefaultStatsDBReporterBatchSize)
+		reporter := workspaceapps.NewStatsDBReporter(db,  slogtest.Make(t, nil),workspaceapps.DefaultStatsDBReporterBatchSize)
 		//nolint:gocritic // This is a test.
 		err = reporter.Report(dbauthz.AsSystemRestricted(ctx), stats)
 		require.NoError(t, err, "want no error inserting app stats")
diff --git a/coderd/prometheusmetrics/insights/metricscollector_test.go b/coderd/prometheusmetrics/insights/metricscollector_test.go
@@ -109,7 +109,7 @@ func TestCollectInsights(t *testing.T) {
 	require.NoError(t, err, "unable to post fake stats")
 
 	// Fake app usage
-	reporter := workspaceapps.NewStatsDBReporter(db, workspaceapps.DefaultStatsDBReporterBatchSize)
+	reporter := workspaceapps.NewStatsDBReporter(db, slogtest.Make(t, nil), workspaceapps.DefaultStatsDBReporterBatchSize)
 	refTime := time.Now().Add(-3 * time.Minute).Truncate(time.Minute)
 	//nolint:gocritic // This is a test.
 	err = reporter.Report(dbauthz.AsSystemRestricted(context.Background()), []workspaceapps.StatsReport{
diff --git a/coderd/workspaceapps/stats.go b/coderd/workspaceapps/stats.go
@@ -9,6 +9,7 @@ import (
 	"golang.org/x/xerrors"
 
 	"cdr.dev/slog"
+	"github.com/coder/coder/v2/coderd/agentapi"
 
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbauthz"
@@ -60,13 +61,15 @@ var _ StatsReporter = (*StatsDBReporter)(nil)
 // StatsDBReporter writes workspace app StatsReports to the database.
 type StatsDBReporter struct {
 	db        database.Store
+	logger    slog.Logger
 	batchSize int
 }
 
 // NewStatsDBReporter returns a new StatsDBReporter.
-func NewStatsDBReporter(db database.Store, batchSize int) *StatsDBReporter {
+func NewStatsDBReporter(db database.Store, logger slog.Logger, batchSize int) *StatsDBReporter {
 	return &StatsDBReporter{
 		db:        db,
+		logger:    logger,
 		batchSize: batchSize,
 	}
 }
@@ -139,6 +142,19 @@ func (r *StatsDBReporter) Report(ctx context.Context, stats []StatsReport) error
 			return err
 		}
 
+		// This is very inefficient to loop over all workspaces with activity.
+		// The 'ActivityBumpWorkspace' sql query is not built to be easily turned
+		// in a batch.
+		for _, id := range uniqueIDs {
+			// Passing in a zero time will default bump the workspace by 1hr.
+			// The correct behavior is to fetch the template settings, and pass
+			// in the calculated autostart time. But that requires an extra db
+			// call per workspace.
+			//
+			// This function will log any failures.
+			agentapi.ActivityBumpWorkspace(ctx, r.logger, r.db, id, time.Time{})
+		}
+
 		return nil
 	}, nil)
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -541,7 +541,7 @@ func New(options Options) API {`
`541`	`541`	`options.WorkspaceAppsStatsCollectorOptions.Logger = &named`
`542`	`542`	`}`
`543`	`543`	`if options.WorkspaceAppsStatsCollectorOptions.Reporter == nil {`
`544`		`- options.WorkspaceAppsStatsCollectorOptions.Reporter = workspaceapps.NewStatsDBReporter(options.Database, workspaceapps.DefaultStatsDBReporterBatchSize)`
	`544`	`+ options.WorkspaceAppsStatsCollectorOptions.Reporter = workspaceapps.NewStatsDBReporter(options.Database, options.Logger.Named("stats-reporter"), workspaceapps.DefaultStatsDBReporterBatchSize)`
`545`	`545`	`}`
`546`	`546`
`547`	`547`	`api.workspaceAppServer = &workspaceapps.Server{`
Original file line number	Diff line number	Diff line change
`@@ -735,7 +735,7 @@ func TestTemplateInsights_Golden(t *testing.T) {`
`735`	`735`	`})`
`736`	`736`	`}`
`737`	`737`	`}`
`738`		`- reporter := workspaceapps.NewStatsDBReporter(db, workspaceapps.DefaultStatsDBReporterBatchSize)`
	`738`	`+ reporter := workspaceapps.NewStatsDBReporter(db, slogtest.Make(t, nil), workspaceapps.DefaultStatsDBReporterBatchSize)`
`739`	`739`	`//nolint:gocritic // This is a test.`
`740`	`740`	`err = reporter.Report(dbauthz.AsSystemRestricted(ctx), stats)`
`741`	`741`	`require.NoError(t, err, "want no error inserting app stats")`
`@@ -1631,7 +1631,7 @@ func TestUserActivityInsights_Golden(t *testing.T) {`
`1631`	`1631`	`})`
`1632`	`1632`	`}`
`1633`	`1633`	`}`
`1634`		`- reporter := workspaceapps.NewStatsDBReporter(db, workspaceapps.DefaultStatsDBReporterBatchSize)`
	`1634`	`+ reporter := workspaceapps.NewStatsDBReporter(db, slogtest.Make(t, nil),workspaceapps.DefaultStatsDBReporterBatchSize)`
`1635`	`1635`	`//nolint:gocritic // This is a test.`
`1636`	`1636`	`err = reporter.Report(dbauthz.AsSystemRestricted(ctx), stats)`
`1637`	`1637`	`require.NoError(t, err, "want no error inserting app stats")`