Provide fallback for older style jobs and ensure their attempt number is not lost

Author: marickvantuil

src/TaskHandler.php

@@ -122,7 +122,16 @@ private function handleTask(array $task): void
 
         $this->loadQueueRetryConfig($job);
 
-        $job->setAttempts($task['internal']['attempts']);
+        // If the task has a [X-CloudTasks-TaskRetryCount] header higher than 0, then
+        // we know the job was created using an earlier version of the package. This
+        // job does not have the attempts tracked internally yet.
+        $taskRetryCountHeader = request()->header('X-CloudTasks-TaskRetryCount');
+        if ($taskRetryCountHeader && (int) $taskRetryCountHeader > 0) {
+            $job->setAttempts((int) $taskRetryCountHeader);
+        } else {
+            $job->setAttempts($task['internal']['attempts']);
+        }
+
         $job->setMaxTries($this->retryConfig->getMaxAttempts());
 
         // If the job is being attempted again we also check if a

tests/QueueTest.php

@@ -389,7 +389,6 @@ public function test_failing_method_on_job()
         // Arrange
         CloudTasksApi::fake();
         CloudTasksApi::partialMock()->shouldReceive('getRetryConfig')->andReturn(
-        // -1 is a valid option in Cloud Tasks to indicate there is no max.
             (new RetryConfig())->setMaxAttempts(1)
         );
 

tests/TaskHandlerTest.php

@@ -439,7 +439,6 @@ public function failing_jobs_are_released()
     public function attempts_are_tracked_internally()
     {
         // Arrange
-        CloudTasksApi::fake();
         OpenIdVerificator::fake();
         Event::fake($this->getJobReleasedAfterExceptionEvent());
 
@@ -459,4 +458,23 @@ public function attempts_are_tracked_internally()
             return $event->job->attempts() === 2;
         });
     }
+
+    /**
+     * @test
+     */
+    public function attempts_are_copied_from_x_header()
+    {
+        // Arrange
+        OpenIdVerificator::fake();
+        Event::fake([JobProcessing::class]);
+
+        // Act & Assert
+        $job = $this->dispatch(new SimpleJob());
+        request()->headers->set('X-CloudTasks-TaskRetryCount', 6);
+        $job->run();
+
+        Event::assertDispatched(JobProcessing::class, function (JobProcessing $event) {
+            return $event->job->attempts() === 7;
+        });
+    }
 }