From e53b1ec93bb77383e292f2733bf0c247a637aa87 Mon Sep 17 00:00:00 2001
From: ssgoncalves <samuel_gs@live.com>
Date: Mon, 10 Oct 2022 12:07:24 -0300
Subject: [PATCH] fix: add catch to any throwable in consumer manager

---
 src/Connectors/Consumer/Manager.php           |  6 +--
 src/TopicHandler/Consumer/AbstractHandler.php |  4 +-
 src/TopicHandler/Consumer/Handler.php         |  4 +-
 tests/Integration/Dummies/MessageConsumer.php |  6 +--
 .../Unit/Connectors/Consumer/ManagerTest.php  | 46 +++++++++++++++++++
 tests/Unit/Dummies/ConsumerHandlerDummy.php   |  4 +-
 6 files changed, 58 insertions(+), 12 deletions(-)

diff --git a/src/Connectors/Consumer/Manager.php b/src/Connectors/Consumer/Manager.php
index cc1b0de0..3e7b7d42 100644
--- a/src/Connectors/Consumer/Manager.php
+++ b/src/Connectors/Consumer/Manager.php
@@ -1,7 +1,6 @@
 <?php
 namespace Metamorphosis\Connectors\Consumer;
 
-use Exception;
 use Metamorphosis\Consumers\ConsumerInterface;
 use Metamorphosis\Exceptions\ResponseTimeoutException;
 use Metamorphosis\Exceptions\ResponseWarningException;
@@ -9,6 +8,7 @@
 use Metamorphosis\Record\ConsumerRecord;
 use Metamorphosis\TopicHandler\Consumer\Handler as ConsumerHandler;
 use RdKafka\Message;
+use Throwable;
 
 class Manager
 {
@@ -79,8 +79,8 @@ public function handleMessage(): void
         } catch (ResponseWarningException $exception) {
             $this->consumerHandler->warning($exception);
             return;
-        } catch (Exception $exception) {
-            $this->consumerHandler->failed($exception);
+        } catch (Throwable $throwable) {
+            $this->consumerHandler->failed($throwable);
             return;
         }
 
diff --git a/src/TopicHandler/Consumer/AbstractHandler.php b/src/TopicHandler/Consumer/AbstractHandler.php
index 73ad2307..d284b7aa 100644
--- a/src/TopicHandler/Consumer/AbstractHandler.php
+++ b/src/TopicHandler/Consumer/AbstractHandler.php
@@ -1,9 +1,9 @@
 <?php
 namespace Metamorphosis\TopicHandler\Consumer;
 
-use Exception;
 use Metamorphosis\Exceptions\ResponseWarningException;
 use Metamorphosis\TopicHandler\ConfigOptions\Consumer as ConsumerConfigOptions;
+use Throwable;
 
 abstract class AbstractHandler implements Handler
 {
@@ -23,7 +23,7 @@ public function warning(ResponseWarningException $exception): void
     {
     }
 
-    public function failed(Exception $exception): void
+    public function failed(Throwable $throwable): void
     {
     }
 
diff --git a/src/TopicHandler/Consumer/Handler.php b/src/TopicHandler/Consumer/Handler.php
index e24a22c0..1f82cac2 100644
--- a/src/TopicHandler/Consumer/Handler.php
+++ b/src/TopicHandler/Consumer/Handler.php
@@ -1,9 +1,9 @@
 <?php
 namespace Metamorphosis\TopicHandler\Consumer;
 
-use Exception;
 use Metamorphosis\Exceptions\ResponseWarningException;
 use Metamorphosis\Record\RecordInterface;
+use Throwable;
 
 interface Handler
 {
@@ -25,5 +25,5 @@ public function finished(): void;
     /**
      * Handle failure process.
      */
-    public function failed(Exception $exception): void;
+    public function failed(Throwable $throwable): void;
 }
diff --git a/tests/Integration/Dummies/MessageConsumer.php b/tests/Integration/Dummies/MessageConsumer.php
index f3c6be20..48f8e28a 100644
--- a/tests/Integration/Dummies/MessageConsumer.php
+++ b/tests/Integration/Dummies/MessageConsumer.php
@@ -1,11 +1,11 @@
 <?php
 namespace Tests\Integration\Dummies;
 
-use Exception;
 use Illuminate\Support\Facades\Log;
 use Metamorphosis\Exceptions\ResponseWarningException;
 use Metamorphosis\Record\RecordInterface;
 use Metamorphosis\TopicHandler\Consumer\AbstractHandler;
+use Throwable;
 
 class MessageConsumer extends AbstractHandler
 {
@@ -23,10 +23,10 @@ public function warning(ResponseWarningException $exception): void
         ]);
     }
 
-    public function failed(Exception $exception): void
+    public function failed(Throwable $throwable): void
     {
         Log::error('Failed to handle kafka record for sku.', [
-            'exception' => $exception,
+            'exception' => $throwable,
         ]);
     }
 }
diff --git a/tests/Unit/Connectors/Consumer/ManagerTest.php b/tests/Unit/Connectors/Consumer/ManagerTest.php
index 1b740360..3d3f76d9 100644
--- a/tests/Unit/Connectors/Consumer/ManagerTest.php
+++ b/tests/Unit/Connectors/Consumer/ManagerTest.php
@@ -1,7 +1,9 @@
 <?php
 namespace Tests\Unit\Connectors\Consumer;
 
+use Error;
 use Exception;
+use InvalidArgumentException;
 use Metamorphosis\Connectors\Consumer\Manager;
 use Metamorphosis\ConsumerConfigManager;
 use Metamorphosis\Consumers\ConsumerInterface;
@@ -14,6 +16,8 @@
 use RdKafka\Message as KafkaMessage;
 use Tests\LaravelTestCase;
 use Tests\Unit\Dummies\ConsumerHandlerDummy;
+use Throwable;
+use TypeError;
 
 class ManagerTest extends LaravelTestCase
 {
@@ -35,6 +39,30 @@ protected function setUp(): void
         ]);
     }
 
+    /**
+     * @dataProvider getThrowableScenarios
+     */
+    public function testShouldHandlerAnyThrowable(Throwable $throwable): void
+    {
+        // Set
+        $consumer = m::mock(ConsumerInterface::class);
+        $consumerHandler = m::mock(ConsumerHandler::class);
+        $dispatcher = m::mock(Dispatcher::class);
+
+        $runner = new Manager($consumer, $consumerHandler, $dispatcher, true, false);
+
+        // Expectations
+        $consumer->expects()
+            ->consume()
+            ->andThrow($throwable);
+
+        $consumerHandler->expects()
+            ->failed($throwable);
+
+        // Actions
+        $runner->handleMessage();
+    }
+
     public function testShouldHandleMultiplesMessages(): void
     {
         // Set
@@ -171,4 +199,22 @@ public function testShouldHandleAsyncCommit(): void
         $runner->handleMessage();
         $runner->handleMessage();
     }
+
+    public function getThrowableScenarios(): array
+    {
+        return [
+            'Exception' => [
+                'throwable' => new Exception(),
+            ],
+            'Error' => [
+                'throwable' => new Error(),
+            ],
+            'InvalidArgumentException' => [
+                'throwable' => new InvalidArgumentException(),
+            ],
+            'TypeError' => [
+                'throwable' => new TypeError(),
+            ],
+        ];
+    }
 }
diff --git a/tests/Unit/Dummies/ConsumerHandlerDummy.php b/tests/Unit/Dummies/ConsumerHandlerDummy.php
index 08eb14a0..52ffc955 100644
--- a/tests/Unit/Dummies/ConsumerHandlerDummy.php
+++ b/tests/Unit/Dummies/ConsumerHandlerDummy.php
@@ -1,9 +1,9 @@
 <?php
 namespace Tests\Unit\Dummies;
 
-use Exception;
 use Metamorphosis\Record\RecordInterface;
 use Metamorphosis\TopicHandler\Consumer\AbstractHandler;
+use Throwable;
 
 class ConsumerHandlerDummy extends AbstractHandler
 {
@@ -11,7 +11,7 @@ public function handle(RecordInterface $data): void
     {
     }
 
-    public function failed(Exception $exception): void
+    public function failed(Throwable $throwable): void
     {
     }
 }