feat: add support for monolog 3 (#1638)

* feat: add support for monolog 3/ symfony 7

* fix: keep the support for php7

* fix: handle cases for php8/7

* Prepare new release (#1640)

* Bump internal dependencies (#1641)

* Bump packages to version 1.0 (#1649)

* Update generated code (#1652)

update generated code

* Update generated code (#1654)

update generated code

* fix: phpStan issues

* fix: doc GeoProximityLocation

* fix: issue psalm/CsFixer

* fix: generated output

* Fix typehint for getMessageSize

---------

Co-authored-by: soufianlagnaoui <[email protected]>
Co-authored-by: Jérémy Derussé <[email protected]>
Co-authored-by: AsyncAws <[email protected]>

Author: 4 people

composer.json

@@ -22,7 +22,7 @@
         "illuminate/queue": "^6.18.11 || ^7.10 || ^8.0 || ^9.0 || ^10.0 || ^11.0",
         "illuminate/support": "^6.18.13 || ^7.10 || ^8.0 || ^9.0 || ^10.0 || ^11.0",
         "matthiasnoback/symfony-config-test": "^4.1 || ^5.0",
-        "monolog/monolog": "^1.1 || ^2.0",
+        "monolog/monolog": "^1.1 || ^2.0 || ^3.0",
         "nette/php-generator": "^3.6 || ^4.1",
         "nette/utils": "^3.0 || ^4.0",
         "nikic/php-parser": "^4.0",

src/Integration/Monolog/CloudWatch/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## NOT RELEASED
 
+### Added
+
+- Added support for `monolog/monolog` 3.0
+
 ## 1.1.0
 
 ### Added

src/Integration/Monolog/CloudWatch/composer.json

@@ -13,7 +13,7 @@
     "require": {
         "php": "^7.2.5 || ^8.0",
         "async-aws/cloud-watch-logs": "^1.0 || ^2.0",
-        "monolog/monolog": "^1.1 || ^2.0"
+        "monolog/monolog": "^1.1 || ^2.0 || ^3.0"
     },
     "autoload": {
         "psr-4": {
@@ -27,7 +27,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.1-dev"
+            "dev-master": "1.2-dev"
         }
     }
 }

src/Integration/Monolog/CloudWatch/src/CloudWatchLogsHandler.php

@@ -10,10 +10,8 @@
 use Monolog\Formatter\LineFormatter;
 use Monolog\Handler\AbstractProcessingHandler;
 use Monolog\Logger;
+use Monolog\LogRecord;
 
-/**
- * @phpstan-import-type FormattedRecord from AbstractProcessingHandler
- */
 class CloudWatchLogsHandler extends AbstractProcessingHandler
 {
     /**
@@ -126,20 +124,21 @@ protected function getDefaultFormatter(): FormatterInterface
     }
 
     /**
-     * {@inheritdoc}
+     * @param LogRecord|array $record
      */
-    protected function write(array $record): void
+    protected function write($record): void
     {
-        $records = $this->formatRecords($record);
+        $entries = $this->formatRecords($record);
 
-        foreach ($records as $record) {
-            if ($this->currentDataAmount + $this->getMessageSize($record) >= self::DATA_AMOUNT_LIMIT) {
+        foreach ($entries as $entry) {
+            $entrySize = $this->getEntrySize($entry);
+            if ($this->currentDataAmount + $entrySize >= self::DATA_AMOUNT_LIMIT) {
                 $this->flushBuffer();
             }
 
-            $this->currentDataAmount += $this->getMessageSize($record);
+            $this->currentDataAmount += $entrySize;
 
-            $this->buffer[] = $record;
+            $this->buffer[] = $entry;
 
             if (\count($this->buffer) >= $this->options['batchSize']) {
                 $this->flushBuffer();
@@ -186,14 +185,18 @@ private function flushBuffer(): void
      * Event size in the batch can not be bigger than 256 KB
      * https://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/cloudwatch_limits_cwl.html.
      *
-     * @phpstan-param FormattedRecord $entry
+     * @param LogRecord|array $record
      *
      * @return list<array{message: string, timestamp: int|float}>
      */
-    private function formatRecords(array $entry): array
+    private function formatRecords($record): array
     {
-        $entries = str_split($entry['formatted'], self::EVENT_SIZE_LIMIT);
-        $timestamp = $entry['datetime']->format('U.u') * 1000;
+        if (!$record instanceof LogRecord && !\is_array($record)) {
+            throw new InvalidArgument(sprintf('Argument 1 passed to %s must be of the type array or LogRecord, %s given', __METHOD__, \gettype($record)));
+        }
+
+        $entries = str_split($record['formatted'], self::EVENT_SIZE_LIMIT);
+        $timestamp = $record['datetime']->format('U.u') * 1000;
         $records = [];
 
         foreach ($entries as $entry) {
@@ -209,11 +212,11 @@ private function formatRecords(array $entry): array
     /**
      * http://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_PutLogEvents.html.
      *
-     * @param array{message: string, timestamp: int|float} $record
+     * @param array{message: string, timestamp: int|float} $entry
      */
-    private function getMessageSize(array $record): int
+    private function getEntrySize(array $entry): int
     {
-        return \strlen($record['message']) + 26;
+        return \strlen($entry['message']) + 26;
     }
 
     /**

src/Integration/Monolog/CloudWatch/tests/CloudWatchLogsHandlerTest.php

@@ -7,7 +7,9 @@
 use AsyncAws\Core\Test\ResultMockFactory;
 use AsyncAws\Monolog\CloudWatch\CloudWatchLogsHandler;
 use Monolog\Formatter\LineFormatter;
+use Monolog\Level;
 use Monolog\Logger;
+use Monolog\LogRecord;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -43,8 +45,8 @@ public function testConfig()
             'group' => $this->groupName,
             'stream' => $this->streamName,
         ], Logger::CRITICAL, false);
-
-        self::assertEquals(Logger::CRITICAL, $handler->getLevel());
+        $level = !\is_int($handler->getLevel()) ? $handler->getLevel()->value : $handler->getLevel();
+        self::assertEquals(Logger::CRITICAL, $level);
         self::assertFalse($handler->getBubble());
     }
 
@@ -115,8 +117,7 @@ public function testSortsEntriesChronologically()
         $records = [];
 
         for ($i = 1; $i <= 4; ++$i) {
-            $record = $this->getRecord(Logger::INFO, 'record' . $i);
-            $record['datetime'] = \DateTime::createFromFormat('U', time() + $i);
+            $record = $this->getRecord(Logger::INFO, 'record' . $i, [], \DateTimeImmutable::createFromFormat('U', time() + $i));
             $records[] = $record;
         }
 
@@ -138,17 +139,31 @@ private function getHandler($batchSize = 1000): CloudWatchLogsHandler
         ]);
     }
 
-    private function getRecord(int $level = Logger::WARNING, string $message = 'test', array $context = []): array
+    private function getRecord(int $level = Logger::WARNING, string $message = 'test', array $context = [], ?\DateTimeImmutable $datetime = null)
     {
-        return [
+        $data = [
             'message' => $message,
             'context' => $context,
             'level' => $level,
-            'level_name' => Logger::getLevelName($level),
             'channel' => 'test',
-            'datetime' => \DateTime::createFromFormat('U.u', sprintf('%.6F', microtime(true))),
+            'datetime' => $datetime ?? \DateTimeImmutable::createFromFormat('U.u', sprintf('%.6F', microtime(true))),
             'extra' => [],
         ];
+
+        if (!class_exists(LogRecord::class)) {
+            $data['level_name'] = Logger::getLevelName($data['level']);
+
+            return $data;
+        }
+
+        return new LogRecord(
+            $data['datetime'],
+            $data['channel'],
+            Level::fromValue($data['level']),
+            $data['message'],
+            $data['context'],
+            $data['extra']
+        );
     }
 
     private function getMultipleRecords(): array

src/Service/MediaConvert/CHANGELOG.md

@@ -7,7 +7,6 @@
 - AWS api-change: This release includes support for bringing your own fonts to use for burn-in or DVB-Sub captioning workflows.
 - AWS api-change: Change endpoint for `cn-northwest-1` region
 
-
 ## 1.1.0
 
 ### Added