Added OpenTelemetry and use structured logging
This commit is contained in:
@@ -1,19 +1,20 @@
|
||||
package response
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"log"
|
||||
"log/slog"
|
||||
"net/http"
|
||||
)
|
||||
|
||||
func JSON(w http.ResponseWriter, status int, data any) {
|
||||
func JSON(ctx context.Context, w http.ResponseWriter, status int, data any) {
|
||||
payload, err := json.Marshal(data)
|
||||
if err != nil {
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
w.WriteHeader(http.StatusInternalServerError)
|
||||
_, err := w.Write([]byte(`{"error": "internal server error: failed to marshal response"}`))
|
||||
if err != nil {
|
||||
log.Println(err)
|
||||
slog.ErrorContext(ctx, "Failed to write JSON", slog.Any("error", err))
|
||||
return
|
||||
}
|
||||
return
|
||||
@@ -23,11 +24,11 @@ func JSON(w http.ResponseWriter, status int, data any) {
|
||||
w.WriteHeader(status)
|
||||
_, err = w.Write(payload)
|
||||
if err != nil {
|
||||
log.Println(err)
|
||||
slog.ErrorContext(ctx, "Failed to write response", slog.Any("error", err))
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
func Error(w http.ResponseWriter, status int, message string) {
|
||||
JSON(w, status, map[string]string{"error": message})
|
||||
func Error(ctx context.Context, w http.ResponseWriter, status int, message string) {
|
||||
JSON(ctx, w, status, map[string]string{"error": message})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user