Update servlet operation name.
MODIFY
dd-java-agent-ittests/src/test/groovy/com/datadoghq/agent/integration/servlet/JettyServletTest.groovy
dd-java-agent-ittests/src/test/groovy/com/datadoghq/agent/integration/servlet/JettyServletTest.groovy
@@ -76,7 +76,7 @@ class JettyServletTest extends Specification {
trace.size() == 1
def span = trace[0]
- span.context().operationName == "Servlet Request - GET"
+ span.context().operationName == "servlet.request"
!span.context().getErrorFlag()
span.context().parentId != 0 // parent should be the okhttp call.
span.context().tags[Tags.HTTP_URL.key] == "http://localhost:$PORT/$path"

MODIFY
dd-java-agent-ittests/src/test/groovy/com/datadoghq/agent/integration/servlet/TomcatServletTest.groovy
dd-java-agent-ittests/src/test/groovy/com/datadoghq/agent/integration/servlet/TomcatServletTest.groovy
@@ -98,7 +98,7 @@ class TomcatServletTest extends Specification {
trace.size() == 1
def span = trace[0]
- span.context().operationName == "Servlet Request - GET"
+ span.context().operationName == "servlet.request"
!span.context().getErrorFlag()
span.context().parentId != 0 // parent should be the okhttp call.
span.context().tags[Tags.HTTP_URL.key] == "http://localhost:$PORT/$path"

MODIFY
dd-java-agent/integrations/helpers/src/main/java/com/datadoghq/agent/integration/Servlet2Helper.java
dd-java-agent/integrations/helpers/src/main/java/com/datadoghq/agent/integration/Servlet2Helper.java
@@ -24,6 +24,8 @@ public class Servlet2Helper extends OpenTracingHelper {
public static final String SERVER_SPAN_CONTEXT =
Servlet2Helper.class.getName() + ".activeSpanContext";
+ public static final String SERVLET_OPERATION_NAME = "servlet.request";
+
protected final Tracer tracer;
public Servlet2Helper(final Rule rule) {
@@ -51,7 +53,7 @@ public class Servlet2Helper extends OpenTracingHelper {
final ActiveSpan span =
tracer
- .buildSpan("Servlet Request - " + req.getMethod())
+ .buildSpan(SERVLET_OPERATION_NAME)
.asChildOf(extractedContext)
.withTag(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_SERVER)
.startActive();

MODIFY
dd-trace/src/main/java/com/datadoghq/trace/integration/OperationDecorator.java
dd-trace/src/main/java/com/datadoghq/trace/integration/OperationDecorator.java
@@ -17,8 +17,6 @@ public class OperationDecorator extends AbstractDecorator {
// Component name <> Operation name
put("apache-httpclient", "apache.http");
put("java-aws-sdk", "aws.http");
- // Jetty + Tomcat (same integration used)
- put("java-web-servlet", "servlet.request");
// FIXME: JMS ops card is low (jms-send or jms-receive), may be this mapping is useless
put("java-jms", "jms");
put("okhttp", "okhttp.http");

Update servlet operation name.