Fix continuous stats

kylecarbs · kylecarbs · commit a1804a96db10 · 2023-03-06T19:03:15.000Z
diff --git a/agent/agent.go b/agent/agent.go
@@ -17,6 +17,7 @@ import (
 	"os/exec"
 	"os/user"
 	"path/filepath"
+	"reflect"
 	"runtime"
 	"sort"
 	"strconv"
@@ -155,6 +156,7 @@ type agent struct {
 
 	network       *tailnet.Conn
 	connStatsChan chan *agentsdk.Stats
+	latestStat    atomic.Pointer[agentsdk.Stats]
 
 	connCountVSCode          atomic.Int64
 	connCountJetBrains       atomic.Int64
@@ -1241,6 +1243,13 @@ func (a *agent) startReportingConnectionStats(ctx context.Context) {
 		// Convert from microseconds to milliseconds.
 		stats.ConnectionMedianLatencyMS /= 1000
 
+		lastStat := a.latestStat.Load()
+		if lastStat != nil && reflect.DeepEqual(lastStat, stats) {
+			a.logger.Info(ctx, "skipping stat because nothing changed")
+			return
+		}
+		a.latestStat.Store(stats)
+
 		select {
 		case a.connStatsChan <- stats:
 		default:
diff --git a/agent/agent_test.go b/agent/agent_test.go
@@ -156,7 +156,6 @@ func TestAgent_Stats_Magic(t *testing.T) {
 		require.Eventuallyf(t, func() bool {
 			var ok bool
 			s, ok = <-stats
-			fmt.Printf("WE GOT STATS %+v\n", s)
 			return ok && s.ConnectionCount > 0 && s.RxBytes > 0 && s.TxBytes > 0 &&
 				// Ensure that the connection didn't count as a "normal" SSH session.
 				// This was a special one, so it should be labeled specially in the stats!
diff --git a/cli/deployment/config.go b/cli/deployment/config.go
@@ -406,7 +406,7 @@ func newConfig() *codersdk.DeploymentConfig {
 			Usage:   "How frequently agent stats are recorded",
 			Flag:    "agent-stats-refresh-interval",
 			Hidden:  true,
-			Default: time.Minute,
+			Default: 30 * time.Second,
 		},
 		AgentFallbackTroubleshootingURL: &codersdk.DeploymentConfigField[string]{
 			Name:    "Agent Fallback Troubleshooting URL",
diff --git a/go.mod b/go.mod
@@ -40,7 +40,7 @@ replace github.com/tcnksm/go-httpstat => github.com/kylecarbs/go-httpstat v0.0.0
 
 // There are a few minor changes we make to Tailscale that we're slowly upstreaming. Compare here:
 // https://github.com/tailscale/tailscale/compare/main...coder:tailscale:main
-replace tailscale.com => github.com/coder/tailscale v1.1.1-0.20230301203426-fb16ae7c5bba
+replace tailscale.com => github.com/coder/tailscale v1.1.1-0.20230306185501-ae6dbba0a7ee
 
 // Switch to our fork that imports fixes from http://github.com/tailscale/ssh.
 // See: https://github.com/coder/coder/issues/3371
diff --git a/go.sum b/go.sum
@@ -407,6 +407,8 @@ github.com/coder/tailscale v1.1.1-0.20230228220447-d27e5d3056e9 h1:bFcFXLUUi+cwg
 github.com/coder/tailscale v1.1.1-0.20230228220447-d27e5d3056e9/go.mod h1:jpg+77g19FpXL43U1VoIqoSg1K/Vh5CVxycGldQ8KhA=
 github.com/coder/tailscale v1.1.1-0.20230301203426-fb16ae7c5bba h1:JOD5pqNtiz9lkSX74PY2BJOyNqsBmvGUjFGIuECtG+o=
 github.com/coder/tailscale v1.1.1-0.20230301203426-fb16ae7c5bba/go.mod h1:jpg+77g19FpXL43U1VoIqoSg1K/Vh5CVxycGldQ8KhA=
+github.com/coder/tailscale v1.1.1-0.20230306185501-ae6dbba0a7ee h1:0o3Q9u7+r7zNPaRCW/bLXuxPv8ukExtyig7RZfzcs8A=
+github.com/coder/tailscale v1.1.1-0.20230306185501-ae6dbba0a7ee/go.mod h1:jpg+77g19FpXL43U1VoIqoSg1K/Vh5CVxycGldQ8KhA=
 github.com/coder/terraform-provider-coder v0.6.14 h1:NsJ1mo0MN1x/VyNLYmsgPUYn2JgzdVNZBqnj9OSIDgY=
 github.com/coder/terraform-provider-coder v0.6.14/go.mod h1:UIfU3bYNeSzJJvHyJ30tEKjD6Z9utloI+HUM/7n94CY=
 github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE=
