From a7b082dd8a6e8f58bcee071278c2d28b2ea1c7b0 Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Wed, 11 Jun 2025 09:22:38 +0300 Subject: [PATCH 1/2] Fix hibernate 7 latest dep tests --- .../hibernate/hibernate-6.0/javaagent/build.gradle.kts | 2 ++ .../instrumentation/hibernate/v7_0/SessionTest.java | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/instrumentation/hibernate/hibernate-6.0/javaagent/build.gradle.kts b/instrumentation/hibernate/hibernate-6.0/javaagent/build.gradle.kts index e55b3d811672..fb232c036eed 100644 --- a/instrumentation/hibernate/hibernate-6.0/javaagent/build.gradle.kts +++ b/instrumentation/hibernate/hibernate-6.0/javaagent/build.gradle.kts @@ -69,6 +69,8 @@ tasks { withType().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 { diff --git a/instrumentation/hibernate/hibernate-6.0/javaagent/src/hibernate7Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v7_0/SessionTest.java b/instrumentation/hibernate/hibernate-6.0/javaagent/src/hibernate7Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v7_0/SessionTest.java index 3359d3885aa8..3ea061e1de83 100644 --- a/instrumentation/hibernate/hibernate-6.0/javaagent/src/hibernate7Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v7_0/SessionTest.java +++ b/instrumentation/hibernate/hibernate-6.0/javaagent/src/hibernate7Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v7_0/SessionTest.java @@ -68,7 +68,10 @@ void testHibernateAction(Parameter parameter) { session.getTransaction().commit(); session.close(); }); - assertTraces(parameter, "refresh".equals(parameter.methodName)); + assertTraces( + parameter, + "refresh".equals(parameter.methodName) + || (Boolean.getBoolean("testLatestDeps") && "lock".equals(parameter.methodName))); } @ParameterizedTest(name = "{index}: {0}") From 943d69303494e266aeaaa01a3b34712e6becbf52 Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Wed, 11 Jun 2025 10:50:47 +0300 Subject: [PATCH 2/2] second try --- .../hibernate/hibernate-6.0/javaagent/build.gradle.kts | 2 -- .../instrumentation/hibernate/v7_0/SessionTest.java | 8 +++----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/instrumentation/hibernate/hibernate-6.0/javaagent/build.gradle.kts b/instrumentation/hibernate/hibernate-6.0/javaagent/build.gradle.kts index fb232c036eed..e55b3d811672 100644 --- a/instrumentation/hibernate/hibernate-6.0/javaagent/build.gradle.kts +++ b/instrumentation/hibernate/hibernate-6.0/javaagent/build.gradle.kts @@ -69,8 +69,6 @@ tasks { withType().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 { diff --git a/instrumentation/hibernate/hibernate-6.0/javaagent/src/hibernate7Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v7_0/SessionTest.java b/instrumentation/hibernate/hibernate-6.0/javaagent/src/hibernate7Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v7_0/SessionTest.java index 3ea061e1de83..55912b70f7fc 100644 --- a/instrumentation/hibernate/hibernate-6.0/javaagent/src/hibernate7Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v7_0/SessionTest.java +++ b/instrumentation/hibernate/hibernate-6.0/javaagent/src/hibernate7Test/java/io/opentelemetry/javaagent/instrumentation/hibernate/v7_0/SessionTest.java @@ -52,6 +52,8 @@ 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(); @@ -59,7 +61,6 @@ void testHibernateAction(Parameter parameter) { 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}")