Merge branch 'master' into 2.1-merge

# Conflicts: # src/guzzle/src/CoroutineHandler.php # src/guzzle/tests/Stub/CoroutineHandlerStub.php
hyperf · Nov 25, 2020 · fe39980 · fe39980
2 parents 4b88c3f + adbf877
commit fe39980
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 18 deletions.
diff --git a/src/Aspect/HttpClientAspect.php b/src/Aspect/HttpClientAspect.php
@@ -91,11 +91,15 @@ public function process(ProceedingJoinPoint $proceedingJoinPoint)
         );
         $options['headers'] = array_replace($options['headers'] ?? [], $appendHeaders);
         $proceedingJoinPoint->arguments['keys']['options'] = $options;
-        $result = $proceedingJoinPoint->process();
-        if ($result instanceof ResponseInterface) {
-            $span->setTag($this->spanTagManager->get('http_client', 'http.status_code'), $result->getStatusCode());
+
+        try {
+            $result = $proceedingJoinPoint->process();
+            if ($result instanceof ResponseInterface) {
+                $span->setTag($this->spanTagManager->get('http_client', 'http.status_code'), $result->getStatusCode());
+            }
+        } finally {
+            $span->finish();
         }
-        $span->finish();
         return $result;
     }
 }
diff --git a/src/Aspect/JsonRpcAspect.php b/src/Aspect/JsonRpcAspect.php
@@ -90,13 +90,16 @@ public function process(ProceedingJoinPoint $proceedingJoinPoint)
         }
 
         if ($proceedingJoinPoint->methodName === 'send') {
-            $result = $proceedingJoinPoint->process();
-            /** @var Span $span */
-            if ($span = CT::get('tracer.span.' . static::class)) {
-                if ($this->spanTagManager->has('rpc', 'status')) {
-                    $span->setTag($this->spanTagManager->get('rpc', 'status'), isset($result['result']) ? 'OK' : 'Failed');
+            try {
+                $result = $proceedingJoinPoint->process();
+            } finally {
+                /** @var Span $span */
+                if ($span = CT::get('tracer.span.' . static::class)) {
+                    if ($this->spanTagManager->has('rpc', 'status')) {
+                        $span->setTag($this->spanTagManager->get('rpc', 'status'), isset($result['result']) ? 'OK' : 'Failed');
+                    }
+                    $span->finish();
                 }
-                $span->finish();
             }
 
             return $result;

diff --git a/src/Aspect/MethodAspect.php b/src/Aspect/MethodAspect.php
@@ -58,8 +58,11 @@ public function process(ProceedingJoinPoint $proceedingJoinPoint)
 
         $key = $proceedingJoinPoint->className . '::' . $proceedingJoinPoint->methodName;
         $span = $this->startSpan($key);
-        $result = $proceedingJoinPoint->process();
-        $span->finish();
+        try {
+            $result = $proceedingJoinPoint->process();
+        } finally {
+            $span->finish();
+        }
         return $result;
     }
 }
diff --git a/src/Aspect/RedisAspect.php b/src/Aspect/RedisAspect.php
@@ -74,9 +74,12 @@ public function process(ProceedingJoinPoint $proceedingJoinPoint)
         $arguments = $proceedingJoinPoint->arguments['keys'];
         $span = $this->startSpan('Redis' . '::' . $arguments['name']);
         $span->setTag($this->spanTagManager->get('redis', 'arguments'), json_encode($arguments['arguments']));
-        $result = $proceedingJoinPoint->process();
-        $span->setTag($this->spanTagManager->get('redis', 'result'), json_encode($result));
-        $span->finish();
+        try {
+            $result = $proceedingJoinPoint->process();
+            $span->setTag($this->spanTagManager->get('redis', 'result'), json_encode($result));
+        } finally {
+            $span->finish();
+        }
         return $result;
     }
 }
diff --git a/src/Aspect/TraceAnnotationAspect.php b/src/Aspect/TraceAnnotationAspect.php
@@ -58,8 +58,11 @@ public function process(ProceedingJoinPoint $proceedingJoinPoint)
         }
         $span = $this->startSpan($name);
         $span->setTag($tag, $source);
-        $result = $proceedingJoinPoint->process();
-        $span->finish();
+        try {
+            $result = $proceedingJoinPoint->process();
+        } finally {
+            $span->finish();
+        }
         return $result;
     }
 }
diff --git a/src/SpanStarter.php b/src/SpanStarter.php
@@ -36,7 +36,12 @@ protected function startSpan(
             /** @var ServerRequestInterface $request */
             $request = Context::get(ServerRequestInterface::class);
             if (! $request instanceof ServerRequestInterface) {
-                throw new \RuntimeException('ServerRequest object missing.');
+                // If the request object is absent, we are probably in a commandline context.
+                // Throwing an exception is unnecessary.
+                $root = $this->tracer->startSpan($name, $option);
+                $root->setTag(SPAN_KIND, $kind);
+                Context::set('tracer.root', $root);
+                return $root;
             }
             $carrier = array_map(function ($header) {
                 return $header[0];