fix: apply insights from test integrations

Author: DominicDetta

src/Instrumentation/Doctrine/src/AttributesResolver.php

@@ -4,7 +4,6 @@
 
 namespace OpenTelemetry\Contrib\Instrumentation\Doctrine;
 
-use Doctrine\DBAL\SQL\Parser;
 use Exception;
 
 final class AttributesResolver
@@ -72,11 +71,11 @@ private static function getServerPort(array $params): string
     /**
      * Resolve attribute `db.system`
      */
-    private static function getDbSystem(array $params): string
+    private static function getDbSystem(array $params)
     {
         $dbSystem = $params[1][0]['driver'] ?? null;
 
-        if (strpos($dbSystem, 'pdo_') !== false) {
+        if ($dbSystem && strpos($dbSystem, 'pdo_') !== false) {
             // Remove pdo_ word to ignore it while searching well-known db.system
             $dbSystem = ltrim($dbSystem, 'pdo_');
         }
@@ -89,6 +88,7 @@ private static function getDbSystem(array $params): string
         if (isset(self::DB_SYSTEMS_KNOWN[$dbSystem])) {
             return self::DB_SYSTEMS_KNOWN[$dbSystem];
         }
+
         return 'other_sql';
     }
 
@@ -133,16 +133,17 @@ public static function getDbQuerySummary(array $params): string
 
         // Fetch target name
         $matches = [];
-        preg_match_all('/(from|into|update|join)\s*([a-zA-Z0-9[\]_]+)/i', $query, $matches);
+        preg_match_all('/(from|into|update|join)\s*([a-zA-Z0-9`"[\]_]+)/i', $query, $matches);
 
         $targetName = null;
         if (strtolower($operationName) == 'select') {
-            if ($matches && isset($matches[2]) && $matches[2]) {
+            if ($matches[2]) {
                 $targetName = implode(' ', $matches[2]);
             }
         } elseif ($matches) {
             $targetName = $matches[2][0] ?? '';
         }
+
         return $operationName . ($targetName ? ' ' . $targetName : '');
     }
 }

src/Instrumentation/Doctrine/tests/Integration/DoctrineInstrumentationTest.php

@@ -102,18 +102,18 @@ public function test_statement_execution(): void
 
         $connection->executeStatement($statement);
         $span = $this->storage->offsetGet(1);
-        $this->assertSame('Doctrine\DBAL\Driver\Connection::exec', $span->getName());
+        $this->assertSame('CREATE technology', $span->getName());
         $this->assertFalse($connection->isTransactionActive());
         $this->assertCount(2, $this->storage);
 
         $connection->prepare('SELECT * FROM `technology`');
         $span = $this->storage->offsetGet(2);
-        $this->assertSame('Doctrine\DBAL\Driver\Connection::prepare', $span->getName());
+        $this->assertSame('SELECT `technology`', $span->getName());
         $this->assertCount(3, $this->storage);
 
         $connection->executeQuery('SELECT * FROM `technology`');
         $span = $this->storage->offsetGet(3);
-        $this->assertSame('Doctrine\DBAL\Driver\Connection::query', $span->getName());
+        $this->assertSame('SELECT `technology`', $span->getName());
         $this->assertCount(4, $this->storage);
     }
 
@@ -128,7 +128,7 @@ public function test_transaction(): void
         $statement = self::fillDB();
         $connection->executeStatement($statement);
         $span = $this->storage->offsetGet(2);
-        $this->assertSame('Doctrine\DBAL\Driver\Connection::exec', $span->getName());
+        $this->assertSame('CREATE technology', $span->getName());
         $connection->commit();
         $span = $this->storage->offsetGet(3);
         $this->assertSame('Doctrine\DBAL\Driver\Connection::commit', $span->getName());