You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2023/03/10 06:52:09 UTC
[skywalking-cli] branch master updated: Add components in topology related query (#175)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-cli.git
The following commit(s) were added to refs/heads/master by this push:
new 9aa1e75 Add components in topology related query (#175)
9aa1e75 is described below
commit 9aa1e75af41407a8b85106cc6bc711ab937f6fb5
Author: mrproliu <74...@qq.com>
AuthorDate: Fri Mar 10 14:52:04 2023 +0800
Add components in topology related query (#175)
---
CHANGES.md | 1 +
assets/assets_test.go | 2 ++
assets/graphqls/dependency/EndpointDependency.graphql | 2 ++
assets/graphqls/dependency/InstanceTopology.graphql | 2 ++
assets/graphqls/dependency/ServiceTopology.graphql | 2 ++
test/cases/basic/expected/dependency-instance.yml | 6 ++++--
test/cases/basic/expected/dependency-service.yml | 6 ++++--
7 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 1643045..97c1671 100644
--- a/CHANGES.md
+++ b/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
------------------
diff --git a/assets/assets_test.go b/assets/assets_test.go
index 6b87025..05629f4 100644
--- a/assets/assets_test.go
+++ b/assets/assets_test.go
@@ -49,6 +49,8 @@ query ($endpointId:ID!, $duration: Duration!) {
source
target
detectPoints
+ sourceComponents
+ targetComponents
}
}
}
diff --git a/assets/graphqls/dependency/EndpointDependency.graphql b/assets/graphqls/dependency/EndpointDependency.graphql
index 6db3336..28cfbd0 100644
--- a/assets/graphqls/dependency/EndpointDependency.graphql
+++ b/assets/graphqls/dependency/EndpointDependency.graphql
@@ -30,6 +30,8 @@ query ($endpointId:ID!, $duration: Duration!) {
source
target
detectPoints
+ sourceComponents
+ targetComponents
}
}
}
diff --git a/assets/graphqls/dependency/InstanceTopology.graphql b/assets/graphqls/dependency/InstanceTopology.graphql
index b52ff99..0b96c8f 100644
--- a/assets/graphqls/dependency/InstanceTopology.graphql
+++ b/assets/graphqls/dependency/InstanceTopology.graphql
@@ -30,6 +30,8 @@ query ($clientServiceId: ID!, $serverServiceId: ID!, $duration: Duration!) {
source
detectPoints
target
+ sourceComponents
+ targetComponents
}
}
}
diff --git a/assets/graphqls/dependency/ServiceTopology.graphql b/assets/graphqls/dependency/ServiceTopology.graphql
index bc08f0e..590171e 100644
--- a/assets/graphqls/dependency/ServiceTopology.graphql
+++ b/assets/graphqls/dependency/ServiceTopology.graphql
@@ -28,6 +28,8 @@ query ($serviceId: ID!, $duration: Duration!) {
source
detectPoints
target
+ sourceComponents
+ targetComponents
}
}
}
diff --git a/test/cases/basic/expected/dependency-instance.yml b/test/cases/basic/expected/dependency-instance.yml
index f889dfa..806149e 100644
--- a/test/cases/basic/expected/dependency-instance.yml
+++ b/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 }}
diff --git a/test/cases/basic/expected/dependency-service.yml b/test/cases/basic/expected/dependency-service.yml
index ef6ca45..7bcb353 100644
--- a/test/cases/basic/expected/dependency-service.yml
+++ b/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