Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 02a108a58e |
@@ -4,6 +4,9 @@ on:
|
|||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- master
|
- master
|
||||||
|
pull_request:
|
||||||
|
branches:
|
||||||
|
- master
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
test:
|
test:
|
||||||
@@ -24,6 +27,7 @@ jobs:
|
|||||||
build:
|
build:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs: test
|
needs: test
|
||||||
|
if: gitea.event_name == 'push'
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
package middleware
|
package middleware
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"crypto/rand"
|
|
||||||
"encoding/hex"
|
|
||||||
"log/slog"
|
"log/slog"
|
||||||
"net/http"
|
"net/http"
|
||||||
"time"
|
"time"
|
||||||
@@ -19,39 +17,21 @@ func (rw *responseWriter) WriteHeader(code int) {
|
|||||||
rw.ResponseWriter.WriteHeader(code)
|
rw.ResponseWriter.WriteHeader(code)
|
||||||
}
|
}
|
||||||
|
|
||||||
// generateRequestID creates a short random hex string for request tracing.
|
// Logging returns middleware that logs each HTTP request with structured logging.
|
||||||
func generateRequestID() string {
|
|
||||||
b := make([]byte, 8)
|
|
||||||
if _, err := rand.Read(b); err != nil {
|
|
||||||
return "unknown"
|
|
||||||
}
|
|
||||||
return hex.EncodeToString(b)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Logging returns middleware that logs each HTTP request with structured fields:
|
|
||||||
// method, path, status, duration (ms), request-id, and remote address.
|
|
||||||
func Logging() func(http.Handler) http.Handler {
|
func Logging() func(http.Handler) http.Handler {
|
||||||
return func(next http.Handler) http.Handler {
|
return func(next http.Handler) http.Handler {
|
||||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
start := time.Now()
|
start := time.Now()
|
||||||
requestID := generateRequestID()
|
|
||||||
rw := &responseWriter{ResponseWriter: w, statusCode: http.StatusOK}
|
rw := &responseWriter{ResponseWriter: w, statusCode: http.StatusOK}
|
||||||
|
|
||||||
// Set request ID header for downstream correlation.
|
|
||||||
w.Header().Set("X-Request-ID", requestID)
|
|
||||||
|
|
||||||
next.ServeHTTP(rw, r)
|
next.ServeHTTP(rw, r)
|
||||||
|
|
||||||
duration := time.Since(start)
|
|
||||||
slog.Info("http request",
|
slog.Info("http request",
|
||||||
"method", r.Method,
|
"method", r.Method,
|
||||||
"path", r.URL.Path,
|
"path", r.URL.Path,
|
||||||
"status", rw.statusCode,
|
"status", rw.statusCode,
|
||||||
"duration_ms", duration.Milliseconds(),
|
"duration", time.Since(start).String(),
|
||||||
"duration", duration.String(),
|
|
||||||
"request_id", requestID,
|
|
||||||
"remote", r.RemoteAddr,
|
"remote", r.RemoteAddr,
|
||||||
"user_agent", r.UserAgent(),
|
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user