Jul 3, 2024 · Jul 2, 2024 · Jul 3, 2024
diff --git a/agent/apphealth.go b/agent/apphealth.go
 "golang.org/x/xerrors"

 "cdr.dev/slog"
 "github.com/coder/coder/v2/clock"
 "github.com/coder/coder/v2/codersdk"
 "github.com/coder/coder/v2/codersdk/agentsdk"
 "github.com/coder/quartz"
 )

 // PostWorkspaceAgentAppHealth updates the workspace app health.

 // NewWorkspaceAppHealthReporter creates a WorkspaceAppHealthReporter that reports app health to coderd.
 func NewWorkspaceAppHealthReporter(logger slog.Logger, apps []codersdk.WorkspaceApp, postWorkspaceAgentAppHealth PostWorkspaceAgentAppHealth) WorkspaceAppHealthReporter {
 return NewAppHealthReporterWithClock(logger, apps, postWorkspaceAgentAppHealth,clock.NewReal())
 return NewAppHealthReporterWithClock(logger, apps, postWorkspaceAgentAppHealth,quartz.NewReal())
 }

 // NewAppHealthReporterWithClock is only called directly by test code.  Product code should call
 logger slog.Logger,
 apps []codersdk.WorkspaceApp,
 postWorkspaceAgentAppHealth PostWorkspaceAgentAppHealth,
 clkclock.Clock,
 clkquartz.Clock,
 ) WorkspaceAppHealthReporter {
 logger = logger.Named("apphealth")

diff --git a/agent/apphealth_test.go b/agent/apphealth_test.go
 "github.com/coder/coder/v2/agent"
 "github.com/coder/coder/v2/agent/agenttest"
 "github.com/coder/coder/v2/agent/proto"
 "github.com/coder/coder/v2/clock"
 "github.com/coder/coder/v2/coderd/httpapi"
 "github.com/coder/coder/v2/codersdk"
 "github.com/coder/coder/v2/codersdk/agentsdk"
 "github.com/coder/coder/v2/testutil"
 "github.com/coder/quartz"
 )

 func TestAppHealth_Healthy(t *testing.T) {
 httpapi.Write(r.Context(), w, http.StatusOK, nil)
 }),
 }
 mClock :=clock.NewMock(t)
 mClock :=quartz.NewMock(t)
 healthcheckTrap := mClock.Trap().TickerFunc("healthcheck")
 defer healthcheckTrap.Close()
 reportTrap := mClock.Trap().TickerFunc("report")
 }),
 }

 mClock :=clock.NewMock(t)
 mClock :=quartz.NewMock(t)
 healthcheckTrap := mClock.Trap().TickerFunc("healthcheck")
 defer healthcheckTrap.Close()
 reportTrap := mClock.Trap().TickerFunc("report")
 <-r.Context().Done()
 }),
 }
 mClock :=clock.NewMock(t)
 mClock :=quartz.NewMock(t)
 start := mClock.Now()

 // for this test, it's easier to think in the number of milliseconds elapsed
 ctx context.Context, t *testing.T,
 apps []codersdk.WorkspaceApp,
 handlers []http.Handler,
 clkclock.Clock,
 clkquartz.Clock,
 ) (*agenttest.FakeAgentAPI, func()) {
 closers := []func(){}
 for _, app := range apps {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,9 +10,9 @@ import (
		"golang.org/x/xerrors"

		"cdr.dev/slog"
		"github.com/coder/coder/v2/clock"
		"github.com/coder/coder/v2/codersdk"
		"github.com/coder/coder/v2/codersdk/agentsdk"
		"github.com/coder/quartz"
		)

		// PostWorkspaceAgentAppHealth updates the workspace app health.
Expand All		@@ -23,7 +23,7 @@ type WorkspaceAppHealthReporter func(ctx context.Context)

		// NewWorkspaceAppHealthReporter creates a WorkspaceAppHealthReporter that reports app health to coderd.
		func NewWorkspaceAppHealthReporter(logger slog.Logger, apps []codersdk.WorkspaceApp, postWorkspaceAgentAppHealth PostWorkspaceAgentAppHealth) WorkspaceAppHealthReporter {
		return NewAppHealthReporterWithClock(logger, apps, postWorkspaceAgentAppHealth,clock.NewReal())
		return NewAppHealthReporterWithClock(logger, apps, postWorkspaceAgentAppHealth,quartz.NewReal())
		}

		// NewAppHealthReporterWithClock is only called directly by test code. Product code should call
Expand All		@@ -32,7 +32,7 @@ func NewAppHealthReporterWithClock(
		logger slog.Logger,
		apps []codersdk.WorkspaceApp,
		postWorkspaceAgentAppHealth PostWorkspaceAgentAppHealth,
		clkclock.Clock,
		clkquartz.Clock,
		) WorkspaceAppHealthReporter {
		logger = logger.Named("apphealth")

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,11 +17,11 @@ import (
		"github.com/coder/coder/v2/agent"
		"github.com/coder/coder/v2/agent/agenttest"
		"github.com/coder/coder/v2/agent/proto"
		"github.com/coder/coder/v2/clock"
		"github.com/coder/coder/v2/coderd/httpapi"
		"github.com/coder/coder/v2/codersdk"
		"github.com/coder/coder/v2/codersdk/agentsdk"
		"github.com/coder/coder/v2/testutil"
		"github.com/coder/quartz"
		)

		func TestAppHealth_Healthy(t *testing.T) {
Expand DownExpand Up		@@ -69,7 +69,7 @@ func TestAppHealth_Healthy(t *testing.T) {
		httpapi.Write(r.Context(), w, http.StatusOK, nil)
		}),
		}
		mClock :=clock.NewMock(t)
		mClock :=quartz.NewMock(t)
		healthcheckTrap := mClock.Trap().TickerFunc("healthcheck")
		defer healthcheckTrap.Close()
		reportTrap := mClock.Trap().TickerFunc("report")
Expand DownExpand Up		@@ -137,7 +137,7 @@ func TestAppHealth_500(t *testing.T) {
		}),
		}

		mClock :=clock.NewMock(t)
		mClock :=quartz.NewMock(t)
		healthcheckTrap := mClock.Trap().TickerFunc("healthcheck")
		defer healthcheckTrap.Close()
		reportTrap := mClock.Trap().TickerFunc("report")
Expand DownExpand Up		@@ -187,7 +187,7 @@ func TestAppHealth_Timeout(t *testing.T) {
		<-r.Context().Done()
		}),
		}
		mClock :=clock.NewMock(t)
		mClock :=quartz.NewMock(t)
		start := mClock.Now()

		// for this test, it's easier to think in the number of milliseconds elapsed
Expand DownExpand Up		@@ -235,7 +235,7 @@ func setupAppReporter(
		ctx context.Context, t *testing.T,
		apps []codersdk.WorkspaceApp,
		handlers []http.Handler,
		clkclock.Clock,
		clkquartz.Clock,
		) (*agenttest.FakeAgentAPI, func()) {
		closers := []func(){}
		for _, app := range apps {
Expand Down