From ced1938d43302de6b1636e39b8bf9f41d2d2528d Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Sun, 15 Feb 2026 13:48:01 +0100
Subject: [PATCH 1/2] chore: prepare for PR

---
 app/Traits/SshRetryable.php | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/app/Traits/SshRetryable.php b/app/Traits/SshRetryable.php
index a26481056..4366558ef 100644
--- a/app/Traits/SshRetryable.php
+++ b/app/Traits/SshRetryable.php
@@ -145,24 +145,21 @@ protected function trackSshRetryEvent(int $attempt, int $maxRetries, int $delay,
         }
 
         try {
-            app('sentry')->captureMessage(
-                'SSH connection retry triggered',
-                \Sentry\Severity::warning(),
-                [
-                    'extra' => [
-                        'attempt' => $attempt,
-                        'max_retries' => $maxRetries,
-                        'delay_seconds' => $delay,
-                        'error_message' => $errorMessage,
-                        'context' => $context,
-                        'retryable_error' => true,
-                    ],
-                    'tags' => [
-                        'component' => 'ssh_retry',
-                        'error_type' => 'connection_retry',
-                    ],
-                ]
-            );
+            \Sentry\withScope(function (\Sentry\State\Scope $scope) use ($attempt, $maxRetries, $delay, $errorMessage, $context): void {
+                $scope->setExtras([
+                    'attempt' => $attempt,
+                    'max_retries' => $maxRetries,
+                    'delay_seconds' => $delay,
+                    'error_message' => $errorMessage,
+                    'context' => $context,
+                    'retryable_error' => true,
+                ]);
+                $scope->setTags([
+                    'component' => 'ssh_retry',
+                    'error_type' => 'connection_retry',
+                ]);
+                \Sentry\captureMessage('SSH connection retry triggered', \Sentry\Severity::warning());
+            });
         } catch (\Throwable $e) {
             // Don't let Sentry tracking errors break the SSH retry flow
             Log::warning('Failed to track SSH retry event in Sentry', [

From c3f0ed30989b1cc6f1bc2d976fab88a9feefb763 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Sun, 15 Feb 2026 14:00:27 +0100
Subject: [PATCH 2/2] refactor(ssh-retry): remove Sentry tracking from retry
 logic

Remove the trackSshRetryEvent() method and its invocation from the SSH retry
flow. This simplifies the retry mechanism and reduces external dependencies for
retry handling.
---
 app/Traits/SshRetryable.php | 38 -------------------------------------
 1 file changed, 38 deletions(-)

diff --git a/app/Traits/SshRetryable.php b/app/Traits/SshRetryable.php
index 4366558ef..2092dc5f3 100644
--- a/app/Traits/SshRetryable.php
+++ b/app/Traits/SshRetryable.php
@@ -95,9 +95,6 @@ protected function executeWithSshRetry(callable $callback, array $context = [],
                 if ($this->isRetryableSshError($lastErrorMessage) && $attempt < $maxRetries - 1) {
                     $delay = $this->calculateRetryDelay($attempt);
 
-                    // Track SSH retry event in Sentry
-                    $this->trackSshRetryEvent($attempt + 1, $maxRetries, $delay, $lastErrorMessage, $context);
-
                     // Add deployment log if available (for ExecuteRemoteCommand trait)
                     if (isset($this->application_deployment_queue) && method_exists($this, 'addRetryLogEntry')) {
                         $this->addRetryLogEntry($attempt + 1, $maxRetries, $delay, $lastErrorMessage);
@@ -133,39 +130,4 @@ protected function executeWithSshRetry(callable $callback, array $context = [],
 
         return null;
     }
-
-    /**
-     * Track SSH retry event in Sentry
-     */
-    protected function trackSshRetryEvent(int $attempt, int $maxRetries, int $delay, string $errorMessage, array $context = []): void
-    {
-        // Only track in production/cloud instances
-        if (isDev() || ! config('constants.sentry.sentry_dsn')) {
-            return;
-        }
-
-        try {
-            \Sentry\withScope(function (\Sentry\State\Scope $scope) use ($attempt, $maxRetries, $delay, $errorMessage, $context): void {
-                $scope->setExtras([
-                    'attempt' => $attempt,
-                    'max_retries' => $maxRetries,
-                    'delay_seconds' => $delay,
-                    'error_message' => $errorMessage,
-                    'context' => $context,
-                    'retryable_error' => true,
-                ]);
-                $scope->setTags([
-                    'component' => 'ssh_retry',
-                    'error_type' => 'connection_retry',
-                ]);
-                \Sentry\captureMessage('SSH connection retry triggered', \Sentry\Severity::warning());
-            });
-        } catch (\Throwable $e) {
-            // Don't let Sentry tracking errors break the SSH retry flow
-            Log::warning('Failed to track SSH retry event in Sentry', [
-                'error' => $e->getMessage(),
-                'original_attempt' => $attempt,
-            ]);
-        }
-    }
 }