mirror of
https://github.com/ebean-orm/ebean.git
synced 2026-11-22 15:10:02 +00:00
#2760 - Add ServerMetrics.asData() ... for consistency
This commit is contained in:
1 parent
01d5aa8199
commit
47b940f672
5 files changed
+29
-42
No files matched your search
@@ -42,6 +42,11 @@ public class BasicMetricVisitor extends AbstractMetricVisitor implements ServerM
|
|||||||
return new MetricsAsJson(this);
|
return new MetricsAsJson(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<MetricData> asData() {
|
||||||
|
return new MetricsAsData(this).data();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<MetaTimedMetric> timedMetrics() {
|
public List<MetaTimedMetric> timedMetrics() {
|
||||||
return timed;
|
return timed;
|
||||||
|
|||||||
@@ -17,21 +17,20 @@ public interface MetaInfoManager {
|
|||||||
ServerMetrics collectMetrics();
|
ServerMetrics collectMetrics();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Collect the metrics in raw JSON form.
|
* Deprecated migrate to collectMetrics().asJson().
|
||||||
* <pre>{@code
|
|
||||||
*
|
|
||||||
* String metricsJson = database.getMetaInfoManager()
|
|
||||||
* .collectMetricsAsJson()
|
|
||||||
* .json();
|
|
||||||
*
|
|
||||||
* }</pre>
|
|
||||||
*/
|
*/
|
||||||
ServerMetricsAsJson collectMetricsAsJson();
|
@Deprecated
|
||||||
|
default ServerMetricsAsJson collectMetricsAsJson() {
|
||||||
|
return collectMetrics().asJson();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return the metrics as a list of MetricData.
|
* Deprecated migrate to collectMetrics().asData().
|
||||||
*/
|
*/
|
||||||
List<MetricData> collectMetricsAsData();
|
@Deprecated
|
||||||
|
default List<MetricData> collectMetricsAsData() {
|
||||||
|
return collectMetrics().asData();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Visit the metrics resetting and collecting/reporting as desired.
|
* Visit the metrics resetting and collecting/reporting as desired.
|
||||||
|
|||||||
+9
-21
@@ -1,12 +1,4 @@
|
|||||||
package io.ebeaninternal.server.core;
|
package io.ebean.meta;
|
||||||
|
|
||||||
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.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -14,30 +6,26 @@ import java.util.List;
|
|||||||
/**
|
/**
|
||||||
* Dump the metrics into a list of MetricData.
|
* Dump the metrics into a list of MetricData.
|
||||||
*/
|
*/
|
||||||
final class DumpMetricsData {
|
final class MetricsAsData {
|
||||||
|
|
||||||
private final Database database;
|
private final ServerMetrics metrics;
|
||||||
private final List<MetricData> list = new ArrayList<>();
|
private final List<MetricData> list = new ArrayList<>();
|
||||||
|
|
||||||
DumpMetricsData(Database database) {
|
MetricsAsData(ServerMetrics metrics) {
|
||||||
this.database = database;
|
this.metrics = metrics;
|
||||||
}
|
}
|
||||||
|
|
||||||
List<MetricData> data() {
|
List<MetricData> data() {
|
||||||
collect(database.metaInfo().collectMetrics());
|
for (MetaTimedMetric metric : metrics.timedMetrics()) {
|
||||||
return list;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void collect(ServerMetrics serverMetrics) {
|
|
||||||
for (MetaTimedMetric metric : serverMetrics.timedMetrics()) {
|
|
||||||
add(metric);
|
add(metric);
|
||||||
}
|
}
|
||||||
for (MetaCountMetric metric : serverMetrics.countMetrics()) {
|
for (MetaCountMetric metric : metrics.countMetrics()) {
|
||||||
addCount(metric);
|
addCount(metric);
|
||||||
}
|
}
|
||||||
for (MetaQueryMetric metric : serverMetrics.queryMetrics()) {
|
for (MetaQueryMetric metric : metrics.queryMetrics()) {
|
||||||
addQuery(metric);
|
addQuery(metric);
|
||||||
}
|
}
|
||||||
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
private MetricData create(MetaMetric metric) {
|
private MetricData create(MetaMetric metric) {
|
||||||
@@ -17,6 +17,11 @@ public interface ServerMetrics {
|
|||||||
*/
|
*/
|
||||||
ServerMetricsAsJson asJson();
|
ServerMetricsAsJson asJson();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return the metrics as a list of MetricData.
|
||||||
|
*/
|
||||||
|
List<MetricData> asData();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Return timed metrics for Transactions, labelled SqlQuery, labelled SqlUpdate.
|
* Return timed metrics for Transactions, labelled SqlQuery, labelled SqlUpdate.
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -47,16 +47,6 @@ final class DefaultMetaInfoManager implements MetaInfoManager {
|
|||||||
return visitBasic();
|
return visitBasic();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public ServerMetricsAsJson collectMetricsAsJson() {
|
|
||||||
return collectMetrics().asJson();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public List<MetricData> collectMetricsAsData() {
|
|
||||||
return new DumpMetricsData(server).data();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BasicMetricVisitor visitBasic() {
|
public BasicMetricVisitor visitBasic() {
|
||||||
BasicMetricVisitor basic = new BasicMetricVisitor(server.name());
|
BasicMetricVisitor basic = new BasicMetricVisitor(server.name());
|
||||||
|
|||||||
Reference in new issue
Block a user