Merge branch 'feature/logfmt' into develop
/ docker (push) Successful in 1m8s Details

This commit is contained in:
Maxim Lebedev 2023-11-18 19:29:46 +06:00
commit 555b8cc333
Signed by: toby3d
GPG Key ID: 1F14E25B7C119FC5
2 changed files with 242 additions and 110 deletions

View File

@ -0,0 +1,130 @@
package middleware
import (
"io"
"log/slog"
"net/http"
"os"
"strings"
"sync/atomic"
"time"
)
type (
LogFmtConfig struct {
// Skipper defines a function to skip middleware.
Skipper Skipper
// Output is a writer where logs in JSON format are written.
// Optional. Default value os.Stdout.
Output io.Writer
}
logFmtResponse struct {
http.ResponseWriter
error error
start time.Time
end time.Time
statusCode int
responseLength int
id uint64
}
)
//nolint:gochecknoglobals // default configuration
var DefaultLogFmtConfig = LogFmtConfig{
Skipper: DefaultSkipper,
Output: os.Stdout,
}
//nolint:gochecknoglobals
var globalConnID uint64
func LogFmt() Interceptor {
c := DefaultLogFmtConfig
return LogFmtWithConfig(c)
}
func LogFmtWithConfig(config LogFmtConfig) Interceptor {
if config.Skipper == nil {
config.Skipper = DefaultLogFmtConfig.Skipper
}
if config.Output == nil {
config.Output = DefaultLogFmtConfig.Output
}
encoder := slog.New(slog.NewTextHandler(config.Output, nil))
return func(w http.ResponseWriter, r *http.Request, next http.HandlerFunc) {
tx := &logFmtResponse{
id: nextConnID(),
responseLength: 0,
ResponseWriter: w,
start: time.Now().UTC(),
statusCode: 0,
}
next(tx, r)
tx.end = time.Now().UTC()
payload := []any{
slog.Int64("bytes_in", r.ContentLength),
slog.Int("bytes_out", tx.responseLength),
slog.Any("error", tx.error),
slog.String("host", r.Host),
slog.Uint64("id", tx.id),
slog.Int64("latency", tx.end.Sub(tx.start).Nanoseconds()),
slog.String("latency_human", tx.end.Sub(tx.start).String()),
slog.String("method", r.Method),
slog.String("path", r.URL.Path),
slog.String("protocol", r.Proto),
slog.String("referer", r.Referer()),
slog.String("remote_ip", r.RemoteAddr),
slog.Int("status", tx.statusCode),
slog.String("time_rfc3339", tx.start.Format(time.RFC3339)),
slog.String("time_rfc3339_nano", tx.start.Format(time.RFC3339Nano)),
slog.Int64("time_unix", tx.start.Unix()),
slog.Int64("time_unix_nano", tx.start.UnixNano()),
slog.String("uri", r.RequestURI),
slog.String("user_agent", r.UserAgent()),
}
for name, src := range map[string]map[string][]string{
"form": r.PostForm,
"header": r.Header,
"query": r.URL.Query(),
} {
values := make([]any, 0)
for k, v := range src {
values = append(values, slog.String(strings.ReplaceAll(strings.ToLower(k), " ", "_"),
strings.Join(v, " ")))
}
payload = append(payload, slog.Group(name, values...))
}
encoder.Log(r.Context(), slog.LevelInfo, "" /* msg */, payload...)
}
}
func (r *logFmtResponse) WriteHeader(status int) {
r.statusCode = status
r.ResponseWriter.WriteHeader(status)
}
func (r *logFmtResponse) Write(src []byte) (int, error) {
var length int
length, r.error = r.ResponseWriter.Write(src)
r.responseLength += length
return length, r.error
}
func nextConnID() uint64 {
return atomic.AddUint64(&globalConnID, 1)
}

12
main.go
View File

@ -28,6 +28,7 @@ import (
"source.toby3d.me/toby3d/home/internal/common"
"source.toby3d.me/toby3d/home/internal/domain"
"source.toby3d.me/toby3d/home/internal/middleware"
"source.toby3d.me/toby3d/home/internal/page"
pagefsrepo "source.toby3d.me/toby3d/home/internal/page/repository/fs"
pageucase "source.toby3d.me/toby3d/home/internal/page/usecase"
@ -81,10 +82,7 @@ func NewApp(ctx context.Context, config *domain.Config) (*App, error) {
themer := themeucase.NewThemeUseCase(themes)
pages := pagefsrepo.NewFileSystemPageRepository(contentDir)
pager := pageucase.NewPageUseCase(pages, resources)
server := &http.Server{
Addr: config.AddrPort().String(),
Handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
// TODO(toby3d): use exists static use case or split that on static and resource modules?
// INFO(toby3d): any static file is public and unprotected by design, so it's safe to search it
// first before deep down to any page or it's resource which might be secured by middleware or
@ -192,7 +190,11 @@ func NewApp(ctx context.Context, config *domain.Config) (*App, error) {
}); err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
}
}),
})
chain := middleware.Chain{middleware.LogFmt()}
server := &http.Server{
Addr: config.AddrPort().String(),
Handler: chain.Handler(handler),
ErrorLog: logger,
BaseContext: func(ln net.Listener) context.Context { return ctx },
WriteTimeout: 500 * time.Millisecond,