Restructure hibernate integration

DataDog · Mar 20, 2019 · 8c5158f · 8c5158f
1 parent 4825a11
commit 8c5158f
Show file tree

Hide file tree

Showing 35 changed files with 94 additions and 92 deletions.
diff --git a/...tation/hibernate-3.5/hibernate-3.5.gradle → ...tation/hibernate/core-3.5/core-3.5.gradle b/...tation/hibernate-3.5/hibernate-3.5.gradle → ...tation/hibernate/core-3.5/core-3.5.gradle
@@ -34,7 +34,7 @@ dependencies {
   compileOnly group: 'org.hibernate', name: 'hibernate-core', version: '3.5.0-Final'
 
   compile project(':dd-java-agent:agent-tooling')
-  compile project(':dd-java-agent:instrumentation:hibernate-common')
+  compile project(':dd-java-agent:instrumentation:hibernate')
 
   compile deps.bytebuddy
   compile deps.opentracing

diff --git a/...bernate/v3_5/CriteriaInstrumentation.java → ...te/core/v3_5/CriteriaInstrumentation.java b/...bernate/v3_5/CriteriaInstrumentation.java → ...te/core/v3_5/CriteriaInstrumentation.java
@@ -1,4 +1,4 @@
-package datadog.trace.instrumentation.hibernate.v3_5;
+package datadog.trace.instrumentation.hibernate.core.v3_5;
 
 import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType;
 import static java.util.Collections.singletonMap;
@@ -11,8 +11,8 @@
 import datadog.trace.agent.tooling.Instrumenter;
 import datadog.trace.bootstrap.ContextStore;
 import datadog.trace.bootstrap.InstrumentationContext;
-import datadog.trace.instrumentation.hibernate.common.SessionMethodUtils;
-import datadog.trace.instrumentation.hibernate.common.SessionState;
+import datadog.trace.instrumentation.hibernate.SessionMethodUtils;
+import datadog.trace.instrumentation.hibernate.SessionState;
 import java.util.Map;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.method.MethodDescription;
@@ -36,13 +36,13 @@ public Map<String, String> contextStore() {
   @Override
   public String[] helperClassNames() {
     return new String[] {
-      "datadog.trace.instrumentation.hibernate.common.SessionMethodUtils",
-      "datadog.trace.instrumentation.hibernate.common.SessionState",
+      "datadog.trace.instrumentation.hibernate.SessionMethodUtils",
+      "datadog.trace.instrumentation.hibernate.SessionState",
       "datadog.trace.agent.decorator.BaseDecorator",
       "datadog.trace.agent.decorator.ClientDecorator",
       "datadog.trace.agent.decorator.DatabaseClientDecorator",
       "datadog.trace.agent.decorator.OrmClientDecorator",
-      "datadog.trace.instrumentation.hibernate.common.HibernateDecorator",
+      "datadog.trace.instrumentation.hibernate.HibernateDecorator",
     };
   }
 

diff --git a/.../hibernate/v4_0/QueryInstrumentation.java → ...rnate/core/v3_5/QueryInstrumentation.java b/.../hibernate/v4_0/QueryInstrumentation.java → ...rnate/core/v3_5/QueryInstrumentation.java
@@ -1,7 +1,7 @@
-package datadog.trace.instrumentation.hibernate.v4_0;
+package datadog.trace.instrumentation.hibernate.core.v3_5;
 
 import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType;
-import static datadog.trace.instrumentation.hibernate.common.HibernateDecorator.DECORATOR;
+import static datadog.trace.instrumentation.hibernate.HibernateDecorator.DECORATOR;
 import static java.util.Collections.singletonMap;
 import static net.bytebuddy.matcher.ElementMatchers.isInterface;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
@@ -12,8 +12,8 @@
 import datadog.trace.agent.tooling.Instrumenter;
 import datadog.trace.bootstrap.ContextStore;
 import datadog.trace.bootstrap.InstrumentationContext;
-import datadog.trace.instrumentation.hibernate.common.SessionMethodUtils;
-import datadog.trace.instrumentation.hibernate.common.SessionState;
+import datadog.trace.instrumentation.hibernate.SessionMethodUtils;
+import datadog.trace.instrumentation.hibernate.SessionState;
 import java.util.Map;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.method.MethodDescription;
@@ -38,13 +38,13 @@ public Map<String, String> contextStore() {
   @Override
   public String[] helperClassNames() {
     return new String[] {
-      "datadog.trace.instrumentation.hibernate.common.SessionMethodUtils",
-      "datadog.trace.instrumentation.hibernate.common.SessionState",
+      "datadog.trace.instrumentation.hibernate.SessionMethodUtils",
+      "datadog.trace.instrumentation.hibernate.SessionState",
       "datadog.trace.agent.decorator.BaseDecorator",
       "datadog.trace.agent.decorator.ClientDecorator",
       "datadog.trace.agent.decorator.DatabaseClientDecorator",
       "datadog.trace.agent.decorator.OrmClientDecorator",
-      "datadog.trace.instrumentation.hibernate.common.HibernateDecorator",
+      "datadog.trace.instrumentation.hibernate.HibernateDecorator",
     };
   }
 

diff --git a/...e/v3_5/SessionFactoryInstrumentation.java → ...e/v3_5/SessionFactoryInstrumentation.java b/...e/v3_5/SessionFactoryInstrumentation.java → ...e/v3_5/SessionFactoryInstrumentation.java
@@ -1,7 +1,7 @@
-package datadog.trace.instrumentation.hibernate.v3_5;
+package datadog.trace.instrumentation.hibernate.core.v3_5;
 
 import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType;
-import static datadog.trace.instrumentation.hibernate.common.HibernateDecorator.DECORATOR;
+import static datadog.trace.instrumentation.hibernate.HibernateDecorator.DECORATOR;
 import static java.util.Collections.singletonMap;
 import static net.bytebuddy.matcher.ElementMatchers.isInterface;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
@@ -14,7 +14,7 @@
 import datadog.trace.agent.tooling.Instrumenter;
 import datadog.trace.bootstrap.ContextStore;
 import datadog.trace.bootstrap.InstrumentationContext;
-import datadog.trace.instrumentation.hibernate.common.SessionState;
+import datadog.trace.instrumentation.hibernate.SessionState;
 import io.opentracing.Span;
 import io.opentracing.util.GlobalTracer;
 import java.util.HashMap;
@@ -45,12 +45,12 @@ public Map<String, String> contextStore() {
   @Override
   public String[] helperClassNames() {
     return new String[] {
-      "datadog.trace.instrumentation.hibernate.common.SessionState",
+      "datadog.trace.instrumentation.hibernate.SessionState",
       "datadog.trace.agent.decorator.BaseDecorator",
       "datadog.trace.agent.decorator.ClientDecorator",
       "datadog.trace.agent.decorator.DatabaseClientDecorator",
       "datadog.trace.agent.decorator.OrmClientDecorator",
-      "datadog.trace.instrumentation.hibernate.common.HibernateDecorator",
+      "datadog.trace.instrumentation.hibernate.HibernateDecorator",
     };
   }
 

diff --git a/...ibernate/v3_5/SessionInstrumentation.java → ...ate/core/v3_5/SessionInstrumentation.java b/...ibernate/v3_5/SessionInstrumentation.java → ...ate/core/v3_5/SessionInstrumentation.java
@@ -1,8 +1,8 @@
-package datadog.trace.instrumentation.hibernate.v3_5;
+package datadog.trace.instrumentation.hibernate.core.v3_5;
 
 import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType;
-import static datadog.trace.instrumentation.hibernate.common.HibernateDecorator.DECORATOR;
-import static datadog.trace.instrumentation.hibernate.common.SessionMethodUtils.SCOPE_ONLY_METHODS;
+import static datadog.trace.instrumentation.hibernate.HibernateDecorator.DECORATOR;
+import static datadog.trace.instrumentation.hibernate.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;
@@ -15,8 +15,8 @@
 import datadog.trace.agent.tooling.Instrumenter;
 import datadog.trace.bootstrap.ContextStore;
 import datadog.trace.bootstrap.InstrumentationContext;
-import datadog.trace.instrumentation.hibernate.common.SessionMethodUtils;
-import datadog.trace.instrumentation.hibernate.common.SessionState;
+import datadog.trace.instrumentation.hibernate.SessionMethodUtils;
+import datadog.trace.instrumentation.hibernate.SessionState;
 import io.opentracing.Span;
 import java.util.Collections;
 import java.util.HashMap;
@@ -53,13 +53,13 @@ public Map<String, String> contextStore() {
   @Override
   public String[] helperClassNames() {
     return new String[] {
-      "datadog.trace.instrumentation.hibernate.common.SessionMethodUtils",
-      "datadog.trace.instrumentation.hibernate.common.SessionState",
+      "datadog.trace.instrumentation.hibernate.SessionMethodUtils",
+      "datadog.trace.instrumentation.hibernate.SessionState",
       "datadog.trace.agent.decorator.BaseDecorator",
       "datadog.trace.agent.decorator.ClientDecorator",
       "datadog.trace.agent.decorator.DatabaseClientDecorator",
       "datadog.trace.agent.decorator.OrmClientDecorator",
-      "datadog.trace.instrumentation.hibernate.common.HibernateDecorator",
+      "datadog.trace.instrumentation.hibernate.HibernateDecorator",
     };
   }
 

diff --git a/...nate/v3_5/TransactionInstrumentation.java → ...core/v3_5/TransactionInstrumentation.java b/...nate/v3_5/TransactionInstrumentation.java → ...core/v3_5/TransactionInstrumentation.java
@@ -1,4 +1,4 @@
-package datadog.trace.instrumentation.hibernate.v3_5;
+package datadog.trace.instrumentation.hibernate.core.v3_5;
 
 import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType;
 import static java.util.Collections.singletonMap;
@@ -12,8 +12,8 @@
 import datadog.trace.agent.tooling.Instrumenter;
 import datadog.trace.bootstrap.ContextStore;
 import datadog.trace.bootstrap.InstrumentationContext;
-import datadog.trace.instrumentation.hibernate.common.SessionMethodUtils;
-import datadog.trace.instrumentation.hibernate.common.SessionState;
+import datadog.trace.instrumentation.hibernate.SessionMethodUtils;
+import datadog.trace.instrumentation.hibernate.SessionState;
 import java.util.Map;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.method.MethodDescription;
@@ -36,13 +36,13 @@ public Map<String, String> contextStore() {
   @Override
   public String[] helperClassNames() {
     return new String[] {
-      "datadog.trace.instrumentation.hibernate.common.SessionMethodUtils",
-      "datadog.trace.instrumentation.hibernate.common.SessionState",
+      "datadog.trace.instrumentation.hibernate.SessionMethodUtils",
+      "datadog.trace.instrumentation.hibernate.SessionState",
       "datadog.trace.agent.decorator.BaseDecorator",
       "datadog.trace.agent.decorator.ClientDecorator",
       "datadog.trace.agent.decorator.DatabaseClientDecorator",
       "datadog.trace.agent.decorator.OrmClientDecorator",
-      "datadog.trace.instrumentation.hibernate.common.HibernateDecorator",
+      "datadog.trace.instrumentation.hibernate.HibernateDecorator",
     };
   }
 

diff --git a/.../test/groovy/AbstractHibernateTest.groovy → .../test/groovy/AbstractHibernateTest.groovy b/.../test/groovy/AbstractHibernateTest.groovy → .../test/groovy/AbstractHibernateTest.groovy
diff --git a/...e-3.5/src/test/groovy/CriteriaTest.groovy → ...e-3.5/src/test/groovy/CriteriaTest.groovy b/...e-3.5/src/test/groovy/CriteriaTest.groovy → ...e-3.5/src/test/groovy/CriteriaTest.groovy
diff --git a/...nate-3.5/src/test/groovy/QueryTest.groovy → ...core-3.5/src/test/groovy/QueryTest.groovy b/...nate-3.5/src/test/groovy/QueryTest.groovy → ...core-3.5/src/test/groovy/QueryTest.groovy
diff --git a/...te-3.5/src/test/groovy/SessionTest.groovy → ...re-3.5/src/test/groovy/SessionTest.groovy b/...te-3.5/src/test/groovy/SessionTest.groovy → ...re-3.5/src/test/groovy/SessionTest.groovy
diff --git a/...on/hibernate-3.5/src/test/java/Value.java → ...bernate/core-3.5/src/test/java/Value.java b/...on/hibernate-3.5/src/test/java/Value.java → ...bernate/core-3.5/src/test/java/Value.java
diff --git a/...-3.5/src/test/resources/hibernate.cfg.xml → ...-3.5/src/test/resources/hibernate.cfg.xml b/...-3.5/src/test/resources/hibernate.cfg.xml → ...-3.5/src/test/resources/hibernate.cfg.xml
diff --git a/...tation/hibernate-4.0/hibernate-4.0.gradle → ...tation/hibernate/core-4.0/core-4.0.gradle b/...tation/hibernate-4.0/hibernate-4.0.gradle → ...tation/hibernate/core-4.0/core-4.0.gradle
@@ -27,7 +27,7 @@ dependencies {
   compileOnly group: 'org.hibernate', name: 'hibernate-core', version: '4.0.0.Final'
 
   compile project(':dd-java-agent:agent-tooling')
-  compile project(':dd-java-agent:instrumentation:hibernate-common')
+  compile project(':dd-java-agent:instrumentation:hibernate')
 
   compile deps.bytebuddy
   compile deps.opentracing
@@ -48,5 +48,5 @@ dependencies {
   latestDepTestCompile group: 'org.hibernate', name: 'hibernate-core', version: '+'
   latestDepTestCompile group: 'com.h2database', name: 'h2', version: '1.4.197'
   // Test that the incremental instrumentation for hibernate 4.3 doesn't cause issues.
-  latestDepTestCompile project(':dd-java-agent:instrumentation:hibernate-4.3')
+  latestDepTestCompile project(':dd-java-agent:instrumentation:hibernate:core-4.3')
 }
diff --git a/...bernate/v4_0/CriteriaInstrumentation.java → ...te/core/v4_0/CriteriaInstrumentation.java b/...bernate/v4_0/CriteriaInstrumentation.java → ...te/core/v4_0/CriteriaInstrumentation.java
@@ -1,4 +1,4 @@
-package datadog.trace.instrumentation.hibernate.v4_0;
+package datadog.trace.instrumentation.hibernate.core.v4_0;
 
 import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType;
 import static java.util.Collections.singletonMap;
@@ -11,8 +11,8 @@
 import datadog.trace.agent.tooling.Instrumenter;
 import datadog.trace.bootstrap.ContextStore;
 import datadog.trace.bootstrap.InstrumentationContext;
-import datadog.trace.instrumentation.hibernate.common.SessionMethodUtils;
-import datadog.trace.instrumentation.hibernate.common.SessionState;
+import datadog.trace.instrumentation.hibernate.SessionMethodUtils;
+import datadog.trace.instrumentation.hibernate.SessionState;
 import java.util.Map;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.method.MethodDescription;
@@ -36,13 +36,13 @@ public Map<String, String> contextStore() {
   @Override
   public String[] helperClassNames() {
     return new String[] {
-      "datadog.trace.instrumentation.hibernate.common.SessionMethodUtils",
-      "datadog.trace.instrumentation.hibernate.common.SessionState",
+      "datadog.trace.instrumentation.hibernate.SessionMethodUtils",
+      "datadog.trace.instrumentation.hibernate.SessionState",
       "datadog.trace.agent.decorator.BaseDecorator",
       "datadog.trace.agent.decorator.ClientDecorator",
       "datadog.trace.agent.decorator.DatabaseClientDecorator",
       "datadog.trace.agent.decorator.OrmClientDecorator",
-      "datadog.trace.instrumentation.hibernate.common.HibernateDecorator",
+      "datadog.trace.instrumentation.hibernate.HibernateDecorator",
     };
   }
 

diff --git a/.../hibernate/v3_5/QueryInstrumentation.java → ...rnate/core/v4_0/QueryInstrumentation.java b/.../hibernate/v3_5/QueryInstrumentation.java → ...rnate/core/v4_0/QueryInstrumentation.java
@@ -1,7 +1,7 @@
-package datadog.trace.instrumentation.hibernate.v3_5;
+package datadog.trace.instrumentation.hibernate.core.v4_0;
 
 import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType;
-import static datadog.trace.instrumentation.hibernate.common.HibernateDecorator.DECORATOR;
+import static datadog.trace.instrumentation.hibernate.HibernateDecorator.DECORATOR;
 import static java.util.Collections.singletonMap;
 import static net.bytebuddy.matcher.ElementMatchers.isInterface;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
@@ -12,8 +12,8 @@
 import datadog.trace.agent.tooling.Instrumenter;
 import datadog.trace.bootstrap.ContextStore;
 import datadog.trace.bootstrap.InstrumentationContext;
-import datadog.trace.instrumentation.hibernate.common.SessionMethodUtils;
-import datadog.trace.instrumentation.hibernate.common.SessionState;
+import datadog.trace.instrumentation.hibernate.SessionMethodUtils;
+import datadog.trace.instrumentation.hibernate.SessionState;
 import java.util.Map;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.method.MethodDescription;
@@ -38,13 +38,13 @@ public Map<String, String> contextStore() {
   @Override
   public String[] helperClassNames() {
     return new String[] {
-      "datadog.trace.instrumentation.hibernate.common.SessionMethodUtils",
-      "datadog.trace.instrumentation.hibernate.common.SessionState",
+      "datadog.trace.instrumentation.hibernate.SessionMethodUtils",
+      "datadog.trace.instrumentation.hibernate.SessionState",
       "datadog.trace.agent.decorator.BaseDecorator",
       "datadog.trace.agent.decorator.ClientDecorator",
       "datadog.trace.agent.decorator.DatabaseClientDecorator",
       "datadog.trace.agent.decorator.OrmClientDecorator",
-      "datadog.trace.instrumentation.hibernate.common.HibernateDecorator",
+      "datadog.trace.instrumentation.hibernate.HibernateDecorator",
     };
   }
 

diff --git a/...e/v4_0/SessionFactoryInstrumentation.java → ...e/v4_0/SessionFactoryInstrumentation.java b/...e/v4_0/SessionFactoryInstrumentation.java → ...e/v4_0/SessionFactoryInstrumentation.java
@@ -1,7 +1,7 @@
-package datadog.trace.instrumentation.hibernate.v4_0;
+package datadog.trace.instrumentation.hibernate.core.v4_0;
 
 import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType;
-import static datadog.trace.instrumentation.hibernate.common.HibernateDecorator.DECORATOR;
+import static datadog.trace.instrumentation.hibernate.HibernateDecorator.DECORATOR;
 import static java.util.Collections.singletonMap;
 import static net.bytebuddy.matcher.ElementMatchers.isInterface;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
@@ -14,7 +14,7 @@
 import datadog.trace.agent.tooling.Instrumenter;
 import datadog.trace.bootstrap.ContextStore;
 import datadog.trace.bootstrap.InstrumentationContext;
-import datadog.trace.instrumentation.hibernate.common.SessionState;
+import datadog.trace.instrumentation.hibernate.SessionState;
 import io.opentracing.Span;
 import io.opentracing.util.GlobalTracer;
 import java.util.Map;
@@ -39,12 +39,12 @@ public Map<String, String> contextStore() {
   @Override
   public String[] helperClassNames() {
     return new String[] {
-      "datadog.trace.instrumentation.hibernate.common.SessionState",
+      "datadog.trace.instrumentation.hibernate.SessionState",
       "datadog.trace.agent.decorator.BaseDecorator",
       "datadog.trace.agent.decorator.ClientDecorator",
       "datadog.trace.agent.decorator.DatabaseClientDecorator",
       "datadog.trace.agent.decorator.OrmClientDecorator",
-      "datadog.trace.instrumentation.hibernate.common.HibernateDecorator",
+      "datadog.trace.instrumentation.hibernate.HibernateDecorator",
     };
   }
 

diff --git a/...ibernate/v4_0/SessionInstrumentation.java → ...ate/core/v4_0/SessionInstrumentation.java b/...ibernate/v4_0/SessionInstrumentation.java → ...ate/core/v4_0/SessionInstrumentation.java
@@ -1,8 +1,8 @@
-package datadog.trace.instrumentation.hibernate.v4_0;
+package datadog.trace.instrumentation.hibernate.core.v4_0;
 
 import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType;
-import static datadog.trace.instrumentation.hibernate.common.HibernateDecorator.DECORATOR;
-import static datadog.trace.instrumentation.hibernate.common.SessionMethodUtils.SCOPE_ONLY_METHODS;
+import static datadog.trace.instrumentation.hibernate.HibernateDecorator.DECORATOR;
+import static datadog.trace.instrumentation.hibernate.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;
@@ -15,8 +15,8 @@
 import datadog.trace.agent.tooling.Instrumenter;
 import datadog.trace.bootstrap.ContextStore;
 import datadog.trace.bootstrap.InstrumentationContext;
-import datadog.trace.instrumentation.hibernate.common.SessionMethodUtils;
-import datadog.trace.instrumentation.hibernate.common.SessionState;
+import datadog.trace.instrumentation.hibernate.SessionMethodUtils;
+import datadog.trace.instrumentation.hibernate.SessionState;
 import io.opentracing.Span;
 import java.util.Collections;
 import java.util.HashMap;
@@ -51,13 +51,13 @@ public Map<String, String> contextStore() {
   @Override
   public String[] helperClassNames() {
     return new String[] {
-      "datadog.trace.instrumentation.hibernate.common.SessionMethodUtils",
-      "datadog.trace.instrumentation.hibernate.common.SessionState",
+      "datadog.trace.instrumentation.hibernate.SessionMethodUtils",
+      "datadog.trace.instrumentation.hibernate.SessionState",
       "datadog.trace.agent.decorator.BaseDecorator",
       "datadog.trace.agent.decorator.ClientDecorator",
       "datadog.trace.agent.decorator.DatabaseClientDecorator",
       "datadog.trace.agent.decorator.OrmClientDecorator",
-      "datadog.trace.instrumentation.hibernate.common.HibernateDecorator",
+      "datadog.trace.instrumentation.hibernate.HibernateDecorator",
     };
   }
 

diff --git a/...nate/v4_0/TransactionInstrumentation.java → ...core/v4_0/TransactionInstrumentation.java b/...nate/v4_0/TransactionInstrumentation.java → ...core/v4_0/TransactionInstrumentation.java
@@ -1,4 +1,4 @@
-package datadog.trace.instrumentation.hibernate.v4_0;
+package datadog.trace.instrumentation.hibernate.core.v4_0;
 
 import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType;
 import static java.util.Collections.singletonMap;
@@ -12,8 +12,8 @@
 import datadog.trace.agent.tooling.Instrumenter;
 import datadog.trace.bootstrap.ContextStore;
 import datadog.trace.bootstrap.InstrumentationContext;
-import datadog.trace.instrumentation.hibernate.common.SessionMethodUtils;
-import datadog.trace.instrumentation.hibernate.common.SessionState;
+import datadog.trace.instrumentation.hibernate.SessionMethodUtils;
+import datadog.trace.instrumentation.hibernate.SessionState;
 import java.util.Map;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.method.MethodDescription;
@@ -36,13 +36,13 @@ public Map<String, String> contextStore() {
   @Override
   public String[] helperClassNames() {
     return new String[] {
-      "datadog.trace.instrumentation.hibernate.common.SessionMethodUtils",
-      "datadog.trace.instrumentation.hibernate.common.SessionState",
+      "datadog.trace.instrumentation.hibernate.SessionMethodUtils",
+      "datadog.trace.instrumentation.hibernate.SessionState",
       "datadog.trace.agent.decorator.BaseDecorator",
       "datadog.trace.agent.decorator.ClientDecorator",
       "datadog.trace.agent.decorator.DatabaseClientDecorator",
       "datadog.trace.agent.decorator.OrmClientDecorator",
-      "datadog.trace.instrumentation.hibernate.common.HibernateDecorator",
+      "datadog.trace.instrumentation.hibernate.HibernateDecorator",
     };
   }
 

diff --git a/.../test/groovy/AbstractHibernateTest.groovy → .../test/groovy/AbstractHibernateTest.groovy b/.../test/groovy/AbstractHibernateTest.groovy → .../test/groovy/AbstractHibernateTest.groovy
diff --git a/...e-4.0/src/test/groovy/CriteriaTest.groovy → ...e-4.0/src/test/groovy/CriteriaTest.groovy b/...e-4.0/src/test/groovy/CriteriaTest.groovy → ...e-4.0/src/test/groovy/CriteriaTest.groovy
diff --git a/...nate-4.0/src/test/groovy/QueryTest.groovy → ...core-4.0/src/test/groovy/QueryTest.groovy b/...nate-4.0/src/test/groovy/QueryTest.groovy → ...core-4.0/src/test/groovy/QueryTest.groovy
diff --git a/...te-4.0/src/test/groovy/SessionTest.groovy → ...re-4.0/src/test/groovy/SessionTest.groovy b/...te-4.0/src/test/groovy/SessionTest.groovy → ...re-4.0/src/test/groovy/SessionTest.groovy
diff --git a/...on/hibernate-4.0/src/test/java/Value.java → ...bernate/core-4.0/src/test/java/Value.java b/...on/hibernate-4.0/src/test/java/Value.java → ...bernate/core-4.0/src/test/java/Value.java
diff --git a/...-4.0/src/test/resources/hibernate.cfg.xml → ...-4.0/src/test/resources/hibernate.cfg.xml b/...-4.0/src/test/resources/hibernate.cfg.xml → ...-4.0/src/test/resources/hibernate.cfg.xml
diff --git a/...tation/hibernate-4.3/hibernate-4.3.gradle → ...tation/hibernate/core-4.3/core-4.3.gradle b/...tation/hibernate-4.3/hibernate-4.3.gradle → ...tation/hibernate/core-4.3/core-4.3.gradle
@@ -27,7 +27,7 @@ dependencies {
   compileOnly group: 'org.hibernate', name: 'hibernate-core', version: '4.3.0.Final'
 
   compile project(':dd-java-agent:agent-tooling')
-  compile project(':dd-java-agent:instrumentation:hibernate-4.0')
+  compile project(':dd-java-agent:instrumentation:hibernate:core-4.0')
 
   compile deps.bytebuddy
   compile deps.opentracing