Merge branch 'master' into 3.1

# Conflicts: # src/redis/composer.json # src/validation/tests/Cases/ValidateAttributesTest.php
hyperf · Sep 14, 2023 · 2a971d8 · 2a971d8
2 parents 8e7abb6 + b56efa0
commit 2a971d8
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/publish/opentracing.php b/publish/opentracing.php
@@ -21,6 +21,7 @@
         'db' => env('TRACER_ENABLE_DB', false),
         'method' => env('TRACER_ENABLE_METHOD', false),
         'exception' => env('TRACER_ENABLE_EXCEPTION', false),
+        'ignore_exceptions' => [],
     ],
     'tracer' => [
         'zipkin' => [

diff --git a/src/Listener/RequestTraceListener.php b/src/Listener/RequestTraceListener.php
@@ -77,7 +77,7 @@ protected function handleRequestTerminated(RequestTerminated $event): void
         $span = TracerContext::getRoot();
         $span->setTag($this->spanTagManager->get('response', 'status_code'), $response->getStatusCode());
 
-        if ($event->exception && $this->switchManager->isEnable('exception')) {
+        if ($event->exception && $this->switchManager->isEnable('exception') && ! $this->switchManager->isIgnoreException($event->exception::class)) {
             $this->appendExceptionToSpan($span, $exception = $event->exception);
 
             if ($exception instanceof HttpException) {

diff --git a/src/Middleware/TraceMiddleware.php b/src/Middleware/TraceMiddleware.php
@@ -58,7 +58,9 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
             }
             $span->setTag($this->spanTagManager->get('response', 'status_code'), $response->getStatusCode());
         } catch (Throwable $exception) {
-            $this->switchManager->isEnable('exception') && $this->appendExceptionToSpan($span, $exception);
+            if ($this->switchManager->isEnable('exception') && ! $this->switchManager->isIgnoreException($exception::class)) {
+                $this->appendExceptionToSpan($span, $exception);
+            }
             if ($exception instanceof HttpException) {
                 $span->setTag($this->spanTagManager->get('response', 'status_code'), $exception->getStatusCode());
             }

diff --git a/src/SwitchManager.php b/src/SwitchManager.php
@@ -27,6 +27,7 @@ class SwitchManager
             // beta feature, please don't enable 'method' in production environment
             'method' => false,
             'error' => false,
+            'ignore_exceptions' => [],
         ];
 
     /**
@@ -48,4 +49,15 @@ public function isEnable(string $identifier): bool
 
         return $this->config[$identifier] && Context::get('tracer.root') instanceof Span;
     }
+
+    public function isIgnoreException(string $className): bool
+    {
+        $ignoreExceptions = $this->config['ignore_exceptions'] ?? [];
+        foreach ($ignoreExceptions as $ignoreException) {
+            if (is_a($className, $ignoreException, true)) {
+                return true;
+            }
+        }
+        return false;
+    }
 }