TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-08 09:14:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

prober: add address family label for udp metrics (#15413)

Browse Source 
Add a label which differentiates the address family
for STUN checks.

Also initialize the derpprobe_attempts_total and
derpprobe_seconds_total metrics by adding 0 for
the alternate fail/ok case.

Updates tailscale/corp#27249

Signed-off-by: Mike O'Driscoll <mikeo@tailscale.com>
This commit is contained in:
Mike O'Driscoll 2025-03-25 12:49:54 -04:00 committed by GitHub
parent e78055eb01
commit 08c8ccb48e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
prober/derp.go
View File

@ -596,11 +596,23 @@ func (d *derpProber) updateMap(ctx context.Context) error {
} }
func (d *derpProber) ProbeUDP(ipaddr string, port int) ProbeClass { func (d *derpProber) ProbeUDP(ipaddr string, port int) ProbeClass {
initLabels := make(Labels)
ip := net.ParseIP(ipaddr)
if ip.To4() != nil {
initLabels["address_family"] = "ipv4"
} else if ip.To16() != nil { // Will return an IPv4 as 16 byte, so ensure the check for IPv4 precedes this
initLabels["address_family"] = "ipv6"
} else {
initLabels["address_family"] = "unknown"
}
return ProbeClass{ return ProbeClass{
Probe: func(ctx context.Context) error { Probe: func(ctx context.Context) error {
return derpProbeUDP(ctx, ipaddr, port) return derpProbeUDP(ctx, ipaddr, port)
}, },
Class: "derp_udp", Class: "derp_udp",
Labels: initLabels,
} }
} }

4
prober/prober.go
View File

@ -404,10 +404,14 @@ func (p *Probe) recordEndLocked(err error) {
p.mSeconds.WithLabelValues("ok").Add(latency.Seconds()) p.mSeconds.WithLabelValues("ok").Add(latency.Seconds())
p.latencyHist.Value = latency p.latencyHist.Value = latency
p.latencyHist = p.latencyHist.Next() p.latencyHist = p.latencyHist.Next()
p.mAttempts.WithLabelValues("fail").Add(0)
p.mSeconds.WithLabelValues("fail").Add(0)
} else { } else {
p.latency = 0 p.latency = 0
p.mAttempts.WithLabelValues("fail").Inc() p.mAttempts.WithLabelValues("fail").Inc()
p.mSeconds.WithLabelValues("fail").Add(latency.Seconds()) p.mSeconds.WithLabelValues("fail").Add(latency.Seconds())
p.mAttempts.WithLabelValues("ok").Add(0)
p.mSeconds.WithLabelValues("ok").Add(0)
} }
p.successHist.Value = p.succeeded p.successHist.Value = p.succeeded
p.successHist = p.successHist.Next() p.successHist = p.successHist.Next()