add handler recorder

handler/tunnel/handler.go

@@ -13,13 +13,13 @@ import (
 	"github.com/go-gost/core/listener"
 	"github.com/go-gost/core/logger"
 	md "github.com/go-gost/core/metadata"
-	"github.com/go-gost/core/recorder"
 	"github.com/go-gost/core/service"
 	"github.com/go-gost/relay"
 	ctxvalue "github.com/go-gost/x/ctx"
 	xnet "github.com/go-gost/x/internal/net"
 	limiter_util "github.com/go-gost/x/internal/util/limiter"
 	stats_util "github.com/go-gost/x/internal/util/stats"
+	rate_limiter "github.com/go-gost/x/limiter/rate"
 	xrecorder "github.com/go-gost/x/recorder"
 	"github.com/go-gost/x/registry"
 	xservice "github.com/go-gost/x/service"
@@ -32,7 +32,6 @@ var (
 	ErrTunnelID           = errors.New("invalid tunnel ID")
 	ErrTunnelNotAvailable = errors.New("tunnel not available")
 	ErrUnauthorized       = errors.New("unauthorized")
-	ErrRateLimit          = errors.New("rate limiting exceeded")
 )
 
 func init() {
@@ -40,17 +39,16 @@ func init() {
 }
 
 type tunnelHandler struct {
-	id       string
-	options  handler.Options
-	pool     *ConnectorPool
-	recorder recorder.Recorder
-	epSvc    service.Service
-	ep       *entrypoint
-	md       metadata
-	log      logger.Logger
-	stats    *stats_util.HandlerStats
-	limiter  traffic.TrafficLimiter
-	cancel   context.CancelFunc
+	id      string
+	options handler.Options
+	pool    *ConnectorPool
+	epSvc   service.Service
+	ep      *entrypoint
+	md      metadata
+	log     logger.Logger
+	stats   *stats_util.HandlerStats
+	limiter traffic.TrafficLimiter
+	cancel  context.CancelFunc
 }
 
 func NewHandler(opts ...handler.Option) handler.Handler {
@@ -79,19 +77,11 @@ func (h *tunnelHandler) Init(md md.Metadata) (err error) {
 		"node": h.id,
 	})
 
-	if opts := h.options.Router.Options(); opts != nil {
-		for _, ro := range opts.Recorders {
-			if ro.Record == xrecorder.RecorderServiceHandlerTunnel {
-				h.recorder = ro.Recorder
-				break
-			}
-		}
-	}
-
 	h.pool = NewConnectorPool(h.id, h.md.sd)
 
 	h.ep = &entrypoint{
 		node:    h.id,
+		service: h.options.Service,
 		pool:    h.pool,
 		ingress: h.md.ingress,
 		sd:      h.md.sd,
@@ -103,6 +93,13 @@ func (h *tunnelHandler) Init(md md.Metadata) (err error) {
 		return
 	}
 
+	for _, ro := range h.options.Recorders {
+		if ro.Record == xrecorder.RecorderServiceHandler {
+			h.ep.recorder = ro
+			break
+		}
+	}
+
 	ctx, cancel := context.WithCancel(context.Background())
 	h.cancel = cancel
 
@@ -174,6 +171,7 @@ func (h *tunnelHandler) Handle(ctx context.Context, conn net.Conn, opts ...handl
 	log := h.log.WithFields(map[string]any{
 		"remote": conn.RemoteAddr().String(),
 		"local":  conn.LocalAddr().String(),
+		"sid":    ctxvalue.SidFromContext(ctx),
 	})
 
 	log.Infof("%s <> %s", conn.RemoteAddr(), conn.LocalAddr())
@@ -188,7 +186,7 @@ func (h *tunnelHandler) Handle(ctx context.Context, conn net.Conn, opts ...handl
 	}()
 
 	if !h.checkRateLimit(conn.RemoteAddr()) {
-		return ErrRateLimit
+		return rate_limiter.ErrRateLimit
 	}
 
 	if h.md.readTimeout > 0 {