Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions src/sentry/src/Aspect/SingletonAspect.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ class SingletonAspect extends AbstractAspect
public array $classes = [
// Singleton Classes
\Sentry\State\HubAdapter::class . '::getInstance',
\Sentry\Integration\IntegrationRegistry::class . '::getInstance',
\Sentry\Logs\Logs::class . '::getInstance',
\Sentry\Metrics\TraceMetrics::class . '::getInstance',
// !!! Don't enable this for now, it may cause some unexpected issues !!!
// \Sentry\Integration\IntegrationRegistry::class . '::getInstance',
// Enums
// \Sentry\CheckInStatus::class . '::getInstance',
// \Sentry\EventType::class . '::getInstance',
Expand All @@ -47,14 +48,16 @@ public function process(ProceedingJoinPoint $proceedingJoinPoint)
return match ($className) {
// Singleton Classes
\Sentry\State\HubAdapter::class,
\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) {
return new $className();
}),

// !!! Don't enable this for now, it may cause some unexpected issues !!!
// \Sentry\Integration\IntegrationRegistry::class => $proceedingJoinPoint->process(),

// Enums
// \Sentry\CheckInStatus::class,
// \Sentry\EventType::class,
Expand Down
2 changes: 1 addition & 1 deletion src/sentry/src/Integration.php
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,9 @@ public static function setTransaction(?string $transaction): void
*/
public static function flushEvents(): void
{
SentrySdk::getCurrentHub()->getClient()?->flush();
Logs::getInstance()->flush();
TraceMetrics::getInstance()->flush();
SentrySdk::getCurrentHub()->getClient()?->flush();
}

/**
Expand Down