From c75c8e533e78aab0ed76ca0dca8852b6b152e400 Mon Sep 17 00:00:00 2001 From: Alex Bouma Date: Thu, 7 Feb 2019 17:14:24 +0100 Subject: [PATCH 1/2] Re-add more missing handlers --- src/Sentry/Laravel/EventHandler.php | 43 +++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/src/Sentry/Laravel/EventHandler.php b/src/Sentry/Laravel/EventHandler.php index f45eb960..653c87ad 100644 --- a/src/Sentry/Laravel/EventHandler.php +++ b/src/Sentry/Laravel/EventHandler.php @@ -61,7 +61,7 @@ class EventHandler /** * EventHandler constructor. * - * @param array $config + * @param array $config */ public function __construct(array $config) { @@ -149,6 +149,29 @@ protected function routeMatchedHandler(RouteMatched $match) $this->routerMatchedHandler($match->route); } + /** + * Until Laravel 5.1 + * + * @param string $query + * @param array $bindings + * @param int $time + * @param string $connectionName + */ + protected function queryHandler($query, $bindings, $time, $connectionName) + { + $data = array('connectionName' => $connectionName); + + if ($this->sqlBindings) { + $data['bindings'] = $bindings; + } + + $this->record(array( + 'message' => $query, + 'category' => 'sql.query', + 'data' => $data, + )); + } + /** * Since Laravel 5.2 * @@ -171,6 +194,23 @@ protected function queryExecutedHandler(QueryExecuted $query) )); } + /** + * Until Laravel 5.3 + * + * @param string $level + * @param string $message + * @param array|null $context + */ + protected function logHandler($level, $message, $context) + { + $this->client->breadcrumbs->record(array( + 'message' => $message, + 'category' => 'log.' . $level, + 'data' => empty($context) ? null : array('params' => $context), + 'level' => $level, + )); + } + /** * Since Laravel 5.4 * @@ -232,7 +272,6 @@ protected function queueJobProcessingHandler(JobProcessing $event) )); } - /** * Since Laravel 5.2 * From 3ffe33274ad401a812cf5cac3ed5ea0e464d7aa1 Mon Sep 17 00:00:00 2001 From: Alex Bouma Date: Fri, 8 Feb 2019 14:53:01 +0100 Subject: [PATCH 2/2] Fix old handlers using old client code --- src/Sentry/Laravel/EventHandler.php | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/Sentry/Laravel/EventHandler.php b/src/Sentry/Laravel/EventHandler.php index 653c87ad..d7ffe301 100644 --- a/src/Sentry/Laravel/EventHandler.php +++ b/src/Sentry/Laravel/EventHandler.php @@ -165,10 +165,12 @@ protected function queryHandler($query, $bindings, $time, $connectionName) $data['bindings'] = $bindings; } - $this->record(array( - 'message' => $query, - 'category' => 'sql.query', - 'data' => $data, + Integration::addBreadcrumb(new Breadcrumb( + Breadcrumb::LEVEL_INFO, + Breadcrumb::TYPE_USER, + 'sql.query', + $query, + $data )); } @@ -203,11 +205,12 @@ protected function queryExecutedHandler(QueryExecuted $query) */ protected function logHandler($level, $message, $context) { - $this->client->breadcrumbs->record(array( - 'message' => $message, - 'category' => 'log.' . $level, - 'data' => empty($context) ? null : array('params' => $context), - 'level' => $level, + Integration::addBreadcrumb(new Breadcrumb( + $level, + Breadcrumb::TYPE_USER, + 'log.' . $level, + $message, + empty($context) ? array() : array('params' => $context) )); }