Skip to content

refactor(sentry): optimize event data setting in EventHandleListener #937

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
Sep 29, 2025
Merged

refactor(sentry): optimize event data setting in EventHandleListener #937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
188cc5b
refactor(sentry): optimize event data setting in EventHandleListener
huangdijia Sep 29, 2025
1ba9136
修复：注释掉 SentrySdk 类的导入
huangdijia Sep 29, 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: 1 addition & 1 deletion src/sentry/src/Aspect/CoroutineAspect.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class CoroutineAspect extends AbstractAspect
];

protected array $keys = [
SentrySdk::class,
// SentrySdk::class,
\Psr\Http\Message\ServerRequestInterface::class,
];

Expand Down
2 changes: 1 addition & 1 deletion src/sentry/src/Tracing/Aspect/CoroutineAspect.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class CoroutineAspect extends AbstractAspect
];

protected array $keys = [
SentrySdk::class,
// SentrySdk::class,
\Psr\Http\Message\ServerRequestInterface::class,
];

Expand Down
105 changes: 48 additions & 57 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 @@ -392,6 +392,10 @@ protected function handleCommandStarting(CommandEvent\BeforeHandle $event): void
->setOp('console.command')
->setDescription($command->getDescription())
->setOrigin('auto.command')
->setData([
'command.arguments' => (fn () => $this->input->getArguments())->call($command),
'command.options' => (fn () => $this->input->getOptions())->call($command),
])
);

Coroutine::inCoroutine() && defer(function () use ($transaction) {
Expand All @@ -415,10 +419,7 @@ protected function handleCommandFinished(CommandEvent\AfterExecute $event): void
$command = $event->getCommand();
$exitCode = (fn () => $this->exitCode ?? SymfonyCommand::SUCCESS)->call($command);

$transaction->setData([
'command.arguments' => (fn () => $this->input->getArguments())->call($command),
'command.options' => (fn () => $this->input->getOptions())->call($command),
])->setTags([
$transaction->setTags([
'command.exit_code' => (string) $exitCode,
]);

Expand Down Expand Up @@ -521,6 +522,14 @@ protected function handleCrontabTaskStarting(CrontabEvent\BeforeExecute $event):
->setDescription($crontab->getMemo())
->setOrigin('auto.crontab')
->setSource(TransactionSource::task())
->setTags([
'crontab.rule' => $crontab->getRule(),
'crontab.type' => $crontab->getType(),
])
->setData([
'crontab.options.is_single' => $crontab->isSingleton(),
'crontab.options.is_on_one_server' => $crontab->isOnOneServer(),
])
);

defer(function () use ($transaction) {
Expand All @@ -540,14 +549,6 @@ protected function handleCrontabTaskFinished(CrontabEvent\FailToExecute|CrontabE
return;
}

$crontab = $event->crontab;
$transaction->setTags([
'crontab.rule' => $crontab->getRule(),
'crontab.type' => $crontab->getType(),
'crontab.options.is_single' => $crontab->isSingleton(),
'crontab.options.is_on_one_server' => $crontab->isOnOneServer(),
]);

if (method_exists($event, 'getThrowable') && $exception = $event->getThrowable()) {
$transaction->setStatus(SpanStatus::internalError())
->setTags([
Expand All @@ -570,6 +571,7 @@ protected function handleAmqpMessageProcessing(AmqpEvent\BeforeConsume $event):
return;
}

/** @var ConsumerMessage $message */
$message = $event->getMessage();
$carrier = null;

Expand All @@ -590,6 +592,20 @@ protected function handleAmqpMessageProcessing(AmqpEvent\BeforeConsume $event):
->setOp('queue.process')
->setDescription($message::class)
->setOrigin('auto.amqp')
->setData([
'messaging.system' => 'amqp',
'messaging.operation' => 'process',
'messaging.message.id' => $carrier?->get('message_id'),
'messaging.message.body.size' => $carrier?->get('body_size'),
'messaging.message.receive.latency' => $carrier?->has('publish_time') ? (microtime(true) - $carrier->get('publish_time')) : null,
'messaging.message.retry.count' => 0,
'messaging.destination.name' => $carrier?->get('destination_name') ?: implode(', ', (array) $message->getRoutingKey()),
'messaging.amqp.message.type' => $message->getTypeString(),
'messaging.amqp.message.routing_key' => $message->getRoutingKey(),
'messaging.amqp.message.exchange' => $message->getExchange(),
'messaging.amqp.message.queue' => $message->getQueue(),
'messaging.amqp.message.pool_name' => $message->getPoolName(),
])
);

defer(function () use ($transaction) {
Expand All @@ -609,24 +625,7 @@ protected function handleAmqpMessageProcessed(AmqpEvent\AfterConsume|AmqpEvent\F
return;
}

/** @var null|Carrier $carrier */
$carrier = Context::get(Constants::TRACE_CARRIER);

/** @var ConsumerMessage $message */
$message = $event->getMessage();
$transaction->setData([
'messaging.system' => 'amqp',
'messaging.operation' => 'process',
'messaging.message.id' => $carrier?->get('message_id'),
'messaging.message.body.size' => $carrier?->get('body_size'),
'messaging.message.receive.latency' => $carrier?->has('publish_time') ? (microtime(true) - $carrier->get('publish_time')) : null,
'messaging.message.retry.count' => 0,
'messaging.destination.name' => $carrier?->get('destination_name') ?: implode(', ', (array) $message->getRoutingKey()),
'messaging.amqp.message.type' => $message->getTypeString(),
'messaging.amqp.message.routing_key' => $message->getRoutingKey(),
'messaging.amqp.message.exchange' => $message->getExchange(),
'messaging.amqp.message.queue' => $message->getQueue(),
'messaging.amqp.message.pool_name' => $message->getPoolName(),
'messaging.amqp.message.result' => $event instanceof AmqpEvent\AfterConsume ? $event->getResult()->value : 'fail',
]);

Expand Down Expand Up @@ -672,6 +671,17 @@ protected function handleKafkaMessageProcessing(KafkaEvent\BeforeConsume $event)
->setOp('queue.process')
->setDescription($consumer::class)
->setOrigin('auto.kafka')
->setData([
'messaging.system' => 'kafka',
'messaging.operation' => 'process',
'messaging.message.id' => $carrier?->get('message_id'),
'messaging.message.body.size' => $carrier?->get('body_size'),
'messaging.message.receive.latency' => $carrier?->has('publish_time') ? (microtime(true) - $carrier->get('publish_time')) : null,
'messaging.message.retry.count' => 0,
'messaging.destination.name' => $carrier?->get('destination_name') ?: (is_array($consumer->getTopic()) ? implode(',', $consumer->getTopic()) : $consumer->getTopic()),
'messaging.kafka.consumer.group' => $consumer->getGroupId(),
'messaging.kafka.consumer.pool' => $consumer->getPool(),
])
);

defer(function () use ($transaction) {
Expand All @@ -691,21 +701,6 @@ protected function handleKafkaMessageProcessed(KafkaEvent\AfterConsume|KafkaEven
return;
}

/** @var null|Carrier $carrier */
$carrier = Context::get(Constants::TRACE_CARRIER);
$consumer = $event->getConsumer();
$transaction->setData([
'messaging.system' => 'kafka',
'messaging.operation' => 'process',
'messaging.message.id' => $carrier?->get('message_id'),
'messaging.message.body.size' => $carrier?->get('body_size'),
'messaging.message.receive.latency' => $carrier?->has('publish_time') ? (microtime(true) - $carrier->get('publish_time')) : null,
'messaging.message.retry.count' => 0,
'messaging.destination.name' => $carrier?->get('destination_name') ?: (is_array($consumer->getTopic()) ? implode(',', $consumer->getTopic()) : $consumer->getTopic()),
'messaging.kafka.consumer.group' => $consumer->getGroupId(),
'messaging.kafka.consumer.pool' => $consumer->getPool(),
]);

if (method_exists($event, 'getThrowable') && $exception = $event->getThrowable()) {
$transaction->setStatus(SpanStatus::internalError())
->setTags([
Expand Down Expand Up @@ -737,7 +732,15 @@ protected function handleAsyncQueueJobProcessing(AsyncQueueEvent\BeforeHandle $e
->setName($job::class)
->setOp('queue.process')
->setDescription('async_queue: ' . $job::class)
->setOrigin('auto.async_queue')
->setOrigin('auto.async_queue')->setData([
'messaging.system' => 'async_queue',
'messaging.operation' => 'process',
'messaging.message.id' => $carrier?->get('message_id'),
'messaging.message.body.size' => $carrier?->get('body_size'),
'messaging.message.receive.latency' => $carrier?->has('publish_time') ? (microtime(true) - $carrier->get('publish_time')) : null,
'messaging.message.retry.count' => $event->getMessage()->getAttempts(),
'messaging.destination.name' => $carrier?->get('destination_name') ?: 'unknown queue',
])
);

defer(function () use ($transaction) {
Expand All @@ -757,18 +760,6 @@ protected function handleAsyncQueueJobProcessed(AsyncQueueEvent\AfterHandle|Asyn
return;
}

/** @var null|Carrier $carrier */
$carrier = Context::get(Constants::TRACE_CARRIER, null, Coroutine::parentId());
$transaction->setData([
'messaging.system' => 'async_queue',
'messaging.operation' => 'process',
'messaging.message.id' => $carrier?->get('message_id'),
'messaging.message.body.size' => $carrier?->get('body_size'),
'messaging.message.receive.latency' => $carrier?->has('publish_time') ? (microtime(true) - $carrier->get('publish_time')) : null,
'messaging.message.retry.count' => $event->getMessage()->getAttempts(),
'messaging.destination.name' => $carrier?->get('destination_name') ?: 'unknown queue',
]);

if (method_exists($event, 'getThrowable') && $exception = $event->getThrowable()) {
$transaction->setStatus(SpanStatus::internalError())
->setTags([
Expand Down