test

Author: leafty

cmd/gateway/main.go

@@ -20,11 +20,10 @@ import (
 	"github.com/SwissDataScienceCenter/renku-gateway/internal/revproxy"
 	"github.com/SwissDataScienceCenter/renku-gateway/internal/sessions"
 	"github.com/SwissDataScienceCenter/renku-gateway/internal/tokenstore"
+	"github.com/SwissDataScienceCenter/renku-gateway/internal/utils"
 	"github.com/SwissDataScienceCenter/renku-gateway/internal/views"
 	"github.com/getsentry/sentry-go"
 	sentryecho "github.com/getsentry/sentry-go/echo"
-	"github.com/go-extras/errx"
-	"github.com/go-extras/errx/stacktrace"
 	"github.com/labstack/echo-contrib/echoprometheus"
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
@@ -68,13 +67,6 @@ func main() {
 	}
 	// Setup
 	e := echo.New()
-
-	// Test
-	e.HTTPErrorHandler = func(err error, c echo.Context) {
-		wrappedErr := errx.Wrap("Unhandled error", err, stacktrace.Here())
-		e.DefaultHTTPErrorHandler(wrappedErr, c)
-	}
-
 	e.Pre(middleware.RequestID(), middleware.RemoveTrailingSlash(), revproxy.UiServerPathRewrite())
 	e.Use(middleware.Recover())
 	// Sentry middleware
@@ -86,7 +78,7 @@ func main() {
 		e.Use(func(next echo.HandlerFunc) echo.HandlerFunc {
 			return func(c echo.Context) error {
 				err = next(c)
-				if err != nil {
+				if err != nil && utils.SendErrorToSentry(err) {
 					hub := sentryecho.GetHubFromContext(c)
 					if hub == nil {
 						slog.Error("SENTRY", "message", "Cannot get Sentry Hub from echo context!")

go.mod

@@ -8,7 +8,6 @@ require (
 	github.com/getkin/kin-openapi v0.134.0
 	github.com/getsentry/sentry-go v0.44.1
 	github.com/getsentry/sentry-go/echo v0.44.1
-	github.com/go-extras/errx v1.3.0
 	github.com/go-jose/go-jose/v4 v4.1.4
 	github.com/golang-jwt/jwt/v4 v4.5.2
 	github.com/google/go-cmp v0.7.0
@@ -21,6 +20,7 @@ require (
 	github.com/oklog/ulid/v2 v2.1.1
 	github.com/posthog/posthog-go v1.11.3
 	github.com/redis/go-redis/v9 v9.18.0
+	github.com/rotisserie/eris v0.5.4
 	github.com/spf13/viper v1.21.0
 	github.com/stretchr/testify v1.11.1
 	github.com/zitadel/oidc/v3 v3.47.5

go.sum

@@ -43,8 +43,6 @@ github.com/go-chi/chi/v5 v5.2.5 h1:Eg4myHZBjyvJmAFjFvWgrqDTXFyOzjj7YIm3L3mu6Ug=
 github.com/go-chi/chi/v5 v5.2.5/go.mod h1:X7Gx4mteadT3eDOMTsXzmI4/rwUpOwBHLpAfupzFJP0=
 github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
 github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
-github.com/go-extras/errx v1.3.0 h1:yVpzdfZZh4pXPLhBxS1svncMmqgeKUZ6A0nNb8V+F5c=
-github.com/go-extras/errx v1.3.0/go.mod h1:WEu7O98SekRqyG7zrk9lNM87Yttfj7Usssshe6sMHoQ=
 github.com/go-jose/go-jose/v4 v4.1.4 h1:moDMcTHmvE6Groj34emNPLs/qtYXRVcd6S7NHbHz3kA=
 github.com/go-jose/go-jose/v4 v4.1.4/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9Kf04k1rs08=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
@@ -191,6 +189,8 @@ github.com/redis/go-redis/v9 v9.18.0 h1:pMkxYPkEbMPwRdenAzUNyFNrDgHx9U+DrBabWNfS
 github.com/redis/go-redis/v9 v9.18.0/go.mod h1:k3ufPphLU5YXwNTUcCRXGxUoF1fqxnhFQmscfkCoDA0=
 github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
 github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
+github.com/rotisserie/eris v0.5.4 h1:Il6IvLdAapsMhvuOahHWiBnl1G++Q0/L5UIkI5mARSk=
+github.com/rotisserie/eris v0.5.4/go.mod h1:Z/kgYTJiJtocxCbFfvRmO+QejApzG6zpyky9G1A4g9s=
 github.com/rs/cors v1.11.1 h1:eU3gRzXLRK57F5rKMGMZURNdIG4EoAmX8k94r9wXWHA=
 github.com/rs/cors v1.11.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
 github.com/sagikazarmark/locafero v0.12.0 h1:/NQhBAkUb4+fH1jivKHWusDYFjMOOKU88eegjfxfHb4=

internal/revproxy/proxies.go

@@ -6,13 +6,12 @@ import (
 	"os"
 
 	"github.com/SwissDataScienceCenter/renku-gateway/internal/utils"
-	"github.com/go-extras/errx"
-	"github.com/go-extras/errx/stacktrace"
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
+	"github.com/rotisserie/eris"
 )
 
-var ErrProxy = errx.NewSentinel("proxy error")
+// var ErrProxy = errx.NewSentinel("proxy error")
 
 // proxyFromURL middleware creates a proxy that forwards requests to the specified URL
 func proxyFromURL(url *url.URL) echo.MiddlewareFunc {
@@ -32,7 +31,9 @@ func proxyFromURL(url *url.URL) echo.MiddlewareFunc {
 				URL:  url,
 			}}),
 		ErrorHandler: func(c echo.Context, err error) error {
-			return errx.Wrap("Unhandled error", err, errx.Attrs("proxy_url", url, "echo_context", c), ErrProxy, stacktrace.Here())
+			return eris.Wrap(err, "proxy error")
+			// return err
+			// return errx.Wrap("Unhandled error", err, errx.Attrs("proxy_url", url, "echo_context", c), ErrProxy, stacktrace.Here())
 		},
 	}
 	return middleware.ProxyWithConfig(mwConfig)