fixes #5 #6

Author: 吴就业

src/main/java/com/wujiuye/flow/BaseFlower.java

@@ -2,6 +2,7 @@
 
 import com.wujiuye.flow.common.*;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -62,8 +63,10 @@ public long exceptionAvg() {
      * @return
      */
     @Override
-    public long successAvg() {
-        return metric.success() / getWindowInterval(metric.getWindowInterval());
+    public float successAvg() {
+        float total = metric.success();
+        float windows = getWindowInterval(metric.getWindowInterval());
+        return total / windows;
     }
 
     /**

src/main/java/com/wujiuye/flow/Flower.java

@@ -61,7 +61,7 @@ default long total() {
      *
      * @return
      */
-    long successAvg();
+    float successAvg();
 
     /**
      * 平均耗时

src/main/java/com/wujiuye/flow/common/ArrayMetric.java

@@ -56,14 +56,15 @@ public long rt() {
     public long minRt() {
         // 确保当前时间的bucket不为空
         data.currentWindow();
-        long rt = 0;
+        long rt = Long.MAX_VALUE;
         List<MetricBucket> list = data.values();
         for (MetricBucket window : list) {
-            if (window.minRt() < rt || rt == 0) {
-                rt = window.minRt();
+            long wrt = window.minRt();
+            if (wrt > 0 && wrt < rt) {
+                rt = wrt;
             }
         }
-        return Math.max(1, rt);
+        return rt == Long.MAX_VALUE ? 0 : rt;
     }
 
     @Override
@@ -77,7 +78,7 @@ public long maxRt() {
                 rt = window.maxRt();
             }
         }
-        return Math.max(1, rt);
+        return rt;
     }
 
     @Override

src/main/java/com/wujiuye/flow/common/MetricBucket.java

@@ -40,6 +40,8 @@ private void add(MetricEvent event, long n) {
     }
 
     public void reset() {
+        minRt = Long.MAX_VALUE;
+        maxRt = Long.MIN_VALUE;
         for (MetricEvent event : MetricEvent.values()) {
             counters[event.ordinal()].reset();
         }

src/test/java/com/wujiuye/flow/FlowTest.java

@@ -17,7 +17,11 @@ public static void main(String[] args) throws InterruptedException {
         // 注册需要收集指标数据的Flower
         MetricPersistencer.registerFlower("test-resource", flowHelper.getFlow(FlowType.Minute));
         new Thread(() -> {
+            int i = 0;
             while (!Thread.interrupted()) {
+                if (i++ >= 100) {
+                    break;
+                }
                 try {
                     Thread.sleep(1);
                     flowHelper.incrSuccess(1);
@@ -38,23 +42,23 @@ public static void main(String[] args) throws InterruptedException {
                 System.out.println("最小请求耗时:" + flower.minRt());
                 System.out.println("平均请求成功数:" + flower.successAvg());
                 System.out.println("平均请求异常数:" + flower.exceptionAvg());
-                try {
-                    Thread.sleep(10000);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
                 System.out.println();
                 List<WindowWrap<MetricBucket>> buckets = flower.windows();
                 for (WindowWrap<MetricBucket> bucket : buckets) {
                     System.out.print("开始时间戳：" + bucket.windowStart() + "\t");
                     System.out.print("成功数：" + bucket.value().success() + "\t");
                     System.out.print("失败数：" + bucket.value().exception() + "\t");
-                    System.out.print("平均耗时：" + (bucket.value().rt() / bucket.value().success()) + "\t");
-                    System.out.print("最大数：" + bucket.value().maxRt() + "\t");
-                    System.out.print("最小数：" + bucket.value().minRt() + "\t");
+                    System.out.print("平均耗时：" + (bucket.value().success() > 0 ? (bucket.value().rt() / bucket.value().success()) : 0) + "\t");
+                    System.out.print("最大耗时：" + bucket.value().maxRt() + "\t");
+                    System.out.print("最小耗时：" + bucket.value().minRt() + "\t");
                     System.out.println();
                 }
                 System.out.println("======================================================");
+                try {
+                    Thread.sleep(1000 * 60);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
             }
         }).start();
         Thread.sleep(Integer.MAX_VALUE);