From 1bfab3a36fabae6e792fde52a4d1c3028ea813c1 Mon Sep 17 00:00:00 2001
From: Kevin Franklin Kim <kevin.kim@bestbytes.com>
Date: Fri, 7 Mar 2025 21:10:35 +0100
Subject: [PATCH] feat: add error_context label

---
 net/http/middleware/cancel.go | 60 -----------------------------------
 net/http/middleware/logger.go |  4 +++
 2 files changed, 4 insertions(+), 60 deletions(-)
 delete mode 100644 net/http/middleware/cancel.go

diff --git a/net/http/middleware/cancel.go b/net/http/middleware/cancel.go
deleted file mode 100644
index 026eeeb..0000000
--- a/net/http/middleware/cancel.go
+++ /dev/null
@@ -1,60 +0,0 @@
-package middleware
-
-import (
-	"net/http"
-
-	httputils "github.com/foomo/keel/utils/net/http"
-	"go.uber.org/zap"
-)
-
-type (
-	CancelOptions struct {
-		Code int
-	}
-	CancelOption func(*CancelOptions)
-)
-
-// GetDefaultCancelOptions returns the default options
-func GetDefaultCancelOptions() CancelOptions {
-	return CancelOptions{
-		Code: 499,
-	}
-}
-
-// CancelWithCode middleware option
-func CancelWithCode(v int) CancelOption {
-	return func(o *CancelOptions) {
-		o.Code = v
-	}
-}
-
-// Cancel middleware
-func Cancel(opts ...CancelOption) Middleware {
-	options := GetDefaultCancelOptions()
-	for _, opt := range opts {
-		if opt != nil {
-			opt(&options)
-		}
-	}
-	return CancelWithOptions(options)
-}
-
-// CancelWithOptions middleware
-func CancelWithOptions(opts CancelOptions) Middleware {
-	return func(l *zap.Logger, name string, next http.Handler) http.Handler {
-		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			done := make(chan struct{})
-			go func() {
-				next.ServeHTTP(w, r)
-				close(done)
-			}()
-
-			select {
-			case <-r.Context().Done():
-				httputils.ServerError(l, w, r, opts.Code, r.Context().Err())
-			case <-done:
-				// If handler completes normally
-			}
-		})
-	}
-}
diff --git a/net/http/middleware/logger.go b/net/http/middleware/logger.go
index 7908f7a..3f7d5b9 100644
--- a/net/http/middleware/logger.go
+++ b/net/http/middleware/logger.go
@@ -99,6 +99,10 @@ func LoggerWithOptions(opts LoggerOptions) Middleware {
 				l = l.With(labeler.Get()...)
 			}
 
+			if err := r.Context().Err(); err != nil {
+				l = l.With(zap.String("error_context", err.Error()))
+			}
+
 			switch {
 			case opts.MinErrorCode > 0 && wr.statusCode >= opts.MinErrorCode:
 				l.Error(opts.Message)