Merge pull request #571 from magento-performance/ACPT-1584-2

small improvements to ACPT-1587 & ACPT-1584

Author: andimov

app/code/Magento/ApplicationPerformanceMonitor/Plugin/ApplicationPerformanceMonitor.php

@@ -9,8 +9,6 @@
 
 use Magento\ApplicationPerformanceMonitor\Profiler\Profiler;
 use Magento\Framework\AppInterface as Application;
-use Magento\Framework\App\HttpRequestInterface;
-use Magento\Framework\App\Response\HttpInterface;
 use Magento\Framework\App\ResponseInterface;
 
 /**
@@ -30,7 +28,7 @@ public function __construct(private Profiler $profiler)
      *
      * @param Application $subject
      * @param callable $proceed
-     * @return HttpInterface
+     * @return ResponseInterface
      */
     public function aroundLaunch(
         Application $subject,

app/code/Magento/GraphQlNewRelic/Plugin/ReportError.php

@@ -35,7 +35,11 @@ public function __construct(private NewRelicWrapper $newRelicWrapper)
     public function beforeHandle(ErrorHandler $subject, array $errors, callable $formatter)
     {
         if (!empty($errors)) {
-            $this->newRelicWrapper->reportError($errors[0]); // Note: We only log the first error because performance
+            $error = $errors[0];
+            if (($error instanceof Error ) && $error->getPrevious()) {
+                $error = $error->getPrevious();
+            }
+            $this->newRelicWrapper->reportError($error); // Note: We only log the first error because performance
         }
         return null;
     }