Addd tags, jaeger connection decorator

Author: allflame

src/Decorator/AbstractConnectionDecorator.php

@@ -3,14 +3,14 @@
 
 namespace Doctrine\DBAL\Jaeger\Decorator;
 
-use Doctrine\DBAL\Driver\Connection as DriverConnection;
+use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\ParameterType;
 
-class AbstractConnectionDecorator implements DriverConnection
+abstract class AbstractConnectionDecorator extends Connection
 {
     private $connection;
 
-    public function __construct(DriverConnection $connection)
+    public function __construct(Connection $connection)
     {
         $this->connection = $connection;
     }
@@ -42,12 +42,12 @@ public function lastInsertId($name = null)
 
     public function beginTransaction()
     {
-        return $this->connection->beginTransaction();
+        $this->connection->beginTransaction();
     }
 
     public function commit()
     {
-        return $this->connection->commit();
+        $this->connection->commit();
     }
 
     public function rollBack()

src/Decorator/JaegerConnectionDecorator.php

@@ -3,18 +3,24 @@
 
 namespace Doctrine\DBAL\Jaeger\Decorator;
 
-use Doctrine\DBAL\Driver\Connection as DriverConnection;
+use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Jaeger\Tag\DbalErrorCodeTag;
 use Doctrine\DBAL\Jaeger\Tag\DbalRowNumberTag;
+use Jaeger\Tag\DbInstanceTag;
 use Jaeger\Tag\DbStatementTag;
+use Jaeger\Tag\DbType;
+use Jaeger\Tag\DbUser;
 use Jaeger\Tag\ErrorTag;
 use Jaeger\Tracer\TracerInterface;
 
 class JaegerConnectionDecorator extends AbstractConnectionDecorator
 {
+    /**
+     * @var TracerInterface
+     */
     private $tracer;
 
-    public function __construct(DriverConnection $connection, TracerInterface $tracer)
+    public function __construct(Connection $connection, TracerInterface $tracer)
     {
         $this->tracer = $tracer;
         parent::__construct($connection);
@@ -24,6 +30,9 @@ public function prepare($prepareString)
     {
         $span = $this->tracer
             ->start('dbal.prepare')
+            ->addTag(new DbInstanceTag($this->getDatabase()))
+            ->addTag(new DbUser($this->getUsername()))
+            ->addTag(new DbType('sql'))
             ->addTag(new DbStatementTag($prepareString));
         try {
             return parent::prepare($prepareString);
@@ -38,7 +47,11 @@ public function prepare($prepareString)
 
     public function query()
     {
-        $span = $this->tracer->start('dbal.query');
+        $span = $this->tracer
+            ->start('dbal.query')
+            ->addTag(new DbInstanceTag($this->getDatabase()))
+            ->addTag(new DbUser($this->getUsername()))
+            ->addTag(new DbType('sql'));
         try {
             return parent::query();
         } catch (\Exception $e) {
@@ -52,7 +65,11 @@ public function query()
 
     public function exec($statement)
     {
-        $span = $this->tracer->start('dbal.exec');
+        $span = $this->tracer
+            ->start('dbal.exec')
+            ->addTag(new DbInstanceTag($this->getDatabase()))
+            ->addTag(new DbUser($this->getUsername()))
+            ->addTag(new DbType('sql'));
         try {
             $rows = parent::exec($statement);
             $span->addTag(new DbalRowNumberTag($rows));
@@ -69,9 +86,13 @@ public function exec($statement)
 
     public function beginTransaction()
     {
-        $span = $this->tracer->start('dbal.transaction');
+        $span = $this->tracer
+            ->start('dbal.transaction')
+            ->addTag(new DbInstanceTag($this->getDatabase()))
+            ->addTag(new DbUser($this->getUsername()))
+            ->addTag(new DbType('sql'));
         try {
-            return parent::beginTransaction();
+            parent::beginTransaction();
         } catch (\Exception $e) {
             $span->addTag(new DbalErrorCodeTag($e->getCode()))
                 ->addTag(new ErrorTag());
@@ -83,9 +104,13 @@ public function beginTransaction()
 
     public function commit()
     {
-        $span = $this->tracer->start('dbal.commit');
+        $span = $this->tracer
+            ->start('dbal.commit')
+            ->addTag(new DbInstanceTag($this->getDatabase()))
+            ->addTag(new DbUser($this->getUsername()))
+            ->addTag(new DbType('sql'));
         try {
-            return parent::commit();
+            parent::commit();
         } catch (\Exception $e) {
             $span->addTag(new DbalErrorCodeTag($e->getCode()))
                 ->addTag(new ErrorTag());
@@ -97,7 +122,11 @@ public function commit()
 
     public function rollBack()
     {
-        $span = $this->tracer->start('dbal.rollback');
+        $span = $this->tracer
+            ->start('dbal.rollback')
+            ->addTag(new DbInstanceTag($this->getDatabase()))
+            ->addTag(new DbUser($this->getUsername()))
+            ->addTag(new DbType('sql'));
         try {
             return parent::rollBack();
         } catch (\Exception $e) {