[pinpoint-apm#3378] aggregate agent's dataSource to show application'…

…s dataSource
likeonechild · Oct 19, 2017 · e26793e · e26793e
1 parent cf04b97
commit e26793e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/web/src/main/java/com/navercorp/pinpoint/web/service/stat/ApplicationDataSourceService.java b/web/src/main/java/com/navercorp/pinpoint/web/service/stat/ApplicationDataSourceService.java
@@ -50,9 +50,15 @@ public List<ApplicationStatChartGroup> selectApplicationChart(String application
             throw new NullPointerException("timeWindow must not be null");
         }
 
+        List<ApplicationStatChartGroup> result = new ArrayList<ApplicationStatChartGroup>();
         List<AggreJoinDataSourceListBo> aggreJoinDataSourceListBoList = this.applicationDataSourceDao.getApplicationStatList(applicationId, timeWindow);
+
+        if (aggreJoinDataSourceListBoList.size() == 0) {
+            result.add(new ApplicationDataSourceChartGroup(timeWindow, "", "", Collections.EMPTY_LIST));
+            return result;
+        }
+
         Map<DataSourceKey, List<AggreJoinDataSourceBo>> aggreJoinDataSourceBoMap = classifyByDataSourceUrl(aggreJoinDataSourceListBoList);
-        List<ApplicationStatChartGroup> result = new ArrayList<ApplicationStatChartGroup>();
 
         for (Map.Entry<DataSourceKey, List<AggreJoinDataSourceBo>> entry: aggreJoinDataSourceBoMap.entrySet()) {
             DataSourceKey dataSourceKey = entry.getKey();

diff --git a/...c/main/java/com/navercorp/pinpoint/web/vo/stat/chart/ApplicationDataSourceChartGroup.java b/...c/main/java/com/navercorp/pinpoint/web/vo/stat/chart/ApplicationDataSourceChartGroup.java
@@ -32,32 +32,33 @@ public class ApplicationDataSourceChartGroup implements ApplicationStatChartGrou
     private static final UncollectedDataSourcePointCreater UNCOLLECTED_DATASOURCE_POINT = new UncollectedDataSourcePointCreater();
 
     private final String url;
-    private final String serviceTypeCodeName;
+    private final String serviceType;
     private final Map<ChartType, Chart> dataSourceChartMap;
 
     public enum DataSourceChartType implements ChartType {
         ACTIVE_CONNECTION_SIZE
     }
 
-    public ApplicationDataSourceChartGroup(TimeWindow timeWindow, String url, String serviceTypeCodeName, List<AggreJoinDataSourceBo> aggreJoinDataSourceBoList) {
+    public ApplicationDataSourceChartGroup(TimeWindow timeWindow, String url, String serviceType, List<AggreJoinDataSourceBo> aggreJoinDataSourceBoList) {
         this.url = url;
-        this.serviceTypeCodeName = serviceTypeCodeName;
+        this.serviceType = serviceType;
         this.dataSourceChartMap = new HashMap<>();
         List<Point> activeConnectionCountList = new ArrayList<>(aggreJoinDataSourceBoList.size());
 
         for (AggreJoinDataSourceBo aggreJoinDataSourceBo : aggreJoinDataSourceBoList) {
             activeConnectionCountList.add(new DataSourcePoint(aggreJoinDataSourceBo.getTimestamp(), aggreJoinDataSourceBo.getMinActiveConnectionSize(), aggreJoinDataSourceBo.getMinActiveConnectionAgentId(), aggreJoinDataSourceBo.getMaxActiveConnectionSize(), aggreJoinDataSourceBo.getMaxActiveConnectionAgentId(), aggreJoinDataSourceBo.getAvgActiveConnectionSize()));
         }
 
+//        여기서 빈 부분을 알아서 채워줘야 될것같은데 왜 그럴까 이건 디버깅을 해보는게 좋을듯함.
         dataSourceChartMap.put(DataSourceChartType.ACTIVE_CONNECTION_SIZE, new TimeSeriesChartBuilder(timeWindow, UNCOLLECTED_DATASOURCE_POINT).build(activeConnectionCountList));
     }
 
     public String getJdbcUrl() {
         return url;
     }
 
-    public String getServiceTypeCodeName() {
-        return serviceTypeCodeName;
+    public String getServiceType() {
+        return serviceType;
     }
 
     @Override