Merge pull request #32 from getsentry/feature/transactions

Add transaction name support

Author: dcramer

composer.json

@@ -14,7 +14,7 @@
     "require": {
         "php": ">=5.2.4",
         "illuminate/support": "4.*|5.*",
-        "sentry/sentry": ">=0.16.0"
+        "sentry/sentry": ">=1.5.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^1.8.0",

examples/laravel-4.2/app/controllers/HomeController.php

@@ -2,22 +2,38 @@
 
 class HomeController extends BaseController {
 
-	/*
-	|--------------------------------------------------------------------------
-	| Default Home Controller
-	|--------------------------------------------------------------------------
-	|
-	| You may wish to use controllers instead of, or in addition to, Closure
-	| based routes. That's great! Here is an example controller method to
-	| get you started. To route to this controller, just add the route:
-	|
-	|	Route::get('/', 'HomeController@showWelcome');
-	|
-	*/
+    /*
+    |--------------------------------------------------------------------------
+    | Default Home Controller
+    |--------------------------------------------------------------------------
+    |
+    | You may wish to use controllers instead of, or in addition to, Closure
+    | based routes. That's great! Here is an example controller method to
+    | get you started. To route to this controller, just add the route:
+    |
+    |   Route::get('/', 'HomeController@showWelcome');
+    |
+    */
 
-	public function showWelcome()
-	{
-		return View::make('hello');
-	}
+    public function verifyCredentials()
+    {
+        Log::info('Verifying credentials');
+        $user = DB::table('migrations')->where('migration', 'a migration')->first();
+        throw new Exception('No credentials passed!');
+    }
+
+
+    public function authenticateUser()
+    {
+        Log::info('Authenticating the current user');
+        $this->verifyCredentials();
+    }
+
+    public function showWelcome($id)
+    {
+        Log::info('Rendering a page thats about to error');
+        $this->authenticateUser();
+        return View::make('hello');
+    }
 
 }

examples/laravel-4.2/app/routes.php

@@ -30,3 +30,5 @@ function authenticateUser()
     Log::info('Rendering a page thats about to error');
     authenticateUser();
 });
+
+Route::get('/welcome/{id}', 'HomeController@showWelcome');

examples/laravel-5.2/app/Http/Controllers/HomeController.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+
+class HomeController extends Controller {
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default Home Controller
+    |--------------------------------------------------------------------------
+    |
+    | You may wish to use controllers instead of, or in addition to, Closure
+    | based routes. That's great! Here is an example controller method to
+    | get you started. To route to this controller, just add the route:
+    |
+    |   Route::get('/', 'HomeController@showWelcome');
+    |
+    */
+
+    public function verifyCredentials()
+    {
+        \Log::info('Verifying credentials');
+        $user = DB::table('users')->where('name', 'John')->first();
+        throw new Exception('No credentials passed!');
+    }
+
+
+    public function authenticateUser()
+    {
+        \Log::info('Authenticating the current user');
+        $this->verifyCredentials();
+    }
+
+    public function showWelcome($id)
+    {
+        \Log::info('Rendering a page thats about to error');
+        // $this->authenticateUser();
+        return view('hello');
+    }
+
+}

examples/laravel-5.2/app/Http/routes.php

@@ -29,4 +29,6 @@ function authenticateUser()
 Route::get('/', function () {
     Log::info('Rendering a page thats about to error');
     authenticateUser();
-});
+})->name('index');
+
+Route::get('/welcome/{id}', 'HomeController@showWelcome')->name('welcome');

src/Sentry/SentryLaravel/SentryLaravelEventHandler.php

@@ -30,6 +30,20 @@ public function onWildcardEvent()
         $args = func_get_args();
         $data = null;
         $level = 'info';
+        if ($name === 'Illuminate\Routing\Events\RouteMatched') {
+            $route = $args[0]->route;
+            $routeName = $route->getActionName();
+            if ($routeName && $routeName !== 'Closure') {
+                $this->client->transaction->push($routeName);
+            }
+        } elseif ($name === 'router.matched') {
+            $route = $args[0];
+            $routeName = $route->getActionName();
+            if ($routeName && $routeName !== 'Closure') {
+                $this->client->transaction->push($routeName);
+            }
+        }
+
         if ($name === 'Illuminate\Database\Events\QueryExecuted') {
             $name = 'sql.query';
             $message = $args[0]->sql;