Commit 085da839 authored by peng-yongsheng's avatar peng-yongsheng
Browse files

trace dag ui with elasticsearch storage module provider test success.

parent 101d92bf

apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/noderef/NodeReference.java

+0 −9
Original line number Diff line number Diff line
@@ -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 class NodeReference extends Data { 
        setSummary(0);

    }



    public String getBehindPeer() {

        return getDataString(1);

    }



    public void setBehindPeer(String behindPeer) {

        setDataString(1, behindPeer);

    }



    public Long getTimeBucket() {

        return getDataLong(0);

    }

apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/noderef/NodeReferenceTable.java

+0 −1
Original line number Diff line number Diff line
@@ -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";

apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/NodeComponentEsUIDAO.java

+6 −15
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import org.skywalking.apm.collector.client.elasticsearch.ElasticSearchClient; 
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 @@ public class NodeComponentEsUIDAO extends EsDAO implements INodeComponentUIDAO { 
        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);

            nodeComponentObj.addProperty(NodeComponentTable.COLUMN_COMPONENT_ID, componentId);

            nodeComponentObj.addProperty(NodeComponentTable.COLUMN_PEER_ID, peerId);

            nodeComponentArray.add(nodeComponentObj);

        }

    }

}
 
}

apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/NodeMappingEsUIDAO.java

+4 −11
Original line number Diff line number Diff line
@@ -61,22 +61,15 @@ public class NodeMappingEsUIDAO extends EsDAO implements INodeMappingUIDAO { 
        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);

                nodeMappingObj.addProperty(NodeMappingTable.COLUMN_APPLICATION_ID, applicationId);

                nodeMappingObj.addProperty(NodeMappingTable.COLUMN_ADDRESS_ID, addressId);

                nodeMappingArray.add(nodeMappingObj);

            }

        }

        }

        logger.debug("node mapping data: {}", nodeMappingArray.toString());

        return nodeMappingArray;

    }

apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/NodeReferenceEsPersistenceDAO.java

+0 −3
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ public class NodeReferenceEsPersistenceDAO extends EsDAO implements INodeReferen 
            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 class NodeReferenceEsPersistenceDAO extends EsDAO implements INodeReferen 
        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 class NodeReferenceEsPersistenceDAO extends EsDAO implements INodeReferen 
        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());