diff --git a/src/sentry/src/Aspect/SingletonAspect.php b/src/sentry/src/Aspect/SingletonAspect.php index aa7c6c841..79db18f07 100644 --- a/src/sentry/src/Aspect/SingletonAspect.php +++ b/src/sentry/src/Aspect/SingletonAspect.php @@ -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', @@ -47,7 +48,6 @@ 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)(); }), @@ -55,6 +55,9 @@ public function process(ProceedingJoinPoint $proceedingJoinPoint) 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, diff --git a/src/sentry/src/Integration.php b/src/sentry/src/Integration.php index 4dff02b2e..776ccd165 100644 --- a/src/sentry/src/Integration.php +++ b/src/sentry/src/Integration.php @@ -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(); } /**