Skip to content

Commit

Permalink
chore: remove useless handler arg
Browse files Browse the repository at this point in the history
  • Loading branch information
cdaguerre committed Jun 30, 2024
1 parent f2b25a0 commit fc9b5e2
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 10 deletions.
10 changes: 3 additions & 7 deletions spec/Tracing/Instrumentation/LogHandler/TracingHandlerSpec.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand Down
1 change: 0 additions & 1 deletion src/DependencyInjection/config/tracing/tracing.php
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@

->set(TracingHandler::class)
->args([
service(TracerProviderInterface::class),
service(MainSpanContextInterface::class),
param('tracing.logs.level'),
param('tracing.logs.channels'),
Expand Down
3 changes: 1 addition & 2 deletions src/Tracing/Instrumentation/LogHandler/TracingHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -30,7 +29,7 @@ class TracingHandler extends AbstractProcessingHandler
/**
* @param array<string> $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);

Expand Down

0 comments on commit fc9b5e2

Please sign in to comment.