ipn/ipnlocal: use SetInt to count current routable ips

Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
This commit is contained in:
Kristoffer Dalby 2024-08-14 15:54:51 +02:00
parent fffc6a65b2
commit 0f0d54b5cc
No known key found for this signature in database

View File

@ -12,7 +12,6 @@ import (
"encoding/base64" "encoding/base64"
"encoding/json" "encoding/json"
"errors" "errors"
"expvar"
"fmt" "fmt"
"io" "io"
"log" "log"
@ -4616,7 +4615,7 @@ func unmapIPPrefixes(ippsList ...[]netip.Prefix) (ret []netip.Prefix) {
return ret return ret
} }
var metricAdvertisedRoutes = usermetric.NewMultiLabelMap[struct{}]( var metricAdvertisedRoutes = usermetric.NewMap(
"tailscaled_advertised_routes", "tailscaled_advertised_routes",
"gauge", "gauge",
"Number of subnet routes advertised by the node. (excluding exit node /0 routes)", "Number of subnet routes advertised by the node. (excluding exit node /0 routes)",
@ -4633,13 +4632,13 @@ func (b *LocalBackend) applyPrefsToHostinfoLocked(hi *tailcfg.Hostinfo, prefs ip
hi.AllowsUpdate = envknob.AllowsRemoteUpdate() || prefs.AutoUpdate().Apply.EqualBool(true) hi.AllowsUpdate = envknob.AllowsRemoteUpdate() || prefs.AutoUpdate().Apply.EqualBool(true)
// count routes without exit node routes // count routes without exit node routes
routeCount := expvar.Int{} routeCount := 0
for _, route := range hi.RoutableIPs { for _, route := range hi.RoutableIPs {
if route.Bits() != 0 { if route.Bits() != 0 {
routeCount.Add(1) routeCount++
} }
} }
metricAdvertisedRoutes.Set(struct{}{}, &routeCount) metricAdvertisedRoutes.SetInt(struct{}{}, int64(routeCount))
var sshHostKeys []string var sshHostKeys []string
if prefs.RunSSH() && envknob.CanSSHD() { if prefs.RunSSH() && envknob.CanSSHD() {