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

Add decorators to servlet tests

This commit is contained in:
Andrew Kent 2018-03-13 10:01:00 -07:00
parent d4ad0a0051
commit b5759bd15c
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dd-java-agent/instrumentation/servlet-3/src/test/groovy/JettyServletTest.groovy
View File

@ -1,5 +1,7 @@
import datadog.opentracing.DDSpan import datadog.opentracing.DDSpan
import datadog.opentracing.DDTracer import datadog.opentracing.DDTracer
import datadog.opentracing.decorators.AbstractDecorator
import datadog.opentracing.decorators.DDDecoratorsFactory
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.api.DDSpanTypes import datadog.trace.api.DDSpanTypes
import datadog.trace.common.writer.ListWriter import datadog.trace.common.writer.ListWriter
@ -52,6 +54,10 @@ class JettyServletTest extends AgentTestRunner {
DDTracer tracer = new DDTracer(writer) DDTracer tracer = new DDTracer(writer)
def setup() { def setup() {
final List<AbstractDecorator> decorators = DDDecoratorsFactory.createBuiltinDecorators()
for (final AbstractDecorator decorator : decorators) {
tracer.addDecorator(decorator)
}
jettyServer = new Server(PORT) jettyServer = new Server(PORT)
servletContext = new ServletContextHandler() servletContext = new ServletContextHandler()
@ -100,7 +106,7 @@ class JettyServletTest extends AgentTestRunner {
span.context().serviceName == "unnamed-java-app" span.context().serviceName == "unnamed-java-app"
span.context().operationName == "servlet.request" span.context().operationName == "servlet.request"
span.context().resourceName == "servlet.request" span.context().resourceName == "GET /$path"
span.context().spanType == DDSpanTypes.WEB_SERVLET span.context().spanType == DDSpanTypes.WEB_SERVLET
!span.context().getErrorFlag() !span.context().getErrorFlag()
span.context().parentId != 0 // parent should be the okhttp call. span.context().parentId != 0 // parent should be the okhttp call.
@ -137,7 +143,7 @@ class JettyServletTest extends AgentTestRunner {
span.context().serviceName == "unnamed-java-app" span.context().serviceName == "unnamed-java-app"
span.context().operationName == "servlet.request" span.context().operationName == "servlet.request"
span.context().resourceName == "servlet.request" span.context().resourceName == "GET /$path"
span.context().spanType == DDSpanTypes.WEB_SERVLET span.context().spanType == DDSpanTypes.WEB_SERVLET
span.context().getErrorFlag() span.context().getErrorFlag()
span.context().parentId != 0 // parent should be the okhttp call. span.context().parentId != 0 // parent should be the okhttp call.

11
dd-java-agent/instrumentation/servlet-3/src/test/groovy/TomcatServletTest.groovy
View File

@ -1,5 +1,7 @@
import com.google.common.io.Files import com.google.common.io.Files
import datadog.opentracing.DDTracer import datadog.opentracing.DDTracer
import datadog.opentracing.decorators.AbstractDecorator
import datadog.opentracing.decorators.DDDecoratorsFactory
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.api.DDSpanTypes import datadog.trace.api.DDSpanTypes
import datadog.trace.common.writer.ListWriter import datadog.trace.common.writer.ListWriter
@ -33,6 +35,11 @@ class TomcatServletTest extends AgentTestRunner {
DDTracer tracer = new DDTracer(writer) DDTracer tracer = new DDTracer(writer)
def setup() { def setup() {
final List<AbstractDecorator> decorators = DDDecoratorsFactory.createBuiltinDecorators()
for (final AbstractDecorator decorator : decorators) {
tracer.addDecorator(decorator)
}
tomcatServer = new Tomcat() tomcatServer = new Tomcat()
tomcatServer.setPort(PORT) tomcatServer.setPort(PORT)
@ -99,7 +106,7 @@ class TomcatServletTest extends AgentTestRunner {
span.context().serviceName == "unnamed-java-app" span.context().serviceName == "unnamed-java-app"
span.context().operationName == "servlet.request" span.context().operationName == "servlet.request"
span.context().resourceName == "servlet.request" span.context().resourceName == "GET /$path"
span.context().spanType == DDSpanTypes.WEB_SERVLET span.context().spanType == DDSpanTypes.WEB_SERVLET
!span.context().getErrorFlag() !span.context().getErrorFlag()
span.context().parentId != 0 // parent should be the okhttp call. span.context().parentId != 0 // parent should be the okhttp call.
@ -136,7 +143,7 @@ class TomcatServletTest extends AgentTestRunner {
span.context().serviceName == "unnamed-java-app" span.context().serviceName == "unnamed-java-app"
span.context().operationName == "servlet.request" span.context().operationName == "servlet.request"
span.context().resourceName == "servlet.request" span.context().resourceName == "GET /$path"
span.context().spanType == DDSpanTypes.WEB_SERVLET span.context().spanType == DDSpanTypes.WEB_SERVLET
span.context().getErrorFlag() span.context().getErrorFlag()
span.context().parentId != 0 // parent should be the okhttp call. span.context().parentId != 0 // parent should be the okhttp call.