Lint (#13)

Author: lucas-angeli-gimenes

publish/open-telemetry.php

@@ -2,12 +2,6 @@
 
 declare(strict_types=1);
 
-use OpenTelemetry\SDK\Common\Export\TransportFactoryInterface;
-use OpenTelemetry\SDK\Logs\Processor\BatchLogRecordProcessor;
-use OpenTelemetry\SDK\Metrics\Data\Temporality;
-use OpenTelemetry\SDK\Trace\SpanProcessor\BatchSpanProcessor;
-use OpenTelemetry\SemConv\Attributes\ServiceAttributes;
-use OpenTelemetry\SemConv\Incubating\Attributes\ServiceIncubatingAttributes;
 use Hyperf\OpenTelemetry\Factory\Log\Exporter\OtlpHttpLogExporterFactory;
 use Hyperf\OpenTelemetry\Factory\Log\Exporter\StdoutLogExporterFactory;
 use Hyperf\OpenTelemetry\Factory\Log\Processor\BatchLogProcessorFactory;
@@ -19,6 +13,12 @@
 use Hyperf\OpenTelemetry\Factory\Trace\Processor\BatchSpanProcessorFactory;
 use Hyperf\OpenTelemetry\Factory\Trace\Processor\SimpleSpanProcessorFactory;
 use Hyperf\OpenTelemetry\Factory\Trace\Sampler\AlwaysOnSamplerFactory;
+use OpenTelemetry\SDK\Common\Export\TransportFactoryInterface;
+use OpenTelemetry\SDK\Logs\Processor\BatchLogRecordProcessor;
+use OpenTelemetry\SDK\Metrics\Data\Temporality;
+use OpenTelemetry\SDK\Trace\SpanProcessor\BatchSpanProcessor;
+use OpenTelemetry\SemConv\Attributes\ServiceAttributes;
+use OpenTelemetry\SemConv\Incubating\Attributes\ServiceIncubatingAttributes;
 
 use function Hyperf\Support\env;
 

src/Aspect/Aws/DynamoDbClientAspect.php

@@ -6,13 +6,13 @@
 
 use Hyperf\Di\Aop\ProceedingJoinPoint;
 use Hyperf\Di\Exception\Exception;
+use Hyperf\OpenTelemetry\Aspect\AbstractAspect;
 use OpenTelemetry\API\Trace\SpanKind;
 use OpenTelemetry\API\Trace\StatusCode;
 use OpenTelemetry\SemConv\Attributes\DbAttributes;
 use OpenTelemetry\SemConv\Attributes\ErrorAttributes;
 use OpenTelemetry\SemConv\Incubating\Attributes\DbIncubatingAttributes as DbIncubatingAttr;
 use OpenTelemetry\SemConv\Metrics\DbMetrics;
-use Hyperf\OpenTelemetry\Aspect\AbstractAspect;
 use Throwable;
 
 class DynamoDbClientAspect extends AbstractAspect

src/Aspect/Aws/SnsClientAspect.php

@@ -5,11 +5,11 @@
 namespace Hyperf\OpenTelemetry\Aspect\Aws;
 
 use Hyperf\Di\Aop\ProceedingJoinPoint;
+use Hyperf\OpenTelemetry\Aspect\AbstractAspect;
 use OpenTelemetry\API\Trace\SpanKind;
 use OpenTelemetry\API\Trace\StatusCode;
 use OpenTelemetry\SemConv\Attributes\ErrorAttributes;
 use OpenTelemetry\SemConv\Incubating\Attributes\MessagingIncubatingAttributes as Msg;
-use Hyperf\OpenTelemetry\Aspect\AbstractAspect;
 use Throwable;
 
 class SnsClientAspect extends AbstractAspect

src/Aspect/GuzzleClientAspect.php

@@ -8,6 +8,9 @@
 use GuzzleHttp\Promise\PromiseInterface;
 use Hyperf\Di\Aop\ProceedingJoinPoint;
 use Hyperf\Di\Exception\Exception;
+use Hyperf\OpenTelemetry\Propagator\HeadersPropagator;
+use Hyperf\OpenTelemetry\Support\SpanScope;
+use Hyperf\OpenTelemetry\Support\Uri;
 use Hyperf\Stringable\Str;
 use OpenTelemetry\API\Trace\SpanKind;
 use OpenTelemetry\API\Trace\StatusCode;
@@ -19,9 +22,6 @@
 use OpenTelemetry\SemConv\Incubating\Attributes\HttpIncubatingAttributes;
 use OpenTelemetry\SemConv\Incubating\Attributes\UrlIncubatingAttributes;
 use OpenTelemetry\SemConv\Metrics\HttpMetrics;
-use Hyperf\OpenTelemetry\Propagator\HeadersPropagator;
-use Hyperf\OpenTelemetry\Support\SpanScope;
-use Hyperf\OpenTelemetry\Support\Uri;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Throwable;
@@ -65,7 +65,7 @@ public function process(ProceedingJoinPoint $proceedingJoinPoint): mixed
 
         if ($this->isTracingEnabled) {
             $scope = $this->instrumentation->startSpan(
-                name: $method . ' ' .  Uri::sanitize(
+                name: $method . ' ' . Uri::sanitize(
                     $request->getUri()->getPath(),
                     $this->config->get('open-telemetry.traces.uri_mask', [])
                 ),

src/Aspect/MongoAspect.php

@@ -5,7 +5,6 @@
 namespace Hyperf\OpenTelemetry\Aspect;
 
 use Hyperf\Di\Aop\ProceedingJoinPoint;
-use Hyperf\OpenTelemetry\Aspect\AbstractAspect;
 use Hyperf\Stringable\Str;
 use OpenTelemetry\API\Trace\SpanKind;
 use OpenTelemetry\API\Trace\StatusCode;

src/ConfigProvider.php

@@ -9,15 +9,13 @@
 use Hyperf\OpenTelemetry\Factory\Metric\MeterProviderFactory;
 use Hyperf\OpenTelemetry\Factory\OTelResourceFactory;
 use Hyperf\OpenTelemetry\Factory\Trace\TracerProviderFactory;
+use Hyperf\OpenTelemetry\Support\HyperfGuzzle;
 use OpenTelemetry\API\Instrumentation\CachedInstrumentation;
+use OpenTelemetry\SDK\Common\Http\Psr\Client\Discovery;
+use OpenTelemetry\SDK\Common\Http\Psr\Client\Discovery\Guzzle;
 use OpenTelemetry\SDK\Logs\LoggerProviderInterface;
 use OpenTelemetry\SDK\Metrics\MeterProviderInterface;
 use OpenTelemetry\SDK\Resource\ResourceInfo;
-use Hyperf\OpenTelemetry\Factory\CachedInstrumentationFactory;
-use Hyperf\OpenTelemetry\Factory\OTelResourceFactory;
-use Hyperf\OpenTelemetry\Support\HyperfGuzzle;
-use OpenTelemetry\SDK\Common\Http\Psr\Client\Discovery;
-use OpenTelemetry\SDK\Common\Http\Psr\Client\Discovery\Guzzle;
 use OpenTelemetry\SDK\Trace\TracerProviderInterface;
 
 class ConfigProvider

src/Factory/Log/LoggerProviderFactory.php

@@ -6,14 +6,14 @@
 
 use Hyperf\Contract\ConfigInterface;
 use Hyperf\Contract\ContainerInterface;
+use Hyperf\OpenTelemetry\Factory\Log\Exporter\LogExporterFactoryInterface;
+use Hyperf\OpenTelemetry\Factory\Log\Processor\LogProcessorFactoryInterface;
 use OpenTelemetry\SDK\Logs\LoggerProvider;
 use OpenTelemetry\SDK\Logs\LoggerProviderInterface;
 use OpenTelemetry\SDK\Logs\LogRecordExporterInterface;
 use OpenTelemetry\SDK\Logs\LogRecordProcessorInterface;
 use OpenTelemetry\SDK\Logs\NoopLoggerProvider;
 use OpenTelemetry\SDK\Resource\ResourceInfo;
-use Hyperf\OpenTelemetry\Factory\Log\Exporter\LogExporterFactoryInterface;
-use Hyperf\OpenTelemetry\Factory\Log\Processor\LogProcessorFactoryInterface;
 
 class LoggerProviderFactory
 {

src/Factory/Trace/TracerProviderFactory.php

@@ -6,16 +6,16 @@
 
 use Hyperf\Contract\ConfigInterface;
 use Hyperf\Contract\ContainerInterface;
+use Hyperf\OpenTelemetry\Factory\Trace\Exporter\TraceExporterFactoryInterface;
+use Hyperf\OpenTelemetry\Factory\Trace\Processor\TraceProcessorFactoryInterface;
+use Hyperf\OpenTelemetry\Factory\Trace\Sampler\SamplerFactory;
 use OpenTelemetry\SDK\Resource\ResourceInfo;
 use OpenTelemetry\SDK\Trace\NoopTracerProvider;
 use OpenTelemetry\SDK\Trace\SamplerInterface;
 use OpenTelemetry\SDK\Trace\SpanExporterInterface;
 use OpenTelemetry\SDK\Trace\SpanProcessorInterface;
 use OpenTelemetry\SDK\Trace\TracerProvider;
 use OpenTelemetry\SDK\Trace\TracerProviderInterface;
-use Hyperf\OpenTelemetry\Factory\Trace\Exporter\TraceExporterFactoryInterface;
-use Hyperf\OpenTelemetry\Factory\Trace\Processor\TraceProcessorFactoryInterface;
-use Hyperf\OpenTelemetry\Factory\Trace\Sampler\SamplerFactory;
 
 class TracerProviderFactory
 {

src/Instrumentation.php

@@ -4,14 +4,14 @@
 
 namespace Hyperf\OpenTelemetry;
 
+use Hyperf\OpenTelemetry\Support\SpanScope;
 use OpenTelemetry\API\Globals;
 use OpenTelemetry\API\Instrumentation\CachedInstrumentation;
 use OpenTelemetry\API\Metrics\MeterInterface;
 use OpenTelemetry\API\Trace\TracerInterface;
 use OpenTelemetry\Context\Context;
 use OpenTelemetry\Context\ContextInterface;
 use OpenTelemetry\Context\Propagation\TextMapPropagatorInterface;
-use Hyperf\OpenTelemetry\Support\SpanScope;
 
 class Instrumentation
 {

src/Listener/AbstractFlushListener.php

@@ -42,9 +42,9 @@ public function listen(): array
         ];
     }
 
-    abstract function flush(): void;
+    abstract public function flush(): void;
 
-    abstract function exportInterval() :float;
+    abstract public function exportInterval(): float;
 
     public function process(object $event): void
     {