Added nesting level tag

Author: allflame

src/Decorator/JaegerConnectionDecorator.php

@@ -7,6 +7,7 @@
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Jaeger\Tag\DbalAutoCommitTag;
 use Doctrine\DBAL\Jaeger\Tag\DbalErrorCodeTag;
+use Doctrine\DBAL\Jaeger\Tag\DbalNestingLevelTag;
 use Doctrine\DBAL\Jaeger\Tag\DbalRowNumberTag;
 use Jaeger\Tag\DbInstanceTag;
 use Jaeger\Tag\DbStatementTag;
@@ -32,7 +33,8 @@ public function connect()
             ->addTag(new DbInstanceTag($this->getDatabase()))
             ->addTag(new DbUser($this->getUsername()))
             ->addTag(new DbType($this->getDatabasePlatform()->getName()))
-            ->addTag(new DbalAutoCommitTag($this->isAutoCommit()));
+            ->addTag(new DbalAutoCommitTag($this->isAutoCommit()))
+            ->addTag(new DbalNestingLevelTag($this->getTransactionNestingLevel()));
         try {
             parent::connect();
         } catch (\Exception $e) {
@@ -52,7 +54,8 @@ public function prepare($prepareString)
             ->addTag(new DbUser($this->getUsername()))
             ->addTag(new DbType($this->getDatabasePlatform()->getName()))
             ->addTag(new DbalAutoCommitTag($this->isAutoCommit()))
-            ->addTag(new DbStatementTag($prepareString));
+            ->addTag(new DbStatementTag($prepareString))
+            ->addTag(new DbalNestingLevelTag($this->getTransactionNestingLevel()));
         try {
             return parent::prepare($prepareString);
         } catch (\Exception $e) {
@@ -72,7 +75,8 @@ public function executeQuery($query, array $params = [], $types = [], QueryCache
             ->addTag(new DbUser($this->getUsername()))
             ->addTag(new DbType($this->getDatabasePlatform()->getName()))
             ->addTag(new DbalAutoCommitTag($this->isAutoCommit()))
-            ->addTag(new DbStatementTag($query));
+            ->addTag(new DbStatementTag($query))
+            ->addTag(new DbalNestingLevelTag($this->getTransactionNestingLevel()));
         try {
             return parent::executeQuery($query, $params, $types, $qcp);
         } catch (\Exception $e) {
@@ -92,7 +96,8 @@ public function executeUpdate($query, array $params = [], array $types = [])
             ->addTag(new DbUser($this->getUsername()))
             ->addTag(new DbType($this->getDatabasePlatform()->getName()))
             ->addTag(new DbalAutoCommitTag($this->isAutoCommit()))
-            ->addTag(new DbStatementTag($query));
+            ->addTag(new DbStatementTag($query))
+            ->addTag(new DbalNestingLevelTag($this->getTransactionNestingLevel()));
         try {
             return parent::executeUpdate($query, $params, $types);
         } catch (\Exception $e) {
@@ -111,7 +116,8 @@ public function query()
             ->addTag(new DbInstanceTag($this->getDatabase()))
             ->addTag(new DbUser($this->getUsername()))
             ->addTag(new DbType($this->getDatabasePlatform()->getName()))
-            ->addTag(new DbalAutoCommitTag($this->isAutoCommit()));
+            ->addTag(new DbalAutoCommitTag($this->isAutoCommit()))
+            ->addTag(new DbalNestingLevelTag($this->getTransactionNestingLevel()));
         try {
             return parent::query();
         } catch (\Exception $e) {
@@ -130,7 +136,8 @@ public function exec($statement)
             ->addTag(new DbInstanceTag($this->getDatabase()))
             ->addTag(new DbUser($this->getUsername()))
             ->addTag(new DbType($this->getDatabasePlatform()->getName()))
-            ->addTag(new DbalAutoCommitTag($this->isAutoCommit()));
+            ->addTag(new DbalAutoCommitTag($this->isAutoCommit()))
+            ->addTag(new DbalNestingLevelTag($this->getTransactionNestingLevel()));
         try {
             $rows = parent::exec($statement);
             $span->addTag(new DbalRowNumberTag($rows));
@@ -160,7 +167,7 @@ public function beginTransaction()
                 ->addTag(new ErrorTag());
             throw $e;
         } finally {
-            $this->tracer->finish($span);
+            $this->tracer->finish($span->addTag(new DbalNestingLevelTag($this->getTransactionNestingLevel())));
         }
     }
 
@@ -179,7 +186,7 @@ public function commit()
                 ->addTag(new ErrorTag());
             throw $e;
         } finally {
-            $this->tracer->finish($span);
+            $this->tracer->finish($span->addTag(new DbalNestingLevelTag($this->getTransactionNestingLevel())));
         }
     }
 
@@ -198,7 +205,7 @@ public function rollBack()
                 ->addTag(new ErrorTag());
             throw $e;
         } finally {
-            $this->tracer->finish($span);
+            $this->tracer->finish($span->addTag(new DbalNestingLevelTag($this->getTransactionNestingLevel())));
         }
     }
 }

src/Tag/DbalNestingLevelTag.php

@@ -0,0 +1,14 @@
+<?php
+declare(strict_types=1);
+
+namespace Doctrine\DBAL\Jaeger\Tag;
+
+use Jaeger\Tag\LongTag;
+
+class DbalNestingLevelTag extends LongTag
+{
+    public function __construct(int $value)
+    {
+        parent::__construct('dbal.netsting_level', $value);
+    }
+}