From 04455e411080d20d9fb10622ac57ea5ab1425c7e Mon Sep 17 00:00:00 2001 From: Nicolas Takashi Date: Wed, 24 Apr 2024 13:45:59 +0100 Subject: [PATCH] [CHORE] considering X-Forwarded-For on HTTP Logging Signed-off-by: Nicolas Takashi --- pkg/logging/http.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkg/logging/http.go b/pkg/logging/http.go index d7d8b299622..229bcf07995 100644 --- a/pkg/logging/http.go +++ b/pkg/logging/http.go @@ -37,13 +37,19 @@ func (m *HTTPServerMiddleware) preCall(name string, start time.Time, r *http.Req func (m *HTTPServerMiddleware) postCall(name string, start time.Time, wrapped *httputil.ResponseWriterWithStatus, r *http.Request) { status := wrapped.Status() + + remoteAddr := r.Header.Get("X-Forwarded-For") + if remoteAddr == "" { + remoteAddr = r.RemoteAddr + } + logger := log.With(m.logger, "http.method", fmt.Sprintf("%s %s", r.Method, r.URL), "http.request_id", r.Header.Get("X-Request-ID"), "http.user_agent", r.Header.Get("User-Agent"), "http.status_code", fmt.Sprintf("%d", status), "http.time_ms", fmt.Sprintf("%v", durationToMilliseconds(time.Since(start))), - "http.remote_addr", r.RemoteAddr, + "http.remote_addr", remoteAddr, "thanos.method_name", name) logger = m.opts.filterLog(logger)