[#4805] fix typo, add index bound check

pinpoint-apm · May 18, 2022 · f9772f5 · f9772f5
1 parent ab7328d
commit f9772f5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/...src/main/java/com/navercorp/pinpoint/web/applicationmap/histogram/AgentTimeHistogram.java b/...src/main/java/com/navercorp/pinpoint/web/applicationmap/histogram/AgentTimeHistogram.java
@@ -16,22 +16,19 @@
 
 package com.navercorp.pinpoint.web.applicationmap.histogram;
 
+import com.navercorp.pinpoint.common.server.util.time.Range;
 import com.navercorp.pinpoint.common.trace.ServiceType;
 import com.navercorp.pinpoint.web.applicationmap.rawdata.AgentHistogram;
 import com.navercorp.pinpoint.web.applicationmap.rawdata.AgentHistogramList;
 import com.navercorp.pinpoint.web.util.TimeWindow;
 import com.navercorp.pinpoint.web.view.AgentResponseTimeViewModel;
 import com.navercorp.pinpoint.web.view.TimeViewModel;
 import com.navercorp.pinpoint.web.vo.Application;
-import com.navercorp.pinpoint.common.server.util.time.Range;
-
 import com.navercorp.pinpoint.web.vo.stat.SampledApdexScore;
 import com.navercorp.pinpoint.web.vo.stat.chart.agent.AgentStatPoint;
 import com.navercorp.pinpoint.web.vo.stat.chart.application.DoubleApplicationStatPoint;
 
-import java.lang.reflect.Array;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
@@ -137,6 +134,9 @@ public List<DoubleApplicationStatPoint> getApplicationApdexScoreList(TimeWindow
             for (TimeHistogram timeHistogram : agentHistogram.getTimeHistogram()) {
                 if (timeHistogram.getTotalCount() != 0) {
                     int index = window.getWindowIndex(timeHistogram.getTimeStamp());
+                    if (index < 0 || index >= size) {
+                        continue;
+                    }
                     double apdex = ApdexScore.toDoubleFromHistogram(timeHistogram);
                     String agentId = agentHistogram.getId();
 
@@ -165,11 +165,11 @@ private void updateMinMaxValue(int index, double apdex, String agentId,
         }
     }
 
-    private List<DoubleApplicationStatPoint> createDoubleApplicationStatPoints(TimeWindow window, List<Double> min, List<String> minAgentId, List<Double> max, List<String> maxAgentId, List<Histogram> sumHistrogram) {
+    private List<DoubleApplicationStatPoint> createDoubleApplicationStatPoints(TimeWindow window, List<Double> min, List<String> minAgentId, List<Double> max, List<String> maxAgentId, List<Histogram> sumHistogram) {
         List<DoubleApplicationStatPoint> applicationStatPoints = new ArrayList<>();
         for (long timestamp : window) {
             int index = window.getWindowIndex(timestamp);
-            Histogram histogram = sumHistrogram.get(index);
+            Histogram histogram = sumHistogram.get(index);
             if (histogram.getTotalCount() != 0) {
                 double avg = ApdexScore.toDoubleFromHistogram(histogram);
                 DoubleApplicationStatPoint point = new DoubleApplicationStatPoint(timestamp, min.get(index), minAgentId.get(index), max.get(index), maxAgentId.get(index), avg);

diff --git a/web/src/main/java/com/navercorp/pinpoint/web/controller/ApdexScoreController.java b/web/src/main/java/com/navercorp/pinpoint/web/controller/ApdexScoreController.java
@@ -53,7 +53,7 @@ public ApdexScore getApdexScore(
         return apdexScoreService.selectApdexScoreData(application, range);
     }
 
-    @GetMapping(value = "/getApplicaionStat/apdexScore/chart")
+    @GetMapping(value = "/getApplicationStat/apdexScore/chart")
     public StatChart getApplicationApdexScoreChart(
             @RequestParam("applicationName") String applicationName,
             @RequestParam("serviceTypeCode") Short serviceTypeCode,
@@ -115,7 +115,7 @@ public StatChart getAgentApdexScoreChartData(
         return apdexScoreService.selectAgentChart(application, range, timeWindow, agentId);
     }
 
-    @GetMapping(value = "/getApplicaionStat/apdexScore/inspectorView")
+    @GetMapping(value = "/getApplicationStat/apdexScore/inspectorView")
     public InspectorView getApplicationApdexScoreView(
             @RequestParam("applicationName") String applicationName,
             @RequestParam("serviceTypeCode") Short serviceTypeCode,