From 568d0fbb01bf57a3eb9c0f8c2b863b5657834894 Mon Sep 17 00:00:00 2001 From: Jonathan Dey Date: Wed, 22 May 2024 17:21:57 +0100 Subject: [PATCH 1/2] Added support for RPS limit --- config/logging.php | 1 + src/Logger.php | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/config/logging.php b/config/logging.php index f12cfb9..0d19022 100644 --- a/config/logging.php +++ b/config/logging.php @@ -14,6 +14,7 @@ 'group_name' => env('CLOUDWATCH_LOG_GROUP_NAME', 'laravel_app'), 'version' => env('CLOUDWATCH_LOG_VERSION', 'latest'), 'batch_size' => env('CLOUDWATCH_LOG_BATCH_SIZE', 10000), + 'rps_limit' => env('CLOUDWATCH_LOG_RPS_LIMIT', 0), 'formatter' => function ($configs) { return new \Monolog\Formatter\LineFormatter( '%channel%: %level_name%: %message% %context% %extra%', diff --git a/src/Logger.php b/src/Logger.php index 69a64cc..0805d48 100644 --- a/src/Logger.php +++ b/src/Logger.php @@ -3,6 +3,7 @@ namespace Pagevamp; use Aws\CloudWatchLogs\CloudWatchLogsClient; +use Monolog\Level; use PhpNexus\Cwh\Handler\CloudWatch; use Monolog\Formatter\LineFormatter; use Pagevamp\Exceptions\IncompleteCloudWatchConfig; @@ -30,8 +31,21 @@ public function __invoke(array $config) $retentionDays = $loggingConfig['retention']; $groupName = $loggingConfig['group_name']; $batchSize = isset($loggingConfig['batch_size']) ? $loggingConfig['batch_size'] : 10000; - - $logHandler = new CloudWatch($cwClient, $groupName, $streamName, $retentionDays, $batchSize); + $rpsLimit = isset($loggingConfig['rps_limit']) ? $loggingConfig['rps_limit'] : 0; + + $logHandler = new CloudWatch( + $cwClient, + $groupName, + $streamName, + $retentionDays, + $batchSize, + [], + Level::Debug, + true, + true, + true, + $rpsLimit + ); $logger = new \Monolog\Logger($loggingConfig['name']); $formatter = $this->resolveFormatter($loggingConfig); From dbb5e484dbcde1be570e8b9b73e969795ef22b7b Mon Sep 17 00:00:00 2001 From: Jonathan Dey Date: Wed, 22 May 2024 17:23:05 +0100 Subject: [PATCH 2/2] Added support for RPS limit - fixed formatting --- src/Logger.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Logger.php b/src/Logger.php index 0805d48..29806e8 100644 --- a/src/Logger.php +++ b/src/Logger.php @@ -42,9 +42,9 @@ public function __invoke(array $config) [], Level::Debug, true, - true, - true, - $rpsLimit + true, + true, + $rpsLimit ); $logger = new \Monolog\Logger($loggingConfig['name']);