query-frontend: add context to start call log

Add more context to link start call with finished call. Signed-off-by: Aymeric <aymeric.daurelle@cdiscount.com>
thanos-io · Oct 12, 2021 · 7201cba · 7201cba
1 parent d5156d8
commit 7201cba
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re
 
 - [#4663](https://github.com/thanos-io/thanos/pull/4663) Fetcher: Fix discovered data races
 - [#4753](https://github.com/thanos-io/thanos/pull/4753) Store: valide block sync concurrency parameter
+- [#4769](https://github.com/thanos-io/thanos/pull/4769) Query-frontend: add context to start call log
 
 ### Added
 

diff --git a/cmd/thanos/query_frontend.go b/cmd/thanos/query_frontend.go
@@ -284,9 +284,10 @@ func runQueryFrontend(
 					logger,
 					ins.NewHandler(
 						name,
-						logMiddleware.HTTPMiddleware(
-							name,
-							gziphandler.GzipHandler(middleware.RequestID(f)),
+						gziphandler.GzipHandler(
+							middleware.RequestID(
+								logMiddleware.HTTPMiddleware(name, f),
+							),
 						),
 					),
 					// Cortex frontend middlewares require orgID.

diff --git a/pkg/api/api.go b/pkg/api/api.go
@@ -219,9 +219,9 @@ func GetInstr(
 
 		return tracing.HTTPMiddleware(tracer, name, logger,
 			ins.NewHandler(name,
-				logMiddleware.HTTPMiddleware(name,
-					gziphandler.GzipHandler(
-						middleware.RequestID(hf),
+				gziphandler.GzipHandler(
+					middleware.RequestID(
+						logMiddleware.HTTPMiddleware(name, hf),
 					),
 				),
 			),

diff --git a/pkg/logging/http.go b/pkg/logging/http.go
@@ -22,9 +22,9 @@ type HTTPServerMiddleware struct {
 	logger log.Logger
 }
 
-func (m *HTTPServerMiddleware) preCall(start time.Time) {
+func (m *HTTPServerMiddleware) preCall(name string, start time.Time, r *http.Request) {
 	logger := m.opts.filterLog(m.logger)
-	level.Debug(logger).Log("http.start_time", start.String(), "msg", "started call")
+	level.Debug(logger).Log("http.start_time", start.String(), "http.method", fmt.Sprintf("%s %s", r.Method, r.URL), "http.request_id", r.Header.Get("X-Request-ID"), "thanos.method_name", name, "msg", "started call")
 }
 
 func (m *HTTPServerMiddleware) postCall(name string, start time.Time, wrapped *httputil.ResponseWriterWithStatus, r *http.Request) {
@@ -68,7 +68,7 @@ func (m *HTTPServerMiddleware) HTTPMiddleware(name string, next http.Handler) ht
 			next.ServeHTTP(w, r)
 
 		case LogStartAndFinishCall:
-			m.preCall(start)
+			m.preCall(name, start, r)
 			next.ServeHTTP(wrapped, r)
 			m.postCall(name, start, wrapped, r)