#1877 - Adjust metric names add "orm." prefix for orm queries, "dto." for dto queries

This commit is contained in:
rob bygrave
2019-12-03 21:01:03 +13:00
parent 63b802d0b8
commit 5d93c44475
5 changed files with 14 additions and 15 deletions
@@ -17,7 +17,7 @@ class DQueryPlanMeta {
this.label = label;
this.profileLocation = profileLocation;
this.sql = sql;
String name = type.getSimpleName();
String name = "dto." + type.getSimpleName();
if (label != null) {
name += "_" + label;
}
@@ -63,6 +63,6 @@ class DQueryPlanMeta {
@Override
public String toString() {
return "type:" + type + " label:" + label;
return name;
}
}
@@ -1,7 +1,6 @@
package io.ebeaninternal.server.query;
import io.ebean.ProfileLocation;
import io.ebean.bean.ObjectGraphNode;
import io.ebean.config.ServerConfig;
import io.ebean.config.dbplatform.SqlLimitResponse;
import io.ebean.meta.MetricType;
@@ -159,12 +158,12 @@ public class CQueryPlan {
private String deriveName(String label, SpiQuery.Type type) {
if (label == null) {
return beanType.getSimpleName() + "." + type.label();
return "orm." + beanType.getSimpleName() + "." + type.label();
}
if (label.startsWith(beanType.getSimpleName())) {
return label;
return "orm." + label;
}
return beanType.getSimpleName() + "_" + label;
return "orm." + beanType.getSimpleName() + "_" + label;
}
private CQueryBindCapture initBindCapture(ServerConfig serverConfig, SpiQuery<?> query) {