Add Predis support

Jimdo · Feb 26, 2018 · 69cf060 · 69cf060
1 parent cf3ea93
commit 69cf060
Show file tree

Hide file tree

Showing 14 changed files with 443 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -15,11 +15,13 @@
         "guzzlehttp/guzzle": "^6.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "4.1.0"
+        "phpunit/phpunit": "4.1.0",
+        "predis/predis": "^1.1"
     },
     "suggest": {
         "ext-redis": "Required if using Redis.",
-        "ext-apc": "Required if using APCu."
+        "predis/predis": "Required if using Predis",
+        "ext-apcu": "Required if using APCu."
     },
     "autoload": {
         "psr-0": {

diff --git a/examples/flush_adapter.php b/examples/flush_adapter.php
@@ -8,6 +8,11 @@
 
     $redisAdapter = new Prometheus\Storage\Redis(array('host' => REDIS_HOST));
     $redisAdapter->flushRedis();
+} elseif ($adapter === 'predis') {
+    $adapter = new Prometheus\Storage\Predis([
+        'host' => isset($_SERVER['REDIS_HOST']) ? $_SERVER['REDIS_HOST'] : '127.0.0.1'
+    ]);
+    $adapter->flushRedis();
 } elseif ($adapter === 'apc') {
     $apcAdapter = new Prometheus\Storage\APC();
     $apcAdapter->flushAPC();

diff --git a/examples/metrics.php b/examples/metrics.php
@@ -11,6 +11,10 @@
 if ($adapter === 'redis') {
     Redis::setDefaultOptions(array('host' => isset($_SERVER['REDIS_HOST']) ? $_SERVER['REDIS_HOST'] : '127.0.0.1'));
     $adapter = new Prometheus\Storage\Redis();
+} elseif ($adapter === 'predis') {
+    $adapter = new Prometheus\Storage\Predis([
+        'host' => isset($_SERVER['REDIS_HOST']) ? $_SERVER['REDIS_HOST'] : '127.0.0.1'
+    ]);
 } elseif ($adapter === 'apc') {
     $adapter = new Prometheus\Storage\APC();
 } elseif ($adapter === 'in-memory') {

diff --git a/examples/pushgateway.php b/examples/pushgateway.php
@@ -9,6 +9,10 @@
 if ($adapter === 'redis') {
     Redis::setDefaultOptions(array('host' => isset($_SERVER['REDIS_HOST']) ? $_SERVER['REDIS_HOST'] : '127.0.0.1'));
     $adapter = new Prometheus\Storage\Redis();
+} elseif ($adapter === 'predis') {
+    $adapter = new Prometheus\Storage\Predis([
+        'host' => isset($_SERVER['REDIS_HOST']) ? $_SERVER['REDIS_HOST'] : '127.0.0.1'
+    ]);
 } elseif ($adapter === 'apc') {
     $adapter = new Prometheus\Storage\APC();
 } elseif ($adapter === 'in-memory') {

diff --git a/examples/some_counter.php b/examples/some_counter.php
@@ -10,6 +10,10 @@
 if ($adapter === 'redis') {
     Redis::setDefaultOptions(array('host' => isset($_SERVER['REDIS_HOST']) ? $_SERVER['REDIS_HOST'] : '127.0.0.1'));
     $adapter = new Prometheus\Storage\Redis();
+} elseif ($adapter === 'predis') {
+    $adapter = new Prometheus\Storage\Predis([
+        'host' => isset($_SERVER['REDIS_HOST']) ? $_SERVER['REDIS_HOST'] : '127.0.0.1'
+    ]);
 } elseif ($adapter === 'apc') {
     $adapter = new Prometheus\Storage\APC();
 } elseif ($adapter === 'in-memory') {

diff --git a/examples/some_gauge.php b/examples/some_gauge.php
@@ -13,6 +13,10 @@
 if ($adapter === 'redis') {
     Redis::setDefaultOptions(array('host' => isset($_SERVER['REDIS_HOST']) ? $_SERVER['REDIS_HOST'] : '127.0.0.1'));
     $adapter = new Prometheus\Storage\Redis();
+} elseif ($adapter === 'predis') {
+    $adapter = new Prometheus\Storage\Predis([
+        'host' => isset($_SERVER['REDIS_HOST']) ? $_SERVER['REDIS_HOST'] : '127.0.0.1'
+    ]);
 } elseif ($adapter === 'apc') {
     $adapter = new Prometheus\Storage\APC();
 } elseif ($adapter === 'in-memory') {

diff --git a/examples/some_histogram.php b/examples/some_histogram.php
@@ -12,6 +12,10 @@
 if ($adapter === 'redis') {
     Redis::setDefaultOptions(array('host' => isset($_SERVER['REDIS_HOST']) ? $_SERVER['REDIS_HOST'] : '127.0.0.1'));
     $adapter = new Prometheus\Storage\Redis();
+} elseif ($adapter === 'predis') {
+    $adapter = new Prometheus\Storage\Predis([
+        'host' => isset($_SERVER['REDIS_HOST']) ? $_SERVER['REDIS_HOST'] : '127.0.0.1'
+    ]);
 } elseif ($adapter === 'apc') {
     $adapter = new Prometheus\Storage\APC();
 } elseif ($adapter === 'in-memory') {

diff --git a/src/Prometheus/PushGateway.php b/src/Prometheus/PushGateway.php
@@ -49,9 +49,9 @@ public function pushAdd(CollectorRegistry $collectorRegistry, $job, $groupingKey
      * @param $job
      * @param $groupingKey
      */
-    public function delete($job, $groupingKey = null)
+    public function delete(CollectorRegistry $collectorRegistry, $job, $groupingKey = null)
     {
-        $this->doRequest(null, $job, $groupingKey, 'delete');
+        $this->doRequest($collectorRegistry, $job, $groupingKey, 'delete');
     }
 
     /**