8000 [Messenger][FrameworkBundle] Add option to exclude stack trace from `… · symfony/symfony@c61849d · GitHub
[go: up one dir, main page]
Skip to content

Commit c61849d

Browse files
HypeMCHypeMC
committed
[Messenger][FrameworkBundle] Add option to exclude stack trace from ErrorDetailsStamp 
1 parent 37138e6 commit c61849d

18 files changed

+167
-3
lines changed

‎src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ CHANGELOG
99
* Move the Router `cache_dir` to `kernel.build_dir`
1010
* Deprecate the `router.cache_dir` config option
1111
* Add `rate_limiter` tags to rate limiter services
12+
* Add `include_stack_trace_in_error` option that's used in `AddErrorDetailsStampListener`
1213

1314
7.0
1415
---

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1575,6 +1575,9 @@ function ($a) {
15751575
->defaultNull()
15761576
->info('Transport name to send failed messages to (after all retries have failed).')
15771577
->end()
1578+
->booleanNode('include_stack_trace_in_error')
1579+
->info('Whether to include a stack trace in the error details stamp.')
1580+
->end()
15781581
->arrayNode('retry_strategy')
15791582
->addDefaultsIfNotSet()
15801583
->beforeNormalization()
@@ -1606,6 +1609,10 @@ function ($a) {
16061609
->defaultNull()
16071610
->info('Transport name to send failed messages to (after all retries have failed).')
16081611
->end()
1612+
->booleanNode('include_stack_trace_in_error')
1613+
->defaultTrue()
1614+
->info('Whether to include a stack trace in the error details stamp.')
1615+
->end()
16091616
->arrayNode('stop_worker_on_signals')
16101617
->defaultValue([])
16111618
->info('A list of signals that should stop the worker; defaults to SIGTERM and SIGINT.')

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2170,6 +2170,7 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
21702170
}
21712171

21722172
$senderAliases = [];
2173+
$includeStackTraceInError = [];
21732174
$transportRetryReferences = [];
21742175
$transportRateLimiterReferences = [];
21752176
foreach ($config['transports'] as $name => $transport) {
@@ -2186,6 +2187,8 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
21862187
$container->setDefinition($transportId = 'messenger.transport.'.$name, $transportDefinition);
21872188
$senderAliases[$name] = $transportId;
21882189

2190+
$includeStackTraceInError[$name] = $transport['include_stack_trace_in_error'] ?? $config['include_stack_trace_in_error'];
2191+
21892192
if (null !== $transport['retry_strategy']['service']) {
21902193
$transportRetryReferences[$name] = new Reference($transport['retry_strategy']['service']);
21912194
} else {
@@ -2258,6 +2261,10 @@ private function registerMessengerConfiguration(array $config, ContainerBuilder
22582261
->replaceArgument(1, $sendersServiceLocator)
22592262
;
22602263

2264+
$container->getDefinition('messenger.failure.add_error_details_stamp_listener')
2265+
->replaceArgument(0, $includeStackTraceInError)
2266+
;
2267+
22612268
$container->getDefinition('messenger.retry.send_failed_message_for_retry_listener')
22622269
->replaceArgument(0, $sendersServiceLocator)
22632270
;

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,9 @@
180180
->tag('monolog.logger', ['channel' => 'messenger'])
181181

182182
->set('messenger.failure.add_error_details_stamp_listener', AddErrorDetailsStampListener::class)
183+
->args([
184+
abstract_arg('include_stack_trace_in_error'),
185+
])
183186
->tag('kernel.event_subscriber')
184187

185188
->set('messenger.failure.send_failed_message_to_failure_transport_listener', SendFailedMessageToFailureTransportListener::class)

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -564,6 +564,7 @@
564564
<xsd:attribute name="default-bus" type="xsd:string" />
565565
<xsd:attribute name="enabled" type="xsd:boolean" />
566566
<xsd:attribute name="failure-transport" type="xsd:string" />
567+
<xsd:attribute name="include-stack-trace-in-error" type="xsd:boolean" />
567568
</xsd:complexType>
568569

569570
<xsd:complexType name="messenger_serializer">
@@ -600,6 +601,7 @@
600601
<xsd:attribute name="serializer" type="xsd:string" />
601602
<xsd:attribute name="dsn" type="xsd:string" />
602603
<xsd:attribute name="failure-transport" type="xsd:string" />
604+
<xsd:attribute name="include-stack-trace-in-error" type="xsd:boolean" />
603605
<xsd:attribute name="rate-limiter" type="xsd:string" />
604606
</xsd:complexType>
605607

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -724,6 +724,7 @@ class_exists(SemaphoreStore::class) && SemaphoreStore::isSupported() ? 'semaphor
724724
'default_bus' => null,
725725
'buses' => ['messenger.bus.default' => ['default_middleware' => ['enabled' => true, 'allow_no_handlers' => false, 'allow_no_senders' => true], 'middleware' => []]],
726726
'stop_worker_on_signals' => [],
727+
'include_stack_trace_in_error' => true,
727728
],
728729
'disallow_search_engine_index' => true,
729730
'http_client' => [

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_with_include_stack_trace_false.php

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?php
2+
3+
$container->loadFromExtension('framework', [
4+
'annotations' => false,
5+
'http_method_override' => false,
6+
'handle_all_throwables' => true,
7+
'php_errors' => ['log' => true],
8+
'messenger' => [
9+
'include_stack_trace_in_error' => false,
10+
'transports' => [
11+
'sender.biz' => 'null://',
12+
'sender.bar' => [
13+
'dsn' => 'null://',
14+
'include_stack_trace_in_error' => true,
15+
],
16+
'sender.foo' => 'null://',
17+
],
18+
],
19+
]);

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/messenger_with_include_stack_trace_true.php

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?php
2+
3+
$container->loadFromExtension('framework', [
4+
'annotations' => false,
5+
'http_method_override' => false,
6+
'handle_all_throwables' => true,
7+
'php_errors' => ['log' => true],
8+
'messenger' => [
9+
'transports' => [
10+
'sender.biz' => 'null://',
11+
'sender.bar' => [
12+
'dsn' => 'null://',
13+
'include_stack_trace_in_error' => false,
14+
],
15+
'sender.foo' => 'null://',
16+
],
17+
],
18+
]);

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_with_include_stack_trace_false.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<container xmlns="http://symfony.com/schema/dic/services"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xmlns:framework="http://symfony.com/schema/dic/symfony"
5+
xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
6+
http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
7+
8+
<framework:config http-method-override="false" handle-all-throwables="true">
9+
<framework:annotations enabled="false" />
10+
<framework:php-errors log="true" />
11+
<framework:messenger include-stack-trace-in-error="false">
12+
<framework:transport name="sender.biz" dsn="null://" />
13+
<framework:transport name="sender.bar" dsn="null://" include-stack-trace-in-error="true" />
14+
<framework:transport name="sender.foo" dsn="null://" />
15+
</framework:messenger>
16+
</framework:config>
17+
</container>

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/messenger_with_include_stack_trace_true.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<container xmlns="http://symfony.com/schema/dic/services"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xmlns:framework="http://symfony.com/schema/dic/symfony"
5+
xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
6+
http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
7+
8+
<framework:config http-method-override="false" handle-all-throwables="true">
9+
<framework:annotations enabled="false" />
10+
<framework:php-errors log="true" />
11+
<framework:messenger>
12+
<framework:transport name="sender.biz" dsn="null://" />
13+
<framework:transport name="sender.bar" dsn="null://" include-stack-trace-in-error="false" />
14+
<framework:transport name="sender.foo" dsn="null://" />
15+
</framework:messenger>
16+
</framework:config>
17+
</container>

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_with_include_stack_trace_false.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
framework:
2+
annotations: false
3+
http_method_override: false
4+
handle_all_throwables: true
5+
php_errors:
6+
log: true
7+
messenger:
8+
include_stack_trace_in_error: false
9+
transports:
10+
sender.biz: 'null://'
11+
sender.bar:
12+
dsn: 'null://'
13+
include_stack_trace_in_error: true
14+
sender.foo: 'null://'

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/messenger_with_include_stack_trace_true.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
framework:
2+
annotations: false
3+
http_method_override: false
4+
handle_all_throwables: true
5+
php_errors:
6+
log: true
7+
messenger:
8+
transports:
9+
sender.biz: 'null://'
10+
sender.bar:
11+
dsn: 'null://'
12+
include_stack_trace_in_error: false
13+
sender.foo: 'null://'

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1096,6 +1096,17 @@ public function testMessengerInvalidWildcardRouting()
10961096
$this->createContainerFromFile('messenger_routing_invalid_transport');
10971097
}
10981098

1099+
/**
1100+
* @testWith ["messenger_with_include_stack_trace_true", {"sender.biz": true, "sender.bar": false, "sender.foo": true}]
1101+
* ["messenger_with_include_stack_trace_false", {"sender.biz": false, "sender.bar": true, "sender.foo": false}]
1102+
*/
1103+
public function testMessengerWithIncludeStackTrace(string $file, array $expected)
1104+
{
1105+
$container = $this->createContainerFromFile($file);
1106+
1107+
$this->assertSame($expected, $container->getDefinition('messenger.failure.add_error_details_stamp_listener')->getArgument(0));
1108+
}
1109+
10991110
public function testTranslator()
11001111
{
11011112
$container = $this->createContainerFromFile('full');

‎src/Symfony/Component/Messenger/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ CHANGELOG
88
* Add `--all` option to the `messenger:consume` command
99
* Make `#[AsMessageHandler]` final
1010
* Add parameter `$jitter` to `MultiplierRetryStrategy` in order to randomize delay and prevent the thundering herd effect
11+
* Add `$includeStackTrace` parameters to `AddErrorDetailsStampListener` and `ErrorDetailsStamp` to allow excluding the stack trace from the `ErrorDetailsStamp`
1112

1213
7.0
1314
---

‎src/Symfony/Component/Messenger/EventListener/AddErrorDetailsStampListener.php

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,17 @@
1717

1818
final class AddErrorDetailsStampListener implements EventSubscriberInterface
1919
{
20+
/**
21+
* @param array<string, bool> $includeStackTrace
22+
*/
23+
public function __construct(
24+
private readonly array $includeStackTrace = [],
25+
) {
26+
}
27+
2028
public function onMessageFailed(WorkerMessageFailedEvent $event): void
2129
{
22-
$stamp = ErrorDetailsStamp::create($event->getThrowable());
30+
$stamp = ErrorDetailsStamp::create($event->getThrowable(), $this->includeStackTrace[$event->getReceiverName()] ?? true);
2331
$previousStamp = $event->getEnvelope()->last(ErrorDetailsStamp::class);
2432

2533
// Do not append duplicate information

‎src/Symfony/Component/Messenger/Stamp/ErrorDetailsStamp.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ public function __construct(string $exceptionClass, int|string $exceptionCode, s
3232
$this->flattenException = $flattenException;
3333
}
3434

35-
public static function create(\Throwable $throwable): self
35+
public static function create(\Throwable $throwable, bool $includeStackTrace = true): self
3636
{
3737
if ($throwable instanceof HandlerFailedException) {
3838
$throwable = $throwable->getPrevious();
3939
}
4040

4141
$flattenException = null;
42-
if (class_exists(FlattenException::class)) {
42+
if ($includeStackTrace && class_exists(FlattenException::class)) {
4343
$flattenException = FlattenException::createFromThrowable($throwable);
4444
}
4545

‎src/Symfony/Component/Messenger/Tests/EventListener/AddErrorDetailsStampListenerTest.php

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,20 @@ public function testExceptionDetailsAreAdded()
3333
$this->assertEquals($expectedStamp, $event->getEnvelope()->last(ErrorDetailsStamp::class));
3434
}
3535

36+
public function testExceptionDetailsWithoutStackTraceAreAdded()
37+
{
38+
$listener = new AddErrorDetailsStampListener(['my_receiver' => false]);
39+
40+
$envelope = new Envelope(new \stdClass());
41+
$exception = new \Exception('It failed!');
42+
$event = new WorkerMessageFailedEvent($envelope, 'my_receiver', $exception);
43+
$expectedStamp = ErrorDetailsStamp::create($exception, false);
44+
45+
$listener->onMessageFailed($event);
46+
47+
$this->assertEquals($expectedStamp, $event->getEnvelope()->last(ErrorDetailsStamp::class));
48+
}
49+
3650
public function testWorkerAddsNewErrorDetailsStampOnFailure()
3751
{
3852
$listener = new AddErrorDetailsStampListener();

‎src/Symfony/Component/Messenger/Tests/Stamp/ErrorDetailsStampTest.php

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,17 @@ public function testUnwrappingHandlerFailedException()
5252
$this->assertEquals($flattenException, $stamp->getFlattenException());
5353
}
5454

55+
public function testFlattenExceptionIsNotIncluded()
56+
{
57+
$exception = new \Exception('exception message');
58+
59+
$stamp = ErrorDetailsStamp::create($exception, false);
60+
61+
$this->assertSame(\Exception::class, $stamp->getExceptionClass());
62+
$this->assertSame('exception message', $stamp->getExceptionMessage());
63+
$this->assertNull($stamp->getFlattenException());
64+
}
65+
5566
public function testDeserialization()
5667
{
5768
$exception = new \Exception('exception message');

0 commit comments

Comments
 (0)
0