From 53b4e5db194a2b55dd2bdaee0e424557bbfb1b4b Mon Sep 17 00:00:00 2001
From: Tyler Benson <tyler.benson@datadoghq.com>
Date: Mon, 11 Nov 2019 16:25:51 -0800
Subject: [PATCH] fix test

---
 .../servlet/request-2/src/test/groovy/JettyServlet2Test.groovy  | 1 +
 .../request-3/src/test/groovy/AbstractServlet3Test.groovy       | 2 +-
 .../servlet/request-3/src/test/groovy/JettyServlet3Test.groovy  | 1 +
 .../servlet/request-3/src/test/groovy/TomcatServlet3Test.groovy | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/dd-java-agent/instrumentation/servlet/request-2/src/test/groovy/JettyServlet2Test.groovy b/dd-java-agent/instrumentation/servlet/request-2/src/test/groovy/JettyServlet2Test.groovy
index e8c8e2624b..f3ef60e7fe 100644
--- a/dd-java-agent/instrumentation/servlet/request-2/src/test/groovy/JettyServlet2Test.groovy
+++ b/dd-java-agent/instrumentation/servlet/request-2/src/test/groovy/JettyServlet2Test.groovy
@@ -94,6 +94,7 @@ class JettyServlet2Test extends HttpServerTest<Server, Servlet2Decorator> {
       }
       tags {
         "servlet.context" "/$CONTEXT"
+        "servlet.path" endpoint.path
         "span.origin.type" TestServlet2.Sync.name
 
         defaultTags(true)
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/AbstractServlet3Test.groovy b/dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/AbstractServlet3Test.groovy
index 84718d17e9..ce0aa772b9 100644
--- a/dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/AbstractServlet3Test.groovy
+++ b/dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/AbstractServlet3Test.groovy
@@ -83,7 +83,7 @@ abstract class AbstractServlet3Test<SERVER, CONTEXT> extends HttpServerTest<SERV
       }
       tags {
         "servlet.context" "/$context"
-        "servlet.path" endpoint.path
+        "servlet.path" { it == endpoint.path || it == "/dispatch$endpoint.path" }
         "span.origin.type" { it == servlet.name || it == ApplicationFilterChain.name }
 
         defaultTags(true)
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/JettyServlet3Test.groovy b/dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/JettyServlet3Test.groovy
index 18b21fe8e2..44a8ab14db 100644
--- a/dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/JettyServlet3Test.groovy
+++ b/dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/JettyServlet3Test.groovy
@@ -244,6 +244,7 @@ abstract class JettyDispatchTest extends JettyServlet3Test {
           // we can't reliably assert parent or child relationship here since both are tested.
           tags {
             "servlet.context" "/$context"
+            "servlet.path" endpoint.status == 404 ? endpoint.path : "/dispatch$endpoint.path"
             "servlet.dispatch" endpoint.path
             "span.origin.type" {
               it == TestServlet3.DispatchImmediate.name || it == TestServlet3.DispatchAsync.name || it == ApplicationFilterChain.name
diff --git a/dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/TomcatServlet3Test.groovy b/dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/TomcatServlet3Test.groovy
index ed84c88e5a..dfc283f1a8 100644
--- a/dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/TomcatServlet3Test.groovy
+++ b/dd-java-agent/instrumentation/servlet/request-3/src/test/groovy/TomcatServlet3Test.groovy
@@ -296,6 +296,7 @@ abstract class TomcatDispatchTest extends TomcatServlet3Test {
           // we can't reliably assert parent or child relationship here since both are tested.
           tags {
             "servlet.context" "/$context"
+            "servlet.path" endpoint.status == 404 ? endpoint.path : "/dispatch$endpoint.path"
             "servlet.dispatch" endpoint.path
             "span.origin.type" {
               it == TestServlet3.DispatchImmediate.name || it == TestServlet3.DispatchAsync.name || it == ApplicationFilterChain.name