Rename ConnStats to StatsConn

ammario · ammario · commit 23f24a17bf67 · 2022-09-01T02:18:35.000Z
diff --git a/agent/agent.go b/agent/agent.go
@@ -205,7 +205,7 @@ func (a *agent) runTailnet(ctx context.Context, derpMap *tailcfg.DERPMap) {
 		if listenerExists {
 			return conn
 		}
-		return &ConnStats{ProtocolStats: &ProtocolStats{}, Conn: conn}
+		return &StatsConn{ProtocolStats: &ProtocolStats{}, Conn: conn}
 	})
 	go a.runCoordinator(ctx)
 
diff --git a/agent/stats.go b/agent/stats.go
@@ -10,21 +10,21 @@ import (
 	"cdr.dev/slog"
 )
 
-// ConnStats wraps a net.Conn with statistics.
-type ConnStats struct {
+// StatsConn wraps a net.Conn with statistics.
+type StatsConn struct {
 	*ProtocolStats
 	net.Conn `json:"-"`
 }
 
-var _ net.Conn = new(ConnStats)
+var _ net.Conn = new(StatsConn)
 
-func (c *ConnStats) Read(b []byte) (n int, err error) {
+func (c *StatsConn) Read(b []byte) (n int, err error) {
 	n, err = c.Conn.Read(b)
 	atomic.AddInt64(&c.RxBytes, int64(n))
 	return n, err
 }
 
-func (c *ConnStats) Write(b []byte) (n int, err error) {
+func (c *StatsConn) Write(b []byte) (n int, err error) {
 	n, err = c.Conn.Write(b)
 	atomic.AddInt64(&c.TxBytes, int64(n))
 	return n, err
@@ -40,7 +40,7 @@ type ProtocolStats struct {
 	TxBytes int64 `json:"tx_bytes"`
 }
 
-var _ net.Conn = new(ConnStats)
+var _ net.Conn = new(StatsConn)
 
 // Stats records the Agent's network connection statistics for use in
 // user-facing metrics and debugging.
@@ -74,7 +74,7 @@ func (s *Stats) wrapConn(conn net.Conn, protocol string) net.Conn {
 	s.Unlock()
 
 	atomic.AddInt64(&ps.NumConns, 1)
-	cs := &ConnStats{
+	cs := &StatsConn{
 		ProtocolStats: ps,
 		Conn:          conn,
 	}
diff --git a/agent/stats_test.go b/agent/stats_test.go
@@ -20,7 +20,7 @@ func TestConnStats(t *testing.T) {
 		c1, c2 := net.Pipe()
 
 		payload := []byte("dogs & cats")
-		statsConn := &agent.ConnStats{Conn: c1, ProtocolStats: &agent.ProtocolStats{}}
+		statsConn := &agent.StatsConn{Conn: c1, ProtocolStats: &agent.ProtocolStats{}}
 
 		got := make(chan []byte)
 		go func() {
@@ -44,7 +44,7 @@ func TestConnStats(t *testing.T) {
 		c1, c2 := net.Pipe()
 
 		payload := []byte("cats & dogs")
-		statsConn := &agent.ConnStats{Conn: c1, ProtocolStats: &agent.ProtocolStats{}}
+		statsConn := &agent.StatsConn{Conn: c1, ProtocolStats: &agent.ProtocolStats{}}
 
 		go func() {
 			c2.Write(payload)

Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ func (a agent) runTailnet(ctx context.Context, derpMap tailcfg.DERPMap) {`
`205`	`205`	`if listenerExists {`
`206`	`206`	`return conn`
`207`	`207`	`}`
`208`		`- return &ConnStats{ProtocolStats: &ProtocolStats{}, Conn: conn}`
	`208`	`+ return &StatsConn{ProtocolStats: &ProtocolStats{}, Conn: conn}`
`209`	`209`	`})`
`210`	`210`	`go a.runCoordinator(ctx)`
`211`	`211`