Merge pull request #159 from silinternational/release/5.1.0

Release 5.1.0 - Use Sentry monitor service
silinternational · Nov 21, 2023 · bf22519 · bf22519
2 parents 177509d + 14adb6f
commit bf22519
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,6 +19,7 @@ google-auth.json
 
 # PHP-CS-Fixer cache file.
 .php_cs.cache
+.php-cs-fixer.cache
 
 dockercfg
 

diff --git a/application/common/config/main.php b/application/common/config/main.php
@@ -131,7 +131,7 @@
                     'clientOptions' => [
                         'attach_stacktrace' => false, // stack trace identifies the logger call stack, not helpful
                         'environment' => YII_ENV,
-                        'release' => 'idp-id-sync@5.0.0',
+                        'release' => 'idp-id-sync@5.1.0',
                         'before_send' => function (Event $event) use ($idpName): ?Event {
                             $event->setExtra(['idp' => $idpName]);
                             return $event;
@@ -147,5 +147,6 @@
         'syncSafetyCutoff' => Env::get('SYNC_SAFETY_CUTOFF'),
         'allowEmptyEmail' => Env::get('ALLOW_EMPTY_EMAIL', false),
         'enableNewUserNotification' => Env::get('ENABLE_NEW_USER_NOTIFICATION', false),
+        'sentryMonitorSlug' => Env::get('SENTRY_MONITOR_SLUG', 'idp-id-sync'),
     ],
 ];
diff --git a/application/composer.json b/application/composer.json
@@ -23,7 +23,8 @@
     "guzzlehttp/guzzle": "^6.2",
     "google/apiclient": "^2.0",
     "codemix/yii2-streamlog": "^1.3",
-    "notamedia/yii2-sentry": "^1.7"
+    "notamedia/yii2-sentry": "^1.7",
+    "sentry/sentry": "^3.22"
   },
   "require-dev": {
     "behat/behat": "^3.3",

diff --git a/application/composer.lock b/application/composer.lock
diff --git a/application/console/controllers/BatchController.php b/application/console/controllers/BatchController.php
@@ -2,17 +2,32 @@
 
 namespace Sil\Idp\IdSync\console\controllers;
 
+use Sentry\CheckInStatus;
 use Sil\Idp\IdSync\common\traits\SyncProvider;
+use Yii;
 use yii\console\Controller;
 
+use function Sentry\captureCheckIn;
+
 class BatchController extends Controller
 {
     use SyncProvider;
 
     public function actionFull()
     {
+        $checkInId = captureCheckIn(
+            slug: Yii::$app->params['sentryMonitorSlug'],
+            status: CheckInStatus::inProgress()
+        );
+
         $synchronizer = $this->getSynchronizer();
         $synchronizer->syncAllNotifyException();
+
+        captureCheckIn(
+            slug: Yii::$app->params['sentryMonitorSlug'],
+            status: CheckInStatus::ok(),
+            checkInId: $checkInId,
+        );
     }
 
     /**
@@ -21,7 +36,21 @@ public function actionFull()
      */
     public function actionIncremental()
     {
+        $checkInId = captureCheckIn(
+            slug: Yii::$app->params['sentryMonitorSlug'],
+            status: CheckInStatus::inProgress()
+        );
+
         $synchronizer = $this->getSynchronizer();
         $synchronizer->syncUsersChangedSince(strtotime('-11 minutes'));
+
+        $synchronizer = $this->getSynchronizer();
+        $synchronizer->syncAllNotifyException();
+
+        captureCheckIn(
+            slug: Yii::$app->params['sentryMonitorSlug'],
+            status: CheckInStatus::ok(),
+            checkInId: $checkInId,
+        );
     }
 }
diff --git a/local.env.dist b/local.env.dist
@@ -77,6 +77,9 @@ ID_STORE_ADAPTER=
 # To use Sentry for error alerting, obtain DSN from Sentry dashboard: Settings - Projects - (project) - Client Keys
 SENTRY_DSN=
 
+# To use Sentry monitor service, create a monitor and enter the slug value here
+SENTRY_MONITOR_SLUG=
+
 ## [prod|dev|test], app defaults to prod
 #APP_ENV=