Merge pull request #42 from CookiesEater/fix-41

Fixed default Sentry integrations

Author: CookiesEater

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change log
 
+## 1.5.1 - 2020-08-24
+### Fixed
+* Fix double sending of events to Sentry.
+* Fix event exclusion ("except" parameter).
+
 ## 1.5.0 - 2020-07-07
 1.5.0 released
 

src/SentryTarget.php

@@ -6,6 +6,12 @@
 
 namespace notamedia\sentry;
 
+use Sentry\ClientBuilder;
+use Sentry\Integration\ErrorListenerIntegration;
+use Sentry\Integration\ExceptionListenerIntegration;
+use Sentry\Integration\FatalErrorListenerIntegration;
+use Sentry\Integration\IntegrationInterface;
+use Sentry\SentrySdk;
 use Sentry\Severity;
 use Sentry\State\Scope;
 use Throwable;
@@ -47,7 +53,28 @@ public function __construct($config = [])
     {
         parent::__construct($config);
 
-        \Sentry\init(array_merge(['dsn' => $this->dsn], $this->clientOptions));
+        $userOptions = array_merge(['dsn' => $this->dsn], $this->clientOptions);
+        $builder = ClientBuilder::create($userOptions);
+
+        $options = $builder->getOptions();
+        $options->setIntegrations(static function (array $integrations) {
+            // Remove the default error and fatal exception listeners to let us handle those
+            return array_filter($integrations, static function (IntegrationInterface $integration): bool {
+                if ($integration instanceof ErrorListenerIntegration) {
+                    return false;
+                }
+                if ($integration instanceof ExceptionListenerIntegration) {
+                    return false;
+                }
+                if ($integration instanceof FatalErrorListenerIntegration) {
+                    return false;
+                }
+
+                return true;
+            });
+        });
+
+        SentrySdk::init()->bindClient($builder->getClient());
     }
 
     /**