From 1537c3d23b95a45332433b3c8bea000922db97e7 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 4 Apr 2022 15:35:31 +0200 Subject: record backtrace when profiling db requests Signed-off-by: Robin Appelman --- lib/composer/composer/autoload_classmap.php | 1 + lib/composer/composer/autoload_static.php | 1 + lib/private/DB/BacktraceDebugStack.php | 34 +++++++++++++++++++++++++++++ lib/private/DB/Connection.php | 3 +-- lib/private/DB/DbDataCollector.php | 5 ++--- 5 files changed, 39 insertions(+), 5 deletions(-) create mode 100644 lib/private/DB/BacktraceDebugStack.php diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php index 2df13618053..7ff7abb6008 100644 --- a/lib/composer/composer/autoload_classmap.php +++ b/lib/composer/composer/autoload_classmap.php @@ -1026,6 +1026,7 @@ return array( 'OC\\DB\\AdapterOCI8' => $baseDir . '/lib/private/DB/AdapterOCI8.php', 'OC\\DB\\AdapterPgSql' => $baseDir . '/lib/private/DB/AdapterPgSql.php', 'OC\\DB\\AdapterSqlite' => $baseDir . '/lib/private/DB/AdapterSqlite.php', + 'OC\\DB\\BacktraceDebugStack' => $baseDir . '/lib/private/DB/BacktraceDebugStack.php', 'OC\\DB\\Connection' => $baseDir . '/lib/private/DB/Connection.php', 'OC\\DB\\ConnectionAdapter' => $baseDir . '/lib/private/DB/ConnectionAdapter.php', 'OC\\DB\\ConnectionFactory' => $baseDir . '/lib/private/DB/ConnectionFactory.php', diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php index cd5d30b3574..989e30ce2e2 100644 --- a/lib/composer/composer/autoload_static.php +++ b/lib/composer/composer/autoload_static.php @@ -1055,6 +1055,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c 'OC\\DB\\AdapterOCI8' => __DIR__ . '/../../..' . '/lib/private/DB/AdapterOCI8.php', 'OC\\DB\\AdapterPgSql' => __DIR__ . '/../../..' . '/lib/private/DB/AdapterPgSql.php', 'OC\\DB\\AdapterSqlite' => __DIR__ . '/../../..' . '/lib/private/DB/AdapterSqlite.php', + 'OC\\DB\\BacktraceDebugStack' => __DIR__ . '/../../..' . '/lib/private/DB/BacktraceDebugStack.php', 'OC\\DB\\Connection' => __DIR__ . '/../../..' . '/lib/private/DB/Connection.php', 'OC\\DB\\ConnectionAdapter' => __DIR__ . '/../../..' . '/lib/private/DB/ConnectionAdapter.php', 'OC\\DB\\ConnectionFactory' => __DIR__ . '/../../..' . '/lib/private/DB/ConnectionFactory.php', diff --git a/lib/private/DB/BacktraceDebugStack.php b/lib/private/DB/BacktraceDebugStack.php new file mode 100644 index 00000000000..be37e5a35da --- /dev/null +++ b/lib/private/DB/BacktraceDebugStack.php @@ -0,0 +1,34 @@ + + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +namespace OC\DB; + +use Doctrine\DBAL\Logging\DebugStack; + +class BacktraceDebugStack extends DebugStack { + public function startQuery($sql, ?array $params = null, ?array $types = null) { + parent::startQuery($sql, $params, $types); + $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); + $this->queries[$this->currentQuery]['backtrace'] = $backtrace; + } +} diff --git a/lib/private/DB/Connection.php b/lib/private/DB/Connection.php index 2e38b1ddf5e..22c2bbbb793 100644 --- a/lib/private/DB/Connection.php +++ b/lib/private/DB/Connection.php @@ -42,7 +42,6 @@ use Doctrine\DBAL\Driver; use Doctrine\DBAL\Exception; use Doctrine\DBAL\Exception\ConstraintViolationException; use Doctrine\DBAL\Exception\NotNullConstraintViolationException; -use Doctrine\DBAL\Logging\DebugStack; use Doctrine\DBAL\Platforms\MySQLPlatform; use Doctrine\DBAL\Platforms\OraclePlatform; use Doctrine\DBAL\Platforms\PostgreSQL94Platform; @@ -113,7 +112,7 @@ class Connection extends \Doctrine\DBAL\Connection { if ($profiler->isEnabled()) { $this->dbDataCollector = new DbDataCollector($this); $profiler->add($this->dbDataCollector); - $debugStack = new DebugStack(); + $debugStack = new BacktraceDebugStack(); $this->dbDataCollector->setDebugStack($debugStack); $this->_config->setSQLLogger($debugStack); } diff --git a/lib/private/DB/DbDataCollector.php b/lib/private/DB/DbDataCollector.php index d708955b10e..60e3dbe797d 100644 --- a/lib/private/DB/DbDataCollector.php +++ b/lib/private/DB/DbDataCollector.php @@ -25,14 +25,13 @@ declare(strict_types = 1); namespace OC\DB; -use Doctrine\DBAL\Logging\DebugStack; use Doctrine\DBAL\Types\ConversionException; use Doctrine\DBAL\Types\Type; use OC\AppFramework\Http\Request; use OCP\AppFramework\Http\Response; class DbDataCollector extends \OCP\DataCollector\AbstractDataCollector { - protected ?DebugStack $debugStack = null; + protected ?BacktraceDebugStack $debugStack = null; private Connection $connection; /** @@ -42,7 +41,7 @@ class DbDataCollector extends \OCP\DataCollector\AbstractDataCollector { $this->connection = $connection; } - public function setDebugStack(DebugStack $debugStack, $name = 'default'): void { + public function setDebugStack(BacktraceDebugStack $debugStack, $name = 'default'): void { $this->debugStack = $debugStack; } -- cgit v1.2.3