Skip to content

Commit 5ec07d5

Browse files
author
drewblin
committed
Add limit for sql length
1 parent a8592af commit 5ec07d5

File tree

3 files changed

+24
-9
lines changed

3 files changed

+24
-9
lines changed

‎src/Decorator/JaegerConnectionDecorator.php‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public function prepare($prepareString)
5656
->addTag(new DbUser($this->getUsername()))
5757
->addTag(new DbType($this->getDatabasePlatform()->getName()))
5858
->addTag(new DbalAutoCommitTag($this->isAutoCommit()))
59-
->addTag(new DbStatementTag($prepareString))
59+
->addTag(new DbStatementTag($this->cutLongSql($prepareString)))
6060
->addTag(new DbalNestingLevelTag($this->getTransactionNestingLevel()));
6161
try {
6262
return parent::prepare($prepareString);
@@ -77,7 +77,7 @@ public function executeQuery($query, array $params = [], $types = [], QueryCache
7777
->addTag(new DbUser($this->getUsername()))
7878
->addTag(new DbType($this->getDatabasePlatform()->getName()))
7979
->addTag(new DbalAutoCommitTag($this->isAutoCommit()))
80-
->addTag(new DbStatementTag($query))
80+
->addTag(new DbStatementTag($this->cutLongSql($query)))
8181
->addTag(new DbalNestingLevelTag($this->getTransactionNestingLevel()));
8282
try {
8383
return parent::executeQuery($query, $params, $types, $qcp);
@@ -98,7 +98,7 @@ public function executeUpdate($query, array $params = [], array $types = [])
9898
->addTag(new DbUser($this->getUsername()))
9999
->addTag(new DbType($this->getDatabasePlatform()->getName()))
100100
->addTag(new DbalAutoCommitTag($this->isAutoCommit()))
101-
->addTag(new DbStatementTag($query))
101+
->addTag(new DbStatementTag($this->cutLongSql($query)))
102102
->addTag(new DbalNestingLevelTag($this->getTransactionNestingLevel()));
103103
try {
104104
return parent::executeUpdate($query, $params, $types);
@@ -116,7 +116,7 @@ public function query()
116116
$args = func_get_args();
117117
$span = $this->tracer
118118
->start('dbal.query')
119-
->addTag(new DbStatementTag($args[0]))
119+
->addTag(new DbStatementTag($this->cutLongSql($args[0])))
120120
->addTag(new DbInstanceTag($this->getDatabase()))
121121
->addTag(new DbUser($this->getUsername()))
122122
->addTag(new DbType($this->getDatabasePlatform()->getName()))
@@ -212,4 +212,9 @@ public function rollBack()
212212
$span->addTag(new DbalNestingLevelTag($this->getTransactionNestingLevel()))->finish();
213213
}
214214
}
215+
216+
private function cutLongSql(string $string): string
217+
{
218+
return substr($string, 0, 200);
219+
}
215220
}

‎src/Wrapper/JaegerConnectionWrapper.php‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public function prepare($prepareString)
6262
->addTag(new DbUser($this->getUsername()))
6363
->addTag(new DbType($this->getDatabasePlatform()->getName()))
6464
->addTag(new DbalAutoCommitTag($this->isAutoCommit()))
65-
->addTag(new DbStatementTag($prepareString))
65+
->addTag(new DbStatementTag($this->cutLongSql($prepareString)))
6666
->addTag(new DbalNestingLevelTag($this->getTransactionNestingLevel()));
6767
try {
6868
return $this->wrappedPrepare($prepareString);
@@ -97,7 +97,7 @@ public function executeQuery($query, array $params = [], $types = [], QueryCache
9797
->addTag(new DbUser($this->getUsername()))
9898
->addTag(new DbType($this->getDatabasePlatform()->getName()))
9999
->addTag(new DbalAutoCommitTag($this->isAutoCommit()))
100-
->addTag(new DbStatementTag($query))
100+
->addTag(new DbStatementTag($this->cutLongSql($query)))
101101
->addTag(new DbalNestingLevelTag($this->getTransactionNestingLevel()));
102102
try {
103103
return parent::executeQuery($query, $params, $types, $qcp);
@@ -118,7 +118,7 @@ public function executeUpdate($query, array $params = [], array $types = [])
118118
->addTag(new DbUser($this->getUsername()))
119119
->addTag(new DbType($this->getDatabasePlatform()->getName()))
120120
->addTag(new DbalAutoCommitTag($this->isAutoCommit()))
121-
->addTag(new DbStatementTag($query))
121+
->addTag(new DbStatementTag($this->cutLongSql($query)))
122122
->addTag(new DbalNestingLevelTag($this->getTransactionNestingLevel()));
123123
try {
124124
return parent::executeUpdate($query, $params, $types);
@@ -136,7 +136,7 @@ public function query()
136136
$args = func_get_args();
137137
$span = $this->tracer
138138
->start('dbal.query')
139-
->addTag(new DbStatementTag($args[0]))
139+
->addTag(new DbStatementTag($this->cutLongSql($args[0])))
140140
->addTag(new DbInstanceTag($this->getDatabase()))
141141
->addTag(new DbUser($this->getUsername()))
142142
->addTag(new DbType($this->getDatabasePlatform()->getName()))
@@ -232,4 +232,9 @@ public function rollBack()
232232
$this->tracer->finish($span->addTag(new DbalNestingLevelTag($this->getTransactionNestingLevel())));
233233
}
234234
}
235+
236+
private function cutLongSql(string $string): string
237+
{
238+
return substr($string, 0, 200);
239+
}
235240
}

‎src/Wrapper/JaegerStatementWrapper.php‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function execute($params = null)
2727
{
2828
$span = $this->tracer
2929
->start('dbal.prepare.execute')
30-
->addTag(new DbStatementTag($this->sql));
30+
->addTag(new DbStatementTag($this->cutLongSql($this->sql)));
3131

3232
try {
3333
return parent::execute($params);
@@ -40,4 +40,9 @@ public function execute($params = null)
4040
$this->tracer->finish($span);
4141
}
4242
}
43+
44+
private function cutLongSql(string $string): string
45+
{
46+
return substr($string, 0, 200);
47+
}
4348
}

0 commit comments

Comments
 (0)