selfhosted
/
coder
mirror of https://github.com/coder/coder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat: implement deadline bumping from workspace app activity

This commit is contained in:
Steven Masley 2024-04-09 12:58:37 -05:00
parent 0a8c8ce5cc
commit 5cec68b317
No known key found for this signature in database
4 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
coderd/coderd.go
View File

@ -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{

4
coderd/insights_test.go
View File

@ -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")

2
coderd/prometheusmetrics/insights/metricscollector_test.go
View File

@ -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{

18
coderd/workspaceapps/stats.go
View File

@ -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 {