Merge pull request #405 from askuy/feature/slowlog20240625

add recover type
gotomicro · Jun 26, 2024 · c4e3af6 · c4e3af6
2 parents a2c0444 + 91849df
commit c4e3af6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/server/egin/interceptor.go b/server/egin/interceptor.go
@@ -232,6 +232,7 @@ func (c *Container) defaultServerInterceptor() gin.HandlerFunc {
 				stackInfo := stack(3)
 				fields = append(fields,
 					elog.FieldEvent(event),
+					elog.FieldType("recover"),
 					zap.ByteString("stack", stackInfo),
 					elog.FieldErrAny(rec),
 					elog.FieldCode(int32(ctx.Writer.Status())),

diff --git a/server/egin/interceptor_test.go b/server/egin/interceptor_test.go
@@ -48,7 +48,7 @@ func TestPanicInHandler(t *testing.T) {
 	n := strings.Index(string(logged), "{")
 	err1 := json.Unmarshal(logged[n:], &m)
 	assert.NoError(t, err1)
-	//assert.Contains(t, m["event"], `recover`)
+	assert.Contains(t, m["type"], `recover`)
 	assert.Contains(t, m["lv"], `error`)
 	assert.Contains(t, string(logged), "we have a panic")
 	assert.Contains(t, m["method"], `GET./recovery`)
@@ -93,6 +93,7 @@ func TestPanicInCustomHandler(t *testing.T) {
 	n := strings.Index(string(logged), "{")
 	err1 := json.Unmarshal(logged[n:], &m)
 	assert.NoError(t, err1)
+	assert.Equal(t, m["type"], `recover`)
 	assert.Equal(t, m["lv"], `error`)
 	assert.Equal(t, m["error"], panicMessage)
 	assert.Equal(t, m["method"], `GET./recovery`)

diff --git a/server/egrpc/interceptor.go b/server/egrpc/interceptor.go
@@ -251,6 +251,7 @@ func (c *Container) defaultUnaryServerInterceptor() grpc.UnaryServerInterceptor
 		// 此处必须使用defer来recover handler内部可能出现的panic
 		defer func() {
 			cost := time.Since(beg)
+			logType := ""
 			if rec := recover(); rec != nil {
 				switch recType := rec.(type) {
 				case error:
@@ -262,7 +263,7 @@ func (c *Container) defaultUnaryServerInterceptor() grpc.UnaryServerInterceptor
 				stack := make([]byte, 4096)
 				stack = stack[:runtime.Stack(stack, true)]
 				fields = append(fields, elog.FieldStack(stack))
-				event = "recover"
+				logType = "recover"
 				err = status.New(grpcCode.Internal, "panic recover, origin err: "+err.Error()).Err()
 			}
 
@@ -281,6 +282,9 @@ func (c *Container) defaultUnaryServerInterceptor() grpc.UnaryServerInterceptor
 
 			httpStatusCode := ecode.GrpcToHTTPStatusCode(spbStatus.Code())
 
+			if logType == "recover" {
+				fields = append(fields, elog.FieldType("recover"))
+			}
 			fields = append(fields,
 				elog.FieldKey("unary"),
 				elog.FieldCode(int32(spbStatus.Code())),