TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-18 20:51:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

sockstats: add labels for netlog and sockstatlog packages

Browse Source 
Signed-off-by: Will Norris <will@tailscale.com>
This commit is contained in:
Will Norris 2023-03-29 14:28:30 -07:00 committed by Will Norris
parent 38e4d303a2
commit e99c7c3ee5
4 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
log/sockstatlog/logger.go
View File

@ -125,6 +125,7 @@ func NewLogger(logdir string, logf logger.Logf, logID logid.PublicID) (*Logger,
HTTPC: &http.Client{Transport: logger.tr}, HTTPC: &http.Client{Transport: logger.tr},
}, logf) }, logf)
logger.logger.SetSockstatsLabel(sockstats.LabelSockstatlogLogger)
return logger, nil return logger, nil
} }

6
net/sockstats/label_string.go
View File

@ -18,11 +18,13 @@ func _() {
_ = x[LabelPortmapperClient-7] _ = x[LabelPortmapperClient-7]
_ = x[LabelMagicsockConnUDP4-8] _ = x[LabelMagicsockConnUDP4-8]
_ = x[LabelMagicsockConnUDP6-9] _ = x[LabelMagicsockConnUDP6-9]
_ = x[LabelNetlogLogger-10]
_ = x[LabelSockstatlogLogger-11]
} }
const _Label_name = "ControlClientAutoControlClientDialerDERPHTTPClientLogtailLoggerDNSForwarderDoHDNSForwarderUDPNetcheckClientPortmapperClientMagicsockConnUDP4MagicsockConnUDP6" const _Label_name = "ControlClientAutoControlClientDialerDERPHTTPClientLogtailLoggerDNSForwarderDoHDNSForwarderUDPNetcheckClientPortmapperClientMagicsockConnUDP4MagicsockConnUDP6NetlogLoggerSockstatlogLogger"
var _Label_index = [...]uint8{0, 17, 36, 50, 63, 78, 93, 107, 123, 140, 157} var _Label_index = [...]uint8{0, 17, 36, 50, 63, 78, 93, 107, 123, 140, 157, 169, 186}
func (i Label) String() string { func (i Label) String() string {
if i >= Label(len(_Label_index)-1) { if i >= Label(len(_Label_index)-1) {

22
net/sockstats/sockstats.go
View File

@ -38,16 +38,18 @@ type Label uint8
// Labels are named after the package and function/struct that uses the socket. // Labels are named after the package and function/struct that uses the socket.
// Values may be persisted and thus existing entries should not be re-numbered. // Values may be persisted and thus existing entries should not be re-numbered.
const ( const (
LabelControlClientAuto Label = 0 // control/controlclient/auto.go LabelControlClientAuto Label = 0 // control/controlclient/auto.go
LabelControlClientDialer Label = 1 // control/controlhttp/client.go LabelControlClientDialer Label = 1 // control/controlhttp/client.go
LabelDERPHTTPClient Label = 2 // derp/derphttp/derphttp_client.go LabelDERPHTTPClient Label = 2 // derp/derphttp/derphttp_client.go
LabelLogtailLogger Label = 3 // logtail/logtail.go LabelLogtailLogger Label = 3 // logtail/logtail.go
LabelDNSForwarderDoH Label = 4 // net/dns/resolver/forwarder.go LabelDNSForwarderDoH Label = 4 // net/dns/resolver/forwarder.go
LabelDNSForwarderUDP Label = 5 // net/dns/resolver/forwarder.go LabelDNSForwarderUDP Label = 5 // net/dns/resolver/forwarder.go
LabelNetcheckClient Label = 6 // net/netcheck/netcheck.go LabelNetcheckClient Label = 6 // net/netcheck/netcheck.go
LabelPortmapperClient Label = 7 // net/portmapper/portmapper.go LabelPortmapperClient Label = 7 // net/portmapper/portmapper.go
LabelMagicsockConnUDP4 Label = 8 // wgengine/magicsock/magicsock.go LabelMagicsockConnUDP4 Label = 8 // wgengine/magicsock/magicsock.go
LabelMagicsockConnUDP6 Label = 9 // wgengine/magicsock/magicsock.go LabelMagicsockConnUDP6 Label = 9 // wgengine/magicsock/magicsock.go
LabelNetlogLogger Label = 10 // wgengine/netlog/logger.go
LabelSockstatlogLogger Label = 11 // log/sockstatlog/logger.go
) )
// WithSockStats instruments a context so that sockets created with it will // WithSockStats instruments a context so that sockets created with it will

2
wgengine/netlog/logger.go
View File

@ -19,6 +19,7 @@ import (
"tailscale.com/logpolicy" "tailscale.com/logpolicy"
"tailscale.com/logtail" "tailscale.com/logtail"
"tailscale.com/net/connstats" "tailscale.com/net/connstats"
"tailscale.com/net/sockstats"
"tailscale.com/net/tsaddr" "tailscale.com/net/tsaddr"
"tailscale.com/smallzstd" "tailscale.com/smallzstd"
"tailscale.com/tailcfg" "tailscale.com/tailcfg"
@ -121,6 +122,7 @@ func (nl *Logger) Startup(nodeID tailcfg.StableNodeID, nodeLogID, domainLogID lo
IncludeProcID: true, IncludeProcID: true,
IncludeProcSequence: true, IncludeProcSequence: true,
}, log.Printf) }, log.Printf)
nl.logger.SetSockstatsLabel(sockstats.LabelNetlogLogger)
// Startup a data structure to track per-connection statistics. // Startup a data structure to track per-connection statistics.
// There is a maximum size for individual log messages that logtail // There is a maximum size for individual log messages that logtail