Report short-lived connections are logged

ammario · ammario · commit 31022af64a57 · 2022-08-30T22:58:49.000Z
diff --git a/agent/agent.go b/agent/agent.go
@@ -351,7 +351,9 @@ func (a *agent) init(ctx context.Context) {
 	go a.run(ctx)
 	if a.statsReporter != nil {
 		cl, err := a.statsReporter(ctx, a.logger, func() *Stats {
-			return a.stats.Copy()
+			ss := a.stats.Copy()
+			a.stats.Reset()
+			return ss
 		})
 		if err != nil {
 			a.logger.Error(ctx, "report stats", slog.Error(err))
diff --git a/agent/stats.go b/agent/stats.go
@@ -63,6 +63,17 @@ func (s *Stats) Copy() *Stats {
 	return &ss
 }
 
+func (s *Stats) Reset() {
+	s.Lock()
+	defer s.Unlock()
+
+	for _, ps := range s.ProtocolStats {
+		atomic.StoreInt64(&ps.NumConns, 0)
+		atomic.StoreInt64(&ps.RxBytes, 0)
+		atomic.StoreInt64(&ps.TxBytes, 0)
+	}
+}
+
 // goConn launches a new connection-processing goroutine, account for
 // s.Conns in a thread-safe manner.
 func (s *Stats) goConn(conn net.Conn, protocol string, fn func(conn net.Conn)) {
@@ -79,17 +90,16 @@ func (s *Stats) goConn(conn net.Conn, protocol string, fn func(conn net.Conn)) {
 		Conn:          conn,
 	}
 
-	go func() {
-		atomic.AddInt64(&ps.NumConns, 1)
-		defer func() {
-			atomic.AddInt64(&ps.NumConns, -1)
-		}()
-
-		fn(cs)
-	}()
+	atomic.AddInt64(&ps.NumConns, 1)
+	go fn(cs)
 }
 
 // StatsReporter periodically accept and records agent stats.
+// The agent should send incremental stats instead of the cumulative
+// value so that SQL queries can efficiently detect activity rates and
+// short-lived connections.
+//
+// E.g., we want to easily query for periods where transfers exceeded 100MB.
 type StatsReporter func(
 	ctx context.Context,
 	log slog.Logger,
diff --git a/coderd/metrics.go b/coderd/metrics.go
@@ -52,7 +52,7 @@ func FillEmptyDAUDays(rows []database.GetDAUsFromAgentStatsRow) []database.GetDA
 }
 
 func (api *API) daus(rw http.ResponseWriter, r *http.Request) {
-	if !api.Authorize(r, rbac.ActionRead, rbac.ResourceMetrics) {
+	if !api.Authorize(r, rbac.ActionRead, rbac.ResourceUser) {
 		httpapi.Forbidden(rw)
 		return
 	}

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ func FillEmptyDAUDays(rows []database.GetDAUsFromAgentStatsRow) []database.GetDA`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`func (api API) daus(rw http.ResponseWriter, r http.Request) {`
`55`		`- if !api.Authorize(r, rbac.ActionRead, rbac.ResourceMetrics) {`
	`55`	`+ if !api.Authorize(r, rbac.ActionRead, rbac.ResourceUser) {`
`56`	`56`	`httpapi.Forbidden(rw)`
`57`	`57`	`return`
`58`	`58`	`}`