Skip to content
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.

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

Print db as well, when profiling InfluxDB queries #2235

Merged
merged 1 commit into from
Mar 19, 2018
Merged
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions cmd/bosun/expr/influx.go
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,8 @@ func timeInfluxRequest(e *State, T miniprofiler.Timer, db, query, startDuration,
if err != nil {
return nil, err
}
T.StepCustomTiming("influx", "query", q, func() {
q_key := fmt.Sprintf("%s: %s", db, q)
T.StepCustomTiming("influx", "query", q_key, func() {
getFn := func() (interface{}, error) {
res, err := conn.Query(client.Query{
Command: q,
Expand All @@ -221,7 +222,7 @@ func timeInfluxRequest(e *State, T miniprofiler.Timer, db, query, startDuration,
}
var val interface{}
var ok bool
val, err = e.Cache.Get(fmt.Sprintf("%s : %s", db, q), getFn)
val, err = e.Cache.Get(q_key, getFn)
if s, ok = val.([]influxModels.Row); !ok {
err = fmt.Errorf("influx: did not get a valid result from InfluxDB")
}
Expand Down