Skip to content

log grafana headers along with query request before query execution #6391

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

Merged
merged 1 commit into from
Dec 3, 2024
Merged

log grafana headers along with query request before query execution #6391

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
25 changes: 18 additions & 7 deletions pkg/frontend/transport/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,13 +228,7 @@ func (f *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
// Log request
if f.cfg.QueryStatsEnabled {
queryString = f.parseRequestQueryString(r, buf)
logMessage := append([]interface{}{
"msg", "query request",
"component", "query-frontend",
"method", r.Method,
"path", r.URL.Path,
}, formatQueryString(queryString)...)
level.Info(util_log.WithContext(r.Context(), f.log)).Log(logMessage...)
f.logQueryRequest(r, queryString)
}

startTime := time.Now()
Expand Down Expand Up @@ -306,6 +300,23 @@ func formatGrafanaStatsFields(r *http.Request) []interface{} {
return fields
}

// logQueryRequest logs query request before query execution.
func (f *Handler) logQueryRequest(r *http.Request, queryString url.Values) {
logMessage := []interface{}{
"msg", "query request",
"component", "query-frontend",
"method", r.Method,
"path", r.URL.Path,
}
grafanaFields := formatGrafanaStatsFields(r)
if len(grafanaFields) > 0 {
logMessage = append(logMessage, grafanaFields...)
}
logMessage = append(logMessage, formatQueryString(queryString)...)

level.Info(util_log.WithContext(r.Context(), f.log)).Log(logMessage...)
}

// reportSlowQuery reports slow queries.
func (f *Handler) reportSlowQuery(r *http.Request, queryString url.Values, queryResponseTime time.Duration) {
logMessage := []interface{}{
Expand Down
Loading