支持采集TPS

dbsyncer-biz/src/main/java/org/dbsyncer/biz/vo/AppReportMetricVo.java

@@ -12,6 +12,8 @@ public class AppReportMetricVo extends AppReportMetric {
 
     private HistoryStackVo memory;
 
+    private HistoryStackVo tps;
+
     public List<MetricResponseVo> getMetrics() {
         return metrics;
     }
@@ -35,4 +37,12 @@ public class AppReportMetricVo extends AppReportMetric {
     public void setMemory(HistoryStackVo memory) {
         this.memory = memory;
     }
+
+    public HistoryStackVo getTps() {
+        return tps;
+    }
+
+    public void setTps(HistoryStackVo tps) {
+        this.tps = tps;
+    }
 }

dbsyncer-common/src/main/java/org/dbsyncer/common/metric/TimeRegistry.java

@@ -16,6 +16,8 @@ import java.util.concurrent.ConcurrentHashMap;
 @Component
 public final class TimeRegistry {
 
+    public static final String GENERAL_BUFFER_ACTUATOR_TPS = "general.buffer.actuator.tps";
+
     private Map<String, TimeMetric> metricMap = new ConcurrentHashMap<>();
 
     public TimeMetric meter(String name) {

dbsyncer-parser/src/main/java/org/dbsyncer/parser/flush/impl/GeneralBufferActuator.java

@@ -174,7 +174,7 @@ public class GeneralBufferActuator extends AbstractBufferActuator<WriterRequest,
     @Override
     protected void meter(TimeRegistry timeRegistry, long count) {
         // 统计执行器同步效率TPS
-        timeRegistry.meter("general.buffer.actuator.tps").add(count);
+        timeRegistry.meter(TimeRegistry.GENERAL_BUFFER_ACTUATOR_TPS).add(count);
     }
 
     @Override

dbsyncer-web/src/main/java/org/dbsyncer/web/controller/monitor/MonitorController.java

@@ -12,6 +12,7 @@ import org.dbsyncer.biz.model.Sample;
 import org.dbsyncer.biz.vo.AppReportMetricVo;
 import org.dbsyncer.biz.vo.HistoryStackVo;
 import org.dbsyncer.biz.vo.RestResult;
+import org.dbsyncer.common.metric.TimeRegistry;
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.common.util.DateFormatUtil;
 import org.dbsyncer.manager.impl.PreloadTemplate;
@@ -47,6 +48,7 @@ public class MonitorController extends BaseController {
     private final static int COUNT = 24;
     private HistoryStackVo cpu = new HistoryStackVo();
     private HistoryStackVo memory = new HistoryStackVo();
+    private HistoryStackVo tps = new HistoryStackVo();
 
     @Resource
     private MonitorService monitorService;
@@ -75,6 +77,9 @@ public class MonitorController extends BaseController {
     @Resource
     private HistoryStackValueFormatter memoryHistoryStackValueFormatterImpl;
 
+    @Resource
+    private TimeRegistry timeRegistry;
+
     @RequestMapping("")
     public String index(HttpServletRequest request, ModelMap model) {
         Map<String, String> params = getParams(request);
@@ -97,6 +102,7 @@ public class MonitorController extends BaseController {
     public void recordHistoryStackMetric() {
         recordHistoryStackMetric(MetricEnum.CPU_USAGE, cpu, cpuHistoryStackValueFormatterImpl);
         recordHistoryStackMetric(MetricEnum.MEMORY_USED, memory, memoryHistoryStackValueFormatterImpl);
+        addHistoryStack(tps, timeRegistry.meter(TimeRegistry.GENERAL_BUFFER_ACTUATOR_TPS).getSecondsRate());
     }
 
     @Scheduled(fixedRate = 10000)
@@ -184,6 +190,7 @@ public class MonitorController extends BaseController {
             AppReportMetricVo reportMetric = monitorService.queryAppReportMetric(list);
             reportMetric.setCpu(cpu);
             reportMetric.setMemory(memory);
+            reportMetric.setTps(tps);
             return RestResult.restSuccess(reportMetric);
         } catch (Exception e) {
             logger.error(e.getLocalizedMessage(), e.getClass());
@@ -243,11 +250,15 @@ public class MonitorController extends BaseController {
         MetricResponse metricResponse = getMetricResponse(metricEnum.getCode());
         List<Sample> measurements = metricResponse.getMeasurements();
         if (!CollectionUtils.isEmpty(measurements)) {
-            addHistoryStack(stackVo.getValue(), formatter.formatValue(measurements.get(0).getValue()));
-            addHistoryStack(stackVo.getName(), DateFormatUtil.getCurrentTime());
+            addHistoryStack(stackVo, formatter.formatValue(measurements.get(0).getValue()));
         }
     }
 
+    private void addHistoryStack(HistoryStackVo stackVo, Object value) {
+        addHistoryStack(stackVo.getValue(), value);
+        addHistoryStack(stackVo.getName(), DateFormatUtil.getCurrentTime());
+    }
+
     private void addHistoryStack(List<Object> stack, Object value) {
         if (stack.size() >= COUNT) {
             stack.remove(0);