From 59e6e4b0c339b7bb3245f2a1dc595b82a8acbc4c Mon Sep 17 00:00:00 2001 From: Deeka Wong <8337659+huangdijia@users.noreply.github.com> Date: Wed, 3 Dec 2025 13:30:42 +0800 Subject: [PATCH 01/22] refactor: centralize context management in Sentry integration - Add new Context class to replace Hyperf Context usage - Move all Sentry-specific context constants to Context class - Update all tracing aspects to use centralized context management - Deprecate old Feature class methods in favor of Context class - Standardize server address/port handling across all components - Improve code organization and maintainability This refactor centralizes all context management for Sentry integration, making it easier to maintain and understand the context flow. --- src/sentry/src/Context.php | 172 ++++++++++++++++++ .../Crons/Listener/EventHandleListener.php | 13 +- src/sentry/src/Feature.php | 6 + .../Aspect/AsyncQueueJobMessageAspect.php | 7 +- .../src/Tracing/Aspect/CoroutineAspect.php | 3 +- src/sentry/src/Tracing/Aspect/DbAspect.php | 11 +- .../src/Tracing/Aspect/DbConnectionAspect.php | 6 +- .../Tracing/Aspect/ElasticsearchAspect.php | 7 +- .../Aspect/ElasticsearchRequestAspect.php | 7 +- .../Tracing/Aspect/RedisConnectionAspect.php | 11 +- src/sentry/src/Tracing/Aspect/RpcAspect.php | 5 +- .../src/Tracing/Aspect/RpcEndpointAspect.php | 15 +- .../Tracing/Listener/EventHandleListener.php | 9 +- types/Sentry/Sentry.php | 3 - 14 files changed, 224 insertions(+), 51 deletions(-) create mode 100644 src/sentry/src/Context.php diff --git a/src/sentry/src/Context.php b/src/sentry/src/Context.php new file mode 100644 index 000000000..b2ed760d1 --- /dev/null +++ b/src/sentry/src/Context.php @@ -0,0 +1,172 @@ +config->get('sentry.crons.enable', true); } + /** + * @deprecated since v3.1, will be removed in v3.2, use `\FriendsOfHyperf\Sentry\Context::disableTracing()` instead. + */ public static function disableCoroutineTracing(): void { Context::set(Constants::DISABLE_COROUTINE_TRACING, true); } + /** + * @deprecated since v3.1, will be removed in v3.2, use `\FriendsOfHyperf\Sentry\Context::isDisableTracing()` instead. + */ public static function isDisableCoroutineTracing(): bool { return (bool) Context::get(Constants::DISABLE_COROUTINE_TRACING); diff --git a/src/sentry/src/Tracing/Aspect/AsyncQueueJobMessageAspect.php b/src/sentry/src/Tracing/Aspect/AsyncQueueJobMessageAspect.php index c8e712883..897af4266 100644 --- a/src/sentry/src/Tracing/Aspect/AsyncQueueJobMessageAspect.php +++ b/src/sentry/src/Tracing/Aspect/AsyncQueueJobMessageAspect.php @@ -12,6 +12,7 @@ namespace FriendsOfHyperf\Sentry\Tracing\Aspect; use FriendsOfHyperf\Sentry\Constants; +use FriendsOfHyperf\Sentry\Context as SentryContext; use FriendsOfHyperf\Sentry\Feature; use FriendsOfHyperf\Sentry\Util\Carrier; use Hyperf\AsyncQueue\Driver\RedisDriver; @@ -106,7 +107,7 @@ function (Scope $scope) use ($proceedingJoinPoint, $messageId, $destinationName, $carrier = Carrier::fromArray([])->with($extra); } - Context::set(Constants::TRACE_CARRIER, $carrier); + SentryContext::setCarrier($carrier); return $proceedingJoinPoint->process(); }, @@ -140,7 +141,7 @@ protected function buildSpanDataOfRedisDriver(RedisDriver $driver): array protected function handleSerialize(ProceedingJoinPoint $proceedingJoinPoint) { return with($proceedingJoinPoint->process(), function ($result) { - if (is_array($result) && $carrier = Context::get(Constants::TRACE_CARRIER)) { + if (is_array($result) && $carrier = SentryContext::getCarrier()) { if (array_is_list($result)) { $result[] = $carrier->toJson(); } elseif (isset($result['job'])) { @@ -164,7 +165,7 @@ protected function handleUnserialize(ProceedingJoinPoint $proceedingJoinPoint) /** @var null|string $carrier */ if ($carrier) { - Context::set(Constants::TRACE_CARRIER, Carrier::fromJson($carrier)); + SentryContext::setCarrier(Carrier::fromJson($carrier)); } return $proceedingJoinPoint->process(); diff --git a/src/sentry/src/Tracing/Aspect/CoroutineAspect.php b/src/sentry/src/Tracing/Aspect/CoroutineAspect.php index 0d08c224e..c6603b982 100644 --- a/src/sentry/src/Tracing/Aspect/CoroutineAspect.php +++ b/src/sentry/src/Tracing/Aspect/CoroutineAspect.php @@ -11,6 +11,7 @@ namespace FriendsOfHyperf\Sentry\Tracing\Aspect; +use FriendsOfHyperf\Sentry\Context as SentryContext; use FriendsOfHyperf\Sentry\Feature; use FriendsOfHyperf\Sentry\Integration; use FriendsOfHyperf\Sentry\Util\CoroutineBacktraceHelper; @@ -46,7 +47,7 @@ public function process(ProceedingJoinPoint $proceedingJoinPoint) { if ( ! $this->feature->isTracingSpanEnabled('coroutine') - || Feature::isDisableCoroutineTracing() + || SentryContext::isTracingDisabled() ) { return $proceedingJoinPoint->process(); } diff --git a/src/sentry/src/Tracing/Aspect/DbAspect.php b/src/sentry/src/Tracing/Aspect/DbAspect.php index a0e149272..eb1ea175a 100644 --- a/src/sentry/src/Tracing/Aspect/DbAspect.php +++ b/src/sentry/src/Tracing/Aspect/DbAspect.php @@ -11,10 +11,9 @@ namespace FriendsOfHyperf\Sentry\Tracing\Aspect; -use FriendsOfHyperf\Sentry\Constants; +use FriendsOfHyperf\Sentry\Context as SentryContext; use FriendsOfHyperf\Sentry\Feature; use FriendsOfHyperf\Sentry\Util\SqlParser; -use Hyperf\Context\Context; use Hyperf\DB\Pool\PoolFactory; use Hyperf\Di\Aop\AbstractAspect; use Hyperf\Di\Aop\ProceedingJoinPoint; @@ -71,8 +70,8 @@ public function process(ProceedingJoinPoint $proceedingJoinPoint) /** @var \Hyperf\DB\AbstractConnection $connection */ $server = $this->serverCache[$connection] ?? null; if ($server !== null) { - Context::set(Constants::TRACE_DB_SERVER_ADDRESS, $server['host'] ?? 'localhost'); - Context::set(Constants::TRACE_DB_SERVER_PORT, $server['port'] ?? 3306); + SentryContext::setServerAddress($server['host'] ?? 'localhost'); + SentryContext::setServerPort((int) ($server['port'] ?? 3306)); } }); } @@ -108,8 +107,8 @@ public function process(ProceedingJoinPoint $proceedingJoinPoint) 'db.pool.max_idle_time' => $pool->getOption()->getMaxIdleTime(), 'db.pool.idle' => $pool->getConnectionsInChannel(), 'db.pool.using' => $pool->getCurrentConnections(), - 'server.host' => Context::get(Constants::TRACE_DB_SERVER_ADDRESS, 'localhost'), - 'server.port' => Context::get(Constants::TRACE_DB_SERVER_PORT, 3306), + 'server.host' => SentryContext::getDbServerAddress() ?? 'localhost', + 'server.port' => SentryContext::getDbServerPort() ?? 3306, ]; if ($this->feature->isTracingTagEnabled('db.sql.bindings', true)) { diff --git a/src/sentry/src/Tracing/Aspect/DbConnectionAspect.php b/src/sentry/src/Tracing/Aspect/DbConnectionAspect.php index 18bf171aa..8166d2a26 100644 --- a/src/sentry/src/Tracing/Aspect/DbConnectionAspect.php +++ b/src/sentry/src/Tracing/Aspect/DbConnectionAspect.php @@ -11,7 +11,7 @@ namespace FriendsOfHyperf\Sentry\Tracing\Aspect; -use FriendsOfHyperf\Sentry\Constants; +use FriendsOfHyperf\Sentry\Context as SentryContext; use FriendsOfHyperf\Sentry\Feature; use Hyperf\Context\Context; use Hyperf\Di\Aop\AbstractAspect; @@ -57,8 +57,8 @@ public function process(ProceedingJoinPoint $proceedingJoinPoint) $server = $this->serverCache[$pdo] ?? null; if (is_array($server)) { - Context::set(Constants::TRACE_DB_SERVER_ADDRESS, $server['host']); - Context::set(Constants::TRACE_DB_SERVER_PORT, $server['port']); + SentryContext::setDbServerAddress($server['host']); + SentryContext::setDbServerPort((int) $server['port']); } return true; diff --git a/src/sentry/src/Tracing/Aspect/ElasticsearchAspect.php b/src/sentry/src/Tracing/Aspect/ElasticsearchAspect.php index c5154e504..499db8afd 100644 --- a/src/sentry/src/Tracing/Aspect/ElasticsearchAspect.php +++ b/src/sentry/src/Tracing/Aspect/ElasticsearchAspect.php @@ -11,9 +11,8 @@ namespace FriendsOfHyperf\Sentry\Tracing\Aspect; -use FriendsOfHyperf\Sentry\Constants; +use FriendsOfHyperf\Sentry\Context as SentryContext; use FriendsOfHyperf\Sentry\Feature; -use Hyperf\Context\Context; use Hyperf\Di\Aop\AbstractAspect; use Hyperf\Di\Aop\ProceedingJoinPoint; use Sentry\State\Scope; @@ -72,8 +71,8 @@ function (Scope $scope) use ($proceedingJoinPoint) { ]); } - $data = (array) Context::get(Constants::TRACE_ELASTICSEARCH_REQUEST_DATA, []); - $scope->getSpan()?->setData($data); + $data = (array) SentryContext::getSpanData(); + $data && $scope->getSpan()?->setData($data); }); }, SpanContext::make() diff --git a/src/sentry/src/Tracing/Aspect/ElasticsearchRequestAspect.php b/src/sentry/src/Tracing/Aspect/ElasticsearchRequestAspect.php index 844de3b76..d2fdf0f32 100644 --- a/src/sentry/src/Tracing/Aspect/ElasticsearchRequestAspect.php +++ b/src/sentry/src/Tracing/Aspect/ElasticsearchRequestAspect.php @@ -11,9 +11,8 @@ namespace FriendsOfHyperf\Sentry\Tracing\Aspect; -use FriendsOfHyperf\Sentry\Constants; +use FriendsOfHyperf\Sentry\Context as SentryContext; use FriendsOfHyperf\Sentry\Feature; -use Hyperf\Context\Context; use Hyperf\Di\Aop\AbstractAspect; use Hyperf\Di\Aop\ProceedingJoinPoint; use Psr\Http\Message\RequestInterface; @@ -46,7 +45,7 @@ public function process(ProceedingJoinPoint $proceedingJoinPoint) 'http.request.method' => $request->getMethod(), 'url.full' => $this->getFullUrl($request), ]; - Context::set(Constants::TRACE_ELASTICSEARCH_REQUEST_DATA, $data); + SentryContext::setSpanData($data); } } @@ -60,7 +59,7 @@ public function process(ProceedingJoinPoint $proceedingJoinPoint) 'http.request.method' => $lastConnection->getLastRequestInfo()['request']['http_method'] ?? 'GET', 'url.full' => $lastConnection->getLastRequestInfo()['response']['effective_url'] ?? '', ]; - Context::set(Constants::TRACE_ELASTICSEARCH_REQUEST_DATA, $data); + SentryContext::setSpanData($data); } }); } diff --git a/src/sentry/src/Tracing/Aspect/RedisConnectionAspect.php b/src/sentry/src/Tracing/Aspect/RedisConnectionAspect.php index 23b1a5e7e..f10ae0541 100644 --- a/src/sentry/src/Tracing/Aspect/RedisConnectionAspect.php +++ b/src/sentry/src/Tracing/Aspect/RedisConnectionAspect.php @@ -11,10 +11,9 @@ namespace FriendsOfHyperf\Sentry\Tracing\Aspect; -use FriendsOfHyperf\Sentry\Constants; +use FriendsOfHyperf\Sentry\Context as SentryContext; use FriendsOfHyperf\Sentry\Feature; use FriendsOfHyperf\Sentry\Util\RedisClusterKeySlot; -use Hyperf\Context\Context; use Hyperf\Di\Aop\AbstractAspect; use Hyperf\Di\Aop\ProceedingJoinPoint; use Redis; @@ -47,8 +46,8 @@ public function process(ProceedingJoinPoint $proceedingJoinPoint) $connection = (fn () => $this->connection ?? null)->call($redisConnection); if ($connection instanceof Redis) { // Redis or RedisSentinel - Context::set(Constants::TRACE_REDIS_SERVER_ADDRESS, $connection->getHost()); - Context::set(Constants::TRACE_REDIS_SERVER_PORT, $connection->getPort()); + SentryContext::setRedisServerAddress($connection->getHost()); + SentryContext::setRedisServerPort($connection->getPort()); } if ($connection instanceof RedisCluster) { // RedisCluster @@ -57,8 +56,8 @@ public function process(ProceedingJoinPoint $proceedingJoinPoint) 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']); + SentryContext::setRedisServerAddress($node['host']); + SentryContext::setRedisServerPort((int) $node['port']); } } } diff --git a/src/sentry/src/Tracing/Aspect/RpcAspect.php b/src/sentry/src/Tracing/Aspect/RpcAspect.php index 51aa90a0e..be942b0a4 100644 --- a/src/sentry/src/Tracing/Aspect/RpcAspect.php +++ b/src/sentry/src/Tracing/Aspect/RpcAspect.php @@ -12,6 +12,7 @@ namespace FriendsOfHyperf\Sentry\Tracing\Aspect; use FriendsOfHyperf\Sentry\Constants; +use FriendsOfHyperf\Sentry\Context as SentryContext; use FriendsOfHyperf\Sentry\Feature; use FriendsOfHyperf\Sentry\Util\Carrier; use Hyperf\Context\Context; @@ -118,8 +119,8 @@ function (Scope $scope) use ($proceedingJoinPoint) { } if (Context::has(Constants::TRACE_RPC_SERVER_ADDRESS)) { $span?->setData([ - 'server.address' => Context::get(Constants::TRACE_RPC_SERVER_ADDRESS), - 'server.port' => Context::get(Constants::TRACE_RPC_SERVER_PORT), + 'server.address' => SentryContext::getRpcServerAddress(), + 'server.port' => SentryContext::getRpcServerPort(), ]); } }); diff --git a/src/sentry/src/Tracing/Aspect/RpcEndpointAspect.php b/src/sentry/src/Tracing/Aspect/RpcEndpointAspect.php index 9388ed283..5bb5991e7 100644 --- a/src/sentry/src/Tracing/Aspect/RpcEndpointAspect.php +++ b/src/sentry/src/Tracing/Aspect/RpcEndpointAspect.php @@ -11,9 +11,8 @@ namespace FriendsOfHyperf\Sentry\Tracing\Aspect; -use FriendsOfHyperf\Sentry\Constants; +use FriendsOfHyperf\Sentry\Context as SentryContext; use FriendsOfHyperf\Sentry\Feature; -use Hyperf\Context\Context; use Hyperf\Di\Aop\AbstractAspect; use Hyperf\Di\Aop\ProceedingJoinPoint; @@ -40,13 +39,13 @@ public function process(ProceedingJoinPoint $proceedingJoinPoint) // RpcMultiplex if ($result instanceof \Hyperf\RpcMultiplex\Socket) { - Context::set(Constants::TRACE_RPC_SERVER_ADDRESS, $result->getName()); - Context::set(Constants::TRACE_RPC_SERVER_PORT, $result->getPort()); + SentryContext::setServerAddress($result->getName()); + SentryContext::setServerPort($result->getPort()); } // JsonRpcHttpTransporter if ($result instanceof \Hyperf\LoadBalancer\Node) { - Context::set(Constants::TRACE_RPC_SERVER_ADDRESS, $result->host); - Context::set(Constants::TRACE_RPC_SERVER_PORT, $result->port); + SentryContext::setServerAddress($result->host); + SentryContext::setServerPort($result->port); } // JsonRpcPoolTransporter if ($result instanceof \Hyperf\JsonRpc\Pool\RpcConnection) { @@ -56,8 +55,8 @@ public function process(ProceedingJoinPoint $proceedingJoinPoint) /** @var null|\Hyperf\Engine\Contract\Socket\SocketOptionInterface $option */ $option = $socket->getSocketOption(); if ($option instanceof \Hyperf\Engine\Contract\Socket\SocketOptionInterface) { - Context::set(Constants::TRACE_RPC_SERVER_ADDRESS, $option->getHost()); - Context::set(Constants::TRACE_RPC_SERVER_PORT, $option->getPort()); + SentryContext::setRpcServerAddress($option->getHost()); + SentryContext::setRpcServerPort($option->getPort()); } } } diff --git a/src/sentry/src/Tracing/Listener/EventHandleListener.php b/src/sentry/src/Tracing/Listener/EventHandleListener.php index 71e3ac35a..29203aa06 100644 --- a/src/sentry/src/Tracing/Listener/EventHandleListener.php +++ b/src/sentry/src/Tracing/Listener/EventHandleListener.php @@ -13,6 +13,7 @@ use Closure; use FriendsOfHyperf\Sentry\Constants; +use FriendsOfHyperf\Sentry\Context as SentryContext; use FriendsOfHyperf\Sentry\Feature; use FriendsOfHyperf\Sentry\Integration; use FriendsOfHyperf\Sentry\Util\Carrier; @@ -193,8 +194,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), + 'server.address' => SentryContext::getDbServerAddress() ?? 'localhost', + 'server.port' => SentryContext::getDbServerPort() ?? 3306, ]; if ($this->feature->isTracingTagEnabled('db.sql.bindings', true)) { @@ -499,8 +500,8 @@ function (Scope $scope) use ($event) { 'db.redis.pool.idle' => $pool->getConnectionsInChannel(), 'db.redis.pool.using' => $pool->getCurrentConnections(), 'duration' => $event->time * 1000, - 'server.address' => (string) Context::get(Constants::TRACE_REDIS_SERVER_ADDRESS, 'localhost'), - 'server.port' => (int) Context::get(Constants::TRACE_REDIS_SERVER_PORT, 6379), + 'server.address' => SentryContext::getRedisServerAddress() ?? 'localhost', + 'server.port' => SentryContext::getRedisServerPort() ?? 6379, ]) ->setStartTimestamp(microtime(true) - $event->time / 1000) ); diff --git a/types/Sentry/Sentry.php b/types/Sentry/Sentry.php index 57d1adae7..4c5597387 100644 --- a/types/Sentry/Sentry.php +++ b/types/Sentry/Sentry.php @@ -139,9 +139,6 @@ public function close(?int $timeout = null): Result assertType('bool', $feature->isTracingTagEnabled('foo')); assertType('bool', $feature->isCronsEnabled()); -Feature::disableCoroutineTracing(); -assertType('bool', Feature::isDisableCoroutineTracing()); - $switcher = new Switcher($config); assertType('bool', $switcher->isEnable('foo')); assertType('bool', $switcher->isExceptionIgnored(RuntimeException::class)); From f3515f4c1f8c05e72ea825d7e5687c32ef372031 Mon Sep 17 00:00:00 2001 From: Deeka Wong <8337659+huangdijia@users.noreply.github.com> Date: Wed, 3 Dec 2025 13:35:58 +0800 Subject: [PATCH 02/22] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=96=B0=E8=8E=B7?= =?UTF-8?q?=E5=8F=96Carrier=E7=9A=84=E6=96=B9=E6=B3=95=E4=BB=A5=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E5=8D=8F=E7=A8=8BID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sentry/src/Context.php | 4 ++-- src/sentry/src/Tracing/Listener/EventHandleListener.php | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/sentry/src/Context.php b/src/sentry/src/Context.php index b2ed760d1..9d17bfc30 100644 --- a/src/sentry/src/Context.php +++ b/src/sentry/src/Context.php @@ -75,9 +75,9 @@ public static function setCarrier(Carrier $carrier): void Ctx::set(self::TRACE_CARRIER, $carrier); } - public static function getCarrier(): ?Carrier + public static function getCarrier(?int $coroutineId = null): ?Carrier { - return Ctx::get(self::TRACE_CARRIER); + return Ctx::get(self::TRACE_CARRIER, coroutineId: $coroutineId); } public static function setRedisServerAddress(string $address): void diff --git a/src/sentry/src/Tracing/Listener/EventHandleListener.php b/src/sentry/src/Tracing/Listener/EventHandleListener.php index 29203aa06..f8e08a07f 100644 --- a/src/sentry/src/Tracing/Listener/EventHandleListener.php +++ b/src/sentry/src/Tracing/Listener/EventHandleListener.php @@ -700,8 +700,7 @@ protected function handleAsyncQueueJobProcessing(AsyncQueueEvent\BeforeHandle $e return; } - /** @var null|Carrier $carrier */ - $carrier = Context::get(Constants::TRACE_CARRIER, null, Coroutine::parentId()); + $carrier = SentryContext::getCarrier(Coroutine::parentId()); $job = $event->getMessage()->job(); $transaction = startTransaction( From 0266bccacefc7fbb6153ca7ccbf031e9c24322da Mon Sep 17 00:00:00 2001 From: Deeka Wong <8337659+huangdijia@users.noreply.github.com> Date: Wed, 3 Dec 2025 13:37:02 +0800 Subject: [PATCH 03/22] =?UTF-8?q?refactor:=20=E4=BD=BF=E7=94=A8call=5Fuser?= =?UTF-8?q?=5Ffunc=E8=8E=B7=E5=8F=96=E6=B6=88=E6=81=AFID=E4=BB=A5=E6=8F=90?= =?UTF-8?q?=E9=AB=98=E5=85=BC=E5=AE=B9=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sentry/src/Tracing/Aspect/AsyncQueueJobMessageAspect.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sentry/src/Tracing/Aspect/AsyncQueueJobMessageAspect.php b/src/sentry/src/Tracing/Aspect/AsyncQueueJobMessageAspect.php index 897af4266..2e0ba9aae 100644 --- a/src/sentry/src/Tracing/Aspect/AsyncQueueJobMessageAspect.php +++ b/src/sentry/src/Tracing/Aspect/AsyncQueueJobMessageAspect.php @@ -78,7 +78,7 @@ public function handlePush(ProceedingJoinPoint $proceedingJoinPoint) /** @var \Hyperf\AsyncQueue\Driver\Driver $driver */ $driver = $proceedingJoinPoint->getInstance(); - $messageId = method_exists($job, 'getId') ? $job->getId() : SentryUid::generate(); + $messageId = method_exists($job, 'getId') ? call_user_func([$job, 'getId']) : SentryUid::generate(); $destinationName = Context::get('sentry.messaging.destination.name', 'default'); $bodySize = (fn ($job) => strlen($this->packer->pack($job)))->call($driver, $job); $data = [ From 829ee231c38a17c57bc5aaf5c5583efde79465f2 Mon Sep 17 00:00:00 2001 From: Deeka Wong <8337659+huangdijia@users.noreply.github.com> Date: Wed, 3 Dec 2025 13:40:05 +0800 Subject: [PATCH 04/22] =?UTF-8?q?refactor:=20=E4=BD=BF=E7=94=A8SentryConte?= =?UTF-8?q?xt=E6=9B=BF=E4=BB=A3Hyperf\Context=E4=BB=A5=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=BF=BD=E8=B8=AA=E8=BD=BD=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sentry/src/Tracing/Listener/EventHandleListener.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/sentry/src/Tracing/Listener/EventHandleListener.php b/src/sentry/src/Tracing/Listener/EventHandleListener.php index f8e08a07f..ba987fe49 100644 --- a/src/sentry/src/Tracing/Listener/EventHandleListener.php +++ b/src/sentry/src/Tracing/Listener/EventHandleListener.php @@ -24,7 +24,6 @@ use Hyperf\Amqp\Message\ConsumerMessage; use Hyperf\AsyncQueue\Event as AsyncQueueEvent; use Hyperf\Command\Event as CommandEvent; -use Hyperf\Context\Context; use Hyperf\Contract\ConfigInterface; use Hyperf\Coroutine\Coroutine; use Hyperf\Crontab\Event as CrontabEvent; @@ -574,7 +573,7 @@ protected function handleAmqpMessageProcessing(AmqpEvent\BeforeConsume $event): $applicationHeaders = $amqpMessage->has('application_headers') ? $amqpMessage->get('application_headers') : null; if ($applicationHeaders && isset($applicationHeaders[Constants::TRACE_CARRIER])) { $carrier = Carrier::fromJson($applicationHeaders[Constants::TRACE_CARRIER]); - Context::set(Constants::TRACE_CARRIER, $carrier); + SentryContext::setCarrier($carrier); } } @@ -644,7 +643,7 @@ protected function handleKafkaMessageProcessing(KafkaEvent\BeforeConsume $event) foreach ($message->getHeaders() as $header) { if ($header->getHeaderKey() === Constants::TRACE_CARRIER) { $carrier = Carrier::fromJson($header->getValue()); - Context::set(Constants::TRACE_CARRIER, $carrier); + SentryContext::setCarrier($carrier); break; } } From 1a85fd7428f63ff797862fadbaa69db6ace890de Mon Sep 17 00:00:00 2001 From: Deeka Wong <8337659+huangdijia@users.noreply.github.com> Date: Wed, 3 Dec 2025 13:46:00 +0800 Subject: [PATCH 05/22] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=96=B0SentryConte?= =?UTF-8?q?xt=E4=BB=A5=E6=94=AF=E6=8C=81Elasticsearch=E5=92=8CRPC=E8=BF=BD?= =?UTF-8?q?=E8=B8=AA=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sentry/src/Constants.php | 27 +++++++++++++++++++ src/sentry/src/Context.php | 10 +++---- .../Tracing/Aspect/ElasticsearchAspect.php | 2 +- .../Aspect/ElasticsearchRequestAspect.php | 4 +-- src/sentry/src/Tracing/Aspect/RpcAspect.php | 4 +-- 5 files changed, 37 insertions(+), 10 deletions(-) diff --git a/src/sentry/src/Constants.php b/src/sentry/src/Constants.php index cfa1d7469..28fb71007 100644 --- a/src/sentry/src/Constants.php +++ b/src/sentry/src/Constants.php @@ -15,22 +15,49 @@ class Constants { public const TRACE_CARRIER = 'sentry.tracing.trace_carrier'; + /** + * @deprecated since v3.1, will be removed in v3.2. + */ public const TRACE_DB_SERVER_ADDRESS = 'sentry.tracing.db.server.address'; + /** + * @deprecated since v3.1, will be removed in v3.2. + */ public const TRACE_DB_SERVER_PORT = 'sentry.tracing.db.server.port'; + /** + * @deprecated since v3.1, will be removed in v3.2. + */ public const TRACE_REDIS_SERVER_ADDRESS = 'sentry.tracing.redis.server.address'; + /** + * @deprecated since v3.1, will be removed in v3.2. + */ public const TRACE_REDIS_SERVER_PORT = 'sentry.tracing.redis.server.port'; + /** + * @deprecated since v3.1, will be removed in v3.2. + */ public const TRACE_RPC_SERVER_ADDRESS = 'sentry.tracing.rpc.server.address'; + /** + * @deprecated since v3.1, will be removed in v3.2. + */ public const TRACE_RPC_SERVER_PORT = 'sentry.tracing.rpc.server.port'; + /** + * @deprecated since v3.1, will be removed in v3.2. + */ public const TRACE_ELASTICSEARCH_REQUEST_DATA = 'sentry.tracing.elasticsearch.request.data'; + /** + * @deprecated since v3.1, will be removed in v3.2. + */ public const CRON_CHECKIN_ID = 'sentry.crons.checkin_id'; + /** + * @deprecated since v3.1, will be removed in v3.2. + */ public const DISABLE_COROUTINE_TRACING = 'sentry.tracing.coroutine.disabled'; public const SENTRY_TRACE = 'sentry-trace'; diff --git a/src/sentry/src/Context.php b/src/sentry/src/Context.php index 9d17bfc30..2b5d42345 100644 --- a/src/sentry/src/Context.php +++ b/src/sentry/src/Context.php @@ -26,7 +26,7 @@ class Context public const TRACE_SERVER_PORT = 'sentry.tracing.server.port'; - public const TRACE_SPAN_DATA = 'sentry.tracing.data'; + public const TRACE_ELASTICSEARCH_SPAN_DATA = 'sentry.tracing.elasticsearch.span.data'; public const TRACE_DB_SERVER_ADDRESS = 'sentry.tracing.db.server.address'; @@ -160,13 +160,13 @@ public static function getDbServerPort(): ?int return Ctx::get(self::TRACE_DB_SERVER_PORT); } - public static function setSpanData(array $data): void + public static function setElasticsearchSpanData(array $data): void { - Ctx::set(self::TRACE_SPAN_DATA, $data); + Ctx::set(self::TRACE_ELASTICSEARCH_SPAN_DATA, $data); } - public static function getSpanData(): ?array + public static function getElasticsearchSpanData(): ?array { - return Ctx::get(self::TRACE_SPAN_DATA); + return Ctx::get(self::TRACE_ELASTICSEARCH_SPAN_DATA); } } diff --git a/src/sentry/src/Tracing/Aspect/ElasticsearchAspect.php b/src/sentry/src/Tracing/Aspect/ElasticsearchAspect.php index 499db8afd..7e79ee2c3 100644 --- a/src/sentry/src/Tracing/Aspect/ElasticsearchAspect.php +++ b/src/sentry/src/Tracing/Aspect/ElasticsearchAspect.php @@ -71,7 +71,7 @@ function (Scope $scope) use ($proceedingJoinPoint) { ]); } - $data = (array) SentryContext::getSpanData(); + $data = (array) SentryContext::getElasticsearchSpanData(); $data && $scope->getSpan()?->setData($data); }); }, diff --git a/src/sentry/src/Tracing/Aspect/ElasticsearchRequestAspect.php b/src/sentry/src/Tracing/Aspect/ElasticsearchRequestAspect.php index d2fdf0f32..18f05513f 100644 --- a/src/sentry/src/Tracing/Aspect/ElasticsearchRequestAspect.php +++ b/src/sentry/src/Tracing/Aspect/ElasticsearchRequestAspect.php @@ -45,7 +45,7 @@ public function process(ProceedingJoinPoint $proceedingJoinPoint) 'http.request.method' => $request->getMethod(), 'url.full' => $this->getFullUrl($request), ]; - SentryContext::setSpanData($data); + SentryContext::setElasticsearchSpanData($data); } } @@ -59,7 +59,7 @@ public function process(ProceedingJoinPoint $proceedingJoinPoint) 'http.request.method' => $lastConnection->getLastRequestInfo()['request']['http_method'] ?? 'GET', 'url.full' => $lastConnection->getLastRequestInfo()['response']['effective_url'] ?? '', ]; - SentryContext::setSpanData($data); + SentryContext::setElasticsearchSpanData($data); } }); } diff --git a/src/sentry/src/Tracing/Aspect/RpcAspect.php b/src/sentry/src/Tracing/Aspect/RpcAspect.php index be942b0a4..7757d1352 100644 --- a/src/sentry/src/Tracing/Aspect/RpcAspect.php +++ b/src/sentry/src/Tracing/Aspect/RpcAspect.php @@ -117,9 +117,9 @@ function (Scope $scope) use ($proceedingJoinPoint) { if ($this->feature->isTracingTagEnabled('rpc.result')) { $span?->setData(['rpc.result' => $result]); } - if (Context::has(Constants::TRACE_RPC_SERVER_ADDRESS)) { + if ($serverAddress = SentryContext::getRpcServerAddress()) { $span?->setData([ - 'server.address' => SentryContext::getRpcServerAddress(), + 'server.address' => $serverAddress, 'server.port' => SentryContext::getRpcServerPort(), ]); } From fb027d7c24e1bcfb766d988ab1fd159cffaa06ea Mon Sep 17 00:00:00 2001 From: Deeka Wong <8337659+huangdijia@users.noreply.github.com> Date: Wed, 3 Dec 2025 13:48:29 +0800 Subject: [PATCH 06/22] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96RPC?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E7=9A=84=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E5=92=8C=E7=AB=AF=E5=8F=A3=E6=95=B0=E6=8D=AE=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sentry/src/Tracing/Aspect/RpcAspect.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/sentry/src/Tracing/Aspect/RpcAspect.php b/src/sentry/src/Tracing/Aspect/RpcAspect.php index 7757d1352..aca77b6f6 100644 --- a/src/sentry/src/Tracing/Aspect/RpcAspect.php +++ b/src/sentry/src/Tracing/Aspect/RpcAspect.php @@ -117,12 +117,10 @@ function (Scope $scope) use ($proceedingJoinPoint) { if ($this->feature->isTracingTagEnabled('rpc.result')) { $span?->setData(['rpc.result' => $result]); } - if ($serverAddress = SentryContext::getRpcServerAddress()) { - $span?->setData([ - 'server.address' => $serverAddress, - 'server.port' => SentryContext::getRpcServerPort(), - ]); - } + $span?->setData([ + 'server.address' => SentryContext::getRpcServerAddress() ?? 'unknown', + 'server.port' => SentryContext::getRpcServerPort() ?? 0, + ]); }); }, $spanContext From ffbfe0bb004abd688728c002616e4bfd93429d15 Mon Sep 17 00:00:00 2001 From: Deeka Wong <8337659+huangdijia@users.noreply.github.com> Date: Wed, 3 Dec 2025 13:50:03 +0800 Subject: [PATCH 07/22] =?UTF-8?q?refactor:=20=E7=A1=AE=E4=BF=9D=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=99=A8=E5=9C=B0=E5=9D=80=E5=9C=A8=E7=BC=BA=E5=A4=B1?= =?UTF-8?q?=E6=97=B6=E9=BB=98=E8=AE=A4=E4=B8=BA'unknown'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sentry/src/Tracing/Aspect/GrpcAspect.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sentry/src/Tracing/Aspect/GrpcAspect.php b/src/sentry/src/Tracing/Aspect/GrpcAspect.php index 0af72956c..0dcd896c7 100644 --- a/src/sentry/src/Tracing/Aspect/GrpcAspect.php +++ b/src/sentry/src/Tracing/Aspect/GrpcAspect.php @@ -52,7 +52,7 @@ public function process(ProceedingJoinPoint $proceedingJoinPoint) 'rpc.system' => 'grpc', 'rpc.method' => $method, 'rpc.options' => $options, - 'server.address' => $serverAddress, + 'server.address' => (string) ($serverAddress ?? 'unknown'), 'server.port' => $serverPort, ]; From 8ef54bfe9f4d94e85827b70a53af39c449a28902 Mon Sep 17 00:00:00 2001 From: Deeka Wong <8337659+huangdijia@users.noreply.github.com> Date: Wed, 3 Dec 2025 14:04:41 +0800 Subject: [PATCH 08/22] =?UTF-8?q?refactor:=20=E6=9B=BF=E6=8D=A2Context?= =?UTF-8?q?=E4=B8=BASentryContext=E4=BB=A5=E7=BB=9F=E4=B8=80=E8=BF=BD?= =?UTF-8?q?=E8=B8=AA=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/Crons/Listener/EventHandleListener.php | 2 +- src/sentry/src/{Context.php => SentryContext.php} | 15 ++++++++++++++- .../Tracing/Aspect/AsyncQueueJobMessageAspect.php | 2 +- src/sentry/src/Tracing/Aspect/CoroutineAspect.php | 2 +- src/sentry/src/Tracing/Aspect/DbAspect.php | 2 +- .../src/Tracing/Aspect/DbConnectionAspect.php | 2 +- .../src/Tracing/Aspect/ElasticsearchAspect.php | 2 +- .../Tracing/Aspect/ElasticsearchRequestAspect.php | 2 +- .../src/Tracing/Aspect/RedisConnectionAspect.php | 2 +- src/sentry/src/Tracing/Aspect/RpcAspect.php | 9 ++++----- .../src/Tracing/Aspect/RpcEndpointAspect.php | 2 +- .../src/Tracing/Listener/EventHandleListener.php | 2 +- 12 files changed, 28 insertions(+), 16 deletions(-) rename src/sentry/src/{Context.php => SentryContext.php} (91%) diff --git a/src/sentry/src/Crons/Listener/EventHandleListener.php b/src/sentry/src/Crons/Listener/EventHandleListener.php index 70f40965f..c083e8d96 100644 --- a/src/sentry/src/Crons/Listener/EventHandleListener.php +++ b/src/sentry/src/Crons/Listener/EventHandleListener.php @@ -11,8 +11,8 @@ namespace FriendsOfHyperf\Sentry\Crons\Listener; -use FriendsOfHyperf\Sentry\Context as SentryContext; use FriendsOfHyperf\Sentry\Feature; +use FriendsOfHyperf\Sentry\SentryContext; use Hyperf\Contract\ConfigInterface; use Hyperf\Contract\StdoutLoggerInterface; use Hyperf\Crontab\Event; diff --git a/src/sentry/src/Context.php b/src/sentry/src/SentryContext.php similarity index 91% rename from src/sentry/src/Context.php rename to src/sentry/src/SentryContext.php index 2b5d42345..715e133f0 100644 --- a/src/sentry/src/Context.php +++ b/src/sentry/src/SentryContext.php @@ -13,8 +13,9 @@ use FriendsOfHyperf\Sentry\Util\Carrier; use Hyperf\Context\Context as Ctx; +use Sentry\Tracing\SpanContext; -class Context +class SentryContext { public const TRACE_CARRIER = 'sentry.tracing.trace_carrier'; @@ -40,6 +41,8 @@ class Context public const TRACE_RPC_SERVER_PORT = 'sentry.tracing.rpc.server.port'; + public const TRACE_RPC_SPAN_CONTEXT = 'sentry.tracing.rpc.span_context'; + public static function disableTracing(): void { Ctx::set(self::DISABLE_COROUTINE_TRACING, true); @@ -169,4 +172,14 @@ public static function getElasticsearchSpanData(): ?array { return Ctx::get(self::TRACE_ELASTICSEARCH_SPAN_DATA); } + + public static function setRpcSpanContext(SpanContext $spanContext): void + { + Ctx::set(self::TRACE_RPC_SPAN_CONTEXT, $spanContext); + } + + public static function getRpcSpanContext(): ?SpanContext + { + return Ctx::get(self::TRACE_RPC_SPAN_CONTEXT); + } } diff --git a/src/sentry/src/Tracing/Aspect/AsyncQueueJobMessageAspect.php b/src/sentry/src/Tracing/Aspect/AsyncQueueJobMessageAspect.php index 2e0ba9aae..252ad3f1e 100644 --- a/src/sentry/src/Tracing/Aspect/AsyncQueueJobMessageAspect.php +++ b/src/sentry/src/Tracing/Aspect/AsyncQueueJobMessageAspect.php @@ -12,8 +12,8 @@ namespace FriendsOfHyperf\Sentry\Tracing\Aspect; use FriendsOfHyperf\Sentry\Constants; -use FriendsOfHyperf\Sentry\Context as SentryContext; use FriendsOfHyperf\Sentry\Feature; +use FriendsOfHyperf\Sentry\SentryContext; use FriendsOfHyperf\Sentry\Util\Carrier; use Hyperf\AsyncQueue\Driver\RedisDriver; use Hyperf\Context\Context; diff --git a/src/sentry/src/Tracing/Aspect/CoroutineAspect.php b/src/sentry/src/Tracing/Aspect/CoroutineAspect.php index c6603b982..bc0170170 100644 --- a/src/sentry/src/Tracing/Aspect/CoroutineAspect.php +++ b/src/sentry/src/Tracing/Aspect/CoroutineAspect.php @@ -11,9 +11,9 @@ namespace FriendsOfHyperf\Sentry\Tracing\Aspect; -use FriendsOfHyperf\Sentry\Context as SentryContext; use FriendsOfHyperf\Sentry\Feature; use FriendsOfHyperf\Sentry\Integration; +use FriendsOfHyperf\Sentry\SentryContext; use FriendsOfHyperf\Sentry\Util\CoroutineBacktraceHelper; use Hyperf\Context\Context; use Hyperf\Di\Aop\AbstractAspect; diff --git a/src/sentry/src/Tracing/Aspect/DbAspect.php b/src/sentry/src/Tracing/Aspect/DbAspect.php index eb1ea175a..430fa6e67 100644 --- a/src/sentry/src/Tracing/Aspect/DbAspect.php +++ b/src/sentry/src/Tracing/Aspect/DbAspect.php @@ -11,8 +11,8 @@ namespace FriendsOfHyperf\Sentry\Tracing\Aspect; -use FriendsOfHyperf\Sentry\Context as SentryContext; use FriendsOfHyperf\Sentry\Feature; +use FriendsOfHyperf\Sentry\SentryContext; use FriendsOfHyperf\Sentry\Util\SqlParser; use Hyperf\DB\Pool\PoolFactory; use Hyperf\Di\Aop\AbstractAspect; diff --git a/src/sentry/src/Tracing/Aspect/DbConnectionAspect.php b/src/sentry/src/Tracing/Aspect/DbConnectionAspect.php index 8166d2a26..a7e5623b4 100644 --- a/src/sentry/src/Tracing/Aspect/DbConnectionAspect.php +++ b/src/sentry/src/Tracing/Aspect/DbConnectionAspect.php @@ -11,8 +11,8 @@ namespace FriendsOfHyperf\Sentry\Tracing\Aspect; -use FriendsOfHyperf\Sentry\Context as SentryContext; use FriendsOfHyperf\Sentry\Feature; +use FriendsOfHyperf\Sentry\SentryContext; use Hyperf\Context\Context; use Hyperf\Di\Aop\AbstractAspect; use Hyperf\Di\Aop\ProceedingJoinPoint; diff --git a/src/sentry/src/Tracing/Aspect/ElasticsearchAspect.php b/src/sentry/src/Tracing/Aspect/ElasticsearchAspect.php index 7e79ee2c3..afbf76318 100644 --- a/src/sentry/src/Tracing/Aspect/ElasticsearchAspect.php +++ b/src/sentry/src/Tracing/Aspect/ElasticsearchAspect.php @@ -11,8 +11,8 @@ namespace FriendsOfHyperf\Sentry\Tracing\Aspect; -use FriendsOfHyperf\Sentry\Context as SentryContext; use FriendsOfHyperf\Sentry\Feature; +use FriendsOfHyperf\Sentry\SentryContext; use Hyperf\Di\Aop\AbstractAspect; use Hyperf\Di\Aop\ProceedingJoinPoint; use Sentry\State\Scope; diff --git a/src/sentry/src/Tracing/Aspect/ElasticsearchRequestAspect.php b/src/sentry/src/Tracing/Aspect/ElasticsearchRequestAspect.php index 18f05513f..0573ba498 100644 --- a/src/sentry/src/Tracing/Aspect/ElasticsearchRequestAspect.php +++ b/src/sentry/src/Tracing/Aspect/ElasticsearchRequestAspect.php @@ -11,8 +11,8 @@ namespace FriendsOfHyperf\Sentry\Tracing\Aspect; -use FriendsOfHyperf\Sentry\Context as SentryContext; use FriendsOfHyperf\Sentry\Feature; +use FriendsOfHyperf\Sentry\SentryContext; use Hyperf\Di\Aop\AbstractAspect; use Hyperf\Di\Aop\ProceedingJoinPoint; use Psr\Http\Message\RequestInterface; diff --git a/src/sentry/src/Tracing/Aspect/RedisConnectionAspect.php b/src/sentry/src/Tracing/Aspect/RedisConnectionAspect.php index f10ae0541..9af76674c 100644 --- a/src/sentry/src/Tracing/Aspect/RedisConnectionAspect.php +++ b/src/sentry/src/Tracing/Aspect/RedisConnectionAspect.php @@ -11,8 +11,8 @@ namespace FriendsOfHyperf\Sentry\Tracing\Aspect; -use FriendsOfHyperf\Sentry\Context as SentryContext; use FriendsOfHyperf\Sentry\Feature; +use FriendsOfHyperf\Sentry\SentryContext; use FriendsOfHyperf\Sentry\Util\RedisClusterKeySlot; use Hyperf\Di\Aop\AbstractAspect; use Hyperf\Di\Aop\ProceedingJoinPoint; diff --git a/src/sentry/src/Tracing/Aspect/RpcAspect.php b/src/sentry/src/Tracing/Aspect/RpcAspect.php index aca77b6f6..0a52c25a3 100644 --- a/src/sentry/src/Tracing/Aspect/RpcAspect.php +++ b/src/sentry/src/Tracing/Aspect/RpcAspect.php @@ -12,8 +12,8 @@ namespace FriendsOfHyperf\Sentry\Tracing\Aspect; use FriendsOfHyperf\Sentry\Constants; -use FriendsOfHyperf\Sentry\Context as SentryContext; use FriendsOfHyperf\Sentry\Feature; +use FriendsOfHyperf\Sentry\SentryContext; use FriendsOfHyperf\Sentry\Util\Carrier; use Hyperf\Context\Context; use Hyperf\Contract\ConfigInterface; @@ -77,7 +77,7 @@ private function handleGenerateRpcPath(ProceedingJoinPoint $proceedingJoinPoint) }; // https://github.com/open-telemetry/semantic-conventions/blob/main/docs/rpc/rpc-spans.md - Context::set(static::SPAN_CONTEXT, SpanContext::make() + SentryContext::setRpcSpanContext(SpanContext::make() ->setOp('rpc.client') ->setDescription($path) ->setOrigin('auto.rpc') @@ -92,8 +92,7 @@ private function handleGenerateRpcPath(ProceedingJoinPoint $proceedingJoinPoint) private function handleSend(ProceedingJoinPoint $proceedingJoinPoint) { - /** @var null|SpanContext $spanContext */ - $spanContext = Context::get(static::SPAN_CONTEXT); + $spanContext = SentryContext::getRpcSpanContext(); if (! $spanContext) { return $proceedingJoinPoint->process(); @@ -126,7 +125,7 @@ function (Scope $scope) use ($proceedingJoinPoint) { $spanContext ); } finally { - Context::destroy(static::SPAN_CONTEXT); + Context::destroy(SentryContext::TRACE_RPC_SPAN_CONTEXT); } } } diff --git a/src/sentry/src/Tracing/Aspect/RpcEndpointAspect.php b/src/sentry/src/Tracing/Aspect/RpcEndpointAspect.php index 5bb5991e7..e21226561 100644 --- a/src/sentry/src/Tracing/Aspect/RpcEndpointAspect.php +++ b/src/sentry/src/Tracing/Aspect/RpcEndpointAspect.php @@ -11,8 +11,8 @@ namespace FriendsOfHyperf\Sentry\Tracing\Aspect; -use FriendsOfHyperf\Sentry\Context as SentryContext; use FriendsOfHyperf\Sentry\Feature; +use FriendsOfHyperf\Sentry\SentryContext; use Hyperf\Di\Aop\AbstractAspect; use Hyperf\Di\Aop\ProceedingJoinPoint; diff --git a/src/sentry/src/Tracing/Listener/EventHandleListener.php b/src/sentry/src/Tracing/Listener/EventHandleListener.php index ba987fe49..8d0df8b08 100644 --- a/src/sentry/src/Tracing/Listener/EventHandleListener.php +++ b/src/sentry/src/Tracing/Listener/EventHandleListener.php @@ -13,9 +13,9 @@ use Closure; use FriendsOfHyperf\Sentry\Constants; -use FriendsOfHyperf\Sentry\Context as SentryContext; use FriendsOfHyperf\Sentry\Feature; use FriendsOfHyperf\Sentry\Integration; +use FriendsOfHyperf\Sentry\SentryContext; use FriendsOfHyperf\Sentry\Util\Carrier; use FriendsOfHyperf\Sentry\Util\CoContainer; use FriendsOfHyperf\Sentry\Util\SqlParser; From c6f080ffcebb5153d71584b51e2900ddb06f7611 Mon Sep 17 00:00:00 2001 From: Deeka Wong <8337659+huangdijia@users.noreply.github.com> Date: Wed, 3 Dec 2025 14:05:53 +0800 Subject: [PATCH 09/22] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=96=B0SentryConte?= =?UTF-8?q?xt=E4=BB=A5=E4=BD=BF=E7=94=A8=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=9C=B0=E5=9D=80=E5=92=8C=E7=AB=AF?= =?UTF-8?q?=E5=8F=A3=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sentry/src/Tracing/Aspect/DbAspect.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sentry/src/Tracing/Aspect/DbAspect.php b/src/sentry/src/Tracing/Aspect/DbAspect.php index 430fa6e67..94edd63ba 100644 --- a/src/sentry/src/Tracing/Aspect/DbAspect.php +++ b/src/sentry/src/Tracing/Aspect/DbAspect.php @@ -70,8 +70,8 @@ public function process(ProceedingJoinPoint $proceedingJoinPoint) /** @var \Hyperf\DB\AbstractConnection $connection */ $server = $this->serverCache[$connection] ?? null; if ($server !== null) { - SentryContext::setServerAddress($server['host'] ?? 'localhost'); - SentryContext::setServerPort((int) ($server['port'] ?? 3306)); + SentryContext::setDbServerAddress($server['host'] ?? 'localhost'); + SentryContext::setDbServerPort((int) ($server['port'] ?? 3306)); } }); } From 2497bb3e3ae6be14b7bc4db1e8680b1324cb6c4e Mon Sep 17 00:00:00 2001 From: Deeka Wong <8337659+huangdijia@users.noreply.github.com> Date: Wed, 3 Dec 2025 14:07:12 +0800 Subject: [PATCH 10/22] =?UTF-8?q?refactor:=20=E7=A7=BB=E9=99=A4=E4=B8=8D?= =?UTF-8?q?=E5=BF=85=E8=A6=81=E7=9A=84=E7=B1=BB=E5=9E=8B=E8=BD=AC=E6=8D=A2?= =?UTF-8?q?=E4=BB=A5=E7=AE=80=E5=8C=96ElasticsearchSpanData=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sentry/src/Tracing/Aspect/ElasticsearchAspect.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sentry/src/Tracing/Aspect/ElasticsearchAspect.php b/src/sentry/src/Tracing/Aspect/ElasticsearchAspect.php index afbf76318..791ce7cc2 100644 --- a/src/sentry/src/Tracing/Aspect/ElasticsearchAspect.php +++ b/src/sentry/src/Tracing/Aspect/ElasticsearchAspect.php @@ -71,7 +71,7 @@ function (Scope $scope) use ($proceedingJoinPoint) { ]); } - $data = (array) SentryContext::getElasticsearchSpanData(); + $data = SentryContext::getElasticsearchSpanData(); $data && $scope->getSpan()?->setData($data); }); }, From 323a1277a84c8ab803bf5243daaabf120f768846 Mon Sep 17 00:00:00 2001 From: Deeka Wong <8337659+huangdijia@users.noreply.github.com> Date: Wed, 3 Dec 2025 14:08:21 +0800 Subject: [PATCH 11/22] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=96=B0RpcEndpoint?= =?UTF-8?q?Aspect=E4=BB=A5=E4=BD=BF=E7=94=A8SentryContext=E7=9A=84RPC?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=9C=B0=E5=9D=80=E5=92=8C=E7=AB=AF?= =?UTF-8?q?=E5=8F=A3=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sentry/src/Tracing/Aspect/RpcEndpointAspect.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/sentry/src/Tracing/Aspect/RpcEndpointAspect.php b/src/sentry/src/Tracing/Aspect/RpcEndpointAspect.php index e21226561..8300be1e9 100644 --- a/src/sentry/src/Tracing/Aspect/RpcEndpointAspect.php +++ b/src/sentry/src/Tracing/Aspect/RpcEndpointAspect.php @@ -39,13 +39,13 @@ public function process(ProceedingJoinPoint $proceedingJoinPoint) // RpcMultiplex if ($result instanceof \Hyperf\RpcMultiplex\Socket) { - SentryContext::setServerAddress($result->getName()); - SentryContext::setServerPort($result->getPort()); + SentryContext::setRpcServerAddress($result->getName()); + SentryContext::setRpcServerPort($result->getPort()); } // JsonRpcHttpTransporter if ($result instanceof \Hyperf\LoadBalancer\Node) { - SentryContext::setServerAddress($result->host); - SentryContext::setServerPort($result->port); + SentryContext::setRpcServerAddress($result->host); + SentryContext::setRpcServerPort($result->port); } // JsonRpcPoolTransporter if ($result instanceof \Hyperf\JsonRpc\Pool\RpcConnection) { From 48d4f6afba74a02b209646bec7da8ee42875da4d Mon Sep 17 00:00:00 2001 From: Deeka Wong Date: Wed, 3 Dec 2025 14:11:42 +0800 Subject: [PATCH 12/22] Apply suggestion from @Copilot Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- src/sentry/src/Feature.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sentry/src/Feature.php b/src/sentry/src/Feature.php index 9ee6b815f..c9e071fab 100644 --- a/src/sentry/src/Feature.php +++ b/src/sentry/src/Feature.php @@ -106,7 +106,7 @@ public static function disableCoroutineTracing(): void } /** - * @deprecated since v3.1, will be removed in v3.2, use `\FriendsOfHyperf\Sentry\Context::isDisableTracing()` instead. + * @deprecated since v3.1, will be removed in v3.2, use `\FriendsOfHyperf\Sentry\Context::isTracingDisabled()` instead. */ public static function isDisableCoroutineTracing(): bool { From 095c1da6edeaebd057c848ca7c779239dd3d2f9e Mon Sep 17 00:00:00 2001 From: Deeka Wong <8337659+huangdijia@users.noreply.github.com> Date: Wed, 3 Dec 2025 14:13:04 +0800 Subject: [PATCH 13/22] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=AD=A3TRACE=5FCAR?= =?UTF-8?q?RIER=E5=B8=B8=E9=87=8F=E7=9A=84=E6=A0=BC=E5=BC=8F=E4=BB=A5?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=91=BD=E5=90=8D=E7=BA=A6=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sentry/src/SentryContext.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sentry/src/SentryContext.php b/src/sentry/src/SentryContext.php index 715e133f0..cefec1209 100644 --- a/src/sentry/src/SentryContext.php +++ b/src/sentry/src/SentryContext.php @@ -17,7 +17,7 @@ class SentryContext { - public const TRACE_CARRIER = 'sentry.tracing.trace_carrier'; + public const TRACE_CARRIER = 'sentry.tracing.trace.carrier'; public const CRON_CHECKIN_ID = 'sentry.crons.checkin_id'; From 9a88598a8ff20e79e3c9c82ce5ae8fbabbb14bf0 Mon Sep 17 00:00:00 2001 From: Deeka Wong <8337659+huangdijia@users.noreply.github.com> Date: Wed, 3 Dec 2025 14:13:52 +0800 Subject: [PATCH 14/22] =?UTF-8?q?refactor:=20=E7=BB=9F=E4=B8=80=E4=BD=BF?= =?UTF-8?q?=E7=94=A8Context=E7=B1=BB=E6=9B=BF=E4=BB=A3=E5=88=AB=E5=90=8D?= =?UTF-8?q?=E4=BB=A5=E6=8F=90=E9=AB=98=E4=BB=A3=E7=A0=81=E5=8F=AF=E8=AF=BB?= =?UTF-8?q?=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sentry/src/SentryContext.php | 58 ++++++++++++++++---------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/src/sentry/src/SentryContext.php b/src/sentry/src/SentryContext.php index cefec1209..13ea8d82d 100644 --- a/src/sentry/src/SentryContext.php +++ b/src/sentry/src/SentryContext.php @@ -12,7 +12,7 @@ namespace FriendsOfHyperf\Sentry; use FriendsOfHyperf\Sentry\Util\Carrier; -use Hyperf\Context\Context as Ctx; +use Hyperf\Context\Context; use Sentry\Tracing\SpanContext; class SentryContext @@ -45,141 +45,141 @@ class SentryContext public static function disableTracing(): void { - Ctx::set(self::DISABLE_COROUTINE_TRACING, true); + Context::set(self::DISABLE_COROUTINE_TRACING, true); } public static function enableTracing(): void { - Ctx::set(self::DISABLE_COROUTINE_TRACING, false); + Context::set(self::DISABLE_COROUTINE_TRACING, false); } public static function isTracingEnabled(): bool { - return ! Ctx::get(self::DISABLE_COROUTINE_TRACING, false); + return ! Context::get(self::DISABLE_COROUTINE_TRACING, false); } public static function isTracingDisabled(): bool { - return Ctx::get(self::DISABLE_COROUTINE_TRACING, false); + return Context::get(self::DISABLE_COROUTINE_TRACING, false); } public static function setCronCheckInId(string $checkInId): void { - Ctx::set(self::CRON_CHECKIN_ID, $checkInId); + Context::set(self::CRON_CHECKIN_ID, $checkInId); } public static function getCronCheckInId(): ?string { - return Ctx::get(self::CRON_CHECKIN_ID); + return Context::get(self::CRON_CHECKIN_ID); } public static function setCarrier(Carrier $carrier): void { - Ctx::set(self::TRACE_CARRIER, $carrier); + Context::set(self::TRACE_CARRIER, $carrier); } public static function getCarrier(?int $coroutineId = null): ?Carrier { - return Ctx::get(self::TRACE_CARRIER, coroutineId: $coroutineId); + return Context::get(self::TRACE_CARRIER, coroutineId: $coroutineId); } public static function setRedisServerAddress(string $address): void { - Ctx::set(self::TRACE_REDIS_SERVER_ADDRESS, $address); + Context::set(self::TRACE_REDIS_SERVER_ADDRESS, $address); } public static function getRedisServerAddress(): ?string { - return Ctx::get(self::TRACE_REDIS_SERVER_ADDRESS); + return Context::get(self::TRACE_REDIS_SERVER_ADDRESS); } public static function setRedisServerPort(int $port): void { - Ctx::set(self::TRACE_REDIS_SERVER_PORT, $port); + Context::set(self::TRACE_REDIS_SERVER_PORT, $port); } public static function getRedisServerPort(): ?int { - return Ctx::get(self::TRACE_REDIS_SERVER_PORT); + return Context::get(self::TRACE_REDIS_SERVER_PORT); } public static function setServerAddress(string $address): void { - Ctx::set(self::TRACE_SERVER_ADDRESS, $address); + Context::set(self::TRACE_SERVER_ADDRESS, $address); } public static function getServerAddress(): ?string { - return Ctx::get(self::TRACE_SERVER_ADDRESS); + return Context::get(self::TRACE_SERVER_ADDRESS); } public static function setServerPort(int $port): void { - Ctx::set(self::TRACE_SERVER_PORT, $port); + Context::set(self::TRACE_SERVER_PORT, $port); } public static function getServerPort(): ?int { - return Ctx::get(self::TRACE_SERVER_PORT); + return Context::get(self::TRACE_SERVER_PORT); } public static function setRpcServerAddress(string $address): void { - Ctx::set(self::TRACE_RPC_SERVER_ADDRESS, $address); + Context::set(self::TRACE_RPC_SERVER_ADDRESS, $address); } public static function getRpcServerAddress(): ?string { - return Ctx::get(self::TRACE_RPC_SERVER_ADDRESS); + return Context::get(self::TRACE_RPC_SERVER_ADDRESS); } public static function setRpcServerPort(int $port): void { - Ctx::set(self::TRACE_RPC_SERVER_PORT, $port); + Context::set(self::TRACE_RPC_SERVER_PORT, $port); } public static function getRpcServerPort(): ?int { - return Ctx::get(self::TRACE_RPC_SERVER_PORT); + return Context::get(self::TRACE_RPC_SERVER_PORT); } public static function setDbServerAddress(string $address): void { - Ctx::set(self::TRACE_DB_SERVER_ADDRESS, $address); + Context::set(self::TRACE_DB_SERVER_ADDRESS, $address); } public static function getDbServerAddress(): ?string { - return Ctx::get(self::TRACE_DB_SERVER_ADDRESS); + return Context::get(self::TRACE_DB_SERVER_ADDRESS); } public static function setDbServerPort(int $port): void { - Ctx::set(self::TRACE_DB_SERVER_PORT, $port); + Context::set(self::TRACE_DB_SERVER_PORT, $port); } public static function getDbServerPort(): ?int { - return Ctx::get(self::TRACE_DB_SERVER_PORT); + return Context::get(self::TRACE_DB_SERVER_PORT); } public static function setElasticsearchSpanData(array $data): void { - Ctx::set(self::TRACE_ELASTICSEARCH_SPAN_DATA, $data); + Context::set(self::TRACE_ELASTICSEARCH_SPAN_DATA, $data); } public static function getElasticsearchSpanData(): ?array { - return Ctx::get(self::TRACE_ELASTICSEARCH_SPAN_DATA); + return Context::get(self::TRACE_ELASTICSEARCH_SPAN_DATA); } public static function setRpcSpanContext(SpanContext $spanContext): void { - Ctx::set(self::TRACE_RPC_SPAN_CONTEXT, $spanContext); + Context::set(self::TRACE_RPC_SPAN_CONTEXT, $spanContext); } public static function getRpcSpanContext(): ?SpanContext { - return Ctx::get(self::TRACE_RPC_SPAN_CONTEXT); + return Context::get(self::TRACE_RPC_SPAN_CONTEXT); } } From 8ae1a2eafc7065a5e042bd56f6afe664e60e7971 Mon Sep 17 00:00:00 2001 From: Deeka Wong <8337659+huangdijia@users.noreply.github.com> Date: Wed, 3 Dec 2025 14:15:11 +0800 Subject: [PATCH 15/22] =?UTF-8?q?refactor:=20=E8=B0=83=E6=95=B4TRACE=5FCAR?= =?UTF-8?q?RIER=E5=B8=B8=E9=87=8F=E7=9A=84=E4=BD=8D=E7=BD=AE=E4=BB=A5?= =?UTF-8?q?=E6=8F=90=E9=AB=98=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84=E6=B8=85?= =?UTF-8?q?=E6=99=B0=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sentry/src/SentryContext.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sentry/src/SentryContext.php b/src/sentry/src/SentryContext.php index 13ea8d82d..e82b2bfa4 100644 --- a/src/sentry/src/SentryContext.php +++ b/src/sentry/src/SentryContext.php @@ -17,12 +17,12 @@ class SentryContext { - public const TRACE_CARRIER = 'sentry.tracing.trace.carrier'; - public const CRON_CHECKIN_ID = 'sentry.crons.checkin_id'; public const DISABLE_COROUTINE_TRACING = 'sentry.tracing.coroutine.disabled'; + public const TRACE_CARRIER = 'sentry.tracing.trace.carrier'; + public const TRACE_SERVER_ADDRESS = 'sentry.tracing.server.address'; public const TRACE_SERVER_PORT = 'sentry.tracing.server.port'; From 9f14095155eb376d5552d99ac0e8382a273afaec Mon Sep 17 00:00:00 2001 From: Deeka Wong <8337659+huangdijia@users.noreply.github.com> Date: Wed, 3 Dec 2025 14:17:24 +0800 Subject: [PATCH 16/22] =?UTF-8?q?refactor:=20=E7=BB=9F=E4=B8=80SentryConte?= =?UTF-8?q?xt=E5=B8=B8=E9=87=8F=E5=91=BD=E5=90=8D=E7=BA=A6=E5=AE=9A?= =?UTF-8?q?=E4=BB=A5=E6=8F=90=E9=AB=98=E4=B8=80=E8=87=B4=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sentry/src/SentryContext.php | 82 ++++++++++++++++---------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/src/sentry/src/SentryContext.php b/src/sentry/src/SentryContext.php index e82b2bfa4..e955300a3 100644 --- a/src/sentry/src/SentryContext.php +++ b/src/sentry/src/SentryContext.php @@ -17,169 +17,169 @@ class SentryContext { - public const CRON_CHECKIN_ID = 'sentry.crons.checkin_id'; + public const CTX_CRON_CHECKIN_ID = 'sentry.ctx.crons.checkin_id'; - public const DISABLE_COROUTINE_TRACING = 'sentry.tracing.coroutine.disabled'; + public const CTX_DISABLE_COROUTINE_TRACING = 'sentry.ctx.coroutine.disabled'; - public const TRACE_CARRIER = 'sentry.tracing.trace.carrier'; + public const CTX_CARRIER = 'sentry.ctx.trace.carrier'; - public const TRACE_SERVER_ADDRESS = 'sentry.tracing.server.address'; + public const CTX_SERVER_ADDRESS = 'sentry.ctx.server.address'; - public const TRACE_SERVER_PORT = 'sentry.tracing.server.port'; + public const CTX_SERVER_PORT = 'sentry.ctx.server.port'; - public const TRACE_ELASTICSEARCH_SPAN_DATA = 'sentry.tracing.elasticsearch.span.data'; + public const CTX_ELASTICSEARCH_SPAN_DATA = 'sentry.ctx.elasticsearch.span.data'; - public const TRACE_DB_SERVER_ADDRESS = 'sentry.tracing.db.server.address'; + public const CTX_DB_SERVER_ADDRESS = 'sentry.ctx.db.server.address'; - public const TRACE_DB_SERVER_PORT = 'sentry.tracing.db.server.port'; + public const CTX_DB_SERVER_PORT = 'sentry.ctx.db.server.port'; - public const TRACE_REDIS_SERVER_ADDRESS = 'sentry.tracing.redis.server.address'; + public const CTX_REDIS_SERVER_ADDRESS = 'sentry.ctx.redis.server.address'; - public const TRACE_REDIS_SERVER_PORT = 'sentry.tracing.redis.server.port'; + public const CTX_REDIS_SERVER_PORT = 'sentry.ctx.redis.server.port'; - public const TRACE_RPC_SERVER_ADDRESS = 'sentry.tracing.rpc.server.address'; + public const CTX_RPC_SERVER_ADDRESS = 'sentry.ctx.rpc.server.address'; - public const TRACE_RPC_SERVER_PORT = 'sentry.tracing.rpc.server.port'; + public const CTX_RPC_SERVER_PORT = 'sentry.ctx.rpc.server.port'; - public const TRACE_RPC_SPAN_CONTEXT = 'sentry.tracing.rpc.span_context'; + public const CTX_RPC_SPAN_CONTEXT = 'sentry.ctx.rpc.span_context'; public static function disableTracing(): void { - Context::set(self::DISABLE_COROUTINE_TRACING, true); + Context::set(self::CTX_DISABLE_COROUTINE_TRACING, true); } public static function enableTracing(): void { - Context::set(self::DISABLE_COROUTINE_TRACING, false); + Context::set(self::CTX_DISABLE_COROUTINE_TRACING, false); } public static function isTracingEnabled(): bool { - return ! Context::get(self::DISABLE_COROUTINE_TRACING, false); + return ! Context::get(self::CTX_DISABLE_COROUTINE_TRACING, false); } public static function isTracingDisabled(): bool { - return Context::get(self::DISABLE_COROUTINE_TRACING, false); + return Context::get(self::CTX_DISABLE_COROUTINE_TRACING, false); } public static function setCronCheckInId(string $checkInId): void { - Context::set(self::CRON_CHECKIN_ID, $checkInId); + Context::set(self::CTX_CRON_CHECKIN_ID, $checkInId); } public static function getCronCheckInId(): ?string { - return Context::get(self::CRON_CHECKIN_ID); + return Context::get(self::CTX_CRON_CHECKIN_ID); } public static function setCarrier(Carrier $carrier): void { - Context::set(self::TRACE_CARRIER, $carrier); + Context::set(self::CTX_CARRIER, $carrier); } public static function getCarrier(?int $coroutineId = null): ?Carrier { - return Context::get(self::TRACE_CARRIER, coroutineId: $coroutineId); + return Context::get(self::CTX_CARRIER, coroutineId: $coroutineId); } public static function setRedisServerAddress(string $address): void { - Context::set(self::TRACE_REDIS_SERVER_ADDRESS, $address); + Context::set(self::CTX_REDIS_SERVER_ADDRESS, $address); } public static function getRedisServerAddress(): ?string { - return Context::get(self::TRACE_REDIS_SERVER_ADDRESS); + return Context::get(self::CTX_REDIS_SERVER_ADDRESS); } public static function setRedisServerPort(int $port): void { - Context::set(self::TRACE_REDIS_SERVER_PORT, $port); + Context::set(self::CTX_REDIS_SERVER_PORT, $port); } public static function getRedisServerPort(): ?int { - return Context::get(self::TRACE_REDIS_SERVER_PORT); + return Context::get(self::CTX_REDIS_SERVER_PORT); } public static function setServerAddress(string $address): void { - Context::set(self::TRACE_SERVER_ADDRESS, $address); + Context::set(self::CTX_SERVER_ADDRESS, $address); } public static function getServerAddress(): ?string { - return Context::get(self::TRACE_SERVER_ADDRESS); + return Context::get(self::CTX_SERVER_ADDRESS); } public static function setServerPort(int $port): void { - Context::set(self::TRACE_SERVER_PORT, $port); + Context::set(self::CTX_SERVER_PORT, $port); } public static function getServerPort(): ?int { - return Context::get(self::TRACE_SERVER_PORT); + return Context::get(self::CTX_SERVER_PORT); } public static function setRpcServerAddress(string $address): void { - Context::set(self::TRACE_RPC_SERVER_ADDRESS, $address); + Context::set(self::CTX_RPC_SERVER_ADDRESS, $address); } public static function getRpcServerAddress(): ?string { - return Context::get(self::TRACE_RPC_SERVER_ADDRESS); + return Context::get(self::CTX_RPC_SERVER_ADDRESS); } public static function setRpcServerPort(int $port): void { - Context::set(self::TRACE_RPC_SERVER_PORT, $port); + Context::set(self::CTX_RPC_SERVER_PORT, $port); } public static function getRpcServerPort(): ?int { - return Context::get(self::TRACE_RPC_SERVER_PORT); + return Context::get(self::CTX_RPC_SERVER_PORT); } public static function setDbServerAddress(string $address): void { - Context::set(self::TRACE_DB_SERVER_ADDRESS, $address); + Context::set(self::CTX_DB_SERVER_ADDRESS, $address); } public static function getDbServerAddress(): ?string { - return Context::get(self::TRACE_DB_SERVER_ADDRESS); + return Context::get(self::CTX_DB_SERVER_ADDRESS); } public static function setDbServerPort(int $port): void { - Context::set(self::TRACE_DB_SERVER_PORT, $port); + Context::set(self::CTX_DB_SERVER_PORT, $port); } public static function getDbServerPort(): ?int { - return Context::get(self::TRACE_DB_SERVER_PORT); + return Context::get(self::CTX_DB_SERVER_PORT); } public static function setElasticsearchSpanData(array $data): void { - Context::set(self::TRACE_ELASTICSEARCH_SPAN_DATA, $data); + Context::set(self::CTX_ELASTICSEARCH_SPAN_DATA, $data); } public static function getElasticsearchSpanData(): ?array { - return Context::get(self::TRACE_ELASTICSEARCH_SPAN_DATA); + return Context::get(self::CTX_ELASTICSEARCH_SPAN_DATA); } public static function setRpcSpanContext(SpanContext $spanContext): void { - Context::set(self::TRACE_RPC_SPAN_CONTEXT, $spanContext); + Context::set(self::CTX_RPC_SPAN_CONTEXT, $spanContext); } public static function getRpcSpanContext(): ?SpanContext { - return Context::get(self::TRACE_RPC_SPAN_CONTEXT); + return Context::get(self::CTX_RPC_SPAN_CONTEXT); } } From 1734ae5184bd320818e2206c4c8e10fba2689313 Mon Sep 17 00:00:00 2001 From: Deeka Wong <8337659+huangdijia@users.noreply.github.com> Date: Wed, 3 Dec 2025 14:19:52 +0800 Subject: [PATCH 17/22] =?UTF-8?q?refactor:=20=E6=B7=BB=E5=8A=A0destroyRpcS?= =?UTF-8?q?panContext=E6=96=B9=E6=B3=95=E4=BB=A5=E7=AE=80=E5=8C=96RPC?= =?UTF-8?q?=E4=B8=8A=E4=B8=8B=E6=96=87=E9=94=80=E6=AF=81=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sentry/src/SentryContext.php | 5 +++++ src/sentry/src/Tracing/Aspect/RpcAspect.php | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/sentry/src/SentryContext.php b/src/sentry/src/SentryContext.php index e955300a3..85e165eca 100644 --- a/src/sentry/src/SentryContext.php +++ b/src/sentry/src/SentryContext.php @@ -182,4 +182,9 @@ public static function getRpcSpanContext(): ?SpanContext { return Context::get(self::CTX_RPC_SPAN_CONTEXT); } + + public static function destroyRpcSpanContext(): void + { + Context::destroy(self::CTX_RPC_SPAN_CONTEXT); + } } diff --git a/src/sentry/src/Tracing/Aspect/RpcAspect.php b/src/sentry/src/Tracing/Aspect/RpcAspect.php index 0a52c25a3..573324eef 100644 --- a/src/sentry/src/Tracing/Aspect/RpcAspect.php +++ b/src/sentry/src/Tracing/Aspect/RpcAspect.php @@ -125,7 +125,7 @@ function (Scope $scope) use ($proceedingJoinPoint) { $spanContext ); } finally { - Context::destroy(SentryContext::TRACE_RPC_SPAN_CONTEXT); + SentryContext::destroyRpcSpanContext(); } } } From 21a426cca05b4d7d1a13f2a1e8ff8a1580810910 Mon Sep 17 00:00:00 2001 From: Deeka Wong <8337659+huangdijia@users.noreply.github.com> Date: Wed, 3 Dec 2025 14:56:25 +0800 Subject: [PATCH 18/22] =?UTF-8?q?refactor:=20=E7=A7=BB=E9=99=A4=E4=B8=8D?= =?UTF-8?q?=E5=BF=85=E8=A6=81=E7=9A=84=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E5=92=8C=E7=AB=AF=E5=8F=A3=E5=B8=B8=E9=87=8F=E5=8F=8A?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=B9=E6=B3=95=E4=BB=A5=E7=AE=80=E5=8C=96?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sentry/src/SentryContext.php | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/src/sentry/src/SentryContext.php b/src/sentry/src/SentryContext.php index 85e165eca..0b1005f88 100644 --- a/src/sentry/src/SentryContext.php +++ b/src/sentry/src/SentryContext.php @@ -23,10 +23,6 @@ class SentryContext public const CTX_CARRIER = 'sentry.ctx.trace.carrier'; - public const CTX_SERVER_ADDRESS = 'sentry.ctx.server.address'; - - public const CTX_SERVER_PORT = 'sentry.ctx.server.port'; - public const CTX_ELASTICSEARCH_SPAN_DATA = 'sentry.ctx.elasticsearch.span.data'; public const CTX_DB_SERVER_ADDRESS = 'sentry.ctx.db.server.address'; @@ -103,26 +99,6 @@ public static function getRedisServerPort(): ?int return Context::get(self::CTX_REDIS_SERVER_PORT); } - public static function setServerAddress(string $address): void - { - Context::set(self::CTX_SERVER_ADDRESS, $address); - } - - public static function getServerAddress(): ?string - { - return Context::get(self::CTX_SERVER_ADDRESS); - } - - public static function setServerPort(int $port): void - { - Context::set(self::CTX_SERVER_PORT, $port); - } - - public static function getServerPort(): ?int - { - return Context::get(self::CTX_SERVER_PORT); - } - public static function setRpcServerAddress(string $address): void { Context::set(self::CTX_RPC_SERVER_ADDRESS, $address); From 77d02b293af7b37318178289266323c6ab43c533 Mon Sep 17 00:00:00 2001 From: Deeka Wong <8337659+huangdijia@users.noreply.github.com> Date: Wed, 3 Dec 2025 14:56:54 +0800 Subject: [PATCH 19/22] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=AD=A3CTX=5FCARRI?= =?UTF-8?q?ER=E5=B8=B8=E9=87=8F=E7=9A=84=E5=91=BD=E5=90=8D=E4=BB=A5?= =?UTF-8?q?=E6=8F=90=E9=AB=98=E4=B8=80=E8=87=B4=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sentry/src/SentryContext.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sentry/src/SentryContext.php b/src/sentry/src/SentryContext.php index 0b1005f88..a5fce1fb8 100644 --- a/src/sentry/src/SentryContext.php +++ b/src/sentry/src/SentryContext.php @@ -21,7 +21,7 @@ class SentryContext public const CTX_DISABLE_COROUTINE_TRACING = 'sentry.ctx.coroutine.disabled'; - public const CTX_CARRIER = 'sentry.ctx.trace.carrier'; + public const CTX_CARRIER = 'sentry.ctx.carrier'; public const CTX_ELASTICSEARCH_SPAN_DATA = 'sentry.ctx.elasticsearch.span.data'; From c6d818eedea912277777d1459266d87ce08c28ea Mon Sep 17 00:00:00 2001 From: Deeka Wong <8337659+huangdijia@users.noreply.github.com> Date: Wed, 3 Dec 2025 14:57:16 +0800 Subject: [PATCH 20/22] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=AD=A3CTX=5FRPC?= =?UTF-8?q?=5FSPAN=5FCONTEXT=E5=B8=B8=E9=87=8F=E7=9A=84=E5=91=BD=E5=90=8D?= =?UTF-8?q?=E4=BB=A5=E6=8F=90=E9=AB=98=E4=B8=80=E8=87=B4=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sentry/src/SentryContext.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sentry/src/SentryContext.php b/src/sentry/src/SentryContext.php index a5fce1fb8..dce4e80f3 100644 --- a/src/sentry/src/SentryContext.php +++ b/src/sentry/src/SentryContext.php @@ -37,7 +37,7 @@ class SentryContext public const CTX_RPC_SERVER_PORT = 'sentry.ctx.rpc.server.port'; - public const CTX_RPC_SPAN_CONTEXT = 'sentry.ctx.rpc.span_context'; + public const CTX_RPC_SPAN_CONTEXT = 'sentry.ctx.rpc.span.context'; public static function disableTracing(): void { From f295f31c58da5d6954b85cedee401989b60ac9bb Mon Sep 17 00:00:00 2001 From: Deeka Wong <8337659+huangdijia@users.noreply.github.com> Date: Wed, 3 Dec 2025 14:57:40 +0800 Subject: [PATCH 21/22] =?UTF-8?q?refactor:=20=E7=A7=BB=E9=99=A4isTracingEn?= =?UTF-8?q?abled=E6=96=B9=E6=B3=95=E4=BB=A5=E7=AE=80=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sentry/src/SentryContext.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/sentry/src/SentryContext.php b/src/sentry/src/SentryContext.php index dce4e80f3..570fb0f5d 100644 --- a/src/sentry/src/SentryContext.php +++ b/src/sentry/src/SentryContext.php @@ -49,11 +49,6 @@ public static function enableTracing(): void Context::set(self::CTX_DISABLE_COROUTINE_TRACING, false); } - public static function isTracingEnabled(): bool - { - return ! Context::get(self::CTX_DISABLE_COROUTINE_TRACING, false); - } - public static function isTracingDisabled(): bool { return Context::get(self::CTX_DISABLE_COROUTINE_TRACING, false); From 67fe140ff0613f756c02c3d8bd2d70a6c84a63ba Mon Sep 17 00:00:00 2001 From: Deeka Wong <8337659+huangdijia@users.noreply.github.com> Date: Wed, 3 Dec 2025 14:58:01 +0800 Subject: [PATCH 22/22] =?UTF-8?q?refactor:=20=E5=BC=BA=E5=88=B6=E8=BD=AC?= =?UTF-8?q?=E6=8D=A2isTracingDisabled=E6=96=B9=E6=B3=95=E7=9A=84=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=80=BC=E4=B8=BA=E5=B8=83=E5=B0=94=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/sentry/src/SentryContext.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sentry/src/SentryContext.php b/src/sentry/src/SentryContext.php index 570fb0f5d..0be693ade 100644 --- a/src/sentry/src/SentryContext.php +++ b/src/sentry/src/SentryContext.php @@ -51,7 +51,7 @@ public static function enableTracing(): void public static function isTracingDisabled(): bool { - return Context::get(self::CTX_DISABLE_COROUTINE_TRACING, false); + return (bool) Context::get(self::CTX_DISABLE_COROUTINE_TRACING, false); } public static function setCronCheckInId(string $checkInId): void