remove loop

coder · f0ssel · Jun 14, 2024 · Jun 14, 2024 · Jun 14, 2024 · Jun 17, 2024
commit fefc2deba4232fb65fad0a6b7145b6766ac7bca0
diff --git a/agent/agent.go b/agent/agent.go
@@ -86,7 +86,6 @@ type Options struct {
 	PrometheusRegistry           *prometheus.Registry
 	ReportMetadataInterval       time.Duration
 	ServiceBannerRefreshInterval time.Duration
-	ExperimentRefreshInterval    time.Duration
 	FetchExperiments             func(ctx context.Context) (codersdk.Experiments, error)
 	Syscaller                    agentproc.Syscaller
 	// ModifiedProcesses is used for testing process priority management.
@@ -141,9 +140,6 @@ func New(options Options) Agent {
 			return codersdk.Experiments{}, nil
 		}
 	}
-	if options.ExperimentRefreshInterval == 0 {
-		options.ExperimentRefreshInterval = 5 * time.Minute
-	}
 	if options.ReportMetadataInterval == 0 {
 		options.ReportMetadataInterval = time.Second
 	}
@@ -178,7 +174,6 @@ func New(options Options) Agent {
 		client:                             options.Client,
 		exchangeToken:                      options.ExchangeToken,
 		fetchExperiments:                   options.FetchExperiments,
-		fetchExperimentsInterval:           options.ExperimentRefreshInterval,
 		filesystem:                         options.Filesystem,
 		logDir:                             options.LogDir,
 		tempDir:                            options.TempDir,
@@ -261,9 +256,8 @@ type agent struct {
 	lifecycleStates            []agentsdk.PostLifecycleRequest
 	lifecycleLastReportedIndex int // Keeps track of the last lifecycle state we successfully reported.
 
-	fetchExperiments         func(ctx context.Context) (codersdk.Experiments, error)
-	fetchExperimentsInterval time.Duration
-	experiments              atomic.Pointer[codersdk.Experiments]
+	fetchExperiments func(ctx context.Context) (codersdk.Experiments, error)
+	experiments      codersdk.Experiments
 
 	network       *tailnet.Conn
 	addresses     []netip.Prefix
@@ -753,28 +747,6 @@ func (a *agent) fetchServiceBannerLoop(ctx context.Context, conn drpc.Conn) erro
 	}
 }
 
-// fetchExperimentsLoop fetches experiments on an interval.
-func (a *agent) fetchExperimentsLoop(ctx context.Context) error {
-	ticker := time.NewTicker(a.fetchExperimentsInterval)
-	defer ticker.Stop()
-	for {
-		select {
-		case <-ctx.Done():
-			return ctx.Err()
-		case <-ticker.C:
-			experiments, err := a.fetchExperiments(ctx)
-			if err != nil {
-				if ctx.Err() != nil {
-					return ctx.Err()
-				}
-				a.logger.Error(ctx, "failed to update experiments", slog.Error(err))
-				return err
-			}
-			a.experiments.Store(&experiments)
-		}
-	}
-}
-
 func (a *agent) run() (retErr error) {
 	// This allows the agent to refresh it's token if necessary.
 	// For instance identity this is required, since the instance
@@ -785,11 +757,10 @@ func (a *agent) run() (retErr error) {
 	}
 	a.sessionToken.Store(&sessionToken)
 
-	exp, err := a.fetchExperiments(a.hardCtx)
+	a.experiments, err = a.fetchExperiments(a.hardCtx)
 	if err != nil {
 		return xerrors.Errorf("fetch experiments: %w", err)
 	}
-	a.experiments.Store(&exp)
 
 	// ConnectRPC returns the dRPC connection we use for the Agent and Tailnet v2+ APIs
 	conn, err := a.client.ConnectRPC(a.hardCtx)
@@ -900,10 +871,6 @@ func (a *agent) run() (retErr error) {
 
 	connMan.start("fetch service banner loop", gracefulShutdownBehaviorStop, a.fetchServiceBannerLoop)
 
-	connMan.start("fetch experiments loop", gracefulShutdownBehaviorStop, func(ctx context.Context, _ drpc.Conn) error {
-		return a.fetchExperimentsLoop(ctx)
-	})
-
 	connMan.start("stats report loop", gracefulShutdownBehaviorStop, func(ctx context.Context, conn drpc.Conn) error {
 		if err := networkOK.wait(ctx); err != nil {
 			return xerrors.Errorf("no network: %w", err)
@@ -1053,7 +1020,7 @@ func (a *agent) createOrUpdateNetwork(manifestOK, networkOK *checkpoint) func(co
 			closed := a.isClosed()
 			if !closed {
 				a.network = network
-				a.statsReporter = newStatsReporter(a.logger, network, a, &a.experiments)
+				a.statsReporter = newStatsReporter(a.logger, network, a, a.experiments)
 			}
 			a.closeMutex.Unlock()
 			if closed {

diff --git a/agent/stats.go b/agent/stats.go
@@ -5,7 +5,6 @@ import (
 	"sync"
 	"time"
 
-	"go.uber.org/atomic"
 	"golang.org/x/xerrors"
 	"tailscale.com/types/netlogtype"
 
@@ -41,10 +40,10 @@ type statsReporter struct {
 	source      networkStatsSource
 	collector   statsCollector
 	logger      slog.Logger
-	experiments *atomic.Pointer[codersdk.Experiments]
+	experiments codersdk.Experiments
 }
 
-func newStatsReporter(logger slog.Logger, source networkStatsSource, collector statsCollector, experiments *atomic.Pointer[codersdk.Experiments]) *statsReporter {
+func newStatsReporter(logger slog.Logger, source networkStatsSource, collector statsCollector, experiments codersdk.Experiments) *statsReporter {
 	return &statsReporter{
 		Cond:        sync.NewCond(&sync.Mutex{}),
 		logger:      logger,
@@ -119,7 +118,7 @@ func (s *statsReporter) reportLocked(
 
 	// if the experiment is enabled we zero out certain session stats
 	// as we migrate to the client reporting these stats instead.
-	if s.experiments.Load().Enabled(codersdk.ExperimentWorkspaceUsage) {
+	if s.experiments.Enabled(codersdk.ExperimentWorkspaceUsage) {
 		stats.SessionCountSsh = 0
 		// TODO: More session types will be enabled as we migrate over.
 		// stats.SessionCountVscode = 0

diff --git a/agent/stats_internal_test.go b/agent/stats_internal_test.go
@@ -11,7 +11,6 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
-	"go.uber.org/atomic"
 	"google.golang.org/protobuf/types/known/durationpb"
 	"tailscale.com/types/ipproto"
 
@@ -32,7 +31,7 @@ func TestStatsReporter(t *testing.T) {
 	fSource := newFakeNetworkStatsSource(ctx, t)
 	fCollector := newFakeCollector(t)
 	fDest := newFakeStatsDest()
-	uut := newStatsReporter(logger, fSource, fCollector, &atomic.Pointer[codersdk.Experiments]{})
+	uut := newStatsReporter(logger, fSource, fCollector, codersdk.Experiments{})
 
 	loopErr := make(chan error, 1)
 	loopCtx, loopCancel := context.WithCancel(ctx)