feat: add RTT tracking and first-PING delay to NatsClient
This commit is contained in:
@@ -168,6 +168,7 @@ public enum SortOpt
|
||||
ByLast,
|
||||
ByIdle,
|
||||
ByUptime,
|
||||
ByRtt,
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
@@ -30,6 +30,7 @@ public sealed class ConnzHandler(NatsServer server)
|
||||
SortOpt.ByLast => connInfos.OrderByDescending(c => c.LastActivity).ToList(),
|
||||
SortOpt.ByIdle => connInfos.OrderByDescending(c => now - c.LastActivity).ToList(),
|
||||
SortOpt.ByUptime => connInfos.OrderByDescending(c => now - c.Start).ToList(),
|
||||
SortOpt.ByRtt => connInfos.OrderBy(c => c.Rtt).ToList(),
|
||||
_ => connInfos.OrderBy(c => c.Cid).ToList(),
|
||||
};
|
||||
|
||||
@@ -73,6 +74,7 @@ public sealed class ConnzHandler(NatsServer server)
|
||||
Reason = client.CloseReason.ToReasonString(),
|
||||
TlsVersion = client.TlsState?.TlsVersion ?? "",
|
||||
TlsCipherSuite = client.TlsState?.CipherSuite ?? "",
|
||||
Rtt = client.Rtt == TimeSpan.Zero ? "" : $"{client.Rtt.TotalMilliseconds:F3}ms",
|
||||
};
|
||||
|
||||
if (opts.Subscriptions)
|
||||
@@ -116,6 +118,7 @@ public sealed class ConnzHandler(NatsServer server)
|
||||
"last" => SortOpt.ByLast,
|
||||
"idle" => SortOpt.ByIdle,
|
||||
"uptime" => SortOpt.ByUptime,
|
||||
"rtt" => SortOpt.ByRtt,
|
||||
_ => SortOpt.ByCid,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -73,6 +73,11 @@ public sealed class NatsClient : IDisposable
|
||||
private int _pingsOut;
|
||||
private long _lastIn;
|
||||
|
||||
// RTT tracking
|
||||
private long _rttStartTicks;
|
||||
private long _rtt;
|
||||
public TimeSpan Rtt => new(Interlocked.Read(ref _rtt));
|
||||
|
||||
public TlsConnectionState? TlsState { get; set; }
|
||||
public bool InfoAlreadySent { get; set; }
|
||||
|
||||
@@ -321,6 +326,14 @@ public sealed class NatsClient : IDisposable
|
||||
|
||||
case CommandType.Pong:
|
||||
Interlocked.Exchange(ref _pingsOut, 0);
|
||||
var rttStart = Interlocked.Read(ref _rttStartTicks);
|
||||
if (rttStart > 0)
|
||||
{
|
||||
var elapsed = DateTime.UtcNow.Ticks - rttStart;
|
||||
if (elapsed <= 0) elapsed = 1; // min 1 tick for Windows granularity
|
||||
Interlocked.Exchange(ref _rtt, elapsed);
|
||||
}
|
||||
_flags.SetFlag(ClientFlags.FirstPongSent);
|
||||
break;
|
||||
|
||||
case CommandType.Sub:
|
||||
@@ -611,6 +624,13 @@ public sealed class NatsClient : IDisposable
|
||||
{
|
||||
while (await timer.WaitForNextTickAsync(ct))
|
||||
{
|
||||
// Delay first PING until client has responded with PONG or 2 seconds elapsed
|
||||
if (!_flags.HasFlag(ClientFlags.FirstPongSent)
|
||||
&& (DateTime.UtcNow - StartTime).TotalSeconds < 2)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
var elapsed = Environment.TickCount64 - Interlocked.Read(ref _lastIn);
|
||||
if (elapsed < (long)_options.PingInterval.TotalMilliseconds)
|
||||
{
|
||||
@@ -629,6 +649,7 @@ public sealed class NatsClient : IDisposable
|
||||
var currentPingsOut = Interlocked.Increment(ref _pingsOut);
|
||||
_logger.LogDebug("Client {ClientId} sending PING ({PingsOut}/{MaxPingsOut})",
|
||||
Id, currentPingsOut, _options.MaxPingsOut);
|
||||
Interlocked.Exchange(ref _rttStartTicks, DateTime.UtcNow.Ticks);
|
||||
WriteProtocol(NatsProtocol.PingBytes);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user