second try

Author: laurit

instrumentation/hibernate/hibernate-6.0/javaagent/build.gradle.kts

@@ -69,8 +69,6 @@ tasks {
   withType<Test>().configureEach {
     // TODO run tests both with and without experimental span attributes
     jvmArgs("-Dotel.instrumentation.hibernate.experimental-span-attributes=true")
-
-    systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
   }
 
   named("compileHibernate7TestJava", JavaCompile::class).configure {

instrumentation/hibernate/hibernate-6.0/javaagent/src/hibernate7Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v7_0/SessionTest.java

@@ -52,14 +52,15 @@ class SessionTest extends AbstractHibernateTest {
   @MethodSource("provideHibernateActionParameters")
   void testHibernateAction(Parameter parameter) {
     Session session = sessionFactory.openSession();
+    session.beginTransaction();
+
     Value value = session.merge(prepopulated.get(0));
     testing.waitForTraces(1);
     testing.clearData();
 
     testing.runWithSpan(
         "parent",
         () -> {
-          session.beginTransaction();
           try {
             parameter.sessionMethodTest.accept(session, value);
           } catch (RuntimeException e) {
@@ -68,10 +69,7 @@ void testHibernateAction(Parameter parameter) {
           session.getTransaction().commit();
           session.close();
         });
-    assertTraces(
-        parameter,
-        "refresh".equals(parameter.methodName)
-            || (Boolean.getBoolean("testLatestDeps") && "lock".equals(parameter.methodName)));
+    assertTraces(parameter, "refresh".equals(parameter.methodName));
   }
 
   @ParameterizedTest(name = "{index}: {0}")