Allowed output log when an exception occurs (#6111)

hyperf · Aug 31, 2023 · f8e7986 · f8e7986
1 parent b599685
commit f8e7986
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/src/Adapter/Reporter/HttpClientFactory.php b/src/Adapter/Reporter/HttpClientFactory.php
@@ -12,7 +12,6 @@
 namespace Hyperf\Tracer\Adapter\Reporter;
 
 use Closure;
-use Hyperf\Contract\StdoutLoggerInterface;
 use Hyperf\Coordinator\Constants;
 use Hyperf\Coordinator\CoordinatorManager;
 use Hyperf\Engine\Channel;
@@ -28,7 +27,7 @@ class HttpClientFactory implements ClientFactoryInterface
 
     protected int $channelSize = 65535;
 
-    public function __construct(private ClientFactory $clientFactory, protected StdoutLoggerInterface $logger)
+    public function __construct(private ClientFactory $clientFactory)
     {
     }
 
@@ -58,7 +57,7 @@ public function build(array $options): callable
                     'no_aspect' => true,
                 ]);
                 $statusCode = $response->getStatusCode();
-                if ($statusCode !== 202) {
+                if (! in_array($statusCode, [200, 202])) {
                     throw new RuntimeException(
                         sprintf('Reporting of spans failed, status code %d', $statusCode)
                     );

diff --git a/src/Adapter/Reporter/ReporterFactory.php b/src/Adapter/Reporter/ReporterFactory.php
@@ -11,6 +11,8 @@
  */
 namespace Hyperf\Tracer\Adapter\Reporter;
 
+use Hyperf\Contract\StdoutLoggerInterface;
+use Psr\Container\ContainerInterface;
 use RuntimeException;
 use Zipkin\Reporter;
 
@@ -19,7 +21,7 @@
 class ReporterFactory
 {
     public function __construct(
-        private HttpClientFactory $httpClientFactory,
+        private ContainerInterface $container
     ) {
     }
 
@@ -28,10 +30,6 @@ public function make(array $option = []): Reporter
         $class = $option['class'] ?? '';
         $constructor = $option['constructor'] ?? [];
 
-        if ($class === \Zipkin\Reporters\Http::class) {
-            $option['constructor']['requesterFactory'] = $this->httpClientFactory;
-        }
-
         if (! class_exists($class)) {
             throw new RuntimeException(sprintf('Class %s is not exists.', $class));
         }
@@ -40,6 +38,14 @@ public function make(array $option = []): Reporter
             throw new RuntimeException('Unsupported reporter.');
         }
 
+        if ($class === \Zipkin\Reporters\Http::class) {
+            $constructor['requesterFactory'] = $this->container->get(HttpClientFactory::class);
+        }
+
+        if ($this->container->has(StdoutLoggerInterface::class)) {
+            $constructor['logger'] = $this->container->get(StdoutLoggerInterface::class);
+        }
+
         return make($class, $constructor);
     }
 }