add logging

This commit is contained in:
Gabriel Augendre 2024-10-10 19:04:51 +02:00
parent 1900e99a93
commit a69a527a81
2 changed files with 36 additions and 3 deletions

1
go.mod
View file

@ -7,6 +7,7 @@ require (
github.com/danielgtaylor/huma/v2 v2.22.1 github.com/danielgtaylor/huma/v2 v2.22.1
github.com/go-chi/chi/v5 v5.1.0 github.com/go-chi/chi/v5 v5.1.0
github.com/go-chi/cors v1.2.1 github.com/go-chi/cors v1.2.1
github.com/google/uuid v1.6.0
github.com/jarcoal/httpmock v1.3.1 github.com/jarcoal/httpmock v1.3.1
golang.org/x/text v0.18.0 golang.org/x/text v0.18.0
gotest.tools/v3 v3.5.1 gotest.tools/v3 v3.5.1

38
main.go
View file

@ -9,6 +9,8 @@ import (
"github.com/danielgtaylor/huma/v2/humacli" "github.com/danielgtaylor/huma/v2/humacli"
"github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5"
"github.com/go-chi/cors" "github.com/go-chi/cors"
"github.com/google/uuid"
"log/slog"
"net/http" "net/http"
"time" "time"
) )
@ -53,10 +55,12 @@ func addRoutes(api huma.API, glConfig GrandLyonConfig, now func() time.Time) {
}) (*stopOutput, error) { }) (*stopOutput, error) {
passages, err := getPassages(ctx, glConfig, now, input.StopID) passages, err := getPassages(ctx, glConfig, now, input.StopID)
if errors.Is(err, errNoPassageFound) { if errors.Is(err, errNoPassageFound) {
slog.ErrorContext(ctx, "passage not found", getRequestIDAttr(ctx))
return nil, huma.NewError(http.StatusNotFound, "no passage found") return nil, huma.NewError(http.StatusNotFound, "no passage found")
} }
if err != nil { if err != nil {
slog.ErrorContext(ctx, "error getting passages", "err", err, getRequestIDAttr(ctx))
return nil, err return nil, err
} }
@ -68,10 +72,12 @@ func addRoutes(api huma.API, glConfig GrandLyonConfig, now func() time.Time) {
}) (*velovOutput, error) { }) (*velovOutput, error) {
station, err := getStation(ctx, glConfig.Client, input.StationID) station, err := getStation(ctx, glConfig.Client, input.StationID)
if errors.Is(err, errStationNotFound) { if errors.Is(err, errStationNotFound) {
slog.ErrorContext(ctx, "station not found", getRequestIDAttr(ctx))
return nil, huma.NewError(http.StatusNotFound, "station not found") return nil, huma.NewError(http.StatusNotFound, "station not found")
} }
if err != nil { if err != nil {
slog.ErrorContext(ctx, "error getting station", "err", err, getRequestIDAttr(ctx))
return nil, err return nil, err
} }
@ -94,6 +100,8 @@ func main() {
Handler: router, Handler: router,
} }
api.UseMiddleware(logging)
glConfig := GrandLyonConfig{ glConfig := GrandLyonConfig{
Username: options.GrandLyonUsername, Username: options.GrandLyonUsername,
Password: options.GrandLyonPassword, Password: options.GrandLyonPassword,
@ -102,9 +110,9 @@ func main() {
addRoutes(api, glConfig, time.Now) addRoutes(api, glConfig, time.Now)
hooks.OnStart(func() { hooks.OnStart(func() {
fmt.Printf("Starting server on %s...\n", server.Addr) slog.Info("Starting server", "addr", server.Addr)
if err := server.ListenAndServe(); err != nil { if err := server.ListenAndServe(); err != nil {
fmt.Printf("Error running server: %s\n", err) slog.Error("Error running server", "err", err)
} }
}) })
@ -112,10 +120,34 @@ func main() {
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel() defer cancel()
if err := server.Shutdown(ctx); err != nil { if err := server.Shutdown(ctx); err != nil {
fmt.Printf("Error shutting down server: %s\n", err) slog.ErrorContext(ctx, "Error shutting down server", "err", err)
} }
}) })
}) })
cli.Run() cli.Run()
} }
type contextKey string
const requestIDKey contextKey = "request_id"
func logging(ctx huma.Context, next func(huma.Context)) {
reqID := uuid.New().String()
ctx = huma.WithValue(ctx, requestIDKey, reqID)
start := time.Now()
next(ctx)
elapsed := time.Since(start)
slog.InfoContext(ctx.Context(), "response",
"method", ctx.Method(),
"path", ctx.URL().Path,
"status", ctx.Status(),
"duration", elapsed,
getRequestIDAttr(ctx.Context()),
)
}
func getRequestIDAttr(ctx context.Context) slog.Attr {
val, _ := ctx.Value(requestIDKey).(string)
return slog.String("request_id", val)
}