Move setting maxAttempt to when task is handled

Author: marickvantuil

src/CloudTasksQueue.php

@@ -60,10 +60,6 @@ protected function pushToCloudTasks($queue, $payload, $delay = 0, $attempts = 0)
         $httpRequest->setHttpMethod(HttpMethod::POST);
         $httpRequest->setBody($payload);
 
-        $httpRequest->setHeaders([
-            'X-Stackkit-Max-Attempts' => $this->getMaxAttempts($queueName),
-        ]);
-
         $task = $this->createTask();
         $task->setHttpRequest($httpRequest);
 
@@ -103,9 +99,4 @@ private function createTask()
     {
         return app(Task::class);
     }
-
-    private function getMaxAttempts($queue)
-    {
-        return $this->client->getQueue($queue)->getRetryConfig()->getMaxAttempts();
-    }
 }

src/TaskHandler.php

@@ -121,13 +121,27 @@ private function handleTask($task)
 
         $job->setAttempts(request()->header('X-CloudTasks-TaskRetryCount') + 1);
         $job->setQueue(request()->header('X-Cloudtasks-Queuename'));
-        $job->setMaxTries(request()->header('X-Stackkit-Max-Attempts'));
+        $job->setMaxTries($this->getQueueMaxTries($job));
 
         $worker = $this->getQueueWorker();
 
         $worker->process('cloudtasks', $job, new WorkerOptions());
     }
 
+    private function getQueueMaxTries(CloudTasksJob $job)
+    {
+        $queueName = $this->client->queueName(
+            Config::project(),
+            Config::location(),
+            $job->getQueue()
+        );
+
+        return $this->client
+            ->getQueue($queueName)
+            ->getRetryConfig()
+            ->getMaxAttempts();
+    }
+
     /**
      * @return Worker
      */