fix: no default limit/response limit

audunru · Dec 2, 2022 · e3cef24 · e3cef24
1 parent 2cc5777
commit e3cef24
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 22 deletions.
diff --git a/src/Listeners/LogMemoryUsage.php b/src/Listeners/LogMemoryUsage.php
@@ -18,12 +18,7 @@ class LogMemoryUsage
     /**
      * Default paths where memory usage logging is enabled.
      */
-    private const DEFAULT_PATTERNS = ['*'];
-
-    /**
-     * Default memory usage limit.
-     */
-    private const DEFAULT_LIMIT = 100;
+    private const DEFAULT_PATTERNS = [];
 
     /**
      * Default log channel.
@@ -62,9 +57,9 @@ public function handle(RequestHandled $event)
         foreach (config('memory-usage.paths', []) as $options) {
             $patterns = Arr::get($options, 'patterns', self::DEFAULT_PATTERNS);
             $ignorePatternsForPath = Arr::get($options, 'ignore_patterns', self::DEFAULT_IGNORE_PATTERNS);
-            $limit = Arr::get($options, 'limit', self::DEFAULT_LIMIT);
+            $limit = Arr::get($options, 'limit');
 
-            if ($peakUsage > $limit && $event->request->is($patterns) && ! $event->request->is($ignorePatternsForPath)) {
+            if (! is_null($limit) && $peakUsage > $limit && $event->request->is($patterns) && ! $event->request->is($ignorePatternsForPath)) {
                 $channel = Arr::get($options, 'channel', self::DEFAULT_CHANNEL);
                 $level = Arr::get($options, 'level', self::DEFAULT_LEVEL);
 

diff --git a/src/Listeners/LogSlowResponse.php b/src/Listeners/LogSlowResponse.php
@@ -17,12 +17,7 @@ class LogSlowResponse
     /**
      * Default paths where memory usage logging is enabled.
      */
-    private const DEFAULT_PATTERNS = ['*'];
-
-    /**
-     * Default slow response limit.
-     */
-    private const DEFAULT_SLOW_RESPONSE_LIMIT = 30;
+    private const DEFAULT_PATTERNS = [];
 
     /**
      * Default log channel.
@@ -51,9 +46,9 @@ public function handle(RequestHandled $event)
         foreach (config('memory-usage.paths', []) as $options) {
             $patterns = Arr::get($options, 'patterns', self::DEFAULT_PATTERNS);
             $ignorePatternsForPath = Arr::get($options, 'ignore_patterns', self::DEFAULT_IGNORE_PATTERNS);
-            $slowResponseLimit = Arr::get($options, 'slow_response_limit', self::DEFAULT_SLOW_RESPONSE_LIMIT);
+            $slowResponseLimit = Arr::get($options, 'slow_response_limit');
 
-            if ($responseTime > $slowResponseLimit && $event->request->is($patterns) && ! $event->request->is($ignorePatternsForPath)) {
+            if (! is_null($slowResponseLimit) && $responseTime > $slowResponseLimit && $event->request->is($patterns) && ! $event->request->is($ignorePatternsForPath)) {
                 $channel = Arr::get($options, 'channel', self::DEFAULT_CHANNEL);
                 $level = Arr::get($options, 'level', self::DEFAULT_LEVEL);
 

diff --git a/tests/Feature/MemoryUsageTest.php b/tests/Feature/MemoryUsageTest.php
@@ -3,6 +3,7 @@
 namespace audunru\MemoryUsage\Tests\Feature;
 
 use audunru\MemoryUsage\Helpers\MemoryHelper;
+use audunru\MemoryUsage\Helpers\TimeHelper;
 use audunru\MemoryUsage\Tests\TestCase;
 use Illuminate\Log\Logger;
 use Illuminate\Support\Facades\Log;
@@ -60,6 +61,11 @@ protected function setUp(): void
                 'ignore*',
             ],
         ]);
+
+        $this->mock(TimeHelper::class, function (MockInterface $mock) {
+            $mock->shouldReceive('getResponseTime')
+                ->andReturn(1000);
+        });
     }
 
     public function testItLogsWarningToDefaultChannel()

diff --git a/tests/Feature/SlowResponseTest.php b/tests/Feature/SlowResponseTest.php
@@ -20,30 +20,27 @@ protected function setUp(): void
                 [
                     'patterns'            => ['include*'],
                     'ignore_patterns'     => ['include/higher*', 'include/lower*'],
-                    'limit'               => 10,
                     'slow_response_limit' => 3,
                     'channel'             => null,
                     'level'               => 'warning',
                 ],
                 [
                     'patterns'            => ['include/higher'],
                     'ignore_patterns'     => [],
-                    'limit'               => 10,
                     'slow_response_limit' => 15,
                     'channel'             => null,
                     'level'               => 'warning',
                 ],
                 [
                     'patterns'            => ['include/lower'],
                     'ignore_patterns'     => [],
-                    'limit'               => 10,
                     'slow_response_limit' => 1,
                     'channel'             => null,
                     'level'               => 'warning',
                 ],
                 [
                     'patterns'            => ['include*'],
-                    'limit'               => 10,
+                    'ignore_patterns'     => [],
                     'slow_response_limit' => 30,
                     'channel'             => 'slack',
                     'level'               => 'emergency',
@@ -54,10 +51,9 @@ protected function setUp(): void
             ],
         ]);
 
-        // Exclude memory usage logging when testing slow responses
         $this->mock(MemoryHelper::class, function (MockInterface $mock) {
             $mock->shouldReceive('getPeakUsage')
-                ->andReturn(0);
+                ->andReturn(1000);
         });
     }