Commit e3492228 authored by peng-yongsheng's avatar peng-yongsheng
Browse files

All success.

parent bc4f1830

apm-collector/apm-collector-boot/src/main/resources/application.yml

+11 −11
Original line number Diff line number Diff line 
cluster:

  zookeeper:

    hostPort: localhost:2181

    sessionTimeout: 100000

#cluster:

#  zookeeper:

#    hostPort: localhost:2181

#    sessionTimeout: 100000

naming:

  jetty:

    host: localhost
@@ -23,10 +23,10 @@ ui: 
    host: localhost

    port: 12800

    context_path: /

storage:

  elasticsearch:

    cluster_name: CollectorDBCluster

    cluster_transport_sniffer: true

    cluster_nodes: localhost:9300

    index_shards_number: 2

    index_replicas_number: 0
 
 No newline at end of file
 
#storage:

#  elasticsearch:

#    cluster_name: CollectorDBCluster

#    cluster_transport_sniffer: true

#    cluster_nodes: localhost:9300

#    index_shards_number: 2

#    index_replicas_number: 0
 
 No newline at end of file

apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/SegmentCostH2UIDAO.java

+0 −8
Original line number Diff line number Diff line
@@ -136,14 +136,6 @@ public class SegmentCostH2UIDAO extends H2DAO implements ISegmentCostUIDAO { 
                topSegmentJson.addProperty(SegmentCostTable.COLUMN_SEGMENT_ID, segmentId);

                topSegmentJson.addProperty(SegmentCostTable.COLUMN_START_TIME, rs.getLong(SegmentCostTable.COLUMN_START_TIME));

                topSegmentJson.addProperty(SegmentCostTable.COLUMN_END_TIME, rs.getLong(SegmentCostTable.COLUMN_END_TIME));



                //TODO IGlobalTraceDAO

//                IGlobalTraceDAO globalTraceDAO = (IGlobalTraceDAO)DAOContainer.INSTANCE.get(IGlobalTraceDAO.class.getName());

//                List<String> globalTraces = globalTraceDAO.getGlobalTraceId(segmentId);

//                if (CollectionUtils.isNotEmpty(globalTraces)) {

//                    topSegmentJson.addProperty(GlobalTraceTable.COLUMN_GLOBAL_TRACE_ID, globalTraces.get(0));

//                }



                topSegmentJson.addProperty(SegmentCostTable.COLUMN_APPLICATION_ID, rs.getInt(SegmentCostTable.COLUMN_APPLICATION_ID));

                topSegmentJson.addProperty(SegmentCostTable.COLUMN_SERVICE_NAME, rs.getString(SegmentCostTable.COLUMN_SERVICE_NAME));

                topSegmentJson.addProperty(SegmentCostTable.COLUMN_COST, rs.getLong(SegmentCostTable.COLUMN_COST));