Skip to content

Commit 57333d9

Browse files
committed
Add cache and vendor dirs to default in app exclusions
1 parent cabd27b commit 57333d9

File tree

3 files changed

+16
-4
lines changed

3 files changed

+16
-4
lines changed

src/DependencyInjection/Configuration.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,10 @@ public function getConfigTreeBuilder()
6161
->scalarNode('error_types')
6262
->end()
6363
->arrayNode('in_app_exclude')
64-
->defaultValue($defaultValues->getInAppExcludedPaths())
64+
->defaultValue([
65+
'%kernel.cache_dir%',
66+
$this->getProjectRoot() . '/vendor',
67+
])
6568
->scalarPrototype()->end()
6669
->end()
6770
->arrayNode('excluded_exceptions')

test/DependencyInjection/ConfigurationTest.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,10 @@ public function testConfigurationDefaults(): void
4949
],
5050
'options' => [
5151
'environment' => '%kernel.environment%',
52-
'in_app_exclude' => $defaultSdkValues->getInAppExcludedPaths(),
52+
'in_app_exclude' => [
53+
'%kernel.cache_dir%',
54+
'%kernel.root_dir%/../vendor',
55+
],
5356
'excluded_exceptions' => $defaultSdkValues->getExcludedExceptions(),
5457
'prefixes' => $defaultSdkValues->getPrefixes(),
5558
'project_root' => '%kernel.root_dir%/..',
@@ -59,6 +62,7 @@ public function testConfigurationDefaults(): void
5962

6063
if (method_exists(Kernel::class, 'getProjectDir')) {
6164
$expectedDefaults['options']['project_root'] = '%kernel.project_dir%';
65+
$expectedDefaults['options']['in_app_exclude'][1] = '%kernel.project_dir%/vendor';
6266
}
6367

6468
$this->assertEquals($expectedDefaults, $processed);

test/DependencyInjection/SentryExtensionTest.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,16 @@ public function testOptionsDefaultValues(): void
3838
$options = $this->getOptionsFrom($container);
3939

4040
if (method_exists(Kernel::class, 'getProjectDir')) {
41-
$this->assertSame('/dir/project/root/', $options->getProjectRoot());
41+
$vendorDir = '/dir/project/root/vendor';
42+
$this->assertSame('/dir/project/root', $options->getProjectRoot());
4243
} else {
44+
$vendorDir = 'kernel/root/../vendor';
4345
$this->assertSame('kernel/root/..', $options->getProjectRoot());
4446
}
47+
4548
$this->assertNull($options->getDsn());
4649
$this->assertSame('test', $options->getEnvironment());
50+
$this->assertSame(['var/cache', $vendorDir], $options->getInAppExcludedPaths());
4751

4852
$this->assertSame(1, $container->getParameter('sentry.listener_priorities.request'));
4953
$this->assertSame(1, $container->getParameter('sentry.listener_priorities.console'));
@@ -144,9 +148,10 @@ public function emptyDsnValueProvider(): array
144148
private function getContainer(array $configuration = []): Container
145149
{
146150
$containerBuilder = new ContainerBuilder();
151+
$containerBuilder->setParameter('kernel.cache_dir', 'var/cache');
147152
$containerBuilder->setParameter('kernel.root_dir', 'kernel/root');
148153
if (method_exists(Kernel::class, 'getProjectDir')) {
149-
$containerBuilder->setParameter('kernel.project_dir', '/dir/project/root/');
154+
$containerBuilder->setParameter('kernel.project_dir', '/dir/project/root');
150155
}
151156
$containerBuilder->setParameter('kernel.environment', 'test');
152157

0 commit comments

Comments
 (0)