extern/hishtory
1
0
Fork 0
mirror of https://github.com/ddworken/hishtory.git synced 2025-06-20 20:07:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add datadog metric to keep track of 503 errors

Browse Source
This commit is contained in:
David Dworken 2023-10-11 18:01:12 -07:00
parent e909bf817e
commit 7e6221ab24
No known key found for this signature in database
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend/server/internal/server/middleware.go
View File

@ -108,12 +108,15 @@ func withLogging(s *statsd.Client, out io.Writer) Middleware {
// withPanicGuard is the last defence from a panic. it will log them and return a 503 error // withPanicGuard is the last defence from a panic. it will log them and return a 503 error
// to the client and prevent the http server from breaking // to the client and prevent the http server from breaking
func withPanicGuard() Middleware { func withPanicGuard(s *statsd.Client) Middleware {
return func(h http.Handler) http.Handler { return func(h http.Handler) http.Handler {
return http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) { return http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
defer func() { defer func() {
if r := recover(); r != nil { if r := recover(); r != nil {
fmt.Printf("panic: %s\n", r) fmt.Printf("panic: %s\n", r)
if s != nil {
s.Incr("hishtory.error", []string{"handler:" + getFunctionName(h)}, 1.0)
}
// Note that we need to return a 503 error code since that is the error handled by the client in lib.IsOfflineError // Note that we need to return a 503 error code since that is the error handled by the client in lib.IsOfflineError
rw.WriteHeader(http.StatusServiceUnavailable) rw.WriteHeader(http.StatusServiceUnavailable)
} }

6
backend/server/internal/server/middleware_test.go
View File

@ -86,7 +86,7 @@ func TestPanicGuard(t *testing.T) {
w := httptest.NewRecorder() w := httptest.NewRecorder()
req := httptest.NewRequest(http.MethodGet, "/", nil) req := httptest.NewRequest(http.MethodGet, "/", nil)
req.Header.Add("X-Real-Ip", "127.0.0.1") req.Header.Add("X-Real-Ip", "127.0.0.1")
wrappedHandler := withPanicGuard()(handler) wrappedHandler := withPanicGuard(nil)(handler)
var panicked bool var panicked bool
func() { func() {
@ -115,7 +115,7 @@ func TestPanicGuardNoPanic(t *testing.T) {
req := httptest.NewRequest(http.MethodGet, "/", nil) req := httptest.NewRequest(http.MethodGet, "/", nil)
req.Header.Add("X-Real-Ip", "127.0.0.1") req.Header.Add("X-Real-Ip", "127.0.0.1")
wrappedHandler := withPanicGuard()(handler) wrappedHandler := withPanicGuard(nil)(handler)
var panicked bool var panicked bool
func() { func() {
@ -174,7 +174,7 @@ func TestMergeMiddlewares(t *testing.T) {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
var out strings.Builder var out strings.Builder
middlewares := mergeMiddlewares( middlewares := mergeMiddlewares(
withPanicGuard(), withPanicGuard(nil),
withLogging(nil, &out), withLogging(nil, &out),
) )

2
backend/server/internal/server/srv.go
View File

@ -95,7 +95,7 @@ func (s *Server) Run(ctx context.Context, addr string) error {
}() }()
} }
middlewares := mergeMiddlewares( middlewares := mergeMiddlewares(
withPanicGuard(), withPanicGuard(s.statsd),
withLogging(s.statsd, os.Stdout), withLogging(s.statsd, os.Stdout),
) )