From 61541a6159df0faaf4f2ff0e3e86f7251b93ab28 Mon Sep 17 00:00:00 2001
From: Stefan Jaroschek <stefan.jaroschek@sandstein.de>
Date: Tue, 19 Nov 2019 15:32:26 +0100
Subject: [PATCH 1/2] add optional environment for sentry for easy filtering of
 different environments in a single project

---
 .../code/community/FireGento/Logger/Model/Sentry.php |  3 +++
 .../code/community/FireGento/Logger/etc/system.xml   | 12 ++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/src/app/code/community/FireGento/Logger/Model/Sentry.php b/src/app/code/community/FireGento/Logger/Model/Sentry.php
index 6426c597..3b273bb3 100644
--- a/src/app/code/community/FireGento/Logger/Model/Sentry.php
+++ b/src/app/code/community/FireGento/Logger/Model/Sentry.php
@@ -83,6 +83,9 @@ public function initRavenClient()
                 'trace'       => $this->_enableBacktrace,
                 'curl_method' => $helper->getLoggerConfig('sentry/curl_method'),
             ];
+            if ($environment = trim($helper->getLoggerConfig('sentry/environment'))) {
+                $options['environment'] = $environment;
+            }
             self::$_ravenClient = new Raven_Client($dsn, $options);
             self::$_ravenClient->setAppPath(dirname(BP));
             self::$_ravenClient->trace = TRUE;
diff --git a/src/app/code/community/FireGento/Logger/etc/system.xml b/src/app/code/community/FireGento/Logger/etc/system.xml
index 2d16fa3d..1d240462 100644
--- a/src/app/code/community/FireGento/Logger/etc/system.xml
+++ b/src/app/code/community/FireGento/Logger/etc/system.xml
@@ -766,6 +766,18 @@
                                 <nobr>https://{PUBLIC_KEY}@{HOST}/{PROJECT_ID}</nobr>
                             ]]></comment>
                         </public_dsn>
+                        <environment translate="label comment">
+                            <label>Environment</label>
+                            <frontend_type>text</frontend_type>
+                            <sort_order>15</sort_order>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>1</show_in_store>
+                            <comment><![CDATA[
+                                Add custom environment label to allow easy filtering
+                                (see <a href="https://docs.sentry.io/enriching-error-data/environments/">https://docs.sentry.io/enriching-error-data/environments/</a>).
+                            ]]></comment>
+                        </environment>
                         <curl_method translate="label">
                             <label>cURL Method</label>
                             <frontend_type>select</frontend_type>

From bd38ed4dc7df0b392885e79b3e1f9be04bfb8269 Mon Sep 17 00:00:00 2001
From: Wilfried Wolf <wilfried.wolf@sandstein.de>
Date: Tue, 14 Jan 2020 16:22:00 +0100
Subject: [PATCH 2/2] Solves Issue Logger priority filter does not work (for
 sentry) #125

---
 .../community/FireGento/Logger/Model/Sentry.php    | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/app/code/community/FireGento/Logger/Model/Sentry.php b/src/app/code/community/FireGento/Logger/Model/Sentry.php
index 3b273bb3..bd15e7c8 100644
--- a/src/app/code/community/FireGento/Logger/Model/Sentry.php
+++ b/src/app/code/community/FireGento/Logger/Model/Sentry.php
@@ -115,7 +115,7 @@ protected function _write($event)
             /**
              * Get message priority
              */
-            if ( ! isset($event['priority'])) {
+            if ( ! isset($event['priority']) || $event['priority'] === Zend_Log::ERR ) {
                 $this->_assumePriorityByMessage($event);
             }
             $priority = isset($event['priority']) ? $event['priority'] : 3;
@@ -191,10 +191,18 @@ protected function _write($event)
      */
     protected function _assumePriorityByMessage(&$event)
     {
-        if (stripos($event['message'], "warn") === 0) {
+        if (
+            stripos($event['message'], "warn") === 0 ||
+            stripos($event['message'], "user warn") === 0
+        ) {
             $event['priority'] = 4;
         }
-        else if (stripos($event['message'], "notice") === 0) {
+        else if (
+            stripos($event['message'], "notice") === 0 ||
+            stripos($event['message'], "user notice") === 0 ||
+            stripos($event['message'], "strict notice") === 0 ||
+            stripos($event['message'], "deprecated") === 0
+        ) {
             $event['priority'] = 5;
         }