logs: build up sloger attrs to conditionaly log xff header

1 files changed, 14 insertions, 8 deletions

diff --git a/internal/server/middleware.go b/internal/server/middleware.go
index c88131c..82e197d 100644
--- a/internal/server/middleware.go
+++ b/internal/server/middleware.go
@@ -19,15 +19,21 @@ func (r *statusRecorder) WriteHeader(code int) {
 func logRequests(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		start := time.Now()
+
 		recorder := &statusRecorder{ResponseWriter: w, status: http.StatusOK}
 		next.ServeHTTP(recorder, r)
-		slog.Info("request",
-			"method", r.Method,
-			"path", r.URL.Path,
-			"status", recorder.status,
-			"duration", time.Since(start),
-			"remote", r.RemoteAddr,
-			"x-forwarded-for", r.Header.Get("x-forwarded-for"),
-		)
+
+		attrs := []slog.Attr{
+			slog.String("method", r.Method),
+			slog.String("path", r.URL.Path),
+			slog.Int("status", recorder.status),
+			slog.Duration("duration", time.Since(start)),
+			slog.String("remote", r.RemoteAddr),
+		}
+
+		if xff := r.Header.Get("x-forwarded-for"); xff != "" {
+			attrs = append(attrs, slog.String("x-forwarded-for", xff))
+		}
+		slog.LogAttrs(r.Context(), slog.LevelInfo, "request", attrs...)
 	})
 }