open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Restructure hibernate integration

This commit is contained in:
Will Gittoes 2019-03-20 11:00:42 +11:00
parent 4825a113f8
commit 8c5158f8e9
No known key found for this signature in database
GPG Key ID: 521026A02DB0BB42
35 changed files with 94 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dd-java-agent/instrumentation/hibernate-3.5/hibernate-3.5.gradle → dd-java-agent/instrumentation/hibernate/core-3.5/core-3.5.gradle
View File

@ -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

12
dd-java-agent/instrumentation/hibernate-3.5/src/main/java/datadog/trace/instrumentation/hibernate/v3_5/CriteriaInstrumentation.java → dd-java-agent/instrumentation/hibernate/core-3.5/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_5/CriteriaInstrumentation.java
View File

@ -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 com.google.auto.service.AutoService;
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 class CriteriaInstrumentation extends Instrumenter.Default {
@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",
};
}

14
dd-java-agent/instrumentation/hibernate-4.0/src/main/java/datadog/trace/instrumentation/hibernate/v4_0/QueryInstrumentation.java → dd-java-agent/instrumentation/hibernate/core-3.5/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_5/QueryInstrumentation.java
View File

@ -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 com.google.auto.service.AutoService;
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 class QueryInstrumentation extends Instrumenter.Default {
@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",
};
}

10
dd-java-agent/instrumentation/hibernate-3.5/src/main/java/datadog/trace/instrumentation/hibernate/v3_5/SessionFactoryInstrumentation.java → dd-java-agent/instrumentation/hibernate/core-3.5/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_5/SessionFactoryInstrumentation.java
View File

@ -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 com.google.auto.service.AutoService;
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 class SessionFactoryInstrumentation extends Instrumenter.Default {
@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",
};
}

16
dd-java-agent/instrumentation/hibernate-3.5/src/main/java/datadog/trace/instrumentation/hibernate/v3_5/SessionInstrumentation.java → dd-java-agent/instrumentation/hibernate/core-3.5/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_5/SessionInstrumentation.java
View File

@ -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 com.google.auto.service.AutoService;
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 class SessionInstrumentation extends Instrumenter.Default {
@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",
};
}

12
dd-java-agent/instrumentation/hibernate-3.5/src/main/java/datadog/trace/instrumentation/hibernate/v3_5/TransactionInstrumentation.java → dd-java-agent/instrumentation/hibernate/core-3.5/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_5/TransactionInstrumentation.java
View File

@ -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 com.google.auto.service.AutoService;
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 class TransactionInstrumentation extends Instrumenter.Default {
@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",
};
}

0
dd-java-agent/instrumentation/hibernate-3.5/src/test/groovy/AbstractHibernateTest.groovy → dd-java-agent/instrumentation/hibernate/core-3.5/src/test/groovy/AbstractHibernateTest.groovy
View File

0
dd-java-agent/instrumentation/hibernate-3.5/src/test/groovy/CriteriaTest.groovy → dd-java-agent/instrumentation/hibernate/core-3.5/src/test/groovy/CriteriaTest.groovy
View File

0
dd-java-agent/instrumentation/hibernate-3.5/src/test/groovy/QueryTest.groovy → dd-java-agent/instrumentation/hibernate/core-3.5/src/test/groovy/QueryTest.groovy
View File

0
dd-java-agent/instrumentation/hibernate-3.5/src/test/groovy/SessionTest.groovy → dd-java-agent/instrumentation/hibernate/core-3.5/src/test/groovy/SessionTest.groovy
View File

0
dd-java-agent/instrumentation/hibernate-3.5/src/test/java/Value.java → dd-java-agent/instrumentation/hibernate/core-3.5/src/test/java/Value.java
View File

0
dd-java-agent/instrumentation/hibernate-3.5/src/test/resources/hibernate.cfg.xml → dd-java-agent/instrumentation/hibernate/core-3.5/src/test/resources/hibernate.cfg.xml
View File

4
dd-java-agent/instrumentation/hibernate-4.0/hibernate-4.0.gradle → dd-java-agent/instrumentation/hibernate/core-4.0/core-4.0.gradle
View File

@ -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')
}

12
dd-java-agent/instrumentation/hibernate-4.0/src/main/java/datadog/trace/instrumentation/hibernate/v4_0/CriteriaInstrumentation.java → dd-java-agent/instrumentation/hibernate/core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/CriteriaInstrumentation.java
View File

@ -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 com.google.auto.service.AutoService;
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 class CriteriaInstrumentation extends Instrumenter.Default {
@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",
};
}

14
dd-java-agent/instrumentation/hibernate-3.5/src/main/java/datadog/trace/instrumentation/hibernate/v3_5/QueryInstrumentation.java → dd-java-agent/instrumentation/hibernate/core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/QueryInstrumentation.java
View File

@ -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 com.google.auto.service.AutoService;
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 class QueryInstrumentation extends Instrumenter.Default {
@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",
};
}

10
dd-java-agent/instrumentation/hibernate-4.0/src/main/java/datadog/trace/instrumentation/hibernate/v4_0/SessionFactoryInstrumentation.java → dd-java-agent/instrumentation/hibernate/core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/SessionFactoryInstrumentation.java
View File

@ -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 com.google.auto.service.AutoService;
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 class SessionFactoryInstrumentation extends Instrumenter.Default {
@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",
};
}

16
dd-java-agent/instrumentation/hibernate-4.0/src/main/java/datadog/trace/instrumentation/hibernate/v4_0/SessionInstrumentation.java → dd-java-agent/instrumentation/hibernate/core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/SessionInstrumentation.java
View File

@ -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 com.google.auto.service.AutoService;
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 class SessionInstrumentation extends Instrumenter.Default {
@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",
};
}

12
dd-java-agent/instrumentation/hibernate-4.0/src/main/java/datadog/trace/instrumentation/hibernate/v4_0/TransactionInstrumentation.java → dd-java-agent/instrumentation/hibernate/core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/TransactionInstrumentation.java
View File

@ -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 com.google.auto.service.AutoService;
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 class TransactionInstrumentation extends Instrumenter.Default {
@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",
};
}

0
dd-java-agent/instrumentation/hibernate-4.0/src/test/groovy/AbstractHibernateTest.groovy → dd-java-agent/instrumentation/hibernate/core-4.0/src/test/groovy/AbstractHibernateTest.groovy
View File

0
dd-java-agent/instrumentation/hibernate-4.0/src/test/groovy/CriteriaTest.groovy → dd-java-agent/instrumentation/hibernate/core-4.0/src/test/groovy/CriteriaTest.groovy
View File

0
dd-java-agent/instrumentation/hibernate-4.0/src/test/groovy/QueryTest.groovy → dd-java-agent/instrumentation/hibernate/core-4.0/src/test/groovy/QueryTest.groovy
View File

0
dd-java-agent/instrumentation/hibernate-4.0/src/test/groovy/SessionTest.groovy → dd-java-agent/instrumentation/hibernate/core-4.0/src/test/groovy/SessionTest.groovy
View File

0
dd-java-agent/instrumentation/hibernate-4.0/src/test/java/Value.java → dd-java-agent/instrumentation/hibernate/core-4.0/src/test/java/Value.java
View File

0
dd-java-agent/instrumentation/hibernate-4.0/src/test/resources/hibernate.cfg.xml → dd-java-agent/instrumentation/hibernate/core-4.0/src/test/resources/hibernate.cfg.xml
View File

2
dd-java-agent/instrumentation/hibernate-4.3/hibernate-4.3.gradle → dd-java-agent/instrumentation/hibernate/core-4.3/core-4.3.gradle
View File

@ -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

12
dd-java-agent/instrumentation/hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3/ProcedureCallInstrumentation.java → dd-java-agent/instrumentation/hibernate/core-4.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_3/ProcedureCallInstrumentation.java
View File

@ -1,4 +1,4 @@
package datadog.trace.instrumentation.hibernate.v4_3;
package datadog.trace.instrumentation.hibernate.core.v4_3;
import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType;
import static java.util.Collections.singletonMap;
@ -11,8 +11,8 @@ import com.google.auto.service.AutoService;
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;
@ -35,13 +35,13 @@ public class ProcedureCallInstrumentation extends Instrumenter.Default {
@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",
};
}

12
dd-java-agent/instrumentation/hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3/SessionInstrumentation.java → dd-java-agent/instrumentation/hibernate/core-4.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_3/SessionInstrumentation.java
View File

@ -1,4 +1,4 @@
package datadog.trace.instrumentation.hibernate.v4_3;
package datadog.trace.instrumentation.hibernate.core.v4_3;
import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType;
import static net.bytebuddy.matcher.ElementMatchers.isInterface;
@ -11,8 +11,8 @@ import com.google.auto.service.AutoService;
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.Collections;
import java.util.HashMap;
import java.util.Map;
@ -41,13 +41,13 @@ public class SessionInstrumentation extends Instrumenter.Default {
@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",
};
}

0
dd-java-agent/instrumentation/hibernate-4.3/src/test/groovy/ProcedureCallTest.groovy → dd-java-agent/instrumentation/hibernate/core-4.3/src/test/groovy/ProcedureCallTest.groovy
View File

0
dd-java-agent/instrumentation/hibernate-4.3/src/test/java/Value.java → dd-java-agent/instrumentation/hibernate/core-4.3/src/test/java/Value.java
View File

0
dd-java-agent/instrumentation/hibernate-4.3/src/test/resources/hibernate.cfg.xml → dd-java-agent/instrumentation/hibernate/core-4.3/src/test/resources/hibernate.cfg.xml
View File

0
dd-java-agent/instrumentation/hibernate-common/hibernate-common.gradle → dd-java-agent/instrumentation/hibernate/hibernate.gradle
View File

2
dd-java-agent/instrumentation/hibernate-common/src/main/java/datadog/trace/instrumentation/hibernate/common/HibernateDecorator.java → dd-java-agent/instrumentation/hibernate/src/main/java/datadog/trace/instrumentation/hibernate/HibernateDecorator.java
View File

@ -1,4 +1,4 @@
package datadog.trace.instrumentation.hibernate.common;
package datadog.trace.instrumentation.hibernate;
import datadog.trace.agent.decorator.OrmClientDecorator;
import datadog.trace.api.DDSpanTypes;

14
dd-java-agent/instrumentation/hibernate-common/src/main/java/datadog/trace/instrumentation/hibernate/common/SessionMethodUtils.java → dd-java-agent/instrumentation/hibernate/src/main/java/datadog/trace/instrumentation/hibernate/SessionMethodUtils.java
View File

@ -1,4 +1,6 @@
package datadog.trace.instrumentation.hibernate.common;
package datadog.trace.instrumentation.hibernate;
import static datadog.trace.instrumentation.hibernate.HibernateDecorator.DECORATOR;
import datadog.trace.bootstrap.CallDepthThreadLocalMap;
import datadog.trace.bootstrap.ContextStore;
@ -41,8 +43,8 @@ public class SessionMethodUtils {
.buildSpan(operationName)
.asChildOf(sessionState.getSessionSpan())
.startActive(true);
HibernateDecorator.DECORATOR.afterStart(scope.span());
HibernateDecorator.DECORATOR.onOperation(scope.span(), entity);
DECORATOR.afterStart(scope.span());
DECORATOR.onOperation(scope.span(), entity);
} else {
scope = GlobalTracer.get().scopeManager().activate(sessionState.getSessionSpan(), false);
sessionState.setHasChildSpan(false);
@ -66,11 +68,11 @@ public class SessionMethodUtils {
final Scope scope = sessionState.getMethodScope();
final Span span = scope.span();
if (span != null && sessionState.hasChildSpan) {
HibernateDecorator.DECORATOR.onError(span, throwable);
DECORATOR.onError(span, throwable);
if (entity != null) {
HibernateDecorator.DECORATOR.onOperation(span, entity);
DECORATOR.onOperation(span, entity);
}
HibernateDecorator.DECORATOR.beforeFinish(span);
DECORATOR.beforeFinish(span);
span.finish();
}

2
dd-java-agent/instrumentation/hibernate-common/src/main/java/datadog/trace/instrumentation/hibernate/common/SessionState.java → dd-java-agent/instrumentation/hibernate/src/main/java/datadog/trace/instrumentation/hibernate/SessionState.java
View File

@ -1,4 +1,4 @@
package datadog.trace.instrumentation.hibernate.common;
package datadog.trace.instrumentation.hibernate;
import io.opentracing.Scope;
import io.opentracing.Span;

8
settings.gradle
View File

@ -40,10 +40,10 @@ 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-3.5'
include ':dd-java-agent:instrumentation:hibernate-4.0'
include ':dd-java-agent:instrumentation:hibernate-4.3'
include ':dd-java-agent:instrumentation:hibernate-common'
include ':dd-java-agent:instrumentation:hibernate'
include ':dd-java-agent:instrumentation:hibernate:core-3.5'
include ':dd-java-agent:instrumentation:hibernate:core-4.0'
include ':dd-java-agent:instrumentation:hibernate:core-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'