feat: support sync mode for tracemap

Author: taloric

server/querier/app/distributed_tracing/model/model.go

@@ -29,12 +29,6 @@ type TraceMap struct {
 }
 
 type FlowMap struct {
-	QueryCondition string            `json:"query_condition"`
-	TimeStart      int               `json:"time_start" binding:"required"`
-	TimeEnd        int               `json:"time_end" binding:"required"`
-	Debug          bool              `json:"debug"`
-	Regions        map[string]string `json:"regions" binding:"required"`
-	TopoFrame      TopoFrame         `json:"topo_frame,omitempty"`
-	Context        context.Context
-	OrgID          string
+	TraceMap
+	TopoFrame TopoFrame `json:"topo_frame,omitempty"`
 }

server/querier/app/distributed_tracing/router/tracemap.go

@@ -31,11 +31,12 @@ import (
 var log = logging.MustGetLogger("tracemap")
 
 func TraceMapRouter(e *gin.Engine, cfg *config.QuerierConfig, generator *tracemap.TraceMapGenerator) {
-	e.POST("/v1/trace_map", traceMap(cfg, generator))
+	e.POST("/v1/trace_map", traceMap(cfg, generator, false))
+	e.POST("/v1/trace_map/sync", traceMap(cfg, generator, true))
 	e.POST("/v1/flow_map", flowMap(cfg, generator))
 }
 
-func traceMap(cfg *config.QuerierConfig, generator *tracemap.TraceMapGenerator) gin.HandlerFunc {
+func traceMap(cfg *config.QuerierConfig, generator *tracemap.TraceMapGenerator, synchronous bool) gin.HandlerFunc {
 	return gin.HandlerFunc(func(c *gin.Context) {
 		var args model.TraceMap
 
@@ -48,10 +49,15 @@ func traceMap(cfg *config.QuerierConfig, generator *tracemap.TraceMapGenerator)
 		args.Context = c.Request.Context()
 		args.OrgID = c.Request.Header.Get(common.HEADER_KEY_X_ORG_ID)
 		c.Header("Content-Type", "application/json")
-		done := make(chan bool)
-		defer close(done)
-		go tracemap.TraceMap(args, cfg, c, done, generator)
-		<-done
+		// support synchronous mode default: async
+		if synchronous {
+			tracemap.TraceMapSync(args, cfg, c, generator)
+		} else {
+			done := make(chan bool)
+			defer close(done)
+			go tracemap.TraceMapAsync(args, cfg, c, done, generator)
+			<-done
+		}
 	})
 }
 

server/querier/app/distributed_tracing/service/tracemap/tracemap.go

@@ -22,11 +22,15 @@ import (
 	"github.com/deepflowio/deepflow/server/querier/config"
 )
 
-func TraceMap(args model.TraceMap, cfg *config.QuerierConfig, c *gin.Context, done chan bool, generator *TraceMapGenerator) {
+func TraceMapAsync(args model.TraceMap, cfg *config.QuerierConfig, c *gin.Context, done chan bool, generator *TraceMapGenerator) {
 	done <- true
 	return
 }
 
+func TraceMapSync(args model.TraceMap, cfg *config.QuerierConfig, c *gin.Context, generator *TraceMapGenerator) {
+	return
+}
+
 func FlowMap(args model.FlowMap, cfg *config.QuerierConfig, c *gin.Context, generator *TraceMapGenerator) {
 	return
 }