From d1e8c7ea963d42460045c9189c4e793a91a8af67 Mon Sep 17 00:00:00 2001
From: Deeka Wong <8337659+huangdijia@users.noreply.github.com>
Date: Fri, 21 Nov 2025 14:48:32 +0800
Subject: [PATCH 1/2] feat: add server address tracing for database connections

- Add DbConnectionAspect to capture database server address and port
- Add TRACE_DB_SERVER_ADDRESS and TRACE_DB_SERVER_PORT constants
- Register DbConnectionAspect in ConfigProvider
- Update EventHandleListener to include server.address and server.port in tracing data

This implements similar functionality to Redis server tracing for database connections.
---
 src/sentry/src/ConfigProvider.php             |  1 +
 src/sentry/src/Constants.php                  |  4 ++
 .../src/Tracing/Aspect/DbConnectionAspect.php | 41 +++++++++++++++++++
 .../Tracing/Listener/EventHandleListener.php  |  2 +
 4 files changed, 48 insertions(+)
 create mode 100644 src/sentry/src/Tracing/Aspect/DbConnectionAspect.php

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..3bf1dc440
--- /dev/null
+++ b/src/sentry/src/Tracing/Aspect/DbConnectionAspect.php
@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of friendsofhyperf/components.
+ *
+ * @link     https://github.com/friendsofhyperf/components
+ * @document https://github.com/friendsofhyperf/components/blob/main/README.md
+ * @contact  huangdijia@gmail.com
+ */
+
+namespace FriendsOfHyperf\Sentry\Tracing\Aspect;
+
+use FriendsOfHyperf\Sentry\Constants;
+use Hyperf\Context\Context;
+use Hyperf\Di\Aop\AbstractAspect;
+use Hyperf\Di\Aop\ProceedingJoinPoint;
+use PDO;
+
+use function Hyperf\Tappable\tap;
+
+class DbConnectionAspect extends AbstractAspect
+{
+    public array $classes = [
+        'Hyperf\Database\Connection::getPdoForSelect',
+        'Hyperf\Database\Connection::getPdo',
+    ];
+
+    public function process(ProceedingJoinPoint $proceedingJoinPoint)
+    {
+        return tap($proceedingJoinPoint->process(), function ($pdo) {
+            if (! Context::get(self::class . '.executed')) {
+                $connectionStatus = $pdo->getAttribute(PDO::ATTR_CONNECTION_STATUS);
+                [$host] = explode(' ', $connectionStatus);
+
+                Context::set(Constants::TRACE_DB_SERVER_ADDRESS, $host);
+                Context::set(self::class . '.executed', 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)) {

From 1c94a44bff53b51dc362665901d6616234f2a895 Mon Sep 17 00:00:00 2001
From: Deeka Wong <8337659+huangdijia@users.noreply.github.com>
Date: Fri, 21 Nov 2025 15:18:32 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=20DbConnectionAs?=
 =?UTF-8?q?pect=20=E4=BB=A5=E7=AE=80=E5=8C=96=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E7=8A=B6=E6=80=81=E8=BF=BD=E8=B8=AA=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/sentry/src/Tracing/Aspect/DbConnectionAspect.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/sentry/src/Tracing/Aspect/DbConnectionAspect.php b/src/sentry/src/Tracing/Aspect/DbConnectionAspect.php
index 3bf1dc440..109f573e1 100644
--- a/src/sentry/src/Tracing/Aspect/DbConnectionAspect.php
+++ b/src/sentry/src/Tracing/Aspect/DbConnectionAspect.php
@@ -29,13 +29,14 @@ class DbConnectionAspect extends AbstractAspect
     public function process(ProceedingJoinPoint $proceedingJoinPoint)
     {
         return tap($proceedingJoinPoint->process(), function ($pdo) {
-            if (! Context::get(self::class . '.executed')) {
+            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);
-                Context::set(self::class . '.executed', true);
-            }
+
+                return true;
+            });
         });
     }
 }