fix: panic handling in shadow resolver (openfga#2432)

Author: Vic-Dev

internal/graph/shadow_resolver.go

@@ -67,20 +67,22 @@ func (s ShadowResolver) ResolveCheck(ctx context.Context, req *ResolveCheckReque
 		reqClone.VisitedPaths = nil // reset completely for evaluation
 		s.wg.Add(1)
 		go func() {
-			ctx, cancel := context.WithTimeout(ctxClone, s.shadowTimeout)
 			defer func() {
 				if r := recover(); r != nil {
-					s.logger.ErrorWithContext(ctx, "shadow check panic",
+					s.logger.ErrorWithContext(ctx, "panic recovered",
 						zap.String("resolver", s.name),
 						zap.Any("error", err),
 						zap.String("request", reqClone.GetTupleKey().String()),
 						zap.String("store_id", reqClone.GetStoreID()),
 						zap.String("model_id", reqClone.GetAuthorizationModelID()),
+						zap.String("function", "ShadowResolver.ResolveCheck"),
 					)
 				}
-				cancel()
-				s.wg.Done()
 			}()
+
+			defer s.wg.Done()
+			ctx, cancel := context.WithTimeout(ctxClone, s.shadowTimeout)
+			defer cancel()
 			shadowRes, err := s.shadow.ResolveCheck(ctx, reqClone)
 			if err != nil {
 				s.logger.WarnWithContext(ctx, "shadow check errored",

internal/graph/shadow_resolver_test.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 	"go.uber.org/mock/gomock"
+	"go.uber.org/zap"
 
 	"github.com/openfga/openfga/internal/mocks"
 )
@@ -105,7 +106,7 @@ func TestShadowResolver_ResolveCheck(t *testing.T) {
 		shadow.EXPECT().ResolveCheck(gomock.Any(), gomock.Any()).DoAndReturn(func(ctx context.Context, request *ResolveCheckRequest) (*ResolveCheckResponse, error) {
 			panic(errors.New("test error"))
 		})
-		logger.EXPECT().ErrorWithContext(gomock.Any(), "shadow check panic", gomock.Any())
+		logger.EXPECT().ErrorWithContext(gomock.Any(), "panic recovered", gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any(), zap.String("function", "ShadowResolver.ResolveCheck"))
 		res, err := checker.ResolveCheck(context.Background(), &ResolveCheckRequest{})
 		require.NoError(t, err)
 		require.False(t, res.Allowed)