调整：链路追踪End接受error参数，

farseer-go · Sep 16, 2024 · f2dc8c4 · f2dc8c4
1 parent 44f5d7d
commit f2dc8c4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/test/trace_test.go b/test/trace_test.go
@@ -55,7 +55,7 @@ func TestTrace(t *testing.T) {
 	iManager.TraceHand("").SetSql("", "", "", "", 0)
 	iManager.TraceHand("").SetHttpRequest("", nil, nil, "", "", 0)
 
-	iManager.EntryQueueConsumer("", "").End()
+	iManager.EntryQueueConsumer("", "").End(nil)
 	iManager.EntryQueueConsumer("", "").Ignore()
 	iManager.EntryQueueConsumer("", "").GetList()
 	iManager.EntryQueueConsumer("", "").GetAppInfo()

diff --git a/trace/emptyManager.go b/trace/emptyManager.go
@@ -6,7 +6,7 @@ type EmptyManager struct {
 func (*EmptyManager) EntryWebApi(domain string, path string, method string, contentType string, header map[string]string, requestIp string) ITraceContext {
 	return &emptyTraceContext{}
 }
-func (*EmptyManager) EntryWebSocket(domain string, path string, method string, contentType string, header map[string]string, requestIp string) ITraceContext {
+func (*EmptyManager) EntryWebSocket(domain string, path string, contentType string, header map[string]string, requestIp string) ITraceContext {
 	return &emptyTraceContext{}
 }
 
@@ -65,7 +65,7 @@ func (*emptyTraceContext) SetBody(requestBody string, statusCode int, responseBo
 func (*emptyTraceContext) GetTraceId() string                                              { return "" }
 func (*emptyTraceContext) GetTraceLevel() int                                              { return 0 }
 func (*emptyTraceContext) GetStartTs() int64                                               { return 0 }
-func (*emptyTraceContext) End()                                                            {}
+func (*emptyTraceContext) End(err error)                                                   {}
 func (*emptyTraceContext) Ignore()                                                         {}
 func (*emptyTraceContext) AddDetail(detail ITraceDetail)                                   {}
 func (*emptyTraceContext) GetList() []any {

diff --git a/trace/iManager.go b/trace/iManager.go
@@ -8,7 +8,7 @@ type IManager interface {
 	// EntryWebApi 创建webapi的链路追踪入口
 	EntryWebApi(domain string, path string, method string, contentType string, headerDictionary map[string]string, requestIp string) ITraceContext
 	// EntryWebSocket 创建WebSocket的链路追踪入口
-	EntryWebSocket(domain string, path string, method string, contentType string, header map[string]string, requestIp string) ITraceContext
+	EntryWebSocket(domain string, path string, contentType string, headerDictionary map[string]string, requestIp string) ITraceContext
 	// EntryMqConsumer 创建MQ消费入口
 	EntryMqConsumer(parentTraceId, parentAppName, server string, queueName string, routingKey string) ITraceContext
 	// EntryQueueConsumer 创建Queue消费入口

diff --git a/trace/iTraceContext.go b/trace/iTraceContext.go
@@ -2,7 +2,7 @@ package trace
 
 type ITraceContext interface {
 	// End 结束
-	End()
+	End(err error)
 	// SetBody 设置webapi的响应报文
 	SetBody(requestBody string, statusCode int, responseBody string)
 	// GetTraceId 获取traceId