Skip to content

fix: improve database read/write connection tracing #1025

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
huangdijia merged 5 commits into from
Nov 21, 2025
Merged

fix: improve database read/write connection tracing #1025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dd15423
fix: improve database read/write connection tracing
huangdijia Nov 21, 2025
5424af3
fix: 优化数据库连接主机和端口的选择逻辑
huangdijia Nov 21, 2025
1aec424
fix: 优化数据库配置获取逻辑以支持更灵活的连接设置
huangdijia Nov 21, 2025
1396619
fix: 使用 array_search 优化数据库主机查找逻辑
huangdijia Nov 21, 2025
e60fe6a
fix: 修复数据库配置获取逻辑以使用正确的主机地址
huangdijia Nov 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/sentry/src/Constants.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ class Constants
{
public const TRACE_CARRIER = 'sentry.tracing.trace_carrier';

public const TRACE_DB_USE_READ_PDO = 'sentry.tracing.db.use_read_pdo';

public const TRACE_DB_SERVER_ADDRESS = 'sentry.tracing.db.server.address';

public const TRACE_DB_SERVER_PORT = 'sentry.tracing.db.server.port';
Expand Down
7 changes: 6 additions & 1 deletion src/sentry/src/Tracing/Aspect/DbConnectionAspect.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,12 @@ class DbConnectionAspect extends AbstractAspect

public function process(ProceedingJoinPoint $proceedingJoinPoint)
{
return tap($proceedingJoinPoint->process(), function ($pdo) {
return tap($proceedingJoinPoint->process(), function ($pdo) use ($proceedingJoinPoint) {
if ($proceedingJoinPoint->methodName === 'getPdoForSelect') {
$arguments = $proceedingJoinPoint->arguments['keys'] ?? [];
Context::set(Constants::TRACE_DB_USE_READ_PDO, $arguments['useReadPdo'] ?? false);
}

Context::getOrSet(self::class, function () use ($pdo) {
$connectionStatus = $pdo->getAttribute(PDO::ATTR_CONNECTION_STATUS);
[$host] = explode(' ', $connectionStatus);
Expand Down
21 changes: 19 additions & 2 deletions src/sentry/src/Tracing/Listener/EventHandleListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,15 +186,32 @@ protected function handleDbQueryExecuted(DbEvent\QueryExecuted $event): void
$data['db.collection.name'] = $sqlParse['table'];
}

// Get port from config
$host = (string) Context::get(Constants::TRACE_DB_SERVER_ADDRESS, 'localhost');
if (! Context::has(Constants::TRACE_DB_SERVER_PORT)) {
$useReadPdo = (bool) Context::get(Constants::TRACE_DB_USE_READ_PDO, false);
$dbConfig = (fn () => $this->config ?? ['host' => $host, 'port' => 3306])->call($event->connection);
$hosts = $dbConfig['write']['host'] ?? [$dbConfig['host']];
$ports = $dbConfig['write']['port'] ?? [$dbConfig['port']];
if ($useReadPdo) {
$hosts = $dbConfig['read']['host'] ?? $hosts;
$ports = $dbConfig['read']['port'] ?? $ports;
}
$index = array_search($host, $hosts, true);
$port = $ports[$index] ?? $ports[0] ?? 3306;
} else {
$port = (int) Context::get(Constants::TRACE_DB_SERVER_PORT);
}

$pool = $this->container->get(PoolFactory::class)->getPool($event->connectionName);
$data += [
'db.pool.name' => $event->connectionName,
'db.pool.max' => $pool->getOption()->getMaxConnections(),
'db.pool.max_idle_time' => $pool->getOption()->getMaxIdleTime(),
'db.pool.idle' => $pool->getConnectionsInChannel(),
'db.pool.using' => $pool->getCurrentConnections(),
'server.address' => (string) Context::get(Constants::TRACE_DB_SERVER_ADDRESS, 'localhost'),
'server.port' => (int) Context::get(Constants::TRACE_DB_SERVER_PORT, 3306),
'server.address' => $host,
'server.port' => $port,
];

if ($this->feature->isTracingTagEnabled('db.sql.bindings', true)) {
Expand Down