diff --git a/src/main/java/io/ebean/meta/MetaMetric.java b/src/main/java/io/ebean/meta/MetaMetric.java index c6ab21c59..0d716fe23 100644 --- a/src/main/java/io/ebean/meta/MetaMetric.java +++ b/src/main/java/io/ebean/meta/MetaMetric.java @@ -5,11 +5,6 @@ package io.ebean.meta; */ public interface MetaMetric { - /** - * Return the metric type. - */ - MetricType getMetricType(); - /** * Return the metric name. */ diff --git a/src/main/java/io/ebean/meta/MetricData.java b/src/main/java/io/ebean/meta/MetricData.java index ab67aae33..b4606b1d7 100644 --- a/src/main/java/io/ebean/meta/MetricData.java +++ b/src/main/java/io/ebean/meta/MetricData.java @@ -6,7 +6,6 @@ package io.ebean.meta; public class MetricData { private String name; - private String type; private String hash; private String loc; private String sql; @@ -16,9 +15,8 @@ public class MetricData { private Long max; private Long total; - public MetricData(String name, String type) { + public MetricData(String name) { this.name = name; - this.type = type; } public MetricData() { @@ -32,14 +30,6 @@ public class MetricData { this.name = name; } - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - public String getHash() { return hash; } diff --git a/src/main/java/io/ebean/meta/MetricType.java b/src/main/java/io/ebean/meta/MetricType.java deleted file mode 100644 index 0a79bb7f4..000000000 --- a/src/main/java/io/ebean/meta/MetricType.java +++ /dev/null @@ -1,40 +0,0 @@ -package io.ebean.meta; - -/** - * The type of Metric. - */ -public enum MetricType { - - /** - * Transactions. - */ - TXN, - - /** - * ORM Insert Update or Delete. - */ - IUD, - - /** - * ORM queries. - */ - ORM, - - /** - * DTO queries. - */ - DTO, - - /** - * SQL queries with a label will have metrics collected. - *

- * SqlQuery and SqlUpdate without a label have no metrics collected. - */ - SQL, - - /** - * L2 cache metrics. - */ - L2 - -} diff --git a/src/main/java/io/ebean/metric/MetricFactory.java b/src/main/java/io/ebean/metric/MetricFactory.java index d7eed095a..d5fb8bd28 100644 --- a/src/main/java/io/ebean/metric/MetricFactory.java +++ b/src/main/java/io/ebean/metric/MetricFactory.java @@ -1,7 +1,6 @@ package io.ebean.metric; import io.ebean.ProfileLocation; -import io.ebean.meta.MetricType; /** * Factory to create timed metric counters. @@ -18,21 +17,21 @@ public interface MetricFactory { /** * Create a timed metric group. */ - TimedMetricMap createTimedMetricMap(MetricType metricType, String name); + TimedMetricMap createTimedMetricMap(String name); /** * Create a Timed metric. */ - TimedMetric createTimedMetric(MetricType metricType, String name); + TimedMetric createTimedMetric(String name); /** * Create a counter metric. */ - CountMetric createCountMetric(MetricType metricType, String name); + CountMetric createCountMetric(String name); /** * Create a Timed metric. */ - QueryPlanMetric createQueryPlanMetric(MetricType metricType, Class type, String label, ProfileLocation profileLocation, String sql); + QueryPlanMetric createQueryPlanMetric(Class type, String label, ProfileLocation profileLocation, String sql); } diff --git a/src/main/java/io/ebeaninternal/api/ExtraMetrics.java b/src/main/java/io/ebeaninternal/api/ExtraMetrics.java index 2d950c40a..5d6f79527 100644 --- a/src/main/java/io/ebeaninternal/api/ExtraMetrics.java +++ b/src/main/java/io/ebeaninternal/api/ExtraMetrics.java @@ -1,6 +1,5 @@ package io.ebeaninternal.api; -import io.ebean.meta.MetricType; import io.ebean.meta.MetricVisitor; import io.ebean.metric.CountMetric; import io.ebean.metric.MetricFactory; @@ -22,11 +21,11 @@ public class ExtraMetrics { */ public ExtraMetrics() { final MetricFactory factory = MetricFactory.get(); - this.bindCapture = factory.createTimedMetric(MetricType.ORM, "ebean.queryplan.bindcapture"); - this.planCollect = factory.createTimedMetric(MetricType.ORM, "ebean.queryplan.collect"); - this.loadOneL2 = factory.createCountMetric(MetricType.ORM, "loadone.l2"); - this.loadOneRef = factory.createCountMetric(MetricType.ORM, "loadone.ref"); - this.loadOneNoLoader = factory.createCountMetric(MetricType.ORM, "loadone.noloader"); + this.bindCapture = factory.createTimedMetric("ebean.queryplan.bindcapture"); + this.planCollect = factory.createTimedMetric("ebean.queryplan.collect"); + this.loadOneL2 = factory.createCountMetric("loadone.l2"); + this.loadOneRef = factory.createCountMetric("loadone.ref"); + this.loadOneNoLoader = factory.createCountMetric("loadone.noloader"); } /** diff --git a/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java b/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java index a008c178d..d0c44de1e 100644 --- a/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java +++ b/src/main/java/io/ebeaninternal/server/cache/DefaultServerCache.java @@ -18,8 +18,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; -import static io.ebean.meta.MetricType.L2; - /** * The default cache implementation. *

@@ -74,12 +72,12 @@ public class DefaultServerCache implements ServerCache { MetricFactory factory = MetricFactory.get(); String prefix = "l2n."; - this.hitCount = factory.createCountMetric(L2, prefix + shortName + ".hit"); - this.missCount = factory.createCountMetric(L2, prefix + shortName + ".miss"); - this.putCount = factory.createCountMetric(L2, prefix + shortName + ".put"); - this.removeCount = factory.createCountMetric(L2, prefix + shortName + ".remove"); - this.clearCount = factory.createCountMetric(L2, prefix + shortName + ".clear"); - this.evictCount = factory.createCountMetric(L2, prefix + shortName + ".evict"); + this.hitCount = factory.createCountMetric(prefix + shortName + ".hit"); + this.missCount = factory.createCountMetric(prefix + shortName + ".miss"); + this.putCount = factory.createCountMetric(prefix + shortName + ".put"); + this.removeCount = factory.createCountMetric(prefix + shortName + ".remove"); + this.clearCount = factory.createCountMetric(prefix + shortName + ".clear"); + this.evictCount = factory.createCountMetric(prefix + shortName + ".evict"); } public void periodicTrim(BackgroundExecutor executor) { diff --git a/src/main/java/io/ebeaninternal/server/core/DumpMetricsData.java b/src/main/java/io/ebeaninternal/server/core/DumpMetricsData.java index 375e3d722..9854cafea 100644 --- a/src/main/java/io/ebeaninternal/server/core/DumpMetricsData.java +++ b/src/main/java/io/ebeaninternal/server/core/DumpMetricsData.java @@ -47,7 +47,7 @@ class DumpMetricsData { } private MetricData create(MetaMetric metric) { - MetricData data = new MetricData(metric.getName(), metric.getMetricType().name()); + MetricData data = new MetricData(metric.getName()); list.add(data); return data; } diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanIudMetrics.java b/src/main/java/io/ebeaninternal/server/deploy/BeanIudMetrics.java index 0780c733d..889716aa3 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanIudMetrics.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanIudMetrics.java @@ -1,6 +1,5 @@ package io.ebeaninternal.server.deploy; -import io.ebean.meta.MetricType; import io.ebean.meta.MetricVisitor; import io.ebean.metric.MetricFactory; import io.ebean.metric.TimedMetric; @@ -25,12 +24,12 @@ class BeanIudMetrics { MetricFactory metricFactory = MetricFactory.get(); String prefix = "iud." + beanShortName; - this.insert = metricFactory.createTimedMetric(MetricType.IUD, prefix + ".insert"); - this.update = metricFactory.createTimedMetric(MetricType.IUD, prefix + ".update"); - this.delete = metricFactory.createTimedMetric(MetricType.IUD, prefix + ".delete"); - this.insertBatch = metricFactory.createTimedMetric(MetricType.IUD, prefix + ".insertBatch"); - this.updateBatch = metricFactory.createTimedMetric(MetricType.IUD, prefix + ".updateBatch"); - this.deleteBatch = metricFactory.createTimedMetric(MetricType.IUD, prefix + ".deleteBatch"); + this.insert = metricFactory.createTimedMetric(prefix + ".insert"); + this.update = metricFactory.createTimedMetric(prefix + ".update"); + this.delete = metricFactory.createTimedMetric(prefix + ".delete"); + this.insertBatch = metricFactory.createTimedMetric(prefix + ".insertBatch"); + this.updateBatch = metricFactory.createTimedMetric(prefix + ".updateBatch"); + this.deleteBatch = metricFactory.createTimedMetric(prefix + ".deleteBatch"); } /** diff --git a/src/main/java/io/ebeaninternal/server/dto/DtoMappingRequest.java b/src/main/java/io/ebeaninternal/server/dto/DtoMappingRequest.java index 588d7450c..1562c9961 100644 --- a/src/main/java/io/ebeaninternal/server/dto/DtoMappingRequest.java +++ b/src/main/java/io/ebeaninternal/server/dto/DtoMappingRequest.java @@ -1,7 +1,6 @@ package io.ebeaninternal.server.dto; import io.ebean.ProfileLocation; -import io.ebean.meta.MetricType; import io.ebean.metric.MetricFactory; import io.ebean.metric.QueryPlanMetric; import io.ebeaninternal.api.SpiDtoQuery; @@ -49,6 +48,6 @@ public class DtoMappingRequest { } public QueryPlanMetric createMetric() { - return MetricFactory.get().createQueryPlanMetric(MetricType.DTO, type, label, profileLocation, sql); + return MetricFactory.get().createQueryPlanMetric(type, label, profileLocation, sql); } } diff --git a/src/main/java/io/ebeaninternal/server/persist/DefaultPersistExecute.java b/src/main/java/io/ebeaninternal/server/persist/DefaultPersistExecute.java index 2d9f400b5..c5fbde3a8 100644 --- a/src/main/java/io/ebeaninternal/server/persist/DefaultPersistExecute.java +++ b/src/main/java/io/ebeaninternal/server/persist/DefaultPersistExecute.java @@ -1,6 +1,5 @@ package io.ebeaninternal.server.persist; -import io.ebean.meta.MetricType; import io.ebean.meta.MetricVisitor; import io.ebean.metric.MetricFactory; import io.ebean.metric.TimedMetricMap; @@ -42,9 +41,9 @@ final class DefaultPersistExecute implements PersistExecute { this.exeUpdateSql = new ExeUpdateSql(binder); this.exeCallableSql = new ExeCallableSql(binder); this.defaultBatchSize = defaultBatchSize; - this.ormUpdateMetric = MetricFactory.get().createTimedMetricMap(MetricType.SQL, "orm.update."); - this.sqlUpdateMetric = MetricFactory.get().createTimedMetricMap(MetricType.SQL, "sql.update."); - this.sqlCallMetric = MetricFactory.get().createTimedMetricMap(MetricType.SQL, "sql.call."); + this.ormUpdateMetric = MetricFactory.get().createTimedMetricMap("orm.update."); + this.sqlUpdateMetric = MetricFactory.get().createTimedMetricMap("sql.update."); + this.sqlCallMetric = MetricFactory.get().createTimedMetricMap("sql.call."); } @Override diff --git a/src/main/java/io/ebeaninternal/server/profile/DCountMetric.java b/src/main/java/io/ebeaninternal/server/profile/DCountMetric.java index fa1a622fb..2cf7a25a7 100644 --- a/src/main/java/io/ebeaninternal/server/profile/DCountMetric.java +++ b/src/main/java/io/ebeaninternal/server/profile/DCountMetric.java @@ -1,6 +1,5 @@ package io.ebeaninternal.server.profile; -import io.ebean.meta.MetricType; import io.ebean.meta.MetricVisitor; import io.ebean.metric.CountMetric; import io.ebean.metric.CountMetricStats; @@ -12,14 +11,11 @@ import java.util.concurrent.atomic.LongAdder; */ class DCountMetric implements CountMetric { - private final MetricType metricType; - private final String name; private final LongAdder count = new LongAdder(); - DCountMetric(MetricType metricType, String name) { - this.metricType = metricType; + DCountMetric(String name) { this.name = name; } @@ -55,27 +51,20 @@ class DCountMetric implements CountMetric { long val = visitor.isReset() ? count.sumThenReset() : count.sum(); if (val > 0) { - visitor.visitCount(new DCountMetricStats(metricType, name, val)); + visitor.visitCount(new DCountMetricStats(name, val)); } } private static class DCountMetricStats implements CountMetricStats { - private final MetricType metricType; private final String name; private final long count; - private DCountMetricStats(MetricType metricType, String name, long count) { - this.metricType = metricType; + private DCountMetricStats(String name, long count) { this.name = name; this.count = count; } - @Override - public MetricType getMetricType() { - return metricType; - } - @Override public String getName() { return name; diff --git a/src/main/java/io/ebeaninternal/server/profile/DMetricFactory.java b/src/main/java/io/ebeaninternal/server/profile/DMetricFactory.java index c86066904..633c4c505 100644 --- a/src/main/java/io/ebeaninternal/server/profile/DMetricFactory.java +++ b/src/main/java/io/ebeaninternal/server/profile/DMetricFactory.java @@ -1,7 +1,6 @@ package io.ebeaninternal.server.profile; import io.ebean.ProfileLocation; -import io.ebean.meta.MetricType; import io.ebean.metric.CountMetric; import io.ebean.metric.MetricFactory; import io.ebean.metric.QueryPlanMetric; @@ -14,23 +13,23 @@ import io.ebean.metric.TimedMetricMap; public class DMetricFactory implements MetricFactory { @Override - public TimedMetricMap createTimedMetricMap(MetricType metricType, String name) { - return new DTimedMetricMap(metricType, name); + public TimedMetricMap createTimedMetricMap(String name) { + return new DTimedMetricMap(name); } @Override - public TimedMetric createTimedMetric(MetricType metricType, String name) { - return new DTimedMetric(metricType, name); + public TimedMetric createTimedMetric(String name) { + return new DTimedMetric(name); } @Override - public CountMetric createCountMetric(MetricType metricType, String name) { - return new DCountMetric(metricType, name); + public CountMetric createCountMetric(String name) { + return new DCountMetric(name); } @Override - public QueryPlanMetric createQueryPlanMetric(MetricType metricType, Class type, String label, ProfileLocation profileLocation, String sql) { - return new DQueryPlanMetric(new DQueryPlanMeta(type, label, profileLocation, sql), new DTimedMetric(metricType, label)); + public QueryPlanMetric createQueryPlanMetric(Class type, String label, ProfileLocation profileLocation, String sql) { + return new DQueryPlanMetric(new DQueryPlanMeta(type, label, profileLocation, sql), new DTimedMetric(label)); } } diff --git a/src/main/java/io/ebeaninternal/server/profile/DProfileLocationFactory.java b/src/main/java/io/ebeaninternal/server/profile/DProfileLocationFactory.java index 51e46ad86..ebf5e78c0 100644 --- a/src/main/java/io/ebeaninternal/server/profile/DProfileLocationFactory.java +++ b/src/main/java/io/ebeaninternal/server/profile/DProfileLocationFactory.java @@ -1,7 +1,6 @@ package io.ebeaninternal.server.profile; import io.ebean.ProfileLocation; -import io.ebean.meta.MetricType; import io.ebean.metric.MetricFactory; import io.ebean.metric.TimedMetric; import io.ebean.service.SpiProfileLocationFactory; @@ -19,7 +18,7 @@ public class DProfileLocationFactory implements SpiProfileLocationFactory { @Override public ProfileLocation create(int lineNumber, String label) { - TimedMetric timedMetric = MetricFactory.get().createTimedMetric(MetricType.TXN, "txn.named." + label); + TimedMetric timedMetric = MetricFactory.get().createTimedMetric("txn.named." + label); DTimedProfileLocation loc = new DTimedProfileLocation(lineNumber, label, timedMetric); TimedProfileLocationRegistry.register(loc); diff --git a/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java b/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java index 2bb5cbd45..21559a152 100644 --- a/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java +++ b/src/main/java/io/ebeaninternal/server/profile/DQueryPlanMetric.java @@ -1,7 +1,6 @@ package io.ebeaninternal.server.profile; import io.ebean.meta.MetaQueryMetric; -import io.ebean.meta.MetricType; import io.ebean.meta.MetricVisitor; import io.ebean.metric.QueryPlanMetric; import io.ebean.metric.TimedMetric; @@ -49,11 +48,6 @@ class DQueryPlanMetric implements QueryPlanMetric { return meta + " " + stats + " sql:" + getSql(); } - @Override - public MetricType getMetricType() { - return stats.getMetricType(); - } - @Override public Class getType() { return meta.getType(); diff --git a/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java b/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java index 03d1d1518..54146abe9 100644 --- a/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java +++ b/src/main/java/io/ebeaninternal/server/profile/DTimeMetricStats.java @@ -1,6 +1,5 @@ package io.ebeaninternal.server.profile; -import io.ebean.meta.MetricType; import io.ebean.metric.TimedMetricStats; /** @@ -8,8 +7,6 @@ import io.ebean.metric.TimedMetricStats; */ class DTimeMetricStats implements TimedMetricStats { - private final MetricType metricType; - private String name; private final boolean collected; @@ -22,8 +19,7 @@ class DTimeMetricStats implements TimedMetricStats { private final long max; - DTimeMetricStats(MetricType metricType, String name, boolean collected, long count, long total, long max) { - this.metricType = metricType; + DTimeMetricStats(String name, boolean collected, long count, long total, long max) { this.name = name; this.collected = collected; this.count = count; @@ -63,11 +59,6 @@ class DTimeMetricStats implements TimedMetricStats { this.name = name; } - @Override - public MetricType getMetricType() { - return metricType; - } - @Override public String getName() { return name; diff --git a/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java b/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java index 3cca92c14..63eb275f6 100644 --- a/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java +++ b/src/main/java/io/ebeaninternal/server/profile/DTimedMetric.java @@ -1,6 +1,5 @@ package io.ebeaninternal.server.profile; -import io.ebean.meta.MetricType; import io.ebean.meta.MetricVisitor; import io.ebean.metric.TimedMetric; @@ -15,8 +14,6 @@ import java.util.concurrent.atomic.LongAdder; */ class DTimedMetric implements TimedMetric { - private final MetricType metricType; - private final String name; private final LongAdder count = new LongAdder(); @@ -27,8 +24,7 @@ class DTimedMetric implements TimedMetric { private boolean collected; - DTimedMetric(MetricType metricType, String name) { - this.metricType = metricType; + DTimedMetric(String name) { this.name = name; } @@ -92,9 +88,9 @@ class DTimedMetric implements TimedMetric { private DTimeMetricStats getStatistics(boolean reset) { try { if (reset) { - return new DTimeMetricStats(metricType, name, collected, count.sumThenReset(), total.sumThenReset(), max.getThenReset()); + return new DTimeMetricStats(name, collected, count.sumThenReset(), total.sumThenReset(), max.getThenReset()); } else { - return new DTimeMetricStats(metricType, name, collected, count.sum(), total.sum(), max.get()); + return new DTimeMetricStats(name, collected, count.sum(), total.sum(), max.get()); } } finally { collected = true; diff --git a/src/main/java/io/ebeaninternal/server/profile/DTimedMetricMap.java b/src/main/java/io/ebeaninternal/server/profile/DTimedMetricMap.java index 5d122840f..f9056bfe8 100644 --- a/src/main/java/io/ebeaninternal/server/profile/DTimedMetricMap.java +++ b/src/main/java/io/ebeaninternal/server/profile/DTimedMetricMap.java @@ -1,6 +1,5 @@ package io.ebeaninternal.server.profile; -import io.ebean.meta.MetricType; import io.ebean.meta.MetricVisitor; import io.ebean.metric.TimedMetricMap; @@ -8,14 +7,11 @@ import java.util.concurrent.ConcurrentHashMap; class DTimedMetricMap implements TimedMetricMap { - private final MetricType metricType; - private final String name; private final ConcurrentHashMap map = new ConcurrentHashMap<>(); - DTimedMetricMap(MetricType metricType, String name) { - this.metricType = metricType; + DTimedMetricMap(String name) { this.name = name; } @@ -26,7 +22,7 @@ class DTimedMetricMap implements TimedMetricMap { @Override public void add(String key, long exeMicros) { - map.computeIfAbsent(key, (k) -> new DTimedMetric(metricType, name + key)).add(exeMicros); + map.computeIfAbsent(key, (k) -> new DTimedMetric(name + key)).add(exeMicros); } @Override diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java b/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java index 0f3a69321..c6bc52676 100644 --- a/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java +++ b/src/main/java/io/ebeaninternal/server/query/CQueryPlan.java @@ -2,7 +2,6 @@ package io.ebeaninternal.server.query; import io.ebean.ProfileLocation; import io.ebean.config.dbplatform.SqlLimitResponse; -import io.ebean.meta.MetricType; import io.ebean.metric.MetricFactory; import io.ebean.metric.TimedMetric; import io.ebeaninternal.api.CQueryPlanKey; @@ -347,7 +346,7 @@ public class CQueryPlan implements SpiQueryPlan { } TimedMetric createTimedMetric() { - return MetricFactory.get().createTimedMetric(MetricType.ORM, label); + return MetricFactory.get().createTimedMetric(label); } void captureBindForQueryPlan(CQueryPredicates predicates, long executionTimeMicros) { diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java b/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java index 2cc1349dd..23de6de5c 100644 --- a/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java +++ b/src/main/java/io/ebeaninternal/server/query/CQueryPlanStats.java @@ -1,7 +1,6 @@ package io.ebeaninternal.server.query; import io.ebean.meta.MetaQueryMetric; -import io.ebean.meta.MetricType; import io.ebean.metric.TimedMetric; import io.ebean.metric.TimedMetricStats; @@ -87,11 +86,6 @@ public final class CQueryPlanStats { return "label:" + getLabel() + " location:" + getLocation() + " metrics:" + metrics + " sql:" + getSql(); } - @Override - public MetricType getMetricType() { - return MetricType.ORM; - } - @Override public Class getType() { return queryPlan.getBeanType(); diff --git a/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java b/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java index 190cbc487..c51cc4289 100644 --- a/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java +++ b/src/main/java/io/ebeaninternal/server/query/DefaultRelationalQueryEngine.java @@ -3,7 +3,6 @@ package io.ebeaninternal.server.query; import io.ebean.RowConsumer; import io.ebean.RowMapper; import io.ebean.SqlRow; -import io.ebean.meta.MetricType; import io.ebean.meta.MetricVisitor; import io.ebean.metric.MetricFactory; import io.ebean.metric.TimedMetricMap; @@ -38,7 +37,7 @@ public class DefaultRelationalQueryEngine implements RelationalQueryEngine { this.binder = binder; this.dbTrueValue = dbTrueValue == null ? "true" : dbTrueValue; this.binaryOptimizedUUID = binaryOptimizedUUID; - this.timedMetricMap = MetricFactory.get().createTimedMetricMap(MetricType.SQL, "sql.query."); + this.timedMetricMap = MetricFactory.get().createTimedMetricMap("sql.query."); } @Override diff --git a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java index 0b4b43ba8..f9e943ec1 100644 --- a/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java +++ b/src/main/java/io/ebeaninternal/server/transaction/TransactionManager.java @@ -13,7 +13,6 @@ import io.ebean.config.dbplatform.DatabasePlatform.OnQueryOnly; import io.ebean.event.changelog.ChangeLogListener; import io.ebean.event.changelog.ChangeLogPrepare; import io.ebean.event.changelog.ChangeSet; -import io.ebean.meta.MetricType; import io.ebean.meta.MetricVisitor; import io.ebean.metric.MetricFactory; import io.ebean.metric.TimedMetric; @@ -189,9 +188,9 @@ public class TransactionManager implements SpiTransactionManager { this.transactionFactory = TransactionFactoryBuilder.build(this, dataSourceSupplier, tenantProvider); MetricFactory metricFactory = MetricFactory.get(); - this.txnMain = metricFactory.createTimedMetric(MetricType.TXN, "txn.main"); - this.txnReadOnly = metricFactory.createTimedMetric(MetricType.TXN, "txn.readonly"); - this.txnNamed = metricFactory.createTimedMetricMap(MetricType.TXN, "txn.named."); + this.txnMain = metricFactory.createTimedMetric("txn.main"); + this.txnReadOnly = metricFactory.createTimedMetric("txn.readonly"); + this.txnNamed = metricFactory.createTimedMetricMap("txn.named."); scopeManager.register(this); } diff --git a/src/test/java/io/ebean/BaseTestCase.java b/src/test/java/io/ebean/BaseTestCase.java index cf3b2863a..444ec37ea 100644 --- a/src/test/java/io/ebean/BaseTestCase.java +++ b/src/test/java/io/ebean/BaseTestCase.java @@ -5,7 +5,6 @@ import io.ebean.annotation.Platform; import io.ebean.cache.ServerCacheStatistics; import io.ebean.config.dbplatform.IdType; import io.ebean.meta.MetaTimedMetric; -import io.ebean.meta.MetricType; import io.ebean.meta.ServerMetrics; import io.ebean.util.StringHelper; import io.ebeaninternal.api.SpiEbeanServer; @@ -98,7 +97,7 @@ public abstract class BaseTestCase { List timedMetrics = visitTimedMetrics(); return timedMetrics.stream() - .filter((it) -> it.getMetricType() == MetricType.SQL) + .filter((it) -> it.getName().startsWith("sql.") || it.getName().startsWith("orm.")) .collect(Collectors.toList()); } diff --git a/src/test/java/io/ebeaninternal/server/deploy/BeanIudMetricsTest.java b/src/test/java/io/ebeaninternal/server/deploy/BeanIudMetricsTest.java index 8ca21d56f..d53f0e973 100644 --- a/src/test/java/io/ebeaninternal/server/deploy/BeanIudMetricsTest.java +++ b/src/test/java/io/ebeaninternal/server/deploy/BeanIudMetricsTest.java @@ -2,7 +2,6 @@ package io.ebeaninternal.server.deploy; import io.ebean.meta.BasicMetricVisitor; import io.ebean.meta.MetaTimedMetric; -import io.ebean.meta.MetricType; import io.ebeaninternal.server.core.PersistRequest; import org.junit.Test; @@ -29,7 +28,6 @@ public class BeanIudMetricsTest { assertThat(timed.get(0).getCount()).isEqualTo(4); assertThat(timed.get(0).getName()).isEqualTo("iud.one.insertBatch"); - assertThat(timed.get(0).getMetricType()).isEqualTo(MetricType.IUD); iudMetrics.addBatch(PersistRequest.Type.UPDATE, startNanos, 1); iudMetrics.addBatch(PersistRequest.Type.DELETE_SOFT, startNanos, 2); diff --git a/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java b/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java index ee932f3a3..6dfdad9f6 100644 --- a/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java +++ b/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java @@ -1,6 +1,5 @@ package io.ebeaninternal.server.profile; -import io.ebean.meta.MetricType; import io.ebean.metric.MetricFactory; import org.junit.Test; @@ -11,7 +10,7 @@ public class BasicProfileLocationTest { @Test public void obtain() { - DProfileLocation loc = new DTimedProfileLocation(12, "foo", MetricFactory.get().createTimedMetric(MetricType.TXN, "junk")); + DProfileLocation loc = new DTimedProfileLocation(12, "foo", MetricFactory.get().createTimedMetric("junk")); assertThat(loc.obtain()).isTrue(); assertThat(loc.fullLocation()).endsWith(":12)"); diff --git a/src/test/java/io/ebeaninternal/server/profile/DTimedMetricMapTest.java b/src/test/java/io/ebeaninternal/server/profile/DTimedMetricMapTest.java index 4da31dda9..43f0e0426 100644 --- a/src/test/java/io/ebeaninternal/server/profile/DTimedMetricMapTest.java +++ b/src/test/java/io/ebeaninternal/server/profile/DTimedMetricMapTest.java @@ -2,7 +2,6 @@ package io.ebeaninternal.server.profile; import io.ebean.meta.BasicMetricVisitor; import io.ebean.meta.MetaTimedMetric; -import io.ebean.meta.MetricType; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -12,7 +11,7 @@ public class DTimedMetricMapTest { @Test public void addSinceNanos() throws InterruptedException { - DTimedMetricMap metricMap = new DTimedMetricMap(MetricType.L2, "addSinceNanos"); + DTimedMetricMap metricMap = new DTimedMetricMap("addSinceNanos"); long nanos = System.nanoTime(); Thread.sleep(10); diff --git a/src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java b/src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java index 06ef3f30b..28e651b88 100644 --- a/src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java +++ b/src/test/java/io/ebeaninternal/server/profile/DTimedMetricTest.java @@ -1,6 +1,5 @@ package io.ebeaninternal.server.profile; -import io.ebean.meta.MetricType; import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; @@ -10,7 +9,7 @@ public class DTimedMetricTest { @Test public void addSinceNanos() throws InterruptedException { - DTimedMetric metric = new DTimedMetric(MetricType.L2, "addSinceNanos"); + DTimedMetric metric = new DTimedMetric("addSinceNanos"); long start = System.nanoTime(); Thread.sleep(10); @@ -33,7 +32,7 @@ public class DTimedMetricTest { @Test public void addBatchSince() throws InterruptedException { - DTimedMetric metric = new DTimedMetric(MetricType.L2, "addSinceNanos"); + DTimedMetric metric = new DTimedMetric("addSinceNanos"); long start = System.nanoTime(); Thread.sleep(10); diff --git a/src/test/java/io/ebeaninternal/server/profile/SortMetricTest.java b/src/test/java/io/ebeaninternal/server/profile/SortMetricTest.java index 2f5ea5738..c67d14b30 100644 --- a/src/test/java/io/ebeaninternal/server/profile/SortMetricTest.java +++ b/src/test/java/io/ebeaninternal/server/profile/SortMetricTest.java @@ -1,7 +1,6 @@ package io.ebeaninternal.server.profile; import io.ebean.meta.MetaTimedMetric; -import io.ebean.meta.MetricType; import io.ebean.meta.SortMetric; import org.junit.Test; @@ -62,6 +61,6 @@ public class SortMetricTest { } private DTimeMetricStats create(String name) { - return new DTimeMetricStats(MetricType.L2, name, false, 0, 0, 0); + return new DTimeMetricStats(name, false, 0, 0, 0); } }