#2760 - Add ServerMetrics.asData() ... for consistency

This commit is contained in:
Rob Bygrave committed 2022-08-02 08:35:48 +12:00
1 parent 01d5aa8199
commit 47b940f672
5 files changed
+29 -42

No files matched your search

@@ -47,16 +47,6 @@ final class DefaultMetaInfoManager implements MetaInfoManager {
return visitBasic();
}
@Override
public ServerMetricsAsJson collectMetricsAsJson() {
return collectMetrics().asJson();
}
@Override
public List<MetricData> collectMetricsAsData() {
return new DumpMetricsData(server).data();
}
@Override
public BasicMetricVisitor visitBasic() {
BasicMetricVisitor basic = new BasicMetricVisitor(server.name());
@@ -1,78 +0,0 @@
package io.ebeaninternal.server.core;
import io.ebean.Database;
import io.ebean.meta.MetaCountMetric;
import io.ebean.meta.MetaMetric;
import io.ebean.meta.MetaQueryMetric;
import io.ebean.meta.MetaTimedMetric;
import io.ebean.meta.MetricData;
import io.ebean.meta.ServerMetrics;
import java.util.ArrayList;
import java.util.List;
/**
* Dump the metrics into a list of MetricData.
*/
final class DumpMetricsData {
private final Database database;
private final List<MetricData> list = new ArrayList<>();
DumpMetricsData(Database database) {
this.database = database;
}
List<MetricData> data() {
collect(database.metaInfo().collectMetrics());
return list;
}
private void collect(ServerMetrics serverMetrics) {
for (MetaTimedMetric metric : serverMetrics.timedMetrics()) {
add(metric);
}
for (MetaCountMetric metric : serverMetrics.countMetrics()) {
addCount(metric);
}
for (MetaQueryMetric metric : serverMetrics.queryMetrics()) {
addQuery(metric);
}
}
private MetricData create(MetaMetric metric) {
MetricData data = new MetricData(metric.name());
list.add(data);
return data;
}
private void add(MetaTimedMetric metric) {
final MetricData data = create(metric);
appendCounters(data, metric);
data.setLoc(metric.location());
}
private void addCount(MetaCountMetric metric) {
final MetricData data = create(metric);
data.setCount(metric.count());
}
private void addQuery(MetaQueryMetric metric) {
final MetricData data = create(metric);
appendCounters(data, metric);
appendLocationAndSql(data, metric);
data.setHash(metric.hash());
}
private void appendLocationAndSql(MetricData data, MetaQueryMetric metric) {
data.setLoc(metric.location());
data.setSql(metric.sql());
}
private void appendCounters(MetricData data, MetaTimedMetric timedMetric) {
data.setCount(timedMetric.count());
data.setTotal(timedMetric.total());
data.setMean(timedMetric.mean());
data.setMax(timedMetric.max());
}
}