Oct 30, 2024 · Oct 29, 2024
diff --git a/cli/server.go b/cli/server.go
 autobuildTicker := time.NewTicker(vals.AutobuildPollInterval.Value())
 defer autobuildTicker.Stop()
 autobuildExecutor := autobuild.NewExecutor(
 ctx, options.Database, options.Pubsub, coderAPI.TemplateScheduleStore, &coderAPI.Auditor, coderAPI.AccessControlStore, logger, autobuildTicker.C, options.NotificationsEnqueuer)
 ctx, options.Database, options.Pubsub,options.PrometheusRegistry,coderAPI.TemplateScheduleStore, &coderAPI.Auditor, coderAPI.AccessControlStore, logger, autobuildTicker.C, options.NotificationsEnqueuer)
 autobuildExecutor.Run()

 hangDetectorTicker := time.NewTicker(vals.JobHangDetectorInterval.Value())
diff --git a/coderd/autobuild/lifecycle_executor.go b/coderd/autobuild/lifecycle_executor.go

 "github.com/dustin/go-humanize"
 "github.com/google/uuid"
 "github.com/prometheus/client_golang/prometheus"
 "github.com/prometheus/client_golang/prometheus/promauto"
 "golang.org/x/sync/errgroup"
 "golang.org/x/xerrors"

 statsCh               chan<- Stats
 // NotificationsEnqueuer handles enqueueing notifications for delivery by SMTP, webhook, etc.
 notificationsEnqueuer notifications.Enqueuer
 reg                   prometheus.Registerer

 metrics executorMetrics
 }

 type executorMetrics struct {
 autobuildExecutionDuration prometheus.Histogram
 }

 // Stats contains information about one run of Executor.
 }

 // New returns a new wsactions executor.
 func NewExecutor(ctx context.Context, db database.Store, ps pubsub.Pubsub, tss *atomic.Pointer[schedule.TemplateScheduleStore], auditor *atomic.Pointer[audit.Auditor], acs *atomic.Pointer[dbauthz.AccessControlStore], log slog.Logger, tick <-chan time.Time, enqueuer notifications.Enqueuer) *Executor {
 func NewExecutor(ctx context.Context, db database.Store, ps pubsub.Pubsub, reg prometheus.Registerer, tss *atomic.Pointer[schedule.TemplateScheduleStore], auditor *atomic.Pointer[audit.Auditor], acs *atomic.Pointer[dbauthz.AccessControlStore], log slog.Logger, tick <-chan time.Time, enqueuer notifications.Enqueuer) *Executor {
 factory := promauto.With(reg)
 le := &Executor{
 //nolint:gocritic // Autostart has a limited set of permissions.
 ctx:                   dbauthz.AsAutostart(ctx),
 auditor:               auditor,
 accessControlStore:    acs,
 notificationsEnqueuer: enqueuer,
 reg:                   reg,
 metrics: executorMetrics{
 autobuildExecutionDuration: factory.NewHistogram(prometheus.HistogramOpts{
 Namespace: "coderd",
 Subsystem: "lifecycle",
 Name:      "autobuild_execution_duration_seconds",
 Help:      "Duration of each autobuild execution.",
 Buckets:   prometheus.DefBuckets,
 }),
 },
 }
 return le
 }
 return
 }
 stats := e.runOnce(t)
 e.metrics.autobuildExecutionDuration.Observe(stats.Elapsed.Seconds())
 if e.statsCh != nil {
 select {
 case <-e.ctx.Done():
diff --git a/coderd/coderdtest/coderdtest.go b/coderd/coderdtest/coderdtest.go
 ctx,
 options.Database,
 options.Pubsub,
 prometheus.NewRegistry(),
 &templateScheduleStore,
 &auditor,
 accessControlStore,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1035,7 +1035,7 @@ func (r RootCmd) Server(newAPI func(context.Context, coderd.Options) (*coderd.
		autobuildTicker := time.NewTicker(vals.AutobuildPollInterval.Value())
		defer autobuildTicker.Stop()
		autobuildExecutor := autobuild.NewExecutor(
		ctx, options.Database, options.Pubsub, coderAPI.TemplateScheduleStore, &coderAPI.Auditor, coderAPI.AccessControlStore, logger, autobuildTicker.C, options.NotificationsEnqueuer)
		ctx, options.Database, options.Pubsub,options.PrometheusRegistry,coderAPI.TemplateScheduleStore, &coderAPI.Auditor, coderAPI.AccessControlStore, logger, autobuildTicker.C, options.NotificationsEnqueuer)
		autobuildExecutor.Run()

		hangDetectorTicker := time.NewTicker(vals.JobHangDetectorInterval.Value())
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,6 +10,8 @@ import (

		"github.com/dustin/go-humanize"
		"github.com/google/uuid"
		"github.com/prometheus/client_golang/prometheus"
		"github.com/prometheus/client_golang/prometheus/promauto"
		"golang.org/x/sync/errgroup"
		"golang.org/x/xerrors"

Expand DownExpand Up		@@ -39,6 +41,13 @@ type Executor struct {
		statsCh chan<- Stats
		// NotificationsEnqueuer handles enqueueing notifications for delivery by SMTP, webhook, etc.
		notificationsEnqueuer notifications.Enqueuer
		reg prometheus.Registerer

		metrics executorMetrics
		}

		type executorMetrics struct {
		autobuildExecutionDuration prometheus.Histogram
		}

		// Stats contains information about one run of Executor.
Expand All		@@ -49,7 +58,8 @@ type Stats struct {
		}

		// New returns a new wsactions executor.
		func NewExecutor(ctx context.Context, db database.Store, ps pubsub.Pubsub, tss atomic.Pointer[schedule.TemplateScheduleStore], auditor atomic.Pointer[audit.Auditor], acs atomic.Pointer[dbauthz.AccessControlStore], log slog.Logger, tick <-chan time.Time, enqueuer notifications.Enqueuer) Executor {
		func NewExecutor(ctx context.Context, db database.Store, ps pubsub.Pubsub, reg prometheus.Registerer, tss atomic.Pointer[schedule.TemplateScheduleStore], auditor atomic.Pointer[audit.Auditor], acs atomic.Pointer[dbauthz.AccessControlStore], log slog.Logger, tick <-chan time.Time, enqueuer notifications.Enqueuer) Executor {
		factory := promauto.With(reg)
		le := &Executor{
		//nolint:gocritic // Autostart has a limited set of permissions.
		ctx: dbauthz.AsAutostart(ctx),
Expand All		@@ -61,6 +71,16 @@ func NewExecutor(ctx context.Context, db database.Store, ps pubsub.Pubsub, tss *
		auditor: auditor,
		accessControlStore: acs,
		notificationsEnqueuer: enqueuer,
		reg: reg,
		metrics: executorMetrics{
		autobuildExecutionDuration: factory.NewHistogram(prometheus.HistogramOpts{
		Namespace: "coderd",
		Subsystem: "lifecycle",
		Name: "autobuild_execution_duration_seconds",
		Help: "Duration of each autobuild execution.",
		Buckets: prometheus.DefBuckets,
		}),
		},
		}
		return le
		}
Expand All		@@ -86,6 +106,7 @@ func (e *Executor) Run() {
		return
		}
		stats := e.runOnce(t)
		e.metrics.autobuildExecutionDuration.Observe(stats.Elapsed.Seconds())
		if e.statsCh != nil {
		select {
		case <-e.ctx.Done():
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -335,6 +335,7 @@ func NewOptions(t testing.TB, options *Options) (func(http.Handler), context.Can
		ctx,
		options.Database,
		options.Pubsub,
		prometheus.NewRegistry(),
		&templateScheduleStore,
		&auditor,
		accessControlStore,
Expand Down