Fix stripping the base namespace for route name (#406)

getsentry · Nov 2, 2020 · 23c14c3 · 23c14c3
1 parent daace27
commit 23c14c3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Fix incorrectly stripped base controller action from transaction name (#406)
+
 ## 2.1.1
 
 - Fix for potential `Undefined index: controllers_base_namespace.` notice

diff --git a/src/Sentry/Laravel/Integration.php b/src/Sentry/Laravel/Integration.php
@@ -149,7 +149,14 @@ public static function extractNameForRoute(Route $route): ?string
 
         if (empty($routeName) && $route->getActionName()) {
             // SomeController@someAction (controller action)
-            $routeName = ltrim($route->getActionName(), (self::$baseControllerNamespace ?? '') . '\\');
+            $routeName = $route->getActionName();
+
+            $baseNamespace = self::$baseControllerNamespace ?? '';
+
+            // Strip away the base namespace from the action name
+            if (!empty($baseNamespace)) {
+                $routeName = Str::after($routeName, $baseNamespace . '\\');
+            }
         }
 
         if (empty($routeName) || $routeName === 'Closure') {