Skip to content

trace: make maximum active traces configurable #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+21 −12
Open

trace: make maximum active traces configurable #65

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 21 additions & 12 deletions trace/trace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,13 +184,14 @@ func Render(w io.Writer, req *http.Request, sensitive bool) {
CompletedTraces map[string]*family

// Set when a bucket has been selected.
Traces traceList
Family string
Bucket int
Expanded bool
Traced bool
Active bool
ShowSensitive bool // whether to show sensitive events
Traces traceList
Family string
Bucket int
Expanded bool
Traced bool
Active bool
MaxActiveTraces int
ShowSensitive bool // whether to show sensitive events

Histogram template.HTML
HistogramWindow string // e.g. "last minute", "last hour", "all time"
Expand All @@ -200,6 +201,7 @@ func Render(w io.Writer, req *http.Request, sensitive bool) {
Total int
}{
CompletedTraces: completedTraces,
MaxActiveTraces: maxActiveTraces,
}

data.ShowSensitive = sensitive
Expand All @@ -213,8 +215,15 @@ func Render(w io.Writer, req *http.Request, sensitive bool) {
if exp, err := strconv.ParseBool(req.FormValue("exp")); err == nil {
data.Expanded = exp
}
if exp, err := strconv.ParseBool(req.FormValue("rtraced")); err == nil {
data.Traced = exp
if rtraced, err := strconv.ParseBool(req.FormValue("rtraced")); err == nil {
data.Traced = rtraced
}
// strconv.Atoi allocates an *strconv.NumError when passed an empty
// string, so only call into it if a max_active argument is provided.
if maxActiveStr := req.FormValue("max_active"); maxActiveStr != "" {
if maxActive, err := strconv.Atoi(maxActiveStr); err == nil && maxActive > 0 {
data.MaxActiveTraces = maxActive
}
}
}

Expand Down Expand Up @@ -243,7 +252,7 @@ func Render(w io.Writer, req *http.Request, sensitive bool) {
case data.Bucket == -1:
data.Active = true
n := data.ActiveTraceCount[data.Family]
data.Traces = getActiveTraces(data.Family)
data.Traces = getActiveTraces(data.Family, data.MaxActiveTraces)
if len(data.Traces) < n {
data.Total = n
}
Expand Down Expand Up @@ -529,14 +538,14 @@ func (ts *traceSet) FirstN(n int) traceList {
return trl
}

func getActiveTraces(fam string) traceList {
func getActiveTraces(fam string, n int) traceList {
activeMu.RLock()
s := activeTraces[fam]
activeMu.RUnlock()
if s == nil {
return nil
}
return s.FirstN(maxActiveTraces)
return s.FirstN(n)
}

func getFamily(fam string, allocNew bool) *family {
Expand Down