fixing tests

Author: Jacq

.github/workflows/tests.yml

@@ -30,10 +30,16 @@ jobs:
           - 5432:5432
 
     env:
-      # The hostname used to communicate with the Redis service container
+      # The hostname used to communicate with the Redis/Sentinel service containers
       REDIS_HOST: redis
+      # The hostname for redis sentinel
+      REDIS_SENTINEL_HOST: redis-sentinel
       # The default Redis port
       REDIS_PORT: 6379
+      # The default Redis Sentinel port
+      REDIS_SENTINEL_PORT: 26379
+      # The default Redis Sentinel primary
+      REDIS_SENTINEL_SERVICE: myprimary
       # MySQL
       DB_DATABASE: test
       DB_USER: root
@@ -69,6 +75,20 @@ jobs:
         with:
           redis-version: ${{ matrix.redis-version }}
 
+      - name: Generate Redis Sentinel conf compatible with redis 5 assuming 127.0.0.1 (no resolve hostname)
+        run: |
+          REDIS_SENTINEL_IP=127.0.0.1
+          cat <<EOF > sentinel5.conf
+          port ${{ env.REDIS_SENTINEL_PORT }}
+          sentinel monitor ${{ env.REDIS_SENTINEL_SERVICE }} $REDIS_SENTINEL_IP ${{ env.REDIS_PORT }} 2
+          sentinel down-after-milliseconds ${{ env.REDIS_SENTINEL_SERVICE }} 10000
+          sentinel failover-timeout ${{ env.REDIS_SENTINEL_SERVICE }} 180000
+          sentinel parallel-syncs ${{ env.REDIS_SENTINEL_SERVICE }} 2
+          EOF
+
+      - name: Start Redis Sentinel
+        run: docker run -d --name ${{env.REDIS_SENTINEL_HOST}} -p 26379:26379 --link redis:redis -v $PWD/sentinel5.conf:/data/sentinel.conf redis:${{ matrix.redis-version }} redis-server sentinel.conf --sentinel
+
       - name: Execute tests (PDO with Sqlite)
         run: vendor/bin/phpunit
 

.vscode/settings.json

@@ -1,3 +1,6 @@
 {
-    "github-actions.workflows.pinned.workflows": []
+    "github-actions.workflows.pinned.workflows": [],
+    "githubPullRequests.ignoredPullRequestBranches": [
+        "main"
+    ]
 }

examples/flush_adapter.php

@@ -8,8 +8,9 @@
 
 if ($adapterName === 'redis') {
     define('REDIS_HOST', $_SERVER['REDIS_HOST'] ?? '127.0.0.1');
+    define('REDIS_SENTINEL_HOST', $_SERVER['REDIS_SENTINEL_HOST'] ?? '127.0.0.1');
 
-    $adapter = new Prometheus\Storage\Redis(['host' => REDIS_HOST]);
+    $adapter = new Prometheus\Storage\Redis(['host' => REDIS_HOST, 'sentinel' => ['host' => REDIS_SENTINEL_HOST]]);
 } elseif ($adapterName === 'apc') {
     $adapter = new Prometheus\Storage\APC();
 } elseif ($adapterName === 'apcng') {

sentinel.conf

@@ -1,4 +1,5 @@
 bind 0.0.0.0
+port 26379
 sentinel monitor myprimary redis 6379 2
 sentinel resolve-hostnames yes
 sentinel down-after-milliseconds myprimary 10000

src/Prometheus/Storage/Redis.php

@@ -130,7 +130,7 @@ public function getRedisSentinel(): \RedisSentinel
      * @return self
      * @throws StorageException
      */
-    public static function fromExistingConnection(\Redis $redis, \RedisSentinel $redisSentinel = null): self
+    public static function fromExistingConnection(\Redis $redis, ?\RedisSentinel $redisSentinel = null): self
     {
         if (isset($redisSentinel)) {
             RedisSentinel::fromExistingConnection($redisSentinel);

src/Prometheus/Storage/RedisSentinel.php

@@ -4,6 +4,7 @@
 
 use Prometheus\Exception\StorageException;
 
+// Redis Sentinel connector based on https://github.com/Namoshek/laravel-redis-sentinel
 class RedisSentinel
 {
     /**

tests/Test/Prometheus/Storage/RedisSentinelTest.php

@@ -60,7 +60,10 @@ public function itShouldThrowExceptionWhenInjectedRedisIsNotConnected(): void
     {
         $connection = new \Redis();
         // @phpstan-ignore arguments.count
-        $sentinel = new \RedisSentinel();
+        
+        $sentinel = version_compare((string)phpversion('redis'), '6.0', '>=') ? 
+                        new \RedisSentinel(['host' => '/dev/null']) :
+                        new \RedisSentinel('/dev/null');
 
         self::expectException(StorageException::class);
         self::expectExceptionMessageMatches("/Can't connect to RedisSentinel server\\..*/");
@@ -86,8 +89,8 @@ public function itShouldThrowAnExceptionOnPrimaryFailure(): void
      * @test
      */
     public function itShouldGetMaster(): void
-    {
-        $redis = new Redis(['host' => '/dev/null',
+    { 
+        $redis = new Redis(['host' => REDIS_HOST,
             'sentinel' => ['host' => REDIS_SENTINEL_HOST, 'enable' => true, 'service' => 'myprimary']
         ]);