better connectionage

ethanndickson · ethanndickson · commit 6e0ec17677f9 · 2024-07-08T05:42:12.000Z
diff --git a/tailnet/conn.go b/tailnet/conn.go
@@ -727,9 +727,9 @@ func (c *Conn) SendConnectedTelemetry(ip netip.Addr, application string) {
 	if c.telemetrySink == nil {
 		return
 	}
+	c.telemetryStore.markConnected(time.Since(c.createdAt))
 	e := c.newTelemetryEvent()
 	e.Status = proto.TelemetryEvent_CONNECTED
-	e.ConnectionSetup = durationpb.New(time.Since(c.createdAt))
 	e.Application = application
 	pip, ok := c.wireguardEngine.PeerForIP(ip)
 	if ok {
diff --git a/tailnet/telemetry.go b/tailnet/telemetry.go
@@ -33,6 +33,8 @@ type TelemetryStore struct {
 	cleanNetCheck *proto.Netcheck
 	nodeID        uint64
 	homeDerp      int32
+
+	connSetupTime time.Duration
 }
 
 func newTelemetryStore() (*TelemetryStore, error) {
@@ -52,17 +54,25 @@ func (b *TelemetryStore) newEvent() *proto.TelemetryEvent {
 	defer b.mu.Unlock()
 
 	return &proto.TelemetryEvent{
-		Time:           timestamppb.Now(),
-		DerpMap:        DERPMapToProto(b.cleanDerpMap),
-		LatestNetcheck: b.cleanNetCheck,
-		NodeIdSelf:     b.nodeID,
-		HomeDerp:       b.homeDerp,
+		Time:            timestamppb.Now(),
+		DerpMap:         DERPMapToProto(b.cleanDerpMap),
+		LatestNetcheck:  b.cleanNetCheck,
+		NodeIdSelf:      b.nodeID,
+		HomeDerp:        b.homeDerp,
+		ConnectionSetup: durationpb.New(b.connSetupTime),
 
 		// TODO(ethanndickson):
 		P2PSetup: &durationpb.Duration{},
 	}
 }
 
+func (b *TelemetryStore) markConnected(connSetupTime time.Duration) {
+	b.mu.Lock()
+	defer b.mu.Unlock()
+
+	b.connSetupTime = connSetupTime
+}
+
 // Given a DERPMap, anonymise all IPs and hostnames.
 // Keep track of seen hostnames/cert names to anonymize them from future logs.
 // b.mu must NOT be held.
