Merge branch 'master' into 3.2-merge

# Conflicts:
#	.github/workflows/test.yml
#	src/grpc-client/src/BaseClient.php

Author: limingxinleo

src/Aspect/DbAspect.php

@@ -20,6 +20,8 @@
 use Hyperf\Tracer\SwitchManager;
 use Throwable;
 
+use const OpenTracing\Tags\SPAN_KIND_RPC_CLIENT;
+
 class DbAspect extends AbstractAspect
 {
     use SpanStarter;
@@ -42,7 +44,7 @@ public function process(ProceedingJoinPoint $proceedingJoinPoint)
         }
 
         $arguments = $proceedingJoinPoint->arguments['keys'];
-        $span = $this->startSpan('Db::' . $arguments['name']);
+        $span = $this->startSpan('Db::' . $arguments['name'], [], SPAN_KIND_RPC_CLIENT);
         $span->setTag($this->spanTagManager->get('db', 'db.query'), json_encode($arguments['arguments']));
         try {
             $result = $proceedingJoinPoint->process();

src/Aspect/HttpClientAspect.php

@@ -23,6 +23,7 @@
 use Throwable;
 
 use const OpenTracing\Formats\TEXT_MAP;
+use const OpenTracing\Tags\SPAN_KIND_RPC_CLIENT;
 
 class HttpClientAspect extends AbstractAspect
 {
@@ -57,7 +58,7 @@ public function process(ProceedingJoinPoint $proceedingJoinPoint)
         $method = $arguments['keys']['method'] ?? 'Null';
         $uri = $arguments['keys']['uri'] ?? 'Null';
         $key = "HTTP Request [{$method}] {$uri}";
-        $span = $this->startSpan($key);
+        $span = $this->startSpan($key, [], SPAN_KIND_RPC_CLIENT);
         $span->setTag('source', $proceedingJoinPoint->className . '::' . $proceedingJoinPoint->methodName);
         if ($this->spanTagManager->has('http_client', 'http.url')) {
             $span->setTag($this->spanTagManager->get('http_client', 'http.url'), $uri);

src/Aspect/RedisAspect.php

@@ -20,6 +20,8 @@
 use Hyperf\Tracer\SwitchManager;
 use Throwable;
 
+use const OpenTracing\Tags\SPAN_KIND_RPC_CLIENT;
+
 class RedisAspect extends AbstractAspect
 {
     use SpanStarter;
@@ -42,7 +44,7 @@ public function process(ProceedingJoinPoint $proceedingJoinPoint)
         }
 
         $arguments = $proceedingJoinPoint->arguments['keys'];
-        $span = $this->startSpan('Redis::' . $arguments['name']);
+        $span = $this->startSpan('Redis::' . $arguments['name'], [], SPAN_KIND_RPC_CLIENT);
         $span->setTag($this->spanTagManager->get('redis', 'arguments'), json_encode($arguments['arguments']));
         try {
             $result = $proceedingJoinPoint->process();

src/Listener/DbQueryExecutedListener.php

@@ -20,6 +20,8 @@
 use Hyperf\Tracer\SpanTagManager;
 use Hyperf\Tracer\SwitchManager;
 
+use const OpenTracing\Tags\SPAN_KIND_RPC_CLIENT;
+
 class DbQueryExecutedListener implements ListenerInterface
 {
     use SpanStarter;
@@ -53,9 +55,12 @@ public function process(object $event): void
         $endTime = microtime(true);
         $span = $this->startSpan($this->spanTagManager->get('db', 'db.query'), [
             'start_time' => (int) (($endTime - $event->time / 1000) * 1000 * 1000),
-        ]);
+        ], SPAN_KIND_RPC_CLIENT);
         $span->setTag($this->spanTagManager->get('db', 'db.statement'), $sql);
         $span->setTag($this->spanTagManager->get('db', 'db.query_time'), $event->time . ' ms');
+        $span->setTag($this->spanTagManager->get('db', 'db.engine'), $event->connection->getDriverName());
+        $span->setTag($this->spanTagManager->get('db', 'db.instance'), $event->connection->getDatabaseName());
+        $span->setTag($this->spanTagManager->get('db', 'db.user'), $event->connection->getConfig('username'));
         $span->finish((int) ($endTime * 1000 * 1000));
     }
 }

src/SpanTagManager.php

@@ -32,6 +32,9 @@ class SpanTagManager
             'db.query' => 'db.query',
             'db.statement' => 'db.statement',
             'db.query_time' => 'db.query_time',
+            'db.engine' => 'db.engine',
+            'db.instance' => 'db.instance',
+            'db.user' => 'db.user',
         ],
         'rpc' => [
             'path' => 'rpc.path',