Merge remote-tracking branch 'skolodyazhnyy/fix-exception-masking' into minline-develop

Author: Oleksii Korshenko

lib/internal/Magento/Framework/Webapi/ErrorProcessor.php

@@ -189,14 +189,10 @@ public function renderException(\Exception $exception, $httpCode = self::DEFAULT
      */
     protected function _critical(\Exception $exception)
     {
-        $exceptionClass = get_class($exception);
         $reportId = uniqid("webapi-");
-        $exceptionForLog = new $exceptionClass(
-            /** Trace is added separately by critical. */
-            "Report ID: {$reportId}; Message: {$exception->getMessage()}",
-            $exception->getCode()
-        );
-        $this->_logger->critical($exceptionForLog);
+
+        $this->_logger->critical(new WebapiException\WebapiExceptionReport($reportId, $exception));
+
         return $reportId;
     }
 

lib/internal/Magento/Framework/Webapi/Exception/WebapiExceptionReport.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Magento\Framework\Webapi\Exception;
+
+class WebapiExceptionReport extends \Exception
+{
+    /**
+     * @var string
+     */
+    private $reportId;
+
+    /**
+     * @param string     $reportId
+     * @param \Exception $exception
+     */
+    public function __construct($reportId, \Exception $exception)
+    {
+        $this->reportId = $reportId;
+
+        parent::__construct(
+            "Report ID: {$reportId}; Message: {$exception->getMessage()}",
+            $exception->getCode(),
+            $exception
+        );
+    }
+
+    /**
+     * @return string
+     */
+    public function getReportId()
+    {
+        return $this->reportId;
+    }
+}

lib/internal/Magento/Framework/Webapi/Test/Unit/ErrorProcessorTest.php

@@ -225,6 +225,22 @@ public function testMaskException($exception, $expectedHttpCode, $expectedMessag
         );
     }
 
+    /**
+     * Test logged exception is the same as the thrown one in production mode
+     */
+    public function testCriticalExceptionStackTrace()
+    {
+        $thrownException = new \Exception('', 0);
+
+        $this->_loggerMock->expects($this->once())
+            ->method('critical')
+            ->will($this->returnCallback(function(\Exception $loggedException) use($thrownException) {
+                $this->assertSame($thrownException, $loggedException->getPrevious());
+            }));
+
+        $this->_errorProcessor->maskException($thrownException);
+    }
+
     /**
      * @return array
      */