From 092c3bec6e8e80bdc526326641e4fa8cf26e669d Mon Sep 17 00:00:00 2001 From: Taner Tombas Date: Fri, 10 Mar 2023 12:42:47 +0300 Subject: [PATCH 1/2] monolog update --- composer.json | 2 +- src/Handler/CloudWatch.php | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/composer.json b/composer.json index a6f4ea8..b88aa70 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ }, "require": { "php": "^7.2 || ^8", - "monolog/monolog": "^2.0", + "monolog/monolog": "^3.3.1", "aws/aws-sdk-php": "^3.18" }, "require-dev": { diff --git a/src/Handler/CloudWatch.php b/src/Handler/CloudWatch.php index 26a1271..b23e1f3 100755 --- a/src/Handler/CloudWatch.php +++ b/src/Handler/CloudWatch.php @@ -6,7 +6,8 @@ use Monolog\Formatter\FormatterInterface; use Monolog\Formatter\LineFormatter; use Monolog\Handler\AbstractProcessingHandler; -use Monolog\Logger; +use Monolog\Level; +use Monolog\LogRecord; class CloudWatch extends AbstractProcessingHandler { @@ -132,14 +133,14 @@ class CloudWatch extends AbstractProcessingHandler */ public function __construct( CloudWatchLogsClient $client, - $group, - $stream, - $retention = 14, - $batchSize = 10000, + string $group, + string $stream, + int $retention = 14, + int $batchSize = 10000, array $tags = [], - $level = Logger::DEBUG, - $bubble = true, - $createGroup = true + Level $level = Level::Debug, + bool $bubble = true, + bool $createGroup = true ) { if ($batchSize > 10000) { throw new \InvalidArgumentException('Batch size can not be greater than 10000'); @@ -161,7 +162,7 @@ public function __construct( /** * {@inheritdoc} */ - protected function write(array $record): void + protected function write(LogRecord $record): void { $records = $this->formatRecords($record); @@ -277,13 +278,13 @@ protected function willMessageTimestampExceedLimit(array $record): bool * Event size in the batch can not be bigger than 256 KB * https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/cloudwatch_limits_cwl.html * - * @param array $entry + * @param LogRecord $entry * @return array */ - private function formatRecords(array $entry): array + private function formatRecords(LogRecord $entry): array { - $entries = str_split($entry['formatted'], self::EVENT_SIZE_LIMIT); - $timestamp = $entry['datetime']->format('U.u') * 1000; + $entries = str_split($entry->formatted, self::EVENT_SIZE_LIMIT); + $timestamp = $entry->datetime->format('U.u') * 1000; $records = []; foreach ($entries as $entry) { @@ -324,7 +325,6 @@ private function send(array $entries): void return 0; }); - $data = [ 'logGroupName' => $this->group, 'logStreamName' => $this->stream, From 76383f1c305d5d0e5d409dbe824e92136e8d1d17 Mon Sep 17 00:00:00 2001 From: Taner Tombas Date: Fri, 10 Mar 2023 12:55:59 +0300 Subject: [PATCH 2/2] comment typo fix --- src/Handler/CloudWatch.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Handler/CloudWatch.php b/src/Handler/CloudWatch.php index b23e1f3..ac3ea7c 100755 --- a/src/Handler/CloudWatch.php +++ b/src/Handler/CloudWatch.php @@ -125,7 +125,7 @@ class CloudWatch extends AbstractProcessingHandler * @param int $retention * @param int $batchSize * @param array $tags - * @param int $level + * @param Level $level * @param bool $bubble * @param bool $createGroup *