From e84f72d32f2261de08875615b76f2175d5c1e3c7 Mon Sep 17 00:00:00 2001
From: briskt <3172830+briskt@users.noreply.github.com>
Date: Wed, 11 Dec 2024 17:56:15 +0800
Subject: [PATCH 1/3] don't report user errors to Sentry

---
 application/common/config/main.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/application/common/config/main.php b/application/common/config/main.php
index 39f5a10..b58b3a2 100644
--- a/application/common/config/main.php
+++ b/application/common/config/main.php
@@ -126,6 +126,15 @@
                     '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,
                     // Additional options for `Sentry\init`
                     // https://docs.sentry.io/platforms/php/configuration/options

From d1b713668673acc5ec109c1e2a973bc81024ad24 Mon Sep 17 00:00:00 2001
From: briskt <3172830+briskt@users.noreply.github.com>
Date: Wed, 11 Dec 2024 17:57:21 +0800
Subject: [PATCH 2/3] replace notamedia/yii2-sentry with
 silinternational/yii2-sentry

---
 application/common/config/main.php |   2 +-
 application/composer.json          |   4 +-
 application/composer.lock          | 138 ++++++++++++++---------------
 application/dependencies.json      |  12 +--
 4 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/application/common/config/main.php b/application/common/config/main.php
index b58b3a2..f0b4b93 100644
--- 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;
 
diff --git a/application/composer.json b/application/composer.json
index 873b15e..22589cf 100644
--- 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
index a293c46..d376278 100644
--- a/application/composer.lock
+++ b/application/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "1894856972ae17381c9546f46f8c2659",
+    "content-hash": "5384e6ee9842f69a8a1175cf25d55ff2",
     "packages": [
         {
             "name": "bower-asset/inputmask",
@@ -1439,57 +1439,6 @@
             ],
             "time": "2024-04-12T20:52:51+00:00"
         },
-        {
-            "name": "notamedia/yii2-sentry",
-            "version": "1.7.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/notamedia/yii2-sentry.git",
-                "reference": "24c1be71f2f9193c3c62b2def3fc4b32b3276c1b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/notamedia/yii2-sentry/zipball/24c1be71f2f9193c3c62b2def3fc4b32b3276c1b",
-                "reference": "24c1be71f2f9193c3c62b2def3fc4b32b3276c1b",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2|^8.0",
-                "sentry/sdk": "^3.0",
-                "yiisoft/yii2": "^2.0"
-            },
-            "require-dev": {
-                "codeception/codeception": "^4.0",
-                "codeception/module-asserts": "^1.3",
-                "codeception/module-yii2": "^1.1"
-            },
-            "type": "yii2-extension",
-            "extra": {
-                "asset-vcs-driver-options": {
-                    "github-no-api": true
-                },
-                "asset-pattern-skip-version": "(-build|-patch)"
-            },
-            "autoload": {
-                "psr-4": {
-                    "notamedia\\sentry\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "Yii2 logger for Sentry",
-            "keywords": [
-                "sentry",
-                "yii2"
-            ],
-            "support": {
-                "issues": "https://github.com/notamedia/yii2-sentry/issues",
-                "source": "https://github.com/notamedia/yii2-sentry/tree/1.7.0"
-            },
-            "time": "2021-01-12T15:17:45+00:00"
-        },
         {
             "name": "paragonie/constant_time_encoding",
             "version": "v3.0.0",
@@ -3769,6 +3718,57 @@
             },
             "time": "2022-08-30T13:18:23+00:00"
         },
+        {
+            "name": "silinternational/yii2-sentry",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/silinternational/yii2-sentry.git",
+                "reference": "aab2db6897eecb51bfdff58708988a0470f1d516"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/silinternational/yii2-sentry/zipball/aab2db6897eecb51bfdff58708988a0470f1d516",
+                "reference": "aab2db6897eecb51bfdff58708988a0470f1d516",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "php": "^7.2|^8.0",
+                "sentry/sdk": "^3.0",
+                "yiisoft/yii2": "^2.0"
+            },
+            "require-dev": {
+                "codeception/codeception": "^4.0",
+                "codeception/module-asserts": "^1.3",
+                "codeception/module-yii2": "^1.1"
+            },
+            "type": "yii2-extension",
+            "extra": {
+                "asset-vcs-driver-options": {
+                    "github-no-api": true
+                },
+                "asset-pattern-skip-version": "(-build|-patch)"
+            },
+            "autoload": {
+                "psr-4": {
+                    "Sil\\Sentry\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Yii2 logger for Sentry",
+            "keywords": [
+                "sentry",
+                "yii2"
+            ],
+            "support": {
+                "source": "https://github.com/silinternational/yii2-sentry/tree/2.0.0"
+            },
+            "time": "2024-12-11T07:18:11+00:00"
+        },
         {
             "name": "swiftmailer/swiftmailer",
             "version": "v6.3.0",
@@ -3914,23 +3914,23 @@
         },
         {
             "name": "symfony/http-client",
-            "version": "v6.4.10",
+            "version": "v6.4.16",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-client.git",
-                "reference": "b5e498f763e0bf5eed8dcd946e50a3b3f71d4ded"
+                "reference": "60a113666fa67e598abace38e5f46a0954d8833d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-client/zipball/b5e498f763e0bf5eed8dcd946e50a3b3f71d4ded",
-                "reference": "b5e498f763e0bf5eed8dcd946e50a3b3f71d4ded",
+                "url": "https://api.github.com/repos/symfony/http-client/zipball/60a113666fa67e598abace38e5f46a0954d8833d",
+                "reference": "60a113666fa67e598abace38e5f46a0954d8833d",
                 "shasum": ""
             },
             "require": {
                 "php": ">=8.1",
                 "psr/log": "^1|^2|^3",
                 "symfony/deprecation-contracts": "^2.5|^3",
-                "symfony/http-client-contracts": "^3.4.1",
+                "symfony/http-client-contracts": "~3.4.3|^3.5.1",
                 "symfony/service-contracts": "^2.5|^3"
             },
             "conflict": {
@@ -3987,7 +3987,7 @@
                 "http"
             ],
             "support": {
-                "source": "https://github.com/symfony/http-client/tree/v6.4.10"
+                "source": "https://github.com/symfony/http-client/tree/v6.4.16"
             },
             "funding": [
                 {
@@ -4003,20 +4003,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-07-15T09:26:24+00:00"
+            "time": "2024-11-27T11:52:33+00:00"
         },
         {
             "name": "symfony/http-client-contracts",
-            "version": "v3.5.0",
+            "version": "v3.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-client-contracts.git",
-                "reference": "20414d96f391677bf80078aa55baece78b82647d"
+                "reference": "c2f3ad828596624ca39ea40f83617ef51ca8bbf9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/20414d96f391677bf80078aa55baece78b82647d",
-                "reference": "20414d96f391677bf80078aa55baece78b82647d",
+                "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/c2f3ad828596624ca39ea40f83617ef51ca8bbf9",
+                "reference": "c2f3ad828596624ca39ea40f83617ef51ca8bbf9",
                 "shasum": ""
             },
             "require": {
@@ -4024,12 +4024,12 @@
             },
             "type": "library",
             "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
                 "branch-alias": {
                     "dev-main": "3.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
                 }
             },
             "autoload": {
@@ -4065,7 +4065,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/http-client-contracts/tree/v3.5.0"
+                "source": "https://github.com/symfony/http-client-contracts/tree/v3.5.1"
             },
             "funding": [
                 {
@@ -4081,7 +4081,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-18T09:32:20+00:00"
+            "time": "2024-11-25T12:02:18+00:00"
         },
         {
             "name": "symfony/options-resolver",
diff --git a/application/dependencies.json b/application/dependencies.json
index 150f157..23360a0 100644
--- 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",

From f9983c7e201150355b6febbb2aaba41c680d8945 Mon Sep 17 00:00:00 2001
From: briskt <3172830+briskt@users.noreply.github.com>
Date: Wed, 11 Dec 2024 17:57:45 +0800
Subject: [PATCH 3/3] add 'idp' tag to Sentry config

---
 application/common/config/main.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/application/common/config/main.php b/application/common/config/main.php
index f0b4b93..cc821f2 100644
--- a/application/common/config/main.php
+++ b/application/common/config/main.php
@@ -136,6 +136,10 @@
                         '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' => [