Add support of doctrine 3.0:

* remove legacy methods from decorator/wrapper
* add new methods to decorator/wrapper

Author: drewblin

src/Decorator/JaegerConnectionDecorator.php

@@ -103,7 +103,7 @@ public function executeStatement($sql, array $params = [], array $types = [])
             ->addTag(new DbStatementTag($this->cutLongSql($sql)))
             ->addTag(new DbalNestingLevelTag($this->getTransactionNestingLevel()));
         try {
-            return parent::executeUpdate($sql, $params, $types);
+            return parent::executeStatement($sql, $params, $types);
         } catch (\Exception $e) {
             $span->addTag(new DbalErrorCodeTag($e->getCode()))
                 ->addTag(new ErrorTag());

src/Wrapper/JaegerConnectionWrapper.php

@@ -111,7 +111,7 @@ private function wrappedPrepare($sql): JaegerStatementWrapper
     public function executeQuery(string $sql, array $params = [], $types = [], ?QueryCacheProfile $qcp = null): Result
     {
         $span = $this->tracer
-            ->start('dbal.execute')
+            ->start('dbal.query')
             ->addTag(new DbType(get_class($this->getDatabasePlatform())))
             ->addTag(new DbalAutoCommitTag($this->isAutoCommit()))
             ->addTag(new DbStatementTag($this->cutLongSql($sql)))
@@ -127,7 +127,7 @@ public function executeQuery(string $sql, array $params = [], $types = [], ?Quer
         }
     }
 
-    public function executeUpdate(string $sql, array $params = [], array $types = []): int
+    public function executeStatement($sql, array $params = [], array $types = [])
     {
         $span = $this->tracer
             ->start('dbal.execute')
@@ -136,47 +136,7 @@ public function executeUpdate(string $sql, array $params = [], array $types = []
             ->addTag(new DbStatementTag($this->cutLongSql($sql)))
             ->addTag(new DbalNestingLevelTag($this->getTransactionNestingLevel()));
         try {
-            return parent::executeUpdate($sql, $params, $types);
-        } catch (\Exception $e) {
-            $span->addTag(new DbalErrorCodeTag($e->getCode()))
-                ->addTag(new ErrorTag());
-            throw $e;
-        } finally {
-            $this->tracer->finish($span);
-        }
-    }
-
-    public function query(string $sql): Result
-    {
-        $span = $this->tracer
-            ->start('dbal.query')
-            ->addTag(new DbStatementTag($this->cutLongSql($sql)))
-            ->addTag(new DbType(get_class($this->getDatabasePlatform())))
-            ->addTag(new DbalAutoCommitTag($this->isAutoCommit()))
-            ->addTag(new DbalNestingLevelTag($this->getTransactionNestingLevel()));
-        try {
-            return parent::query($sql);
-        } catch (\Exception $e) {
-            $span->addTag(new DbalErrorCodeTag($e->getCode()))
-                ->addTag(new ErrorTag());
-            throw $e;
-        } finally {
-            $this->tracer->finish($span);
-        }
-    }
-
-    public function exec(string $sql): int
-    {
-        $span = $this->tracer
-            ->start('dbal.exec')
-            ->addTag(new DbType(get_class($this->getDatabasePlatform())))
-            ->addTag(new DbalAutoCommitTag($this->isAutoCommit()))
-            ->addTag(new DbalNestingLevelTag($this->getTransactionNestingLevel()));
-        try {
-            $rows = parent::exec($sql);
-            $span->addTag(new DbalRowNumberTag($rows));
-
-            return $rows;
+            return parent::executeStatement($sql, $params, $types);
         } catch (\Exception $e) {
             $span->addTag(new DbalErrorCodeTag($e->getCode()))
                 ->addTag(new ErrorTag());