From cfd67d81741c7a14c234f64919a7aebb6efecae8 Mon Sep 17 00:00:00 2001
From: Tim MacDonald <hello@timacdonald.me>
Date: Wed, 4 Mar 2026 10:28:35 +1100
Subject: [PATCH] Refactor agent ingest timer handling

---
 agent/build/agent.phar    | Bin 850903 -> 850661 bytes
 agent/build/signature.txt |   2 +-
 agent/src/Ingest.php      |  30 ++++++++++++++----------------
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/agent/build/agent.phar b/agent/build/agent.phar
index 02279700535fa457d258c61310870538b1a0344f..d6507e19fbbcd8a087976e5ccbd400e105605fc2 100755
GIT binary patch
delta 389
zcmccq-T3KO;|<PC0-vNA7#dnj(m^!mMExI|gP8*T*itgnQ;SO`*N2O5J{7Q)d3wP=
z7G7=_u%Jt7PGaTsi#n|0lX)U#rf;xf=bc<18h}%Y@bp*}Htxws!VF-hGKc5FnDyaj
zCO5RRPrvY%lZ^+-e2qy<WhS2wQ{BuH87(k*<up;D<ixz>)Es0b(;sf<l$xv%!p;qG
zEyQ7l(JXc_)8B_kPIutrV2APR!=<M`2;pLzZcxHvHu=H~sphSj?OQV$ftU%1nSq!E
zh*^P{4T#x+m;;D8ftU-3xwmi4<heD`<K3^zK_W}^lU9gdkdI(>;60@$x|Gdu-^2A^
zW#38)*aW(9xm>;SWm=HjinzrWJ8j-G3!Zx#Evz*6{qcgy+2PGgSr`}?+?{-#0Lspo
Av;Y7A

delta 556
zcmaF*)%f~%;|<PC0#9TZ7#dnj(n0k5+2(<pgP8*T_={8XQk+WD(o%~Y(@Ii{Hm?de
z!#rI;gN1eayf7AaVN_X{)SSf1=?#y#l%{Xk&%-<Uzmu>CngI|c7aws+OkR+{A%aDJ
z$n=k|xFx4g_{z*R-5`sFb@Kd>db-;vIXNNJ8r}1g7l!7FV)GBw$?~r3+>`CX7ENyu
zX6452abVcUO-^{nK3yS=g$)!wILw>x%_=%QU^@^0X8!Otf$3JeI87$U_bD`=%xFKE
z!3e}mK+FupEI`Z(#B4y!4#XTl%n8I?K+L`UWCqWbi5{)9W44RzbI-`R=IY|0big>Z
z?S#n2<IP|Cx^6g^a=1Pad^j)o`l*vAm75-_=z29zw*9#vBRgtV9<#x<i3}$exU(=Y
KFt|JUIspLiX5ESa

diff --git a/agent/build/signature.txt b/agent/build/signature.txt
index 2b8bda11..9da1af64 100644
--- a/agent/build/signature.txt
+++ b/agent/build/signature.txt
@@ -1 +1 @@
-859B5CB714BE47686CD645444022C0336586C814B1C783F48E8AD843750845E011E19E53D7CAC9C92382E1242D4A83933DF9A0686B5A9A6E0330D69100C8A047
+EEFAD35214A42F62A817D01F5805400DCA2E15A50631BEE1AFF51DED19103C51460A44D5D4F496521EA85EA3D1893CEF0311CEE55B13229DEFC770936B5783A5
diff --git a/agent/src/Ingest.php b/agent/src/Ingest.php
index 6c48501a..f579f081 100644
--- a/agent/src/Ingest.php
+++ b/agent/src/Ingest.php
@@ -30,7 +30,7 @@ class Ingest
      */
     private array $concurrentRequests = [];
 
-    private ?TimerInterface $sendBufferAfterDelayTimer = null;
+    private ?TimerInterface $digestDelayTimer = null;
 
     private StreamBuffer|NullBuffer $buffer;
 
@@ -59,11 +59,7 @@ public function __construct(
     public function write(string $payload): void
     {
         if ($this->buffer->isNotEmpty() && $this->buffer->willExceedThresholdWith($payload)) {
-            if ($this->sendBufferAfterDelayTimer !== null) {
-                $this->loop->cancelTimer($this->sendBufferAfterDelayTimer);
-
-                $this->sendBufferAfterDelayTimer = null;
-            }
+            $this->cancelDigestDelay();
 
             $this->digest();
         }
@@ -71,16 +67,12 @@ public function write(string $payload): void
         $this->buffer->write($payload);
 
         if ($this->buffer->reachedThreshold()) {
-            if ($this->sendBufferAfterDelayTimer !== null) {
-                $this->loop->cancelTimer($this->sendBufferAfterDelayTimer);
-
-                $this->sendBufferAfterDelayTimer = null;
-            }
+            $this->cancelDigestDelay();
 
             $this->digest();
         } elseif ($this->buffer->isNotEmpty()) {
-            $this->sendBufferAfterDelayTimer ??= $this->loop->addTimer($this->maxBufferDurationInSeconds, function () {
-                $this->sendBufferAfterDelayTimer = null;
+            $this->digestDelayTimer ??= $this->loop->addTimer($this->maxBufferDurationInSeconds, function () {
+                $this->digestDelayTimer = null;
 
                 $this->digest();
             });
@@ -92,9 +84,7 @@ public function write(string $payload): void
      */
     public function forceDigest(): PromiseInterface
     {
-        if ($this->sendBufferAfterDelayTimer !== null) {
-            $this->loop->cancelTimer($this->sendBufferAfterDelayTimer);
-        }
+        $this->cancelDigestDelay();
 
         if ($this->buffer->isNotEmpty()) {
             $this->digest();
@@ -233,4 +223,12 @@ private function parseResponse(ResponseInterface $response): array
             $refreshIn,
         ];
     }
+
+    private function cancelDigestDelay(): void
+    {
+        if ($this->digestDelayTimer !== null) {
+            $this->loop->cancelTimer($this->digestDelayTimer);
+            $this->digestDelayTimer = null;
+        }
+    }
 }