Move root path handling to getRouteUri function

cego · May 4, 2023 · 839e303 · 839e303
1 parent 4f4664a
commit 839e303
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/src/ElasticApmAgentLaravelOctane/EventListeners/RequestReceivedHandler.php b/src/ElasticApmAgentLaravelOctane/EventListeners/RequestReceivedHandler.php
@@ -22,11 +22,7 @@ public function handle(RequestReceived $event): void
         $manager = $event->app->make(OctaneApmManager::class);
 
         $routeUri = $this->getRouteUri($event);
-        if ($routeUri === "/") {
-           $manager->beginTransaction($event->request->method() . ' /', 'request');
-        } else {
-           $manager->beginTransaction($event->request->method() . ' /' . $routeUri, 'request');
-        }        
+        $manager->beginTransaction($event->request->method() . ' /' . $routeUri, 'request');
     }
 
     /**
@@ -42,7 +38,8 @@ private function getRouteUri(RequestReceived $event): string
         $router = $event->sandbox->make('router');
 
         try {
-            return $router->getRoutes()->match($event->request)->uri();
+            $routeUri = $router->getRoutes()->match($event->request)->uri();
+            return $routeUri === "/" ? "" : $routeUri;
         } catch (Throwable $throwable) {
             // If the route does not exist, then simply return the path
             return $event->request->path();