Skip to content

Commit d084288

Browse files
Update monolog/monolog requirement from ^2.3 to ^2.3 || ^3.0 (#1551)
* Update monolog/monolog requirement from ^2.3 to ^2.3 || ^3.0 Updates the requirements on [monolog/monolog](https://github.com/Seldaek/monolog) to permit the latest version. - [Release notes](https://github.com/Seldaek/monolog/releases) - [Changelog](https://github.com/Seldaek/monolog/blob/main/CHANGELOG.md) - [Commits](Seldaek/monolog@2.3.0...3.9.0) --- updated-dependencies: - dependency-name: monolog/monolog dependency-version: 3.9.0 dependency-type: direct:development ... Signed-off-by: dependabot[bot] <[email protected]> * update monolog example * style * drop monolog 2.3 from example --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Brett McBride <[email protected]>
1 parent 1413c34 commit d084288

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
"guzzlehttp/psr7": "^2.1",
9494
"mikey179/vfsstream": "^1.6.11",
9595
"mockery/mockery": "^1.5.1",
96-
"monolog/monolog": "^2.3",
96+
"monolog/monolog": "^3.0",
9797
"nyholm/psr7": "^1.4",
9898
"open-telemetry/dev-tools": "dev-main",
9999
"php-http/mock-client": "^1.5",

examples/logs/features/monolog-otel-integration.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
use Monolog\Handler\AbstractProcessingHandler;
88
use Monolog\Handler\StreamHandler;
99
use Monolog\Logger;
10+
use Monolog\LogRecord as MonologLogRecord;
1011
use OpenTelemetry\API\Globals;
11-
use OpenTelemetry\API\Logs\Bridge;
1212
use OpenTelemetry\API\Logs\LoggerInterface;
1313
use OpenTelemetry\API\Logs\LoggerProviderInterface;
1414
use OpenTelemetry\API\Logs\LogRecord;
15-
use OpenTelemetry\API\Logs\Map\Psr3;
15+
use OpenTelemetry\API\Logs\Severity;
1616
use Psr\Log\LogLevel;
1717

1818
/**
@@ -36,7 +36,7 @@
3636
$streamHandler = new StreamHandler(STDOUT, LogLevel::DEBUG);
3737
$tracer = Globals::tracerProvider()->getTracer('monolog-demo');
3838

39-
//otel handler for Monolog v2
39+
//otel handler for Monolog v3
4040
$otelHandler = new class(LogLevel::INFO) extends AbstractProcessingHandler {
4141
private LoggerInterface $logger;
4242

@@ -50,19 +50,19 @@ public function __construct(string $level, bool $bubble = true, ?LoggerProviderI
5050
$this->logger = $provider->getLogger('monolog-demo', null, null, ['logging.library' => 'monolog']);
5151
}
5252

53-
protected function write(array $record): void
53+
protected function write(MonologLogRecord $record): void
5454
{
5555
$this->logger->emit($this->convert($record));
5656
}
5757

58-
private function convert(array $record): LogRecord
58+
private function convert(MonologLogRecord $record): LogRecord
5959
{
6060
return (new LogRecord($record['message']))
61-
->setSeverityText($record['level_name'])
61+
->setSeverityText($record->level->toPsrLogLevel())
6262
->setTimestamp((int) (microtime(true) * LogRecord::NANOS_PER_SECOND))
63-
->setObservedTimestamp($record['datetime']->format('U') * LogRecord::NANOS_PER_SECOND)
64-
->setSeverityNumber(Psr3::severityNumber($record['level_name']))
65-
->setAttributes($record['context'] + $record['extra']);
63+
->setObservedTimestamp((int) $record->datetime->format('U') * LogRecord::NANOS_PER_SECOND)
64+
->setSeverityNumber(Severity::fromPsr3($record->level->toPsrLogLevel()))
65+
->setAttributes($record->context + $record->extra);
6666
}
6767
};
6868

0 commit comments

Comments
 (0)