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

Change some span kinds to INTERNAL (#167) 

* Change handler/controller span kind to INTERNAL

* Change hibernate span kind to INTERNAL

* Change spring-data span kind to INTERNAL
This commit is contained in:
Trask Stalnaker 2020-02-18 11:28:32 -08:00 committed by GitHub
parent cf1623711e
commit 3632e3bb2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 125 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
instrumentation/dropwizard-testing/src/test/groovy/DropwizardTest.groovy
View File

@ -25,6 +25,7 @@ import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.EXCE
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.QUERY_PARAM
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.REDIRECT
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.SUCCESS
import static io.opentelemetry.trace.Span.Kind.INTERNAL
import static io.opentelemetry.trace.Span.Kind.SERVER
class DropwizardTest extends HttpServerTest<DropwizardTestSupport, Servlet3Decorator> {
@ -86,6 +87,7 @@ class DropwizardTest extends HttpServerTest<DropwizardTestSupport, Servlet3Decor
void handlerSpan(TraceAssert trace, int index, Object parent, String method = "GET", ServerEndpoint endpoint = SUCCESS) {
trace.span(index) {
operationName "jax-rs.request"
spanKind INTERNAL
errored endpoint == EXCEPTION
childOf((SpanData) parent)
tags {

15
instrumentation/elasticsearch/transport-5.3/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy
View File

@ -14,6 +14,7 @@ import java.lang.reflect.Proxy
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static io.opentelemetry.trace.Span.Kind.INTERNAL
class Elasticsearch53SpringRepositoryTest extends AgentTestRunner {
// Setting up appContext & repo with @Shared doesn't allow
@ -71,7 +72,7 @@ class Elasticsearch53SpringRepositoryTest extends AgentTestRunner {
}
span(0) {
operationName "repository.operation"
spanKind CLIENT
spanKind INTERNAL
tags {
"$MoreTags.RESOURCE_NAME" "CrudRepository.findAll"
"$Tags.COMPONENT" "spring-data"
@ -117,7 +118,7 @@ class Elasticsearch53SpringRepositoryTest extends AgentTestRunner {
}
span(0) {
operationName "repository.operation"
spanKind CLIENT
spanKind INTERNAL
tags {
"$MoreTags.RESOURCE_NAME" "ElasticsearchRepository.index"
"$Tags.COMPONENT" "spring-data"
@ -192,7 +193,7 @@ class Elasticsearch53SpringRepositoryTest extends AgentTestRunner {
}
span(0) {
operationName "repository.operation"
spanKind CLIENT
spanKind INTERNAL
tags {
"$MoreTags.RESOURCE_NAME" "CrudRepository.findById"
"$Tags.COMPONENT" "spring-data"
@ -236,7 +237,7 @@ class Elasticsearch53SpringRepositoryTest extends AgentTestRunner {
}
span(0) {
operationName "repository.operation"
spanKind CLIENT
spanKind INTERNAL
tags {
"$MoreTags.RESOURCE_NAME" "ElasticsearchRepository.index"
"$Tags.COMPONENT" "spring-data"
@ -288,7 +289,7 @@ class Elasticsearch53SpringRepositoryTest extends AgentTestRunner {
}
span(0) {
operationName "repository.operation"
spanKind CLIENT
spanKind INTERNAL
tags {
"$MoreTags.RESOURCE_NAME" "CrudRepository.findById"
"$Tags.COMPONENT" "spring-data"
@ -331,7 +332,7 @@ class Elasticsearch53SpringRepositoryTest extends AgentTestRunner {
}
span(0) {
operationName "repository.operation"
spanKind CLIENT
spanKind INTERNAL
tags {
"$MoreTags.RESOURCE_NAME" "CrudRepository.deleteById"
"$Tags.COMPONENT" "spring-data"
@ -384,7 +385,7 @@ class Elasticsearch53SpringRepositoryTest extends AgentTestRunner {
}
span(0) {
operationName "repository.operation"
spanKind CLIENT
spanKind INTERNAL
tags {
"$MoreTags.RESOURCE_NAME" "CrudRepository.findAll"
"$Tags.COMPONENT" "spring-data"

3
instrumentation/finatra-2.9/src/main/java/io/opentelemetry/auto/instrumentation/finatra/FinatraInstrumentation.java
View File

@ -3,7 +3,6 @@ package io.opentelemetry.auto.instrumentation.finatra;
import static io.opentelemetry.auto.instrumentation.finatra.FinatraDecorator.DECORATE;
import static io.opentelemetry.auto.instrumentation.finatra.FinatraDecorator.TRACER;
import static io.opentelemetry.auto.tooling.ByteBuddyElementMatchers.safeHasSuperType;
import static io.opentelemetry.trace.Span.Kind.SERVER;
import static java.util.Collections.singletonMap;
import static net.bytebuddy.matcher.ElementMatchers.isInterface;
import static net.bytebuddy.matcher.ElementMatchers.isMethod;
@ -79,7 +78,7 @@ public class FinatraInstrumentation extends Instrumenter.Default {
parent.setAttribute(Tags.COMPONENT, "finatra");
parent.updateName("finatra.request");
final Span span = TRACER.spanBuilder("finatra.controller").setSpanKind(SERVER).startSpan();
final Span span = TRACER.spanBuilder("finatra.controller").startSpan();
DECORATE.afterStart(span);
span.setAttribute(MoreTags.RESOURCE_NAME, DECORATE.spanNameForClass(clazz));

3
instrumentation/finatra-2.9/src/test/groovy/FinatraServerTest.groovy
View File

@ -15,6 +15,7 @@ import java.util.concurrent.TimeoutException
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.ERROR
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.EXCEPTION
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.SUCCESS
import static io.opentelemetry.trace.Span.Kind.INTERNAL
import static io.opentelemetry.trace.Span.Kind.SERVER
class FinatraServerTest extends HttpServerTest<HttpServer, FinatraDecorator> {
@ -73,7 +74,7 @@ class FinatraServerTest extends HttpServerTest<HttpServer, FinatraDecorator> {
def errorEndpoint = endpoint == EXCEPTION || endpoint == ERROR
trace.span(index) {
operationName "finatra.controller"
spanKind SERVER
spanKind INTERNAL
errored errorEndpoint
childOf(parent as SpanData)
tags {

3
instrumentation/hibernate/core-3.3/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/core/v3_3/SessionFactoryInstrumentation.java
View File

@ -3,7 +3,6 @@ package io.opentelemetry.auto.instrumentation.hibernate.core.v3_3;
import static io.opentelemetry.auto.instrumentation.hibernate.HibernateDecorator.DECORATOR;
import static io.opentelemetry.auto.instrumentation.hibernate.HibernateDecorator.TRACER;
import static io.opentelemetry.auto.tooling.ByteBuddyElementMatchers.safeHasSuperType;
import static io.opentelemetry.trace.Span.Kind.CLIENT;
import static java.util.Collections.singletonMap;
import static net.bytebuddy.matcher.ElementMatchers.isInterface;
import static net.bytebuddy.matcher.ElementMatchers.isMethod;
@ -62,7 +61,7 @@ public class SessionFactoryInstrumentation extends AbstractHibernateInstrumentat
@Advice.OnMethodExit(suppress = Throwable.class)
public static void openSession(@Advice.Return final Object session) {
final Span span = TRACER.spanBuilder("hibernate.session").setSpanKind(CLIENT).startSpan();
final Span span = TRACER.spanBuilder("hibernate.session").startSpan();
DECORATOR.afterStart(span);
DECORATOR.onConnection(span, session);

7
instrumentation/hibernate/core-3.3/src/test/groovy/CriteriaTest.groovy
View File

@ -7,6 +7,7 @@ import org.hibernate.criterion.Order
import org.hibernate.criterion.Restrictions
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static io.opentelemetry.trace.Span.Kind.INTERNAL
class CriteriaTest extends AbstractHibernateTest {
@ -26,7 +27,7 @@ class CriteriaTest extends AbstractHibernateTest {
trace(0, 4) {
span(0) {
operationName "hibernate.session"
spanKind CLIENT
spanKind INTERNAL
parent()
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -36,7 +37,7 @@ class CriteriaTest extends AbstractHibernateTest {
}
span(1) {
operationName "hibernate.criteria.$methodName"
spanKind CLIENT
spanKind INTERNAL
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -61,7 +62,7 @@ class CriteriaTest extends AbstractHibernateTest {
}
span(3) {
operationName "hibernate.transaction.commit"
spanKind CLIENT
spanKind INTERNAL
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"

17
instrumentation/hibernate/core-3.3/src/test/groovy/QueryTest.groovy
View File

@ -5,6 +5,7 @@ import org.hibernate.Query
import org.hibernate.Session
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static io.opentelemetry.trace.Span.Kind.INTERNAL
class QueryTest extends AbstractHibernateTest {
@ -31,7 +32,7 @@ class QueryTest extends AbstractHibernateTest {
trace(0, 4) {
span(0) {
operationName "hibernate.session"
spanKind CLIENT
spanKind INTERNAL
parent()
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -41,7 +42,7 @@ class QueryTest extends AbstractHibernateTest {
}
span(1) {
operationName "hibernate.$queryMethodName"
spanKind CLIENT
spanKind INTERNAL
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -68,7 +69,7 @@ class QueryTest extends AbstractHibernateTest {
}
span(3) {
operationName "hibernate.transaction.commit"
spanKind CLIENT
spanKind INTERNAL
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -82,7 +83,7 @@ class QueryTest extends AbstractHibernateTest {
trace(1, 3) {
span(0) {
operationName "hibernate.session"
spanKind CLIENT
spanKind INTERNAL
parent()
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -92,7 +93,7 @@ class QueryTest extends AbstractHibernateTest {
}
span(1) {
operationName "hibernate.$queryMethodName"
spanKind CLIENT
spanKind INTERNAL
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -163,7 +164,7 @@ class QueryTest extends AbstractHibernateTest {
trace(0, 4) {
span(0) {
operationName "hibernate.session"
spanKind CLIENT
spanKind INTERNAL
parent()
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -173,7 +174,7 @@ class QueryTest extends AbstractHibernateTest {
}
span(1) {
operationName "hibernate.iterate"
spanKind CLIENT
spanKind INTERNAL
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -199,7 +200,7 @@ class QueryTest extends AbstractHibernateTest {
}
span(3) {
operationName "hibernate.transaction.commit"
spanKind CLIENT
spanKind INTERNAL
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"

55
instrumentation/hibernate/core-3.3/src/test/groovy/SessionTest.groovy
View File

@ -9,6 +9,7 @@ import org.hibernate.Session
import spock.lang.Shared
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static io.opentelemetry.trace.Span.Kind.INTERNAL
class SessionTest extends AbstractHibernateTest {
@ -42,7 +43,7 @@ class SessionTest extends AbstractHibernateTest {
trace(i, 4) {
span(0) {
operationName "hibernate.session"
spanKind CLIENT
spanKind INTERNAL
parent()
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -52,7 +53,7 @@ class SessionTest extends AbstractHibernateTest {
}
span(1) {
operationName "hibernate.$methodName"
spanKind CLIENT
spanKind INTERNAL
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -78,7 +79,7 @@ class SessionTest extends AbstractHibernateTest {
}
span(3) {
operationName "hibernate.transaction.commit"
spanKind CLIENT
spanKind INTERNAL
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -124,7 +125,7 @@ class SessionTest extends AbstractHibernateTest {
trace(0, 4) {
span(0) {
operationName "hibernate.session"
spanKind CLIENT
spanKind INTERNAL
parent()
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -134,7 +135,7 @@ class SessionTest extends AbstractHibernateTest {
}
span(1) {
operationName "hibernate.$methodName"
spanKind CLIENT
spanKind INTERNAL
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -145,7 +146,7 @@ class SessionTest extends AbstractHibernateTest {
}
span(2) {
operationName "hibernate.transaction.commit"
spanKind CLIENT
spanKind INTERNAL
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -210,7 +211,7 @@ class SessionTest extends AbstractHibernateTest {
trace(0, 5) {
span(0) {
operationName "hibernate.session"
spanKind CLIENT
spanKind INTERNAL
parent()
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -220,7 +221,7 @@ class SessionTest extends AbstractHibernateTest {
}
span(1) {
operationName "hibernate.$methodName"
spanKind CLIENT
spanKind INTERNAL
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -246,7 +247,7 @@ class SessionTest extends AbstractHibernateTest {
}
span(3) {
operationName "hibernate.transaction.commit"
spanKind CLIENT
spanKind INTERNAL
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -308,7 +309,7 @@ class SessionTest extends AbstractHibernateTest {
trace(0, 3) {
span(0) {
operationName "hibernate.session"
spanKind CLIENT
spanKind INTERNAL
parent()
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -318,7 +319,7 @@ class SessionTest extends AbstractHibernateTest {
}
span(1) {
operationName "hibernate.replicate"
spanKind CLIENT
spanKind INTERNAL
childOf span(0)
errored(true)
tags {
@ -330,7 +331,7 @@ class SessionTest extends AbstractHibernateTest {
}
span(2) {
operationName "hibernate.transaction.commit"
spanKind CLIENT
spanKind INTERNAL
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -364,7 +365,7 @@ class SessionTest extends AbstractHibernateTest {
trace(0, 4) {
span(0) {
operationName "hibernate.session"
spanKind CLIENT
spanKind INTERNAL
parent()
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -374,7 +375,7 @@ class SessionTest extends AbstractHibernateTest {
}
span(1) {
operationName "hibernate.$methodName"
spanKind CLIENT
spanKind INTERNAL
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -385,7 +386,7 @@ class SessionTest extends AbstractHibernateTest {
}
span(2) {
operationName "hibernate.transaction.commit"
spanKind CLIENT
spanKind INTERNAL
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -457,7 +458,7 @@ class SessionTest extends AbstractHibernateTest {
trace(0, 4) {
span(0) {
operationName "hibernate.session"
spanKind CLIENT
spanKind INTERNAL
parent()
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -467,7 +468,7 @@ class SessionTest extends AbstractHibernateTest {
}
span(1) {
operationName "hibernate.query.list"
spanKind CLIENT
spanKind INTERNAL
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -494,7 +495,7 @@ class SessionTest extends AbstractHibernateTest {
}
span(3) {
operationName "hibernate.transaction.commit"
spanKind CLIENT
spanKind INTERNAL
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -516,7 +517,7 @@ class SessionTest extends AbstractHibernateTest {
def "test hibernate overlapping Sessions"() {
setup:
def rootSpan = TEST_TRACER.spanBuilder("overlapping Sessions").setSpanKind(CLIENT).startSpan()
def rootSpan = TEST_TRACER.spanBuilder("overlapping Sessions").startSpan()
def scope = TEST_TRACER.withSpan(rootSpan)
def session1 = sessionFactory.openSession()
@ -549,7 +550,7 @@ class SessionTest extends AbstractHibernateTest {
}
span(1) {
operationName "hibernate.session"
spanKind CLIENT
spanKind INTERNAL
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -559,7 +560,7 @@ class SessionTest extends AbstractHibernateTest {
}
span(2) {
operationName "hibernate.save"
spanKind CLIENT
spanKind INTERNAL
childOf span(1)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -570,7 +571,7 @@ class SessionTest extends AbstractHibernateTest {
}
span(3) {
operationName "hibernate.delete"
spanKind CLIENT
spanKind INTERNAL
childOf span(1)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -581,7 +582,7 @@ class SessionTest extends AbstractHibernateTest {
}
span(4) {
operationName "hibernate.transaction.commit"
spanKind CLIENT
spanKind INTERNAL
childOf span(1)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -621,7 +622,7 @@ class SessionTest extends AbstractHibernateTest {
}
span(7) {
operationName "hibernate.session"
spanKind CLIENT
spanKind INTERNAL
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -631,7 +632,7 @@ class SessionTest extends AbstractHibernateTest {
}
span(8) {
operationName "hibernate.insert"
spanKind CLIENT
spanKind INTERNAL
childOf span(7)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -642,7 +643,7 @@ class SessionTest extends AbstractHibernateTest {
}
span(9) {
operationName "hibernate.session"
spanKind CLIENT
spanKind INTERNAL
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -652,7 +653,7 @@ class SessionTest extends AbstractHibernateTest {
}
span(10) {
operationName "hibernate.save"
spanKind CLIENT
spanKind INTERNAL
childOf span(9)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"

3
instrumentation/hibernate/core-4.0/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/core/v4_0/SessionFactoryInstrumentation.java
View File

@ -3,7 +3,6 @@ package io.opentelemetry.auto.instrumentation.hibernate.core.v4_0;
import static io.opentelemetry.auto.instrumentation.hibernate.HibernateDecorator.DECORATOR;
import static io.opentelemetry.auto.instrumentation.hibernate.HibernateDecorator.TRACER;
import static io.opentelemetry.auto.tooling.ByteBuddyElementMatchers.safeHasSuperType;
import static io.opentelemetry.trace.Span.Kind.CLIENT;
import static java.util.Collections.singletonMap;
import static net.bytebuddy.matcher.ElementMatchers.isInterface;
import static net.bytebuddy.matcher.ElementMatchers.isMethod;
@ -54,7 +53,7 @@ public class SessionFactoryInstrumentation extends AbstractHibernateInstrumentat
@Advice.OnMethodExit(suppress = Throwable.class)
public static void openSession(@Advice.Return final SharedSessionContract session) {
final Span span = TRACER.spanBuilder("hibernate.session").setSpanKind(CLIENT).startSpan();
final Span span = TRACER.spanBuilder("hibernate.session").startSpan();
DECORATOR.afterStart(span);
DECORATOR.onConnection(span, session);

7
instrumentation/hibernate/core-4.0/src/test/groovy/CriteriaTest.groovy
View File

@ -7,6 +7,7 @@ import org.hibernate.criterion.Order
import org.hibernate.criterion.Restrictions
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static io.opentelemetry.trace.Span.Kind.INTERNAL
class CriteriaTest extends AbstractHibernateTest {
@ -26,7 +27,7 @@ class CriteriaTest extends AbstractHibernateTest {
trace(0, 4) {
span(0) {
operationName "hibernate.session"
spanKind CLIENT
spanKind INTERNAL
parent()
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -36,7 +37,7 @@ class CriteriaTest extends AbstractHibernateTest {
}
span(1) {
operationName "hibernate.criteria.$methodName"
spanKind CLIENT
spanKind INTERNAL
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -61,7 +62,7 @@ class CriteriaTest extends AbstractHibernateTest {
}
span(3) {
operationName "hibernate.transaction.commit"
spanKind CLIENT
spanKind INTERNAL
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"

17
instrumentation/hibernate/core-4.0/src/test/groovy/QueryTest.groovy
View File

@ -5,6 +5,7 @@ import org.hibernate.Query
import org.hibernate.Session
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static io.opentelemetry.trace.Span.Kind.INTERNAL
class QueryTest extends AbstractHibernateTest {
@ -31,7 +32,7 @@ class QueryTest extends AbstractHibernateTest {
trace(0, 4) {
span(0) {
operationName "hibernate.session"
spanKind CLIENT
spanKind INTERNAL
parent()
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -41,7 +42,7 @@ class QueryTest extends AbstractHibernateTest {
}
span(1) {
operationName "hibernate.$queryMethodName"
spanKind CLIENT
spanKind INTERNAL
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -68,7 +69,7 @@ class QueryTest extends AbstractHibernateTest {
}
span(3) {
operationName "hibernate.transaction.commit"
spanKind CLIENT
spanKind INTERNAL
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -82,7 +83,7 @@ class QueryTest extends AbstractHibernateTest {
trace(1, 3) {
span(0) {
operationName "hibernate.session"
spanKind CLIENT
spanKind INTERNAL
parent()
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -92,7 +93,7 @@ class QueryTest extends AbstractHibernateTest {
}
span(1) {
operationName "hibernate.$queryMethodName"
spanKind CLIENT
spanKind INTERNAL
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -163,7 +164,7 @@ class QueryTest extends AbstractHibernateTest {
trace(0, 4) {
span(0) {
operationName "hibernate.session"
spanKind CLIENT
spanKind INTERNAL
parent()
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -173,7 +174,7 @@ class QueryTest extends AbstractHibernateTest {
}
span(1) {
operationName "hibernate.iterate"
spanKind CLIENT
spanKind INTERNAL
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -199,7 +200,7 @@ class QueryTest extends AbstractHibernateTest {
}
span(3) {
operationName "hibernate.transaction.commit"
spanKind CLIENT
spanKind INTERNAL
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"

49
instrumentation/hibernate/core-4.0/src/test/groovy/SessionTest.groovy
View File

@ -9,6 +9,7 @@ import org.hibernate.Session
import spock.lang.Shared
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static io.opentelemetry.trace.Span.Kind.INTERNAL
class SessionTest extends AbstractHibernateTest {
@ -42,7 +43,7 @@ class SessionTest extends AbstractHibernateTest {
trace(i, 4) {
span(0) {
operationName "hibernate.session"
spanKind CLIENT
spanKind INTERNAL
parent()
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -52,7 +53,7 @@ class SessionTest extends AbstractHibernateTest {
}
span(1) {
operationName "hibernate.$methodName"
spanKind CLIENT
spanKind INTERNAL
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -78,7 +79,7 @@ class SessionTest extends AbstractHibernateTest {
}
span(3) {
operationName "hibernate.transaction.commit"
spanKind CLIENT
spanKind INTERNAL
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -138,7 +139,7 @@ class SessionTest extends AbstractHibernateTest {
trace(0, 5) {
span(0) {
operationName "hibernate.session"
spanKind CLIENT
spanKind INTERNAL
parent()
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -148,7 +149,7 @@ class SessionTest extends AbstractHibernateTest {
}
span(1) {
operationName "hibernate.$methodName"
spanKind CLIENT
spanKind INTERNAL
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -174,7 +175,7 @@ class SessionTest extends AbstractHibernateTest {
}
span(3) {
operationName "hibernate.transaction.commit"
spanKind CLIENT
spanKind INTERNAL
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -236,7 +237,7 @@ class SessionTest extends AbstractHibernateTest {
trace(0, 3) {
span(0) {
operationName "hibernate.session"
spanKind CLIENT
spanKind INTERNAL
parent()
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -246,7 +247,7 @@ class SessionTest extends AbstractHibernateTest {
}
span(1) {
operationName "hibernate.replicate"
spanKind CLIENT
spanKind INTERNAL
childOf span(0)
errored(true)
tags {
@ -258,7 +259,7 @@ class SessionTest extends AbstractHibernateTest {
}
span(2) {
operationName "hibernate.transaction.commit"
spanKind CLIENT
spanKind INTERNAL
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -292,7 +293,7 @@ class SessionTest extends AbstractHibernateTest {
trace(0, 4) {
span(0) {
operationName "hibernate.session"
spanKind CLIENT
spanKind INTERNAL
parent()
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -302,7 +303,7 @@ class SessionTest extends AbstractHibernateTest {
}
span(1) {
operationName "hibernate.$methodName"
spanKind CLIENT
spanKind INTERNAL
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -313,7 +314,7 @@ class SessionTest extends AbstractHibernateTest {
}
span(2) {
operationName "hibernate.transaction.commit"
spanKind CLIENT
spanKind INTERNAL
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -385,7 +386,7 @@ class SessionTest extends AbstractHibernateTest {
trace(0, 4) {
span(0) {
operationName "hibernate.session"
spanKind CLIENT
spanKind INTERNAL
parent()
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -395,7 +396,7 @@ class SessionTest extends AbstractHibernateTest {
}
span(1) {
operationName "hibernate.query.list"
spanKind CLIENT
spanKind INTERNAL
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -422,7 +423,7 @@ class SessionTest extends AbstractHibernateTest {
}
span(3) {
operationName "hibernate.transaction.commit"
spanKind CLIENT
spanKind INTERNAL
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -444,7 +445,7 @@ class SessionTest extends AbstractHibernateTest {
def "test hibernate overlapping Sessions"() {
setup:
def rootSpan = TEST_TRACER.spanBuilder("overlapping Sessions").setSpanKind(CLIENT).startSpan()
def rootSpan = TEST_TRACER.spanBuilder("overlapping Sessions").startSpan()
def scope = TEST_TRACER.withSpan(rootSpan)
def session1 = sessionFactory.openSession()
@ -477,7 +478,7 @@ class SessionTest extends AbstractHibernateTest {
}
span(1) {
operationName "hibernate.session"
spanKind CLIENT
spanKind INTERNAL
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -487,7 +488,7 @@ class SessionTest extends AbstractHibernateTest {
}
span(2) {
operationName "hibernate.save"
spanKind CLIENT
spanKind INTERNAL
childOf span(1)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -498,7 +499,7 @@ class SessionTest extends AbstractHibernateTest {
}
span(3) {
operationName "hibernate.delete"
spanKind CLIENT
spanKind INTERNAL
childOf span(1)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -509,7 +510,7 @@ class SessionTest extends AbstractHibernateTest {
}
span(4) {
operationName "hibernate.transaction.commit"
spanKind CLIENT
spanKind INTERNAL
childOf span(1)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -549,7 +550,7 @@ class SessionTest extends AbstractHibernateTest {
}
span(7) {
operationName "hibernate.session"
spanKind CLIENT
spanKind INTERNAL
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -559,7 +560,7 @@ class SessionTest extends AbstractHibernateTest {
}
span(8) {
operationName "hibernate.insert"
spanKind CLIENT
spanKind INTERNAL
childOf span(7)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -585,7 +586,7 @@ class SessionTest extends AbstractHibernateTest {
}
span(10) {
operationName "hibernate.session"
spanKind CLIENT
spanKind INTERNAL
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -595,7 +596,7 @@ class SessionTest extends AbstractHibernateTest {
}
span(11) {
operationName "hibernate.save"
spanKind CLIENT
spanKind INTERNAL
childOf span(10)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"

13
instrumentation/hibernate/core-4.3/src/test/groovy/ProcedureCallTest.groovy
View File

@ -15,6 +15,7 @@ import java.sql.DriverManager
import java.sql.Statement
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static io.opentelemetry.trace.Span.Kind.INTERNAL
class ProcedureCallTest extends AgentTestRunner {
@ -69,7 +70,7 @@ class ProcedureCallTest extends AgentTestRunner {
trace(0, 4) {
span(0) {
operationName "hibernate.session"
spanKind CLIENT
spanKind INTERNAL
parent()
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -79,7 +80,7 @@ class ProcedureCallTest extends AgentTestRunner {
}
span(1) {
operationName "hibernate.procedure.getOutputs"
spanKind CLIENT
spanKind INTERNAL
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -104,7 +105,7 @@ class ProcedureCallTest extends AgentTestRunner {
}
}
span(3) {
spanKind CLIENT
spanKind INTERNAL
operationName "hibernate.transaction.commit"
childOf span(0)
tags {
@ -140,7 +141,7 @@ class ProcedureCallTest extends AgentTestRunner {
trace(0, 3) {
span(0) {
operationName "hibernate.session"
spanKind CLIENT
spanKind INTERNAL
parent()
tags {
"$MoreTags.SERVICE_NAME" "hibernate"
@ -150,7 +151,7 @@ class ProcedureCallTest extends AgentTestRunner {
}
span(1) {
operationName "hibernate.procedure.getOutputs"
spanKind CLIENT
spanKind INTERNAL
childOf span(0)
errored(true)
tags {
@ -163,7 +164,7 @@ class ProcedureCallTest extends AgentTestRunner {
}
span(2) {
operationName "hibernate.transaction.commit"
spanKind CLIENT
spanKind INTERNAL
childOf span(0)
tags {
"$MoreTags.SERVICE_NAME" "hibernate"

4
instrumentation/hibernate/src/main/java/io/opentelemetry/auto/instrumentation/hibernate/SessionMethodUtils.java
View File

@ -2,7 +2,6 @@ package io.opentelemetry.auto.instrumentation.hibernate;
import static io.opentelemetry.auto.instrumentation.hibernate.HibernateDecorator.DECORATOR;
import static io.opentelemetry.auto.instrumentation.hibernate.HibernateDecorator.TRACER;
import static io.opentelemetry.trace.Span.Kind.CLIENT;
import io.opentelemetry.auto.bootstrap.CallDepthThreadLocalMap;
import io.opentelemetry.auto.bootstrap.ContextStore;
@ -37,8 +36,7 @@ public class SessionMethodUtils {
}
if (createSpan) {
final Span span =
TRACER.spanBuilder(operationName).setSpanKind(CLIENT).setParent(sessionSpan).startSpan();
final Span span = TRACER.spanBuilder(operationName).setParent(sessionSpan).startSpan();
DECORATOR.afterStart(span);
DECORATOR.onOperation(span, entity);
return new SpanWithScope(span, TRACER.withSpan(span));

3
instrumentation/play-2.4/src/main/java8/io/opentelemetry/auto/instrumentation/play24/PlayAdvice.java
View File

@ -3,7 +3,6 @@ package io.opentelemetry.auto.instrumentation.play24;
import static io.opentelemetry.auto.instrumentation.play24.PlayHeaders.GETTER;
import static io.opentelemetry.auto.instrumentation.play24.PlayHttpServerDecorator.DECORATE;
import static io.opentelemetry.auto.instrumentation.play24.PlayHttpServerDecorator.TRACER;
import static io.opentelemetry.trace.Span.Kind.SERVER;
import io.opentelemetry.auto.instrumentation.api.SpanWithScope;
import io.opentelemetry.trace.Span;
@ -17,7 +16,7 @@ import scala.concurrent.Future;
public class PlayAdvice {
@Advice.OnMethodEnter(suppress = Throwable.class)
public static SpanWithScope onEnter(@Advice.Argument(0) final Request req) {
final Span.Builder spanBuilder = TRACER.spanBuilder("play.request").setSpanKind(SERVER);
final Span.Builder spanBuilder = TRACER.spanBuilder("play.request");
if (!TRACER.getCurrentSpan().getContext().isValid()) {
try {
final SpanContext extractedContext =

4
instrumentation/play-2.4/src/test/groovy/server/PlayServerTest.groovy
View File

@ -19,7 +19,7 @@ import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.EXCE
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.QUERY_PARAM
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.REDIRECT
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.SUCCESS
import static io.opentelemetry.trace.Span.Kind.SERVER
import static io.opentelemetry.trace.Span.Kind.INTERNAL
class PlayServerTest extends HttpServerTest<Server, NettyHttpServerDecorator> {
@Override
@ -84,7 +84,7 @@ class PlayServerTest extends HttpServerTest<Server, NettyHttpServerDecorator> {
void handlerSpan(TraceAssert trace, int index, Object parent, String method = "GET", ServerEndpoint endpoint = SUCCESS) {
trace.span(index) {
operationName "play.request"
spanKind SERVER
spanKind INTERNAL
errored endpoint == ERROR || endpoint == EXCEPTION
childOf((SpanData) parent)
tags {

3
instrumentation/play-2.6/src/main/java8/io/opentelemetry/auto/instrumentation/play26/PlayAdvice.java
View File

@ -3,7 +3,6 @@ package io.opentelemetry.auto.instrumentation.play26;
import static io.opentelemetry.auto.instrumentation.play26.PlayHeaders.GETTER;
import static io.opentelemetry.auto.instrumentation.play26.PlayHttpServerDecorator.DECORATE;
import static io.opentelemetry.auto.instrumentation.play26.PlayHttpServerDecorator.TRACER;
import static io.opentelemetry.trace.Span.Kind.SERVER;
import io.opentelemetry.auto.instrumentation.api.SpanWithScope;
import io.opentelemetry.trace.Span;
@ -17,7 +16,7 @@ import scala.concurrent.Future;
public class PlayAdvice {
@Advice.OnMethodEnter(suppress = Throwable.class)
public static SpanWithScope onEnter(@Advice.Argument(0) final Request req) {
final Span.Builder spanBuilder = TRACER.spanBuilder("play.request").setSpanKind(SERVER);
final Span.Builder spanBuilder = TRACER.spanBuilder("play.request");
if (!TRACER.getCurrentSpan().getContext().isValid()) {
try {
final SpanContext extractedContext =

3
instrumentation/play-2.6/src/test/groovy/server/PlayServerTest.groovy
View File

@ -22,6 +22,7 @@ import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.EXCE
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.QUERY_PARAM
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.REDIRECT
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.SUCCESS
import static io.opentelemetry.trace.Span.Kind.INTERNAL
import static io.opentelemetry.trace.Span.Kind.SERVER
@Retry(mode = Retry.Mode.SETUP_FEATURE_CLEANUP)
@ -88,7 +89,7 @@ class PlayServerTest extends HttpServerTest<Server, AkkaHttpServerDecorator> {
void handlerSpan(TraceAssert trace, int index, Object parent, String method = "GET", ServerEndpoint endpoint = SUCCESS) {
trace.span(index) {
operationName "play.request"
spanKind SERVER
spanKind INTERNAL
errored endpoint == ERROR || endpoint == EXCEPTION
childOf((SpanData) parent)
tags {

3
instrumentation/ratpack-1.4/src/main/java8/io/opentelemetry/auto/instrumentation/ratpack/TracingHandler.java
View File

@ -2,7 +2,6 @@ package io.opentelemetry.auto.instrumentation.ratpack;
import static io.opentelemetry.auto.instrumentation.ratpack.RatpackServerDecorator.DECORATE;
import static io.opentelemetry.auto.instrumentation.ratpack.RatpackServerDecorator.TRACER;
import static io.opentelemetry.trace.Span.Kind.SERVER;
import io.netty.util.Attribute;
import io.netty.util.AttributeKey;
@ -32,7 +31,7 @@ public final class TracingHandler implements Handler {
final Span nettySpan = spanAttribute.get();
// Relying on executor instrumentation to assume the netty span is in context as the parent.
final Span ratpackSpan = TRACER.spanBuilder("ratpack.handler").setSpanKind(SERVER).startSpan();
final Span ratpackSpan = TRACER.spanBuilder("ratpack.handler").startSpan();
DECORATE.afterStart(ratpackSpan);
DECORATE.onConnection(ratpackSpan, request);
DECORATE.onRequest(ratpackSpan, request);

3
instrumentation/ratpack-1.4/src/test/groovy/RatpackOtherTest.groovy
View File

@ -9,6 +9,7 @@ import okhttp3.Request
import ratpack.groovy.test.embed.GroovyEmbeddedApp
import ratpack.path.PathBinding
import static io.opentelemetry.trace.Span.Kind.INTERNAL
import static io.opentelemetry.trace.Span.Kind.SERVER
class RatpackOtherTest extends AgentTestRunner {
@ -84,7 +85,7 @@ class RatpackOtherTest extends AgentTestRunner {
}
span(1) {
operationName "ratpack.handler"
spanKind SERVER
spanKind INTERNAL
childOf(span(0))
errored false
tags {

3
instrumentation/ratpack-1.4/src/test/groovy/server/RatpackHttpServerTest.groovy
View File

@ -18,6 +18,7 @@ import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.EXCE
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.QUERY_PARAM
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.REDIRECT
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.SUCCESS
import static io.opentelemetry.trace.Span.Kind.INTERNAL
import static io.opentelemetry.trace.Span.Kind.SERVER
class RatpackHttpServerTest extends HttpServerTest<EmbeddedApp, NettyHttpServerDecorator> {
@ -106,7 +107,7 @@ class RatpackHttpServerTest extends HttpServerTest<EmbeddedApp, NettyHttpServerD
void handlerSpan(TraceAssert trace, int index, Object parent, String method = "GET", ServerEndpoint endpoint = SUCCESS) {
trace.span(index) {
operationName "ratpack.handler"
spanKind SERVER
spanKind INTERNAL
errored endpoint == ERROR || endpoint == EXCEPTION
childOf((SpanData) parent)
tags {

3
instrumentation/spring-data-1.8/src/main/java/io/opentelemetry/auto/instrumentation/springdata/SpringRepositoryInstrumentation.java
View File

@ -4,7 +4,6 @@ package io.opentelemetry.auto.instrumentation.springdata;
import static io.opentelemetry.auto.instrumentation.springdata.SpringDataDecorator.DECORATOR;
import static io.opentelemetry.auto.instrumentation.springdata.SpringDataDecorator.TRACER;
import static io.opentelemetry.trace.Span.Kind.CLIENT;
import static net.bytebuddy.matcher.ElementMatchers.isConstructor;
import static net.bytebuddy.matcher.ElementMatchers.isInterface;
import static net.bytebuddy.matcher.ElementMatchers.named;
@ -111,7 +110,7 @@ public final class SpringRepositoryInstrumentation extends Instrumenter.Default
return methodInvocation.proceed();
}
final Span span = TRACER.spanBuilder("repository.operation").setSpanKind(CLIENT).startSpan();
final Span span = TRACER.spanBuilder("repository.operation").startSpan();
DECORATOR.afterStart(span);
DECORATOR.onOperation(span, invokedMethod);

11
instrumentation/spring-data-1.8/src/test/groovy/SpringJpaTest.groovy
View File

@ -10,6 +10,7 @@ import spring.jpa.JpaPersistenceConfig
import static io.opentelemetry.auto.test.utils.TraceUtils.runUnderTrace
import static io.opentelemetry.trace.Span.Kind.CLIENT
import static io.opentelemetry.trace.Span.Kind.INTERNAL
class SpringJpaTest extends AgentTestRunner {
def "test object method"() {
@ -57,7 +58,7 @@ class SpringJpaTest extends AgentTestRunner {
trace(0, 2) {
span(0) {
operationName "repository.operation"
spanKind CLIENT
spanKind INTERNAL
errored false
tags {
"$MoreTags.RESOURCE_NAME" "JpaRepository.findAll"
@ -93,7 +94,7 @@ class SpringJpaTest extends AgentTestRunner {
trace(0, 2) {
span(0) {
operationName "repository.operation"
spanKind CLIENT
spanKind INTERNAL
errored false
tags {
"$MoreTags.RESOURCE_NAME" "CrudRepository.save"
@ -129,7 +130,7 @@ class SpringJpaTest extends AgentTestRunner {
trace(0, 3) {
span(0) {
operationName "repository.operation"
spanKind CLIENT
spanKind INTERNAL
errored false
tags {
"$MoreTags.RESOURCE_NAME" "CrudRepository.save"
@ -178,7 +179,7 @@ class SpringJpaTest extends AgentTestRunner {
trace(0, 2) {
span(0) {
operationName "repository.operation"
spanKind CLIENT
spanKind INTERNAL
errored false
tags {
"$MoreTags.RESOURCE_NAME" "JpaCustomerRepository.findByLastName"
@ -212,7 +213,7 @@ class SpringJpaTest extends AgentTestRunner {
trace(0, 3) {
span(0) {
operationName "repository.operation"
spanKind CLIENT
spanKind INTERNAL
errored false
tags {
"$MoreTags.RESOURCE_NAME" "CrudRepository.delete"

3
instrumentation/spring-webmvc-3.1/src/main/java/io/opentelemetry/auto/instrumentation/springweb/DispatcherServletInstrumentation.java
View File

@ -3,7 +3,6 @@ package io.opentelemetry.auto.instrumentation.springweb;
import static io.opentelemetry.auto.instrumentation.springweb.SpringWebHttpServerDecorator.DECORATE;
import static io.opentelemetry.auto.instrumentation.springweb.SpringWebHttpServerDecorator.DECORATE_RENDER;
import static io.opentelemetry.auto.instrumentation.springweb.SpringWebHttpServerDecorator.TRACER;
import static io.opentelemetry.trace.Span.Kind.SERVER;
import static net.bytebuddy.matcher.ElementMatchers.isMethod;
import static net.bytebuddy.matcher.ElementMatchers.isProtected;
import static net.bytebuddy.matcher.ElementMatchers.nameStartsWith;
@ -68,7 +67,7 @@ public final class DispatcherServletInstrumentation extends Instrumenter.Default
@Advice.OnMethodEnter(suppress = Throwable.class)
public static SpanWithScope onEnter(@Advice.Argument(0) final ModelAndView mv) {
final Span span = TRACER.spanBuilder("response.render").setSpanKind(SERVER).startSpan();
final Span span = TRACER.spanBuilder("response.render").startSpan();
DECORATE_RENDER.afterStart(span);
DECORATE_RENDER.onRender(span, mv);
return new SpanWithScope(span, TRACER.withSpan(span));

3
instrumentation/spring-webmvc-3.1/src/main/java/io/opentelemetry/auto/instrumentation/springweb/HandlerAdapterInstrumentation.java
View File

@ -4,7 +4,6 @@ import static io.opentelemetry.auto.decorator.HttpServerDecorator.SPAN_ATTRIBUTE
import static io.opentelemetry.auto.instrumentation.springweb.SpringWebHttpServerDecorator.DECORATE;
import static io.opentelemetry.auto.instrumentation.springweb.SpringWebHttpServerDecorator.TRACER;
import static io.opentelemetry.auto.tooling.ByteBuddyElementMatchers.safeHasSuperType;
import static io.opentelemetry.trace.Span.Kind.SERVER;
import static java.util.Collections.singletonMap;
import static net.bytebuddy.matcher.ElementMatchers.isInterface;
import static net.bytebuddy.matcher.ElementMatchers.isMethod;
@ -78,7 +77,7 @@ public final class HandlerAdapterInstrumentation extends Instrumenter.Default {
// Now create a span for handler/controller execution.
final Span span = TRACER.spanBuilder("spring.handler").setSpanKind(SERVER).startSpan();
final Span span = TRACER.spanBuilder("spring.handler").startSpan();
DECORATE.afterStart(span);
DECORATE.onHandle(span, handler);

5
instrumentation/spring-webmvc-3.1/src/test/groovy/test/SpringBootBasedTest.groovy
View File

@ -16,6 +16,7 @@ import org.springframework.web.servlet.view.RedirectView
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.EXCEPTION
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.REDIRECT
import static io.opentelemetry.auto.test.base.HttpServerTest.ServerEndpoint.SUCCESS
import static io.opentelemetry.trace.Span.Kind.INTERNAL
import static io.opentelemetry.trace.Span.Kind.SERVER
import static java.util.Collections.singletonMap
@ -65,7 +66,7 @@ class SpringBootBasedTest extends HttpServerTest<ConfigurableApplicationContext,
void renderSpan(TraceAssert trace, int index, Object parent, String method = "GET", ServerEndpoint endpoint = SUCCESS) {
trace.span(index) {
operationName "response.render"
spanKind SERVER
spanKind INTERNAL
errored false
tags {
"$MoreTags.SPAN_TYPE" "web"
@ -79,7 +80,7 @@ class SpringBootBasedTest extends HttpServerTest<ConfigurableApplicationContext,
void handlerSpan(TraceAssert trace, int index, Object parent, String method = "GET", ServerEndpoint endpoint = SUCCESS) {
trace.span(index) {
operationName "spring.handler"
spanKind SERVER
spanKind INTERNAL
errored endpoint == EXCEPTION
childOf((SpanData) parent)
tags {