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

Improved logging of HTTP requests #4011

Merged
merged 3 commits into from
Jun 23, 2023
Merged

Improved logging of HTTP requests #4011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88890b0
Improved logging of HTTP requests
glpatcern Jun 23, 2023
520fbea
Split (potentially sensitive) details to a trace-level log
glpatcern Jun 23, 2023
ef4a3e5
Addressed comment
glpatcern Jun 23, 2023
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
6 changes: 6 additions & 0 deletions changelog/unreleased/httplog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Enhancement: improve logging of HTTP requests

Added request and response headers and removed redundant
URL from the "http" messages

https://github.com/cs3org/reva/pull/4011
16 changes: 8 additions & 8 deletions internal/http/interceptors/log/log.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func (h loggingHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
logger := makeLogger(w)
url := *req.URL
h.handler.ServeHTTP(logger, req)
writeLog(log, req, url, t, logger.Status(), logger.Size())
writeLog(log, req, url, t, logger.Status(), logger.Size(), logger.Header())
}

func makeLogger(w http.ResponseWriter) loggingResponseWriter {
Expand All @@ -70,7 +70,7 @@ func makeLogger(w http.ResponseWriter) loggingResponseWriter {
return logger
}

func writeLog(log *zerolog.Logger, req *http.Request, url url.URL, ts time.Time, status, size int) {
func writeLog(log *zerolog.Logger, req *http.Request, url url.URL, ts time.Time, status, size int, resHeaders http.Header) {
end := time.Now()
host, _, err := net.SplitHostPort(req.RemoteAddr)

Expand All @@ -79,8 +79,6 @@ func writeLog(log *zerolog.Logger, req *http.Request, url url.URL, ts time.Time,
}

uri := req.RequestURI
u := req.URL.String()

if req.ProtoMajor == 2 && req.Method == "CONNECT" {
uri = req.Host
}
Expand All @@ -93,16 +91,18 @@ func writeLog(log *zerolog.Logger, req *http.Request, url url.URL, ts time.Time,
var event *zerolog.Event
switch {
case status < 400:
event = log.Debug()
event = log.Info()
case status < 500:
event = log.Warn()
default:
event = log.Error()
}
event.Str("host", host).Str("method", req.Method).Str("uri", uri).Int("status", status).
Msg("processed http request")

event.Str("host", host).Str("method", req.Method).
Str("uri", uri).Str("url", u).Str("proto", req.Proto).Int("status", status).
Int("size", size).
log.Trace().Str("host", host).Str("method", req.Method).
Str("uri", uri).Str("proto", req.Proto).Interface("req_headers", req.Header).
Int("status", status).Int("size", size).Interface("res_headers", resHeaders).
Str("start", ts.Format("02/Jan/2006:15:04:05 -0700")).
Str("end", end.Format("02/Jan/2006:15:04:05 -0700")).Int("time_ns", int(diff)).
Msg("http")
Expand Down