Missed a few test helper methods
MODIFY
dd-java-agent/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpServerInstrumentationTest.groovy
dd-java-agent/instrumentation/akka-http-10.0/src/test/groovy/AkkaHttpServerInstrumentationTest.groovy
@@ -35,7 +35,7 @@ abstract class AkkaHttpServerInstrumentationTest extends HttpServerTest<Object,
// AkkaHttpTestWebServer.stop()
// }
- void serverSpan(TraceAssert trace, int index, String traceID = null, String parentID = null, String method = "GET", ServerEndpoint endpoint = SUCCESS) {
+ void serverSpan(TraceAssert trace, int index, BigInteger traceID = null, BigInteger parentID = null, String method = "GET", ServerEndpoint endpoint = SUCCESS) {
trace.span(index) {
serviceName expectedServiceName()
operationName expectedOperationName()

MODIFY
dd-java-agent/instrumentation/glassfish/src/test/groovy/GlassFishServerTest.groovy
dd-java-agent/instrumentation/glassfish/src/test/groovy/GlassFishServerTest.groovy
@@ -86,7 +86,7 @@ class GlassFishServerTest extends HttpServerTest<GlassFish, Servlet3Decorator> {
}
@Override
- void serverSpan(TraceAssert trace, int index, String traceID = null, String parentID = null, String method = "GET", ServerEndpoint endpoint = SUCCESS) {
+ void serverSpan(TraceAssert trace, int index, BigInteger traceID = null, BigInteger parentID = null, String method = "GET", ServerEndpoint endpoint = SUCCESS) {
trace.span(index) {
serviceName expectedServiceName()
operationName expectedOperationName()

MODIFY
dd-java-agent/instrumentation/jax-rs-annotations-2/src/test/groovy/DropwizardTest.groovy
dd-java-agent/instrumentation/jax-rs-annotations-2/src/test/groovy/DropwizardTest.groovy
@@ -11,10 +11,11 @@ import io.dropwizard.setup.Environment
import io.dropwizard.testing.ConfigOverride
import io.dropwizard.testing.DropwizardTestSupport
import io.opentracing.tag.Tags
+import org.eclipse.jetty.servlet.ServletHandler
+
import javax.ws.rs.GET
import javax.ws.rs.Path
import javax.ws.rs.core.Response
-import org.eclipse.jetty.servlet.ServletHandler
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.ERROR
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.EXCEPTION
@@ -94,7 +95,7 @@ class DropwizardTest extends HttpServerTest<DropwizardTestSupport, Servlet3Decor
}
@Override
- void serverSpan(TraceAssert trace, int index, String traceID = null, String parentID = null, String method = "GET", ServerEndpoint endpoint = SUCCESS) {
+ void serverSpan(TraceAssert trace, int index, BigInteger traceID = null, BigInteger parentID = null, String method = "GET", ServerEndpoint endpoint = SUCCESS) {
trace.span(index) {
serviceName expectedServiceName()
operationName expectedOperationName()

MODIFY
dd-java-agent/instrumentation/jetty-8/src/test/groovy/JettyHandlerTest.groovy
dd-java-agent/instrumentation/jetty-8/src/test/groovy/JettyHandlerTest.groovy
@@ -109,7 +109,7 @@ class JettyHandlerTest extends HttpServerTest<Server, JettyDecorator> {
}
@Override
- void serverSpan(TraceAssert trace, int index, String traceID = null, String parentID = null, String method = "GET", ServerEndpoint endpoint = SUCCESS) {
+ void serverSpan(TraceAssert trace, int index, BigInteger traceID = null, BigInteger parentID = null, String method = "GET", ServerEndpoint endpoint = SUCCESS) {
def handlerName = handler().class.name
trace.span(index) {
serviceName expectedServiceName()

MODIFY
dd-java-agent/instrumentation/play-2.6/src/test/groovy/server/PlayServerTest.groovy
dd-java-agent/instrumentation/play-2.6/src/test/groovy/server/PlayServerTest.groovy
@@ -105,7 +105,7 @@ class PlayServerTest extends HttpServerTest<Server, AkkaHttpServerDecorator> {
}
}
- void serverSpan(TraceAssert trace, int index, String traceID = null, String parentID = null, String method = "GET", ServerEndpoint endpoint = SUCCESS) {
+ void serverSpan(TraceAssert trace, int index, BigInteger traceID = null, BigInteger parentID = null, String method = "GET", ServerEndpoint endpoint = SUCCESS) {
trace.span(index) {
serviceName expectedServiceName()
operationName expectedOperationName()

MODIFY
dd-java-agent/instrumentation/servlet/request-2/src/test/groovy/JettyServlet2Test.groovy
dd-java-agent/instrumentation/servlet/request-2/src/test/groovy/JettyServlet2Test.groovy
@@ -79,7 +79,7 @@ class JettyServlet2Test extends HttpServerTest<Server, Servlet2Decorator> {
}
// parent span must be cast otherwise it breaks debugging classloading (junit loads it early)
- void serverSpan(TraceAssert trace, int index, String traceID = null, String parentID = null, String method = "GET", ServerEndpoint endpoint = SUCCESS) {
+ void serverSpan(TraceAssert trace, int index, BigInteger traceID = null, BigInteger parentID = null, String method = "GET", ServerEndpoint endpoint = SUCCESS) {
trace.span(index) {
serviceName expectedServiceName()
operationName expectedOperationName()

MODIFY
dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/AbstractServlet3Test.groovy
dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/AbstractServlet3Test.groovy
@@ -68,7 +68,7 @@ abstract class AbstractServlet3Test<SERVER, CONTEXT> extends HttpServerTest<SERV
}
@Override
- void serverSpan(TraceAssert trace, int index, String traceID = null, String parentID = null, String method = "GET", ServerEndpoint endpoint = SUCCESS) {
+ void serverSpan(TraceAssert trace, int index, BigInteger traceID = null, BigInteger parentID = null, String method = "GET", ServerEndpoint endpoint = SUCCESS) {
trace.span(index) {
serviceName expectedServiceName()
operationName expectedOperationName()

MODIFY
dd-java-agent/instrumentation/spring-webmvc-3.1/src/test/groovy/test/SpringBootBasedTest.groovy
dd-java-agent/instrumentation/spring-webmvc-3.1/src/test/groovy/test/SpringBootBasedTest.groovy
@@ -111,7 +111,7 @@ class SpringBootBasedTest extends HttpServerTest<ConfigurableApplicationContext,
}
@Override
- void serverSpan(TraceAssert trace, int index, String traceID = null, String parentID = null, String method = "GET", ServerEndpoint endpoint = SUCCESS) {
+ void serverSpan(TraceAssert trace, int index, BigInteger traceID = null, BigInteger parentID = null, String method = "GET", ServerEndpoint endpoint = SUCCESS) {
trace.span(index) {
serviceName expectedServiceName()
operationName expectedOperationName()

MODIFY
dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/base/HttpServerTest.groovy
dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/base/HttpServerTest.groovy
@@ -199,11 +199,11 @@ abstract class HttpServerTest<SERVER, DECORATOR extends HttpServerDecorator> ext
def "test success with parent"() {
setup:
- def traceId = "123"
- def parentId = "456"
+ def traceId = BigInteger.valueOf(123)
+ def parentId = BigInteger.valueOf(456)
def request = request(SUCCESS, method, body)
- .header("x-datadog-trace-id", traceId)
- .header("x-datadog-parent-id", parentId)
+ .header("x-datadog-trace-id", traceId.toString())
+ .header("x-datadog-parent-id", parentId.toString())
.build()
def response = client.newCall(request).execute()
@@ -425,7 +425,7 @@ abstract class HttpServerTest<SERVER, DECORATOR extends HttpServerDecorator> ext
}
// parent span must be cast otherwise it breaks debugging classloading (junit loads it early)
- void serverSpan(TraceAssert trace, int index, String traceID = null, String parentID = null, String method = "GET", ServerEndpoint endpoint = SUCCESS) {
+ void serverSpan(TraceAssert trace, int index, BigInteger traceID = null, BigInteger parentID = null, String method = "GET", ServerEndpoint endpoint = SUCCESS) {
trace.span(index) {
serviceName expectedServiceName()
operationName expectedOperationName()

MODIFY
dd-trace-ot/src/ot31CompatabilityTest/groovy/OT31ApiTest.groovy
dd-trace-ot/src/ot31CompatabilityTest/groovy/OT31ApiTest.groovy
@@ -70,8 +70,8 @@ class OT31ApiTest extends DDSpecification {
then:
textMap == [
- "x-datadog-trace-id" : context.traceId,
- "x-datadog-parent-id" : context.spanId,
+ "x-datadog-trace-id" : context.toTraceId(),
+ "x-datadog-parent-id" : context.toSpanId(),
"x-datadog-sampling-priority": "$context.samplingPriority",
]

Missed a few test helper methods