Skip to content

Allow logging exceptions #1035

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 10, 2025
Merged

Allow logging exceptions #1035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
688278d
Allow logging exceptions
cleptric Sep 9, 2025
3ac8295
Update src/Sentry/Laravel/Logs/LogsHandler.php
cleptric Sep 10, 2025
38e53c0
Merge branch 'master' into exception-logging
cleptric Sep 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions src/Sentry/Laravel/Logs/LogsHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
use Sentry\Severity;
use Throwable;

use function Sentry\logger;

class LogsHandler extends AbstractProcessingHandler
{
use CompatibilityProcessingHandlerTrait;
Expand Down Expand Up @@ -95,20 +97,22 @@ public function getBatchFormatter(): FormatterInterface
*/
protected function doWrite($record): void
{
$exception = $record['context']['exception'] ?? null;
$context = $record['context'];
$exception = $context['exception'] ?? null;

if ($exception instanceof Throwable) {
return;
// Unset the exception object from the log context
unset($context['exception']);
}

\Sentry\logger()->aggregator()->add(
logger()->aggregator()->add(
// This seems a little bit of a roundabout way to get the log level, but this is done for compatibility
self::getLogLevelFromSeverity(
self::getSeverityFromLevel($record['level'])
),
$record['message'],
[],
array_merge($record['context'], $record['extra'])
array_merge($context, $record['extra'])
);
}

Expand Down
10 changes: 8 additions & 2 deletions test/Sentry/Features/LogLogsIntegrationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,15 +77,21 @@ public function testLogChannelGeneratesLogsOnlyForConfiguredLevel(): void
$this->assertEquals('Sentry Laravel error log message', $log->getBody());
}

public function testLogChannelDoesntCaptureExceptions(): void
public function testLogChannelCapturesExceptions(): void
{
$logger = Log::channel('sentry_logs');

$logger->error('Sentry Laravel error log message', ['exception' => new \Exception('Test exception')]);

$logs = $this->getAndFlushCapturedLogs();

$this->assertCount(0, $logs);
$this->assertCount(1, $logs);

$log = $logs[0];

$this->assertEquals(LogLevel::error(), $log->getLevel());
$this->assertEquals('Sentry Laravel error log message', $log->getBody());
$this->assertNull($log->attributes()->get('exception'));
}

public function testLogChannelAddsContextAsAttributes(): void
Expand Down