Fixed: Hyperf Commands Shutdown (#26)

Author: lucas-angeli-gimenes

src/Listener/OtelShutdownListener.php

@@ -4,6 +4,7 @@
 
 namespace Hyperf\OpenTelemetry\Listener;
 
+use Hyperf\Command\Event\AfterExecute;
 use Hyperf\Contract\StdoutLoggerInterface;
 use Hyperf\Coroutine\Coroutine;
 use Hyperf\Event\Contract\ListenerInterface;
@@ -25,6 +26,7 @@ public function listen(): array
     {
         return [
             OnWorkerExit::class,
+            AfterExecute::class,
         ];
     }
 

src/SpanProcessor/ChannelBatchSpanProcessor.php

@@ -49,19 +49,6 @@ public function __construct(
     ) {
     }
 
-    private function ensureInitialized(): void
-    {
-        if ($this->initialized) {
-            return;
-        }
-
-        $this->initialized = true;
-        $this->exportContext = Context::getCurrent();
-        $this->channel = new Channel($this->channelCapacity);
-        $this->startConsumer();
-        $this->startFlushTimer();
-    }
-
     public function onStart(ReadWriteSpanInterface $span, ContextInterface $parentContext): void
     {
     }
@@ -116,6 +103,19 @@ public function shutdown(?CancellationInterface $cancellation = null): bool
         return $this->exporter->shutdown($cancellation);
     }
 
+    private function ensureInitialized(): void
+    {
+        if ($this->initialized) {
+            return;
+        }
+
+        $this->initialized = true;
+        $this->exportContext = Context::getCurrent();
+        $this->channel = new Channel($this->channelCapacity);
+        $this->startConsumer();
+        $this->startFlushTimer();
+    }
+
     private function pushBatch(): void
     {
         if ($this->batch === [] || $this->channel === null) {

tests/Unit/Listener/OtelShutdownListenerTest.php

@@ -4,6 +4,7 @@
 
 namespace Tests\Unit\Listener;
 
+use Hyperf\Command\Event\AfterExecute;
 use Hyperf\Contract\StdoutLoggerInterface;
 use Hyperf\Event\Contract\ListenerInterface;
 use Hyperf\Framework\Event\OnWorkerExit;
@@ -36,7 +37,7 @@ public function testListensToOnWorkerExit(): void
             $this->createMock(TracerProviderInterface::class),
             $this->createMock(StdoutLoggerInterface::class)
         );
-        $this->assertSame([OnWorkerExit::class], $listener->listen());
+        $this->assertSame([OnWorkerExit::class, AfterExecute::class], $listener->listen());
     }
 
     public function testProcessCallsShutdownInsideCoroutine(): void