Add support for failure_issue_threshold & recovery_threshold (#838)

getsentry · Jan 23, 2024 · 8919f41 · 8919f41
1 parent fbcd9bd
commit 8919f41
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 10 deletions.
diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
     "require": {
         "php": "^7.2 | ^8.0",
         "illuminate/support": "^6.0 | ^7.0 | ^8.0 | ^9.0 | ^10.0",
-        "sentry/sentry": "^4.3",
+        "sentry/sentry": "^4.4",
         "symfony/psr-http-message-bridge": "^1.0 | ^2.0 | ^6.0 | ^7.0",
         "nyholm/psr7": "^1.0"
     },

diff --git a/src/Sentry/Laravel/Features/ConsoleIntegration.php b/src/Sentry/Laravel/Features/ConsoleIntegration.php
@@ -42,8 +42,24 @@ public function onBoot(Cache $cache): void
     {
         $this->cache = $cache;
 
-        $startCheckIn = function (?string $slug, SchedulingEvent $scheduled, ?int $checkInMargin, ?int $maxRuntime, bool $updateMonitorConfig) {
-            $this->startCheckIn($slug, $scheduled, $checkInMargin, $maxRuntime, $updateMonitorConfig);
+        $startCheckIn = function (
+            ?string $slug,
+            SchedulingEvent $scheduled,
+            ?int $checkInMargin,
+            ?int $maxRuntime,
+            bool $updateMonitorConfig,
+            ?int $failureIssueThreshold,
+            ?int $recoveryThreshold
+        ) {
+            $this->startCheckIn(
+                $slug,
+                $scheduled,
+                $checkInMargin,
+                $maxRuntime,
+                $updateMonitorConfig,
+                $failureIssueThreshold,
+                $recoveryThreshold
+            );
         };
         $finishCheckIn = function (?string $slug, SchedulingEvent $scheduled, CheckInStatus $status) {
             $this->finishCheckIn($slug, $scheduled, $status);
@@ -53,17 +69,35 @@ public function onBoot(Cache $cache): void
             ?string $monitorSlug = null,
             ?int $checkInMargin = null,
             ?int $maxRuntime = null,
-            bool $updateMonitorConfig = true
+            bool $updateMonitorConfig = true,
+            ?int $failureIssueThreshold = null,
+            ?int $recoveryThreshold = null
         ) use ($startCheckIn, $finishCheckIn) {
             /** @var SchedulingEvent $this */
             if ($monitorSlug === null && $this->command === null) {
                 throw new RuntimeException('The command string is null, please set a slug manually for this scheduled command using the `sentryMonitor(\'your-monitor-slug\')` macro.');
             }
 
             return $this
-                ->before(function () use ($startCheckIn, $monitorSlug, $checkInMargin, $maxRuntime, $updateMonitorConfig) {
+                ->before(function () use (
+                    $startCheckIn,
+                    $monitorSlug,
+                    $checkInMargin,
+                    $maxRuntime,
+                    $updateMonitorConfig,
+                    $failureIssueThreshold,
+                    $recoveryThreshold
+                ) {
                     /** @var SchedulingEvent $this */
-                    $startCheckIn($monitorSlug, $this, $checkInMargin, $maxRuntime, $updateMonitorConfig);
+                    $startCheckIn(
+                        $monitorSlug,
+                        $this,
+                        $checkInMargin,
+                        $maxRuntime,
+                        $updateMonitorConfig,
+                        $failureIssueThreshold,
+                        $recoveryThreshold
+                    );
                 })
                 ->onSuccess(function () use ($finishCheckIn, $monitorSlug) {
                     /** @var SchedulingEvent $this */
@@ -83,14 +117,23 @@ public function onBootInactive(): void
             ?string $monitorSlug = null,
             ?int $checkInMargin = null,
             ?int $maxRuntime = null,
-            bool $updateMonitorConfig = true
+            bool $updateMonitorConfig = true,
+            ?int $failureIssueThreshold = null,
+            ?int $recoveryThreshold = null
         ) {
             return $this;
         });
     }
 
-    private function startCheckIn(?string $slug, SchedulingEvent $scheduled, ?int $checkInMargin, ?int $maxRuntime, bool $updateMonitorConfig): void
-    {
+    private function startCheckIn(
+        ?string $slug,
+        SchedulingEvent $scheduled,
+        ?int $checkInMargin,
+        ?int $maxRuntime,
+        bool $updateMonitorConfig,
+        ?int $failureIssueThreshold,
+        ?int $recoveryThreshold
+    ): void {
         $checkInSlug = $slug ?? $this->makeSlugForScheduled($scheduled);
 
         $checkIn = $this->createCheckIn($checkInSlug, CheckInStatus::inProgress());
@@ -106,7 +149,9 @@ private function startCheckIn(?string $slug, SchedulingEvent $scheduled, ?int $c
                 MonitorSchedule::crontab($scheduled->getExpression()),
                 $checkInMargin,
                 $maxRuntime,
-                $timezone
+                $timezone,
+                $failureIssueThreshold,
+                $recoveryThreshold
             ));
         }