Skip to content

Laravel: handle possible LogWatcher TypeError's #311

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 1 commit into from
Oct 27, 2024
Merged

Laravel: handle possible LogWatcher TypeError's #311

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 12 additions & 3 deletions src/Instrumentation/Laravel/src/Watchers/LogWatcher.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
use OpenTelemetry\API\Instrumentation\CachedInstrumentation;
use OpenTelemetry\API\Logs\LogRecord;
use OpenTelemetry\API\Logs\Map\Psr3;
use TypeError;

class LogWatcher extends Watcher
{
Expand All @@ -36,9 +37,17 @@ public function recordLog(MessageLogged $log): void
{
$underlyingLogger = $this->logger->getLogger();

/** @phan-suppress-next-line PhanUndeclaredMethod */
if (method_exists($underlyingLogger, 'isHandling') && !$underlyingLogger->isHandling($log->level)) {
return;
/**
* This assumes that the underlying logger (expected to be monolog) would accept `$log->level` as a string.
* With monolog < 3.x, this method would fail. Let's prevent this blowing up in Laravel<10.x.
*/
try {
/** @phan-suppress-next-line PhanUndeclaredMethod */
if (method_exists($underlyingLogger, 'isHandling') && !$underlyingLogger->isHandling($log->level)) {
return;
}
} catch (TypeError) {
// Should this fail, we should continue to emit the LogRecord.
}

$attributes = [
Expand Down
Loading