Merge branch 'master' into develop

Author: cleptric

composer.json

@@ -25,7 +25,6 @@
     "require": {
         "php": "^7.2||^8.0",
         "jean85/pretty-package-versions": "^1.5 || ^2.0",
-        "php-http/discovery": "^1.11",
         "sentry/sdk": "^3.3",
         "sentry/sentry": "^3.12",
         "symfony/cache-contracts": "^1.1||^2.4||^3.0",

src/EventListener/TracingRequestListener.php

@@ -42,8 +42,16 @@ public function handleKernelRequestEvent(RequestEvent $event): void
             $request->headers->get('baggage', '')
         );
         $context->setOp('http.server');
-        $context->setName(sprintf('%s %s%s%s', $request->getMethod(), $request->getSchemeAndHttpHost(), $request->getBaseUrl(), $request->getPathInfo()));
-        $context->setSource(TransactionSource::url());
+
+        $routeName = $request->attributes->get('_route');
+        if (null !== $routeName && \is_string($routeName)) {
+            $context->setName(sprintf('%s %s', $request->getMethod(), $routeName));
+            $context->setSource(TransactionSource::route());
+        } else {
+            $context->setName(sprintf('%s %s%s%s', $request->getMethod(), $request->getSchemeAndHttpHost(), $request->getBaseUrl(), $request->getPathInfo()));
+            $context->setSource(TransactionSource::url());
+        }
+
         $context->setStartTimestamp($requestStartTime);
         $context->setTags($this->getTags($request));
 

tests/EventListener/TracingRequestListenerTest.php

@@ -217,8 +217,8 @@ public function handleKernelRequestEventDataProvider(): \Generator
         $request->attributes->set('_route', 'app_homepage');
 
         $transactionContext = new TransactionContext();
-        $transactionContext->setName('GET http://www.example.com/path');
-        $transactionContext->setSource(TransactionSource::url());
+        $transactionContext->setName('GET app_homepage');
+        $transactionContext->setSource(TransactionSource::route());
         $transactionContext->setOp('http.server');
         $transactionContext->setStartTimestamp(1613493597.010275);
         $transactionContext->setTags([