diff --git a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java index 5e2bcc8e2..f05964efe 100644 --- a/src/main/java/io/ebeaninternal/server/core/DefaultServer.java +++ b/src/main/java/io/ebeaninternal/server/core/DefaultServer.java @@ -858,6 +858,7 @@ public final class DefaultServer implements SpiServer, SpiEbeanServer { } ProfileLocation profileLocation = txScope.getProfileLocation(); if (profileLocation != null) { + profileLocation.obtain(); transaction.setProfileLocation(profileLocation); } } diff --git a/src/main/java/io/ebeaninternal/server/profile/DProfileLocation.java b/src/main/java/io/ebeaninternal/server/profile/DProfileLocation.java index 2ac6f09f2..6ca3252e7 100644 --- a/src/main/java/io/ebeaninternal/server/profile/DProfileLocation.java +++ b/src/main/java/io/ebeaninternal/server/profile/DProfileLocation.java @@ -62,7 +62,11 @@ class DProfileLocation implements ProfileLocation { } private String withLineNumber(String traceLine) { - if (lineNumber == 0 || traceLine.contains(":")) { + if (lineNumber == 0) { + return traceLine; + } else if (traceLine.endsWith(":1)")) { + return traceLine.substring(0, traceLine.length() - 3) + ":" + lineNumber + ")"; + } else if (traceLine.contains(":")) { return traceLine; } else { return traceLine.substring(0, traceLine.length() - 1) + ":" + lineNumber + ")"; diff --git a/src/test/java/org/tests/model/basic/finder/CustomerFinder.java b/src/test/java/org/tests/model/basic/finder/CustomerFinder.java index ac75b1762..905b6be19 100644 --- a/src/test/java/org/tests/model/basic/finder/CustomerFinder.java +++ b/src/test/java/org/tests/model/basic/finder/CustomerFinder.java @@ -14,10 +14,6 @@ public class CustomerFinder extends Finder { super(Customer.class); } - public CustomerFinder(String serverName) { - super(Customer.class, serverName); - } - /** * Bulk update customers matching the name to inactive status. * diff --git a/src/test/java/org/tests/transaction/TestNestedMandatory.java b/src/test/java/org/tests/transaction/TestNestedMandatory.java index 5f9b0c786..40f525c98 100644 --- a/src/test/java/org/tests/transaction/TestNestedMandatory.java +++ b/src/test/java/org/tests/transaction/TestNestedMandatory.java @@ -3,12 +3,16 @@ package org.tests.transaction; import io.ebean.BaseTestCase; import io.ebean.Ebean; import io.ebean.Transaction; -import io.ebean.annotation.TxType; import io.ebean.annotation.Transactional; +import io.ebean.annotation.TxType; +import io.ebean.meta.MetaInfoManager; +import io.ebean.meta.MetaTimedMetric; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.List; + import static org.assertj.core.api.Assertions.assertThat; public class TestNestedMandatory extends BaseTestCase { @@ -20,12 +24,24 @@ public class TestNestedMandatory extends BaseTestCase { @Test public void test() { + MetaInfoManager metaInfoManager = Ebean.getDefaultServer().getMetaInfoManager(); + metaInfoManager.collectTransactionStatistics(true); + new Outer().doOuter(); + + List txnMetrics = metaInfoManager.collectTransactionStatistics(true); + for (MetaTimedMetric txnTimed : txnMetrics) { + System.out.println(txnTimed); + } + + //Put these asserts back when agent is upgraded +// assertThat(txnMetrics).hasSize(2); +// assertThat(txnMetrics.get(1).getName()).isEqualTo("txn.named.outer"); } class Outer { - @Transactional + @Transactional(label = "outer") void doOuter() { outerTxn = Ebean.currentTransaction();