Merge pull request #7 from danwall/transaction-names

update automatic transaction naming

Author: pleckey

README.md

@@ -32,9 +32,16 @@ Finally, publish the default configuration (it will end up in `app/config/packag
 
 * type: bool
 * default: true
-* this will automatically name all transactions by their route name
-    * ex: Route::get('foo/{id}/bar/{name}', ...) will be named: 'get foo/{id}/bar/{name}'
-    * the uri parameters will not be replaced, it will be the string literal
+* this will automatically name all transactions with the following precedence
+    1. Route name (e.g. "home")
+    2. Controller and method (e.g. "HomeController@showWelcome")
+    3. HTTP verb + path (e.g. "GET /")
+
+=> **name_provider**
+
+* type: closure or null
+* default: null
+* if a closure is provided, this allows for full customization of the transaction name with access to \Illuminate\Http\Request, \Illuminate\Http\Response and \Illuminate\Foundation\Application as parameters for convenience.
 
 => **throw_if_not_installed**
 

src/Intouch/LaravelNewrelic/LaravelNewrelicServiceProvider.php

@@ -78,14 +78,38 @@ function ( $request, $response ) use ( $app )
             {
                 if ( true == $app['config']['laravel-newrelic::auto_name_transactions'] )
                 {
-                    /** @var \Illuminate\Routing\Router $router */
-                    $router = $app['router'];
                     /** @var \Intouch\Newrelic\Newrelic $newrelic */
                     $newrelic = $app['newrelic'];
 
-                    $newrelic->nameTransaction( $router->currentRouteName() );
+                    $newrelic->nameTransaction( $this->getTransactionName( $request, $response, $app ) );
                 }
             }
         );
     }
+
+    /**
+     * Build the transaction name
+     *
+     * @param  \Illuminate\Http\Request           $request
+     * @param  \Illuminate\Http\Response          $response
+     * @param  \Illuminate\Foundation\Application $app
+     * @return string
+     */
+    protected function getTransactionName( $request, $response, $app )
+    {
+        $nameProvider = $app['config']['laravel-newrelic::name_provider'];
+
+        if ( is_callable( $nameProvider ) ) {
+            $name = $nameProvider( $request, $response, $app );
+        } else {
+            /** @var \Illuminate\Routing\Router $router */
+            $router = $app['router'];
+
+            $name = $router->currentRouteName()
+                ?: $router->currentRouteAction()
+                ?: $request->getMethod() . ' ' . $request->getPathInfo();
+        }
+
+        return $name;
+    }
 }

src/config/config.php

@@ -10,14 +10,25 @@
 
     /*
      * Will automatically name transactions in NewRelic,
-     * using the Laravel route name
+     * using the Laravel route name, action or request
      */
     'auto_name_transactions' => true,
 
+    /*
+     * Define the name provider used when automatically naming transactions.
+     * Accepts either a closure or null to use the package default.
+     */
+    'name_provider' => null,
+
+    // 'name_provider' => function ($request, $response, $app) {
+    //     return $app['router']->currentRouteAction()
+    //         ?: $request->getMethod() . ' ' . $request->getPathInfo();
+    // },
+
     /*
      * Will cause an exception to be thrown if the NewRelic
      * PHP agent is not found / installed
      */
     'throw_if_not_installed' => false,
 
-);
+);