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.

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

Jump to bottom

[Lookout] Improve query logging to include duration + slow_query field #3882

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Lookout] Improve query logging to include duration + slow_query field #3882

Show file tree
Hide file tree
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
4 changes: 3 additions & 1 deletion internal/lookoutv2/repository/getjobs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,15 @@ func (r *SqlGetJobsRepository) getJobs(ctx *armadacontext.Context, filters []*mo
if err != nil {
return nil, err
}
logQuery(query, "GetJobs")
var jobs []*model.Job

queryStart := time.Now()
rows, err := r.db.Query(ctx, query.Sql, query.Args...)
if err != nil {
return nil, err
}
queryDuration := time.Now().Sub(queryStart)
logQuery(query, "GetJobs", queryDuration)
defer rows.Close()
for rows.Next() {
var row jobRow
Expand Down
5 changes: 4 additions & 1 deletion internal/lookoutv2/repository/groupjobs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package repository
import (
"fmt"
"strings"
"time"

"github.com/jackc/pgx/v5"
"github.com/jackc/pgx/v5/pgxpool"
Expand Down Expand Up @@ -57,14 +58,16 @@ func (r *SqlGroupJobsRepository) GroupBy(
if err != nil {
return nil, err
}
logQuery(query, "GroupBy")

var groups []*model.JobGroup

queryStart := time.Now()
groupRows, err := r.db.Query(ctx, query.Sql, query.Args...)
if err != nil {
return nil, err
}
queryDuration := time.Now().Sub(queryStart)
logQuery(query, "GroupBy", queryDuration)
groups, err = rowsToGroups(groupRows, groupedField, aggregates, filters)
if err != nil {
return nil, err
Expand Down
4 changes: 3 additions & 1 deletion internal/lookoutv2/repository/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -734,10 +734,12 @@ func prefixAnnotations(prefix string, annotations map[string]string) map[string]
return prefixed
}

func logQuery(query *Query, description string) {
func logQuery(query *Query, description string, duration time.Duration) {
log.
WithField("query", removeNewlinesAndTabs(query.Sql)).
WithField("values", query.Args).
WithField("duration", duration).
WithField("slow_query", duration > time.Second*3).
Debug(description)
}

Expand Down