From acc49c120c326c03ea7fe0a6c8b0fbc704d4057a Mon Sep 17 00:00:00 2001 From: Max Chadwick Date: Wed, 1 Nov 2017 20:50:31 -0400 Subject: [PATCH 1/9] Dispatch an event when handling exceptions --- lib/internal/Magento/Framework/App/Http.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/internal/Magento/Framework/App/Http.php b/lib/internal/Magento/Framework/App/Http.php index 3c6dee49f97b4..cd62f998352a5 100644 --- a/lib/internal/Magento/Framework/App/Http.php +++ b/lib/internal/Magento/Framework/App/Http.php @@ -153,6 +153,8 @@ public function launch() */ public function catchException(Bootstrap $bootstrap, \Exception $exception) { + $this->_eventManager->dispatch('application_handled_exception', ['exception' => $exception]); + $result = $this->handleDeveloperMode($bootstrap, $exception) || $this->handleBootstrapErrors($bootstrap, $exception) || $this->handleSessionException($exception) From debea4227a15480ba2bb37be3ebce1c5870cdd42 Mon Sep 17 00:00:00 2001 From: Max Chadwick Date: Wed, 1 Nov 2017 20:51:12 -0400 Subject: [PATCH 2/9] Add new wrapper for newrelic_notice_error --- .../NewRelicReporting/Model/NewRelicWrapper.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php b/app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php index c4818c38cd9c6..9064a5194bd05 100644 --- a/app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php +++ b/app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php @@ -28,6 +28,19 @@ public function addCustomParameter($param, $value) return false; } + /** + * Wrapper for 'newrelic_notice_error' function + * + * @param Exception $exception + * @return void + */ + public function reportError($exception) + { + if (extension_loaded('newrelic')) { + newrelic_notice_error($exception->getMessage(), $exception); + } + } + /** * Checks whether newrelic-php5 agent is installed * From 2cc85a11c767ee425042350c34712a4d6fba1abf Mon Sep 17 00:00:00 2001 From: Max Chadwick Date: Wed, 1 Nov 2017 20:52:40 -0400 Subject: [PATCH 3/9] Listen for exceptions and report to New Relic --- ...tApplicationHandledExceptionToNewRelic.php | 47 +++++++++++++++++++ .../Magento/NewRelicReporting/etc/events.xml | 3 ++ 2 files changed, 50 insertions(+) create mode 100644 app/code/Magento/NewRelicReporting/Model/Observer/ReportApplicationHandledExceptionToNewRelic.php diff --git a/app/code/Magento/NewRelicReporting/Model/Observer/ReportApplicationHandledExceptionToNewRelic.php b/app/code/Magento/NewRelicReporting/Model/Observer/ReportApplicationHandledExceptionToNewRelic.php new file mode 100644 index 0000000000000..32a64e61b6f99 --- /dev/null +++ b/app/code/Magento/NewRelicReporting/Model/Observer/ReportApplicationHandledExceptionToNewRelic.php @@ -0,0 +1,47 @@ +config = $config; + $this->newRelicWrapper = $newRelicWrapper; + } + + public function execute(Observer $observer) + { + if ($this->config->isNewRelicEnabled()) { + $exception = $observer->getEvent()->getException(); + $this->newRelicWrapper->reportError($exception); + } + } +} diff --git a/app/code/Magento/NewRelicReporting/etc/events.xml b/app/code/Magento/NewRelicReporting/etc/events.xml index 0fd7c4dab3a44..f1b467dfcd485 100644 --- a/app/code/Magento/NewRelicReporting/etc/events.xml +++ b/app/code/Magento/NewRelicReporting/etc/events.xml @@ -10,4 +10,7 @@ + + + From 01370500787b1a4c80b72c3061b83757bdd217f9 Mon Sep 17 00:00:00 2001 From: Max Chadwick Date: Thu, 2 Nov 2017 21:53:43 -0400 Subject: [PATCH 4/9] Fix indentation --- app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php b/app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php index 9064a5194bd05..845ed0429d2c3 100644 --- a/app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php +++ b/app/code/Magento/NewRelicReporting/Model/NewRelicWrapper.php @@ -37,7 +37,7 @@ public function addCustomParameter($param, $value) public function reportError($exception) { if (extension_loaded('newrelic')) { - newrelic_notice_error($exception->getMessage(), $exception); + newrelic_notice_error($exception->getMessage(), $exception); } } From 46a0c9d9d4f62ca9f44675142f8d88c1c188d72c Mon Sep 17 00:00:00 2001 From: Max Chadwick Date: Thu, 2 Nov 2017 21:55:19 -0400 Subject: [PATCH 5/9] Remove event dispatching --- lib/internal/Magento/Framework/App/Http.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/internal/Magento/Framework/App/Http.php b/lib/internal/Magento/Framework/App/Http.php index cd62f998352a5..3c6dee49f97b4 100644 --- a/lib/internal/Magento/Framework/App/Http.php +++ b/lib/internal/Magento/Framework/App/Http.php @@ -153,8 +153,6 @@ public function launch() */ public function catchException(Bootstrap $bootstrap, \Exception $exception) { - $this->_eventManager->dispatch('application_handled_exception', ['exception' => $exception]); - $result = $this->handleDeveloperMode($bootstrap, $exception) || $this->handleBootstrapErrors($bootstrap, $exception) || $this->handleSessionException($exception) From a9d408e4e15c16345fd88a2d5d7f84450e7fb043 Mon Sep 17 00:00:00 2001 From: Max Chadwick Date: Thu, 2 Nov 2017 21:56:24 -0400 Subject: [PATCH 6/9] Remove observer --- ...tApplicationHandledExceptionToNewRelic.php | 47 ------------------- .../Magento/NewRelicReporting/etc/events.xml | 3 -- 2 files changed, 50 deletions(-) delete mode 100644 app/code/Magento/NewRelicReporting/Model/Observer/ReportApplicationHandledExceptionToNewRelic.php diff --git a/app/code/Magento/NewRelicReporting/Model/Observer/ReportApplicationHandledExceptionToNewRelic.php b/app/code/Magento/NewRelicReporting/Model/Observer/ReportApplicationHandledExceptionToNewRelic.php deleted file mode 100644 index 32a64e61b6f99..0000000000000 --- a/app/code/Magento/NewRelicReporting/Model/Observer/ReportApplicationHandledExceptionToNewRelic.php +++ /dev/null @@ -1,47 +0,0 @@ -config = $config; - $this->newRelicWrapper = $newRelicWrapper; - } - - public function execute(Observer $observer) - { - if ($this->config->isNewRelicEnabled()) { - $exception = $observer->getEvent()->getException(); - $this->newRelicWrapper->reportError($exception); - } - } -} diff --git a/app/code/Magento/NewRelicReporting/etc/events.xml b/app/code/Magento/NewRelicReporting/etc/events.xml index f1b467dfcd485..0fd7c4dab3a44 100644 --- a/app/code/Magento/NewRelicReporting/etc/events.xml +++ b/app/code/Magento/NewRelicReporting/etc/events.xml @@ -10,7 +10,4 @@ - - - From a22b31bc81238cabac824ecc192a6268cc9c22b1 Mon Sep 17 00:00:00 2001 From: Max Chadwick Date: Thu, 2 Nov 2017 21:58:23 -0400 Subject: [PATCH 7/9] Implement plugin for handled exceptions --- .../NewRelicReporting/Plugin/HttpPlugin.php | 42 +++++++++++++++++++ app/code/Magento/NewRelicReporting/etc/di.xml | 3 ++ 2 files changed, 45 insertions(+) create mode 100644 app/code/Magento/NewRelicReporting/Plugin/HttpPlugin.php diff --git a/app/code/Magento/NewRelicReporting/Plugin/HttpPlugin.php b/app/code/Magento/NewRelicReporting/Plugin/HttpPlugin.php new file mode 100644 index 0000000000000..3c8ebbf02b660 --- /dev/null +++ b/app/code/Magento/NewRelicReporting/Plugin/HttpPlugin.php @@ -0,0 +1,42 @@ +config = $config; + $this->newRelicWrapper = $newRelicWrapper; + } + + public function beforeCatchException(Http $subject, $bootstrap, $exception) + { + if ($this->config->isNewRelicEnabled()) { + $this->newRelicWrapper->reportError($exception); + } + } +} diff --git a/app/code/Magento/NewRelicReporting/etc/di.xml b/app/code/Magento/NewRelicReporting/etc/di.xml index a0d06105dd3fe..cba92f91cd4bb 100644 --- a/app/code/Magento/NewRelicReporting/etc/di.xml +++ b/app/code/Magento/NewRelicReporting/etc/di.xml @@ -27,4 +27,7 @@ + + + From b9ee5930b82f640b8e16373dab164bd662906d1f Mon Sep 17 00:00:00 2001 From: Max Chadwick Date: Fri, 3 Nov 2017 18:16:34 -0400 Subject: [PATCH 8/9] Typehint params and add DocBlock --- .../Magento/NewRelicReporting/Plugin/HttpPlugin.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/NewRelicReporting/Plugin/HttpPlugin.php b/app/code/Magento/NewRelicReporting/Plugin/HttpPlugin.php index 3c8ebbf02b660..4cf2038018121 100644 --- a/app/code/Magento/NewRelicReporting/Plugin/HttpPlugin.php +++ b/app/code/Magento/NewRelicReporting/Plugin/HttpPlugin.php @@ -5,6 +5,7 @@ */ namespace Magento\NewRelicReporting\Plugin; +use Magento\Framework\App\Bootstrap; use Magento\Framework\App\Http; use Magento\NewRelicReporting\Model\Config; use Magento\NewRelicReporting\Model\NewRelicWrapper; @@ -33,7 +34,17 @@ public function __construct( $this->newRelicWrapper = $newRelicWrapper; } - public function beforeCatchException(Http $subject, $bootstrap, $exception) + /** + * Report exception to New Relic + * + * @param Http $subject + * @param Bootstrap $bootstrap + * @param \Exception $exception + * @return void + * + * @SuppressWarnings(PHPMD.UnusedFormalParameter) + */ + public function beforeCatchException(Http $subject, Bootstrap $bootstrap, \Exception $exception) { if ($this->config->isNewRelicEnabled()) { $this->newRelicWrapper->reportError($exception); From 6bc4fcf6d7dc6bb9383abd98302f350d13d3471d Mon Sep 17 00:00:00 2001 From: Max Chadwick Date: Sun, 5 Nov 2017 20:42:01 -0500 Subject: [PATCH 9/9] Make properties private --- app/code/Magento/NewRelicReporting/Plugin/HttpPlugin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/NewRelicReporting/Plugin/HttpPlugin.php b/app/code/Magento/NewRelicReporting/Plugin/HttpPlugin.php index 4cf2038018121..a37d93329d43a 100644 --- a/app/code/Magento/NewRelicReporting/Plugin/HttpPlugin.php +++ b/app/code/Magento/NewRelicReporting/Plugin/HttpPlugin.php @@ -15,12 +15,12 @@ class HttpPlugin /** * @var Config */ - protected $config; + private $config; /** * @var NewRelicWrapper */ - protected $newRelicWrapper; + private $newRelicWrapper; /** * @param Config $config