[pinpoint-apm#9712] Add apdex to uri statistics summary

ga-ram · ga-ram · commit c9c35b874e9b · 2023-02-24T18:01:30.000+09:00
diff --git a/uristat/uristat-common/src/main/java/com/navercorp/pinpoint/uristat/common/model/UriStat.java b/uristat/uristat-common/src/main/java/com/navercorp/pinpoint/uristat/common/model/UriStat.java
@@ -30,6 +30,7 @@ public class UriStat {
     private final String applicationName;
     private final String agentId;
     private final String uri;
+    private final double apdexRaw;
     private final long count;
     private final long failCount;
     private final long maxLatencyMs;
@@ -52,6 +53,7 @@ public UriStat(long timestamp, String tenantId, String serviceName, String appli
         this.failureHistogram = Objects.requireNonNull(failureHistogram, "totalHistogram");
         this.count = Arrays.stream(totalHistogram).sum();
         this.failCount = Arrays.stream(failureHistogram).sum();
+        this.apdexRaw = (totalHistogram[0] + totalHistogram[1] + totalHistogram[2] + totalHistogram[3] + (0.5 * totalHistogram[4]));
         this.version = version;
     }
 
@@ -69,6 +71,7 @@ public UriStat(long timestamp, double tot0, double tot1, double tot2, double tot
         this.failCount = EMPTY_NUMBER;
         this.maxLatencyMs = EMPTY_NUMBER;
         this.totalTimeMs = EMPTY_NUMBER;
+        this.apdexRaw = EMPTY_NUMBER;
         this.totalHistogram = new int[]{(int) tot0, (int) tot1, (int) tot2, (int) tot3, (int) tot4, (int) tot5, (int) tot6, (int) tot7};
         this.failureHistogram = new int[]{(int) fail0, (int) fail1, (int) fail2, (int) fail3, (int) fail4, (int) fail5, (int) fail6, (int) fail7};
         this.version = version;
@@ -94,6 +97,10 @@ public String getUri() {
         return uri;
     }
 
+    public double getApdexRaw() {
+        return apdexRaw;
+    }
+
     public long getCount() {
         return count;
     }
@@ -199,6 +206,7 @@ public String toString() {
                 ", applicationName='" + applicationName + '\'' +
                 ", agentId='" + agentId + '\'' +
                 ", uri=" + uri +
+                ", apdexRaw= " + apdexRaw +
                 ", count=" + count +
                 ", maxLatencyMs=" + maxLatencyMs +
                 ", totalTimeMs=" + totalTimeMs +
diff --git a/uristat/uristat-common/src/main/pinot/pinot-uriStat-schema.json b/uristat/uristat-common/src/main/pinot/pinot-uriStat-schema.json
@@ -29,6 +29,11 @@
     }
   ],
   "metricFieldSpecs": [
+    {
+      "name": "apdexRaw",
+      "dataType": "DOUBLE",
+      "defaultNullValue": -1.0
+    },
     {
       "name": "count",
       "dataType": "LONG"
diff --git a/uristat/uristat-web/src/main/java/com/navercorp/pinpoint/uristat/web/controller/UriStatController.java b/uristat/uristat-web/src/main/java/com/navercorp/pinpoint/uristat/web/controller/UriStatController.java
@@ -49,7 +49,32 @@ public UriStatController(UriStatService uriStatService, TenantProvider tenantPro
         this.tenantProvider = Objects.requireNonNull(tenantProvider, "tenantProvider");
     }
 
+    @GetMapping("summary")
+    public List<UriStatSummary> getUriStatPagedSummary(@RequestParam("applicationName") String applicationName,
+                                                  @RequestParam(value = "agentId", required = false) String agentId,
+                                                  @RequestParam("from") long from,
+                                                  @RequestParam("to") long to,
+                                                  @RequestParam("orderby") String column,
+                                                  @RequestParam("isDesc") boolean isDesc,
+                                                  @RequestParam("count") int count) {
+        UriStatQueryParameter.Builder builder = new UriStatQueryParameter.Builder();
+        builder.setTenantId(tenantProvider.getTenantId());
+        builder.setApplicationName(applicationName);
+        builder.setRange(Range.newRange(from, to));
+        builder.setOrderby(column);
+        builder.setDesc(isDesc);
+        builder.setLimit(count);
+
+        if (StringUtils.isEmpty(agentId)) {
+            return uriStatService.getUriStatApplicationPagedSummary(builder.build());
+        } else {
+            builder.setAgentId(agentId);
+            return uriStatService.getUriStatAgentPagedSummary(builder.build());
+        }
+    }
+
     @GetMapping("top50")
+    @Deprecated
     public List<UriStatSummary> getUriStatSummary(@RequestParam("applicationName") String applicationName,
                                             @RequestParam(value = "agentId", required = false) String agentId,
                                             @RequestParam("from") long from,
diff --git a/uristat/uristat-web/src/main/java/com/navercorp/pinpoint/uristat/web/dao/PinotUriStatDao.java b/uristat/uristat-web/src/main/java/com/navercorp/pinpoint/uristat/web/dao/PinotUriStatDao.java
@@ -26,6 +26,7 @@
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 
 @Repository
@@ -51,12 +52,25 @@ public List<UriStat> getUriStatAgent(UriStatQueryParameter queryParameter) {
     }
 
     @Override
+    public List<UriStatSummary> getUriStatApplicationPagedSummary(UriStatQueryParameter queryParameter) {
+        return sqlPinotSessionTemplate.selectList(NAMESPACE + "uriStatApplicationSummary", queryParameter);
+    }
+
+    @Override
+    public List<UriStatSummary> getUriStatAgentPagedSummary(UriStatQueryParameter queryParameter) {
+        return sqlPinotSessionTemplate.selectList(NAMESPACE + "uriStatAgentSummary", queryParameter);
+    }
+
+    @Override
+    @Deprecated
     public List<UriStatSummary> getUriStatApplicationSummary(UriStatQueryParameter queryParameter) {
         return sqlPinotSessionTemplate.selectList(NAMESPACE + "top50UriStatApplication", queryParameter);
     }
 
     @Override
+    @Deprecated
     public List<UriStatSummary> getUriStatAgentSummary(UriStatQueryParameter queryParameter) {
         return sqlPinotSessionTemplate.selectList(NAMESPACE + "top50UriStatAgent", queryParameter);
     }
+
 }
diff --git a/uristat/uristat-web/src/main/java/com/navercorp/pinpoint/uristat/web/dao/UriStatDao.java b/uristat/uristat-web/src/main/java/com/navercorp/pinpoint/uristat/web/dao/UriStatDao.java
@@ -21,10 +21,16 @@
 import com.navercorp.pinpoint.uristat.web.util.UriStatQueryParameter;
 
 import java.util.List;
+import java.util.Map;
 
 public interface UriStatDao {
     List<UriStat> getUriStatApplication(UriStatQueryParameter queryParameter);
     List<UriStat> getUriStatAgent(UriStatQueryParameter queryParameter);
+    @Deprecated
     List<UriStatSummary> getUriStatApplicationSummary(UriStatQueryParameter uriStatQueryParameter);
+    @Deprecated
     List<UriStatSummary> getUriStatAgentSummary(UriStatQueryParameter uriStatQueryParameter);
+    List<UriStatSummary> getUriStatApplicationPagedSummary(UriStatQueryParameter uriStatQueryParameter);
+    List<UriStatSummary> getUriStatAgentPagedSummary(UriStatQueryParameter uriStatQueryParameter);
+
 }
diff --git a/uristat/uristat-web/src/main/java/com/navercorp/pinpoint/uristat/web/model/UriStatSummary.java b/uristat/uristat-web/src/main/java/com/navercorp/pinpoint/uristat/web/model/UriStatSummary.java
@@ -24,22 +24,37 @@ public class UriStatSummary {
     private final double failureCount;
     private final double maxTimeMs;
     private final double avgTimeMs;
+    private final double apdex;
     private final int version;
 
-    public UriStatSummary(String uri, double totalCount, double failureCount, double maxTimeMs, double totalTimeMs, int version) {
+    public UriStatSummary(String uri, double apdexRaw, double apdexCount, double totalCount, double failureCount, double maxTimeMs, double totalTimeMs, int version) {
         this.uri = uri;
+        this.apdex = MathUtils.average(apdexRaw, apdexCount);
         this.totalCount = totalCount;
         this.failureCount = failureCount;
         this.maxTimeMs = maxTimeMs;
         this.avgTimeMs = MathUtils.average(totalTimeMs, totalCount);
         this.version = version;
     }
 
-
+    @Deprecated
+    public UriStatSummary(String uri, double totalCount, double failureCount, double maxTimeMs, double totalTimeMs, int version) {
+        this.uri = uri;
+        this.apdex = 0;
+        this.totalCount = totalCount;
+        this.failureCount = failureCount;
+        this.maxTimeMs = maxTimeMs;
+        this.avgTimeMs = MathUtils.average(totalTimeMs, totalCount);
+        this.version = version;
+    }
     public String getUri() {
         return uri;
     }
 
+    public double getApdex() {
+        return apdex;
+    }
+
     public double getTotalCount() {
         return totalCount;
     }
diff --git a/uristat/uristat-web/src/main/java/com/navercorp/pinpoint/uristat/web/service/UriStatService.java b/uristat/uristat-web/src/main/java/com/navercorp/pinpoint/uristat/web/service/UriStatService.java
@@ -25,6 +25,11 @@
 public interface UriStatService {
     List<UriStat> getCollectedUriStatApplication(UriStatQueryParameter queryParameter);
     List<UriStat> getCollectedUriStatAgent(UriStatQueryParameter queryParameter);
+    @Deprecated
     List<UriStatSummary> getUriStatApplicationSummary(UriStatQueryParameter queryParameter);
+    @Deprecated
     List<UriStatSummary> getUriStatAgentSummary(UriStatQueryParameter queryParameter);
+    List<UriStatSummary> getUriStatApplicationPagedSummary(UriStatQueryParameter queryParameter);
+    List<UriStatSummary> getUriStatAgentPagedSummary(UriStatQueryParameter queryParameter);
+
 }
diff --git a/uristat/uristat-web/src/main/java/com/navercorp/pinpoint/uristat/web/service/UriStatServiceImpl.java b/uristat/uristat-web/src/main/java/com/navercorp/pinpoint/uristat/web/service/UriStatServiceImpl.java
@@ -45,12 +45,25 @@ public List<UriStat> getCollectedUriStatAgent(UriStatQueryParameter queryParamet
     }
 
     @Override
+    @Deprecated
     public List<UriStatSummary> getUriStatApplicationSummary(UriStatQueryParameter queryParameter) {
         return uriStatDao.getUriStatApplicationSummary(queryParameter);
     }
 
     @Override
+    @Deprecated
     public List<UriStatSummary> getUriStatAgentSummary(UriStatQueryParameter queryParameter) {
         return uriStatDao.getUriStatAgentSummary(queryParameter);
     }
+
+    @Override
+    public List<UriStatSummary> getUriStatApplicationPagedSummary(UriStatQueryParameter queryParameter) {
+        return uriStatDao.getUriStatApplicationPagedSummary(queryParameter);
+    }
+
+    @Override
+    public List<UriStatSummary> getUriStatAgentPagedSummary(UriStatQueryParameter queryParameter) {
+        return uriStatDao.getUriStatAgentPagedSummary(queryParameter);
+    }
+
 }
diff --git a/uristat/uristat-web/src/main/java/com/navercorp/pinpoint/uristat/web/util/UriStatQueryParameter.java b/uristat/uristat-web/src/main/java/com/navercorp/pinpoint/uristat/web/util/UriStatQueryParameter.java
@@ -19,6 +19,7 @@
 import com.navercorp.pinpoint.metric.web.util.QueryParameter;
 import com.navercorp.pinpoint.metric.web.util.TimePrecision;
 
+import java.security.InvalidParameterException;
 import java.util.concurrent.TimeUnit;
 
 public class UriStatQueryParameter extends QueryParameter {
@@ -27,6 +28,45 @@ public class UriStatQueryParameter extends QueryParameter {
     private final String applicationName;
     private final String agentId;
     private final String uri;
+    private final OrderBy orderBy;
+    private final String isDesc;
+
+
+    private enum OrderBy {
+        URI("uri"),
+        APDEX("apdex"),
+        TOTAL("totalCount"),
+        FAILURE("failureCount"),
+        MAX("maxTimeMs"),
+        AVG("avgTimeMs");
+
+        private final String value;
+
+        OrderBy(String value) {
+            this.value = value;
+        }
+
+        public static OrderBy fromValue(String value) {
+            for (OrderBy orderBy : OrderBy.values()) {
+                if (orderBy.value.equalsIgnoreCase(value)) {
+                    return orderBy;
+                }
+            }
+            return null;
+        }
+
+        @Override
+        public String toString() {
+            switch(this) {
+                case APDEX:
+                    return "(apdexRaw / apdexCount)";
+                case AVG:
+                    return "(totalTimeMs / totalCount)";
+                default:
+                    return this.value;
+            }
+        }
+    }
 
     protected UriStatQueryParameter(Builder builder) {
         super(builder.getRange(), builder.getTimePrecision(), builder.getLimit());
@@ -35,6 +75,8 @@ protected UriStatQueryParameter(Builder builder) {
         this.applicationName = builder.applicationName;
         this.agentId = builder.agentId;
         this.uri = builder.uri;
+        this.orderBy = builder.orderBy;
+        this.isDesc = builder.isDesc;
     }
 
     public static class Builder extends QueryParameter.Builder {
@@ -43,6 +85,8 @@ public static class Builder extends QueryParameter.Builder {
         private String applicationName;
         private String agentId;
         private String uri;
+        private OrderBy orderBy;
+        private String isDesc;
 
         public void setTenantId(String tenantId) {
             this.tenantId = tenantId;
@@ -61,12 +105,41 @@ public void setAgentId(String agentId) {
 
         public void setUri(String uri) { this.uri = uri; }
 
+        public void setOrderby(String orderBy) throws InvalidParameterException {
+            this.orderBy = OrderBy.fromValue(orderBy);
+            if (this.orderBy == null) {
+                throw new InvalidParameterException("Invalid order by type : " + orderBy + " not supported.");
+            }
+        }
+
+        public void setDesc(boolean desc) {
+            if (desc) {
+                isDesc = "desc";
+            } else {
+                isDesc = "asc";
+            }
+        }
+
+        public void setLimit(long limit) {
+            if (limit > 200) {
+                this.limit = 200;
+            } else if (limit < 50) {
+                this.limit = 50;
+            } else {
+                this.limit = limit;
+            }
+        }
+
         @Override
         public UriStatQueryParameter build() {
             if (timePrecision == null) {
                 this.timePrecision = TimePrecision.newTimePrecision(TimeUnit.MILLISECONDS, 30000);
             }
-            this.limit = estimateLimit();
+
+            if (limit == 0) {
+                this.limit = estimateLimit();
+            }
+
             return new UriStatQueryParameter(this);
         }
     }
diff --git a/uristat/uristat-web/src/main/resources/mapper/uristat/UriStatMapper.xml b/uristat/uristat-web/src/main/resources/mapper/uristat/UriStatMapper.xml

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,11 @@`
`29`	`29`	`}`
`30`	`30`	`],`
`31`	`31`	`"metricFieldSpecs": [`
	`32`	`+ {`
	`33`	`+ "name": "apdexRaw",`
	`34`	`+ "dataType": "DOUBLE",`
	`35`	`+ "defaultNullValue": -1.0`
	`36`	`+ },`
`32`	`37`	`{`
`33`	`38`	`"name": "count",`
`34`	`39`	`"dataType": "LONG"`
Original file line number	Diff line number	Diff line change
`@@ -45,12 +45,25 @@ public List<UriStat> getCollectedUriStatAgent(UriStatQueryParameter queryParamet`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`@Override`
	`48`	`+ @Deprecated`
`48`	`49`	`public List<UriStatSummary> getUriStatApplicationSummary(UriStatQueryParameter queryParameter) {`
`49`	`50`	`return uriStatDao.getUriStatApplicationSummary(queryParameter);`
`50`	`51`	`}`
`51`	`52`
`52`	`53`	`@Override`
	`54`	`+ @Deprecated`
`53`	`55`	`public List<UriStatSummary> getUriStatAgentSummary(UriStatQueryParameter queryParameter) {`
`54`	`56`	`return uriStatDao.getUriStatAgentSummary(queryParameter);`
`55`	`57`	`}`
	`58`	`+`
	`59`	`+ @Override`
	`60`	`+ public List<UriStatSummary> getUriStatApplicationPagedSummary(UriStatQueryParameter queryParameter) {`
	`61`	`+ return uriStatDao.getUriStatApplicationPagedSummary(queryParameter);`
	`62`	`+ }`
	`63`	`+`
	`64`	`+ @Override`
	`65`	`+ public List<UriStatSummary> getUriStatAgentPagedSummary(UriStatQueryParameter queryParameter) {`
	`66`	`+ return uriStatDao.getUriStatAgentPagedSummary(queryParameter);`
	`67`	`+ }`
	`68`	`+`
`56`	`69`	`}`