Skip to content

chore: add additional network telemetry stats & events #13800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Jul 10, 2024
Merged

chore: add additional network telemetry stats & events #13800

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
6ee3bfa
chore: add additional network telemetry stats & events
ethanndickson Jul 8, 2024
6e0ec17
better connectionage
ethanndickson Jul 8, 2024
ae17bb3
send update events only when home derp changes
ethanndickson Jul 8, 2024
612ae5f
better remote node id
ethanndickson Jul 8, 2024
d2d9c39
use netmap callback
ethanndickson Jul 8, 2024
af36c37
fixup
ethanndickson Jul 8, 2024
3466ba6
fixup
ethanndickson Jul 8, 2024
dbffec4
test
ethanndickson Jul 8, 2024
b240507
set p2p setup
ethanndickson Jul 9, 2024
e2e4018
fixup
ethanndickson Jul 9, 2024
0bebad4
watch for conn changes
ethanndickson Jul 9, 2024
6a19849
fixup
ethanndickson Jul 9, 2024
11f2a2b
use latest p2p setup time
ethanndickson Jul 9, 2024
fe7252a
ensure latest derpmap
ethanndickson Jul 9, 2024
4b76942
nicer ping peer
ethanndickson Jul 9, 2024
6214e2a
fix race
ethanndickson Jul 9, 2024
60e88f7
relay -> udp addr
ethanndickson Jul 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
set p2p setup
  • Loading branch information
@ethanndickson
ethanndickson committed Jul 9, 2024
commit b2405072da6160d67b4966bf6df88955fc31855a
60 changes: 21 additions & 39 deletions tailnet/conn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,11 +294,7 @@ func NewConn(options *Options) (conn *Conn, err error) {
server.telemetryStore.setNetInfo(ni)
nodeUp.setNetInfo(ni)
})
server.wireguardEngine.AddNetworkMapCallback(func(nm *netmap.NetworkMap) {
if server.telemetryStore.updateNetworkMap(nm) {
server.sendUpdatedTelemetry()
}
})
server.wireguardEngine.AddNetworkMapCallback(server.networkMapCallback)
} else {
server.wireguardEngine.SetNetInfoCallback(nodeUp.setNetInfo)
}
Expand Down Expand Up @@ -723,25 +719,7 @@ func (c *Conn) SendConnectedTelemetry(ip netip.Addr, application string) {
c.telemetryStore.markConnected(&ip, c.createdAt, application)
e := c.newTelemetryEvent()
e.Status = proto.TelemetryEvent_CONNECTED
c.telemetryWg.Add(1)
go func() {
defer c.telemetryWg.Done()
c.telemetrySink.SendTelemetryEvent(e)
}()
}

// Currently only called when the preferred DERP is updated.
func (c *Conn) sendUpdatedTelemetry() {
if c.telemetrySink == nil {
return
}
e := c.newTelemetryEvent()
e.Status = proto.TelemetryEvent_CONNECTED
c.telemetryWg.Add(1)
go func() {
defer c.telemetryWg.Done()
c.telemetrySink.SendTelemetryEvent(e)
}()
c.sendTelemetryBackground(e)
}

func (c *Conn) SendDisconnectedTelemetry() {
Expand All @@ -750,11 +728,7 @@ func (c *Conn) SendDisconnectedTelemetry() {
}
e := c.newTelemetryEvent()
e.Status = proto.TelemetryEvent_DISCONNECTED
c.telemetryWg.Add(1)
go func() {
defer c.telemetryWg.Done()
c.telemetrySink.SendTelemetryEvent(e)
}()
c.sendTelemetryBackground(e)
}

func (c *Conn) SendSpeedtestTelemetry(throughputMbits float64) {
Expand All @@ -764,11 +738,7 @@ func (c *Conn) SendSpeedtestTelemetry(throughputMbits float64) {
e := c.newTelemetryEvent()
e.ThroughputMbits = wrapperspb.Float(float32(throughputMbits))
e.Status = proto.TelemetryEvent_CONNECTED
c.telemetryWg.Add(1)
go func() {
defer c.telemetryWg.Done()
c.telemetrySink.SendTelemetryEvent(e)
}()
c.sendTelemetryBackground(e)
}

// nolint:revive
Expand All @@ -782,15 +752,12 @@ func (c *Conn) sendPingTelemetry(pr *ipnstate.PingResult) {
if pr.Endpoint != "" {
e.P2PLatency = latency
e.P2PEndpoint = c.telemetryStore.toEndpoint(pr.Endpoint)
e.P2PSetup = durationpb.New(time.Since(c.createdAt))
} else {
e.DerpLatency = latency
}
e.Status = proto.TelemetryEvent_CONNECTED
c.telemetryWg.Add(1)
go func() {
defer c.telemetryWg.Done()
c.telemetrySink.SendTelemetryEvent(e)
}()
c.sendTelemetryBackground(e)
}

// The returned telemetry event will not have it's status set.
Expand All @@ -804,6 +771,21 @@ func (c *Conn) newTelemetryEvent() *proto.TelemetryEvent {
return event
}

func (c *Conn) networkMapCallback(nm *netmap.NetworkMap) {
c.telemetryStore.updateNetworkMap(nm)
if c.telemetryStore.connectedIP != nil {
go func() { _, _, _, _ = c.Ping(context.Background(), *c.telemetryStore.connectedIP) }()
}
}

func (c *Conn) sendTelemetryBackground(e *proto.TelemetryEvent) {
c.telemetryWg.Add(1)
go func() {
defer c.telemetryWg.Done()
c.telemetrySink.SendTelemetryEvent(e)
}()
}

// PeerDiagnostics is a checklist of human-readable conditions necessary to establish an encrypted
// tunnel to a peer via a Conn
type PeerDiagnostics struct {
Expand Down
7 changes: 3 additions & 4 deletions tailnet/telemetry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,18 +100,17 @@ func (b *TelemetryStore) updateRemoteNodeIDLocked(nm *netmap.NetworkMap) {
}
}

// Returns whether a new telemetry event should be sent
func (b *TelemetryStore) updateNetworkMap(nm *netmap.NetworkMap) bool {
func (b *TelemetryStore) updateNetworkMap(nm *netmap.NetworkMap) {
b.mu.Lock()
defer b.mu.Unlock()

if nm == nil {
return false
return
}

b.updateDerpMapLocked(nm.DERPMap)
b.updateRemoteNodeIDLocked(nm)
return b.updateByNodeLocked(nm.SelfNode)
b.updateByNodeLocked(nm.SelfNode)
}

// Given a DERPMap, anonymise all IPs and hostnames.
Expand Down