Merge pull request #175 from silinternational/sentry

Sentry
silinternational · Dec 12, 2024 · 3828e81 · 3828e81
2 parents b779da0 + f9983c7
commit 3828e81
Show file tree

Hide file tree

Showing 4 changed files with 91 additions and 78 deletions.
diff --git a/application/common/config/main.php b/application/common/config/main.php
@@ -1,6 +1,5 @@
 <?php
 
-use notamedia\sentry\SentryTarget;
 use Sentry\Event;
 use Sil\Idp\IdSync\common\components\IdBrokerBase;
 use Sil\Idp\IdSync\common\components\IdStoreBase;
@@ -9,6 +8,7 @@
 use Sil\JsonLog\target\EmailServiceTarget;
 use Sil\JsonLog\target\JsonStreamTarget;
 use Sil\PhpEnv\Env;
+use Sil\Sentry\SentryTarget;
 use yii\helpers\ArrayHelper;
 use yii\helpers\Json;
 
@@ -126,7 +126,20 @@
                     'enabled' => !empty(Env::get('SENTRY_DSN')),
                     'dsn' => Env::get('SENTRY_DSN'),
                     'levels' => ['error'],
+                    'except' => [
+                        'yii\web\HttpException:400',
+                        'yii\web\HttpException:401',
+                        'yii\web\HttpException:404',
+                        'yii\web\HttpException:409',
+                        'yii\web\HttpException:422',
+                        'yii\web\HttpException:502',
+                        'Sil\EmailService\Client\EmailServiceClientException',
+                    ],
                     'context' => true,
+                    'tagCallback' => function ($tags) use ($idpName): array {
+                        $tags['idp'] = $idpName;
+                        return $tags;
+                    },
                     // Additional options for `Sentry\init`
                     // https://docs.sentry.io/platforms/php/configuration/options
                     'clientOptions' => [

diff --git a/application/composer.json b/application/composer.json
@@ -23,8 +23,8 @@
     "guzzlehttp/guzzle": "^6.2",
     "google/apiclient": "^2.0",
     "codemix/yii2-streamlog": "^1.3",
-    "notamedia/yii2-sentry": "^1.7",
-    "sentry/sentry": "^3.22"
+    "sentry/sentry": "^3.22",
+    "silinternational/yii2-sentry": "^2.0"
   },
   "require-dev": {
     "behat/behat": "^3.3",

diff --git a/application/composer.lock b/application/composer.lock
diff --git a/application/dependencies.json b/application/dependencies.json
@@ -87,10 +87,6 @@
     "name": "monolog/monolog",
     "version": "2.9.3"
   },
-  {
-    "name": "notamedia/yii2-sentry",
-    "version": "1.7.0"
-  },
   {
     "name": "paragonie/constant_time_encoding",
     "version": "v3.0.0"
@@ -195,6 +191,10 @@
     "name": "silinternational/yii2-json-log-targets",
     "version": "2.1.0"
   },
+  {
+    "name": "silinternational/yii2-sentry",
+    "version": "2.0.0"
+  },
   {
     "name": "swiftmailer/swiftmailer",
     "version": "v6.3.0"
@@ -205,11 +205,11 @@
   },
   {
     "name": "symfony/http-client",
-    "version": "v6.4.10"
+    "version": "v6.4.16"
   },
   {
     "name": "symfony/http-client-contracts",
-    "version": "v3.5.0"
+    "version": "v3.5.1"
   },
   {
     "name": "symfony/options-resolver",