Enhanced context format

composer.json

@@ -43,7 +43,7 @@
     "scripts": {
         "cs:diff": "php-cs-fixer fix --dry-run -v --diff --show-progress dots",
         "cs:fix": "php-cs-fixer fix -v",
-        "test": "phpunit",
+        "test": "XDEBUG_MODE=coverage phpunit",
         "psalm": "psalm"
     },
     "autoload": {

src/Context/DefaultProcessor.php

@@ -0,0 +1,61 @@
+<?php
+
+declare(strict_types=1);
+
+namespace RoadRunner\PsrLogger\Context;
+
+use RoadRunner\PsrLogger\Context\ObjectProcessor\DateTimeProcessor;
+use RoadRunner\PsrLogger\Context\ObjectProcessor\FallbackProcessor;
+use RoadRunner\PsrLogger\Context\ObjectProcessor\StringableProcessor;
+use RoadRunner\PsrLogger\Context\ObjectProcessor\ThrowableProcessor;
+
+final class DefaultProcessor
+{
+    /** @var list<ObjectProcessor> */
+    private array $processors = [];
+
+    public static function createDefault(): self
+    {
+        $self = new self();
+        $self->processors = [
+            new DateTimeProcessor(),
+            new StringableProcessor(),
+            new ThrowableProcessor(),
+            new FallbackProcessor(),
+        ];
+        return $self;
+    }
+
+    /**
+     * Copy the current object and add Object Processors before existing ones.
+     */
+    public function withObjectProcessors(ObjectProcessor ...$processors): self
+    {
+        $clone = clone $this;
+        $clone->processors = \array_merge(\array_values($processors), $clone->processors);
+        return $clone;
+    }
+
+    public function __invoke(mixed $value): mixed
+    {
+        if (\is_resource($value)) {
+            return \get_resource_type($value) . ' resource';
+        }
+
+        if (\is_array($value)) {
+            foreach ($value as &$v) {
+                $v = $this($v);
+            }
+        }
+
+        if (\is_object($value)) {
+            foreach ($this->processors as $processor) {
+                if ($processor->canProcess($value)) {
+                    return $processor->process($value, $this);
+                }
+            }
+        }
+
+        return $value;
+    }
+}

src/Context/ObjectProcessor.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace RoadRunner\PsrLogger\Context;
+
+/**
+ * Converts an object into a scalar or an arra for serializable logger context.
+ *
+ * @template T
+ *
+ * @internal
+ */
+interface ObjectProcessor
+{
+    /**
+     * Check if this processor can handle the given value.
+     */
+    public function canProcess(object $value): bool;
+
+    /**
+     * @param T $value
+     * @param callable(mixed): mixed $processor Function to process nested object values
+     */
+    public function process(object $value, callable $processor): mixed;
+}

src/Context/ObjectProcessor/DateTimeProcessor.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace RoadRunner\PsrLogger\Context\ObjectProcessor;
+
+use RoadRunner\PsrLogger\Context\ObjectProcessor;
+
+/**
+ * Processor for DateTime objects.
+ *
+ * Converts DateTime and DateTimeImmutable objects to ISO 8601 format
+ * for consistent structured logging.
+ *
+ * @implements ObjectProcessor<\DateTimeInterface>
+ *
+ * @internal
+ */
+final class DateTimeProcessor implements ObjectProcessor
+{
+    public function canProcess(object $value): bool
+    {
+        return $value instanceof \DateTimeInterface;
+    }
+
+    public function process(object $value, callable $processor): mixed
+    {
+        return $value->format(\DateTimeInterface::ATOM);
+    }
+}

src/Context/ObjectProcessor/FallbackProcessor.php

@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace RoadRunner\PsrLogger\Context\ObjectProcessor;
+
+use RoadRunner\PsrLogger\Context\ObjectProcessor;
+
+/**
+ * Fallback processor for unknown objects.
+ *
+ * @internal
+ *
+ * @implements ObjectProcessor<object>
+ */
+final class FallbackProcessor implements ObjectProcessor
+{
+    public function canProcess(object $value): bool
+    {
+        return true;
+    }
+
+    public function process(object $value, callable $processor): array
+    {
+        $result = ['@class' => $value::class] + \get_object_vars($value);
+        foreach ($result as $k => &$v) {
+            if ($v === $value) {
+                unset($result[$k]);
+            }
+
+            $v = $processor($v);
+        }
+
+        return $result;
+    }
+}

src/Context/ObjectProcessor/StringableProcessor.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace RoadRunner\PsrLogger\Context\ObjectProcessor;
+
+use RoadRunner\PsrLogger\Context\ObjectProcessor;
+
+/**
+ * Converts Stringable objects to their string representation.
+ *
+ * @internal
+ *
+ * @implements ObjectProcessor<\Stringable>
+ */
+final class StringableProcessor implements ObjectProcessor
+{
+    public function canProcess(object $value): bool
+    {
+        return $value instanceof \Stringable;
+    }
+
+    public function process(object $value, callable $processor): mixed
+    {
+        return (string) $value;
+    }
+}

src/Context/ObjectProcessor/ThrowableProcessor.php

@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace RoadRunner\PsrLogger\Context\ObjectProcessor;
+
+use RoadRunner\PsrLogger\Context\ObjectProcessor;
+
+/**
+ * Converts exceptions to structured data containing class, message,
+ * code, file, line, and stack trace information.
+ *
+ * @internal
+ *
+ * @implements ObjectProcessor<\Throwable>
+ */
+final class ThrowableProcessor implements ObjectProcessor
+{
+    public function canProcess(object $value): bool
+    {
+        return $value instanceof \Throwable;
+    }
+
+    public function process(object $value, callable $processor): array
+    {
+        return [
+            'class' => \get_class($value),
+            'message' => $value->getMessage(),
+            'code' => $value->getCode(),
+            'file' => $value->getFile(),
+            'line' => $value->getLine(),
+            'trace' => $value->getTraceAsString(),
+        ];
+    }
+}

src/RpcLogger.php

@@ -10,16 +10,19 @@
 use Psr\Log\InvalidArgumentException as PsrInvalidArgumentException;
 use RoadRunner\Logger\Logger as AppLogger;
 use RoadRunner\Logger\LogLevel;
+use RoadRunner\PsrLogger\Context\DefaultProcessor;
 
 class RpcLogger implements LoggerInterface
 {
     use LoggerTrait;
 
     private readonly AppLogger $logger;
+    private readonly \Closure $objectProcessor;
 
-    public function __construct(AppLogger $logger)
+    public function __construct(AppLogger $logger, ?callable $processor = null)
     {
         $this->logger = $logger;
+        $this->objectProcessor = ($processor ?? DefaultProcessor::createDefault())(...);
     }
 
     /**
@@ -32,23 +35,25 @@ public function __construct(AppLogger $logger)
     public function log($level, \Stringable|string $message, array $context = []): void
     {
         $normalizedLevel = \strtolower(match (true) {
-            \is_string($level),
+            \is_string($level) => $level,
             $level instanceof \Stringable => (string) $level,
             $level instanceof \BackedEnum => (string) $level->value,
             $level instanceof LogLevel => $level->name,
             default => throw new PsrInvalidArgumentException('Invalid log level type provided.'),
         });
 
-        /** @var array<string, mixed> $context */
+        // Process context data for structured logging using the processor manager
+        $processedContext = ($this->objectProcessor)($context);
+
         match ($normalizedLevel) {
             PsrLogLevel::EMERGENCY,
             PsrLogLevel::ALERT,
             PsrLogLevel::CRITICAL,
-            PsrLogLevel::ERROR => $this->logger->error($message, $context),
-            PsrLogLevel::WARNING => $this->logger->warning($message, $context),
-            PsrLogLevel::NOTICE, PsrLogLevel::INFO => $this->logger->info((string) $message, $context),
-            'log' => $this->logger->log((string) $message, $context),
-            PsrLogLevel::DEBUG => $this->logger->debug($message, $context),
+            PsrLogLevel::ERROR => $this->logger->error($message, $processedContext),
+            PsrLogLevel::WARNING => $this->logger->warning($message, $processedContext),
+            PsrLogLevel::NOTICE, PsrLogLevel::INFO => $this->logger->info((string) $message, $processedContext),
+            'log' => $this->logger->log((string) $message, $processedContext),
+            PsrLogLevel::DEBUG => $this->logger->debug($message, $processedContext),
             default => throw new PsrInvalidArgumentException("Invalid log level `$normalizedLevel` provided."),
         };
     }

tests/Unit/Context/DefaultProcessorTest.php

@@ -0,0 +1,91 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Context;
+
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\TestCase;
+use RoadRunner\PsrLogger\Context\DefaultProcessor;
+use RoadRunner\PsrLogger\Context\ObjectProcessor\BuiltInTypeProcessor;
+
+#[CoversClass(DefaultProcessor::class)]
+class DefaultProcessorTest extends TestCase
+{
+    private DefaultProcessor $processor;
+
+    public static function builtInTypeValuesProvider(): array
+    {
+        return [
+            'string' => ['test string', 'test string'],
+            'integer' => [42, 42],
+            'float' => [3.14, 3.14],
+            'boolean true' => [true, true],
+            'boolean false' => [false, false],
+            'null' => [null, null],
+            'empty array' => [[], []],
+            'simple array' => [[1, 2, 3], [1, 2, 3]],
+            'associative array' => [['key' => 'value'], ['key' => 'value']],
+            'resource' => [\fopen('php://memory', 'r'), 'stream resource'],
+        ];
+    }
+
+    #[DataProvider('builtInTypeValuesProvider')]
+    public function testCanProcessBuiltInTypes(mixed $value, mixed $expected): void
+    {
+        $this->assertSame($expected, ($this->processor)($value));
+    }
+
+    public function testProcessNull(): void
+    {
+        $recursiveProcessor = static fn($v) => $v;
+        $result = ($this->processor)(null, $recursiveProcessor);
+        $this->assertNull($result);
+    }
+
+    public function testProcessScalarValues(): void
+    {
+        $values = ['test string', 42, 3.14, true, false];
+        $recursiveProcessor = static fn($v) => $v;
+
+        foreach ($values as $value) {
+            $result = ($this->processor)($value, $recursiveProcessor);
+            $this->assertSame($value, $result);
+        }
+    }
+
+    public function testProcessSimpleArray(): void
+    {
+        $array = [1, 2, 'three', true];
+        $recursiveProcessor = static fn($v) => $v; // Identity function for simple values
+
+        $result = ($this->processor)($array, $recursiveProcessor);
+
+        $this->assertSame([1, 2, 'three', true], $result);
+    }
+
+    public function testProcessNestedArray(): void
+    {
+        $array = [
+            'level1' => [
+                'level2' => [
+                    'value' => 'deep',
+                ],
+            ],
+        ];
+
+        $result = ($this->processor)($array);
+
+        $this->assertArrayHasKey('level1', $result);
+        $this->assertIsArray($result['level1']);
+        $this->assertArrayHasKey('level2', $result['level1']);
+        $this->assertIsArray($result['level1']['level2']);
+        $this->assertSame('deep', $result['level1']['level2']['value']);
+    }
+
+    protected function setUp(): void
+    {
+        $this->processor = new DefaultProcessor();
+    }
+}