chore(logging): better log format

Co-authored-by: Paul B. Beskow <[email protected]>

pkg/requestlogger/requestlogger.go

@@ -1,6 +1,7 @@
 package requestlogger
 
 import (
+	"fmt"
 	"net/http"
 	"strconv"
 	"time"
@@ -41,11 +42,8 @@ func Middleware(log zerolog.Logger, pathFilters ...string) func(next http.Handle
 
 				log.Info().Timestamp().Fields(map[string]interface{}{
 					"request_id": requestID,
-					"method":     r.Method,
-					"url":        r.URL.Path,
-					"status":     ww.Status(),
-					"browser":    ua.Name,
-					"os":         ua.OS,
+					"request":    fmt.Sprintf("%v %v (response_code: %v)", r.Method, r.URL.Path, ww.Status()),
+					"browser":    fmt.Sprintf("%v (%v)", ua.Name, ua.OS),
 					"bytes_in":   bytesIn,
 					"bytes_out":  ww.BytesWritten(),
 					"latency_ms": float64(t2.Sub(t1).Nanoseconds()) / 1000000.0, //nolint: gomnd

pkg/requestlogger/requestlogger_test.go

@@ -2,6 +2,7 @@ package requestlogger_test
 
 import (
 	"bytes"
+	"fmt"
 	"net/http"
 	"net/http/httptest"
 	"testing"
@@ -26,12 +27,9 @@ type LogFormat struct {
 	BytesIn   int       `json:"bytes_in"`
 	BytesOut  int       `json:"bytes_out"`
 	Latency   float64   `json:"latency_ms"`
-	Method    string    `json:"method"`
-	URL       string    `json:"url"`
-	Status    int       `json:"status"`
+	Request   string    `json:"request"`
 	Message   string    `json:"message"`
 	Browser   string    `json:"browser"`
-	OS        string    `json:"os"`
 }
 
 func TestLoggerMiddleware(t *testing.T) {
@@ -54,12 +52,9 @@ func TestLoggerMiddleware(t *testing.T) {
 				Level:    "info",
 				BytesIn:  0,
 				BytesOut: 2,
-				Method:   http.MethodGet,
-				URL:      "/foo",
-				Status:   http.StatusOK,
+				Request:  "GET /foo (response_code: 200)",
 				Message:  "incoming_request",
-				Browser:  "Chrome",
-				OS:       "Windows",
+				Browser:  "Chrome (Windows)",
 			},
 		},
 		{
@@ -100,6 +95,8 @@ func TestLoggerMiddleware(t *testing.T) {
 			err := json.Unmarshal(buf.Bytes(), got)
 			require.NoError(t, err)
 
+			fmt.Println(buf.String())
+
 			diff := cmp.Diff(tc.expect, got, cmpopts.IgnoreFields(LogFormat{}, "Time", "Latency", "RequestID"))
 			assert.Empty(t, diff)
 			assert.Greater(t, got.Latency, 0.0)