考虑特殊情况下 sessionid 获取不到的情况

cli.go

@@ -89,7 +89,7 @@ func parseFromCmd(cfg *model.Configure) {
 func cli(cfg *model.Configure) {
 	defer func() {
 		if err := recover(); err != nil {
-			log.Run().Errorf("cli panic %+v", err)
+			log.Error().Errorf("cli panic %+v", err)
 		}
 	}()
 	log.Run().Infof("cpu count %d proc %d", runtime.NumCPU(), runtime.NumCPU()*2)

client/codec.go

@@ -36,7 +36,7 @@ func (p *PacketCodec) Read(session getty.Session, data []byte) (interface{}, int
 
 	frameLen, err := common.ReadInt32(reader)
 	if err != nil {
-		log.Run().Errorf("[PacketCodec] frameLen error %+v", err)
+		log.Error().Errorf("[PacketCodec] frameLen error %+v", err)
 		return nil, 0, err
 	}
 
@@ -51,7 +51,7 @@ func (p *PacketCodec) Read(session getty.Session, data []byte) (interface{}, int
 	// type
 	msgType, err := common.ReadByte(reader)
 	if err != nil {
-		log.Run().Errorf("[PacketCodec] read type error %+v", err)
+		log.Error().Errorf("[PacketCodec] read type error %+v", err)
 		return nil, 0, err
 	}
 
@@ -63,7 +63,7 @@ func (p *PacketCodec) Read(session getty.Session, data []byte) (interface{}, int
 	// num
 	pack.SerialNumber, err = common.ReadInt64(reader)
 	if err != nil {
-		log.Run().Errorf("[PacketCodec] read num error %+v", err)
+		log.Error().Errorf("[PacketCodec] read num error %+v", err)
 		return nil, len(data), nil
 	}
 
@@ -72,13 +72,13 @@ func (p *PacketCodec) Read(session getty.Session, data []byte) (interface{}, int
 	// extra size
 	extraSize, err := common.ReadByte(reader)
 	if err != nil {
-		log.Run().Errorf("[PacketCodec] read extra size error  %+v", err)
+		log.Error().Errorf("[PacketCodec] read extra size error  %+v", err)
 		return nil, len(data), nil
 	}
 
 	extra, err := common.ReadN(int(extraSize), reader)
 	if err != nil {
-		log.Run().Errorf("[PacketCodec] read extra error  %+v", err)
+		log.Error().Errorf("[PacketCodec] read extra error  %+v", err)
 		return nil, len(data), nil
 	}
 	pack.Extra = string(extra)
@@ -87,14 +87,14 @@ func (p *PacketCodec) Read(session getty.Session, data []byte) (interface{}, int
 	// dataFrame
 	dataSize := int(frameLen) - common.TypeSize - common.SerialNumberSize - common.ExtraSize - int(extraSize)
 	if dataSize < 0 {
-		log.Run().Errorf("[PacketCodec] read frameLen error  %+v", err)
+		log.Error().Errorf("[PacketCodec] read frameLen error  %+v", err)
 		return nil, len(data), common.ErrInvalidSize
 	}
 
 	if dataSize > 0 {
 		data, err := common.ReadN(dataSize, reader)
 		if err != nil {
-			log.Run().Errorf("[PacketCodec] read data error %+v", err)
+			log.Error().Errorf("[PacketCodec] read data error %+v", err)
 			return nil, len(data), nil
 		}
 		pack.Data = data

client/event.go

@@ -31,13 +31,20 @@ func (client *Client) handleHeartbeat(session getty.Session) {
 
 func (client *Client) handleConnect(packet *protocol.MajoraPacket, session getty.Session) {
 	go func(packet *protocol.MajoraPacket, session getty.Session) {
+		defer func() {
+			if err := recover(); err != nil {
+				log.Error().Errorf("handleConnect panic %+v", err)
+			}
+		}()
 		m := decodeMap(packet.Data)
 		if len(m) <= 0 {
 			log.Error().Errorf("SN: %d -> get connect map failed", packet.SerialNumber)
-			client.closeVirtualConnection(session, packet.SerialNumber)
-			return
 		}
-		traceSession := trace.NewSession(m[trace.MajoraSessionName])
+		sessionId, ok := m[trace.MajoraSessionName]
+		if !ok {
+			log.Error().Errorf("SN: %d -> get sessionId failed", packet.SerialNumber)
+		}
+		traceSession := trace.NewSession(sessionId)
 		session.SetAttribute(trace.MajoraSessionName, traceSession)
 		traceSession.Recorder.RecordEvent(trace.ConnectEvent, "start handle connect")
 
@@ -93,6 +100,9 @@ func (client *Client) handleConnect(packet *protocol.MajoraPacket, session getty
 
 func decodeMap(data []byte) map[string]string {
 	result := make(map[string]string, 1)
+	if len(data) <= 0 {
+		return result
+	}
 	var headerSize int8
 	err := binary.Read(bytes.NewBuffer(data[:1]), binary.BigEndian, &headerSize)
 	data = data[1:]
@@ -124,10 +134,7 @@ func decodeMap(data []byte) map[string]string {
 
 func (client *Client) handleTransfer(packet *protocol.MajoraPacket, session getty.Session) {
 	go func(packet *protocol.MajoraPacket, session getty.Session) {
-		traceRecorder, err := trace.GetTraceRecorderFromSession(session)
-		if err != nil {
-			log.Run().Errorf("%s SerialNumber: %s", err.Error(), packet.SerialNumber)
-		}
+		traceRecorder := trace.GetTraceRecorderFromSession(session)
 		traceRecorder.RecordEvent(trace.TransferEvent, "receive transfer packet from natServer,need to be forward to target")
 
 		load, ok := client.connStore.Load(packet.SerialNumber)
@@ -165,10 +172,7 @@ func (client *Client) handleTransfer(packet *protocol.MajoraPacket, session gett
 
 func (client *Client) handleUpStream(conn *net.TCPConn, packet *protocol.MajoraPacket, session getty.Session) {
 	go func() {
-		traceRecorder, err := trace.GetTraceRecorderFromSession(session)
-		if err != nil {
-			log.Run().Errorf("%s SerialNumber: %s", err.Error(), packet.SerialNumber)
-		}
+		traceRecorder := trace.GetTraceRecorderFromSession(session)
 		traceRecorder.RecordEvent(trace.UpStreamEvent, fmt.Sprintf("SerialNumber:%d -> handleUpStream start", packet.SerialNumber))
 		log.Run().Debugf("[handleUpStream] %d-> handleUpStream start...", packet.SerialNumber)
 		for {
@@ -207,10 +211,7 @@ func (client *Client) handleUpStream(conn *net.TCPConn, packet *protocol.MajoraP
 
 func (client *Client) handleDisconnectMessage(session getty.Session, packet *protocol.MajoraPacket) {
 	go func() {
-		traceRecorder, err := trace.GetTraceRecorderFromSession(session)
-		if err != nil {
-			log.Run().Errorf("%s SerialNumber: %s", err.Error(), packet.SerialNumber)
-		}
+		traceRecorder := trace.GetTraceRecorderFromSession(session)
 		traceRecorder.RecordEvent(trace.DisconnectEvent, fmt.Sprintf("SN: %d start close session", packet.SerialNumber))
 		log.Run().Debugf("[handleDisconnectMessage] %d->session closesd %v", packet.SerialNumber, session.IsClosed())
 		if conn, ok := client.connStore.Load(packet.SerialNumber); ok {
@@ -247,10 +248,7 @@ func (client *Client) OnClose(natSession getty.Session, upStreamSession net.Conn
 			log.Error().Errorf("OnClose %+v", err)
 		}
 	}()
-	traceRecorder, err := trace.GetTraceRecorderFromSession(natSession)
-	if err != nil {
-		log.Run().Errorf("%s SerialNumber: %s", err.Error(), serialNumber)
-	}
+	traceRecorder := trace.GetTraceRecorderFromSession(natSession)
 	client.connStore.Delete(serialNumber)
 	_ = upStreamSession.Close()
 	client.closeVirtualConnection(natSession, serialNumber)
@@ -259,10 +257,7 @@ func (client *Client) OnClose(natSession getty.Session, upStreamSession net.Conn
 
 //closeVirtualConnection disconnect to server
 func (client *Client) closeVirtualConnection(session getty.Session, serialNumber int64) {
-	traceRecorder, err := trace.GetTraceRecorderFromSession(session)
-	if err != nil {
-		log.Run().Errorf("%s SerialNumber: %s", err.Error(), serialNumber)
-	}
+	traceRecorder := trace.GetTraceRecorderFromSession(session)
 
 	log.Run().Debugf("[closeVirtualConnection] %d->session closed %v", serialNumber, session.IsClosed())
 	if session.IsClosed() {

client/eventlistener.go

@@ -5,6 +5,7 @@ import (
 	"time"
 
 	"github.com/adamweixuan/getty"
+
 	"virjar.com/majora-go/common"
 	"virjar.com/majora-go/log"
 	"virjar.com/majora-go/protocol"
@@ -24,7 +25,7 @@ func (m *MajoraEventListener) OnOpen(session getty.Session) error {
 		log.Error().Errorf("register to server error %+v", err)
 		return err
 	}
-	log.Run().Infof("[OnOpen] registe to %s success", m.client.config.TunnelAddr)
+	log.Run().Infof("[OnOpen] register to %s success", m.client.config.TunnelAddr)
 	return nil
 }
 

trace/trace.go

 package trace
 
 import (
-	"errors"
 	"github.com/adamweixuan/getty"
 	"go.uber.org/zap"
 	"time"
@@ -15,6 +14,7 @@ var (
 	MajoraSessionName = "MajoraSession"
 	UpStreamEvent     = "UpStream"
 	DisconnectEvent   = "Disconnect"
+	sessionIdNop      = "session_id_not_set"
 )
 
 func init() {
@@ -128,16 +128,19 @@ type Session struct {
 }
 
 func NewSession(sessionId string) *Session {
+	if len(sessionId) == 0 {
+		sessionId = sessionIdNop
+	}
 	return &Session{
 		Recorder: AcquireRecorder(sessionId),
 	}
 }
 
-func GetTraceRecorderFromSession(session getty.Session) (Recorder, error) {
+func GetTraceRecorderFromSession(session getty.Session) Recorder {
 	majoraSession := session.GetAttribute(MajoraSessionName)
 	traceSession, ok := majoraSession.(*Session)
 	if !ok {
-		return nil, errors.New("Get trace session failed")
+		return NewSession(sessionIdNop).Recorder
 	}
-	return traceSession.Recorder, nil
+	return traceSession.Recorder
 }