Support sub-commands for the cross-thread trace profiling (#178)

Author: mrproliu

CHANGES.md

@@ -38,6 +38,7 @@ Release Notes.
 * Adapt the sub-command `metrics` for deprecate scope fron entity by @mrproliu in https://github.com/apache/skywalking-cli/pull/173
 * Add components in topology related sub-commands. @mrproliu in https://github.com/apache/skywalking-cli/pull/175
 * Add the sub-command `metrics nullable` for query the nullable metrics value. @mrproliu in https://github.com/apache/skywalking-cli/pull/176
+* Adapt the sub-command `profiling trace` for adapt the new trace profiling protocol. @mrproliu in https://github.com/apache/skywalking-cli/pull/177
 
 0.10.0
 ------------------

…ofiling/trace/GetTaskSegmentList.graphql …/trace/GetSegmentsProfileAnalyze.graphqlassets/graphqls/profiling/trace/GetTaskSegmentList.graphql renamed to assets/graphqls/profiling/trace/GetSegmentsProfileAnalyze.graphql assets/graphqls/profiling/trace/GetTaskSegmentList.graphql renamed to assets/graphqls/profiling/trace/GetSegmentsProfileAnalyze.graphql

@@ -15,13 +15,13 @@
 # specific language governing permissions and limitations
 # under the License.
 
-query ($taskId: String!) {
-    result: getProfileTaskSegmentList(taskID: $taskId) {
-        segmentId
-        endpointNames
-        duration
-        start
-        isError
-        traceIds
+query ($queries: [SegmentProfileAnalyzeQuery!]!) {
+    result: getSegmentsProfileAnalyze(queries: $queries) {
+        tip
+        trees {
+            elements {
+                id parentId codeSignature duration durationChildExcluded count
+            }
+        }
     }
-}
+}

…rofiling/trace/GetProfileAnalyze.graphql …filing/trace/GetTaskSegmentsList.graphqlassets/graphqls/profiling/trace/GetProfileAnalyze.graphql renamed to assets/graphqls/profiling/trace/GetTaskSegmentsList.graphql assets/graphqls/profiling/trace/GetProfileAnalyze.graphql renamed to assets/graphqls/profiling/trace/GetTaskSegmentsList.graphql

@@ -15,17 +15,39 @@
 # specific language governing permissions and limitations
 # under the License.
 
-query ($segmentId: String!, $timeRanges: [ProfileAnalyzeTimeRange!]!) {
-    result: getProfileAnalyze(segmentId: $segmentId, timeRanges: $timeRanges) {
-        trees {
-            elements {
-                id
-                parentId
-                codeSignature
-                duration
-                durationChildExcluded
-                count
+query ($taskId: ID!) {
+    result: getProfileTaskSegments(taskID: $taskId) {
+        traceId
+        instanceId
+        instanceName
+        endpointNames
+        duration
+        start
+        spans {
+            spanId
+            parentSpanId
+            segmentId
+            refs {
+                traceId parentSegmentId parentSpanId type
             }
+            serviceCode
+            serviceInstanceName
+            startTime
+            endTime
+            endpointName
+            type
+            peer
+            component
+            isError
+            layer
+            tags {
+                key value
+            }
+            logs {
+                time
+                data { key value }
+            }
+            profiled
         }
     }
-}
+}

internal/commands/profiling/trace/getProfileAnalyze.go

@@ -37,19 +37,20 @@ var getProfiledAnalyzeCommand = &cli.Command{
 	ArgsUsage: "[parameters...]",
 	Flags: []cli.Flag{
 		&cli.StringFlag{
-			Name:  "segment-id",
-			Usage: "profiled segment id.",
+			Name:  "segment-ids",
+			Usage: "profiled segment ids, multiple id split by ',': s1,s2",
 		},
 		&cli.StringFlag{
 			Name:  "time-ranges",
 			Usage: "need to analyze time ranges in the segment: start-end,start-end",
 		},
 	},
 	Action: func(ctx *cli.Context) error {
-		segmentID := ctx.String("segment-id")
+		segmentIDs := ctx.String("segment-ids")
+		segmentIDList := strings.Split(segmentIDs, ",")
 
 		tagStr := ctx.String("time-ranges")
-		var timeRanges []*api.ProfileAnalyzeTimeRange = nil
+		var queries []*api.SegmentProfileAnalyzeQuery = nil
 		if tagStr != "" {
 			tagArr := strings.Split(tagStr, ",")
 			for _, tag := range tagArr {
@@ -62,16 +63,25 @@ var getProfiledAnalyzeCommand = &cli.Command{
 				if err != nil {
 					return err
 				}
-				timeRanges = append(timeRanges, &api.ProfileAnalyzeTimeRange{Start: start, End: end})
+
+				// adding time range to each segments
+				for _, segmentID := range segmentIDList {
+					queries = append(queries, &api.SegmentProfileAnalyzeQuery{
+						SegmentID: segmentID,
+						TimeRange: &api.ProfileAnalyzeTimeRange{
+							Start: start, End: end,
+						},
+					})
+				}
 			}
 		}
 
-		analysis, err := profiling.GetTraceProfilingAnalyze(ctx, segmentID, timeRanges)
+		analysis, err := profiling.GetTraceProfilingAnalyze(ctx, queries)
 
 		if err != nil {
 			return err
 		}
 
-		return display.Display(ctx, &displayable.Displayable{Data: analysis, Condition: segmentID})
+		return display.Display(ctx, &displayable.Displayable{Data: analysis, Condition: segmentIDs})
 	},
 }

internal/commands/profiling/trace/getProfiledSegment.go

@@ -28,11 +28,11 @@ import (
 var getTaskSegmentListCommand = &cli.Command{
 	Name:    "segment-list",
 	Aliases: []string{"sl"},
-	Usage:   "Query profiling trace task segment list",
-	UsageText: `Query profiling trace task segment list
+	Usage:   "Query profiling trace task segments list",
+	UsageText: `Query profiling trace task segments list
 
 Examples:
-1. Query profiled segment list
+1. Query profiled segments list
 $ swctl profiling trace segment-list --service-name=service-name --endpoint-name=endpoint`,
 	Flags: []cli.Flag{
 		&cli.StringFlag{

internal/commands/profiling/trace/getTaskSegmentList.go

@@ -33,7 +33,6 @@ on https://github.com/apache/skywalking/blob/master/docs/en/guides/backend-profi
 		getTaskListCommand,
 		getTaskLogListCommand,
 		getTaskSegmentListCommand,
-		getProfiledSegmentCommand,
 		getProfiledAnalyzeCommand,
 	},
 }

internal/commands/profiling/trace/trace.go

@@ -62,34 +62,22 @@ func GetTraceProfilingTaskLogList(ctx *cli.Context, taskID string) ([]*api.Profi
 	return response["result"], err
 }
 
-func GetTraceProfilingTaskSegmentList(ctx *cli.Context, taskID string) ([]*api.BasicTrace, error) {
-	var response map[string][]*api.BasicTrace
+func GetTraceProfilingTaskSegmentList(ctx *cli.Context, taskID string) ([]*api.ProfiledTraceSegments, error) {
+	var response map[string][]*api.ProfiledTraceSegments
 
-	request := graphql.NewRequest(assets.Read("graphqls/profiling/trace/GetTaskSegmentList.graphql"))
+	request := graphql.NewRequest(assets.Read("graphqls/profiling/trace/GetTaskSegmentsList.graphql"))
 	request.Var("taskId", taskID)
 
 	err := client.ExecuteQuery(ctx, request, &response)
 
 	return response["result"], err
 }
 
-func GetTraceProfilingSegment(ctx *cli.Context, segmentID string) (api.ProfiledSegment, error) {
-	var response map[string]api.ProfiledSegment
-
-	request := graphql.NewRequest(assets.Read("graphqls/profiling/trace/GetProfiledSegment.graphql"))
-	request.Var("segmentId", segmentID)
-
-	err := client.ExecuteQuery(ctx, request, &response)
-
-	return response["result"], err
-}
-
-func GetTraceProfilingAnalyze(ctx *cli.Context, segmentID string, timeRanges []*api.ProfileAnalyzeTimeRange) (api.ProfileAnalyzation, error) {
+func GetTraceProfilingAnalyze(ctx *cli.Context, queries []*api.SegmentProfileAnalyzeQuery) (api.ProfileAnalyzation, error) {
 	var response map[string]api.ProfileAnalyzation
 
-	request := graphql.NewRequest(assets.Read("graphqls/profiling/trace/GetProfileAnalyze.graphql"))
-	request.Var("segmentId", segmentID)
-	request.Var("timeRanges", timeRanges)
+	request := graphql.NewRequest(assets.Read("graphqls/profiling/trace/GetSegmentsProfileAnalyze.graphql"))
+	request.Var("queries", queries)
 
 	err := client.ExecuteQuery(ctx, request, &response)