Merge pull request #2 from arquivei/task/atom-82

Task/atom 82

.gitignore

@@ -13,4 +13,3 @@ npm-debug.log
 yarn-error.log
 .idea
 /data/*
-composer.lock

Dockerfile

@@ -9,7 +9,7 @@ COPY . /application
 
 RUN composer install $COMPOSER_ARGS
 
-FROM arquivei/php:8.0-cli-alpine
+FROM arquivei/php:8.1-cli-alpine
 
 WORKDIR /application
 

README.md

@@ -4,7 +4,7 @@ Base project for Command line Workers using Laravel
 
 ## Requirements
 
-+ PHP 8.0+
++ PHP 8.1+
 + Composer
 + Git
 + docker-composer 1.26+

app/Console/Commands/ConsumerCommand.php

@@ -4,7 +4,7 @@
 
 namespace App\Console\Commands;
 
-use App\Adapters\Kafka\KafkaConsumerBuilder;
+use App\Dependencies\Kafka\KafkaConsumerBuilder;
 use Illuminate\Console\Command;
 use Symfony\Component\Console\Input\InputOption;
 

app/Console/Commands/ProducerCommand.php

@@ -4,7 +4,7 @@
 
 namespace App\Console\Commands;
 
-use App\Adapters\Event\ExampleEvent;
+use App\Dependencies\Event\ExampleEvent;
 use Core\Dependencies\Event\Event;
 use Core\Dependencies\Event\EventSenderInterface;
 use Illuminate\Console\Command;

app/Consumers/Middleware/MessageDecoderMiddleware.php

@@ -6,19 +6,19 @@
 
 use App\Consumers\Middleware\Mapper\CannotMapMessageException;
 use App\Consumers\Middleware\Mapper\MessageMapper;
-use Core\Dependencies\LogInterface;
+use Arquivei\LogAdapter\Log;
 use Illuminate\Support\Arr;
 use InvalidArgumentException;
 use JsonException;
 use stdClass;
 
 class MessageDecoderMiddleware
 {
-    private LogInterface $logger;
+    private Log $logger;
     private array $mappers;
 
     public function __construct(
-        LogInterface $logger,
+        Log $logger,
         MessageMapper ...$mappers
     ) {
         $this->logger = $logger;

app/Adapters/Event/EventSenderAdapter.php → app/Dependencies/Event/Adapters/EventSenderAdapter.php

@@ -2,8 +2,9 @@
 
 declare(strict_types=1);
 
-namespace App\Adapters\Event;
+namespace App\Dependencies\Event\Adapters;
 
+use App\Dependencies\Event\EventSenderConfig;
 use Arquivei\Events\Sender\Exceptions\EmptyExportersException;
 use Arquivei\Events\Sender\Exceptions\PusherException;
 use Arquivei\Events\Sender\Factories\LatestSchemaFactory;

app/Adapters/Event/EventSenderConfig.php → app/Dependencies/Event/EventSenderConfig.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Adapters\Event;
+namespace App\Dependencies\Event;
 
 use Arquivei\Events\Sender\Pusher;
 

app/Adapters/Event/ExampleEvent.php → app/Dependencies/Event/ExampleEvent.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Adapters\Event;
+namespace App\Dependencies\Event;
 
 use Core\Dependencies\Event\Event;
 

app/Adapters/Kafka/KafkaConfig.php → app/Dependencies/Kafka/KafkaConfig.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace App\Adapters\Kafka;
+namespace App\Dependencies\Kafka;
 
 class KafkaConfig
 {
@@ -13,8 +13,7 @@ public function __construct(
         private string $saslMechanism,
         private string $securityProtocol,
         private string $eventsStream,
-    ) {
-    }
+    ) {}
 
     public function getBrokers(): string
     {

app/Adapters/Kafka/KafkaConsumerBuilder.php → app/Dependencies/Kafka/KafkaConsumerBuilder.php

@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace App\Adapters\Kafka;
+namespace App\Dependencies\Kafka;
 
 use App\Consumers\Middleware\Mapper\MessageMapper;
 use App\Consumers\Middleware\MessageDecoderMiddleware;
-use Core\Dependencies\LogInterface;
+use Arquivei\LogAdapter\Log;
 use Kafka\Consumer\Consumer;
 use Kafka\Consumer\ConsumerBuilder;
 use Kafka\Consumer\Entities\Config;
@@ -28,7 +28,7 @@ class KafkaConsumerBuilder
     private bool $autoCommit = false;
 
     public function __construct(
-        private LogInterface $logger,
+        private Log $logger,
         private KafkaConfig $kafkaConfig,
     ) {
     }

app/Exceptions/Handler.php

@@ -7,6 +7,7 @@
 use App\Http\Middleware\HeadersMiddleware;
 use Core\Dependencies\ContextualLogger;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Arquivei\LogAdapter\Log;
 use Illuminate\Support\Facades\App;
 use Illuminate\Validation\ValidationException;
 use Symfony\Component\HttpFoundation\Request;
@@ -17,7 +18,6 @@
 
 class Handler extends ExceptionHandler
 {
-    protected ContextualLogger $logger;
 
     /**
      * A list of the exception types that are not reported.
@@ -64,12 +64,18 @@ public function render($request, Throwable $exception)
             return $this->getResponse(Response::HTTP_UNPROCESSABLE_ENTITY);
         }
 
-        $this->logger->setTraceId($request->headers->get(HeadersMiddleware::X_TRACE_ID));
-        $this->logger->error(
-            Response::$statusTexts[Response::HTTP_INTERNAL_SERVER_ERROR],
-            ['exception' => $exception]
+
+        /** @var Log $logger */
+
+        // $logger = new LogAdapter();
+        $logger = app(Log::class);
+        $logger->setTraceId($request->headers->get(HeadersMiddleware::X_TRACEID));
+        $logger->error(
+            Response::$statusTexts[HttpResponse::HTTP_INTERNAL_SERVER_ERROR],
+            ['exception' => $e]
         );
 
+
         return $this->getResponse(Response::HTTP_INTERNAL_SERVER_ERROR);
     }
 

app/Providers/AppServiceProvider.php

@@ -4,15 +4,14 @@
 
 namespace App\Providers;
 
-use App\Adapters\Event\EventSenderAdapter;
-use App\Adapters\Event\EventSenderConfig;
-use App\Adapters\Kafka\KafkaConfig;
-use App\Adapters\Monolog\MonologLogAdapter;
+use App\Dependencies\Event\Adapters\EventSenderAdapter;
+use App\Dependencies\Event\EventSenderConfig;
+use App\Dependencies\Kafka\KafkaConfig;
 use Arquivei\Events\Sender\Exporters\Kafka;
 use Arquivei\Events\Sender\Pusher;
-use Core\Dependencies\ContextualLogger;
+use Arquivei\LogAdapter\Log;
+use Arquivei\LogAdapter\LogAdapter;
 use Core\Dependencies\Event\EventSenderInterface;
-use Core\Dependencies\LogInterface;
 use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Foundation\Application;
 use Illuminate\Support\ServiceProvider;
@@ -27,9 +26,7 @@ class AppServiceProvider extends ServiceProvider
      */
     public function register()
     {
-        $logger = $this->app->make(MonologLogAdapter::class);
-        $this->app->singleton(LogInterface::class, fn() => $logger);
-        $this->app->singleton(ContextualLogger::class, fn() => $logger);
+        $this->app->singleton(Log::class, LogAdapter::class);
 
         $this->app->bind(KafkaConfig::class, function (): KafkaConfig {
             $config = config('services');
@@ -41,6 +38,7 @@ public function register()
                 saslMechanism: $config['kafka']['sasl']['mechanisms'],
                 securityProtocol: $config['kafka']['security_protocol'],
                 eventsStream: $config['kafka']['events_stream'],
+                prefix: $config['kafka']['prefix'],
             );
         });