Merge pull request #5 from drewblin/v1.4.0

V1.4.0

Author: allflame

src/Decorator/JaegerConnectionDecorator.php

@@ -20,9 +20,15 @@ class JaegerConnectionDecorator extends AbstractConnectionDecorator
 {
     private $tracer;
 
-    public function __construct(Connection $connection, TracerInterface $tracer)
+    /**
+     * @var int|null
+     */
+    private $maxSqlLength;
+
+    public function __construct(Connection $connection, TracerInterface $tracer, ?int $maxSqlLength = null)
     {
         $this->tracer = $tracer;
+        $this->maxSqlLength = $maxSqlLength;
         parent::__construct($connection);
     }
 
@@ -56,7 +62,7 @@ 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($this->cutLongSql($prepareString)))
             ->addTag(new DbalNestingLevelTag($this->getTransactionNestingLevel()));
         try {
             return parent::prepare($prepareString);
@@ -77,7 +83,7 @@ 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($this->cutLongSql($query)))
             ->addTag(new DbalNestingLevelTag($this->getTransactionNestingLevel()));
         try {
             return parent::executeQuery($query, $params, $types, $qcp);
@@ -98,7 +104,7 @@ 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($this->cutLongSql($query)))
             ->addTag(new DbalNestingLevelTag($this->getTransactionNestingLevel()));
         try {
             return parent::executeUpdate($query, $params, $types);
@@ -116,7 +122,7 @@ public function query()
         $args = func_get_args();
         $span = $this->tracer
             ->start('dbal.query')
-            ->addTag(new DbStatementTag($args[0]))
+            ->addTag(new DbStatementTag($this->cutLongSql($args[0])))
             ->addTag(new DbInstanceTag($this->getDatabase()))
             ->addTag(new DbUser($this->getUsername()))
             ->addTag(new DbType($this->getDatabasePlatform()->getName()))
@@ -212,4 +218,13 @@ public function rollBack()
             $span->addTag(new DbalNestingLevelTag($this->getTransactionNestingLevel()))->finish();
         }
     }
+
+    private function cutLongSql(string $string): string
+    {
+        if (null === $this->maxSqlLength) {
+            return $string;
+        }
+
+        return substr($string, 0, $this->maxSqlLength);
+    }
 }

src/Wrapper/JaegerConnectionWrapper.php

@@ -23,13 +23,25 @@ class JaegerConnectionWrapper extends Connection
      */
     private $tracer;
 
+    /**
+     * @var int|null
+     */
+    private $maxSqlLength = null;
+
     public function setTracer(TracerInterface $tracer)
     {
         $this->tracer = $tracer;
 
         return $this;
     }
 
+    public function setMaxSqlLength(?int $maxSqlLength)
+    {
+        $this->maxSqlLength = $maxSqlLength;
+
+        return $this;
+    }
+
     public function connect()
     {
         if ($this->isConnected()) {
@@ -62,7 +74,7 @@ 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($this->cutLongSql($prepareString)))
             ->addTag(new DbalNestingLevelTag($this->getTransactionNestingLevel()));
         try {
             return $this->wrappedPrepare($prepareString);
@@ -85,6 +97,7 @@ private function wrappedPrepare($sql)
 
         $stmt->setFetchMode($this->defaultFetchMode);
         $stmt->setTracer($this->tracer);
+        $stmt->setMaxSqlLength($this->maxSqlLength);
 
         return $stmt;
     }
@@ -97,7 +110,7 @@ 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($this->cutLongSql($query)))
             ->addTag(new DbalNestingLevelTag($this->getTransactionNestingLevel()));
         try {
             return parent::executeQuery($query, $params, $types, $qcp);
@@ -118,7 +131,7 @@ 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($this->cutLongSql($query)))
             ->addTag(new DbalNestingLevelTag($this->getTransactionNestingLevel()));
         try {
             return parent::executeUpdate($query, $params, $types);
@@ -136,7 +149,7 @@ public function query()
         $args = func_get_args();
         $span = $this->tracer
             ->start('dbal.query')
-            ->addTag(new DbStatementTag($args[0]))
+            ->addTag(new DbStatementTag($this->cutLongSql($args[0])))
             ->addTag(new DbInstanceTag($this->getDatabase()))
             ->addTag(new DbUser($this->getUsername()))
             ->addTag(new DbType($this->getDatabasePlatform()->getName()))
@@ -232,4 +245,13 @@ public function rollBack()
             $this->tracer->finish($span->addTag(new DbalNestingLevelTag($this->getTransactionNestingLevel())));
         }
     }
+
+    private function cutLongSql(string $string): string
+    {
+        if (null === $this->maxSqlLength) {
+            return $string;
+        }
+
+        return substr($string, 0, $this->maxSqlLength);
+    }
 }

src/Wrapper/JaegerStatementWrapper.php

@@ -16,18 +16,30 @@ class JaegerStatementWrapper extends Statement
      */
     private $tracer;
 
+    /**
+     * @var int|null
+     */
+    private $maxSqlLength;
+
     public function setTracer(TracerInterface $tracer)
     {
         $this->tracer = $tracer;
 
         return $this;
     }
 
+    public function setMaxSqlLength(?int $maxSqlLength)
+    {
+        $this->maxSqlLength = $maxSqlLength;
+
+        return $this;
+    }
+
     public function execute($params = null)
     {
         $span = $this->tracer
             ->start('dbal.prepare.execute')
-            ->addTag(new DbStatementTag($this->sql));
+            ->addTag(new DbStatementTag($this->cutLongSql($this->sql)));
 
         try {
             return parent::execute($params);
@@ -40,4 +52,13 @@ public function execute($params = null)
             $this->tracer->finish($span);
         }
     }
+
+    private function cutLongSql(string $string): string
+    {
+        if (null === $this->maxSqlLength) {
+            return $string;
+        }
+
+        return substr($string, 0, $this->maxSqlLength);
+    }
 }