Fix: Metric Listener (#1)

Author: lucas-angeli-gimenes

src/Listener/MetricFlushListener.php

@@ -13,6 +13,7 @@
 use Hyperf\Event\Contract\ListenerInterface;
 use Hyperf\Framework\Event\BeforeWorkerStart;
 use OpenTelemetry\SDK\Metrics\MetricReaderInterface;
+use Hyperf\Command\Event\BeforeHandle;
 
 class MetricFlushListener implements ListenerInterface
 {
@@ -29,15 +30,12 @@ public function listen(): array
     {
         return [
             BeforeWorkerStart::class,
+            BeforeHandle::class,
         ];
     }
 
     public function process(object $event): void
     {
-        if ($event->workerId === null) {
-            return;
-        }
-
         $timerInterval = (int) $this->config->get(
             'open-telemetry.exporter.metrics.flush_interval',
             5

tests/Unit/Listener/MetricFlushListenerTest.php

@@ -4,16 +4,16 @@
 
 namespace Tests\Unit\Listener;
 
+use Hyperf\Command\Event\BeforeHandle;
 use Hyperf\Contract\ConfigInterface;
 use Hyperf\Contract\ContainerInterface;
 use Hyperf\Coordinator\Constants;
 use Hyperf\Coordinator\CoordinatorManager;
 use Hyperf\Coordinator\Timer;
 use Hyperf\Framework\Event\BeforeWorkerStart;
+use Hyperf\OpenTelemetry\Listener\MetricFlushListener;
 use OpenTelemetry\SDK\Metrics\MetricReaderInterface;
 use PHPUnit\Framework\TestCase;
-use Hyperf\OpenTelemetry\Listener\MetricFlushListener;
-use stdClass;
 use Swoole\Server;
 
 /**
@@ -55,19 +55,7 @@ public function testListenReturnsCorrectEvents(): void
     {
         $listener = new MetricFlushListener($this->container, $this->config);
 
-        $this->assertEquals([BeforeWorkerStart::class], $listener->listen());
-    }
-
-    public function testProcessWithNullWorkerIdShouldDoNothing(): void
-    {
-        $event = new stdClass();
-        $event->workerId = null;
-
-        $this->config->expects($this->never())->method('get');
-        $this->container->expects($this->never())->method('has');
-
-        $listener = new MetricFlushListener($this->container, $this->config);
-        $listener->process($event);
+        $this->assertEquals([BeforeWorkerStart::class, BeforeHandle::class], $listener->listen());
     }
 
     public function testProcessWithValidWorkerIdSetsUpTimer(): void