wip

Author: timacdonald

src/Recorders/Concerns/Throttling.php

@@ -5,17 +5,21 @@
 use Carbon\CarbonImmutable;
 use DateInterval;
 use Illuminate\Support\Facades\App;
+use Illuminate\Support\InteractsWithTime;
 use Laravel\Pulse\Events\IsolatedBeat;
 use Laravel\Pulse\Events\SharedBeat;
 use Laravel\Pulse\Support\CacheStoreResolver;
 
 trait Throttling
 {
+    use InteractsWithTime;
+
     /**
      * Determine if the recorder is ready to record another snapshot.
      */
     protected function throttle(DateInterval|int $interval, SharedBeat|IsolatedBeat $event, callable $callback, ?string $key = null): void
     {
+        // in-memory for shared beat.
         $key ??= static::class;
 
         if ($event instanceof SharedBeat) {
@@ -24,6 +28,8 @@ protected function throttle(DateInterval|int $interval, SharedBeat|IsolatedBeat
 
         $cache = App::make(CacheStoreResolver::class);
 
+        $key = 'laravel:pulse:throttle:'.$key;
+
         $lastRunAt = $cache->store()->get($key);
 
         if ($lastRunAt !== null && CarbonImmutable::createFromTimestamp($lastRunAt)->addSeconds($this->secondsUntil($interval))->isFuture()) {

src/Recorders/Servers.php

@@ -4,19 +4,17 @@
 
 use Carbon\CarbonInterval as Interval;
 use Illuminate\Config\Repository;
-use Illuminate\Support\InteractsWithTime;
 use Illuminate\Support\Str;
 use Laravel\Pulse\Events\SharedBeat;
 use Laravel\Pulse\Pulse;
-use Laravel\Pulse\Support\CacheStoreResolver;
 use RuntimeException;
 
 /**
  * @internal
  */
 class Servers
 {
-    use Concerns\Throttling, InteractsWithTime;
+    use Concerns\Throttling;
 
     /**
      * The events to listen for.
@@ -30,7 +28,6 @@ class Servers
      */
     public function __construct(
         protected Pulse $pulse,
-        protected CacheStoreResolver $cache,
         protected Repository $config
     ) {
         //
@@ -41,7 +38,7 @@ public function __construct(
      */
     public function record(SharedBeat $event): void
     {
-        $this->throttle(Interval::seconds(15), $event, function ($event) {
+        $this->throttle(15, $event, function ($event) {
             $server = $this->config->get('pulse.recorders.'.self::class.'.server_name');
             $slug = Str::slug($server);