github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/io/ebean/DtoQueryTest.java
+1 -1
View File
@@ -201,7 +201,7 @@ public class DtoQueryTest extends BaseTestCase {
MetaQueryMetric queryMetric = stats.get(0);
assertThat(queryMetric.getLabel()).isEqualTo("basic");
assertThat(queryMetric.getCount()).isEqualTo(3);
assertThat(queryMetric.getName()).isEqualTo("DCust_basic");
assertThat(queryMetric.getName()).isEqualTo("dto.DCust_basic");
server().findDto(DCust.class, "select c4.id, c4.name from o_customer c4 where lower(c4.name) = :name")
src/test/java/io/ebean/NamedDtoQueryTest.java
+1 -1
View File
@@ -127,7 +127,7 @@ public class NamedDtoQueryTest extends BaseTestCase {
MetaQueryMetric queryMetric = stats.get(0);
assertThat(queryMetric.getLabel()).isEqualTo("basic");
assertThat(queryMetric.getCount()).isEqualTo(3);
assertThat(queryMetric.getName()).isEqualTo("DCust_basic");
assertThat(queryMetric.getName()).isEqualTo("dto.DCust_basic");
server().createNamedDtoQuery(DCust.class, "findByName_c4")
src/test/java/org/tests/query/finder/TestCustomerFinder.java
+7 -7
View File
@@ -38,7 +38,7 @@ public class TestCustomerFinder extends BaseTestCase {
String json0 = buffer0.toString();
System.out.println(json0);
assertThat(json0).contains("\"name\":\"txn.main\"");
assertThat(json0).contains("\"name\":\"Customer.findList\"");
assertThat(json0).contains("\"name\":\"orm.Customer.findList\"");
//assertThat(json0).contains("\"sql\":\"select t0.id, t0.status, t0.name");
runQueries();
@@ -52,7 +52,7 @@ public class TestCustomerFinder extends BaseTestCase {
String json1 = buffer1.toString();
System.out.println(json1);
assertThat(json1).contains("\"name\":\"txn.main\"");
assertThat(json1).contains("\"name\":\"Customer.findList\"");
assertThat(json1).contains("\"name\":\"orm.Customer.findList\"");
assertThat(json1).doesNotContain("\"sql\":\"select t0.id, t0.status, t0.name");
}
@@ -214,9 +214,9 @@ public class TestCustomerFinder extends BaseTestCase {
.json();
assertThat(metricsJson).contains("\"name\":\"txn.main\", \"type\":\"TXN\"");
assertThat(metricsJson).contains("\"name\":\"Customer.findList\"");
assertThat(metricsJson).contains("\"name\":\"orm.Customer.findList\"");
assertThat(metricsJson).contains("\"loc\":\"CustomerFinder.byNameStatus(CustomerFinder.java:44)\"");
assertThat(metricsJson).contains("\"hash\":\"f089744556e1677b57c7c6ef73f65da8\"");
assertThat(metricsJson).contains("\"hash\":\"cc20eb930403cfd418db2d0475c6e26a\"");
assertThat(metricsJson).contains("\"sql\":\"select t0.id, t0.status,");
}
@@ -237,7 +237,7 @@ public class TestCustomerFinder extends BaseTestCase {
.json();
assertThat(metricsJson).contains("\"name\":\"txn.main\"");
assertThat(metricsJson).contains("\"name\":\"Customer.findList\"");
assertThat(metricsJson).contains("\"name\":\"orm.Customer.findList\"");
assertThat(metricsJson).doesNotContain("\"loc\":");
assertThat(metricsJson).doesNotContain("\"hash\":");
assertThat(metricsJson).doesNotContain("\"sql\":");
@@ -258,7 +258,7 @@ public class TestCustomerFinder extends BaseTestCase {
String metricsJson = buffer.toString();
assertThat(metricsJson).contains("\"name\":\"txn.main\"");
assertThat(metricsJson).contains("\"name\":\"Customer.findList\"");
assertThat(metricsJson).contains("\"name\":\"orm.Customer.findList\"");
}
@Test
@@ -277,7 +277,7 @@ public class TestCustomerFinder extends BaseTestCase {
String metricsJson = buffer.toString();
assertThat(metricsJson).contains(" \"metrics\":[");
assertThat(metricsJson).contains("\"name\":\"txn.main\"");
assertThat(metricsJson).contains("\"name\":\"Customer.findList\"");
assertThat(metricsJson).contains("\"name\":\"orm.Customer.findList\"");
}
private void runQueries() {