TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-02-22 12:58:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

derp: add bytes dropped metric (#14698)

Browse Source 
Add bytes dropped counter metric by reason and kind.

Fixes tailscale/corp#25918

Signed-off-by: Mike O'Driscoll <mikeo@tailscale.com>
This commit is contained in:
Mike O'Driscoll 2025-01-20 12:31:26 -05:00 committed by GitHub
parent 6c30840cac
commit 6e3c746942
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
derp/derp_server.go
View File

@ -357,6 +357,12 @@ var packetsDropped = metrics.NewMultiLabelMap[dropReasonKindLabels](
"counter", "counter",
"DERP packets dropped by reason and by kind") "DERP packets dropped by reason and by kind")
var bytesDropped = metrics.NewMultiLabelMap[dropReasonKindLabels](
"derp_bytes_dropped",
"counter",
"DERP bytes dropped by reason and by kind",
)
// NewServer returns a new DERP server. It doesn't listen on its own. // NewServer returns a new DERP server. It doesn't listen on its own.
// Connections are given to it via Server.Accept. // Connections are given to it via Server.Accept.
func NewServer(privateKey key.NodePrivate, logf logger.Logf) *Server { func NewServer(privateKey key.NodePrivate, logf logger.Logf) *Server {
@ -388,13 +394,13 @@ func NewServer(privateKey key.NodePrivate, logf logger.Logf) *Server {
s.packetsRecvDisco = s.packetsRecvByKind.Get(string(packetKindDisco)) s.packetsRecvDisco = s.packetsRecvByKind.Get(string(packetKindDisco))
s.packetsRecvOther = s.packetsRecvByKind.Get(string(packetKindOther)) s.packetsRecvOther = s.packetsRecvByKind.Get(string(packetKindOther))
genPacketsDroppedCounters() genDroppedCounters()
s.perClientSendQueueDepth = getPerClientSendQueueDepth() s.perClientSendQueueDepth = getPerClientSendQueueDepth()
return s return s
} }
func genPacketsDroppedCounters() { func genDroppedCounters() {
initMetrics := func(reason dropReason) { initMetrics := func(reason dropReason) {
packetsDropped.Add(dropReasonKindLabels{ packetsDropped.Add(dropReasonKindLabels{
Kind: string(packetKindDisco), Kind: string(packetKindDisco),
@ -404,6 +410,14 @@ func genPacketsDroppedCounters() {
Kind: string(packetKindOther), Kind: string(packetKindOther),
Reason: string(reason), Reason: string(reason),
}, 0) }, 0)
bytesDropped.Add(dropReasonKindLabels{
Kind: string(packetKindDisco),
Reason: string(reason),
}, 0)
bytesDropped.Add(dropReasonKindLabels{
Kind: string(packetKindOther),
Reason: string(reason),
}, 0)
} }
getMetrics := func(reason dropReason) []expvar.Var { getMetrics := func(reason dropReason) []expvar.Var {
return []expvar.Var{ return []expvar.Var{
@ -415,6 +429,14 @@ func genPacketsDroppedCounters() {
Kind: string(packetKindOther), Kind: string(packetKindOther),
Reason: string(reason), Reason: string(reason),
}), }),
bytesDropped.Get(dropReasonKindLabels{
Kind: string(packetKindDisco),
Reason: string(reason),
}),
bytesDropped.Get(dropReasonKindLabels{
Kind: string(packetKindOther),
Reason: string(reason),
}),
} }
} }
@ -431,14 +453,16 @@ func genPacketsDroppedCounters() {
for _, dr := range dropReasons { for _, dr := range dropReasons {
initMetrics(dr) initMetrics(dr)
m := getMetrics(dr) m := getMetrics(dr)
if len(m) != 2 { if len(m) != 4 {
panic("dropReason metrics out of sync") panic("dropReason metrics out of sync")
} }
if m[0] == nil || m[1] == nil { for _, v := range m {
if v == nil {
panic("dropReason metrics out of sync") panic("dropReason metrics out of sync")
} }
} }
}
} }
// SetMesh sets the pre-shared key that regional DERP servers used to mesh // SetMesh sets the pre-shared key that regional DERP servers used to mesh
@ -1207,6 +1231,7 @@ func (s *Server) recordDrop(packetBytes []byte, srcKey, dstKey key.NodePublic, r
labels.Kind = string(packetKindOther) labels.Kind = string(packetKindOther)
} }
packetsDropped.Add(labels, 1) packetsDropped.Add(labels, 1)
bytesDropped.Add(labels, int64(len(packetBytes)))
if verboseDropKeys[dstKey] { if verboseDropKeys[dstKey] {
// Preformat the log string prior to calling limitedLogf. The // Preformat the log string prior to calling limitedLogf. The