From 600f2e267f341dc366373932a55139c666b1e323 Mon Sep 17 00:00:00 2001
From: Will Gittoes <will.gittoes@datadoghq.com>
Date: Mon, 11 Mar 2019 16:20:27 +1100
Subject: [PATCH] Enable integration for hibernate 4.3

---
 .../hibernate-4.3.gradle}                                   | 4 ++--
 .../hibernate/v4_3}/CriteriaInstrumentation.java            | 2 +-
 .../instrumentation/hibernate/v4_3}/HibernateDecorator.java | 2 +-
 .../hibernate/v4_3}/ProcedureCallInstrumentation.java       | 2 +-
 .../hibernate/v4_3}/QueryInstrumentation.java               | 4 ++--
 .../hibernate/v4_3}/SessionFactoryInstrumentation.java      | 4 ++--
 .../hibernate/v4_3}/SessionInstrumentation.java             | 6 +++---
 .../instrumentation/hibernate/v4_3}/SessionMethodUtils.java | 4 ++--
 .../trace/instrumentation/hibernate/v4_3}/SessionState.java | 2 +-
 .../hibernate/v4_3}/TransactionInstrumentation.java         | 2 +-
 .../src/test/groovy/AbstractHibernateTest.groovy            | 0
 .../src/test/groovy/CriteriaTest.groovy                     | 0
 .../src/test/groovy/QueryTest.groovy                        | 0
 .../src/test/groovy/SessionTest.groovy                      | 0
 .../{hibernate-5 => hibernate-4.3}/src/test/java/Value.java | 0
 .../src/test/resources/hibernate.cfg.xml                    | 0
 settings.gradle                                             | 2 +-
 17 files changed, 17 insertions(+), 17 deletions(-)
 rename dd-java-agent/instrumentation/{hibernate-5/hibernate-5.gradle => hibernate-4.3/hibernate-4.3.gradle} (96%)
 rename dd-java-agent/instrumentation/{hibernate-5/src/main/java/datadog/trace/instrumentation/hibernate5 => hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3}/CriteriaInstrumentation.java (98%)
 rename dd-java-agent/instrumentation/{hibernate-5/src/main/java/datadog/trace/instrumentation/hibernate5 => hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3}/HibernateDecorator.java (96%)
 rename dd-java-agent/instrumentation/{hibernate-5/src/main/java/datadog/trace/instrumentation/hibernate5 => hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3}/ProcedureCallInstrumentation.java (98%)
 rename dd-java-agent/instrumentation/{hibernate-5/src/main/java/datadog/trace/instrumentation/hibernate5 => hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3}/QueryInstrumentation.java (96%)
 rename dd-java-agent/instrumentation/{hibernate-5/src/main/java/datadog/trace/instrumentation/hibernate5 => hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3}/SessionFactoryInstrumentation.java (95%)
 rename dd-java-agent/instrumentation/{hibernate-5/src/main/java/datadog/trace/instrumentation/hibernate5 => hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3}/SessionInstrumentation.java (97%)
 rename dd-java-agent/instrumentation/{hibernate-5/src/main/java/datadog/trace/instrumentation/hibernate5 => hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3}/SessionMethodUtils.java (95%)
 rename dd-java-agent/instrumentation/{hibernate-5/src/main/java/datadog/trace/instrumentation/hibernate5 => hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3}/SessionState.java (81%)
 rename dd-java-agent/instrumentation/{hibernate-5/src/main/java/datadog/trace/instrumentation/hibernate5 => hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3}/TransactionInstrumentation.java (98%)
 rename dd-java-agent/instrumentation/{hibernate-5 => hibernate-4.3}/src/test/groovy/AbstractHibernateTest.groovy (100%)
 rename dd-java-agent/instrumentation/{hibernate-5 => hibernate-4.3}/src/test/groovy/CriteriaTest.groovy (100%)
 rename dd-java-agent/instrumentation/{hibernate-5 => hibernate-4.3}/src/test/groovy/QueryTest.groovy (100%)
 rename dd-java-agent/instrumentation/{hibernate-5 => hibernate-4.3}/src/test/groovy/SessionTest.groovy (100%)
 rename dd-java-agent/instrumentation/{hibernate-5 => hibernate-4.3}/src/test/java/Value.java (100%)
 rename dd-java-agent/instrumentation/{hibernate-5 => hibernate-4.3}/src/test/resources/hibernate.cfg.xml (100%)

diff --git a/dd-java-agent/instrumentation/hibernate-5/hibernate-5.gradle b/dd-java-agent/instrumentation/hibernate-4.3/hibernate-4.3.gradle
similarity index 96%
rename from dd-java-agent/instrumentation/hibernate-5/hibernate-5.gradle
rename to dd-java-agent/instrumentation/hibernate-4.3/hibernate-4.3.gradle
index 98402078b7..8c1c116cce 100644
--- a/dd-java-agent/instrumentation/hibernate-5/hibernate-5.gradle
+++ b/dd-java-agent/instrumentation/hibernate-4.3/hibernate-4.3.gradle
@@ -9,7 +9,7 @@ muzzle {
   pass {
     group = "org.hibernate"
     module = "hibernate-core"
-    versions = "[5.0.0.Final,)"
+    versions = "[4.3.0.Final,)"
   }
 }
 
@@ -24,7 +24,7 @@ testSets {
 }
 
 dependencies {
-  compileOnly group: 'org.hibernate', name: 'hibernate-core', version: '5.0.0.Final'
+  compileOnly group: 'org.hibernate', name: 'hibernate-core', version: '4.3.0.Final'
 
   compile project(':dd-java-agent:agent-tooling')
 
diff --git a/dd-java-agent/instrumentation/hibernate-5/src/main/java/datadog/trace/instrumentation/hibernate5/CriteriaInstrumentation.java b/dd-java-agent/instrumentation/hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3/CriteriaInstrumentation.java
similarity index 98%
rename from dd-java-agent/instrumentation/hibernate-5/src/main/java/datadog/trace/instrumentation/hibernate5/CriteriaInstrumentation.java
rename to dd-java-agent/instrumentation/hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3/CriteriaInstrumentation.java
index 2c2112dcd3..5e936f52c8 100644
--- a/dd-java-agent/instrumentation/hibernate-5/src/main/java/datadog/trace/instrumentation/hibernate5/CriteriaInstrumentation.java
+++ b/dd-java-agent/instrumentation/hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3/CriteriaInstrumentation.java
@@ -1,4 +1,4 @@
-package datadog.trace.instrumentation.hibernate5;
+package datadog.trace.instrumentation.hibernate.v4_3;
 
 import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType;
 import static java.util.Collections.singletonMap;
diff --git a/dd-java-agent/instrumentation/hibernate-5/src/main/java/datadog/trace/instrumentation/hibernate5/HibernateDecorator.java b/dd-java-agent/instrumentation/hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3/HibernateDecorator.java
similarity index 96%
rename from dd-java-agent/instrumentation/hibernate-5/src/main/java/datadog/trace/instrumentation/hibernate5/HibernateDecorator.java
rename to dd-java-agent/instrumentation/hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3/HibernateDecorator.java
index 1fd8bfb4c4..3b098a8e11 100644
--- a/dd-java-agent/instrumentation/hibernate-5/src/main/java/datadog/trace/instrumentation/hibernate5/HibernateDecorator.java
+++ b/dd-java-agent/instrumentation/hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3/HibernateDecorator.java
@@ -1,4 +1,4 @@
-package datadog.trace.instrumentation.hibernate5;
+package datadog.trace.instrumentation.hibernate.v4_3;
 
 import datadog.trace.agent.decorator.OrmClientDecorator;
 import datadog.trace.api.DDSpanTypes;
diff --git a/dd-java-agent/instrumentation/hibernate-5/src/main/java/datadog/trace/instrumentation/hibernate5/ProcedureCallInstrumentation.java b/dd-java-agent/instrumentation/hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3/ProcedureCallInstrumentation.java
similarity index 98%
rename from dd-java-agent/instrumentation/hibernate-5/src/main/java/datadog/trace/instrumentation/hibernate5/ProcedureCallInstrumentation.java
rename to dd-java-agent/instrumentation/hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3/ProcedureCallInstrumentation.java
index b3483907a7..770eb78676 100644
--- a/dd-java-agent/instrumentation/hibernate-5/src/main/java/datadog/trace/instrumentation/hibernate5/ProcedureCallInstrumentation.java
+++ b/dd-java-agent/instrumentation/hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3/ProcedureCallInstrumentation.java
@@ -1,4 +1,4 @@
-package datadog.trace.instrumentation.hibernate5;
+package datadog.trace.instrumentation.hibernate.v4_3;
 
 import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType;
 import static java.util.Collections.singletonMap;
diff --git a/dd-java-agent/instrumentation/hibernate-5/src/main/java/datadog/trace/instrumentation/hibernate5/QueryInstrumentation.java b/dd-java-agent/instrumentation/hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3/QueryInstrumentation.java
similarity index 96%
rename from dd-java-agent/instrumentation/hibernate-5/src/main/java/datadog/trace/instrumentation/hibernate5/QueryInstrumentation.java
rename to dd-java-agent/instrumentation/hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3/QueryInstrumentation.java
index 31a14a3482..21e75e5ee9 100644
--- a/dd-java-agent/instrumentation/hibernate-5/src/main/java/datadog/trace/instrumentation/hibernate5/QueryInstrumentation.java
+++ b/dd-java-agent/instrumentation/hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3/QueryInstrumentation.java
@@ -1,7 +1,7 @@
-package datadog.trace.instrumentation.hibernate5;
+package datadog.trace.instrumentation.hibernate.v4_3;
 
 import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType;
-import static datadog.trace.instrumentation.hibernate5.HibernateDecorator.DECORATOR;
+import static datadog.trace.instrumentation.hibernate.v4_3.HibernateDecorator.DECORATOR;
 import static java.util.Collections.singletonMap;
 import static net.bytebuddy.matcher.ElementMatchers.isInterface;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
diff --git a/dd-java-agent/instrumentation/hibernate-5/src/main/java/datadog/trace/instrumentation/hibernate5/SessionFactoryInstrumentation.java b/dd-java-agent/instrumentation/hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3/SessionFactoryInstrumentation.java
similarity index 95%
rename from dd-java-agent/instrumentation/hibernate-5/src/main/java/datadog/trace/instrumentation/hibernate5/SessionFactoryInstrumentation.java
rename to dd-java-agent/instrumentation/hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3/SessionFactoryInstrumentation.java
index 5da5339351..fb740d1dea 100644
--- a/dd-java-agent/instrumentation/hibernate-5/src/main/java/datadog/trace/instrumentation/hibernate5/SessionFactoryInstrumentation.java
+++ b/dd-java-agent/instrumentation/hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3/SessionFactoryInstrumentation.java
@@ -1,7 +1,7 @@
-package datadog.trace.instrumentation.hibernate5;
+package datadog.trace.instrumentation.hibernate.v4_3;
 
 import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType;
-import static datadog.trace.instrumentation.hibernate5.HibernateDecorator.DECORATOR;
+import static datadog.trace.instrumentation.hibernate.v4_3.HibernateDecorator.DECORATOR;
 import static java.util.Collections.singletonMap;
 import static net.bytebuddy.matcher.ElementMatchers.isInterface;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
diff --git a/dd-java-agent/instrumentation/hibernate-5/src/main/java/datadog/trace/instrumentation/hibernate5/SessionInstrumentation.java b/dd-java-agent/instrumentation/hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3/SessionInstrumentation.java
similarity index 97%
rename from dd-java-agent/instrumentation/hibernate-5/src/main/java/datadog/trace/instrumentation/hibernate5/SessionInstrumentation.java
rename to dd-java-agent/instrumentation/hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3/SessionInstrumentation.java
index 38e6f156ac..8376a111de 100644
--- a/dd-java-agent/instrumentation/hibernate-5/src/main/java/datadog/trace/instrumentation/hibernate5/SessionInstrumentation.java
+++ b/dd-java-agent/instrumentation/hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3/SessionInstrumentation.java
@@ -1,8 +1,8 @@
-package datadog.trace.instrumentation.hibernate5;
+package datadog.trace.instrumentation.hibernate.v4_3;
 
 import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType;
-import static datadog.trace.instrumentation.hibernate5.HibernateDecorator.DECORATOR;
-import static datadog.trace.instrumentation.hibernate5.SessionMethodUtils.SCOPE_ONLY_METHODS;
+import static datadog.trace.instrumentation.hibernate.v4_3.HibernateDecorator.DECORATOR;
+import static datadog.trace.instrumentation.hibernate.v4_3.SessionMethodUtils.SCOPE_ONLY_METHODS;
 import static net.bytebuddy.matcher.ElementMatchers.isInterface;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.named;
diff --git a/dd-java-agent/instrumentation/hibernate-5/src/main/java/datadog/trace/instrumentation/hibernate5/SessionMethodUtils.java b/dd-java-agent/instrumentation/hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3/SessionMethodUtils.java
similarity index 95%
rename from dd-java-agent/instrumentation/hibernate-5/src/main/java/datadog/trace/instrumentation/hibernate5/SessionMethodUtils.java
rename to dd-java-agent/instrumentation/hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3/SessionMethodUtils.java
index a7288fd84e..62701afd57 100644
--- a/dd-java-agent/instrumentation/hibernate-5/src/main/java/datadog/trace/instrumentation/hibernate5/SessionMethodUtils.java
+++ b/dd-java-agent/instrumentation/hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3/SessionMethodUtils.java
@@ -1,6 +1,6 @@
-package datadog.trace.instrumentation.hibernate5;
+package datadog.trace.instrumentation.hibernate.v4_3;
 
-import static datadog.trace.instrumentation.hibernate5.HibernateDecorator.DECORATOR;
+import static datadog.trace.instrumentation.hibernate.v4_3.HibernateDecorator.DECORATOR;
 
 import datadog.trace.bootstrap.CallDepthThreadLocalMap;
 import datadog.trace.bootstrap.ContextStore;
diff --git a/dd-java-agent/instrumentation/hibernate-5/src/main/java/datadog/trace/instrumentation/hibernate5/SessionState.java b/dd-java-agent/instrumentation/hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3/SessionState.java
similarity index 81%
rename from dd-java-agent/instrumentation/hibernate-5/src/main/java/datadog/trace/instrumentation/hibernate5/SessionState.java
rename to dd-java-agent/instrumentation/hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3/SessionState.java
index f46f76d59c..01b55a7af0 100644
--- a/dd-java-agent/instrumentation/hibernate-5/src/main/java/datadog/trace/instrumentation/hibernate5/SessionState.java
+++ b/dd-java-agent/instrumentation/hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3/SessionState.java
@@ -1,4 +1,4 @@
-package datadog.trace.instrumentation.hibernate5;
+package datadog.trace.instrumentation.hibernate.v4_3;
 
 import io.opentracing.Scope;
 import io.opentracing.Span;
diff --git a/dd-java-agent/instrumentation/hibernate-5/src/main/java/datadog/trace/instrumentation/hibernate5/TransactionInstrumentation.java b/dd-java-agent/instrumentation/hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3/TransactionInstrumentation.java
similarity index 98%
rename from dd-java-agent/instrumentation/hibernate-5/src/main/java/datadog/trace/instrumentation/hibernate5/TransactionInstrumentation.java
rename to dd-java-agent/instrumentation/hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3/TransactionInstrumentation.java
index 066f8c416a..b80b60fbcb 100644
--- a/dd-java-agent/instrumentation/hibernate-5/src/main/java/datadog/trace/instrumentation/hibernate5/TransactionInstrumentation.java
+++ b/dd-java-agent/instrumentation/hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3/TransactionInstrumentation.java
@@ -1,4 +1,4 @@
-package datadog.trace.instrumentation.hibernate5;
+package datadog.trace.instrumentation.hibernate.v4_3;
 
 import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType;
 import static java.util.Collections.singletonMap;
diff --git a/dd-java-agent/instrumentation/hibernate-5/src/test/groovy/AbstractHibernateTest.groovy b/dd-java-agent/instrumentation/hibernate-4.3/src/test/groovy/AbstractHibernateTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/hibernate-5/src/test/groovy/AbstractHibernateTest.groovy
rename to dd-java-agent/instrumentation/hibernate-4.3/src/test/groovy/AbstractHibernateTest.groovy
diff --git a/dd-java-agent/instrumentation/hibernate-5/src/test/groovy/CriteriaTest.groovy b/dd-java-agent/instrumentation/hibernate-4.3/src/test/groovy/CriteriaTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/hibernate-5/src/test/groovy/CriteriaTest.groovy
rename to dd-java-agent/instrumentation/hibernate-4.3/src/test/groovy/CriteriaTest.groovy
diff --git a/dd-java-agent/instrumentation/hibernate-5/src/test/groovy/QueryTest.groovy b/dd-java-agent/instrumentation/hibernate-4.3/src/test/groovy/QueryTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/hibernate-5/src/test/groovy/QueryTest.groovy
rename to dd-java-agent/instrumentation/hibernate-4.3/src/test/groovy/QueryTest.groovy
diff --git a/dd-java-agent/instrumentation/hibernate-5/src/test/groovy/SessionTest.groovy b/dd-java-agent/instrumentation/hibernate-4.3/src/test/groovy/SessionTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/hibernate-5/src/test/groovy/SessionTest.groovy
rename to dd-java-agent/instrumentation/hibernate-4.3/src/test/groovy/SessionTest.groovy
diff --git a/dd-java-agent/instrumentation/hibernate-5/src/test/java/Value.java b/dd-java-agent/instrumentation/hibernate-4.3/src/test/java/Value.java
similarity index 100%
rename from dd-java-agent/instrumentation/hibernate-5/src/test/java/Value.java
rename to dd-java-agent/instrumentation/hibernate-4.3/src/test/java/Value.java
diff --git a/dd-java-agent/instrumentation/hibernate-5/src/test/resources/hibernate.cfg.xml b/dd-java-agent/instrumentation/hibernate-4.3/src/test/resources/hibernate.cfg.xml
similarity index 100%
rename from dd-java-agent/instrumentation/hibernate-5/src/test/resources/hibernate.cfg.xml
rename to dd-java-agent/instrumentation/hibernate-4.3/src/test/resources/hibernate.cfg.xml
diff --git a/settings.gradle b/settings.gradle
index 2233ffb6bb..b59f13acc7 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -40,7 +40,7 @@ include ':dd-java-agent:instrumentation:elasticsearch:transport-5'
 include ':dd-java-agent:instrumentation:elasticsearch:transport-5.3'
 include ':dd-java-agent:instrumentation:elasticsearch:transport-6'
 include ':dd-java-agent:instrumentation:grpc-1.5'
-include ':dd-java-agent:instrumentation:hibernate-5'
+include ':dd-java-agent:instrumentation:hibernate-4.3'
 include ':dd-java-agent:instrumentation:http-url-connection'
 include ':dd-java-agent:instrumentation:hystrix-1.4'
 include ':dd-java-agent:instrumentation:jax-rs-annotations'