fix: Track attributes for new PDO subclasses

Author: cedricziel

src/Instrumentation/PDO/src/PDOInstrumentation.php

@@ -31,6 +31,41 @@ public static function register(): void
         );
         $pdoTracker = new PDOTracker();
 
+        // Hook for the new PDO::connect static method
+        if (method_exists(PDO::class, 'connect')) {
+            hook(
+                PDO::class,
+                'connect',
+                pre: static function (PDO $pdo, array $params, string $class, string $function, ?string $filename, ?int $lineno) use ($instrumentation) {
+                    /** @psalm-suppress ArgumentTypeCoercion */
+                    $builder = self::makeBuilder($instrumentation, 'PDO::connect', $function, $class, $filename, $lineno)
+                        ->setSpanKind(SpanKind::KIND_CLIENT);
+                    if ($class === PDO::class) {
+                        $builder
+                            ->setAttribute(TraceAttributes::SERVER_ADDRESS, $params[0] ?? 'unknown')
+                            ->setAttribute(TraceAttributes::SERVER_PORT, $params[0] ?? null);
+                    }
+                    $parent = Context::getCurrent();
+                    $span = $builder->startSpan();
+                    Context::storage()->attach($span->storeInContext($parent));
+                },
+                post: static function (PDO $pdo, array $params, mixed $statement, ?Throwable $exception) use ($pdoTracker) {
+                    $scope = Context::storage()->scope();
+                    if (!$scope) {
+                        return;
+                    }
+                    $span = Span::fromContext($scope->context());
+
+                    $dsn = $params[0] ?? '';
+
+                    $attributes = $pdoTracker->trackPdoAttributes($pdo, $dsn);
+                    $span->setAttributes($attributes);
+
+                    self::end($exception);
+                }
+            );
+        }
+
         hook(
             PDO::class,
             '__construct',

src/Instrumentation/PDO/tests/Integration/PDOInstrumentationTest.php

@@ -26,6 +26,14 @@ private function createDB(): PDO
         return new PDO('sqlite::memory:');
     }
 
+    private function createDBWithNewSubclass(): PDO\Sqlite
+    {
+        if (!class_exists('Pdo\Sqlite')) {
+            $this->markTestSkipped('Pdo\Sqlite class is not available in this PHP version');
+        }
+        return PDO::connect('sqlite::memory:');
+    }
+
     private function fillDB():string
     {
         return <<<SQL
@@ -72,6 +80,34 @@ public function test_pdo_construct(): void
         $this->assertEquals('sqlite', $span->getAttributes()->get(TraceAttributes::DB_SYSTEM_NAME));
     }
 
+    public function test_pdo_sqlite_subclass(): void
+    {
+        $this->assertCount(0, $this->storage);
+        $db = self::createDBWithNewSubclass();
+        $this->assertCount(1, $this->storage);
+        $span = $this->storage->offsetGet(0);
+        $this->assertSame('PDO::connect', $span->getName());
+        $this->assertEquals('sqlite', $span->getAttributes()->get(TraceAttributes::DB_SYSTEM_NAME));
+
+        // Test that the subclass-specific methods work
+        $db->createFunction('test_function', static fn ($value) => strtoupper($value));
+        
+        // Test that standard PDO operations still work
+        $db->exec($this->fillDB());
+        $span = $this->storage->offsetGet(1);
+        $this->assertSame('PDO::exec', $span->getName());
+        $this->assertEquals('sqlite', $span->getAttributes()->get(TraceAttributes::DB_SYSTEM_NAME));
+        $this->assertCount(2, $this->storage);
+
+        // Test that the custom function works
+        $result = $db->query("SELECT test_function('hello')")->fetchColumn();
+        $this->assertEquals('HELLO', $result);
+        $span = $this->storage->offsetGet(2);
+        $this->assertSame('PDO::query', $span->getName());
+        $this->assertEquals('sqlite', $span->getAttributes()->get(TraceAttributes::DB_SYSTEM_NAME));
+        $this->assertCount(3, $this->storage);
+    }
+
     public function test_constructor_exception(): void
     {
         $this->expectException(\PDOException::class);