TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-05-23 07:48:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

derp: add metrics to server got pings, sent pongs

Browse Source 
Updates #3652

Change-Id: I1d350bcaee39ea36b0c71912028624d18fb541b4
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2022-01-03 14:02:40 -08:00 committed by Brad Fitzpatrick
parent 2513d2d728
commit 2aeb93003f
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
derp/derp_server.go
View File

@ -125,6 +125,8 @@ type Server struct {
packetsForwardedOut expvar.Int packetsForwardedOut expvar.Int
packetsForwardedIn expvar.Int packetsForwardedIn expvar.Int
peerGoneFrames expvar.Int // number of peer gone frames sent peerGoneFrames expvar.Int // number of peer gone frames sent
gotPing expvar.Int // number of ping frames from client
sentPong expvar.Int // number of pong frames enqueued to client
accepts expvar.Int accepts expvar.Int
curClients expvar.Int curClients expvar.Int
curHomeClients expvar.Int // ones with preferred curHomeClients expvar.Int // ones with preferred
@ -770,6 +772,7 @@ func (c *sclient) handleFrameWatchConns(ft frameType, fl uint32) error {
} }
func (c *sclient) handleFramePing(ft frameType, fl uint32) error { func (c *sclient) handleFramePing(ft frameType, fl uint32) error {
c.s.gotPing.Add(1)
var m PingMessage var m PingMessage
if fl < uint32(len(m)) { if fl < uint32(len(m)) {
return fmt.Errorf("short ping: %v", fl) return fmt.Errorf("short ping: %v", fl)
@ -1422,6 +1425,7 @@ func (c *sclient) sendKeepAlive() error {
// sendPong sends a pong reply, without flushing. // sendPong sends a pong reply, without flushing.
func (c *sclient) sendPong(data [8]byte) error { func (c *sclient) sendPong(data [8]byte) error {
c.s.sentPong.Add(1)
c.setWriteDeadline() c.setWriteDeadline()
if err := writeFrameHeader(c.bw.bw(), framePong, uint32(len(data))); err != nil { if err := writeFrameHeader(c.bw.bw(), framePong, uint32(len(data))); err != nil {
return err return err
@ -1671,6 +1675,8 @@ func (s *Server) ExpVar() expvar.Var {
m.Set("unknown_frames", &s.unknownFrames) m.Set("unknown_frames", &s.unknownFrames)
m.Set("home_moves_in", &s.homeMovesIn) m.Set("home_moves_in", &s.homeMovesIn)
m.Set("home_moves_out", &s.homeMovesOut) m.Set("home_moves_out", &s.homeMovesOut)
m.Set("got_ping", &s.gotPing)
m.Set("sent_pong", &s.sentPong)
m.Set("peer_gone_frames", &s.peerGoneFrames) m.Set("peer_gone_frames", &s.peerGoneFrames)
m.Set("packets_forwarded_out", &s.packetsForwardedOut) m.Set("packets_forwarded_out", &s.packetsForwardedOut)
m.Set("packets_forwarded_in", &s.packetsForwardedIn) m.Set("packets_forwarded_in", &s.packetsForwardedIn)