Fix e2e-cli error reporting and enable retry test suite

- Make error_handler log-only; determine success from enqueue/flush
  return values to avoid false failures from transient retry errors
- Wire maxRetries from input config to retry_count option
- Remove duplicate "Flush failed" in error output
- Enable retry test suite in e2e-config

Author: MichaelGHSeg

e2e-cli/e2e-config.json

@@ -1,6 +1,6 @@
 {
   "sdk": "php",
-  "test_suites": "basic",
+  "test_suites": "basic,retry",
   "auto_settings": false,
   "patch": null,
   "env": {}

e2e-cli/main.php

@@ -135,10 +135,9 @@ function parseHost(string $apiHost): string
  * Build the options array for Segment\Client.
  *
  * @param array<string,mixed>   $input
- * @param array<int,string>    &$errors   collected error messages
  * @return array<string,mixed>
  */
-function buildClientOptions(array $input, array &$errors): array
+function buildClientOptions(array $input): array
 {
     $config  = $input['config'] ?? [];
     $apiHost = $input['apiHost'] ?? '';
@@ -154,10 +153,11 @@ function buildClientOptions(array $input, array &$errors): array
         // mock test server (the base LibCurl hardcodes https://).
         'consumer'      => E2eLibCurl::class,
         'protocol'      => $scheme,
-        'error_handler' => function (int $code, string $message) use (&$errors): void {
-            $msg = "HTTP {$code}: {$message}";
-            debugLog('SDK error — ' . $msg);
-            $errors[] = $msg;
+        // Log HTTP errors to stderr only — success/failure is determined by
+        // track()/flush() return values, not by the error_handler callback,
+        // because handleError fires for transient retry errors too.
+        'error_handler' => function (int $code, string $message): void {
+            debugLog("SDK HTTP error {$code}: {$message}");
         },
     ];
 
@@ -176,6 +176,11 @@ function buildClientOptions(array $input, array &$errors): array
         debugLog('curl_timeout: ' . $options['curl_timeout']);
     }
 
+    if (isset($config['maxRetries']) && is_numeric($config['maxRetries'])) {
+        $options['retry_count'] = (int)$config['maxRetries'];
+        debugLog('retry_count: ' . $options['retry_count']);
+    }
+
     return $options;
 }
 
@@ -241,9 +246,10 @@ function buildMessage(array $event): array
 }
 
 $errors = [];
+$autoFlushFailed = false; // set true if an enqueue() auto-flush returns false
 
-// Build client options (error_handler captures into $errors by reference)
-$options = buildClientOptions($input, $errors);
+// Build client options (error_handler just logs; we track success via return values)
+$options = buildClientOptions($input);
 
 debugLog('Creating Segment\\Client with writeKey=' . substr($writeKey, 0, 4) . '...');
 
@@ -268,30 +274,35 @@ function buildMessage(array $event): array
 
         debugLog("  [{$seqIndex}/{$eventIndex}] Enqueueing {$type}");
 
+        $enqueueOk = true;
         switch ($type) {
             case 'track':
-                $client->track($message);
+                $enqueueOk = $client->track($message);
                 break;
             case 'identify':
-                $client->identify($message);
+                $enqueueOk = $client->identify($message);
                 break;
             case 'page':
-                $client->page($message);
+                $enqueueOk = $client->page($message);
                 break;
             case 'screen':
-                $client->screen($message);
+                $enqueueOk = $client->screen($message);
                 break;
             case 'alias':
-                $client->alias($message);
+                $enqueueOk = $client->alias($message);
                 break;
             case 'group':
-                $client->group($message);
+                $enqueueOk = $client->group($message);
                 break;
             default:
                 $errors[] = "Unknown event type: {$type}";
                 debugLog("  Unknown event type: {$type}");
                 break;
         }
+        if (!$enqueueOk) {
+            $autoFlushFailed = true;
+            debugLog("  Enqueue/auto-flush failed for {$type}");
+        }
     }
 }
 
@@ -306,14 +317,19 @@ function buildMessage(array $event): array
     $errors[] = 'Flush failed';
 }
 
-$hasErrors = !empty($errors);
-$success   = $flushOk && !$hasErrors;
+// Success = all flushes succeeded and no fatal errors.
+// auto-flushes (from enqueue when flush_at reached) and explicit flush are both tracked.
+$overallSuccess = $flushOk && !$autoFlushFailed && empty($errors);
 
-if ($success) {
+if ($overallSuccess) {
     outputResult(true, $sentBatches);
     exit(0);
 } else {
-    $errorMsg = implode('; ', $errors);
+    $allErrors = array_merge(
+        $errors,
+        $autoFlushFailed ? ['Auto-flush failed'] : []
+    );
+    $errorMsg = implode('; ', $allErrors ?: ['Unknown flush failure']);
     outputResult(false, $sentBatches, $errorMsg);
     exit(1);
 }

lib/Consumer/QueueConsumer.php

@@ -131,12 +131,10 @@ public function flush(): bool
                 return false;
             }
 
-            $success = $this->flushBatch($batch);
+            // Remove batch before sending — flushBatch() handles all retries internally
+            array_splice($this->queue, 0, $batchSize);
 
-            // Remove batch from queue only after successful send
-            if ($success) {
-                array_splice($this->queue, 0, $batchSize);
-            }
+            $success = $this->flushBatch($batch);
 
             $count = count($this->queue);