Correct boundary

laravel · Oct 9, 2023 · bb56dd6 · bb56dd6
1 parent 84139ac
commit bb56dd6
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/src/Queries/Exceptions.php b/src/Queries/Exceptions.php
@@ -37,7 +37,7 @@ public function __invoke(Interval $interval, string $orderBy): Collection
 
         return $this->connection()->table('pulse_exceptions')
             ->selectRaw('class, location, COUNT(*) AS count, MAX(date) AS last_occurrence')
-            ->where('date', '>=', $now->subSeconds((int) $interval->totalSeconds)->toDateTimeString())
+            ->where('date', '>', $now->subSeconds((int) $interval->totalSeconds)->toDateTimeString())
             ->groupBy('class', 'location')
             ->orderByDesc($orderBy)
             ->get();

diff --git a/src/Queries/Servers.php b/src/Queries/Servers.php
@@ -71,7 +71,7 @@ public function __invoke(Interval $interval): Collection
                     ->select(['server', 'cpu_percent', 'memory_used', 'date'])
                     // Divide the data into buckets.
                     ->selectRaw('FLOOR(UNIX_TIMESTAMP(CONVERT_TZ(`date`, ?, @@session.time_zone)) / ?) AS `bucket`', [$now->format('P'), $secondsPerPeriod])
-                    ->where('date', '>=', $now->ceilSeconds($interval->totalSeconds / $maxDataPoints)->subSeconds((int) $interval->totalSeconds)),
+                    ->where('date', '>', $now->ceilSeconds($interval->totalSeconds / $maxDataPoints)->subSeconds((int) $interval->totalSeconds)),
                 'grouped'
             )
             ->groupBy('server', 'bucket')

diff --git a/src/Queries/SlowJobs.php b/src/Queries/SlowJobs.php
@@ -36,7 +36,7 @@ public function __invoke(Interval $interval): Collection
 
         return $this->connection()->table('pulse_jobs')
             ->selectRaw('`job`, SUM(slow) as count, MAX(slowest) as slowest')
-            ->where('date', '>=', $now->subSeconds((int) $interval->totalSeconds)->toDateTimeString())
+            ->where('date', '>', $now->subSeconds((int) $interval->totalSeconds)->toDateTimeString())
             ->where('slow', '>', 0)
             ->groupBy('job')
             ->orderByDesc('slowest')

diff --git a/src/Queries/SlowOutgoingRequests.php b/src/Queries/SlowOutgoingRequests.php
@@ -36,7 +36,7 @@ public function __invoke(Interval $interval): Collection
 
         return $this->connection()->table('pulse_outgoing_requests')
             ->selectRaw('`uri`, COUNT(*) as count, MAX(duration) AS slowest')
-            ->where('date', '>=', $now->subSeconds((int) $interval->totalSeconds)->toDateTimeString())
+            ->where('date', '>', $now->subSeconds((int) $interval->totalSeconds)->toDateTimeString())
             ->where('duration', '>=', $this->config->get('pulse.slow_outgoing_request_threshold'))
             ->groupBy('uri')
             ->orderByDesc('slowest')

diff --git a/src/Queries/SlowQueries.php b/src/Queries/SlowQueries.php
@@ -36,7 +36,7 @@ public function __invoke(Interval $interval): Collection
 
         return $this->connection()->table('pulse_slow_queries')
             ->selectRaw('`sql`, COUNT(*) as count, MAX(duration) AS slowest')
-            ->where('date', '>=', $now->subSeconds((int) $interval->totalSeconds)->toDateTimeString())
+            ->where('date', '>', $now->subSeconds((int) $interval->totalSeconds)->toDateTimeString())
             ->groupBy('sql')
             ->orderByDesc('slowest')
             ->get();

diff --git a/src/Queries/SlowRoutes.php b/src/Queries/SlowRoutes.php
@@ -39,7 +39,7 @@ public function __invoke(Interval $interval): Collection
 
         return $this->connection()->table('pulse_requests')
             ->selectRaw('route, COUNT(*) as count, MAX(duration) AS slowest')
-            ->where('date', '>=', $now->subSeconds((int) $interval->totalSeconds)->toDateTimeString())
+            ->where('date', '>', $now->subSeconds((int) $interval->totalSeconds)->toDateTimeString())
             ->where('duration', '>=', $this->config->get('pulse.slow_endpoint_threshold'))
             ->groupBy('route')
             ->orderByDesc('slowest')

diff --git a/src/Queries/Usage.php b/src/Queries/Usage.php
@@ -44,7 +44,7 @@ public function __invoke(Interval $interval, string $type): Collection
                 fn (Builder $query) => $query->from('pulse_requests'))
             ->selectRaw('user_id, COUNT(*) as count')
             ->whereNotNull('user_id')
-            ->where('date', '>=', $now->subSeconds((int) $interval->totalSeconds)->toDateTimeString())
+            ->where('date', '>', $now->subSeconds((int) $interval->totalSeconds)->toDateTimeString())
             ->when($type === 'slow_endpoint_counts',
                 fn (Builder $query) => $query->where('duration', '>=', $this->config->get('pulse.slow_endpoint_threshold')))
             ->groupBy('user_id')

diff --git a/src/Recorders/CacheInteractions.php b/src/Recorders/CacheInteractions.php
@@ -67,7 +67,7 @@ protected function normalize(string $key): string
         foreach ($this->config->get('pulse.cache_keys') as $pattern => $replacement) {
             $normalized = preg_replace($pattern, $replacement, $key, count: $count);
 
-            if ($count > 0) {
+            if ($count > 0 && $normalized !== null) {
                 return $normalized;
             }
         }