Skip to content

feat(sentry): add singleton support for Logs class #1050

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
Dec 23, 2025
Merged

feat(sentry): add singleton support for Logs class #1050

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
f322cb8
feat(sentry): add singleton support for Logs class
huangdijia Dec 23, 2025
a7cc6ae
fix(sentry): simplify flushEvents method by using nullsafe operator
huangdijia Dec 23, 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
4 changes: 3 additions & 1 deletion src/sentry/src/Aspect/SingletonAspect.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ class SingletonAspect extends AbstractAspect
// Singleton Classes
\Sentry\State\HubAdapter::class . '::getInstance',
\Sentry\Integration\IntegrationRegistry::class . '::getInstance',
\Sentry\Logs\Logs::class . '::getInstance',
\Sentry\Metrics\TraceMetrics::class . '::getInstance',
// Enums
// \Sentry\CheckInStatus::class . '::getInstance',
Expand All @@ -46,7 +47,8 @@ public function process(ProceedingJoinPoint $proceedingJoinPoint)
return match ($className) {
// Singleton Classes
\Sentry\State\HubAdapter::class,
\Sentry\Integration\IntegrationRegistry::class => Context::getOrSet($key, function () use ($className) {
\Sentry\Integration\IntegrationRegistry::class,
\Sentry\Logs\Logs::class => Context::getOrSet($key, function () use ($className) {
return Closure::bind(fn () => new $className(), null, $className)();
}),
\Sentry\Metrics\TraceMetrics::class => Context::getOrSet($key, function () use ($className) {
Expand Down
11 changes: 3 additions & 8 deletions src/sentry/src/Integration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,14 +106,9 @@ public static function setTransaction(?string $transaction): void
*/
public static function flushEvents(): void
{
$client = SentrySdk::getCurrentHub()->getClient();

if ($client !== null) {
$client->flush();

Logs::getInstance()->flush();
TraceMetrics::getInstance()->flush();
}
SentrySdk::getCurrentHub()->getClient()?->flush();
Logs::getInstance()->flush();
TraceMetrics::getInstance()->flush();
}

/**
Expand Down