Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Unreleased

- Deprecate the `logger` option (#1167)

## 3.1.2 (2021-01-08)

- Fix unwanted call to the `before_send` callback with transaction events, use `traces_sampler` instead to filter transactions (#1158)
Expand Down
2 changes: 1 addition & 1 deletion src/Client.php
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ private function prepareEvent(Event $event, ?EventHint $hint = null, ?Scope $sco
}

if (null === $event->getLogger()) {
$event->setLogger($this->options->getLogger());
$event->setLogger($this->options->getLogger(false));
}

$isTransaction = EventType::transaction() === $event->getType();
Expand Down
22 changes: 20 additions & 2 deletions src/Options.php
Original file line number Diff line number Diff line change
Expand Up @@ -270,19 +270,29 @@ public function setInAppIncludedPaths(array $paths): void

/**
* Gets the logger used by Sentry.
*
* @deprecated since version 3.2, to be removed in 4.0
*/
public function getLogger(): string
public function getLogger(/*bool $triggerDeprecation = true*/): string
{
if (0 === \func_num_args() || false !== func_get_arg(0)) {
@trigger_error(sprintf('Method %s() is deprecated since version 3.2 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);
}

return $this->options['logger'];
}

/**
* Sets the logger used by Sentry.
*
* @param string $logger The logger
*
* @deprecated since version 3.2, to be removed in 4.0
*/
public function setLogger(string $logger): void
{
@trigger_error(sprintf('Method %s() is deprecated since version 3.2 and will be removed in 4.0.', __METHOD__), E_USER_DEPRECATED);

$options = array_merge($this->options, ['logger' => $logger]);

$this->options = $this->resolver->resolve($options);
Expand Down Expand Up @@ -722,7 +732,7 @@ private function configureOptions(OptionsResolver $resolver): void
$resolver->setAllowedTypes('environment', ['null', 'string']);
$resolver->setAllowedTypes('in_app_exclude', 'string[]');
$resolver->setAllowedTypes('in_app_include', 'string[]');
$resolver->setAllowedTypes('logger', 'string');
$resolver->setAllowedTypes('logger', ['null', 'string']);
$resolver->setAllowedTypes('release', ['null', 'string']);
$resolver->setAllowedTypes('dsn', ['null', 'string', 'bool', Dsn::class]);
$resolver->setAllowedTypes('server_name', 'string');
Expand Down Expand Up @@ -759,6 +769,14 @@ private function configureOptions(OptionsResolver $resolver): void
$resolver->setNormalizer('in_app_include', function (SymfonyOptions $options, array $value) {
return array_map([$this, 'normalizeAbsolutePath'], $value);
});

$resolver->setNormalizer('logger', function (SymfonyOptions $options, ?string $value): ?string {
if ('php' !== $value) {
@trigger_error('The option "logger" is deprecated.', E_USER_DEPRECATED);
}

return $value;
});
}

/**
Expand Down
3 changes: 3 additions & 0 deletions tests/ClientTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,12 @@
use Sentry\State\Scope;
use Sentry\Transport\TransportFactoryInterface;
use Sentry\Transport\TransportInterface;
use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;

final class ClientTest extends TestCase
{
use ExpectDeprecationTrait;

public function testConstructorSetupsIntegrations(): void
{
$integrationCalled = false;
Expand Down
Loading