Move add task to monitor to service provider

Author: marickvantuil

src/CloudTasksQueue.php

@@ -120,13 +120,9 @@ protected function pushToCloudTasks($queue, $payload, $delay = 0)
             $task->setScheduleTime(new Timestamp(['seconds' => $availableAt]));
         }
 
-        if (CloudTasks::monitorEnabled()) {
-            MonitoringService::make()->addToMonitor($queue, $task);
-        }
-
         $createdTask = CloudTasksApi::createTask($queueName, $task);
 
-        event(new TaskCreated($createdTask));
+        event((new TaskCreated)->queue($queue)->task($createdTask));
     }
 
     private function withUuid(string $payload): string

src/CloudTasksServiceProvider.php

@@ -151,6 +151,14 @@ private function registerRoutes(Router $router): void
 
     private function registerMonitoring(): void
     {
+        app('events')->listen(TaskCreated::class, function (TaskCreated $event) {
+            if (CloudTasks::monitorDisabled()) {
+                return;
+            }
+
+            MonitoringService::make()->addToMonitor($event->queue, $event->task);
+        });
+
         app('events')->listen(JobFailed::class, function (JobFailed $event) {
             if (!$event->job instanceof CloudTasksJob) {
                 return;

src/TaskCreated.php

@@ -8,10 +8,20 @@
 
 class TaskCreated
 {
+    public string $queue;
     public Task $task;
 
-    public function __construct(Task $task)
+    public function task(Task $task): self
     {
         $this->task = $task;
+
+        return $this;
+    }
+
+    public function queue(string $queue): self
+    {
+        $this->queue = $queue;
+
+        return $this;
     }
 }