TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-25 19:15:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

tsweb: make BucketedStats not track 400s, 404s, etc

Browse Source 
Updates tailscale/corp#18687

Change-Id: I142ccb1301ec4201c70350799ff03222bce96668
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2024-03-28 08:24:06 -07:00 committed by Brad Fitzpatrick
parent 354cac74a9
commit b0941b79d6
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tsweb/tsweb.go
View File

@ -311,10 +311,20 @@ func (h retHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
} }
var bucket string var bucket string
bumpStartIfNeeded := func() {}
if bs := h.opts.BucketedStats; bs != nil { if bs := h.opts.BucketedStats; bs != nil {
bucket = bs.bucketForRequest(r) bucket = bs.bucketForRequest(r)
if bs.Started != nil { if bs.Started != nil {
bs.Started.Add(bucket, 1) switch v := bs.Started.Map.Get(bucket).(type) {
case *expvar.Int:
// If we've already seen this bucket for, count it immediately.
v.Add(1)
case nil:
// Otherwise, for newly seen paths, only count retroactively
// (so started-finished doesn't go negative) so we don't fill
// this LabelMap up with internet scanning spam.
bumpStartIfNeeded = func() { bs.Started.Add(bucket, 1) }
}
} }
} }
@ -401,8 +411,16 @@ func (h retHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
} }
if bs := h.opts.BucketedStats; bs != nil && bs.Finished != nil { if bs := h.opts.BucketedStats; bs != nil && bs.Finished != nil {
// Only increment metrics for buckets that result in good HTTP statuses.
// Otherwise they get full of internet scanning noise. Only filtering 404
// gets most of the way there but there are also plenty of URLs that are
// almost right but result in 400s too. Seem easier to just only ignore
// all 4xx and 5xx.
if msg.Code < 400 {
bumpStartIfNeeded()
bs.Finished.Add(bucket, 1) bs.Finished.Add(bucket, 1)
} }
}
if !h.opts.QuietLoggingIfSuccessful || (msg.Code != http.StatusOK && msg.Code != http.StatusNotModified) { if !h.opts.QuietLoggingIfSuccessful || (msg.Code != http.StatusOK && msg.Code != http.StatusNotModified) {
h.opts.Logf("%s", msg) h.opts.Logf("%s", msg)