Merge a34d8e7 into 838e222

CHANGES.md

@@ -36,6 +36,7 @@ Release Notes.
 * Add the sampling config file into the `profiling ebpf create network` sub-command by @mrproliu in https://github.com/apache/skywalking-cli/pull/171
 * Add the sub-command `profiling continuous` for adapt the new continuous profiling API by @mrproliu in https://github.com/apache/skywalking-cli/pull/173
 * 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
 
 0.10.0
 ------------------

assets/assets_test.go

@@ -49,6 +49,8 @@ query ($endpointId:ID!, $duration: Duration!) {
             source
             target
             detectPoints
+            sourceComponents
+            targetComponents
         }
     }
 }

assets/graphqls/dependency/EndpointDependency.graphql

@@ -30,6 +30,8 @@ query ($endpointId:ID!, $duration: Duration!) {
             source
             target
             detectPoints
+            sourceComponents
+            targetComponents
         }
     }
 }

assets/graphqls/dependency/InstanceTopology.graphql

@@ -30,6 +30,8 @@ query ($clientServiceId: ID!, $serverServiceId: ID!, $duration: Duration!) {
             source
             detectPoints
             target
+            sourceComponents
+            targetComponents
         }
     }
 }

assets/graphqls/dependency/ServiceTopology.graphql

@@ -28,6 +28,8 @@ query ($serviceId: ID!, $duration: Duration!) {
             source
             detectPoints
             target
+            sourceComponents
+            targetComponents
         }
     }
 }

test/cases/basic/expected/dependency-instance.yml

@@ -31,9 +31,11 @@ nodes:
 calls:
   {{- contains .calls }}
 - source: {{ b64enc "consumer" }}.1_{{ b64enc "consumer1" }}
-  sourcecomponents: [ ]
+  sourcecomponents:
+    - Python
   target: {{ b64enc "provider" }}.1_{{ b64enc "provider1" }}
-  targetcomponents: [ ]
+  targetcomponents:
+    - Python
   id: {{ b64enc "consumer" }}.1_{{ b64enc "consumer1" }}-{{ b64enc "provider" }}.1_{{ b64enc "provider1" }}
   detectpoints:
     {{- contains .detectpoints }}

test/cases/basic/expected/dependency-service.yml

@@ -27,9 +27,11 @@ nodes:
 calls:
   {{- contains .calls }}
 - source: {{ b64enc "consumer" }}.1
-  sourcecomponents: [ ]
+  sourcecomponents:
+    - Python
   target: {{ b64enc "provider" }}.1
-  targetcomponents: [ ]
+  targetcomponents:
+    - Python
   id: {{ b64enc "consumer" }}.1-{{ b64enc "provider"}}.1
   detectpoints:
     - CLIENT