[#noissue] Refactor ApplicationResponse

batch/src/main/java/com/navercorp/pinpoint/batch/alarm/collector/ResponseTimeDataCollector.java

@@ -19,13 +19,12 @@
 import com.navercorp.pinpoint.common.timeseries.time.Range;
 import com.navercorp.pinpoint.common.timeseries.window.TimeWindow;
 import com.navercorp.pinpoint.web.alarm.DataCollectorCategory;
+import com.navercorp.pinpoint.web.applicationmap.dao.ApplicationResponse;
 import com.navercorp.pinpoint.web.applicationmap.dao.MapResponseDao;
 import com.navercorp.pinpoint.web.applicationmap.histogram.TimeHistogram;
 import com.navercorp.pinpoint.web.vo.Application;
-import com.navercorp.pinpoint.web.vo.ResponseTime;
 
 import java.util.Collection;
-import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -67,11 +66,10 @@ public void collect() {
 
         Range range = Range.between(timeSlotEndTime - slotInterval, timeSlotEndTime);
         TimeWindow timeWindow = new TimeWindow(range);
-        List<ResponseTime> responseTimes = responseDao.selectResponseTime(application, timeWindow);
 
-        for (ResponseTime responseTime : responseTimes) {
-            sum(responseTime.getAgentResponseHistogramList());
-        }
+        ApplicationResponse applicationResponse = responseDao.selectApplicationResponse(application, timeWindow);
+        sum(applicationResponse.getApplicationHistograms());
+
 
         setSlowRate();
         setErrorRate();

web/src/main/java/com/navercorp/pinpoint/web/applicationmap/appender/histogram/datasource/MapApplicationResponseNodeHistogramDataSource.java

@@ -18,8 +18,8 @@
 
 import com.navercorp.pinpoint.common.timeseries.time.Range;
 import com.navercorp.pinpoint.common.timeseries.window.TimeWindow;
+import com.navercorp.pinpoint.web.applicationmap.dao.ApplicationResponse;
 import com.navercorp.pinpoint.web.applicationmap.dao.MapResponseDao;
-import com.navercorp.pinpoint.web.applicationmap.histogram.ApplicationHistogram;
 import com.navercorp.pinpoint.web.applicationmap.histogram.ApplicationTimeHistogram;
 import com.navercorp.pinpoint.web.applicationmap.histogram.ApplicationTimeHistogramBuilder;
 import com.navercorp.pinpoint.web.applicationmap.histogram.Histogram;
@@ -45,9 +45,9 @@
 
     @Override
     public NodeHistogram createNodeHistogram(Application application, TimeWindow timeWindow) {
-        ApplicationHistogram applicationHistogram = mapResponseDao.selectApplicationResponseTime(application, timeWindow);
+        ApplicationResponse applicationResponse = mapResponseDao.selectApplicationResponse(application, timeWindow);
 
-        ApplicationTimeHistogram applicationTimeHistogram = buildApplicationTimeHistogram(application, timeWindow, applicationHistogram);
+        ApplicationTimeHistogram applicationTimeHistogram = buildApplicationTimeHistogram(application, timeWindow, applicationResponse);
 
         Range windowRange = timeWindow.getWindowRange();
         NodeHistogram.Builder builder = NodeHistogram.newBuilder(application, windowRange);
@@ -56,13 +56,13 @@
         Histogram appHistogram = getHistogram(application, applicationTimeHistogram);
         builder.setApplicationHistogram(appHistogram);
 
-        Map<String, Histogram> agentMap = getAgentIdMap(application, applicationHistogram.getAgentIds());
+        Map<String, Histogram> agentMap = getAgentIdMap(application, applicationResponse.getAgentIds());
         builder.setAgentHistogramMap(agentMap);
         return builder.build();
     }
 
-    private ApplicationTimeHistogram buildApplicationTimeHistogram(Application application, TimeWindow timeWindow, ApplicationHistogram applicationHistogram) {
-        List<TimeHistogram> histogram = applicationHistogram.getApplicationHistograms();
+    private ApplicationTimeHistogram buildApplicationTimeHistogram(Application application, TimeWindow timeWindow, ApplicationResponse applicationResponse) {
+        List<TimeHistogram> histogram = applicationResponse.getApplicationHistograms();
 
         ApplicationTimeHistogramBuilder builder = new ApplicationTimeHistogramBuilder(application, timeWindow);
         return builder.buildFromTimeHistogram(histogram);

web/src/main/java/com/navercorp/pinpoint/web/applicationmap/config/MapHbaseConfiguration.java

@@ -31,6 +31,7 @@
 import com.navercorp.pinpoint.common.hbase.util.ScanMetricReporter;
 import com.navercorp.pinpoint.common.server.executor.ExecutorCustomizer;
 import com.navercorp.pinpoint.common.server.executor.ExecutorProperties;
+import com.navercorp.pinpoint.web.applicationmap.dao.ApplicationResponse;
 import com.navercorp.pinpoint.web.applicationmap.dao.MapInLinkDao;
 import com.navercorp.pinpoint.web.applicationmap.dao.MapOutLinkDao;
 import com.navercorp.pinpoint.web.applicationmap.dao.MapResponseDao;
@@ -40,7 +41,6 @@
 import com.navercorp.pinpoint.web.applicationmap.dao.hbase.MapScanFactory;
 import com.navercorp.pinpoint.web.applicationmap.dao.mapper.ResultExtractorFactory;
 import com.navercorp.pinpoint.web.applicationmap.dao.mapper.RowMapperFactory;
-import com.navercorp.pinpoint.web.applicationmap.histogram.ApplicationHistogram;
 import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkDataMap;
 import com.navercorp.pinpoint.web.vo.RangeFactory;
 import com.navercorp.pinpoint.web.vo.ResponseTime;
@@ -138,7 +138,7 @@ public MapResponseDao mapResponseDao(@Qualifier("mapHbaseTemplate")
                                          @Qualifier("responseTimeResultExtractor")
                                          ResultExtractorFactory<List<ResponseTime>> resultExtractFactory,
                                          @Qualifier("applicationResponseTimeResultExtractor")
-                                         ResultExtractorFactory<ApplicationHistogram> applicationHistogramResultExtractor,
+                                         ResultExtractorFactory<ApplicationResponse> applicationHistogramResultExtractor,
                                          MapScanFactory mapScanFactory,
                                          @Qualifier("mapSelfRowKeyDistributor")
                                          RowKeyDistributorByHashPrefix rowKeyDistributor) {

web/src/main/java/com/navercorp/pinpoint/web/applicationmap/config/MapMapperConfiguration.java

@@ -2,6 +2,7 @@
 
 
 import com.navercorp.pinpoint.loader.service.ServiceTypeRegistryService;
+import com.navercorp.pinpoint.web.applicationmap.dao.ApplicationResponse;
 import com.navercorp.pinpoint.web.applicationmap.dao.mapper.ApplicationResponseTimeResultExtractor;
 import com.navercorp.pinpoint.web.applicationmap.dao.mapper.InLinkMapper;
 import com.navercorp.pinpoint.web.applicationmap.dao.mapper.LinkFilter;
@@ -10,7 +11,6 @@
 import com.navercorp.pinpoint.web.applicationmap.dao.mapper.ResponseTimeResultExtractor;
 import com.navercorp.pinpoint.web.applicationmap.dao.mapper.ResultExtractorFactory;
 import com.navercorp.pinpoint.web.applicationmap.dao.mapper.RowMapperFactory;
-import com.navercorp.pinpoint.web.applicationmap.histogram.ApplicationHistogram;
 import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkDataMap;
 import com.navercorp.pinpoint.web.component.ApplicationFactory;
 import com.navercorp.pinpoint.web.vo.ResponseTime;
@@ -54,8 +54,8 @@ public ResultExtractorFactory<List<ResponseTime>> responseTimeResultExtractor(Se
     }
 
     @Bean
-    public ResultExtractorFactory<ApplicationHistogram> applicationResponseTimeResultExtractor(ServiceTypeRegistryService registry,
-                                                                                @Qualifier("mapSelfRowKeyDistributor")
+    public ResultExtractorFactory<ApplicationResponse> applicationResponseTimeResultExtractor(ServiceTypeRegistryService registry,
+                                                                                              @Qualifier("mapSelfRowKeyDistributor")
                                                                                 RowKeyDistributorByHashPrefix rowKeyDistributor) {
         return (windowFunction) -> new ApplicationResponseTimeResultExtractor(registry, rowKeyDistributor, windowFunction);
     }

web/src/main/java/com/navercorp/pinpoint/web/applicationmap/histogram/ApplicationHistogram.java → web/src/main/java/com/navercorp/pinpoint/web/applicationmap/dao/ApplicationResponse.java

@@ -14,9 +14,12 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.web.applicationmap.histogram;
+package com.navercorp.pinpoint.web.applicationmap.dao;
 
 import com.navercorp.pinpoint.common.trace.ServiceType;
+import com.navercorp.pinpoint.web.applicationmap.histogram.Histogram;
+import com.navercorp.pinpoint.web.applicationmap.histogram.TimeHistogram;
+import com.navercorp.pinpoint.web.vo.Application;
 
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -30,32 +33,24 @@
 /**
  * @author emeroad
  */
-public class ApplicationHistogram {
+public class ApplicationResponse {
     // rowKey
-    private final String applicationName;
-    private final ServiceType applicationServiceType;
+    private final Application application;
     // agentId is the key
     private final List<TimeHistogram> histograms;
     private final Set<String> agentIdMap;
 
 
-    ApplicationHistogram(String applicationName,
-                         ServiceType applicationServiceType,
-                         List<TimeHistogram> histograms,
-                         Set<String> agentIdMap) {
-        this.applicationName = Objects.requireNonNull(applicationName, "applicationName");
-        this.applicationServiceType = Objects.requireNonNull(applicationServiceType, "applicationServiceType");
+    ApplicationResponse(Application application,
+                        List<TimeHistogram> histograms,
+                        Set<String> agentIdMap) {
+        this.application = Objects.requireNonNull(application, "application");
         this.histograms = Objects.requireNonNull(histograms, "histograms");
         this.agentIdMap = Objects.requireNonNull(agentIdMap, "agentIdMap");
     }
 
-
-    public String getApplicationName() {
-        return applicationName;
-    }
-
-    public int getApplicationServiceType() {
-        return applicationServiceType.getCode();
+    public Application getApplication() {
+        return application;
     }
 
     public Set<String> getAgentIds() {
@@ -67,18 +62,23 @@
         return histograms;
     }
 
+    public Histogram getApplicationTotalHistogram() {
+        Histogram histogram = new Histogram(application.getServiceType());
+        histogram.addAll(histograms);
+        return histogram;
+    }
+
     @Override
     public String toString() {
         return "ApplicationHistogram{" +
-                "applicationName='" + applicationName + '\'' +
-                ", applicationServiceType=" + applicationServiceType +
+                "application='" + application + '\'' +
                 ", histograms=" + histograms +
                 ", agentIdMap=" + agentIdMap +
                 '}';
     }
 
-    public static Builder newBuilder(String applicationName, ServiceType applicationServiceType) {
-        return new Builder(applicationName, applicationServiceType);
+    public static Builder newBuilder(Application application) {
+        return new Builder(application);
     }
 
     public static class Builder {
@@ -87,22 +87,24 @@
         // agentId is the key
         private final Set<String> agentIdMap;
 
-        private final String applicationName;
-        private final ServiceType applicationServiceType;
+        private final Application application;
 
-        Builder(String applicationName, ServiceType applicationServiceType) {
-            this.applicationName = Objects.requireNonNull(applicationName, "applicationName");
-            this.applicationServiceType = Objects.requireNonNull(applicationServiceType, "applicationServiceType");
+        Builder(Application application) {
+            this.application = Objects.requireNonNull(application, "application");
             this.histogramMap = new HashMap<>();
             this.agentIdMap = new HashSet<>();
         }
 
+        public Application getApplication() {
+            return application;
+        }
+
         public String getApplicationName() {
-            return applicationName;
+            return application.getName();
         }
 
         public ServiceType getApplicationServiceType() {
-            return applicationServiceType;
+            return application.getServiceType();
         }
 
         public void addResponseTime(String agentId, long timeStamp, short slotNumber, long count) {
@@ -112,7 +114,7 @@
         }
 
         private TimeHistogram getTimeHistogram(long timeStamp) {
-            return this.histogramMap.computeIfAbsent(timeStamp, k -> new TimeHistogram(applicationServiceType, timeStamp));
+            return this.histogramMap.computeIfAbsent(timeStamp, k -> new TimeHistogram(application.getServiceType(), timeStamp));
         }
 
 
@@ -134,10 +136,10 @@
             histogram.addCallCountByElapsedTime(elapsedTime, error);
         }
 
-        public ApplicationHistogram build() {
+        public ApplicationResponse build() {
             List<TimeHistogram> list = new ArrayList<>(this.histogramMap.values());
             list.sort(Comparator.comparing(TimeHistogram::getTimeStamp));
-            return new ApplicationHistogram(applicationName, applicationServiceType, list, this.agentIdMap);
+            return new ApplicationResponse(application, list, this.agentIdMap);
         }
     }
 }

web/src/main/java/com/navercorp/pinpoint/web/applicationmap/dao/MapResponseDao.java

@@ -17,11 +17,12 @@
 package com.navercorp.pinpoint.web.applicationmap.dao;
 
 import com.navercorp.pinpoint.common.timeseries.window.TimeWindow;
-import com.navercorp.pinpoint.web.applicationmap.histogram.ApplicationHistogram;
+import com.navercorp.pinpoint.web.applicationmap.histogram.TimeHistogram;
 import com.navercorp.pinpoint.web.vo.Application;
 import com.navercorp.pinpoint.web.vo.ResponseTime;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  *
@@ -32,7 +33,16 @@
 public interface MapResponseDao {
     List<ResponseTime> selectResponseTime(Application application, TimeWindow timeWindow);
 
-    default ApplicationHistogram selectApplicationResponseTime(Application application, TimeWindow timeWindow) {
-        return null;
+    default ApplicationResponse selectApplicationResponse(Application application, TimeWindow timeWindow) {
+        List<ResponseTime> responseTimes = selectResponseTime(application, timeWindow);
+        ApplicationResponse.Builder builder = ApplicationResponse.newBuilder(application);
+        for (ResponseTime responseTime : responseTimes) {
+            for (Map.Entry<String, TimeHistogram> entry : responseTime.getAgentHistogram()) {
+                String agentId = entry.getKey();
+                TimeHistogram timeHistogram = entry.getValue();
+                builder.addResponseTime(agentId, timeHistogram.getTimeStamp(), timeHistogram);
+            }
+        }
+        return builder.build();
     }
 }

web/src/main/java/com/navercorp/pinpoint/web/applicationmap/dao/hbase/HbaseMapResponseTimeDao.java

@@ -23,9 +23,9 @@
 import com.navercorp.pinpoint.common.hbase.TableNameProvider;
 import com.navercorp.pinpoint.common.timeseries.time.Range;
 import com.navercorp.pinpoint.common.timeseries.window.TimeWindow;
+import com.navercorp.pinpoint.web.applicationmap.dao.ApplicationResponse;
 import com.navercorp.pinpoint.web.applicationmap.dao.MapResponseDao;
 import com.navercorp.pinpoint.web.applicationmap.dao.mapper.ResultExtractorFactory;
-import com.navercorp.pinpoint.web.applicationmap.histogram.ApplicationHistogram;
 import com.navercorp.pinpoint.web.vo.Application;
 import com.navercorp.pinpoint.web.vo.ResponseTime;
 import com.sematext.hbase.wd.RowKeyDistributorByHashPrefix;
@@ -59,12 +59,12 @@
     private final MapScanFactory scanFactory;
 
     private final RowKeyDistributorByHashPrefix rowKeyDistributor;
-    private final ResultExtractorFactory<ApplicationHistogram> applicationHistogramResultExtractor;
+    private final ResultExtractorFactory<ApplicationResponse> applicationHistogramResultExtractor;
 
     public HbaseMapResponseTimeDao(HbaseOperations hbaseOperations,
                                    TableNameProvider tableNameProvider,
                                    ResultExtractorFactory<List<ResponseTime>> resultExtractMapperFactory,
-                                   ResultExtractorFactory<ApplicationHistogram> applicationHistogramResultExtractor,
+                                   ResultExtractorFactory<ApplicationResponse> applicationHistogramResultExtractor,
                                    MapScanFactory scanFactory,
                                    RowKeyDistributorByHashPrefix rowKeyDistributor) {
         this.hbaseOperations = Objects.requireNonNull(hbaseOperations, "hbaseOperations");
@@ -101,7 +101,7 @@
     }
 
     @Override
-    public ApplicationHistogram selectApplicationResponseTime(Application application, TimeWindow timeWindow) {
+    public ApplicationResponse selectApplicationResponse(Application application, TimeWindow timeWindow) {
         Objects.requireNonNull(application, "application");
 
         if (logger.isDebugEnabled()) {
@@ -111,13 +111,13 @@
         Range windowRange = timeWindow.getWindowRange();
         Scan scan = scanFactory.createScan("MapSelfScan", application, windowRange, DESCRIPTOR.getName());
 
-        ResultsExtractor<ApplicationHistogram> mapper = applicationHistogramResultExtractor.newMapper(timeWindow);
+        ResultsExtractor<ApplicationResponse> mapper = applicationHistogramResultExtractor.newMapper(timeWindow);
         TableName mapStatisticsSelfTableName = tableNameProvider.getTableName(DESCRIPTOR.getTable());
 
-        ApplicationHistogram histogram = hbaseOperations.findParallel(mapStatisticsSelfTableName, scan, rowKeyDistributor,
+        ApplicationResponse histogram = hbaseOperations.findParallel(mapStatisticsSelfTableName, scan, rowKeyDistributor,
                 mapper, MAP_STATISTICS_SELF_VER2_NUM_PARTITIONS);
         if (histogram == null) {
-            return ApplicationHistogram.newBuilder(application.getName(), application.getServiceType()).build();
+            return ApplicationResponse.newBuilder(application).build();
         }
         return histogram;
     }