🐛 fix(sentry): flush metrics in watchers and release captured refs in defer

src/sentry/publish/sentry.php

@@ -43,6 +43,9 @@
     // @see: https://docs.sentry.io/platforms/php/guides/laravel/configuration/options/#enable_logs
     'enable_logs' => env('SENTRY_ENABLE_LOGS', true),
 
+    // @see: https://docs.sentry.io/platforms/php/guides/laravel/configuration/options/#log_flush_threshold
+    'log_flush_threshold' => env('SENTRY_LOG_FLUSH_THRESHOLD') === null ? null : (int) env('SENTRY_LOG_FLUSH_THRESHOLD'),
+
     // @see: https://docs.sentry.io/platforms/php/configuration/options/#before_send_log
     // 'before_send_log' => function (Sentry\Logs\Log $log): Sentry\Logs\Log {
     //     return $log;

src/sentry/src/Crons/Listener/EventHandleListener.php

@@ -66,7 +66,6 @@ public function process(object $event): void
 
     protected function handleCrontabTaskStarting(Event\BeforeExecute $event, array $options): void
     {
-        $hub = SentrySdk::getCurrentHub();
         $slug = $event->crontab->getName();
         $rule = $event->crontab->getRule();
         $rules = explode(' ', $rule);
@@ -83,7 +82,7 @@ protected function handleCrontabTaskStarting(Event\BeforeExecute $event, array $
             $monitorConfig = $this->createMonitorConfig($event, $options, $rule);
         }
 
-        $checkInId = $hub->captureCheckIn(
+        $checkInId = SentrySdk::getCurrentHub()->captureCheckIn(
             slug: $slug,
             status: CheckInStatus::inProgress(),
             monitorConfig: $monitorConfig,
@@ -100,10 +99,9 @@ protected function handleCrontabTaskFinished(Event\AfterExecute $event): void
             return;
         }
 
-        $hub = SentrySdk::getCurrentHub();
         $slug = $event->crontab->getName();
 
-        $hub->captureCheckIn(
+        SentrySdk::getCurrentHub()->captureCheckIn(
             slug: $slug,
             status: CheckInStatus::ok(),
             checkInId: $checkInId,
@@ -118,10 +116,9 @@ protected function handleCrontabTaskFailed(Event\FailToExecute $event): void
             return;
         }
 
-        $hub = SentrySdk::getCurrentHub();
         $slug = $event->crontab->getName();
 
-        $hub->captureCheckIn(
+        SentrySdk::getCurrentHub()->captureCheckIn(
             slug: $slug,
             status: CheckInStatus::error(),
             checkInId: $checkInId,

src/sentry/src/Metrics/Listener/OnBeforeHandle.php

@@ -113,6 +113,8 @@ function () use ($metrics) {
                     ['worker' => '0'],
                     Unit::megabyte()
                 );
+
+                metrics()->flush();
             }
         );
     }

src/sentry/src/Metrics/Listener/OnCoroutineServerStart.php

@@ -111,6 +111,8 @@ function () use ($metrics) {
                     ['worker' => '0'],
                     Unit::megabyte()
                 );
+
+                metrics()->flush();
             }
         );
     }

src/sentry/src/Metrics/Listener/OnMetricFactoryReady.php

@@ -128,6 +128,8 @@ function () use ($metrics, $serverStatsFactory, $workerId) {
                     ['worker' => (string) $workerId],
                     Unit::megabyte()
                 );
+
+                metrics()->flush();
             }
         );
     }

src/sentry/src/Metrics/Listener/OnWorkerStart.php

@@ -118,6 +118,8 @@ function () use ($metrics, $event) {
                     ['worker' => (string) ($event->workerId ?? 0)],
                     Unit::megabyte()
                 );
+
+                metrics()->flush();
             }
         );
     }

src/sentry/src/Metrics/Listener/PoolWatcher.php

@@ -88,6 +88,8 @@ function () use ($pool, $workerId, $poolName) {
                         'worker' => (string) $workerId,
                     ]
                 );
+
+                metrics()->flush();
             }
         );
     }

src/sentry/src/Metrics/Listener/QueueWatcher.php

@@ -82,6 +82,8 @@ function () {
                         ['queue' => $name]
                     );
                 }
+
+                metrics()->flush();
             }
         );
     }

src/sentry/src/Metrics/Listener/RequestWatcher.php

@@ -63,6 +63,8 @@ public function process(object $event): void
                 --$this->stats->connection_num;
 
                 $timer->end(true);
+
+                unset($timer);
             });
         }
     }

src/sentry/src/Tracing/Aspect/CoroutineAspect.php

@@ -27,9 +27,6 @@
 use function Hyperf\Coroutine\defer;
 use function Sentry\continueTrace;
 
-/**
- * Run after FriendsOfHyperf\Sentry\Aspect\CoroutineAspect.
- */
 class CoroutineAspect extends AbstractAspect
 {
     public const CONTEXT_KEYS = [
@@ -88,6 +85,7 @@ function (Scope $scope) use ($proceedingJoinPoint, $callingOnFunction) {
                         defer(function () use ($transaction) {
                             $transaction->finish();
                             SentrySdk::endContext();
+                            unset($transaction);
                         });
 
                         return trace(

src/sentry/src/Tracing/Listener/EventHandleListener.php

@@ -336,6 +336,8 @@ protected function handleRequestReceived(HttpEvent\RequestReceived|RpcEvent\Requ
 
             // Finish transaction
             $transaction->finish();
+
+            unset($transaction, $span);
         });
     }
 
@@ -532,6 +534,8 @@ protected function handleCrontabTaskStarting(CrontabEvent\BeforeExecute $event):
 
             // Finish transaction
             $transaction->finish();
+
+            unset($transaction);
         });
     }
 
@@ -598,6 +602,8 @@ protected function handleAmqpMessageProcessing(AmqpEvent\BeforeConsume $event):
 
             // Finish transaction
             $transaction->finish();
+
+            unset($transaction);
         });
     }
 
@@ -663,6 +669,8 @@ protected function handleKafkaMessageProcessing(KafkaEvent\BeforeConsume $event)
 
             // Finish transaction
             $transaction->finish();
+
+            unset($transaction);
         });
     }
 
@@ -710,6 +718,8 @@ protected function handleAsyncQueueJobProcessing(AsyncQueueEvent\BeforeHandle $e
 
             // Finish transaction
             $transaction->finish();
+
+            unset($transaction);
         });
     }