Skip to content

Commit 919338a

Browse files
authored
Format code (#5172)
1 parent 0436f2b commit 919338a

9 files changed

Lines changed: 21 additions & 11 deletions

class_map/ThriftUdpTransport.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@
1919
use Hyperf\Utils\Coroutine;
2020
use Psr\Log\LoggerInterface;
2121
use Psr\Log\NullLogger;
22+
use Socket;
2223
use Thrift\Exception\TTransportException;
2324
use Thrift\Transport\TTransport;
25+
use Throwable;
2426

2527
class ThriftUdpTransport extends TTransport
2628
{
@@ -40,7 +42,7 @@ class ThriftUdpTransport extends TTransport
4042
private $logger;
4143

4244
/**
43-
* @var null|resource|\Socket
45+
* @var null|resource|Socket
4446
*/
4547
private $socket;
4648

@@ -177,7 +179,7 @@ private function loop(): void
177179
break 2;
178180
}
179181
$closure->call($this);
180-
} catch (\Throwable $e) {
182+
} catch (Throwable $e) {
181183
if (ApplicationContext::hasContainer()) {
182184
if (ApplicationContext::getContainer()->has(StdoutLoggerInterface::class)) {
183185
ApplicationContext::getContainer()

src/Aspect/DbAspect.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
use Hyperf\Tracer\SpanTagManager;
1919
use Hyperf\Tracer\SwitchManager;
2020
use OpenTracing\Tracer;
21+
use Throwable;
2122

2223
class DbAspect extends AbstractAspect
2324
{
@@ -45,7 +46,7 @@ public function process(ProceedingJoinPoint $proceedingJoinPoint)
4546
$span->setTag($this->spanTagManager->get('db', 'db.query'), json_encode($arguments['arguments']));
4647
try {
4748
$result = $proceedingJoinPoint->process();
48-
} catch (\Throwable $e) {
49+
} catch (Throwable $e) {
4950
$span->setTag('error', true);
5051
$span->log(['message', $e->getMessage(), 'code' => $e->getCode(), 'stacktrace' => $e->getTraceAsString()]);
5152
throw $e;

src/Aspect/ElasticserachAspect.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
use Hyperf\Tracer\SpanTagManager;
1919
use Hyperf\Tracer\SwitchManager;
2020
use OpenTracing\Tracer;
21+
use Throwable;
2122

2223
class ElasticserachAspect extends AbstractAspect
2324
{
@@ -52,7 +53,7 @@ public function process(ProceedingJoinPoint $proceedingJoinPoint)
5253
$span = $this->startSpan($key);
5354
try {
5455
$result = $proceedingJoinPoint->process();
55-
} catch (\Throwable $e) {
56+
} catch (Throwable $e) {
5657
$span->setTag('error', true);
5758
$span->log(['message', $e->getMessage(), 'code' => $e->getCode(), 'stacktrace' => $e->getTraceAsString()]);
5859
throw $e;

src/Aspect/HttpClientAspect.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
use Hyperf\Tracer\SwitchManager;
2020
use OpenTracing\Tracer;
2121
use Psr\Http\Message\ResponseInterface;
22+
use Throwable;
2223

2324
use const OpenTracing\Formats\TEXT_MAP;
2425

@@ -73,7 +74,7 @@ public function process(ProceedingJoinPoint $proceedingJoinPoint)
7374
if ($result instanceof ResponseInterface) {
7475
$span->setTag($this->spanTagManager->get('http_client', 'http.status_code'), $result->getStatusCode());
7576
}
76-
} catch (\Throwable $e) {
77+
} catch (Throwable $e) {
7778
$span->setTag('error', true);
7879
$span->log(['message', $e->getMessage(), 'code' => $e->getCode(), 'stacktrace' => $e->getTraceAsString()]);
7980
throw $e;

src/Aspect/JsonRpcAspect.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
use OpenTracing\Span;
2424
use OpenTracing\Tracer;
2525
use Psr\Container\ContainerInterface;
26+
use Throwable;
2627

2728
use const OpenTracing\Formats\TEXT_MAP;
2829

@@ -75,7 +76,7 @@ public function process(ProceedingJoinPoint $proceedingJoinPoint)
7576
if ($proceedingJoinPoint->methodName === 'send') {
7677
try {
7778
$result = $proceedingJoinPoint->process();
78-
} catch (\Throwable $e) {
79+
} catch (Throwable $e) {
7980
if ($span = CT::get('tracer.span.' . static::class)) {
8081
$span->setTag('error', true);
8182
$span->log(['message', $e->getMessage(), 'code' => $e->getCode(), 'stacktrace' => $e->getTraceAsString()]);

src/Aspect/MethodAspect.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
use Hyperf\Tracer\SpanStarter;
1717
use Hyperf\Tracer\SwitchManager;
1818
use OpenTracing\Tracer;
19+
use Throwable;
1920

2021
class MethodAspect extends AbstractAspect
2122
{
@@ -42,7 +43,7 @@ public function process(ProceedingJoinPoint $proceedingJoinPoint)
4243
$span = $this->startSpan($key);
4344
try {
4445
$result = $proceedingJoinPoint->process();
45-
} catch (\Throwable $e) {
46+
} catch (Throwable $e) {
4647
$span->setTag('error', true);
4748
$span->log(['message', $e->getMessage(), 'code' => $e->getCode(), 'stacktrace' => $e->getTraceAsString()]);
4849
throw $e;

src/Aspect/RedisAspect.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
use Hyperf\Tracer\SpanTagManager;
1919
use Hyperf\Tracer\SwitchManager;
2020
use OpenTracing\Tracer;
21+
use Throwable;
2122

2223
class RedisAspect extends AbstractAspect
2324
{
@@ -46,7 +47,7 @@ public function process(ProceedingJoinPoint $proceedingJoinPoint)
4647
try {
4748
$result = $proceedingJoinPoint->process();
4849
$span->setTag($this->spanTagManager->get('redis', 'result'), json_encode($result));
49-
} catch (\Throwable $e) {
50+
} catch (Throwable $e) {
5051
$span->setTag('error', true);
5152
$span->log(['message', $e->getMessage(), 'code' => $e->getCode(), 'stacktrace' => $e->getTraceAsString()]);
5253
throw $e;

src/Aspect/TraceAnnotationAspect.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
use Hyperf\Tracer\Annotation\Trace;
1717
use Hyperf\Tracer\SpanStarter;
1818
use OpenTracing\Tracer;
19+
use Throwable;
1920

2021
class TraceAnnotationAspect extends AbstractAspect
2122
{
@@ -48,7 +49,7 @@ public function process(ProceedingJoinPoint $proceedingJoinPoint)
4849
$span->setTag($tag, $source);
4950
try {
5051
$result = $proceedingJoinPoint->process();
51-
} catch (\Throwable $e) {
52+
} catch (Throwable $e) {
5253
$span->setTag('error', true);
5354
$span->log(['message', $e->getMessage(), 'code' => $e->getCode(), 'stacktrace' => $e->getTraceAsString()]);
5455
throw $e;

src/Middleware/TraceMiddleware.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
use Psr\Http\Message\ServerRequestInterface;
2323
use Psr\Http\Server\MiddlewareInterface;
2424
use Psr\Http\Server\RequestHandlerInterface;
25+
use Throwable;
2526

2627
class TraceMiddleware implements MiddlewareInterface
2728
{
@@ -50,7 +51,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
5051
try {
5152
$response = $handler->handle($request);
5253
$span->setTag($this->spanTagManager->get('response', 'status_code'), $response->getStatusCode());
53-
} catch (\Throwable $exception) {
54+
} catch (Throwable $exception) {
5455
$this->switchManager->isEnable('exception') && $this->appendExceptionToSpan($span, $exception);
5556
if ($exception instanceof HttpException) {
5657
$span->setTag($this->spanTagManager->get('response', 'status_code'), $exception->getStatusCode());
@@ -63,7 +64,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
6364
return $response;
6465
}
6566

66-
protected function appendExceptionToSpan(Span $span, \Throwable $exception): void
67+
protected function appendExceptionToSpan(Span $span, Throwable $exception): void
6768
{
6869
$span->setTag('error', true);
6970
$span->setTag($this->spanTagManager->get('exception', 'class'), get_class($exception));

0 commit comments

Comments
 (0)