feat: better node metrics chart (#370)

Ehco1996 · Sep 2, 2024 · 22b6586 · 22b6586
1 parent 54e5279
commit 22b6586
Show file tree

Hide file tree

Showing 9 changed files with 492 additions and 397 deletions.
diff --git a/internal/conn/relay_conn.go b/internal/conn/relay_conn.go
@@ -64,12 +64,11 @@ type relayConnImpl struct {
 	EndTime   time.Time `json:"end_time,omitempty"`
 
 	// options set those fields
-	l                 *zap.SugaredLogger
-	remote            *lb.Node
-	HandshakeDuration time.Duration
-	RelayLabel        string `json:"relay_label"`
-	ConnType          string `json:"conn_type"`
-	Options           *conf.Options
+	l          *zap.SugaredLogger
+	remote     *lb.Node
+	RelayLabel string `json:"relay_label"`
+	ConnType   string `json:"conn_type"`
+	Options    *conf.Options
 }
 
 func WithRelayLabel(relayLabel string) RelayConnOption {
@@ -78,12 +77,6 @@ func WithRelayLabel(relayLabel string) RelayConnOption {
 	}
 }
 
-func WithHandshakeDuration(duration time.Duration) RelayConnOption {
-	return func(rci *relayConnImpl) {
-		rci.HandshakeDuration = duration
-	}
-}
-
 func WithConnType(connType string) RelayConnOption {
 	return func(rci *relayConnImpl) {
 		rci.ConnType = connType
@@ -93,6 +86,7 @@ func WithConnType(connType string) RelayConnOption {
 func WithRemote(remote *lb.Node) RelayConnOption {
 	return func(rci *relayConnImpl) {
 		rci.remote = remote
+		rci.Stats.HandShakeLatency = remote.HandShakeDuration
 	}
 }
 

diff --git a/internal/transporter/base.go b/internal/transporter/base.go
@@ -44,9 +44,6 @@ func newBaseRelayServer(cfg *conf.Config, cmgr cmgr.Cmgr) (*BaseRelayServer, err
 }
 
 func (b *BaseRelayServer) RelayTCPConn(ctx context.Context, c net.Conn, remote *lb.Node) error {
-	if remote == nil {
-		remote = b.remotes.Next().Clone()
-	}
 	metrics.CurConnectionCount.WithLabelValues(remote.Label, metrics.METRIC_CONN_TYPE_TCP).Inc()
 	defer metrics.CurConnectionCount.WithLabelValues(remote.Label, metrics.METRIC_CONN_TYPE_TCP).Dec()
 
@@ -66,15 +63,11 @@ func (b *BaseRelayServer) RelayTCPConn(ctx context.Context, c net.Conn, remote *
 		return fmt.Errorf("handshake error: %w", err)
 	}
 	defer rc.Close()
-
 	b.l.Infof("RelayTCPConn from %s to %s", c.LocalAddr(), remote.Address)
 	return b.handleRelayConn(c, rc, remote, metrics.METRIC_CONN_TYPE_TCP)
 }
 
 func (b *BaseRelayServer) RelayUDPConn(ctx context.Context, c net.Conn, remote *lb.Node) error {
-	if remote == nil {
-		remote = b.remotes.Next().Clone()
-	}
 	metrics.CurConnectionCount.WithLabelValues(remote.Label, metrics.METRIC_CONN_TYPE_UDP).Inc()
 	defer metrics.CurConnectionCount.WithLabelValues(remote.Label, metrics.METRIC_CONN_TYPE_UDP).Dec()
 
@@ -144,7 +137,6 @@ func (b *BaseRelayServer) handleRelayConn(c, rc net.Conn, remote *lb.Node, connT
 		conn.WithConnType(connType),
 		conn.WithRelayLabel(b.cfg.Label),
 		conn.WithRelayOptions(b.cfg.Options),
-		conn.WithHandshakeDuration(remote.HandShakeDuration),
 	}
 	relayConn := conn.NewRelayConn(c, rc, opts...)
 	if b.cmgr != nil {

diff --git a/internal/transporter/raw.go b/internal/transporter/raw.go
@@ -99,7 +99,7 @@ func (s *RawServer) ListenAndServe(ctx context.Context) error {
 		}
 		go func(c net.Conn) {
 			defer c.Close()
-			if err := s.RelayTCPConn(ctx, c, nil); err != nil {
+			if err := s.RelayTCPConn(ctx, c, s.remotes.Next()); err != nil {
 				s.l.Errorf("RelayTCPConn meet error: %s", err.Error())
 			}
 		}(c)
@@ -118,7 +118,7 @@ func (s *RawServer) listenUDP(ctx context.Context) error {
 			return err
 		}
 		go func() {
-			if err := s.RelayUDPConn(ctx, c, nil); err != nil {
+			if err := s.RelayUDPConn(ctx, c, s.remotes.Next()); err != nil {
 				s.l.Errorf("RelayUDPConn meet error: %s", err.Error())
 			}
 		}()

diff --git a/internal/transporter/ws.go b/internal/transporter/ws.go
@@ -98,6 +98,8 @@ func (s *WsServer) handleRequest(w http.ResponseWriter, req *http.Request) {
 	var remote *lb.Node
 	if addr := req.URL.Query().Get(conf.WS_QUERY_REMOTE_ADDR); addr != "" {
 		remote = &lb.Node{Address: addr, Label: addr}
+	} else {
+		remote = s.remotes.Next()
 	}
 
 	if req.URL.Query().Get("type") == "udp" {