test

ethanndickson · ethanndickson · commit dbffec425b00 · 2024-07-08T13:46:58.000Z
diff --git a/tailnet/telemetry.go b/tailnet/telemetry.go
@@ -33,15 +33,15 @@ type TelemetryStore struct {
 
 	cleanDerpMap  *tailcfg.DERPMap
 	cleanNetCheck *proto.Netcheck
-	nodeID        uint64
+	nodeIDSelf    uint64
 	homeDerp      int32
 	application   string
 
 	// nil if not connected
 	connSetupTime *durationpb.Duration
 	connectedIP   *netip.Addr
 	// 0 if not connected
-	connectedNodeID uint64
+	nodeIDRemote uint64
 }
 
 func newTelemetryStore() (*TelemetryStore, error) {
@@ -64,8 +64,8 @@ func (b *TelemetryStore) newEvent() *proto.TelemetryEvent {
 		Time:            timestamppb.Now(),
 		DerpMap:         DERPMapToProto(b.cleanDerpMap),
 		LatestNetcheck:  b.cleanNetCheck,
-		NodeIdSelf:      b.nodeID,
-		NodeIdRemote:    b.connectedNodeID,
+		NodeIdSelf:      b.nodeIDSelf,
+		NodeIdRemote:    b.nodeIDRemote,
 		HomeDerp:        b.homeDerp,
 		ConnectionSetup: b.connSetupTime,
 		Application:     b.application,
@@ -94,7 +94,7 @@ func (b *TelemetryStore) updateRemoteNodeIDLocked(nm *netmap.NetworkMap) {
 	for _, p := range nm.Peers {
 		for _, a := range p.Addresses {
 			if a.Addr() == ip && a.IsSingleIP() {
-				b.connectedNodeID = uint64(p.ID)
+				b.nodeIDRemote = uint64(p.ID)
 			}
 		}
 	}
@@ -145,7 +145,7 @@ func (b *TelemetryStore) updateByNodeLocked(n *tailcfg.Node) bool {
 	if n == nil {
 		return false
 	}
-	b.nodeID = uint64(n.ID)
+	b.nodeIDSelf = uint64(n.ID)
 	derpIP, err := netip.ParseAddrPort(n.DERP)
 	if err != nil {
 		return false
diff --git a/tailnet/telemetry_internal_test.go b/tailnet/telemetry_internal_test.go
@@ -1,17 +1,82 @@
 package tailnet
 
 import (
+	"fmt"
+	"net/netip"
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/require"
 	"tailscale.com/tailcfg"
+	"tailscale.com/types/netmap"
 
 	"github.com/coder/coder/v2/tailnet/proto"
 )
 
 func TestTelemetryStore(t *testing.T) {
 	t.Parallel()
 
+	t.Run("CreateEvent", func(t *testing.T) {
+		t.Parallel()
+
+		remotePrefix := netip.PrefixFrom(IP(), 128)
+		remoteIP := remotePrefix.Addr()
+		application := "test"
+
+		nm := &netmap.NetworkMap{
+			SelfNode: &tailcfg.Node{
+				ID:   0,
+				DERP: "127.3.3.40:999",
+			},
+			Peers: []*tailcfg.Node{
+				{
+					ID: 1,
+					Addresses: []netip.Prefix{
+						netip.PrefixFrom(IP(), 128),
+						netip.PrefixFrom(IP(), 128),
+					},
+				},
+				{
+					ID: 2,
+					Addresses: []netip.Prefix{
+						remotePrefix,
+						netip.PrefixFrom(IP(), 128),
+						netip.PrefixFrom(IP(), 128),
+					},
+				},
+			},
+			DERPMap: &tailcfg.DERPMap{
+				HomeParams: &tailcfg.DERPHomeParams{
+					RegionScore: map[int]float64{
+						999: 1.0,
+					},
+				},
+				Regions: map[int]*tailcfg.DERPRegion{
+					999: {
+						RegionID:      999,
+						RegionCode:    "zzz",
+						RegionName:    "Cool Region",
+						EmbeddedRelay: true,
+						Avoid:         false,
+					},
+				},
+				OmitDefaultRegions: false,
+			},
+		}
+
+		telemetry, err := newTelemetryStore()
+		require.NoError(t, err)
+		telemetry.markConnected(&remoteIP, time.Now(), application)
+		telemetry.updateNetworkMap(nm)
+		e := telemetry.newEvent()
+		// DERPMapToProto already tested
+		require.Equal(t, DERPMapToProto(nm.DERPMap), e.DerpMap)
+		require.Equal(t, uint64(nm.Peers[1].ID), e.NodeIdRemote)
+		require.Equal(t, uint64(nm.SelfNode.ID), e.NodeIdSelf)
+		require.Equal(t, application, e.Application)
+		require.Equal(t, nm.SelfNode.DERP, fmt.Sprintf("127.3.3.40:%d", e.HomeDerp))
+	})
+
 	t.Run("CleanIPs", func(t *testing.T) {
 		t.Parallel()
 
