improve gin errors

jvexiau · Sep 23, 2020 · 824e28b · 824e28b
1 parent 5de8fd8
commit 824e28b
Showing 1 changed file with 12 additions and 29 deletions.
diff --git a/ginhttp/server.go b/ginhttp/server.go
@@ -118,37 +118,20 @@ func Middleware(tr opentracing.Tracer, options ...MWOption) gin.HandlerFunc {
 		// capture response in case of invalid response
 		blw := &bodyLogWriter{body: bytes.NewBufferString(""), ResponseWriter: c.Writer}
 		c.Writer = blw
+		c.Next()
 
-		defer func() {
-			panicErr := recover()
-			didPanic := panicErr != nil
-
-			if didPanic {
-				ext.Error.Set(sp, true)
-			}
-			sp.Finish()
-
-			ext.HTTPStatusCode.Set(sp, uint16(c.Writer.Status()))
-			if c.Writer.Status() >= http.StatusInternalServerError {
-				ext.Error.Set(sp, true)
-				if len(c.Errors) > 0 {
-					for _, err := range c.Errors {
-						ext.LogError(sp, err)
-					}
-				}
-			}
-
-			if opts.logResponse && c.Writer.Status() >= http.StatusBadRequest {
-				sp.SetTag("http.response", blw.body.String())
-			}
-			sp.Finish()
-
-			if didPanic {
-				panic(panicErr)
-			}
-		}()
+		ext.HTTPStatusCode.Set(sp, uint16(c.Writer.Status()))
+		if c.Writer.Status() >= http.StatusInternalServerError {
+			ext.Error.Set(sp, true)
+		}
 
-		c.Next()
+		if len(c.Errors) > 0 {
+			sp.SetTag("gin.errors", c.Errors.String())
+		}
 
+		if opts.logResponse && c.Writer.Status() >= http.StatusBadRequest {
+			sp.SetTag("http.response", blw.body.String())
+		}
+		sp.Finish()
 	}
 }