Fix finding the operation definition node on the query

getsentry · Apr 12, 2024 · b2e85b3 · b2e85b3
1 parent 054e0d6
commit b2e85b3
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/src/Sentry/Laravel/Tracing/Integrations/LighthouseIntegration.php b/src/Sentry/Laravel/Tracing/Integrations/LighthouseIntegration.php
@@ -125,10 +125,9 @@ public function handleStartExecution(StartExecution $startExecution): void
             return;
         }
 
-        /** @var \GraphQL\Language\AST\OperationDefinitionNode|null $operationDefinition */
-        $operationDefinition = $startExecution->query->definitions[0] ?? null;
+        $operationDefinition = $this->extractOperationDefinitionNode($startExecution->query);
 
-        if (!$operationDefinition instanceof OperationDefinitionNode) {
+        if ($operationDefinition === null) {
             return;
         }
 
@@ -239,6 +238,17 @@ private function extractOperationNames(OperationDefinitionNode $operation): arra
         return $selectionSet;
     }
 
+    private function extractOperationDefinitionNode(DocumentNode $query): ?OperationDefinitionNode
+    {
+        foreach ($query->definitions as $definition) {
+            if ($definition instanceof OperationDefinitionNode) {
+                return $definition;
+            }
+        }
+
+        return null;
+    }
+
     private function isApplicable(): bool
     {
         if (!class_exists(StartRequest::class) || !class_exists(StartExecution::class)) {