Fix tests: our new version doesn't support old symfony versions

Author: cataphract

Makefile

@@ -1543,7 +1543,7 @@ test_web_symfony_42: global_test_run_dependencies tests/Frameworks/Symfony/Versi
 	php tests/Frameworks/Symfony/Version_4_2/bin/console cache:clear --no-warmup --env=prod
 	$(call run_tests_debug,tests/Integrations/Symfony/V4_2)
 test_web_symfony_44: global_test_run_dependencies tests/Frameworks/Symfony/Version_4_4/composer.lock-php$(PHP_MAJOR_MINOR)
-	php tests/Frameworks/Symfony/Version_4_4/bin/console cache:clear --no-warmup --env=prod
+	php tests/Frameworks/Symfony/Version_4_4/bin/console cache:clear --env=prod
 	$(call run_tests_debug,--testsuite=symfony-44-test)
 test_web_symfony_50: global_test_run_dependencies
 	$(COMPOSER) --working-dir=tests/Frameworks/Symfony/Version_5_0 install # EOL; install from lock

src/DDTrace/Integrations/Symfony/EndpointCatalog.php

@@ -44,9 +44,14 @@ public static function pathForRoute($routeName, ContainerInterface $container)
             return null;
         }
 
-        $genFile = rtrim($cacheDir, '/\\') . DIRECTORY_SEPARATOR . 'url_generating_routes.php';
+        $base = rtrim($cacheDir, '/\\') . DIRECTORY_SEPARATOR;
+        // Symfony 5+ uses url_generating_routes.php; 4.3–4.4 uses UrlGenerator.php
+        $genFile = $base . 'url_generating_routes.php';
         if (!is_file($genFile)) {
-            return null;
+            $genFile = $base . 'UrlGenerator.php';
+            if (!is_file($genFile)) {
+                return null;
+            }
         }
 
         $gen = require $genFile;

tests/Integrations/Symfony/V3_3/CommonScenariosTest.php

@@ -52,7 +52,7 @@ public function provideSpecs()
                     )->withExactTags([
                         'symfony.route.action' => 'AppBundle\Controller\CommonScenariosController@simpleAction',
                         'symfony.route.name' => 'simple',
-                        'http.route' => '/simple',
+
                         'http.method' => 'GET',
                         'http.url' => 'http://localhost/simple?key=value&<redacted>',
                         'http.status_code' => '200',
@@ -91,7 +91,7 @@ public function provideSpecs()
                     )->withExactTags([
                         'symfony.route.action' => 'AppBundle\Controller\CommonScenariosController@simpleViewAction',
                         'symfony.route.name' => 'simple_view',
-                        'http.route' => '/simple_view',
+
                         'http.method' => 'GET',
                         'http.url' => 'http://localhost/simple_view?key=value&<redacted>',
                         'http.status_code' => '200',
@@ -139,7 +139,7 @@ public function provideSpecs()
                     )->withExactTags([
                         'symfony.route.action' => 'AppBundle\Controller\CommonScenariosController@errorAction',
                         'symfony.route.name' => 'error',
-                        'http.route' => '/error',
+
                         'http.method' => 'GET',
                         'http.url' => 'http://localhost/error?key=value&<redacted>',
                         'http.status_code' => '500',

tests/Integrations/Symfony/V3_3/TraceSearchConfigTest.php

@@ -42,7 +42,7 @@ public function testScenario()
                 )->withExactTags([
                     'symfony.route.action' => 'AppBundle\Controller\CommonScenariosController@simpleAction',
                     'symfony.route.name' => 'simple',
-                    'http.route' => '/simple',
+
                     'http.method' => 'GET',
                     'http.url' => 'http://localhost/simple',
                     'http.status_code' => '200',

tests/Integrations/Symfony/V3_4/AutofinishedTracesSymfony34Test.php

@@ -36,7 +36,7 @@ public function testEndpointThatExitsWithNoProcess()
             )->withExactTags([
                 'symfony.route.action' => 'AppBundle\Controller\HomeController@actionBeingTerminatedByExit',
                 'symfony.route.name' => 'terminated_by_exit',
-                'http.route' => '/terminated_by_exit',
+
                 'http.method' => 'GET',
                 'http.url' => 'http://localhost/terminated_by_exit',
                 'http.status_code' => '200',

tests/Integrations/Symfony/V3_4/CommonScenariosTest.php

@@ -59,7 +59,7 @@ public function provideSpecs()
                     )->withExactTags([
                         'symfony.route.action' => 'AppBundle\Controller\CommonScenariosController@simpleAction',
                         'symfony.route.name' => 'simple',
-                        'http.route' => '/simple',
+
                         'http.method' => 'GET',
                         'http.url' => 'http://localhost/simple?key=value&<redacted>',
                         'http.status_code' => '200',
@@ -98,7 +98,7 @@ public function provideSpecs()
                     )->withExactTags([
                         'symfony.route.action' => 'AppBundle\Controller\CommonScenariosController@simpleViewAction',
                         'symfony.route.name' => 'simple_view',
-                        'http.route' => '/simple_view',
+
                         'http.method' => 'GET',
                         'http.url' => 'http://localhost/simple_view?key=value&<redacted>',
                         'http.status_code' => '200',
@@ -148,7 +148,7 @@ public function provideSpecs()
                         ->withExactTags([
                             'symfony.route.action' => 'AppBundle\Controller\CommonScenariosController@errorAction',
                             'symfony.route.name' => 'error',
-                            'http.route' => '/error',
+
                             'http.method' => 'GET',
                             'http.url' => 'http://localhost/error?key=value&<redacted>',
                             'http.status_code' => '500',

tests/Integrations/Symfony/V3_4/TemplateEnginesTest.php

@@ -29,7 +29,7 @@ public function testAlternateTemplatingEngine()
             )->withExactTags([
                 'symfony.route.action' => 'AppBundle\Controller\HomeController@indexAction',
                 'symfony.route.name' => 'alternate_templating',
-                'http.route' => '/alternate_templating',
+
                 'http.method' => 'GET',
                 'http.url' => 'http://localhost/alternate_templating',
                 'http.status_code' => '200',

tests/Integrations/Symfony/V3_4/TraceSearchConfigTest.php

@@ -42,7 +42,7 @@ public function testScenario()
                 )->withExactTags([
                     'symfony.route.action' => 'AppBundle\Controller\CommonScenariosController@simpleAction',
                     'symfony.route.name' => 'simple',
-                    'http.route' => '/simple',
+
                     'http.method' => 'GET',
                     'http.url' => 'http://localhost/simple',
                     'http.status_code' => '200',

tests/Integrations/Symfony/V4_0/CommonScenariosTest.php

@@ -55,7 +55,7 @@ public function provideSpecs()
                     )->withExactTags([
                         'symfony.route.action' => 'App\Controller\CommonScenariosController@simpleAction',
                         'symfony.route.name' => 'simple',
-                        'http.route' => '/simple',
+
                         'http.method' => 'GET',
                         'http.url' => 'http://localhost/simple?key=value&<redacted>',
                         'http.status_code' => '200',
@@ -94,7 +94,7 @@ public function provideSpecs()
                     )->withExactTags([
                         'symfony.route.action' => 'App\Controller\CommonScenariosController@simpleViewAction',
                         'symfony.route.name' => 'simple_view',
-                        'http.route' => '/simple_view',
+
                         'http.method' => 'GET',
                         'http.url' => 'http://localhost/simple_view?key=value&<redacted>',
                         'http.status_code' => '200',
@@ -142,7 +142,7 @@ public function provideSpecs()
                     )->withExactTags([
                         'symfony.route.action' => 'App\Controller\CommonScenariosController@errorAction',
                         'symfony.route.name' => 'error',
-                        'http.route' => '/error',
+
                         'http.method' => 'GET',
                         'http.url' => 'http://localhost/error?key=value&<redacted>',
                         'http.status_code' => '500',

tests/Integrations/Symfony/V4_0/TraceSearchConfigTest.php

@@ -42,7 +42,7 @@ public function testScenario()
                 )->withExactTags([
                     'symfony.route.action' => 'App\Controller\CommonScenariosController@simpleAction',
                     'symfony.route.name' => 'simple',
-                    'http.route' => '/simple',
+
                     'http.method' => 'GET',
                     'http.url' => 'http://localhost/simple',
                     'http.status_code' => '200',