diff --git a/ebean-api/src/main/java/io/ebean/meta/BasicMetricVisitor.java b/ebean-api/src/main/java/io/ebean/meta/BasicMetricVisitor.java index 0db953159..9bcf2d414 100644 --- a/ebean-api/src/main/java/io/ebean/meta/BasicMetricVisitor.java +++ b/ebean-api/src/main/java/io/ebean/meta/BasicMetricVisitor.java @@ -8,22 +8,33 @@ import java.util.List; */ public class BasicMetricVisitor extends AbstractMetricVisitor implements ServerMetrics { + private final String name; private final List timed = new ArrayList<>(); private final List query = new ArrayList<>(); private final List count = new ArrayList<>(); + public BasicMetricVisitor() { + this("db"); + } + /** * Construct to reset and collect everything. */ - public BasicMetricVisitor() { - super(true, true, true, true); + public BasicMetricVisitor(String name) { + this(name, true, true, true, true); } /** * Construct specifying reset and what to collect. */ - public BasicMetricVisitor(boolean reset, boolean collectTransactionMetrics, boolean collectQueryMetrics, boolean collectL2Metrics) { + public BasicMetricVisitor(String name, boolean reset, boolean collectTransactionMetrics, boolean collectQueryMetrics, boolean collectL2Metrics) { super(reset, collectTransactionMetrics, collectQueryMetrics, collectL2Metrics); + this.name = name; + } + + @Override + public String name() { + return name; } @Override diff --git a/ebean-api/src/main/java/io/ebean/meta/MetaInfoManager.java b/ebean-api/src/main/java/io/ebean/meta/MetaInfoManager.java index f0bcdc586..8a925df93 100644 --- a/ebean-api/src/main/java/io/ebean/meta/MetaInfoManager.java +++ b/ebean-api/src/main/java/io/ebean/meta/MetaInfoManager.java @@ -16,6 +16,17 @@ public interface MetaInfoManager { */ ServerMetrics collectMetrics(); + /** + * Given the already collected metrics provide them in json form. + *

+ * Expected to be used when we wish to collect the metrics and report them + * to some service and additionally format them as json for say output into + * an application log. + * + * @param metrics The already collected metrics + */ + ServerMetricsAsJson metricsAsJson(ServerMetrics metrics); + /** * Collect the metrics in raw JSON form. *

{@code
diff --git a/ebean-api/src/main/java/io/ebean/meta/ServerMetrics.java b/ebean-api/src/main/java/io/ebean/meta/ServerMetrics.java
index f9ca58c33..3d2955638 100644
--- a/ebean-api/src/main/java/io/ebean/meta/ServerMetrics.java
+++ b/ebean-api/src/main/java/io/ebean/meta/ServerMetrics.java
@@ -7,6 +7,11 @@ import java.util.List;
  */
 public interface ServerMetrics {
 
+  /**
+   * Return the name of the database these metrics were obtained for.
+   */
+  String name();
+
   /**
    * Return timed metrics for Transactions, labelled SqlQuery, labelled SqlUpdate.
    */
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultMetaInfoManager.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultMetaInfoManager.java
index a1775e818..efde5b22f 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultMetaInfoManager.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DefaultMetaInfoManager.java
@@ -47,6 +47,11 @@ final class DefaultMetaInfoManager implements MetaInfoManager {
     return visitBasic();
   }
 
+  @Override
+  public ServerMetricsAsJson metricsAsJson(ServerMetrics metrics) {
+    return new DumpMetricsJson(metrics);
+  }
+
   @Override
   public ServerMetricsAsJson collectMetricsAsJson() {
     return new DumpMetricsJson(server);
@@ -59,7 +64,7 @@ final class DefaultMetaInfoManager implements MetaInfoManager {
 
   @Override
   public BasicMetricVisitor visitBasic() {
-    BasicMetricVisitor basic = new BasicMetricVisitor();
+    BasicMetricVisitor basic = new BasicMetricVisitor(server.name());
     visitMetrics(basic);
     return basic;
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsData.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsData.java
index ef006949f..fc6b80858 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsData.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsData.java
@@ -29,17 +29,13 @@ final class DumpMetricsData {
   }
 
   private void collect(ServerMetrics serverMetrics) {
-    final List timedMetrics = serverMetrics.timedMetrics();
-    final List countMetrics = serverMetrics.countMetrics();
-    final List queryMetrics = serverMetrics.queryMetrics();
-
-    for (MetaTimedMetric metric : timedMetrics) {
+    for (MetaTimedMetric metric : serverMetrics.timedMetrics()) {
       add(metric);
     }
-    for (MetaCountMetric metric : countMetrics) {
+    for (MetaCountMetric metric : serverMetrics.countMetrics()) {
       addCount(metric);
     }
-    for (MetaQueryMetric metric : queryMetrics) {
+    for (MetaQueryMetric metric : serverMetrics.queryMetrics()) {
       addQuery(metric);
     }
   }
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsJson.java b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsJson.java
index 0b96dcbd9..dd01c1198 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsJson.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/core/DumpMetricsJson.java
@@ -17,9 +17,11 @@ import java.util.List;
 final class DumpMetricsJson implements ServerMetricsAsJson {
 
   private final Database database;
+  private final ServerMetrics metrics;
+  private final String name;
   private Appendable writer;
   /**
-   * By default include sql and location attributes for the initial collection only.
+   * By default, include sql and location attributes for the initial collection only.
    */
   private int includeExtraAttributes = 1;
   private boolean withHeader = true;
@@ -31,6 +33,14 @@ final class DumpMetricsJson implements ServerMetricsAsJson {
 
   DumpMetricsJson(Database database) {
     this.database = database;
+    this.name = database.name();
+    this.metrics = null;
+  }
+
+  DumpMetricsJson(ServerMetrics metrics) {
+    this.database = null;
+    this.metrics = metrics;
+    this.name = metrics.name();
   }
 
   @Override
@@ -66,14 +76,18 @@ final class DumpMetricsJson implements ServerMetricsAsJson {
   @Override
   public String json() {
     writer = new StringWriter();
-    collect(database.metaInfo().collectMetrics());
+    collect(obtainMetrics());
     return writer.toString();
   }
 
   @Override
   public void write(Appendable buffer) {
     writer = buffer;
-    collect(database.metaInfo().collectMetrics());
+    collect(obtainMetrics());
+  }
+
+  private ServerMetrics obtainMetrics() {
+    return metrics != null ? metrics :  database.metaInfo().collectMetrics();
   }
 
   private void collect(ServerMetrics serverMetrics) {
@@ -112,7 +126,7 @@ final class DumpMetricsJson implements ServerMetricsAsJson {
     if (withHeader) {
       objStart();
       key("db");
-      val(database.name());
+      val(name);
       key("metrics");
       listStart();
     }
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index fc97ae264..451fbb0d3 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -103,6 +103,13 @@
 
     
 
+    
+      io.avaje
+      avaje-applog-slf4j
+      1.0
+      test
+    
+
     
       io.ebean
       ebean-platform-all
diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/DtoQuery2Test.java b/ebean-test/src/test/java/io/ebean/xtest/base/DtoQuery2Test.java
index f702d4c14..5c62ac653 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/base/DtoQuery2Test.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/base/DtoQuery2Test.java
@@ -210,7 +210,7 @@ public class DtoQuery2Test extends BaseTestCase {
     }
 
     // collect without reset
-    BasicMetricVisitor basic = new BasicMetricVisitor(false, true, true, true);
+    BasicMetricVisitor basic = new BasicMetricVisitor("db", false, true, true, true);
     server().metaInfo().visitMetrics(basic);
 
     List stats = basic.queryMetrics();
diff --git a/ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryTest.java b/ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryTest.java
index 4717fabf4..a97dbc39a 100644
--- a/ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryTest.java
+++ b/ebean-test/src/test/java/io/ebean/xtest/base/DtoQueryTest.java
@@ -298,7 +298,7 @@ public class DtoQueryTest extends BaseTestCase {
     }
 
     // collect without reset
-    BasicMetricVisitor basic = new BasicMetricVisitor(false, true, true, true);
+    BasicMetricVisitor basic = new BasicMetricVisitor("db", false, true, true, true);
     server().metaInfo().visitMetrics(basic);
 
     List stats = basic.queryMetrics();
@@ -322,6 +322,8 @@ public class DtoQueryTest extends BaseTestCase {
 
     log.info("stats " + stats);
 
+    String asJson = server().metaInfo().metricsAsJson(metric2).withHash(false).withNewLine(false).json();
+    assertThat(asJson).contains("dto.DCust_basic2");
   }
 
   @Test