feat: enhance coroutine context handling in CoroutineAspect

Author: huangdijia

src/Aspect/CoroutineAspect.php

@@ -53,7 +53,9 @@ protected function handleCreate(ProceedingJoinPoint $proceedingJoinPoint): void
 
         $proceedingJoinPoint->arguments['keys']['callable'] = function () use ($callable, $cid) {
             // Restore the Context in the new Coroutine.
-            Context::copy($cid, self::CONTEXT_KEYS);
+            foreach (self::CONTEXT_KEYS as $key) {
+                Context::getOrSet($key, fn () => Context::get($key, coroutineId: $cid));
+            }
 
             // Defer the flushing of events until the coroutine completes.
             Co::defer(fn () => Integration::flushEvents());

src/Tracing/Aspect/CoroutineAspect.php

@@ -53,9 +53,13 @@ public function process(ProceedingJoinPoint $proceedingJoinPoint)
 
         $callingOnFunction = CoroutineBacktraceHelper::foundCallingOnFunction();
 
+        if (! $callingOnFunction) {
+            return $proceedingJoinPoint->process();
+        }
+
         return trace(
             function (Scope $scope) use ($proceedingJoinPoint, $callingOnFunction) {
-                if ($callingOnFunction && $span = $scope->getSpan()) {
+                if ($span = $scope->getSpan()) {
                     $cid = Co::id();
                     $callable = $proceedingJoinPoint->arguments['keys']['callable'];
 
@@ -64,7 +68,9 @@ function (Scope $scope) use ($proceedingJoinPoint, $callingOnFunction) {
                         SentrySdk::init(); // Ensure Sentry is initialized in the new coroutine.
 
                         // Restore the Context in the new Coroutine.
-                        Context::copy($cid, self::CONTEXT_KEYS);
+                        foreach (self::CONTEXT_KEYS as $key) {
+                            Context::getOrSet($key, fn () => Context::get($key, coroutineId: $cid));
+                        }
 
                         // Start a new transaction for the coroutine preparation phase.
                         $transaction = startTransaction(