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

Merge fixes for Hibernate

This commit is contained in:
Will Gittoes 2019-03-12 10:46:30 +11:00
parent bf110640e8
commit e1915c35bf
No known key found for this signature in database
GPG Key ID: 521026A02DB0BB42
5 changed files with 15 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,7 +71,7 @@ public class SessionFactoryInstrumentation extends Instrumenter.Default {
final Span span = GlobalTracer.get().buildSpan("hibernate.session").start();
DECORATOR.afterStart(span);
DECORATOR.onSession(span, session);
DECORATOR.onConnection(span, session);
final ContextStore<SharedSessionContract, SessionState> contextStore =
InstrumentationContext.get(SharedSessionContract.class, SessionState.class);

2
dd-java-agent/instrumentation/hibernate-4.0/src/test/groovy/AbstractHibernateTest.groovy
View File

@ -16,7 +16,7 @@ abstract class AbstractHibernateTest extends AgentTestRunner {
try {
sessionFactory = new Configuration().configure().buildSessionFactory()
} catch (Exception e) {
return
throw e
}
// Pre-populate the DB, so delete/update can be tested.

5
dd-java-agent/instrumentation/hibernate-4.0/src/test/groovy/CriteriaTest.groovy
View File

@ -1,5 +1,4 @@
import datadog.trace.api.DDSpanTypes
import datadog.trace.api.DDTags
import io.opentracing.tag.Tags
import org.hibernate.Criteria
import org.hibernate.Session
@ -31,7 +30,6 @@ class CriteriaTest extends AbstractHibernateTest {
tags {
"$Tags.COMPONENT.key" "java-hibernate"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.HIBERNATE
defaultTags()
}
}
@ -44,7 +42,6 @@ class CriteriaTest extends AbstractHibernateTest {
tags {
"$Tags.COMPONENT.key" "java-hibernate"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.HIBERNATE
defaultTags()
}
}
@ -57,12 +54,12 @@ class CriteriaTest extends AbstractHibernateTest {
tags {
"$Tags.COMPONENT.key" "java-hibernate"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.HIBERNATE
defaultTags()
}
}
span(3) {
serviceName "h2"
spanType "sql"
childOf span(2)
}
}

12
dd-java-agent/instrumentation/hibernate-4.0/src/test/groovy/QueryTest.groovy
View File

@ -1,5 +1,4 @@
import datadog.trace.api.DDSpanTypes
import datadog.trace.api.DDTags
import io.opentracing.tag.Tags
import org.hibernate.Query
import org.hibernate.Session
@ -36,7 +35,6 @@ class QueryTest extends AbstractHibernateTest {
tags {
"$Tags.COMPONENT.key" "java-hibernate"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.HIBERNATE
defaultTags()
}
}
@ -49,7 +47,6 @@ class QueryTest extends AbstractHibernateTest {
tags {
"$Tags.COMPONENT.key" "java-hibernate"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.HIBERNATE
defaultTags()
}
}
@ -62,12 +59,12 @@ class QueryTest extends AbstractHibernateTest {
tags {
"$Tags.COMPONENT.key" "java-hibernate"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.HIBERNATE
defaultTags()
}
}
span(3) {
serviceName "h2"
spanType "sql"
childOf span(2)
}
}
@ -83,7 +80,6 @@ class QueryTest extends AbstractHibernateTest {
tags {
"$Tags.COMPONENT.key" "java-hibernate"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.HIBERNATE
defaultTags()
}
}
@ -96,12 +92,12 @@ class QueryTest extends AbstractHibernateTest {
tags {
"$Tags.COMPONENT.key" "java-hibernate"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.HIBERNATE
defaultTags()
}
}
span(2) {
serviceName "h2"
spanType "sql"
childOf span(1)
}
}
@ -157,7 +153,6 @@ class QueryTest extends AbstractHibernateTest {
tags {
"$Tags.COMPONENT.key" "java-hibernate"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.HIBERNATE
defaultTags()
}
}
@ -170,7 +165,6 @@ class QueryTest extends AbstractHibernateTest {
tags {
"$Tags.COMPONENT.key" "java-hibernate"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.HIBERNATE
defaultTags()
}
}
@ -183,12 +177,12 @@ class QueryTest extends AbstractHibernateTest {
tags {
"$Tags.COMPONENT.key" "java-hibernate"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.HIBERNATE
defaultTags()
}
}
span(3) {
serviceName "h2"
spanType "sql"
childOf span(2)
}
}

33
dd-java-agent/instrumentation/hibernate-4.0/src/test/groovy/SessionTest.groovy
View File

@ -1,5 +1,4 @@
import datadog.trace.api.DDSpanTypes
import datadog.trace.api.DDTags
import io.opentracing.Scope
import io.opentracing.Tracer
import io.opentracing.tag.Tags
@ -46,7 +45,6 @@ class SessionTest extends AbstractHibernateTest {
tags {
"$Tags.COMPONENT.key" "java-hibernate"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.HIBERNATE
defaultTags()
}
}
@ -59,7 +57,6 @@ class SessionTest extends AbstractHibernateTest {
tags {
"$Tags.COMPONENT.key" "java-hibernate"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.HIBERNATE
defaultTags()
}
}
@ -72,12 +69,12 @@ class SessionTest extends AbstractHibernateTest {
tags {
"$Tags.COMPONENT.key" "java-hibernate"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.HIBERNATE
defaultTags()
}
}
span(3) {
serviceName "h2"
spanType "sql"
childOf span(2)
}
}
@ -139,7 +136,6 @@ class SessionTest extends AbstractHibernateTest {
tags {
"$Tags.COMPONENT.key" "java-hibernate"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.HIBERNATE
defaultTags()
}
}
@ -152,12 +148,12 @@ class SessionTest extends AbstractHibernateTest {
tags {
"$Tags.COMPONENT.key" "java-hibernate"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.HIBERNATE
defaultTags()
}
}
span(2) {
serviceName "h2"
spanType "sql"
childOf span(1)
}
span(3) {
@ -169,12 +165,12 @@ class SessionTest extends AbstractHibernateTest {
tags {
"$Tags.COMPONENT.key" "java-hibernate"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.HIBERNATE
defaultTags()
}
}
span(4) {
serviceName "h2"
spanType "sql"
childOf span(3)
}
}
@ -223,7 +219,6 @@ class SessionTest extends AbstractHibernateTest {
tags {
"$Tags.COMPONENT.key" "java-hibernate"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.HIBERNATE
defaultTags()
}
}
@ -236,7 +231,6 @@ class SessionTest extends AbstractHibernateTest {
tags {
"$Tags.COMPONENT.key" "java-hibernate"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.HIBERNATE
defaultTags()
}
}
@ -246,12 +240,12 @@ class SessionTest extends AbstractHibernateTest {
operationName "hibernate.replicate"
spanType DDSpanTypes.HIBERNATE
childOf span(0)
errored(true)
tags {
errorTags(MappingException, "Unknown entity: java.lang.Long")
"$Tags.COMPONENT.key" "java-hibernate"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.HIBERNATE
defaultTags()
}
}
@ -288,7 +282,6 @@ class SessionTest extends AbstractHibernateTest {
tags {
"$Tags.COMPONENT.key" "java-hibernate"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.HIBERNATE
defaultTags()
}
}
@ -301,12 +294,12 @@ class SessionTest extends AbstractHibernateTest {
tags {
"$Tags.COMPONENT.key" "java-hibernate"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.HIBERNATE
defaultTags()
}
}
span(2) {
serviceName "h2"
spanType "sql"
childOf span(1)
}
span(3) {
@ -318,7 +311,6 @@ class SessionTest extends AbstractHibernateTest {
tags {
"$Tags.COMPONENT.key" "java-hibernate"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.HIBERNATE
defaultTags()
}
}
@ -379,7 +371,6 @@ class SessionTest extends AbstractHibernateTest {
tags {
"$Tags.COMPONENT.key" "java-hibernate"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.HIBERNATE
defaultTags()
}
}
@ -392,7 +383,6 @@ class SessionTest extends AbstractHibernateTest {
tags {
"$Tags.COMPONENT.key" "java-hibernate"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.HIBERNATE
defaultTags()
}
}
@ -405,12 +395,12 @@ class SessionTest extends AbstractHibernateTest {
tags {
"$Tags.COMPONENT.key" "java-hibernate"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.HIBERNATE
defaultTags()
}
}
span(3) {
serviceName "h2"
spanType "sql"
childOf span(2)
}
}
@ -466,7 +456,6 @@ class SessionTest extends AbstractHibernateTest {
tags {
"$Tags.COMPONENT.key" "java-hibernate"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.HIBERNATE
defaultTags()
}
}
@ -479,7 +468,6 @@ class SessionTest extends AbstractHibernateTest {
tags {
"$Tags.COMPONENT.key" "java-hibernate"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.HIBERNATE
defaultTags()
}
}
@ -492,16 +480,17 @@ class SessionTest extends AbstractHibernateTest {
tags {
"$Tags.COMPONENT.key" "java-hibernate"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.HIBERNATE
defaultTags()
}
}
span(4) {
serviceName "h2"
spanType "sql"
childOf span(3)
}
span(5) {
serviceName "h2"
spanType "sql"
childOf span(3)
}
span(6) {
@ -513,7 +502,6 @@ class SessionTest extends AbstractHibernateTest {
tags {
"$Tags.COMPONENT.key" "java-hibernate"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.HIBERNATE
defaultTags()
}
}
@ -526,7 +514,6 @@ class SessionTest extends AbstractHibernateTest {
tags {
"$Tags.COMPONENT.key" "java-hibernate"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.HIBERNATE
defaultTags()
}
}
@ -539,7 +526,6 @@ class SessionTest extends AbstractHibernateTest {
tags {
"$Tags.COMPONENT.key" "java-hibernate"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.HIBERNATE
defaultTags()
}
}
@ -552,12 +538,12 @@ class SessionTest extends AbstractHibernateTest {
tags {
"$Tags.COMPONENT.key" "java-hibernate"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.HIBERNATE
defaultTags()
}
}
span(10) {
serviceName "h2"
spanType "sql"
childOf span(9)
}
span(11) {
@ -569,7 +555,6 @@ class SessionTest extends AbstractHibernateTest {
tags {
"$Tags.COMPONENT.key" "java-hibernate"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.HIBERNATE
defaultTags()
}
}