TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-29 04:55:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

net/tshttpproxy: add clientmetrics on Windows proxy lookup paths

Browse Source 
To collect some data on how widespread this is and whether there's
any correlation between different versions of Windows, etc.

Updates #4811

Change-Id: I003041d0d7e61d2482acd8155c1a4ed413a2c5c4
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2022-11-02 21:31:24 -07:00 committed by Brad Fitzpatrick
parent e55ae53169
commit d57cba8655
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/derper/depaware.txt
View File

@ -69,6 +69,7 @@ tailscale.com/cmd/derper dependencies: (generated by github.com/tailscale/depawa
tailscale.com/types/structs from tailscale.com/ipn+ tailscale.com/types/structs from tailscale.com/ipn+
tailscale.com/types/tkatype from tailscale.com/types/key+ tailscale.com/types/tkatype from tailscale.com/types/key+
tailscale.com/types/views from tailscale.com/ipn/ipnstate+ tailscale.com/types/views from tailscale.com/ipn/ipnstate+
W tailscale.com/util/clientmetric from tailscale.com/net/tshttpproxy
tailscale.com/util/cloudenv from tailscale.com/hostinfo+ tailscale.com/util/cloudenv from tailscale.com/hostinfo+
W tailscale.com/util/cmpver from tailscale.com/net/tshttpproxy W tailscale.com/util/cmpver from tailscale.com/net/tshttpproxy
tailscale.com/util/dnsname from tailscale.com/hostinfo+ tailscale.com/util/dnsname from tailscale.com/hostinfo+

16
net/tshttpproxy/tshttpproxy_windows.go
View File

@ -23,6 +23,7 @@
"tailscale.com/hostinfo" "tailscale.com/hostinfo"
"tailscale.com/syncs" "tailscale.com/syncs"
"tailscale.com/types/logger" "tailscale.com/types/logger"
"tailscale.com/util/clientmetric"
"tailscale.com/util/cmpver" "tailscale.com/util/cmpver"
) )
@ -43,6 +44,15 @@ func init() {
// forever. So for errors, we only log a bit. // forever. So for errors, we only log a bit.
var proxyErrorf = logger.RateLimitedFn(log.Printf, 10*time.Minute, 2 /* burst*/, 10 /* maxCache */) var proxyErrorf = logger.RateLimitedFn(log.Printf, 10*time.Minute, 2 /* burst*/, 10 /* maxCache */)
var (
metricSuccess = clientmetric.NewCounter("winhttp_proxy_success")
metricErrDetectionFailed = clientmetric.NewCounter("winhttp_proxy_err_detection_failed")
metricErrInvalidParameters = clientmetric.NewCounter("winhttp_proxy_err_invalid_param")
metricErrDownloadScript = clientmetric.NewCounter("winhttp_proxy_err_download_script")
metricErrTimeout = clientmetric.NewCounter("winhttp_proxy_err_timeout")
metricErrOther = clientmetric.NewCounter("winhttp_proxy_err_other")
)
func proxyFromWinHTTPOrCache(req *http.Request) (*url.URL, error) { func proxyFromWinHTTPOrCache(req *http.Request) (*url.URL, error) {
if req.URL == nil { if req.URL == nil {
return nil, nil return nil, nil
@ -66,6 +76,7 @@ type result struct {
case res := <-resc: case res := <-resc:
err := res.err err := res.err
if err == nil { if err == nil {
metricSuccess.Add(1)
cachedProxy.Lock() cachedProxy.Lock()
defer cachedProxy.Unlock() defer cachedProxy.Unlock()
if was, now := fmt.Sprint(cachedProxy.val), fmt.Sprint(res.proxy); was != now { if was, now := fmt.Sprint(cachedProxy.val), fmt.Sprint(res.proxy); was != now {
@ -81,10 +92,12 @@ type result struct {
ERROR_WINHTTP_UNABLE_TO_DOWNLOAD_SCRIPT = 12167 ERROR_WINHTTP_UNABLE_TO_DOWNLOAD_SCRIPT = 12167
) )
if err == syscall.Errno(ERROR_WINHTTP_AUTODETECTION_FAILED) { if err == syscall.Errno(ERROR_WINHTTP_AUTODETECTION_FAILED) {
metricErrDetectionFailed.Add(1)
setNoProxyUntil(10 * time.Second) setNoProxyUntil(10 * time.Second)
return nil, nil return nil, nil
} }
if err == windows.ERROR_INVALID_PARAMETER { if err == windows.ERROR_INVALID_PARAMETER {
metricErrInvalidParameters.Add(1)
// Seen on Windows 8.1. (https://github.com/tailscale/tailscale/issues/879) // Seen on Windows 8.1. (https://github.com/tailscale/tailscale/issues/879)
// TODO(bradfitz): figure this out. // TODO(bradfitz): figure this out.
setNoProxyUntil(time.Hour) setNoProxyUntil(time.Hour)
@ -93,11 +106,14 @@ type result struct {
} }
proxyErrorf("tshttpproxy: winhttp: GetProxyForURL(%q): %v/%#v", urlStr, err, err) proxyErrorf("tshttpproxy: winhttp: GetProxyForURL(%q): %v/%#v", urlStr, err, err)
if err == syscall.Errno(ERROR_WINHTTP_UNABLE_TO_DOWNLOAD_SCRIPT) { if err == syscall.Errno(ERROR_WINHTTP_UNABLE_TO_DOWNLOAD_SCRIPT) {
metricErrDownloadScript.Add(1)
setNoProxyUntil(10 * time.Second) setNoProxyUntil(10 * time.Second)
return nil, nil return nil, nil
} }
metricErrOther.Add(1)
return nil, err return nil, err
case <-ctx.Done(): case <-ctx.Done():
metricErrTimeout.Add(1)
cachedProxy.Lock() cachedProxy.Lock()
defer cachedProxy.Unlock() defer cachedProxy.Unlock()
proxyErrorf("tshttpproxy: winhttp: GetProxyForURL(%q): timeout; using cached proxy %v", urlStr, cachedProxy.val) proxyErrorf("tshttpproxy: winhttp: GetProxyForURL(%q): timeout; using cached proxy %v", urlStr, cachedProxy.val)