pangolin_mirror/newt
1
0
Fork 0
mirror of https://github.com/fosrl/newt.git synced 2026-03-27 04:56:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(websocket): improve error type handling in connection establishment and ping monitoring

Browse Source
This commit is contained in:
Marc Schäfer
2025-10-08 08:14:04 +02:00
parent ae5129a7c7
commit fef9e8c76b
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
websocket/client.go
View File

@@ -20,6 +20,7 @@ import (
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
"context" "context"
"github.com/fosrl/newt/internal/telemetry" "github.com/fosrl/newt/internal/telemetry"
"go.opentelemetry.io/otel" "go.opentelemetry.io/otel"
) )
@@ -440,7 +441,7 @@ func (c *Client) establishConnection() error {
logger.Debug("WebSocket TLS certificate verification disabled via SKIP_TLS_VERIFY environment variable") logger.Debug("WebSocket TLS certificate verification disabled via SKIP_TLS_VERIFY environment variable")
} }
conn, _, err := dialer.DialContext(spanCtx, u.String(), nil) conn, _, err := dialer.DialContext(spanCtx, u.String(), nil)
lat := time.Since(start).Seconds() lat := time.Since(start).Seconds()
if err != nil { if err != nil {
telemetry.IncConnAttempt(context.Background(), "websocket", "failure") telemetry.IncConnAttempt(context.Background(), "websocket", "failure")
@@ -448,9 +449,9 @@ conn, _, err := dialer.DialContext(spanCtx, u.String(), nil)
telemetry.IncConnError(context.Background(), "websocket", etype) telemetry.IncConnError(context.Background(), "websocket", etype)
telemetry.ObserveWSConnectLatency(context.Background(), lat, "failure", etype) telemetry.ObserveWSConnectLatency(context.Background(), lat, "failure", etype)
// Map handshake-related errors to reconnect reasons where appropriate // Map handshake-related errors to reconnect reasons where appropriate
if etype == "tls" { if etype == "tls_handshake" {
telemetry.IncReconnect(context.Background(), c.config.ID, "client", telemetry.ReasonHandshakeError) telemetry.IncReconnect(context.Background(), c.config.ID, "client", telemetry.ReasonHandshakeError)
} else if etype == "timeout" { } else if etype == "dial_timeout" {
telemetry.IncReconnect(context.Background(), c.config.ID, "client", telemetry.ReasonTimeout) telemetry.IncReconnect(context.Background(), c.config.ID, "client", telemetry.ReasonTimeout)
} else { } else {
telemetry.IncReconnect(context.Background(), c.config.ID, "client", telemetry.ReasonError) telemetry.IncReconnect(context.Background(), c.config.ID, "client", telemetry.ReasonError)
@@ -563,10 +564,10 @@ func (c *Client) pingMonitor() {
return return
} }
c.writeMux.Lock() c.writeMux.Lock()
err := c.conn.WriteControl(websocket.PingMessage, []byte{}, time.Now().Add(c.pingTimeout)) err := c.conn.WriteControl(websocket.PingMessage, []byte{}, time.Now().Add(c.pingTimeout))
if err == nil { if err == nil {
telemetry.IncWSMessage(context.Background(), "out", "ping") telemetry.IncWSMessage(context.Background(), "out", "ping")
} }
c.writeMux.Unlock() c.writeMux.Unlock()
if err != nil { if err != nil {
// Check if we're shutting down before logging error and reconnecting // Check if we're shutting down before logging error and reconnecting