Bump hyperf 3.1

.github/workflows/close-pull-request.yml

@@ -0,0 +1,9 @@
+name: Close Pull Request
+
+on:
+  pull_request_target:
+    types: [ opened ]
+
+jobs:
+  run:
+    uses: hyperf/.github/.github/workflows/close-pull-request.yml@master

.github/workflows/release.yml

@@ -0,0 +1,11 @@
+on:
+  push:
+    # Sequence of patterns matched against refs/tags
+    tags:
+      - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
+
+name: Release
+
+jobs:
+  release:
+    uses: hyperf/.github/.github/workflows/release.yml@master

composer.json

@@ -18,10 +18,9 @@
         "hyperf/guzzle": "~3.1.0",
         "hyperf/support": "~3.1.0",
         "hyperf/utils": "~3.1.0",
-        "psr/container": "^1.0|^2.0",
-        "promphp/prometheus_client_php": "^2.7",
+        "psr/container": "^1.0 || ^2.0",
         "psr/event-dispatcher": "^1.0",
-        "psr/http-message": "^1.0|^2.0"
+        "psr/http-message": "^1.0 || ^2.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.21",
@@ -44,15 +43,17 @@
         "swoole/ide-helper": "^5.0"
     },
     "suggest": {
-        "influxdb/influxdb-php": "Required to use InfluxDB driver.",
         "hyperf/di": "Required to use annotations.",
         "hyperf/event": "Required to use listeners for default metrics.",
+        "hyperf/http-server": "Required to capture routes in middleware.",
         "hyperf/process": "Required to use standalone process, or you have to roll your own",
         "hyperf/retry": "Required to use back-off retry implementation.",
-        "hyperf/http-server": "Required to capture routes in middleware.",
+        "influxdb/influxdb-php": "Required to use InfluxDB driver.",
         "promphp/prometheus_client_php": "Required to use Prometheus driver.(2.2.*)",
         "slickdeals/statsd": "Required to use StatdD driver."
     },
+    "minimum-stability": "dev",
+    "prefer-stable": true,
     "autoload": {
         "psr-4": {
             "Hyperf\\Metric\\": "src/"
@@ -71,8 +72,6 @@
         "analyse": "phpstan analyse --memory-limit=-1 -l 5 -c phpstan.neon",
         "rector": "rector process --clear-cache"
     },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
     "config": {
         "optimize-autoloader": true,
         "sort-packages": true,

grafana.json

@@ -397,7 +397,7 @@
         {
           "expr": "sum([[app_name]]_event_num{instance=~'$instance'})",
           "format": "time_series",
-          "instant": true,
+          "instant": false,
           "intervalFactor": 1,
           "refId": "A"
         }
@@ -484,7 +484,7 @@
         {
           "expr": "sum([[app_name]]_coroutine_num{instance=~'$instance'})",
           "format": "time_series",
-          "instant": true,
+          "instant": false,
           "intervalFactor": 1,
           "refId": "A"
         }
@@ -567,7 +567,7 @@
         {
           "expr": "sum([[app_name]]_connection_num{instance=~'$instance'})",
           "format": "time_series",
-          "instant": true,
+          "instant": false,
           "intervalFactor": 1,
           "refId": "A"
         }
@@ -729,7 +729,7 @@
         {
           "expr": "sum([[app_name]]_tasking_num{instance=~'$instance'})",
           "format": "time_series",
-          "instant": true,
+          "instant": false,
           "intervalFactor": 1,
           "refId": "A"
         }
@@ -895,7 +895,7 @@
         {
           "expr": "sum([[app_name]]_timer_num{instance=~'$instance'})",
           "format": "time_series",
-          "instant": true,
+          "instant": false,
           "intervalFactor": 1,
           "refId": "A"
         }

publish/metric.php

@@ -10,6 +10,7 @@
  * @license  https://github.com/opencodeco/hyperf-metric/blob/main/LICENSE
  */
 use Hyperf\Metric\Adapter\Prometheus\Constants;
+use Hyperf\Metric\Adapter\Prometheus\MetricFactory;
 
 use function Hyperf\Support\env;
 
@@ -25,7 +26,7 @@
     'buffer_size' => env('METRIC_BUFFER_SIZE', 200),
     'metric' => [
         'prometheus' => [
-            'driver' => Hyperf\Metric\Adapter\Prometheus\MetricFactory::class,
+            'driver' => MetricFactory::class,
             'mode' => Constants::SCRAPE_MODE,
             'namespace' => env('APP_NAME', 'skeleton'),
             'redis_config' => env('PROMETHEUS_REDIS_CONFIG', 'default'),

src/Adapter/InfluxDB/MetricFactory.php

@@ -9,6 +9,7 @@
  * @contact  [email protected]
  * @license  https://github.com/opencodeco/hyperf-metric/blob/main/LICENSE
  */
+
 namespace Hyperf\Metric\Adapter\InfluxDB;
 
 use Hyperf\Contract\ConfigInterface;

src/Adapter/NoOp/Counter.php

@@ -9,6 +9,7 @@
  * @contact  [email protected]
  * @license  https://github.com/opencodeco/hyperf-metric/blob/main/LICENSE
  */
+
 namespace Hyperf\Metric\Adapter\NoOp;
 
 use Hyperf\Metric\Contract\CounterInterface;

src/Adapter/NoOp/Gauge.php

@@ -9,6 +9,7 @@
  * @contact  [email protected]
  * @license  https://github.com/opencodeco/hyperf-metric/blob/main/LICENSE
  */
+
 namespace Hyperf\Metric\Adapter\NoOp;
 
 use Hyperf\Metric\Contract\GaugeInterface;

src/Adapter/NoOp/Histogram.php

@@ -9,6 +9,7 @@
  * @contact  [email protected]
  * @license  https://github.com/opencodeco/hyperf-metric/blob/main/LICENSE
  */
+
 namespace Hyperf\Metric\Adapter\NoOp;
 
 use Hyperf\Metric\Contract\HistogramInterface;

src/Adapter/NoOp/MetricFactory.php

@@ -9,6 +9,7 @@
  * @contact  [email protected]
  * @license  https://github.com/opencodeco/hyperf-metric/blob/main/LICENSE
  */
+
 namespace Hyperf\Metric\Adapter\NoOp;
 
 use Hyperf\Coordinator\Constants;

src/Adapter/Prometheus/Constants.php

@@ -9,6 +9,7 @@
  * @contact  [email protected]
  * @license  https://github.com/opencodeco/hyperf-metric/blob/main/LICENSE
  */
+
 namespace Hyperf\Metric\Adapter\Prometheus;
 
 class Constants

src/Adapter/Prometheus/Counter.php

@@ -9,6 +9,7 @@
  * @contact  [email protected]
  * @license  https://github.com/opencodeco/hyperf-metric/blob/main/LICENSE
  */
+
 namespace Hyperf\Metric\Adapter\Prometheus;
 
 use Hyperf\Metric\Contract\CounterInterface;

src/Adapter/Prometheus/Gauge.php

@@ -9,6 +9,7 @@
  * @contact  [email protected]
  * @license  https://github.com/opencodeco/hyperf-metric/blob/main/LICENSE
  */
+
 namespace Hyperf\Metric\Adapter\Prometheus;
 
 use Hyperf\Metric\Contract\GaugeInterface;

src/Adapter/Prometheus/Histogram.php

@@ -9,6 +9,7 @@
  * @contact  [email protected]
  * @license  https://github.com/opencodeco/hyperf-metric/blob/main/LICENSE
  */
+
 namespace Hyperf\Metric\Adapter\Prometheus;
 
 use Hyperf\Metric\Contract\HistogramInterface;

src/Adapter/Prometheus/MetricFactory.php

@@ -9,6 +9,7 @@
  * @contact  [email protected]
  * @license  https://github.com/opencodeco/hyperf-metric/blob/main/LICENSE
  */
+
 namespace Hyperf\Metric\Adapter\Prometheus;
 
 use GuzzleHttp\Exception\GuzzleException;

src/Adapter/Prometheus/Redis.php

@@ -9,6 +9,7 @@
  * @contact  [email protected]
  * @license  https://github.com/opencodeco/hyperf-metric/blob/main/LICENSE
  */
+
 namespace Hyperf\Metric\Adapter\Prometheus;
 
 use Hyperf\Codec\Json;

src/Adapter/Prometheus/RedisStorageFactory.php

@@ -9,6 +9,7 @@
  * @contact  [email protected]
  * @license  https://github.com/opencodeco/hyperf-metric/blob/main/LICENSE
  */
+
 namespace Hyperf\Metric\Adapter\Prometheus;
 
 use Hyperf\Contract\ConfigInterface;

src/Adapter/RemoteProxy/Counter.php

@@ -9,6 +9,7 @@
  * @contact  [email protected]
  * @license  https://github.com/opencodeco/hyperf-metric/blob/main/LICENSE
  */
+
 namespace Hyperf\Metric\Adapter\RemoteProxy;
 
 use Hyperf\Context\ApplicationContext;

src/Adapter/RemoteProxy/Gauge.php

@@ -9,6 +9,7 @@
  * @contact  [email protected]
  * @license  https://github.com/opencodeco/hyperf-metric/blob/main/LICENSE
  */
+
 namespace Hyperf\Metric\Adapter\RemoteProxy;
 
 use Hyperf\Context\ApplicationContext;

src/Adapter/RemoteProxy/Histogram.php

@@ -9,6 +9,7 @@
  * @contact  [email protected]
  * @license  https://github.com/opencodeco/hyperf-metric/blob/main/LICENSE
  */
+
 namespace Hyperf\Metric\Adapter\RemoteProxy;
 
 use Hyperf\Context\ApplicationContext;

src/Adapter/RemoteProxy/MetricCollector.php

@@ -9,6 +9,7 @@
  * @contact  [email protected]
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace Hyperf\Metric\Adapter\RemoteProxy;
 
 use Hyperf\Metric\Contract\MetricCollectorInterface;

src/Adapter/RemoteProxy/MetricCollectorFactory.php

@@ -9,6 +9,7 @@
  * @contact  [email protected]
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace Hyperf\Metric\Adapter\RemoteProxy;
 
 use Hyperf\Contract\ConfigInterface;

src/Adapter/RemoteProxy/MetricFactory.php

@@ -9,6 +9,7 @@
  * @contact  [email protected]
  * @license  https://github.com/opencodeco/hyperf-metric/blob/main/LICENSE
  */
+
 namespace Hyperf\Metric\Adapter\RemoteProxy;
 
 use Hyperf\Metric\Contract\CounterInterface;

src/Adapter/StatsD/Counter.php

@@ -9,6 +9,7 @@
  * @contact  [email protected]
  * @license  https://github.com/opencodeco/hyperf-metric/blob/main/LICENSE
  */
+
 namespace Hyperf\Metric\Adapter\StatsD;
 
 use Domnikl\Statsd\Client;

src/Adapter/StatsD/Gauge.php

@@ -9,6 +9,7 @@
  * @contact  [email protected]
  * @license  https://github.com/opencodeco/hyperf-metric/blob/main/LICENSE
  */
+
 namespace Hyperf\Metric\Adapter\StatsD;
 
 use Domnikl\Statsd\Client;

src/Adapter/StatsD/Histogram.php

@@ -9,6 +9,7 @@
  * @contact  [email protected]
  * @license  https://github.com/opencodeco/hyperf-metric/blob/main/LICENSE
  */
+
 namespace Hyperf\Metric\Adapter\StatsD;
 
 use Domnikl\Statsd\Client;

src/Adapter/StatsD/MetricFactory.php

@@ -9,6 +9,7 @@
  * @contact  [email protected]
  * @license  https://github.com/opencodeco/hyperf-metric/blob/main/LICENSE
  */
+
 namespace Hyperf\Metric\Adapter\StatsD;
 
 use Domnikl\Statsd\Client;

src/Annotation/Counter.php

@@ -9,6 +9,7 @@
  * @contact  [email protected]
  * @license  https://github.com/opencodeco/hyperf-metric/blob/main/LICENSE
  */
+
 namespace Hyperf\Metric\Annotation;
 
 use Attribute;

src/Annotation/Histogram.php

@@ -9,6 +9,7 @@
  * @contact  [email protected]
  * @license  https://github.com/opencodeco/hyperf-metric/blob/main/LICENSE
  */
+
 namespace Hyperf\Metric\Annotation;
 
 use Attribute;

src/Aspect/CounterAnnotationAspect.php

@@ -9,6 +9,7 @@
  * @contact  [email protected]
  * @license  https://github.com/opencodeco/hyperf-metric/blob/main/LICENSE
  */
+
 namespace Hyperf\Metric\Aspect;
 
 use Hyperf\Di\Aop\AbstractAspect;

src/Aspect/HistogramAnnotationAspect.php

@@ -9,6 +9,7 @@
  * @contact  [email protected]
  * @license  https://github.com/opencodeco/hyperf-metric/blob/main/LICENSE
  */
+
 namespace Hyperf\Metric\Aspect;
 
 use Hyperf\Di\Aop\AbstractAspect;

src/ConfigProvider.php

@@ -9,6 +9,7 @@
  * @contact  [email protected]
  * @license  https://github.com/opencodeco/hyperf-metric/blob/main/LICENSE
  */
+
 namespace Hyperf\Metric;
 
 use Domnikl\Statsd\Connection;

src/Contract/CounterInterface.php

@@ -9,6 +9,7 @@
  * @contact  [email protected]
  * @license  https://github.com/opencodeco/hyperf-metric/blob/main/LICENSE
  */
+
 namespace Hyperf\Metric\Contract;
 
 /**

src/Contract/GaugeInterface.php

@@ -9,6 +9,7 @@
  * @contact  [email protected]
  * @license  https://github.com/opencodeco/hyperf-metric/blob/main/LICENSE
  */
+
 namespace Hyperf\Metric\Contract;
 
 /**

src/Contract/HistogramInterface.php

@@ -9,6 +9,7 @@
  * @contact  [email protected]
  * @license  https://github.com/opencodeco/hyperf-metric/blob/main/LICENSE
  */
+
 namespace Hyperf\Metric\Contract;
 
 /**

src/Contract/MetricCollectorInterface.php

@@ -9,6 +9,7 @@
  * @contact  [email protected]
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
 namespace Hyperf\Metric\Contract;
 
 interface MetricCollectorInterface

src/Contract/MetricFactoryInterface.php

@@ -9,6 +9,7 @@
  * @contact  [email protected]
  * @license  https://github.com/opencodeco/hyperf-metric/blob/main/LICENSE
  */
+
 namespace Hyperf\Metric\Contract;
 
 interface MetricFactoryInterface

src/CoroutineServerStats.php

@@ -9,6 +9,7 @@
  * @contact  [email protected]
  * @license  https://github.com/opencodeco/hyperf-metric/blob/main/LICENSE
  */
+
 namespace Hyperf\Metric;
 
 use Hyperf\Contract\Arrayable;

src/Event/MetricFactoryReady.php

@@ -9,6 +9,7 @@
  * @contact  [email protected]
  * @license  https://github.com/opencodeco/hyperf-metric/blob/main/LICENSE
  */
+
 namespace Hyperf\Metric\Event;
 
 use Hyperf\Metric\Contract\MetricFactoryInterface;