coder
diff --git a/‎coderd/agentapi/api.go
Lines changed: 27 additions & 13 deletions b/‎coderd/agentapi/api.go
Lines changed: 27 additions & 13 deletions
diff --git a/‎coderd/coderd.go
Lines changed: 16 additions & 8 deletions b/‎coderd/coderd.go
Lines changed: 16 additions & 8 deletions
@@ -23,6 +23,7 @@ import (
 	"github.com/coder/coder/v2/coderd/externalauth"
 	"github.com/coder/coder/v2/coderd/prometheusmetrics"
 	"github.com/coder/coder/v2/coderd/schedule"
+	"github.com/coder/coder/v2/coderd/telemetry"
 	"github.com/coder/coder/v2/coderd/tracing"
 	"github.com/coder/coder/v2/coderd/workspacestats"
 	"github.com/coder/coder/v2/codersdk"
@@ -47,6 +48,7 @@ type API struct {
 
 	mu                sync.Mutex
 	cachedWorkspaceID uuid.UUID
+	drpcServiceClose  func()
 }
 
 var _ agentproto.DRPCAgentServer = &API{}
@@ -65,15 +67,18 @@ type Options struct {
 	AppearanceFetcher                 *atomic.Pointer[appearance.Fetcher]
 	PublishWorkspaceUpdateFn          func(ctx context.Context, workspaceID uuid.UUID)
 	PublishWorkspaceAgentLogsUpdateFn func(ctx context.Context, workspaceAgentID uuid.UUID, msg agentsdk.LogsNotifyMessage)
-
-	AccessURL                 *url.URL
-	AppHostname               string
-	AgentStatsRefreshInterval time.Duration
-	DisableDirectConnections  bool
-	DerpForceWebSockets       bool
-	DerpMapUpdateFrequency    time.Duration
-	ExternalAuthConfigs       []*externalauth.Config
-	Experiments               codersdk.Experiments
+	NetworkTelemetryBatchFn           func(batch []telemetry.NetworkEvent)
+
+	AccessURL                      *url.URL
+	AppHostname                    string
+	AgentStatsRefreshInterval      time.Duration
+	DisableDirectConnections       bool
+	DerpForceWebSockets            bool
+	DerpMapUpdateFrequency         time.Duration
+	NetworkTelemetryBatchFrequency time.Duration
+	NetworkTelemetryBatchMaxSize   int
+	ExternalAuthConfigs            []*externalauth.Config
+	Experiments                    codersdk.Experiments
 
 	// Optional:
 	// WorkspaceID avoids a future lookup to find the workspace ID by setting
@@ -154,15 +159,24 @@ func New(opts Options) *API {
 	}
 
 	api.DRPCService = &tailnet.DRPCService{
-		CoordPtr:               opts.TailnetCoordinator,
-		Logger:                 opts.Log,
-		DerpMapUpdateFrequency: opts.DerpMapUpdateFrequency,
-		DerpMapFn:              opts.DerpMapFn,
+		CoordPtr:                       opts.TailnetCoordinator,
+		Logger:                         opts.Log,
+		DerpMapUpdateFrequency:         opts.DerpMapUpdateFrequency,
+		DerpMapFn:                      opts.DerpMapFn,
+		NetworkTelemetryBatchFrequency: opts.NetworkTelemetryBatchFrequency,
+		NetworkTelemetryBatchMaxSize:   opts.NetworkTelemetryBatchMaxSize,
+		NetworkTelemetryBatchFn:        opts.NetworkTelemetryBatchFn,
 	}
+	api.drpcServiceClose = api.DRPCService.PeriodicTelemetryBatcher()
 
 	return api
 }
 
+func (a *API) Close() error {
+	a.drpcServiceClose()
+	return nil
+}
+
 func (a *API) Server(ctx context.Context) (*drpcserver.Server, error) {
 	mux := drpcmux.New()
 	err := agentproto.DRPCRegisterAgent(mux, a)
 
@@ -142,14 +142,16 @@ type Options struct {
 	DERPServer         *derp.Server
 	// BaseDERPMap is used as the base DERP map for all clients and agents.
 	// Proxies are added to this list.
-	BaseDERPMap                 *tailcfg.DERPMap
-	DERPMapUpdateFrequency      time.Duration
-	SwaggerEndpoint             bool
-	SetUserGroups               func(ctx context.Context, logger slog.Logger, tx database.Store, userID uuid.UUID, orgGroupNames map[uuid.UUID][]string, createMissingGroups bool) error
-	SetUserSiteRoles            func(ctx context.Context, logger slog.Logger, tx database.Store, userID uuid.UUID, roles []string) error
-	TemplateScheduleStore       *atomic.Pointer[schedule.TemplateScheduleStore]
-	UserQuietHoursScheduleStore *atomic.Pointer[schedule.UserQuietHoursScheduleStore]
-	AccessControlStore          *atomic.Pointer[dbauthz.AccessControlStore]
+	BaseDERPMap                    *tailcfg.DERPMap
+	DERPMapUpdateFrequency         time.Duration
+	NetworkTelemetryBatchFrequency time.Duration
+	NetworkTelemetryBatchMaxSize   int
+	SwaggerEndpoint                bool
+	SetUserGroups                  func(ctx context.Context, logger slog.Logger, tx database.Store, userID uuid.UUID, orgGroupNames map[uuid.UUID][]string, createMissingGroups bool) error
+	SetUserSiteRoles               func(ctx context.Context, logger slog.Logger, tx database.Store, userID uuid.UUID, roles []string) error
+	TemplateScheduleStore          *atomic.Pointer[schedule.TemplateScheduleStore]
+	UserQuietHoursScheduleStore    *atomic.Pointer[schedule.UserQuietHoursScheduleStore]
+	AccessControlStore             *atomic.Pointer[dbauthz.AccessControlStore]
 	// AppSecurityKey is the crypto key used to sign and encrypt tokens related to
 	// workspace applications. It consists of both a signing and encryption key.
 	AppSecurityKey workspaceapps.SecurityKey
@@ -305,6 +307,12 @@ func New(options *Options) *API {
 	if options.DERPMapUpdateFrequency == 0 {
 		options.DERPMapUpdateFrequency = 5 * time.Second
 	}
+	if options.NetworkTelemetryBatchFrequency == 0 {
+		options.NetworkTelemetryBatchFrequency = 1 * time.Minute
+	}
+	if options.NetworkTelemetryBatchMaxSize == 0 {
+		options.NetworkTelemetryBatchMaxSize = 1_000
+	}
 	if options.TailnetCoordinator == nil {
 		options.TailnetCoordinator = tailnet.NewCoordinator(options.Logger)
 	}