Merge pull request #11165 from notbakaneko/queue-datadog-log-command-…

…name

Use command name instead of display name in datadog metric

app/Providers/AppServiceProvider.php

@@ -64,7 +64,7 @@ public function boot()
                 $GLOBALS['cfg']['datadog-helper']['prefix_web'].'.queue.run',
                 1,
                 [
-                    'job' => $event->job->resolveName(),
+                    'job' => $event->job->payload()['data']['commandName'],
                     'queue' => $event->job->getQueue(),
                 ]
             );

tests/Jobs/JobNameTest.php

@@ -0,0 +1,28 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+declare(strict_types=1);
+
+namespace Tests\Jobs;
+
+use Illuminate\Queue\Events\JobProcessed;
+use Queue;
+use Tests\TestCase;
+
+class JobNameTest extends TestCase
+{
+    public function testDisplayName()
+    {
+        $job = new TestJob('test');
+
+        Queue::after(function (JobProcessed $event) use ($job) {
+            $payload = $event->job->payload();
+            $this->assertSame($job::class, $payload['data']['commandName']);
+            $this->assertSame($job->displayName(), $payload['displayName']);
+        });
+
+        dispatch($job);
+    }
+}

tests/Jobs/TestJob.php

@@ -0,0 +1,27 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+namespace Tests\Jobs;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+
+class TestJob implements ShouldQueue
+{
+    use Queueable;
+
+    public function __construct(private $name)
+    {
+    }
+
+    public function displayName()
+    {
+        return $this->name;
+    }
+
+    public function handle()
+    {
+    }
+}