55: upgrade the SDK to support Laravel 5.6 logging best practices

Author: ArturMoczulski

src/Facades/Rollbar.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace Rollbar\Laravel;
+
+use Rollbar\Monolog\Handler\RollbarHandler;
+
+class MonologHandler extends RollbarHandler
+{
+    protected $app;
+    
+    public function setApp($app)
+    {
+        $this->app = $app;
+    }
+    
+    protected function write(array $record)
+    {
+        $record['context'] = $this->addContext($record['context']);
+        parent::write($record);
+    }
+
+    /**
+     * Add Laravel specific information to the context.
+     *
+     * @param array $context
+     */
+    protected function addContext(array $context = [])
+    {
+        // Add session data.
+        if ($session = $this->app->session->all()) {
+            $config = $this->rollbarLogger->extend([]);
+
+            if (empty($config['person']) or ! is_array($config['person'])) {
+                $person = [];
+            } else {
+                $person = $config['person'];
+            }
+
+            // Merge person context.
+            if (isset($context['person']) and is_array($context['person'])) {
+                $person = $context['person'];
+                unset($context['person']);
+            } else {
+                if (isset($config['person_fn']) && is_callable($config['person_fn'])) {
+                    $data = @call_user_func($config['person_fn']);
+                    if (isset($data['id'])) {
+                        $person = call_user_func($config['person_fn']);
+                    }
+                }
+            }
+
+            // Add user session information.
+            if (isset($person['session'])) {
+                $person['session'] = array_merge($session, $person['session']);
+            } else {
+                $person['session'] = $session;
+            }
+
+            // User session id as user id if not set.
+            if (! isset($person['id'])) {
+                $person['id'] = $this->app->session->getId();
+            }
+                
+            $this->rollbarLogger->configure(['person' => $person]);
+        }
+
+        return $context;
+    }
+}

src/MonologHandler.php

@@ -3,7 +3,7 @@
 use InvalidArgumentException;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\ServiceProvider;
-use Rollbar\Laravel\RollbarLogHandler;
+use Rollbar\Laravel\MonologHandler;
 use Rollbar\RollbarLogger;
 use Rollbar\Rollbar;
 
@@ -16,48 +16,6 @@ class RollbarServiceProvider extends ServiceProvider
      */
     protected $defer = false;
 
-    /**
-     * Bootstrap the application events.
-     */
-    public function boot()
-    {
-        // Don't boot rollbar if it is not configured.
-        if ($this->stop() === true) {
-            return;
-        }
-
-        $app = $this->app;
-
-        // Listen to log messages.
-        $app['log']->listen(function () use ($app) {
-            $args = func_get_args();
-
-            // Laravel 5.4 returns a MessageLogged instance only
-            if (count($args) == 1) {
-                $level = $args[0]->level;
-                $message = $args[0]->message;
-                $context = $args[0]->context;
-            } else {
-                $level = $args[0];
-                $message = $args[1];
-                $context = $args[2];
-            }
-
-            if (strpos($message, 'Unable to send messages to Rollbar API. Produced response: ') !== false) {
-                return;
-            }
-
-            $result = $app[RollbarLogHandler::class]->log($level, $message, $context);
-
-            if (!$result->getStatus()) {
-                \Log::error(
-                    'Unable to send messages to Rollbar API. Produced response: ' .
-                    print_r($result, true)
-                );
-            }
-        });
-    }
-
     /**
      * Register the service provider.
      */
@@ -95,11 +53,14 @@ public function register()
             return Rollbar::logger();
         });
 
-        $this->app->singleton(RollbarLogHandler::class, function ($app) {
+        $this->app->singleton(MonologHandler::class, function ($app) {
 
             $level = static::config('level', 'debug');
+            
+            $handler = new MonologHandler($app[RollbarLogger::class], $level);
+            $handler->setApp($app);
 
-            return new RollbarLogHandler($app[RollbarLogger::class], $app, $level);
+            return $handler;
         });
     }