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

tsweb: remove redundant bumpStartIfNeeded func

Browse Source 
Updates #12001

Signed-off-by: Will Norris <will@tailscale.com>
This commit is contained in:
Will Norris 2024-05-03 15:49:19 -07:00 committed by Will Norris
parent ed843e643f
commit 80decd83c1
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tsweb/tsweb.go
View File

@ -312,7 +312,6 @@ func (h retHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
} }
var bucket string var bucket string
bumpStartIfNeeded := func() {}
var startRecorded bool var startRecorded bool
if bs := h.opts.BucketedStats; bs != nil { if bs := h.opts.BucketedStats; bs != nil {
bucket = bs.bucketForRequest(r) bucket = bs.bucketForRequest(r)
@ -320,13 +319,11 @@ func (h retHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
switch v := bs.Started.Map.Get(bucket).(type) { switch v := bs.Started.Map.Get(bucket).(type) {
case *expvar.Int: case *expvar.Int:
// If we've already seen this bucket for, count it immediately. // If we've already seen this bucket for, count it immediately.
v.Add(1)
startRecorded = true
case nil:
// Otherwise, for newly seen paths, only count retroactively // Otherwise, for newly seen paths, only count retroactively
// (so started-finished doesn't go negative) so we don't fill // (so started-finished doesn't go negative) so we don't fill
// this LabelMap up with internet scanning spam. // this LabelMap up with internet scanning spam.
bumpStartIfNeeded = func() { bs.Started.Add(bucket, 1) } v.Add(1)
startRecorded = true
} }
} }
} }
@ -445,8 +442,12 @@ func (h retHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
// gets most of the way there but there are also plenty of URLs that are // 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 // almost right but result in 400s too. Seem easier to just only ignore
// all 4xx and 5xx. // all 4xx and 5xx.
if startRecorded || msg.Code < 400 { if startRecorded {
bumpStartIfNeeded() bs.Finished.Add(bucket, 1)
} else if msg.Code < 400 {
// This is the first non-error request for this bucket,
// so count it now retroactively.
bs.Started.Add(bucket, 1)
bs.Finished.Add(bucket, 1) bs.Finished.Add(bucket, 1)
} }
} }