feat: remove execution if a given operation completes with an exception

ExpediaGroup · Jul 11, 2024 · 8d615b9 · 8d615b9
1 parent c8e9366
commit 8d615b9
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/...up/graphql/dataloader/instrumentation/syncexhaustion/state/SyncExecutionExhaustedState.kt b/...up/graphql/dataloader/instrumentation/syncexhaustion/state/SyncExecutionExhaustedState.kt
@@ -52,6 +52,7 @@ class SyncExecutionExhaustedState(
      * for example:
      * - parsing, validation errors
      * - persisted query errors
+     * - an exception during execution was thrown
      */
     private fun removeExecution(executionId: ExecutionId) {
         if (executions.containsKey(executionId)) {
@@ -74,10 +75,8 @@ class SyncExecutionExhaustedState(
         }
         return object : SimpleInstrumentationContext<ExecutionResult>() {
             override fun onCompleted(result: ExecutionResult?, t: Throwable?) {
-                result?.let {
-                    if (result.errors.size > 0) {
-                        removeExecution(parameters.executionInput.executionId)
-                    }
+                if ((result != null && result.errors.size > 0) || t != null) {
+                    removeExecution(parameters.executionInput.executionId)
                 }
             }
         }