Skip to content

feat: add server address tracing for RedisCluster connections #1026

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 2 commits into from
Nov 22, 2025
Merged

feat: add server address tracing for RedisCluster connections #1026

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4a6da6
feat: add server address tracing for RedisCluster connections
huangdijia Nov 22, 2025
0c0e85e
feat: optimize RedisCluster node tracing by consolidating slot retrie…
huangdijia Nov 22, 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
38 changes: 37 additions & 1 deletion src/sentry/src/Tracing/Aspect/RedisConnectionAspect.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
use Hyperf\Di\Aop\ProceedingJoinPoint;
use Redis;
use RedisCluster;
use WeakMap;

use function Hyperf\Tappable\tap;

Expand All @@ -26,6 +27,13 @@ class RedisConnectionAspect extends AbstractAspect
'Hyperf\Redis\RedisConnection::__call',
];

private WeakMap $slotNodeCache;

public function __construct()
{
$this->slotNodeCache = new WeakMap();
}

public function process(ProceedingJoinPoint $proceedingJoinPoint)
{
return tap($proceedingJoinPoint->process(), function ($result) use ($proceedingJoinPoint) {
Expand All @@ -38,8 +46,36 @@ public function process(ProceedingJoinPoint $proceedingJoinPoint)
}

if ($connection instanceof RedisCluster) { // RedisCluster
// TODO: support RedisCluster
$arguments = $proceedingJoinPoint->arguments['keys']['arguments'] ?? [];
$key = $arguments[0] ?? null;
if (is_string($key)) {
$node = $this->getClusterNodeBySlot($connection, $key);
if ($node !== null) {
Context::set(Constants::TRACE_REDIS_SERVER_ADDRESS, $node['host']);
Context::set(Constants::TRACE_REDIS_SERVER_PORT, $node['port']);
}
}
}
});
}

private function getClusterNodeBySlot(RedisCluster $rc, string $key)
{
$slot = $rc->cluster('CLUSTER', 'KEYSLOT', $key);
$slots = ($this->slotNodeCache[$rc] ??= $rc->cluster('CLUSTER', 'SLOTS')); // @phpstan-ignore-line

foreach ($slots as $range) {
[$start, $end, $master] = $range;
if ($slot >= $start && $slot <= $end) {
// $master = [host, port, nodeId]
return [
'host' => $master[0],
'port' => $master[1],
'nodeId' => $master[2] ?? null,
];
}
}

return null;
}
}