feat(sentry): add SentrySdkAspect for coroutine-safe SDK usage

composer.json

@@ -32,7 +32,7 @@
         "psr/http-factory-implementation": "*",
         "psy/psysh": "^0.10.0 || ^0.11.0",
         "ramsey/uuid": "^4.7",
-        "sentry/sentry": "^4.19.0",
+        "sentry/sentry": "^4.21.0",
         "symfony/console": "^5.3 || ^6.0 || ^7.0",
         "symfony/http-foundation": "^5.3 || ^6.0 || ^7.0",
         "symfony/polyfill-php84": "^1.33",
@@ -330,4 +330,4 @@
         "test:types": "@php vendor/bin/pest --type-coverage",
         "test:unit": "@php vendor/bin/pest"
     }
-}
+}

src/sentry/composer.json

@@ -33,7 +33,7 @@
         "hyperf/http-server": "~3.1.0",
         "hyperf/support": "~3.1.0",
         "hyperf/tappable": "~3.1.0",
-        "sentry/sentry": "^4.19.0",
+        "sentry/sentry": "^4.21.0",
         "symfony/polyfill-php85": "^1.33"
     },
     "suggest": {
@@ -65,4 +65,4 @@
             "config": "FriendsOfHyperf\\Sentry\\ConfigProvider"
         }
     }
-}
+}

src/sentry/src/Aspect/SentrySdkAspect.php

@@ -0,0 +1,69 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of friendsofhyperf/components.
+ *
+ * @link     https://github.com/friendsofhyperf/components
+ * @document https://github.com/friendsofhyperf/components/blob/main/README.md
+ * @contact  huangdijia@gmail.com
+ */
+
+namespace FriendsOfHyperf\Sentry\Aspect;
+
+use Closure;
+use Hyperf\Context\Context;
+use Hyperf\Di\Aop\AbstractAspect;
+use Hyperf\Di\Aop\ProceedingJoinPoint;
+use Sentry\SentrySdk;
+use Sentry\State\HubInterface;
+use Sentry\State\RuntimeContextManager;
+
+use function Hyperf\Support\make;
+
+class SentrySdkAspect extends AbstractAspect
+{
+    public array $classes = [
+        SentrySdk::class . '::init',
+        SentrySdk::class . '::setCurrentHub',
+        SentrySdk::class . '::getRuntimeContextManager',
+    ];
+
+    public function process(ProceedingJoinPoint $proceedingJoinPoint)
+    {
+        return match ($proceedingJoinPoint->methodName) {
+            'init' => $this->handleInit($proceedingJoinPoint),
+            'setCurrentHub' => $this->handleSetCurrentHub($proceedingJoinPoint),
+            'getRuntimeContextManager' => $this->handleGetRuntimeContextManager($proceedingJoinPoint),
+            default => $proceedingJoinPoint->process(),
+        };
+    }
+
+    private function handleInit(ProceedingJoinPoint $proceedingJoinPoint)
+    {
+        Context::set(
+            RuntimeContextManager::class,
+            new RuntimeContextManager(make(HubInterface::class))
+        );
+
+        return SentrySdk::getCurrentHub();
+    }
+
+    private function handleSetCurrentHub(ProceedingJoinPoint $proceedingJoinPoint)
+    {
+        $arguments = $proceedingJoinPoint->arguments['keys'] ?? [];
+        $hub = $arguments['hub'];
+        // @phpstan-ignore-next-line
+        Closure::bind(fn () => static::getRuntimeContextManager()->setCurrentHub($hub), null, SentrySdk::class)();
+
+        return $hub;
+    }
+
+    private function handleGetRuntimeContextManager(ProceedingJoinPoint $proceedingJoinPoint)
+    {
+        return Context::getOrSet(
+            RuntimeContextManager::class,
+            fn () => new RuntimeContextManager(make(HubInterface::class))
+        );
+    }
+}

src/sentry/src/ConfigProvider.php

@@ -28,6 +28,7 @@ public function __invoke(): array
                 Aspect\LoggerAspect::class,
                 Aspect\RedisAspect::class,
                 // Aspect\SingletonAspect::class,
+                Aspect\SentrySdkAspect::class,
                 Metrics\Aspect\CounterAspect::class,
                 Metrics\Aspect\HistogramAspect::class,
                 Tracing\Aspect\AmqpProducerAspect::class,
@@ -76,7 +77,7 @@ public function __invoke(): array
             'annotations' => [
                 'scan' => [
                     'class_map' => [
-                        \Sentry\SentrySdk::class => __DIR__ . '/../class_map/SentrySdk.php',
+                        // \Sentry\SentrySdk::class => __DIR__ . '/../class_map/SentrySdk.php',
                     ],
                 ],
             ],