feat: add coderd_api_websocket_probes_total metric (#25012)

Relates to CODAGT-115

Adds metric `coderd_api_websocket_probes_total`. Every successful
heartbeat for a given path will increment the metric.

Comparing this with `coderd_api_concurrent_websockets` will give an
indication of how many websocket connections are open but in a 'wedged'
state (when heartbeats stopped versus when we closed the connection).
This commit is contained in:
Cian Johnston
2026-06-03 10:46:07 +01:00
committed by GitHub
parent 7703e7a26e
commit 8b058dc949
22 changed files with 596 additions and 171 deletions
+103 -39
View File
@@ -15,20 +15,70 @@ import (
const HeartbeatInterval time.Duration = 15 * time.Second
// HeartbeatClose loops to ping a WebSocket to keep it alive.
// It calls `exit` on ping failure.
func HeartbeatClose(ctx context.Context, logger slog.Logger, exit func(), conn *websocket.Conn) {
heartbeatCloseWith(ctx, logger, exit, conn, quartz.NewReal(), HeartbeatInterval)
// ProbeResult classifies the outcome of a single WebSocket liveness
// probe so that callers (typically a Prometheus recorder) can track
// successes and the various failure modes independently.
type ProbeResult string
const (
ProbeOK ProbeResult = "ok"
ProbeTimeout ProbeResult = "timeout"
ProbePeerClosed ProbeResult = "peer_closed"
ProbeCanceled ProbeResult = "canceled"
ProbeError ProbeResult = "error"
)
// ProbeRecorder is called once per liveness probe with its outcome.
// It may be nil, in which case probes are still run but not recorded.
type ProbeRecorder func(ctx context.Context, result ProbeResult)
// PingCloser is the minimal interface for WebSocket liveness probing.
// *websocket.Conn satisfies this interface.
type PingCloser interface {
Ping(ctx context.Context) error
Close(code websocket.StatusCode, reason string) error
}
// HeartbeatCloseWithClock is like HeartbeatClose, but uses the provided
// clock so tests can drive heartbeat ticks deterministically.
func HeartbeatCloseWithClock(ctx context.Context, logger slog.Logger, exit func(), conn *websocket.Conn, clk quartz.Clock) {
heartbeatCloseWith(ctx, logger, exit, conn, clk, HeartbeatInterval)
// WSWatcher supervises WebSocket connections for liveness by
// periodically sending ping frames. On probe failure, the watcher
// closes the connection with StatusGoingAway and cancels the
// returned context; the caller owns closing the connection on
// normal teardown.
type WSWatcher struct {
rec ProbeRecorder
clk quartz.Clock
interval time.Duration
}
func heartbeatCloseWith(ctx context.Context, logger slog.Logger, exit func(), conn *websocket.Conn, clk quartz.Clock, interval time.Duration) {
ticker := clk.NewTicker(interval, "HeartbeatClose")
// NewWSWatcher creates a WSWatcher. Pass nil for rec when no
// recording is needed (e.g. agent-side code without a Prometheus
// registry).
func NewWSWatcher(clk quartz.Clock, rec ProbeRecorder) *WSWatcher {
return &WSWatcher{
rec: rec,
clk: clk,
interval: HeartbeatInterval,
}
}
// Watch supervises conn for liveness. The returned context is
// canceled when parent is canceled or when conn fails a probe.
// Watch closes conn on probe failure with StatusGoingAway; the
// caller owns close on normal teardown.
func (w *WSWatcher) Watch(parent context.Context, log slog.Logger, conn PingCloser) context.Context {
if w == nil {
panic("developer error: WSWatcher is nil")
}
ctx, cancel := context.WithCancel(parent)
go func() {
defer cancel()
w.supervise(ctx, log, conn)
}()
return ctx
}
func (w *WSWatcher) supervise(ctx context.Context, log slog.Logger, conn PingCloser) {
ticker := w.clk.NewTicker(w.interval, "WSWatcher")
defer ticker.Stop()
for {
@@ -37,39 +87,53 @@ func heartbeatCloseWith(ctx context.Context, logger slog.Logger, exit func(), co
return
case <-ticker.C:
}
err := pingWithTimeout(ctx, conn, interval)
if err != nil {
// These errors are all expected during normal connection
// teardown and should not be logged at error level:
// - context.DeadlineExceeded: client disconnected
// without sending a close frame.
// - context.Canceled: request context was canceled.
// - net.ErrClosed: connection was already closed by
// another goroutine (e.g. handler returned).
// - websocket.CloseError: a close frame was
// received or sent.
if errors.Is(err, context.DeadlineExceeded) ||
errors.Is(err, context.Canceled) ||
errors.Is(err, net.ErrClosed) ||
websocket.CloseStatus(err) != -1 {
logger.Debug(ctx, "heartbeat ping stopped", slog.Error(err))
} else {
logger.Error(ctx, "failed to heartbeat ping", slog.Error(err))
}
_ = conn.Close(websocket.StatusGoingAway, "Ping failed")
exit()
return
result, err := probe(ctx, conn, w.interval)
if w.rec != nil {
w.rec(ctx, result)
}
if result == ProbeOK {
continue
}
if result == ProbeError {
log.Error(ctx, "websocket probe failed", slog.Error(err))
} else {
log.Debug(ctx, "websocket probe stopped",
slog.F("result", string(result)), slog.Error(err))
}
_ = conn.Close(websocket.StatusGoingAway, "liveness probe failed")
return
}
}
func pingWithTimeout(ctx context.Context, conn *websocket.Conn, timeout time.Duration) error {
ctx, cancel := context.WithTimeout(ctx, timeout)
func probe(ctx context.Context, conn PingCloser, timeout time.Duration) (ProbeResult, error) {
pingCtx, cancel := context.WithTimeout(ctx, timeout)
defer cancel()
err := conn.Ping(ctx)
if err != nil {
return xerrors.Errorf("failed to ping: %w", err)
err := conn.Ping(pingCtx)
switch {
case err == nil:
return ProbeOK, nil
case errors.Is(err, context.Canceled):
return ProbeCanceled, err
case errors.Is(err, context.DeadlineExceeded):
return ProbeTimeout, err
case errors.Is(err, net.ErrClosed) || websocket.CloseStatus(err) != -1:
return ProbePeerClosed, err
default:
return ProbeError, xerrors.Errorf("ping: %w", err)
}
}
// HeartbeatClose is a legacy helper that pings conn in a loop and
// calls exit on failure. Callers that need metric recording should
// use WSWatcher directly.
func HeartbeatClose(ctx context.Context, logger slog.Logger, exit func(), conn *websocket.Conn) {
w := NewWSWatcher(quartz.NewReal(), nil)
watchCtx := w.Watch(ctx, logger, conn)
<-watchCtx.Done()
// Only call exit when the probe failed; if the parent context was
// canceled the caller is already shutting down.
if ctx.Err() == nil {
exit()
}
return nil
}