[FIX] - possible fix for failures with area code already set - added proxy to customer session - refactor of setappstate with emulateAreaCode

Author: rakibabu

Helper/Data.php

@@ -47,11 +47,7 @@ class Data extends AbstractHelper
      * @param StoreManagerInterface $storeManager
      * @param State                 $appState
      */
-    public function __construct(
-        Context $context,
-        StoreManagerInterface $storeManager,
-        State $appState,
-        ProductMetadataInterface $productMetadataInterface
+    public function __construct(Context $context, StoreManagerInterface $storeManager, State $appState, ProductMetadataInterface $productMetadataInterface
     ) {
         $this->storeManager = $storeManager;
         $this->appState = $appState;
@@ -111,13 +107,7 @@ public function isActive()
      */
     public function isProductionMode()
     {
-        try {
-            $this->appState->setAreaCode(Area::AREA_GLOBAL);
-        } catch (LocalizedException $e) {
-            //intentionally left empty
-        }
-
-        return $this->getAppState() == 'production';
+        return $this->appState->emulateAreaCode(Area::AREA_GLOBAL, [$this, 'getAppState']) == 'production';
     }
 
     /**

Model/SentryLog.php

@@ -40,7 +40,7 @@ class SentryLog extends Monolog
     public function __construct(
         $name,
         Data $data,
-        Session $customerSession,
+        Session\Proxy $customerSession,
         array $handlers = [],
         array $processors = []
     ) {

Plugin/ExceptionCatcher.php

@@ -41,11 +41,7 @@ class ExceptionCatcher
      * @param State     $state
      * @param SentryLog $logger
      */
-    public function __construct(
-        Data $data,
-        Monolog $monolog,
-        SentryLog $sentryLog
-    ) {
+    public function __construct(Data $data, Monolog $monolog, SentryLog $sentryLog) {
         $this->sentryHelper = $data;
         $this->monolog = $monolog;
         $this->sentryLog = $sentryLog;

README.md

@@ -14,7 +14,7 @@ This Magento 2 module integrates the [Sentry sdk](https://github.com/getsentry/s
 - Optional you can configure custom error pages in pub/errors. You can use the sentry feedback form and insert here the sentry log ID. The Sentry Log Id is captured in de customer session and can be retrieved in `processor.php`. Soon I'll integrate this in the module.
 
 ## Compability
-The module is tested on Magento version 2.1.x & 2.2.x with sentry sdk version 1.9.x
+The module is tested on Magento version 2.2.x & 2.3.x with sentry sdk version 1.10.x
 
 ## Ideas, bugs or suggestions?
 Please create a [issue](https://github.com/justbetter/magento2-sentry/issues) or a [pull request](https://github.com/justbetter/magento2-sentry/pulls).

composer.json

@@ -6,7 +6,7 @@
   "license": "MIT",
   "require": {
     "php": ">=7.0",
-    "sentry/sentry": "^1.9",
+    "sentry/sentry": "^1.10",
     "monolog/monolog": "*",
     "magento/framework": "*"
   },