Send logs to dedicated monolog channel in symfony bundle (#369)

* refactor LoggingService * use LoggingService to add span event * add monolog channel to symfony extension * fix phpdi container implementation for optional reference * fix phpstan * add test compat with monolog 2.0 * drop code duplication for LoggerExample.php * add `critical` method to LoggingGateway * log to console with laravel * remove EchoLogger
ecotoneframework · Sep 4, 2024 · 8a91789 · 8a91789
1 parent 3089cfe
commit 8a91789
Show file tree

Hide file tree

Showing 64 changed files with 469 additions and 1,454 deletions.
diff --git a/composer.json b/composer.json
@@ -157,7 +157,8 @@
         "open-telemetry/exporter-otlp": "^1.0.0",
         "nesbot/carbon": "^2.71",
         "moneyphp/money": "^4.1.0",
-        "timacdonald/log-fake": "^2.0"
+        "timacdonald/log-fake": "^2.0",
+        "symfony/monolog-bundle": "^3.10"
     },
     "conflict": {
         "symfony/doctrine-messenger": ">7.0.5 < 7.1.0"

diff --git a/packages/Amqp/tests/Fixture/Support/Logger/LoggerExample.php b/packages/Amqp/tests/Fixture/Support/Logger/LoggerExample.php
diff --git a/packages/Amqp/tests/Integration/AmqpMessageChannelTest.php b/packages/Amqp/tests/Integration/AmqpMessageChannelTest.php
@@ -15,13 +15,13 @@
 use Ecotone\Messaging\Handler\Recoverability\RetryTemplateBuilder;
 use Ecotone\Messaging\PollableChannel;
 use Ecotone\Messaging\Support\MessageBuilder;
+use Ecotone\Test\LoggerExample;
 use Enqueue\AmqpExt\AmqpConnectionFactory;
 use Interop\Amqp\Impl\AmqpQueue;
 use Ramsey\Uuid\Uuid;
 use Test\Ecotone\Amqp\AmqpMessagingTest;
 use Test\Ecotone\Amqp\Fixture\DeadLetter\ErrorConfigurationContext;
 use Test\Ecotone\Amqp\Fixture\Order\OrderService;
-use Test\Ecotone\Amqp\Fixture\Support\Logger\LoggerExample;
 
 /**
  * @internal

diff --git a/packages/Dbal/src/DbalTransaction/DbalTransactionInterceptor.php b/packages/Dbal/src/DbalTransaction/DbalTransactionInterceptor.php
@@ -97,7 +97,7 @@ public function transactional(MethodInvocation $methodInvocation, Message $messa
                         $logger->info(
                             'Implicit Commit was detected, skipping manual one.',
                             $message,
-                            $exception
+                            ['exception' => $exception],
                         );
 
                         try {
@@ -117,7 +117,7 @@ public function transactional(MethodInvocation $methodInvocation, Message $messa
                     $logger->info(
                         'Exception has been thrown, rolling back transaction.',
                         $message,
-                        $exception
+                        ['exception' => $exception]
                     );
 
                     /** Doctrine hold the state, so it needs to be cleaned */

diff --git a/packages/Dbal/src/Deduplication/DeduplicationInterceptor.php b/packages/Dbal/src/Deduplication/DeduplicationInterceptor.php
@@ -10,14 +10,14 @@
 use Ecotone\Messaging\Attribute\AsynchronousRunningEndpoint;
 use Ecotone\Messaging\Attribute\Deduplicated;
 use Ecotone\Messaging\Attribute\IdentifiedAnnotation;
+use Ecotone\Messaging\Handler\Logger\LoggingGateway;
 use Ecotone\Messaging\Handler\Processor\MethodInvoker\MethodInvocation;
 use Ecotone\Messaging\Message;
 use Ecotone\Messaging\MessageHeaders;
 use Ecotone\Messaging\Scheduling\Clock;
 use Enqueue\Dbal\DbalContext;
 use Interop\Queue\ConnectionFactory;
 use Interop\Queue\Exception\Exception;
-use Psr\Log\LoggerInterface;
 
 use function spl_object_id;
 
@@ -36,11 +36,11 @@ class DeduplicationInterceptor
     public const DEFAULT_DEDUPLICATION_TABLE = 'ecotone_deduplication';
     private array $initialized = [];
 
-    public function __construct(private ConnectionFactory $connection, private Clock $clock, private int $minimumTimeToRemoveMessageInMilliseconds, private LoggerInterface $logger)
+    public function __construct(private ConnectionFactory $connection, private Clock $clock, private int $minimumTimeToRemoveMessageInMilliseconds, private LoggingGateway $logger)
     {
     }
 
-    public function deduplicate(MethodInvocation $methodInvocation, Message $message, ?Deduplicated $deduplicatedAttribute, ?IdentifiedAnnotation $identifiedAnnotation, ?AsynchronousRunningEndpoint $asynchronousRunningEndpoint)
+    public function deduplicate(MethodInvocation $methodInvocation, Message $message, ?Deduplicated $deduplicatedAttribute, ?IdentifiedAnnotation $identifiedAnnotation, ?AsynchronousRunningEndpoint $asynchronousRunningEndpoint): mixed
     {
         $connectionFactory = CachedConnectionFactory::createFor(new DbalReconnectableConnectionFactory($this->connection));
         $contextId = spl_object_id($connectionFactory->createContext());
@@ -77,7 +77,7 @@ public function deduplicate(MethodInvocation $methodInvocation, Message $message
                 'consumer_endpoint_id' => $consumerEndpointId,
                 'routing_slip' => $routingSlip,
             ]);
-            return;
+            return null;
         }
 
         try {

diff --git a/packages/Dbal/src/Deduplication/DeduplicationModule.php b/packages/Dbal/src/Deduplication/DeduplicationModule.php
@@ -15,10 +15,10 @@
 use Ecotone\Messaging\Config\ModulePackageList;
 use Ecotone\Messaging\Config\ModuleReferenceSearchService;
 use Ecotone\Messaging\Handler\InterfaceToCallRegistry;
+use Ecotone\Messaging\Handler\Logger\LoggingGateway;
 use Ecotone\Messaging\Handler\Processor\MethodInvoker\AroundInterceptorBuilder;
 use Ecotone\Messaging\Precedence;
 use Ecotone\Messaging\Scheduling\Clock;
-use Psr\Log\LoggerInterface;
 
 #[ModuleAnnotation]
 /**
@@ -64,7 +64,7 @@ public function prepare(Configuration $messagingConfiguration, array $extensionO
                     new Reference($connectionFactory),
                     new Reference(Clock::class),
                     $minimumTimeToRemoveMessageFromDeduplication,
-                    new Reference(LoggerInterface::class),
+                    new Reference(LoggingGateway::class),
                 ]
             )
         );