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 2020/02/24 03:55:16 UTC
[skywalking] 01/01: 1. Format codes
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch multi-services-topo
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 2f99c8b6ee514b957e5acd7c887aa85d247d3cf0
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Mon Feb 24 11:54:52 2020 +0800
1. Format codes
2. Add comments for storage interface of topology
3. Narrow the scope of secondary query to get the component name. Only query the nodes as client out of the given service Ids.
---
.../oap/server/core/query/TopologyBuilder.java | 6 ++-
.../server/core/query/TopologyQueryService.java | 58 ++++++++++++++++------
.../core/storage/query/ITopologyQueryDAO.java | 56 +++++++++++++++++----
.../plugin/jdbc/h2/dao/H2TopologyQueryDAO.java | 4 +-
4 files changed, 93 insertions(+), 31 deletions(-)
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TopologyBuilder.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TopologyBuilder.java
index 5c6f51b..8aeb8ad 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TopologyBuilder.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TopologyBuilder.java
@@ -82,7 +82,8 @@ class TopologyBuilder {
nodes.put(target.getSequence(), buildNode(target));
if (BooleanUtils.valueToBoolean(target.getIsAddress())) {
nodes.get(target.getSequence())
- .setType(componentLibraryCatalogService.getServerNameBasedOnComponent(clientCall.getComponentId()));
+ .setType(
+ componentLibraryCatalogService.getServerNameBasedOnComponent(clientCall.getComponentId()));
}
}
@@ -129,7 +130,8 @@ class TopologyBuilder {
Node conjecturalNode = new Node();
conjecturalNode.setId(source.getSequence());
conjecturalNode.setName(source.getName());
- conjecturalNode.setType(componentLibraryCatalogService.getServerNameBasedOnComponent(serverCall.getComponentId()));
+ conjecturalNode.setType(
+ componentLibraryCatalogService.getServerNameBasedOnComponent(serverCall.getComponentId()));
conjecturalNode.setReal(true);
nodes.put(source.getSequence(), conjecturalNode);
}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TopologyQueryService.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TopologyQueryService.java
index e384d7c..fc4cb07 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TopologyQueryService.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/TopologyQueryService.java
@@ -90,30 +90,47 @@ public class TopologyQueryService implements Service {
}
public Topology getGlobalTopology(final Downsampling downsampling, final long startTB,
- final long endTB) throws IOException {
+ final long endTB) throws IOException {
logger.debug("Downsampling: {}, startTimeBucket: {}, endTimeBucket: {}", downsampling, startTB, endTB);
- List<Call.CallDetail> serviceRelationServerCalls = getTopologyQueryDAO().loadServerSideServiceRelations(downsampling, startTB, endTB);
- List<Call.CallDetail> serviceRelationClientCalls = getTopologyQueryDAO().loadClientSideServiceRelations(downsampling, startTB, endTB);
+ List<Call.CallDetail> serviceRelationServerCalls = getTopologyQueryDAO().loadServerSideServiceRelations(
+ downsampling, startTB, endTB);
+ List<Call.CallDetail> serviceRelationClientCalls = getTopologyQueryDAO().loadClientSideServiceRelations(
+ downsampling, startTB, endTB);
TopologyBuilder builder = new TopologyBuilder(moduleManager);
return builder.build(serviceRelationClientCalls, serviceRelationServerCalls);
}
public Topology getServiceTopology(final Downsampling downsampling, final long startTB, final long endTB,
- final int serviceId) throws IOException {
+ final int serviceId) throws IOException {
List<Integer> serviceIds = new ArrayList<>();
serviceIds.add(serviceId);
- List<Call.CallDetail> serviceRelationClientCalls = getTopologyQueryDAO().loadSpecifiedClientSideServiceRelations(downsampling, startTB, endTB, serviceIds);
- List<Call.CallDetail> serviceRelationServerCalls = getTopologyQueryDAO().loadSpecifiedServerSideServiceRelations(downsampling, startTB, endTB, serviceIds);
+ List<Call.CallDetail> serviceRelationClientCalls = getTopologyQueryDAO().loadSpecifiedClientSideServiceRelations(
+ downsampling, startTB, endTB, serviceIds);
+ List<Call.CallDetail> serviceRelationServerCalls = getTopologyQueryDAO().loadSpecifiedServerSideServiceRelations(
+ downsampling, startTB, endTB, serviceIds);
TopologyBuilder builder = new TopologyBuilder(moduleManager);
Topology topology = builder.build(serviceRelationClientCalls, serviceRelationServerCalls);
+ /**
+ * The topology built above is complete.
+ * There is a special case, there may be a node of the `serviceIds` call these services as and only as a client, so it is included in the topology,
+ * its component name could be missed as not being queried before. We add another query about this.
+ */
List<Integer> sourceServiceIds = new ArrayList<>();
- serviceRelationClientCalls.forEach(call -> sourceServiceIds.add(call.getSource()));
+ serviceRelationClientCalls.forEach(call -> {
+ // Client side relationships exclude the given services(#serviceIds)
+ // The given services(#serviceIds)'s component names have been included inside `serviceRelationServerCalls`
+ if (!serviceIds.contains(call.getSource())) {
+ sourceServiceIds.add(call.getSource());
+ }
+ });
if (CollectionUtils.isNotEmpty(sourceServiceIds)) {
- List<Call.CallDetail> sourceCalls = getTopologyQueryDAO().loadSpecifiedServerSideServiceRelations(downsampling, startTB, endTB, sourceServiceIds);
+ // If exist, query them as the server side to get the target's component.
+ List<Call.CallDetail> sourceCalls = getTopologyQueryDAO().loadSpecifiedServerSideServiceRelations(
+ downsampling, startTB, endTB, sourceServiceIds);
topology.getNodes().forEach(node -> {
if (Strings.isNullOrEmpty(node.getType())) {
for (Call.CallDetail call : sourceCalls) {
@@ -129,20 +146,29 @@ public class TopologyQueryService implements Service {
return topology;
}
- public ServiceInstanceTopology getServiceInstanceTopology(final int clientServiceId, final int serverServiceId,
- final Downsampling downsampling, final long startTB, final long endTB) throws IOException {
- logger.debug("ClientServiceId: {}, ServerServiceId: {}, Downsampling: {}, startTimeBucket: {}, endTimeBucket: {}", clientServiceId, serverServiceId, downsampling, startTB, endTB);
-
- List<Call.CallDetail> serviceInstanceRelationClientCalls = getTopologyQueryDAO().loadClientSideServiceInstanceRelations(clientServiceId, serverServiceId, downsampling, startTB, endTB);
- List<Call.CallDetail> serviceInstanceRelationServerCalls = getTopologyQueryDAO().loadServerSideServiceInstanceRelations(clientServiceId, serverServiceId, downsampling, startTB, endTB);
+ public ServiceInstanceTopology getServiceInstanceTopology(final int clientServiceId,
+ final int serverServiceId,
+ final Downsampling downsampling,
+ final long startTB,
+ final long endTB) throws IOException {
+ logger.debug(
+ "ClientServiceId: {}, ServerServiceId: {}, Downsampling: {}, startTimeBucket: {}, endTimeBucket: {}",
+ clientServiceId, serverServiceId, downsampling, startTB, endTB
+ );
+
+ List<Call.CallDetail> serviceInstanceRelationClientCalls = getTopologyQueryDAO().loadClientSideServiceInstanceRelations(
+ clientServiceId, serverServiceId, downsampling, startTB, endTB);
+ List<Call.CallDetail> serviceInstanceRelationServerCalls = getTopologyQueryDAO().loadServerSideServiceInstanceRelations(
+ clientServiceId, serverServiceId, downsampling, startTB, endTB);
ServiceInstanceTopologyBuilder builder = new ServiceInstanceTopologyBuilder(moduleManager);
return builder.build(serviceInstanceRelationClientCalls, serviceInstanceRelationServerCalls);
}
public Topology getEndpointTopology(final Downsampling downsampling, final long startTB, final long endTB,
- final int endpointId) throws IOException {
- List<Call.CallDetail> serverSideCalls = getTopologyQueryDAO().loadSpecifiedDestOfServerSideEndpointRelations(downsampling, startTB, endTB, endpointId);
+ final int endpointId) throws IOException {
+ List<Call.CallDetail> serverSideCalls = getTopologyQueryDAO().loadSpecifiedDestOfServerSideEndpointRelations(
+ downsampling, startTB, endTB, endpointId);
Topology topology = new Topology();
serverSideCalls.forEach(callDetail -> {
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/ITopologyQueryDAO.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/ITopologyQueryDAO.java
index 1f9689e..ba2618f 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/ITopologyQueryDAO.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/ITopologyQueryDAO.java
@@ -21,29 +21,63 @@ package org.apache.skywalking.oap.server.core.storage.query;
import java.io.IOException;
import java.util.List;
import org.apache.skywalking.oap.server.core.analysis.Downsampling;
+import org.apache.skywalking.oap.server.core.analysis.manual.relation.instance.ServiceInstanceRelationClientSideMetrics;
+import org.apache.skywalking.oap.server.core.analysis.manual.relation.instance.ServiceInstanceRelationServerSideMetrics;
+import org.apache.skywalking.oap.server.core.analysis.manual.relation.service.ServiceRelationClientSideMetrics;
+import org.apache.skywalking.oap.server.core.analysis.manual.relation.service.ServiceRelationServerSideMetrics;
import org.apache.skywalking.oap.server.core.query.entity.Call;
import org.apache.skywalking.oap.server.library.module.Service;
public interface ITopologyQueryDAO extends Service {
-
+ /**
+ * Query {@link ServiceRelationServerSideMetrics} through the given conditions
+ */
List<Call.CallDetail> loadSpecifiedServerSideServiceRelations(Downsampling downsampling, long startTB, long endTB,
- List<Integer> serviceIds) throws IOException;
+ List<Integer> serviceIds) throws IOException;
+ /**
+ * Query {@link ServiceRelationClientSideMetrics} through the given conditions
+ */
List<Call.CallDetail> loadSpecifiedClientSideServiceRelations(Downsampling downsampling, long startTB, long endTB,
- List<Integer> serviceIds) throws IOException;
+ List<Integer> serviceIds) throws IOException;
+ /**
+ * Query {@link ServiceRelationServerSideMetrics} globally, without given serviceIds
+ */
List<Call.CallDetail> loadServerSideServiceRelations(Downsampling downsampling, long startTB,
- long endTB) throws IOException;
+ long endTB) throws IOException;
+ /**
+ * Query {@link ServiceRelationClientSideMetrics} globally, without given serviceIds
+ */
List<Call.CallDetail> loadClientSideServiceRelations(Downsampling downsampling, long startTB,
- long endTB) throws IOException;
+ long endTB) throws IOException;
- List<Call.CallDetail> loadServerSideServiceInstanceRelations(int clientServiceId, int serverServiceId,
- Downsampling downsampling, long startTB, long endTB) throws IOException;
+ /**
+ * Query {@link ServiceInstanceRelationServerSideMetrics} through given conditions, including the specific
+ * clientServiceId and serverServiceId
+ */
+ List<Call.CallDetail> loadServerSideServiceInstanceRelations(int clientServiceId,
+ int serverServiceId,
+ Downsampling downsampling,
+ long startTB,
+ long endTB) throws IOException;
- List<Call.CallDetail> loadClientSideServiceInstanceRelations(int clientServiceId, int serverServiceId,
- Downsampling downsampling, long startTB, long endTB) throws IOException;
+ /**
+ * Query {@link ServiceInstanceRelationClientSideMetrics} through given conditions, including the specific
+ * clientServiceId and serverServiceId
+ */
+ List<Call.CallDetail> loadClientSideServiceInstanceRelations(int clientServiceId,
+ int serverServiceId,
+ Downsampling downsampling,
+ long startTB,
+ long endTB) throws IOException;
- List<Call.CallDetail> loadSpecifiedDestOfServerSideEndpointRelations(Downsampling downsampling, long startTB,
- long endTB, int destEndpointId) throws IOException;
+ /**
+ * Query the endpoint relationship. Endpoint dependency is not detected from server side agent.
+ */
+ List<Call.CallDetail> loadSpecifiedDestOfServerSideEndpointRelations(Downsampling downsampling,
+ long startTB,
+ long endTB,
+ int destEndpointId) throws IOException;
}
diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2TopologyQueryDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2TopologyQueryDAO.java
index 02ed57f..ebf68e8 100644
--- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2TopologyQueryDAO.java
+++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2TopologyQueryDAO.java
@@ -56,7 +56,7 @@ public class H2TopologyQueryDAO implements ITopologyQueryDAO {
public List<Call.CallDetail> loadSpecifiedClientSideServiceRelations(Downsampling downsampling, long startTB,
long endTB, List<Integer> serviceIds) throws IOException {
String tableName = ModelName.build(downsampling, ServiceRelationClientSideMetrics.INDEX_NAME);
- return loadServiceCalls(tableName, startTB, endTB, ServiceRelationServerSideMetrics.SOURCE_SERVICE_ID, ServiceRelationServerSideMetrics.DEST_SERVICE_ID, serviceIds, true);
+ return loadServiceCalls(tableName, startTB, endTB, ServiceRelationClientSideMetrics.SOURCE_SERVICE_ID, ServiceRelationClientSideMetrics.DEST_SERVICE_ID, serviceIds, true);
}
@Override
@@ -70,7 +70,7 @@ public class H2TopologyQueryDAO implements ITopologyQueryDAO {
public List<Call.CallDetail> loadClientSideServiceRelations(Downsampling downsampling, long startTB,
long endTB) throws IOException {
String tableName = ModelName.build(downsampling, ServiceRelationClientSideMetrics.INDEX_NAME);
- return loadServiceCalls(tableName, startTB, endTB, ServiceRelationServerSideMetrics.SOURCE_SERVICE_ID, ServiceRelationServerSideMetrics.DEST_SERVICE_ID, new ArrayList<>(0), true);
+ return loadServiceCalls(tableName, startTB, endTB, ServiceRelationClientSideMetrics.SOURCE_SERVICE_ID, ServiceRelationClientSideMetrics.DEST_SERVICE_ID, new ArrayList<>(0), true);
}
@Override