sockstats: add labels for netlog and sockstatlog packages

Signed-off-by: Will Norris <will@tailscale.com>
pull/7731/head
Will Norris 2 years ago committed by Will Norris
parent 38e4d303a2
commit e99c7c3ee5

@ -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
} }

@ -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) {

@ -48,6 +48,8 @@ const (
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

@ -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

Loading…
Cancel
Save