feat(tracer): implement proper SQL connection retry logic

Signed-off-by: Alexandre Rulleau <[email protected]>

Author: Leiyks

.gitlab/generate-package.php

@@ -998,7 +998,20 @@
     - sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo
     - sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo
     - sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo
-    - yum update -y --nogpgcheck
+    - |
+      # Retry yum update as vault.centos.org can be slow/unreliable
+      for i in 1 2 3; do
+        if yum update -y --nogpgcheck; then
+          echo "yum update succeeded on attempt $i"
+          break
+        fi
+        echo "yum update failed (attempt $i/3), retrying in 5 seconds..."
+        sleep 5
+        if [ $i -eq 3 ]; then
+          echo "yum update failed after 3 attempts, exiting"
+          exit 1
+        fi
+      done
 
 "verify debian":
   extends: .verify_job

tests/Integrations/Laravel/Octane/Latest/CommonScenariosTest.php

@@ -92,6 +92,14 @@ public function testScenarioGetReturnString()
             }
         }
 
+        $this->assertNotNull(
+            $webRequestTrace,
+            'Expected to find a laravel.request trace with App\\Http\\Controllers in resource, but none was found. '
+            . 'Available traces: ' . json_encode(array_map(function($t) {
+                return ['name' => $t[0]['name'] ?? 'N/A', 'resource' => $t[0]['resource'] ?? 'N/A'];
+            }, $traces))
+        );
+
         $this->assertFlameGraph([$webRequestTrace], [
             SpanAssertion::build(
                 'laravel.request',
@@ -134,7 +142,12 @@ public function testScenarioGetWithView()
 
             foreach ($traces as $trace) {
                 foreach ($trace as $span) {
-                    if ($span && isset($span["name"]) && $span["name"] === "laravel.request") {
+                    if ($span
+                        && isset($span["name"])
+                        && $span["name"] === "laravel.request"
+                        && isset($span["resource"])
+                        && str_contains($span["resource"], 'App\\Http\\Controllers')
+                    ) {
                         return true;
                     }
                 }
@@ -160,6 +173,14 @@ public function testScenarioGetWithView()
             }
         }
 
+        $this->assertNotNull(
+            $webRequestTrace,
+            'Expected to find a laravel.request trace with App\\Http\\Controllers in resource, but none was found. '
+            . 'Available traces: ' . json_encode(array_map(function($t) {
+                return ['name' => $t[0]['name'] ?? 'N/A', 'resource' => $t[0]['resource'] ?? 'N/A'];
+            }, $traces))
+        );
+
         $this->assertFlameGraph([$webRequestTrace], [
             SpanAssertion::build(
                 'laravel.request',
@@ -219,7 +240,12 @@ public function testScenarioGetWithException()
 
             foreach ($traces as $trace) {
                 foreach ($trace as $span) {
-                    if ($span && isset($span["name"]) && $span["name"] === "laravel.request") {
+                    if ($span
+                        && isset($span["name"])
+                        && $span["name"] === "laravel.request"
+                        && isset($span["resource"])
+                        && str_contains($span["resource"], 'App\\Http\\Controllers')
+                    ) {
                         return true;
                     }
                 }
@@ -245,6 +271,14 @@ public function testScenarioGetWithException()
             }
         }
 
+        $this->assertNotNull(
+            $webRequestTrace,
+            'Expected to find a laravel.request trace with App\\Http\\Controllers in resource, but none was found. '
+            . 'Available traces: ' . json_encode(array_map(function($t) {
+                return ['name' => $t[0]['name'] ?? 'N/A', 'resource' => $t[0]['resource'] ?? 'N/A'];
+            }, $traces))
+        );
+
         $this->assertFlameGraph([$webRequestTrace], [
             SpanAssertion::build(
                 'laravel.request',
@@ -312,6 +346,14 @@ public function testScenarioGetToMissingRoute()
             }
         }
 
+        $this->assertNotNull(
+            $webRequestTrace,
+            'Expected to find a laravel.request trace, but none was found. '
+            . 'Available traces: ' . json_encode(array_map(function($t) {
+                return ['name' => $t[0]['name'] ?? 'N/A', 'resource' => $t[0]['resource'] ?? 'N/A'];
+            }, $traces))
+        );
+
         $this->assertFlameGraph([$webRequestTrace], [
             SpanAssertion::build(
                 'laravel.request',

tests/Integrations/SQLSRV/SQLSRVTest.php

@@ -502,15 +502,41 @@ public function testNoFakeServices()
 
     private function createConnection()
     {
-        $conn = sqlsrv_connect(
-            self::$host . ', ' . self::$port,
-            [
-                'PWD' => self::$password,
-                'Database' => self::$db,
-                'UID' => self::$user,
-                'TrustServerCertificate' => true
-            ]
-        );
+        // Retry connection to handle SQL Server container startup time
+        $maxAttempts = 30;
+        $attempt = 0;
+        $conn = false;
+        $lastError = null;
+
+        while ($attempt < $maxAttempts && $conn === false) {
+            $attempt++;
+            $conn = sqlsrv_connect(
+                self::$host . ', ' . self::$port,
+                [
+                    'PWD' => self::$password,
+                    'Database' => self::$db,
+                    'UID' => self::$user,
+                    'TrustServerCertificate' => true,
+                    'LoginTimeout' => 2  // Shorter timeout per attempt
+                ]
+            );
+
+            if ($conn === false) {
+                $errors = sqlsrv_errors();
+                $lastError = $errors ? json_encode($errors) : 'Unknown error';
+
+                // Only retry on connection errors (timeout, network, server not ready)
+                if ($attempt < $maxAttempts) {
+                    usleep(500000); // 500ms between retries
+                }
+            }
+        }
+
+        if ($conn === false) {
+            throw new \RuntimeException(
+                "Failed to connect to SQL Server after {$maxAttempts} attempts. Last error: {$lastError}"
+            );
+        }
 
         return $conn;
     }