multi client configuration

Author: ASKozienko

pkg/enqueue-bundle/DependencyInjection/EnqueueExtension.php

@@ -86,11 +86,25 @@ public function load(array $configs, ContainerBuilder $container): void
             }
         }
 
+        $defaultClient = null;
+        if (in_array($defaultName, $clientNames, true)) {
+            $defaultClient = $defaultName;
+        }
+
         $container->setParameter('enqueue.transports', $transportNames);
         $container->setParameter('enqueue.clients', $clientNames);
 
+        $container->setParameter('enqueue.default_transport', $defaultName);
+
+        if ($defaultClient) {
+            $container->setParameter('enqueue.default_client', $defaultClient);
+        }
+
+        if ($defaultClient) {
+            $this->setupAutowiringForDefaultClientsProcessors($container, $defaultClient);
+        }
+
         $this->loadMessageQueueCollector($config, $container);
-        $this->setupAutowiringForProcessors($config, $container);
         $this->loadAsyncCommands($config, $container);
 
         // extensions
@@ -167,31 +181,18 @@ private function registerJobQueueDoctrineEntityMapping(ContainerBuilder $contain
         }
     }
 
-    private function setupAutowiringForProcessors(array $config, ContainerBuilder $container)
+    private function setupAutowiringForDefaultClientsProcessors(ContainerBuilder $container, string $defaultClient)
     {
-        $configNames = [];
-        foreach ($config as $name => $modules) {
-            if (isset($modules['client'])) {
-                $configNames[] = $name;
-            }
-        }
-
-        if (false == $configNames) {
-            return;
-        }
-
-        $topicSubscriber = $container->registerForAutoconfiguration(TopicSubscriberInterface::class)
+        $container->registerForAutoconfiguration(TopicSubscriberInterface::class)
             ->setPublic(true)
+            ->addTag('enqueue.topic_subscriber', ['client' => $defaultClient])
         ;
 
-        $commandSubscriber = $container->registerForAutoconfiguration(CommandSubscriberInterface::class)
+        $container->registerForAutoconfiguration(CommandSubscriberInterface::class)
             ->setPublic(true)
+            ->addTag('enqueue.command_subscriber', ['client' => $defaultClient])
         ;
 
-        foreach ($configNames as $configName) {
-            $topicSubscriber->addTag('enqueue.topic_subscriber', ['client' => $configName]);
-            $commandSubscriber->addTag('enqueue.command_subscriber', ['client' => $configName]);
-        }
     }
 
     private function loadDoctrinePingConnectionExtension(array $config, ContainerBuilder $container): void

pkg/enqueue-bundle/Tests/Unit/Profiler/MessageQueueCollectorTest.php

@@ -58,7 +58,7 @@ public function testShouldReturnSentMessageArrayTakenFromTraceableProducers()
 
         $collector->collect(new Request(), new Response());
 
-        $this->assertEquals(
+        $this->assertArraySubset(
             [
                 'foo' => [
                     [

pkg/enqueue/Tests/Client/TraceableProducerTest.php

@@ -45,7 +45,7 @@ public function testShouldCollectInfoIfStringGivenAsEventMessage()
 
         $producer->sendEvent('aFooTopic', 'aFooBody');
 
-        $this->assertSame([
+        $this->assertArraySubset([
             [
                 'topic' => 'aFooTopic',
                 'command' => null,
@@ -60,6 +60,8 @@ public function testShouldCollectInfoIfStringGivenAsEventMessage()
                 'messageId' => null,
             ],
         ], $producer->getTraces());
+        
+        $this->assertArrayHasKey('sentAt', $producer->getTraces()[0]);
     }
 
     public function testShouldCollectInfoIfArrayGivenAsEventMessage()
@@ -68,7 +70,7 @@ public function testShouldCollectInfoIfArrayGivenAsEventMessage()
 
         $producer->sendEvent('aFooTopic', ['foo' => 'fooVal', 'bar' => 'barVal']);
 
-        $this->assertSame([
+        $this->assertArraySubset([
             [
                 'topic' => 'aFooTopic',
                 'command' => null,
@@ -83,6 +85,8 @@ public function testShouldCollectInfoIfArrayGivenAsEventMessage()
                 'messageId' => null,
             ],
         ], $producer->getTraces());
+
+        $this->assertArrayHasKey('sentAt', $producer->getTraces()[0]);
     }
 
     public function testShouldCollectInfoIfEventMessageObjectGivenAsMessage()
@@ -102,7 +106,7 @@ public function testShouldCollectInfoIfEventMessageObjectGivenAsMessage()
 
         $producer->sendEvent('aFooTopic', $message);
 
-        $this->assertSame([
+        $this->assertArraySubset([
             [
                 'topic' => 'aFooTopic',
                 'command' => null,
@@ -117,6 +121,8 @@ public function testShouldCollectInfoIfEventMessageObjectGivenAsMessage()
                 'messageId' => 'theMessageId',
             ],
         ], $producer->getTraces());
+
+        $this->assertArrayHasKey('sentAt', $producer->getTraces()[0]);
     }
 
     public function testShouldNotStoreAnythingIfInternalEventMessageProducerThrowsException()
@@ -162,7 +168,7 @@ public function testShouldCollectInfoIfStringGivenAsCommandMessage()
 
         $producer->sendCommand('aFooCommand', 'aFooBody');
 
-        $this->assertSame([
+        $this->assertArraySubset([
             [
                 'topic' => null,
                 'command' => 'aFooCommand',
@@ -177,6 +183,8 @@ public function testShouldCollectInfoIfStringGivenAsCommandMessage()
                 'messageId' => null,
             ],
         ], $producer->getTraces());
+
+        $this->assertArrayHasKey('sentAt', $producer->getTraces()[0]);
     }
 
     public function testShouldCollectInfoIfArrayGivenAsCommandMessage()
@@ -185,7 +193,7 @@ public function testShouldCollectInfoIfArrayGivenAsCommandMessage()
 
         $producer->sendCommand('aFooCommand', ['foo' => 'fooVal', 'bar' => 'barVal']);
 
-        $this->assertSame([
+        $this->assertArraySubset([
             [
                 'topic' => null,
                 'command' => 'aFooCommand',
@@ -200,6 +208,8 @@ public function testShouldCollectInfoIfArrayGivenAsCommandMessage()
                 'messageId' => null,
             ],
         ], $producer->getTraces());
+
+        $this->assertArrayHasKey('sentAt', $producer->getTraces()[0]);
     }
 
     public function testShouldCollectInfoIfCommandMessageObjectGivenAsMessage()
@@ -219,7 +229,7 @@ public function testShouldCollectInfoIfCommandMessageObjectGivenAsMessage()
 
         $producer->sendCommand('aFooCommand', $message);
 
-        $this->assertSame([
+        $this->assertArraySubset([
             [
                 'topic' => null,
                 'command' => 'aFooCommand',
@@ -234,6 +244,8 @@ public function testShouldCollectInfoIfCommandMessageObjectGivenAsMessage()
                 'messageId' => 'theMessageId',
             ],
         ], $producer->getTraces());
+
+        $this->assertArrayHasKey('sentAt', $producer->getTraces()[0]);
     }
 
     public function testShouldNotStoreAnythingIfInternalCommandMessageProducerThrowsException()