Merge branch 'master' into 3.1

# Conflicts: # src/support/tests/FunctionTest.php
hyperf · Nov 10, 2023 · 6df2909 · 6df2909
2 parents a3809a5 + 9d7abda
commit 6df2909
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/publish/metric.php b/publish/metric.php
@@ -18,6 +18,7 @@
     'default' => env('METRIC_DRIVER', 'prometheus'),
     'use_standalone_process' => env('METRIC_USE_STANDALONE_PROCESS', true),
     'enable_default_metric' => env('METRIC_ENABLE_DEFAULT_METRIC', true),
+    'enable_command_metric' => env('METRIC_ENABLE_COMMAND_METRIC', true),
     'default_metric_interval' => env('DEFAULT_METRIC_INTERVAL', 5),
     // only available when use_standalone_process is true
     'buffer_interval' => env('METRIC_BUFFER_INTERVAL', 5),

diff --git a/src/Listener/OnBeforeHandle.php b/src/Listener/OnBeforeHandle.php
@@ -63,6 +63,10 @@ public function process(object $event): void
             return;
         }
 
+        if (! $this->config->get('metric.enable_command_metric', true)) {
+            return;
+        }
+
         MetricFactoryPicker::$isCommand = true;
 
         if ($this->config->get('metric.use_standalone_process', true)) {