From fc9b5e240e998b866d42b904545ac4100259842c Mon Sep 17 00:00:00 2001 From: Christian Daguerre Date: Sun, 30 Jun 2024 08:40:32 +0200 Subject: [PATCH] chore: remove useless handler arg --- .../Instrumentation/LogHandler/TracingHandlerSpec.php | 10 +++------- src/DependencyInjection/config/tracing/tracing.php | 1 - .../Instrumentation/LogHandler/TracingHandler.php | 3 +-- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/spec/Tracing/Instrumentation/LogHandler/TracingHandlerSpec.php b/spec/Tracing/Instrumentation/LogHandler/TracingHandlerSpec.php index d09e6bf..022afca 100644 --- a/spec/Tracing/Instrumentation/LogHandler/TracingHandlerSpec.php +++ b/spec/Tracing/Instrumentation/LogHandler/TracingHandlerSpec.php @@ -12,18 +12,16 @@ use Monolog\Level; use Monolog\LogRecord; use OpenTelemetry\API\Trace\SpanInterface; -use OpenTelemetry\API\Trace\TracerProviderInterface; use PhpSpec\ObjectBehavior; use Prophecy\Argument; class TracingHandlerSpec extends ObjectBehavior { public function it_adds_event_from_all_channels( - TracerProviderInterface $tracerProvider, MainSpanContextInterface $mainSpanContext, SpanInterface $span ): void { - $this->beConstructedWith($tracerProvider, $mainSpanContext, Level::Info, []); + $this->beConstructedWith($mainSpanContext, Level::Info, []); $mainSpanContext->getMainSpan()->willReturn($span); $span->addEvent(Argument::any())->willReturn($span); @@ -36,11 +34,10 @@ public function it_adds_event_from_all_channels( } public function it_adds_event_from_specific_channel_only( - TracerProviderInterface $tracerProvider, MainSpanContextInterface $mainSpanContext, SpanInterface $span ): void { - $this->beConstructedWith($tracerProvider, $mainSpanContext, Level::Info, ['foo']); + $this->beConstructedWith($mainSpanContext, Level::Info, ['foo']); $mainSpanContext->getMainSpan()->willReturn($span); $span->addEvent(Argument::any())->willReturn($span); @@ -53,11 +50,10 @@ public function it_adds_event_from_specific_channel_only( } public function it_ignores_event_from_specific_channel( - TracerProviderInterface $tracerProvider, MainSpanContextInterface $mainSpanContext, SpanInterface $span ): void { - $this->beConstructedWith($tracerProvider, $mainSpanContext, Level::Info, ['!foo']); + $this->beConstructedWith($mainSpanContext, Level::Info, ['!foo']); $mainSpanContext->getMainSpan()->willReturn($span); $span->addEvent(Argument::any())->willReturn($span); diff --git a/src/DependencyInjection/config/tracing/tracing.php b/src/DependencyInjection/config/tracing/tracing.php index 1d207d0..ca8f203 100644 --- a/src/DependencyInjection/config/tracing/tracing.php +++ b/src/DependencyInjection/config/tracing/tracing.php @@ -94,7 +94,6 @@ ->set(TracingHandler::class) ->args([ - service(TracerProviderInterface::class), service(MainSpanContextInterface::class), param('tracing.logs.level'), param('tracing.logs.channels'), diff --git a/src/Tracing/Instrumentation/LogHandler/TracingHandler.php b/src/Tracing/Instrumentation/LogHandler/TracingHandler.php index 02e64e0..62a11a4 100644 --- a/src/Tracing/Instrumentation/LogHandler/TracingHandler.php +++ b/src/Tracing/Instrumentation/LogHandler/TracingHandler.php @@ -14,7 +14,6 @@ use Monolog\Level; use Monolog\LogRecord; use Monolog\Processor\PsrLogMessageProcessor; -use OpenTelemetry\API\Trace\TracerProviderInterface; use OpenTelemetry\SDK\Trace\Span; class TracingHandler extends AbstractProcessingHandler @@ -30,7 +29,7 @@ class TracingHandler extends AbstractProcessingHandler /** * @param array $channels */ - public function __construct(protected TracerProviderInterface $tracerProvider, protected MainSpanContextInterface $mainSpanContext, $level = Level::Info, private array $channels = [], private string $strategy = self::STRATEGY_MAIN_SPAN, bool $bubble = true) + public function __construct(protected MainSpanContextInterface $mainSpanContext, $level = Level::Info, private array $channels = [], private string $strategy = self::STRATEGY_MAIN_SPAN, bool $bubble = true) { parent::__construct($level, $bubble);