diff --git a/src/sentry/src/ConfigProvider.php b/src/sentry/src/ConfigProvider.php index 5a24ed040..c2b1caf19 100644 --- a/src/sentry/src/ConfigProvider.php +++ b/src/sentry/src/ConfigProvider.php @@ -33,6 +33,7 @@ public function __invoke(): array Tracing\Aspect\CoordinatorAspect::class, Tracing\Aspect\CoroutineAspect::class, Tracing\Aspect\DbAspect::class, + Tracing\Aspect\DbConnectionAspect::class, Tracing\Aspect\ElasticsearchAspect::class, Tracing\Aspect\ElasticsearchRequestAspect::class, Tracing\Aspect\FilesystemAspect::class, diff --git a/src/sentry/src/Constants.php b/src/sentry/src/Constants.php index 40e8dff2a..735f4417a 100644 --- a/src/sentry/src/Constants.php +++ b/src/sentry/src/Constants.php @@ -15,6 +15,10 @@ class Constants { public const TRACE_CARRIER = 'sentry.tracing.trace_carrier'; + public const TRACE_DB_SERVER_ADDRESS = 'sentry.tracing.db.server.address'; + + public const TRACE_DB_SERVER_PORT = 'sentry.tracing.db.server.port'; + public const TRACE_REDIS_SERVER_ADDRESS = 'sentry.tracing.redis.server.address'; public const TRACE_REDIS_SERVER_PORT = 'sentry.tracing.redis.server.port'; diff --git a/src/sentry/src/Tracing/Aspect/DbConnectionAspect.php b/src/sentry/src/Tracing/Aspect/DbConnectionAspect.php new file mode 100644 index 000000000..109f573e1 --- /dev/null +++ b/src/sentry/src/Tracing/Aspect/DbConnectionAspect.php @@ -0,0 +1,42 @@ +process(), function ($pdo) { + Context::getOrSet(self::class, function () use ($pdo) { + $connectionStatus = $pdo->getAttribute(PDO::ATTR_CONNECTION_STATUS); + [$host] = explode(' ', $connectionStatus); + + Context::set(Constants::TRACE_DB_SERVER_ADDRESS, $host); + + return true; + }); + }); + } +} diff --git a/src/sentry/src/Tracing/Listener/EventHandleListener.php b/src/sentry/src/Tracing/Listener/EventHandleListener.php index 0a4159229..71e3ac35a 100644 --- a/src/sentry/src/Tracing/Listener/EventHandleListener.php +++ b/src/sentry/src/Tracing/Listener/EventHandleListener.php @@ -193,6 +193,8 @@ protected function handleDbQueryExecuted(DbEvent\QueryExecuted $event): void '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), ]; if ($this->feature->isTracingTagEnabled('db.sql.bindings', true)) {