Merge branch 'release/0.5.0'

Author: rakibabu

Helper/Data.php

@@ -8,6 +8,7 @@
 use Magento\Framework\App\Helper\Context;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\App\Helper\AbstractHelper;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\App\ProductMetadataInterface;
 
 class Data extends AbstractHelper
@@ -46,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;
@@ -102,13 +99,6 @@ public function collectModuleConfig()
      */
     public function isActive()
     {
-        try {
-            $this->appState->setAreaCode(Area::AREA_GLOBAL);
-        } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            // intentionally left empty
-            // var_dump($e);
-        }
-
         return (! empty($this->config) && array_key_exists('enabled', $this->config) && $this->config['enabled'] && ($this->isProductionMode() || $this->isOverwriteProductionMode()));
     }
 
@@ -117,7 +107,7 @@ public function isActive()
      */
     public function isProductionMode()
     {
-        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 = []
     ) {
@@ -61,7 +61,10 @@ public function send($message, $logLevel, Monolog $monolog, $context = [])
         $config = $this->data->collectModuleConfig();
 
         if ($logLevel >= (int) $config['log_level']) {
-            $client = (new Raven_Client($config['domain'] ?? null));
+            $client = new Raven_Client($config['domain'] ?? null, [
+                'ignore_server_port'    => true,
+                'curl_method'           => 'async'
+            ]);
             $handler = new RavenHandler($client, $config['log_level'] ?? Logger::ERROR);
             $tags = $this->getTags();
             $userData = $this->getUserData();

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

@@ -5,7 +5,9 @@ This Magento 2 module integrates the [Sentry sdk](https://github.com/getsentry/s
 ## Installation
 - `composer require justbetter/magento2-sentry`
 - `bin/magento module:enable JustBetter_Sentry`
-- `bin/magento setup:upgrade && bin/magento setup:static-content:deploy`
+- `bin/magento setup:upgrade`
+- `bin/magento setup:di:compile`
+- `bin/magento setup:static-content:deploy`
 
 ## Configuration
 - Options for the module are defined in the backend under Stores > Configuration > JustBetter > Sentry configuration
@@ -14,14 +16,18 @@ 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. Magento 2.1.x is not supported by us anymore, feel free to fork this project or make a pull request.
 
 ## 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).
 
 ## Todo
 - Integrate custom error pages in composer package
 - Integrate feedback sentry form in error pages
+- Integrate Raven Client options describe here: [sentry-php](https://github.com/getsentry/sentry-php/blob/master/docs/config.rst)
+
+## Abous Us
+We're a innovative development agency from The Netherlands building awesome websites, webshops and web applications with Laravel and Magento. Check out our website [justbetter.nl](https://justbetter.nl) and our open source projects at [GitHub](https://github.com/justbetter)
 
 ## License
 [MIT](LICENSE)

composer.json

@@ -2,11 +2,11 @@
   "name": "justbetter/magento2-sentry",
   "description": "Magento 2 Logger for Sentry",
   "type": "magento2-module",
-  "version": "0.4.2",
+  "version": "0.5.0",
   "license": "MIT",
   "require": {
     "php": ">=7.0",
-    "sentry/sentry": "^1.9",
+    "sentry/sentry": "^1.10",
     "monolog/monolog": "*",
     "magento/framework": "*"
   },