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

metrics: move currentFDs code to the metrics package

Browse Source 
Updates #2784

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick
2021-09-02 11:14:14 -07:00
parent 5d800152d9
commit fc160f80ee
5 changed files with 59 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
derp/derp_server.go
View File

@@ -1609,20 +1609,12 @@ func (s *Server) expVarFunc(f func() interface{}) expvar.Func {
})
}
func currentFDs() int {
// TODO(bradfitz): this could be more efficient, without making so much
// garbage. Probably doesn't matter but a Linux-only fast path would be
// reasonable for us using something like goimport's fastwalk.
ents, _ := os.ReadDir("/proc/self/fd")
return len(ents)
}
// ExpVar returns an expvar variable suitable for registering with expvar.Publish.
func (s *Server) ExpVar() expvar.Var {
m := new(metrics.Set)
m.Set("gauge_memstats_sys0", expvar.Func(func() interface{} { return int64(s.memSys0) }))
m.Set("gauge_watchers", s.expVarFunc(func() interface{} { return len(s.watchers) }))
m.Set("gauge_current_file_descriptors", expvar.Func(func() interface{} { return currentFDs() }))
m.Set("gauge_current_file_descriptors", expvar.Func(func() interface{} { return metrics.CurrentFDs() }))
m.Set("gauge_current_connections", &s.curClients)
m.Set("gauge_current_home_connections", &s.curHomeClients)
m.Set("gauge_clients_total", expvar.Func(func() interface{} { return len(s.clientsMesh) }))