Use promphp instead of endclothing for prometheus_client_php. (…

…#3676)
hyperf · Jun 5, 2021 · a89957a · a89957a
1 parent 5f3cabb
commit a89957a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -12,10 +12,10 @@
     "description": "hyperf metric component",
     "require": {
         "php": ">=7.3",
-        "endclothing/prometheus_client_php": "^1.0",
         "hyperf/contract": "~2.2.0",
         "hyperf/guzzle": "~2.2.0",
         "hyperf/utils": "~2.2.0",
+        "promphp/prometheus_client_php": "^2.2",
         "psr/container": "^1.0|^2.0",
         "psr/event-dispatcher": "^1.0",
         "psr/http-message": "^1.0"
@@ -39,7 +39,10 @@
             "HyperfTest\\Metric\\": "tests/"
         }
     },
+    "minimum-stability": "dev",
+    "prefer-stable": true,
     "config": {
+        "optimize-autoloader": true,
         "sort-packages": true
     },
     "extra": {

diff --git a/src/Adapter/Prometheus/Redis.php b/src/Adapter/Prometheus/Redis.php
@@ -20,12 +20,6 @@
 use Prometheus\MetricFamilySamples;
 use Prometheus\Storage\Adapter;
 
-/**
- * This class is backported from
- * endclothing/prometheus_client_php 1.0.* branch.
- * The 1.0.* branch requires php7.3, so we cannot
- * directly use it in Hyperf as of now.
- */
 class Redis implements Adapter
 {
     public const PROMETHEUS_METRIC_KEYS_SUFFIX = '_METRIC_KEYS';
@@ -97,6 +91,11 @@ public static function setPrefix(string $prefix): void
      * @throws StorageException
      */
     public function flushRedis(): void
+    {
+        $this->wipeStorage();
+    }
+
+    public function wipeStorage(): void
     {
         $this->openConnection();
         $this->redis->flushAll();