Fix Laravel Octane flakiness

DataDog · Jan 21, 2025 · e1be028 · e1be028
1 parent f1508ab
commit e1be028
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/tests/Integrations/Laravel/Octane/CommonScenariosTest.php b/tests/Integrations/Laravel/Octane/CommonScenariosTest.php
@@ -85,7 +85,7 @@ public function testScenarioGetReturnString()
 
         $webRequestTrace = null;
         foreach ($traces as $trace) {
-            if ($trace[0]["name"] === "laravel.request") {
+            if ($trace[0]["name"] === "laravel.request" && str_contains($trace[0]["resource"], 'App\\Http\\Controllers')) {
                 $webRequestTrace = $trace;
             }
         }
@@ -152,7 +152,7 @@ public function testScenarioGetWithView()
 
         $webRequestTrace = null;
         foreach ($traces as $trace) {
-            if ($trace[0]["name"] === "laravel.request") {
+            if ($trace[0]["name"] === "laravel.request" && str_contains($trace[0]["resource"], 'App\\Http\\Controllers')) {
                 $webRequestTrace = $trace;
             }
         }
@@ -236,7 +236,7 @@ public function testScenarioGetWithException()
 
         $webRequestTrace = null;
         foreach ($traces as $trace) {
-            if ($trace[0]["name"] === "laravel.request") {
+            if ($trace[0]["name"] === "laravel.request" && str_contains($trace[0]["resource"], 'App\\Http\\Controllers')) {
                 $webRequestTrace = $trace;
             }
         }
@@ -282,7 +282,7 @@ public function testScenarioGetToMissingRoute()
 
             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" && $span["resource"] === 'GET /does_not_exist') {
                         return true;
                     }
                 }