Merge remote-tracking branch 'origin/ACP2E-4237' into PR_2025_10_01_flowers

Author: thiaramus

lib/internal/Magento/Framework/App/Backpressure/SlidingWindow/RedisRequestLogger.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -61,6 +61,7 @@ public function __construct(
     public function incrAndGetFor(ContextInterface $context, int $timeSlot, int $discardAfter): int
     {
         $id = $this->generateId($context, $timeSlot);
+        $this->redisClient->pipeline();
         $this->redisClient->incrBy($id, 1);
         $this->redisClient->expireAt($id, time() + $discardAfter);
 

lib/internal/Magento/Framework/App/Backpressure/SlidingWindow/RedisRequestLogger/RedisClient.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -68,16 +68,14 @@ class RedisClient
     /**
      * @var Credis_Client
      */
-    private $pipeline;
+    private $client;
 
     /**
      * @param DeploymentConfig $config
-     * @throws FileSystemException
-     * @throws RuntimeException
      */
     public function __construct(DeploymentConfig $config)
     {
-        $credisClient = new Credis_Client(
+        $this->client = new Credis_Client(
             $this->getHost($config),
             $this->getPort($config),
             $this->getTimeout($config),
@@ -86,8 +84,6 @@ public function __construct(DeploymentConfig $config)
             $this->getPassword($config),
             $this->getUser($config)
         );
-
-        $this->pipeline = $credisClient->pipeline();
     }
 
     /**
@@ -99,7 +95,7 @@ public function __construct(DeploymentConfig $config)
      */
     public function incrBy(string $key, int $decrement)
     {
-        return $this->pipeline->incrBy($key, $decrement);
+        return $this->client->incrBy($key, $decrement);
     }
 
     /**
@@ -111,7 +107,7 @@ public function incrBy(string $key, int $decrement)
      */
     public function expireAt(string $key, int $timestamp)
     {
-        return $this->pipeline->expireAt($key, $timestamp);
+        return $this->client->expireAt($key, $timestamp);
     }
 
     /**
@@ -122,7 +118,17 @@ public function expireAt(string $key, int $timestamp)
      */
     public function get(string $key)
     {
-        return $this->pipeline->get($key);
+        return $this->client->get($key);
+    }
+
+    /**
+     * Start pipeline
+     *
+     * @return void
+     */
+    public function pipeline(): void
+    {
+        $this->client->pipeline();
     }
 
     /**
@@ -132,7 +138,7 @@ public function get(string $key)
      */
     public function exec(): array
     {
-        return $this->pipeline->exec();
+        return $this->client->exec();
     }
 
     /**

lib/internal/Magento/Framework/App/Test/Unit/Backpressure/SlidingWindow/RedisRequestLoggerTest.php

@@ -1,9 +1,8 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
-
 declare(strict_types=1);
 
 namespace Magento\Framework\App\Test\Unit\Backpressure\SlidingWindow;
@@ -67,11 +66,16 @@ public function testIncrAndGetFor()
     {
         $expectedId = 'custompref_typeId_2_identity_400';
 
-        $this->redisClientMock->method('incrBy')
+        $this->redisClientMock->expects(self::once())
+            ->method('pipeline');
+        $this->redisClientMock->expects(self::once())
+            ->method('incrBy')
             ->with($expectedId, 1);
-        $this->redisClientMock->method('expireAt')
+        $this->redisClientMock->expects(self::once())
+            ->method('expireAt')
             ->with($expectedId, time() + 500);
-        $this->redisClientMock->method('exec')
+        $this->redisClientMock->expects(self::once())
+            ->method('exec')
             ->willReturn(['45']);
 
         self::assertEquals(
@@ -83,9 +87,10 @@ public function testIncrAndGetFor()
     public function testGetFor()
     {
         $expectedId = 'custompref_typeId_2_identity_600';
-        $this->redisClientMock->method('get')
-        ->with($expectedId)
-        ->willReturn('23');
+        $this->redisClientMock->expects(self::once())
+            ->method('get')
+            ->with($expectedId)
+            ->willReturn('23');
 
         self::assertEquals(23, $this->redisRequestLogger->getFor($this->contextMock, 600));
     }