From b5759bd15c06e9d19d702a16cb15cb77fe331e74 Mon Sep 17 00:00:00 2001
From: Andrew Kent <andrew.kent@datadoghq.com>
Date: Tue, 13 Mar 2018 10:01:00 -0700
Subject: [PATCH] Add decorators to servlet tests

---
 .../servlet-3/src/test/groovy/JettyServletTest.groovy | 10 ++++++++--
 .../src/test/groovy/TomcatServletTest.groovy          | 11 +++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/dd-java-agent/instrumentation/servlet-3/src/test/groovy/JettyServletTest.groovy b/dd-java-agent/instrumentation/servlet-3/src/test/groovy/JettyServletTest.groovy
index 890589caa9..980a1425d8 100644
--- a/dd-java-agent/instrumentation/servlet-3/src/test/groovy/JettyServletTest.groovy
+++ b/dd-java-agent/instrumentation/servlet-3/src/test/groovy/JettyServletTest.groovy
@@ -1,5 +1,7 @@
 import datadog.opentracing.DDSpan
 import datadog.opentracing.DDTracer
+import datadog.opentracing.decorators.AbstractDecorator
+import datadog.opentracing.decorators.DDDecoratorsFactory
 import datadog.trace.agent.test.AgentTestRunner
 import datadog.trace.api.DDSpanTypes
 import datadog.trace.common.writer.ListWriter
@@ -52,6 +54,10 @@ class JettyServletTest extends AgentTestRunner {
   DDTracer tracer = new DDTracer(writer)
 
   def setup() {
+    final List<AbstractDecorator> decorators = DDDecoratorsFactory.createBuiltinDecorators()
+    for (final AbstractDecorator decorator : decorators) {
+      tracer.addDecorator(decorator)
+    }
     jettyServer = new Server(PORT)
     servletContext = new ServletContextHandler()
 
@@ -100,7 +106,7 @@ class JettyServletTest extends AgentTestRunner {
 
     span.context().serviceName == "unnamed-java-app"
     span.context().operationName == "servlet.request"
-    span.context().resourceName == "servlet.request"
+    span.context().resourceName == "GET /$path"
     span.context().spanType == DDSpanTypes.WEB_SERVLET
     !span.context().getErrorFlag()
     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().operationName == "servlet.request"
-    span.context().resourceName == "servlet.request"
+    span.context().resourceName == "GET /$path"
     span.context().spanType == DDSpanTypes.WEB_SERVLET
     span.context().getErrorFlag()
     span.context().parentId != 0 // parent should be the okhttp call.
diff --git a/dd-java-agent/instrumentation/servlet-3/src/test/groovy/TomcatServletTest.groovy b/dd-java-agent/instrumentation/servlet-3/src/test/groovy/TomcatServletTest.groovy
index 47b970e2c1..99f51442a7 100644
--- a/dd-java-agent/instrumentation/servlet-3/src/test/groovy/TomcatServletTest.groovy
+++ b/dd-java-agent/instrumentation/servlet-3/src/test/groovy/TomcatServletTest.groovy
@@ -1,5 +1,7 @@
 import com.google.common.io.Files
 import datadog.opentracing.DDTracer
+import datadog.opentracing.decorators.AbstractDecorator
+import datadog.opentracing.decorators.DDDecoratorsFactory
 import datadog.trace.agent.test.AgentTestRunner
 import datadog.trace.api.DDSpanTypes
 import datadog.trace.common.writer.ListWriter
@@ -33,6 +35,11 @@ class TomcatServletTest extends AgentTestRunner {
   DDTracer tracer = new DDTracer(writer)
 
   def setup() {
+    final List<AbstractDecorator> decorators = DDDecoratorsFactory.createBuiltinDecorators()
+    for (final AbstractDecorator decorator : decorators) {
+      tracer.addDecorator(decorator)
+    }
+
     tomcatServer = new Tomcat()
     tomcatServer.setPort(PORT)
 
@@ -99,7 +106,7 @@ class TomcatServletTest extends AgentTestRunner {
 
     span.context().serviceName == "unnamed-java-app"
     span.context().operationName == "servlet.request"
-    span.context().resourceName == "servlet.request"
+    span.context().resourceName == "GET /$path"
     span.context().spanType == DDSpanTypes.WEB_SERVLET
     !span.context().getErrorFlag()
     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().operationName == "servlet.request"
-    span.context().resourceName == "servlet.request"
+    span.context().resourceName == "GET /$path"
     span.context().spanType == DDSpanTypes.WEB_SERVLET
     span.context().getErrorFlag()
     span.context().parentId != 0 // parent should be the okhttp call.