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

Enable integration for hibernate 4.3

This commit is contained in:
Will Gittoes 2019-03-11 16:20:27 +11:00
parent b40483c974
commit 600f2e267f
No known key found for this signature in database
GPG Key ID: 521026A02DB0BB42
17 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dd-java-agent/instrumentation/hibernate-5/hibernate-5.gradle → dd-java-agent/instrumentation/hibernate-4.3/hibernate-4.3.gradle
View File

@ -9,7 +9,7 @@ muzzle {
pass { pass {
group = "org.hibernate" group = "org.hibernate"
module = "hibernate-core" module = "hibernate-core"
versions = "[5.0.0.Final,)" versions = "[4.3.0.Final,)"
} }
} }
@ -24,7 +24,7 @@ testSets {
} }
dependencies { 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') compile project(':dd-java-agent:agent-tooling')

2
dd-java-agent/instrumentation/hibernate-5/src/main/java/datadog/trace/instrumentation/hibernate5/CriteriaInstrumentation.java → dd-java-agent/instrumentation/hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3/CriteriaInstrumentation.java
View File

@ -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 datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType;
import static java.util.Collections.singletonMap; import static java.util.Collections.singletonMap;

2
dd-java-agent/instrumentation/hibernate-5/src/main/java/datadog/trace/instrumentation/hibernate5/HibernateDecorator.java → dd-java-agent/instrumentation/hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3/HibernateDecorator.java
View File

@ -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.agent.decorator.OrmClientDecorator;
import datadog.trace.api.DDSpanTypes; import datadog.trace.api.DDSpanTypes;

2
dd-java-agent/instrumentation/hibernate-5/src/main/java/datadog/trace/instrumentation/hibernate5/ProcedureCallInstrumentation.java → dd-java-agent/instrumentation/hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3/ProcedureCallInstrumentation.java
View File

@ -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 datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType;
import static java.util.Collections.singletonMap; import static java.util.Collections.singletonMap;

4
dd-java-agent/instrumentation/hibernate-5/src/main/java/datadog/trace/instrumentation/hibernate5/QueryInstrumentation.java → dd-java-agent/instrumentation/hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3/QueryInstrumentation.java
View File

@ -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.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 java.util.Collections.singletonMap;
import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.isInterface;
import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isMethod;

4
dd-java-agent/instrumentation/hibernate-5/src/main/java/datadog/trace/instrumentation/hibernate5/SessionFactoryInstrumentation.java → dd-java-agent/instrumentation/hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3/SessionFactoryInstrumentation.java
View File

@ -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.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 java.util.Collections.singletonMap;
import static net.bytebuddy.matcher.ElementMatchers.isInterface; import static net.bytebuddy.matcher.ElementMatchers.isInterface;
import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isMethod;

6
dd-java-agent/instrumentation/hibernate-5/src/main/java/datadog/trace/instrumentation/hibernate5/SessionInstrumentation.java → dd-java-agent/instrumentation/hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3/SessionInstrumentation.java
View File

@ -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.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType;
import static datadog.trace.instrumentation.hibernate5.HibernateDecorator.DECORATOR; import static datadog.trace.instrumentation.hibernate.v4_3.HibernateDecorator.DECORATOR;
import static datadog.trace.instrumentation.hibernate5.SessionMethodUtils.SCOPE_ONLY_METHODS; 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.isInterface;
import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isMethod;
import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.named;

4
dd-java-agent/instrumentation/hibernate-5/src/main/java/datadog/trace/instrumentation/hibernate5/SessionMethodUtils.java → dd-java-agent/instrumentation/hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3/SessionMethodUtils.java
View File

@ -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.CallDepthThreadLocalMap;
import datadog.trace.bootstrap.ContextStore; import datadog.trace.bootstrap.ContextStore;

2
dd-java-agent/instrumentation/hibernate-5/src/main/java/datadog/trace/instrumentation/hibernate5/SessionState.java → dd-java-agent/instrumentation/hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3/SessionState.java
View File

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

2
dd-java-agent/instrumentation/hibernate-5/src/main/java/datadog/trace/instrumentation/hibernate5/TransactionInstrumentation.java → dd-java-agent/instrumentation/hibernate-4.3/src/main/java/datadog/trace/instrumentation/hibernate/v4_3/TransactionInstrumentation.java
View File

@ -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 datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType;
import static java.util.Collections.singletonMap; import static java.util.Collections.singletonMap;

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

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

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

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

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

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

2
settings.gradle
View File

@ -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-5.3'
include ':dd-java-agent:instrumentation:elasticsearch:transport-6' include ':dd-java-agent:instrumentation:elasticsearch:transport-6'
include ':dd-java-agent:instrumentation:grpc-1.5' 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:http-url-connection'
include ':dd-java-agent:instrumentation:hystrix-1.4' include ':dd-java-agent:instrumentation:hystrix-1.4'
include ':dd-java-agent:instrumentation:jax-rs-annotations' include ':dd-java-agent:instrumentation:jax-rs-annotations'