connect

f0ssel · f0ssel · commit d19a4da1ed61 · 2024-06-17T19:11:36.000Z
diff --git a/agent/agent.go b/agent/agent.go
@@ -1052,7 +1052,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.statsReporter = newStatsReporter(a.logger, network, a, &a.experiments)
 			}
 			a.closeMutex.Unlock()
 			if closed {
diff --git a/agent/stats.go b/agent/stats.go
@@ -41,15 +41,16 @@ type statsReporter struct {
 	source      networkStatsSource
 	collector   statsCollector
 	logger      slog.Logger
-	experiments atomic.Pointer[codersdk.Experiments]
+	experiments *atomic.Pointer[codersdk.Experiments]
 }
 
-func newStatsReporter(logger slog.Logger, source networkStatsSource, collector statsCollector) *statsReporter {
+func newStatsReporter(logger slog.Logger, source networkStatsSource, collector statsCollector, experiments *atomic.Pointer[codersdk.Experiments]) *statsReporter {
 	return &statsReporter{
-		Cond:      sync.NewCond(&sync.Mutex{}),
-		logger:    logger,
-		source:    source,
-		collector: collector,
+		Cond:        sync.NewCond(&sync.Mutex{}),
+		logger:      logger,
+		source:      source,
+		collector:   collector,
+		experiments: experiments,
 	}
 }
 
diff --git a/agent/stats_internal_test.go b/agent/stats_internal_test.go
@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
+	"go.uber.org/atomic"
 	"google.golang.org/protobuf/types/known/durationpb"
 	"tailscale.com/types/ipproto"
 
@@ -20,6 +21,7 @@ import (
 	"cdr.dev/slog/sloggers/slogjson"
 	"cdr.dev/slog/sloggers/slogtest"
 	"github.com/coder/coder/v2/agent/proto"
+	"github.com/coder/coder/v2/codersdk"
 	"github.com/coder/coder/v2/testutil"
 )
 
@@ -30,7 +32,7 @@ func TestStatsReporter(t *testing.T) {
 	fSource := newFakeNetworkStatsSource(ctx, t)
 	fCollector := newFakeCollector(t)
 	fDest := newFakeStatsDest()
-	uut := newStatsReporter(logger, fSource, fCollector)
+	uut := newStatsReporter(logger, fSource, fCollector, &atomic.Pointer[codersdk.Experiments]{})
 
 	loopErr := make(chan error, 1)
 	loopCtx, loopCancel := context.WithCancel(ctx)

Original file line number	Diff line number	Diff line change
`@@ -1052,7 +1052,7 @@ func (a agent) createOrUpdateNetwork(manifestOK, networkOK checkpoint) func(co`
`1052`	`1052`	`closed := a.isClosed()`
`1053`	`1053`	`if !closed {`
`1054`	`1054`	`a.network = network`
`1055`		`- a.statsReporter = newStatsReporter(a.logger, network, a)`
	`1055`	`+ a.statsReporter = newStatsReporter(a.logger, network, a, &a.experiments)`
`1056`	`1056`	`}`
`1057`	`1057`	`a.closeMutex.Unlock()`
`1058`	`1058`	`if closed {`