Improved logging of HTTP requests

cs3org · Jun 23, 2023 · cf49289 · cf49289
1 parent 1c131b0
commit cf49289
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/internal/http/interceptors/log/log.go b/internal/http/interceptors/log/log.go
@@ -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(), w.Header())
 }
 
 func makeLogger(w http.ResponseWriter) loggingResponseWriter {
@@ -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)
 
@@ -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
 	}
@@ -101,8 +99,8 @@ func writeLog(log *zerolog.Logger, req *http.Request, url url.URL, ts time.Time,
 	}
 
 	event.Str("host", host).Str("method", req.Method).
-		Str("uri", uri).Str("url", u).Str("proto", req.Proto).Int("status", status).
-		Int("size", size).
+		Str("uri", uri).Str("proto", req.Proto).Interface("reqHeaders", req.Header).
+		Int("status", status).Int("size", size).Interface("resHeaders", 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")