Fix remaining reliability findings

2026-04-28 06:38:05 -04:00
parent b0041c5d18
commit 047d875fe6
8 changed files with 200 additions and 217 deletions
@@ -46,8 +46,8 @@ public sealed class EventStreamService(
            eventQueue.Writer,
            () =>
            {
-                int depth = Interlocked.Increment(ref streamQueueDepth);
-                metrics.SetGrpcEventStreamQueueDepth(depth);
+                Interlocked.Increment(ref streamQueueDepth);
+                metrics.AdjustGrpcEventStreamQueueDepth(1);
            },
            streamCts.Token);

@@ -55,8 +55,8 @@ public sealed class EventStreamService(
        {
            await foreach (MxEvent mxEvent in eventQueue.Reader.ReadAllAsync(cancellationToken).ConfigureAwait(false))
            {
-                int depth = Math.Max(0, Interlocked.Decrement(ref streamQueueDepth));
-                metrics.SetGrpcEventStreamQueueDepth(depth);
+                Interlocked.Decrement(ref streamQueueDepth);
+                metrics.AdjustGrpcEventStreamQueueDepth(-1);
                yield return mxEvent;
            }

@@ -66,9 +66,6 @@ public sealed class EventStreamService(
        {
            await streamCts.CancelAsync().ConfigureAwait(false);
            subscriber.Dispose();
-            Interlocked.Exchange(ref streamQueueDepth, 0);
-            metrics.SetGrpcEventStreamQueueDepth(0);
-            metrics.StreamDisconnected("Detached");

            try
            {
@@ -84,6 +81,14 @@ public sealed class EventStreamService(
                    "Event stream producer stopped for session {SessionId}.",
                    request.SessionId);
            }
+
+            int remainingDepth = Interlocked.Exchange(ref streamQueueDepth, 0);
+            if (remainingDepth > 0)
+            {
+                metrics.AdjustGrpcEventStreamQueueDepth(-remainingDepth);
+            }
+
+            metrics.StreamDisconnected("Detached");
        }
    }