fix(sentry): adjust event flush order in Integration (#1052)

* fix(sentry): adjust event flush order in Integration

Move SentrySdk client flush to after Logs and TraceMetrics flush
to ensure proper event ordering during shutdown sequence.

* fix(sentry): adjust event flush order for IntegrationRegistry in SingletonAspect

* fix(sentry): disable IntegrationRegistry instance creation to prevent unexpected issues

---------

Co-authored-by: Deeka Wong <8337659+huangdijia@users.noreply.github.com>

Author: huangdijia

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,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,

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();
     }
 
     /**