diff --git a/common/middleware/trace.go b/common/middleware/trace.go
index 99d94227..84a32c80 100644
--- a/common/middleware/trace.go
+++ b/common/middleware/trace.go
@@ -20,7 +20,8 @@ func Trace() gin.HandlerFunc {
 		} else {
 			sp = opentracing.StartSpan(opName, opentracing.ChildOf(wireContext))
 		}
-		defer sp.Finish()
+		ctx.Set("traceSpan", sp)
 		ctx.Next()
+		sp.Finish()
 	}
 }