Skip to content

Commit e99c7c3

Browse files
committed
sockstats: add labels for netlog and sockstatlog packages
Signed-off-by: Will Norris <[email protected]>
1 parent 38e4d30 commit e99c7c3

File tree

4 files changed

+19
-12
lines changed

4 files changed

+19
-12
lines changed

log/sockstatlog/logger.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ func NewLogger(logdir string, logf logger.Logf, logID logid.PublicID) (*Logger,
125125

126126
HTTPC: &http.Client{Transport: logger.tr},
127127
}, logf)
128+
logger.logger.SetSockstatsLabel(sockstats.LabelSockstatlogLogger)
128129

129130
return logger, nil
130131
}

net/sockstats/label_string.go

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

net/sockstats/sockstats.go

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,18 @@ type Label uint8
3838
// Labels are named after the package and function/struct that uses the socket.
3939
// Values may be persisted and thus existing entries should not be re-numbered.
4040
const (
41-
LabelControlClientAuto Label = 0 // control/controlclient/auto.go
42-
LabelControlClientDialer Label = 1 // control/controlhttp/client.go
43-
LabelDERPHTTPClient Label = 2 // derp/derphttp/derphttp_client.go
44-
LabelLogtailLogger Label = 3 // logtail/logtail.go
45-
LabelDNSForwarderDoH Label = 4 // net/dns/resolver/forwarder.go
46-
LabelDNSForwarderUDP Label = 5 // net/dns/resolver/forwarder.go
47-
LabelNetcheckClient Label = 6 // net/netcheck/netcheck.go
48-
LabelPortmapperClient Label = 7 // net/portmapper/portmapper.go
49-
LabelMagicsockConnUDP4 Label = 8 // wgengine/magicsock/magicsock.go
50-
LabelMagicsockConnUDP6 Label = 9 // wgengine/magicsock/magicsock.go
41+
LabelControlClientAuto Label = 0 // control/controlclient/auto.go
42+
LabelControlClientDialer Label = 1 // control/controlhttp/client.go
43+
LabelDERPHTTPClient Label = 2 // derp/derphttp/derphttp_client.go
44+
LabelLogtailLogger Label = 3 // logtail/logtail.go
45+
LabelDNSForwarderDoH Label = 4 // net/dns/resolver/forwarder.go
46+
LabelDNSForwarderUDP Label = 5 // net/dns/resolver/forwarder.go
47+
LabelNetcheckClient Label = 6 // net/netcheck/netcheck.go
48+
LabelPortmapperClient Label = 7 // net/portmapper/portmapper.go
49+
LabelMagicsockConnUDP4 Label = 8 // wgengine/magicsock/magicsock.go
50+
LabelMagicsockConnUDP6 Label = 9 // wgengine/magicsock/magicsock.go
51+
LabelNetlogLogger Label = 10 // wgengine/netlog/logger.go
52+
LabelSockstatlogLogger Label = 11 // log/sockstatlog/logger.go
5153
)
5254

5355
// WithSockStats instruments a context so that sockets created with it will

wgengine/netlog/logger.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919
"tailscale.com/logpolicy"
2020
"tailscale.com/logtail"
2121
"tailscale.com/net/connstats"
22+
"tailscale.com/net/sockstats"
2223
"tailscale.com/net/tsaddr"
2324
"tailscale.com/smallzstd"
2425
"tailscale.com/tailcfg"
@@ -121,6 +122,7 @@ func (nl *Logger) Startup(nodeID tailcfg.StableNodeID, nodeLogID, domainLogID lo
121122
IncludeProcID: true,
122123
IncludeProcSequence: true,
123124
}, log.Printf)
125+
nl.logger.SetSockstatsLabel(sockstats.LabelNetlogLogger)
124126

125127
// Startup a data structure to track per-connection statistics.
126128
// There is a maximum size for individual log messages that logtail

0 commit comments

Comments
 (0)