trace dag ui with elasticsearch storage module provider test success.

apache · Nov 15, 2017 · 085da83 · 085da83
1 parent 101d92b
commit 085da83
Show file tree

Hide file tree

Showing 12 changed files with 56 additions and 128 deletions.
diff --git a/...efine/src/main/java/org/skywalking/apm/collector/storage/table/noderef/NodeReference.java b/...efine/src/main/java/org/skywalking/apm/collector/storage/table/noderef/NodeReference.java
@@ -30,7 +30,6 @@ public class NodeReference extends Data {
 
     private static final Column[] STRING_COLUMNS = {
         new Column(NodeReferenceTable.COLUMN_ID, new NonOperation()),
-        new Column(NodeReferenceTable.COLUMN_BEHIND_PEER, new NonOperation()),
     };
 
     private static final Column[] LONG_COLUMNS = {
@@ -61,14 +60,6 @@ public NodeReference(String id) {
         setSummary(0);
     }
 
-    public String getBehindPeer() {
-        return getDataString(1);
-    }
-
-    public void setBehindPeer(String behindPeer) {
-        setDataString(1, behindPeer);
-    }
-
     public Long getTimeBucket() {
         return getDataLong(0);
     }

diff --git a/.../src/main/java/org/skywalking/apm/collector/storage/table/noderef/NodeReferenceTable.java b/.../src/main/java/org/skywalking/apm/collector/storage/table/noderef/NodeReferenceTable.java
@@ -27,7 +27,6 @@ public class NodeReferenceTable extends CommonTable {
     public static final String TABLE = "node_reference";
     public static final String COLUMN_FRONT_APPLICATION_ID = "front_application_id";
     public static final String COLUMN_BEHIND_APPLICATION_ID = "behind_application_id";
-    public static final String COLUMN_BEHIND_PEER = "behind_peer";
     public static final String COLUMN_S1_LTE = "s1_lte";
     public static final String COLUMN_S3_LTE = "s3_lte";
     public static final String COLUMN_S5_LTE = "s5_lte";

diff --git a/...vider/src/main/java/org/skywalking/apm/collector/storage/es/dao/NodeComponentEsUIDAO.java b/...vider/src/main/java/org/skywalking/apm/collector/storage/es/dao/NodeComponentEsUIDAO.java
@@ -30,7 +30,6 @@
 import org.skywalking.apm.collector.storage.dao.INodeComponentUIDAO;
 import org.skywalking.apm.collector.storage.es.base.dao.EsDAO;
 import org.skywalking.apm.collector.storage.table.node.NodeComponentTable;
-import org.skywalking.apm.network.trace.component.ComponentsDefine;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -68,29 +67,21 @@ private JsonArray aggregationByComponentId(long startTime, long endTime) {
         JsonArray nodeComponentArray = new JsonArray();
         for (Terms.Bucket componentIdBucket : componentIdTerms.getBuckets()) {
             int componentId = componentIdBucket.getKeyAsNumber().intValue();
-            String componentName = ComponentsDefine.getInstance().getComponentName(componentId);
-            if (componentId != 0) {
-                buildComponentArray(componentIdBucket, componentName, nodeComponentArray);
-            }
+            buildComponentArray(componentIdBucket, componentId, nodeComponentArray);
         }
 
         return nodeComponentArray;
     }
 
-    private void buildComponentArray(Terms.Bucket componentBucket, String componentName, JsonArray nodeComponentArray) {
+    private void buildComponentArray(Terms.Bucket componentBucket, int componentId, JsonArray nodeComponentArray) {
         Terms peerIdTerms = componentBucket.getAggregations().get(NodeComponentTable.COLUMN_PEER_ID);
         for (Terms.Bucket peerIdBucket : peerIdTerms.getBuckets()) {
             int peerId = peerIdBucket.getKeyAsNumber().intValue();
 
-            if (peerId != 0) {
-                //TODO ApplicationCache
-//                String peer = ApplicationCache.get(peerId);
-
-                JsonObject nodeComponentObj = new JsonObject();
-                nodeComponentObj.addProperty("componentName", componentName);
-//                nodeComponentObj.addProperty("peer", peer);
-                nodeComponentArray.add(nodeComponentObj);
-            }
+            JsonObject nodeComponentObj = new JsonObject();
+            nodeComponentObj.addProperty(NodeComponentTable.COLUMN_COMPONENT_ID, componentId);
+            nodeComponentObj.addProperty(NodeComponentTable.COLUMN_PEER_ID, peerId);
+            nodeComponentArray.add(nodeComponentObj);
         }
     }
 }
diff --git a/...rovider/src/main/java/org/skywalking/apm/collector/storage/es/dao/NodeMappingEsUIDAO.java b/...rovider/src/main/java/org/skywalking/apm/collector/storage/es/dao/NodeMappingEsUIDAO.java
@@ -61,20 +61,13 @@ public NodeMappingEsUIDAO(ElasticSearchClient client) {
         JsonArray nodeMappingArray = new JsonArray();
         for (Terms.Bucket applicationIdBucket : applicationIdTerms.getBuckets()) {
             int applicationId = applicationIdBucket.getKeyAsNumber().intValue();
-            //TODO ApplicationCache
-//            String applicationCode = ApplicationCache.get(applicationId);
             Terms addressIdTerms = applicationIdBucket.getAggregations().get(NodeMappingTable.COLUMN_ADDRESS_ID);
             for (Terms.Bucket addressIdBucket : addressIdTerms.getBuckets()) {
                 int addressId = addressIdBucket.getKeyAsNumber().intValue();
-                //TODO ApplicationCache
-//                String address = ApplicationCache.get(addressId);
-
-                if (addressId != 0) {
-                    JsonObject nodeMappingObj = new JsonObject();
-//                    nodeMappingObj.addProperty("applicationCode", applicationCode);
-//                    nodeMappingObj.addProperty("address", address);
-                    nodeMappingArray.add(nodeMappingObj);
-                }
+                JsonObject nodeMappingObj = new JsonObject();
+                nodeMappingObj.addProperty(NodeMappingTable.COLUMN_APPLICATION_ID, applicationId);
+                nodeMappingObj.addProperty(NodeMappingTable.COLUMN_ADDRESS_ID, addressId);
+                nodeMappingArray.add(nodeMappingObj);
             }
         }
         logger.debug("node mapping data: {}", nodeMappingArray.toString());

diff --git a/.../main/java/org/skywalking/apm/collector/storage/es/dao/NodeReferenceEsPersistenceDAO.java b/.../main/java/org/skywalking/apm/collector/storage/es/dao/NodeReferenceEsPersistenceDAO.java
@@ -45,7 +45,6 @@ public NodeReferenceEsPersistenceDAO(ElasticSearchClient client) {
             Map<String, Object> source = getResponse.getSource();
             nodeReference.setFrontApplicationId(((Number)source.get(NodeReferenceTable.COLUMN_FRONT_APPLICATION_ID)).intValue());
             nodeReference.setBehindApplicationId(((Number)source.get(NodeReferenceTable.COLUMN_BEHIND_APPLICATION_ID)).intValue());
-            nodeReference.setBehindPeer((String)source.get(NodeReferenceTable.COLUMN_BEHIND_PEER));
             nodeReference.setS1Lte(((Number)source.get(NodeReferenceTable.COLUMN_S1_LTE)).intValue());
             nodeReference.setS3Lte(((Number)source.get(NodeReferenceTable.COLUMN_S3_LTE)).intValue());
             nodeReference.setS5Lte(((Number)source.get(NodeReferenceTable.COLUMN_S5_LTE)).intValue());
@@ -63,7 +62,6 @@ public NodeReferenceEsPersistenceDAO(ElasticSearchClient client) {
         Map<String, Object> source = new HashMap<>();
         source.put(NodeReferenceTable.COLUMN_FRONT_APPLICATION_ID, data.getFrontApplicationId());
         source.put(NodeReferenceTable.COLUMN_BEHIND_APPLICATION_ID, data.getBehindApplicationId());
-        source.put(NodeReferenceTable.COLUMN_BEHIND_PEER, data.getBehindPeer());
         source.put(NodeReferenceTable.COLUMN_S1_LTE, data.getS1Lte());
         source.put(NodeReferenceTable.COLUMN_S3_LTE, data.getS3Lte());
         source.put(NodeReferenceTable.COLUMN_S5_LTE, data.getS5Lte());
@@ -79,7 +77,6 @@ public NodeReferenceEsPersistenceDAO(ElasticSearchClient client) {
         Map<String, Object> source = new HashMap<>();
         source.put(NodeReferenceTable.COLUMN_FRONT_APPLICATION_ID, data.getFrontApplicationId());
         source.put(NodeReferenceTable.COLUMN_BEHIND_APPLICATION_ID, data.getBehindApplicationId());
-        source.put(NodeReferenceTable.COLUMN_BEHIND_PEER, data.getBehindPeer());
         source.put(NodeReferenceTable.COLUMN_S1_LTE, data.getS1Lte());
         source.put(NodeReferenceTable.COLUMN_S3_LTE, data.getS3Lte());
         source.put(NodeReferenceTable.COLUMN_S5_LTE, data.getS5Lte());

diff --git a/...vider/src/main/java/org/skywalking/apm/collector/storage/es/dao/NodeReferenceEsUIDAO.java b/...vider/src/main/java/org/skywalking/apm/collector/storage/es/dao/NodeReferenceEsUIDAO.java
@@ -29,7 +29,7 @@
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.metrics.sum.Sum;
 import org.skywalking.apm.collector.client.elasticsearch.ElasticSearchClient;
-import org.skywalking.apm.collector.core.util.StringUtils;
+import org.skywalking.apm.collector.core.util.ColumnNameUtils;
 import org.skywalking.apm.collector.storage.dao.INodeReferenceUIDAO;
 import org.skywalking.apm.collector.storage.es.base.dao.EsDAO;
 import org.skywalking.apm.collector.storage.table.noderef.NodeReferenceTable;
@@ -62,75 +62,37 @@ public NodeReferenceEsUIDAO(ElasticSearchClient client) {
             .subAggregation(AggregationBuilders.sum(NodeReferenceTable.COLUMN_S5_GT).field(NodeReferenceTable.COLUMN_S5_GT))
             .subAggregation(AggregationBuilders.sum(NodeReferenceTable.COLUMN_SUMMARY).field(NodeReferenceTable.COLUMN_SUMMARY))
             .subAggregation(AggregationBuilders.sum(NodeReferenceTable.COLUMN_ERROR).field(NodeReferenceTable.COLUMN_ERROR)));
-        aggregationBuilder.subAggregation(AggregationBuilders.terms(NodeReferenceTable.COLUMN_BEHIND_PEER).field(NodeReferenceTable.COLUMN_BEHIND_PEER).size(100)
-            .subAggregation(AggregationBuilders.sum(NodeReferenceTable.COLUMN_S1_LTE).field(NodeReferenceTable.COLUMN_S1_LTE))
-            .subAggregation(AggregationBuilders.sum(NodeReferenceTable.COLUMN_S3_LTE).field(NodeReferenceTable.COLUMN_S3_LTE))
-            .subAggregation(AggregationBuilders.sum(NodeReferenceTable.COLUMN_S5_LTE).field(NodeReferenceTable.COLUMN_S5_LTE))
-            .subAggregation(AggregationBuilders.sum(NodeReferenceTable.COLUMN_S5_GT).field(NodeReferenceTable.COLUMN_S5_GT))
-            .subAggregation(AggregationBuilders.sum(NodeReferenceTable.COLUMN_SUMMARY).field(NodeReferenceTable.COLUMN_SUMMARY))
-            .subAggregation(AggregationBuilders.sum(NodeReferenceTable.COLUMN_ERROR).field(NodeReferenceTable.COLUMN_ERROR)));
 
         searchRequestBuilder.addAggregation(aggregationBuilder);
         SearchResponse searchResponse = searchRequestBuilder.execute().actionGet();
 
         JsonArray nodeRefResSumArray = new JsonArray();
         Terms frontApplicationIdTerms = searchResponse.getAggregations().get(NodeReferenceTable.COLUMN_FRONT_APPLICATION_ID);
         for (Terms.Bucket frontApplicationIdBucket : frontApplicationIdTerms.getBuckets()) {
-            int applicationId = frontApplicationIdBucket.getKeyAsNumber().intValue();
-            //TODO ApplicationCache
-//            String applicationCode = ApplicationCache.get(applicationId);
+            int frontApplicationId = frontApplicationIdBucket.getKeyAsNumber().intValue();
             Terms behindApplicationIdTerms = frontApplicationIdBucket.getAggregations().get(NodeReferenceTable.COLUMN_BEHIND_APPLICATION_ID);
             for (Terms.Bucket behindApplicationIdBucket : behindApplicationIdTerms.getBuckets()) {
                 int behindApplicationId = behindApplicationIdBucket.getKeyAsNumber().intValue();
 
                 if (behindApplicationId != 0) {
-//                    String behindApplicationCode = ApplicationCache.get(behindApplicationId);
-
                     Sum s1LTE = behindApplicationIdBucket.getAggregations().get(NodeReferenceTable.COLUMN_S1_LTE);
                     Sum s3LTE = behindApplicationIdBucket.getAggregations().get(NodeReferenceTable.COLUMN_S3_LTE);
                     Sum s5LTE = behindApplicationIdBucket.getAggregations().get(NodeReferenceTable.COLUMN_S5_LTE);
                     Sum s5GT = behindApplicationIdBucket.getAggregations().get(NodeReferenceTable.COLUMN_S5_GT);
                     Sum summary = behindApplicationIdBucket.getAggregations().get(NodeReferenceTable.COLUMN_SUMMARY);
                     Sum error = behindApplicationIdBucket.getAggregations().get(NodeReferenceTable.COLUMN_ERROR);
-                    logger.debug("applicationId: {}, behindApplicationId: {}, s1LTE: {}, s3LTE: {}, s5LTE: {}, s5GT: {}, error: {}, summary: {}", applicationId,
+                    logger.debug("frontApplicationId: {}, behindApplicationId: {}, s1LTE: {}, s3LTE: {}, s5LTE: {}, s5GT: {}, error: {}, summary: {}", frontApplicationId,
                         behindApplicationId, s1LTE.getValue(), s3LTE.getValue(), s5LTE.getValue(), s5GT.getValue(), error.getValue(), summary.getValue());
 
                     JsonObject nodeRefResSumObj = new JsonObject();
-//                    nodeRefResSumObj.addProperty("front", applicationCode);
-//                    nodeRefResSumObj.addProperty("behind", behindApplicationCode);
-                    nodeRefResSumObj.addProperty(NodeReferenceTable.COLUMN_S1_LTE, s1LTE.getValue());
-                    nodeRefResSumObj.addProperty(NodeReferenceTable.COLUMN_S3_LTE, s3LTE.getValue());
-                    nodeRefResSumObj.addProperty(NodeReferenceTable.COLUMN_S5_LTE, s5LTE.getValue());
-                    nodeRefResSumObj.addProperty(NodeReferenceTable.COLUMN_S5_GT, s5GT.getValue());
-                    nodeRefResSumObj.addProperty(NodeReferenceTable.COLUMN_ERROR, error.getValue());
-                    nodeRefResSumObj.addProperty(NodeReferenceTable.COLUMN_SUMMARY, summary.getValue());
-                    nodeRefResSumArray.add(nodeRefResSumObj);
-                }
-            }
-
-            Terms behindPeerTerms = frontApplicationIdBucket.getAggregations().get(NodeReferenceTable.COLUMN_BEHIND_PEER);
-            for (Terms.Bucket behindPeerBucket : behindPeerTerms.getBuckets()) {
-                String behindPeer = behindPeerBucket.getKeyAsString();
-
-                if (StringUtils.isNotEmpty(behindPeer)) {
-                    Sum s1LTE = behindPeerBucket.getAggregations().get(NodeReferenceTable.COLUMN_S1_LTE);
-                    Sum s3LTE = behindPeerBucket.getAggregations().get(NodeReferenceTable.COLUMN_S3_LTE);
-                    Sum s5LTE = behindPeerBucket.getAggregations().get(NodeReferenceTable.COLUMN_S5_LTE);
-                    Sum s5GT = behindPeerBucket.getAggregations().get(NodeReferenceTable.COLUMN_S5_GT);
-                    Sum summary = behindPeerBucket.getAggregations().get(NodeReferenceTable.COLUMN_SUMMARY);
-                    Sum error = behindPeerBucket.getAggregations().get(NodeReferenceTable.COLUMN_ERROR);
-                    logger.debug("applicationId: {}, behindPeer: {}, s1LTE: {}, s3LTE: {}, s5LTE: {}, s5GT: {}, error: {}, summary: {}", applicationId,
-                        behindPeer, s1LTE.getValue(), s3LTE.getValue(), s5LTE.getValue(), s5GT.getValue(), error.getValue(), summary.getValue());
-
-                    JsonObject nodeRefResSumObj = new JsonObject();
-//                    nodeRefResSumObj.addProperty("front", applicationCode);
-                    nodeRefResSumObj.addProperty("behind", behindPeer);
-                    nodeRefResSumObj.addProperty(NodeReferenceTable.COLUMN_S1_LTE, s1LTE.getValue());
-                    nodeRefResSumObj.addProperty(NodeReferenceTable.COLUMN_S3_LTE, s3LTE.getValue());
-                    nodeRefResSumObj.addProperty(NodeReferenceTable.COLUMN_S5_LTE, s5LTE.getValue());
-                    nodeRefResSumObj.addProperty(NodeReferenceTable.COLUMN_S5_GT, s5GT.getValue());
-                    nodeRefResSumObj.addProperty(NodeReferenceTable.COLUMN_ERROR, error.getValue());
-                    nodeRefResSumObj.addProperty(NodeReferenceTable.COLUMN_SUMMARY, summary.getValue());
+                    nodeRefResSumObj.addProperty(ColumnNameUtils.INSTANCE.rename(NodeReferenceTable.COLUMN_FRONT_APPLICATION_ID), frontApplicationId);
+                    nodeRefResSumObj.addProperty(ColumnNameUtils.INSTANCE.rename(NodeReferenceTable.COLUMN_BEHIND_APPLICATION_ID), behindApplicationId);
+                    nodeRefResSumObj.addProperty(ColumnNameUtils.INSTANCE.rename(NodeReferenceTable.COLUMN_S1_LTE), s1LTE.getValue());
+                    nodeRefResSumObj.addProperty(ColumnNameUtils.INSTANCE.rename(NodeReferenceTable.COLUMN_S3_LTE), s3LTE.getValue());
+                    nodeRefResSumObj.addProperty(ColumnNameUtils.INSTANCE.rename(NodeReferenceTable.COLUMN_S5_LTE), s5LTE.getValue());
+                    nodeRefResSumObj.addProperty(ColumnNameUtils.INSTANCE.rename(NodeReferenceTable.COLUMN_S5_GT), s5GT.getValue());
+                    nodeRefResSumObj.addProperty(ColumnNameUtils.INSTANCE.rename(NodeReferenceTable.COLUMN_ERROR), error.getValue());
+                    nodeRefResSumObj.addProperty(ColumnNameUtils.INSTANCE.rename(NodeReferenceTable.COLUMN_SUMMARY), summary.getValue());
                     nodeRefResSumArray.add(nodeRefResSumObj);
                 }
             }

diff --git a/.../main/java/org/skywalking/apm/collector/storage/es/define/NodeReferenceEsTableDefine.java b/.../main/java/org/skywalking/apm/collector/storage/es/define/NodeReferenceEsTableDefine.java
@@ -38,7 +38,6 @@ public NodeReferenceEsTableDefine() {
     @Override public void initialize() {
         addColumn(new ElasticSearchColumnDefine(NodeReferenceTable.COLUMN_FRONT_APPLICATION_ID, ElasticSearchColumnDefine.Type.Integer.name()));
         addColumn(new ElasticSearchColumnDefine(NodeReferenceTable.COLUMN_BEHIND_APPLICATION_ID, ElasticSearchColumnDefine.Type.Integer.name()));
-        addColumn(new ElasticSearchColumnDefine(NodeReferenceTable.COLUMN_BEHIND_PEER, ElasticSearchColumnDefine.Type.Keyword.name()));
         addColumn(new ElasticSearchColumnDefine(NodeReferenceTable.COLUMN_S1_LTE, ElasticSearchColumnDefine.Type.Integer.name()));
         addColumn(new ElasticSearchColumnDefine(NodeReferenceTable.COLUMN_S3_LTE, ElasticSearchColumnDefine.Type.Integer.name()));
         addColumn(new ElasticSearchColumnDefine(NodeReferenceTable.COLUMN_S5_LTE, ElasticSearchColumnDefine.Type.Integer.name()));

diff --git a/.../main/java/org/skywalking/apm/collector/storage/h2/dao/NodeReferenceH2PersistenceDAO.java b/.../main/java/org/skywalking/apm/collector/storage/h2/dao/NodeReferenceH2PersistenceDAO.java
@@ -56,7 +56,6 @@ public NodeReferenceH2PersistenceDAO(H2Client client) {
                 NodeReference nodeReference = new NodeReference(id);
                 nodeReference.setFrontApplicationId(rs.getInt(NodeReferenceTable.COLUMN_FRONT_APPLICATION_ID));
                 nodeReference.setBehindApplicationId(rs.getInt(NodeReferenceTable.COLUMN_BEHIND_APPLICATION_ID));
-                nodeReference.setBehindPeer(rs.getString(NodeReferenceTable.COLUMN_BEHIND_PEER));
                 nodeReference.setS1Lte(rs.getInt(NodeReferenceTable.COLUMN_S1_LTE));
                 nodeReference.setS3Lte(rs.getInt(NodeReferenceTable.COLUMN_S3_LTE));
                 nodeReference.setS5Lte(rs.getInt(NodeReferenceTable.COLUMN_S5_LTE));
@@ -78,7 +77,6 @@ public NodeReferenceH2PersistenceDAO(H2Client client) {
         source.put(NodeReferenceTable.COLUMN_ID, data.getId());
         source.put(NodeReferenceTable.COLUMN_FRONT_APPLICATION_ID, data.getFrontApplicationId());
         source.put(NodeReferenceTable.COLUMN_BEHIND_APPLICATION_ID, data.getBehindApplicationId());
-        source.put(NodeReferenceTable.COLUMN_BEHIND_PEER, data.getBehindPeer());
         source.put(NodeReferenceTable.COLUMN_S1_LTE, data.getS1Lte());
         source.put(NodeReferenceTable.COLUMN_S3_LTE, data.getS3Lte());
         source.put(NodeReferenceTable.COLUMN_S5_LTE, data.getS5Lte());
@@ -98,7 +96,6 @@ public NodeReferenceH2PersistenceDAO(H2Client client) {
         H2SqlEntity entity = new H2SqlEntity();
         source.put(NodeReferenceTable.COLUMN_FRONT_APPLICATION_ID, data.getFrontApplicationId());
         source.put(NodeReferenceTable.COLUMN_BEHIND_APPLICATION_ID, data.getBehindApplicationId());
-        source.put(NodeReferenceTable.COLUMN_BEHIND_PEER, data.getBehindPeer());
         source.put(NodeReferenceTable.COLUMN_S1_LTE, data.getS1Lte());
         source.put(NodeReferenceTable.COLUMN_S3_LTE, data.getS3Lte());
         source.put(NodeReferenceTable.COLUMN_S5_LTE, data.getS5Lte());