pr comments

f0ssel · f0ssel · commit 43a00352d319 · 2024-06-20T18:42:04.000Z
diff --git a/agent/stats.go b/agent/stats.go
@@ -24,15 +24,15 @@ type statsCollector interface {
 	Collect(ctx context.Context, networkStats map[netlogtype.Connection]netlogtype.Counts) *proto.Stats
 }
 
-type statsDest interface {
+type statsAPI interface {
 	GetExperiments(ctx context.Context, req *proto.GetExperimentsRequest) (*proto.GetExperimentsResponse, error)
 	UpdateStats(ctx context.Context, req *proto.UpdateStatsRequest) (*proto.UpdateStatsResponse, error)
 }
 
 // statsReporter is a subcomponent of the agent that handles registering the stats callback on the
 // networkStatsSource (tailnet.Conn in prod), handling the callback, calling back to the
 // statsCollector (agent in prod) to collect additional stats, then sending the update to the
-// statsDest (agent API in prod)
+// statsAPI (agent API in prod)
 type statsReporter struct {
 	*sync.Cond
 	networkStats *map[netlogtype.Connection]netlogtype.Counts
@@ -70,12 +70,14 @@ func (s *statsReporter) callback(_, _ time.Time, virtual, _ map[netlogtype.Conne
 // connection to the agent API, then passes that connection to go routines like
 // this that use it.  There is no retry and we fail on the first error since
 // this will be inside a larger retry loop.
-func (s *statsReporter) reportLoop(ctx context.Context, dest statsDest) error {
+func (s *statsReporter) reportLoop(ctx context.Context, dest statsAPI) error {
 	exp, err := dest.GetExperiments(ctx, &proto.GetExperimentsRequest{})
 	if err != nil {
 		return xerrors.Errorf("get experiments: %w", err)
 	}
+	s.L.Lock()
 	s.experiments = agentsdk.ExperimentsFromProto(exp)
+	s.L.Unlock()
 
 	// send an initial, blank report to get the interval
 	resp, err := dest.UpdateStats(ctx, &proto.UpdateStatsRequest{})
@@ -115,7 +117,7 @@ func (s *statsReporter) reportLoop(ctx context.Context, dest statsDest) error {
 }
 
 func (s *statsReporter) reportLocked(
-	ctx context.Context, dest statsDest, networkStats map[netlogtype.Connection]netlogtype.Counts,
+	ctx context.Context, dest statsAPI, networkStats map[netlogtype.Connection]netlogtype.Counts,
 ) error {
 	// here we want to do our collecting/reporting while it is unlocked, but then relock
 	// when we return to reportLoop.
diff --git a/coderd/workspacestats/workspacestatstest/batcher.go b/coderd/workspacestats/workspacestatstest/batcher.go
diff --git a/tailnet/proto/version.go b/tailnet/proto/version.go
@@ -6,7 +6,7 @@ import (
 
 const (
 	CurrentMajor = 2
-	CurrentMinor = 1
+	CurrentMinor = 2
 )
 
 var CurrentVersion = apiversion.New(CurrentMajor, CurrentMinor).WithBackwardCompat(1)

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`
`7`	`7`	`const (`
`8`	`8`	`CurrentMajor = 2`
`9`		`- CurrentMinor = 1`
	`9`	`+ CurrentMinor = 2`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`var CurrentVersion = apiversion.New(CurrentMajor, CurrentMinor).WithBackwardCompat(1)`