fix: fix prefix for PHPRedis

Signed-off-by: Mateusz Cholewka <mateusz@cholewka.com.pl>

Author: mtk3d

src/Prometheus/Storage/AbstractRedis.php

@@ -292,7 +292,7 @@ protected function collectHistograms(): array
         sort($keys);
         $histograms = [];
         foreach ($keys as $key) {
-            $raw = $this->redis->hGetAll(ltrim($key, $this->redis->prefix('')));
+            $raw = $this->redis->hGetAll(ltrim($key, $this->redis->getOption(RedisClient::OPT_PREFIX) ?? ''));
             if (! isset($raw['__meta'])) {
                 continue;
             }
@@ -373,7 +373,7 @@ protected function removePrefixFromKey(string $key): string
             return $key;
         }
 
-        return substr($key, strlen($this->redis->prefix('')));
+        return substr($key, strlen($this->redis->getOption(RedisClient::OPT_PREFIX)));
     }
 
     /**
@@ -483,7 +483,7 @@ protected function collectGauges(bool $sortMetrics = true): array
         sort($keys);
         $gauges = [];
         foreach ($keys as $key) {
-            $raw = $this->redis->hGetAll(ltrim($key, $this->redis->prefix('')));
+            $raw = $this->redis->hGetAll(ltrim($key, $this->redis->getOption(RedisClient::OPT_PREFIX) ?? ''));
             if (! isset($raw['__meta'])) {
                 continue;
             }
@@ -525,7 +525,7 @@ protected function collectCounters(bool $sortMetrics = true): array
         sort($keys);
         $counters = [];
         foreach ($keys as $key) {
-            $raw = $this->redis->hGetAll(ltrim($key, $this->redis->prefix('')));
+            $raw = $this->redis->hGetAll(ltrim($key, $this->redis->getOption(RedisClient::OPT_PREFIX) ?? ''));
             if (! isset($raw['__meta'])) {
                 continue;
             }

src/Prometheus/Storage/Redis.php

@@ -48,7 +48,7 @@ public static function fromExistingConnection(\Redis $redis): self
         }
 
         $self = new self;
-        $self->redis = new PHPRedis($redis, self::$defaultOptions);
+        $self->redis = PHPRedis::fromExistingConnection($redis, self::$defaultOptions);
 
         return $self;
     }

src/Prometheus/Storage/RedisClients/PHPRedis.php

@@ -42,6 +42,17 @@ public static function create(array $options): self
         return new self($redis, $options);
     }
 
+    /**
+     * @param  mixed[]  $options
+     */
+    public static function fromExistingConnection(\Redis $redis, array $options): self
+    {
+        $self = new self($redis, $options);
+        $self->connectionInitialized = true;
+
+        return $self;
+    }
+
     public function getOption(int $option): mixed
     {
         return $this->redis->getOption($option);
@@ -96,11 +107,6 @@ public function del(array|string $key, string ...$other_keys): void
         }
     }
 
-    public function prefix(string $key): string
-    {
-        return $this->redis->_prefix($key);
-    }
-
     /**
      * @throws StorageException
      */

src/Prometheus/Storage/RedisClients/Predis.php

@@ -120,11 +120,6 @@ public function del(array|string $key, string ...$other_keys): void
         $this->client->del($key, ...$other_keys);
     }
 
-    public function prefix(string $key): string
-    {
-        return $this->getOption(RedisClient::OPT_PREFIX).$key;
-    }
-
     public function ensureOpenConnection(): void
     {
         // Predis doesn't require to trigger connection

src/Prometheus/Storage/RedisClients/RedisClient.php

@@ -45,7 +45,5 @@ public function get(string $key): mixed;
      */
     public function del(array|string $key, string ...$other_keys): void;
 
-    public function prefix(string $key): string;
-
     public function ensureOpenConnection(): void;
 }