Queue logs (#11)

* fix changelog

* use FQCN

* use `make()` method

* log sqs event

* use context for job name

* add changelog entry

* use single log line

Author: tillkruss

CHANGELOG.md

@@ -8,11 +8,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Added maintenance mode support ([#7](https://github.com/cachewerk/bref-laravel-bridge/pull/7))
 - Support persistent PostgresSQL sessions with Octane ([#9](https://github.com/cachewerk/bref-laravel-bridge/pull/9))
-- Parse `Authorization: Basic` header into `PHP_AUTH_*` variables ([#9](https://github.com/cachewerk/bref-laravel-bridge/pull/10))
+- Parse `Authorization: Basic` header into `PHP_AUTH_*` variables ([#10](https://github.com/cachewerk/bref-laravel-bridge/pull/10))
+- Prepare Octane responses without `Content-Type` ([08ab941](08ab941ab734d636697847b036cd9ed5e31a30ad))
 
 ### Changed 
 - Made `ServeStaticAssets` configurable ([19fb1ac](19fb1ac21fd7245a8bd529eb6325cea2308ffbf2))
 - Made shared `X-Request-ID` log context configurable ([bfbc249](bfbc2498d3b418f149aba3d3fe795073dfcb7b48))
+- Log SQS job events ([#11](https://github.com/cachewerk/bref-laravel-bridge/pull/11))
+- Collapse `Secrets` log message into single line ([#11](https://github.com/cachewerk/bref-laravel-bridge/pull/11))
 
 ## [v0.1.0] - 2022-05-18
 ### Added

src/BrefServiceProvider.php

@@ -4,6 +4,7 @@
 
 use Monolog\Formatter\JsonFormatter;
 
+use Illuminate\Log\LogManager;
 use Illuminate\Contracts\Http\Kernel;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\ServiceProvider;
@@ -85,7 +86,7 @@ protected function shareRequestContext()
 
         $this->app->rebinding('request', function ($app, $request) {
             if ($request->hasHeader('X-Request-ID')) {
-                $app->make('log')->shareContext([
+                $app->make(LogManager::class)->shareContext([
                     'requestId' => $request->header('X-Request-ID'),
                 ]);
             }

src/Queue/QueueHandler.php

@@ -13,6 +13,8 @@
 use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Contracts\Debug\ExceptionHandler;
 
+use Illuminate\Log\LogManager;
+
 use Illuminate\Queue\SqsQueue;
 use Illuminate\Queue\Jobs\SqsJob;
 use Illuminate\Queue\QueueManager;
@@ -39,7 +41,7 @@ public function __construct(
         protected string $connection,
         protected string $queue,
     ) {
-        $queue = $container->get(QueueManager::class)
+        $queue = $container->make(QueueManager::class)
             ->connection($connection);
 
         if (! $queue instanceof SqsQueue) {
@@ -105,6 +107,9 @@ protected function process(string $connectionName, SqsJob $job): void
      */
     protected function raiseBeforeJobEvent(string $connectionName, SqsJob $job): void
     {
+        $this->container->make(LogManager::class)
+            ->info("Processing job {$job->getJobId()}", ['name' => $job->resolveName()]);
+
         $this->events->dispatch(new JobProcessing($connectionName, $job));
     }
 
@@ -113,6 +118,9 @@ protected function raiseBeforeJobEvent(string $connectionName, SqsJob $job): voi
      */
     protected function raiseAfterJobEvent(string $connectionName, SqsJob $job): void
     {
+        $this->container->make(LogManager::class)
+            ->info("Processed job {$job->getJobId()}", ['name' => $job->resolveName()]);
+
         $this->events->dispatch(new JobProcessed($connectionName, $job));
     }
 
@@ -121,6 +129,9 @@ protected function raiseAfterJobEvent(string $connectionName, SqsJob $job): void
      */
     protected function raiseExceptionOccurredJobEvent(string $connectionName, SqsJob $job, Throwable $th): void
     {
+        $this->container->make(LogManager::class)
+            ->error("Job failed {$job->getJobId()}", ['name' => $job->resolveName()]);
+
         $this->events->dispatch(new JobExceptionOccurred($connectionName, $job, $th));
     }
 }

src/Secrets.php

@@ -25,16 +25,16 @@ public static function injectIntoEnvironment(string $path, array $parameters)
             'WithDecryption' => true,
         ]);
 
+        $injected = [];
+
         foreach ($response['Parameters'] ?? [] as $secret) {
             $key = trim(strrchr($secret['Name'], '/'), '/');
-
-            fwrite(STDERR, sprintf(
-                '%s: %s' . PHP_EOL,
-                isset($_ENV[$key]) ? 'Overwriting runtime secret' : 'Injecting runtime secret',
-                $key
-            ));
-
+            $injected[] = isset($_ENV[$key]) ? "{$key} (overwritten)" : $key;
             $_ENV[$key] = $secret['Value'];
         }
+
+        if (! empty($injected)) {
+            fwrite(STDERR, 'Injected runtime secrets: ' . implode(', ', $injected) . PHP_EOL);
+        }
     }
 }