From d877039fa77c95ce89c181e129beb7773ffc134a Mon Sep 17 00:00:00 2001
From: Luca Abbati <luca.abbati@datadoghq.com>
Date: Fri, 30 Aug 2019 13:57:30 +0200
Subject: [PATCH] Set span.type = web on jax-rs endpoints

---
 .../instrumentation/jaxrs/JaxRsAnnotationsDecorator.java      | 4 +++-
 .../test/groovy/JaxRsAnnotationsInstrumentationTest.groovy    | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/dd-java-agent/instrumentation/jax-rs-annotations/src/main/java/datadog/trace/instrumentation/jaxrs/JaxRsAnnotationsDecorator.java b/dd-java-agent/instrumentation/jax-rs-annotations/src/main/java/datadog/trace/instrumentation/jaxrs/JaxRsAnnotationsDecorator.java
index 0949e11af3..653a3f0220 100644
--- a/dd-java-agent/instrumentation/jax-rs-annotations/src/main/java/datadog/trace/instrumentation/jaxrs/JaxRsAnnotationsDecorator.java
+++ b/dd-java-agent/instrumentation/jax-rs-annotations/src/main/java/datadog/trace/instrumentation/jaxrs/JaxRsAnnotationsDecorator.java
@@ -3,6 +3,7 @@ package datadog.trace.instrumentation.jaxrs;
 import static datadog.trace.bootstrap.WeakMap.Provider.newWeakMap;
 
 import datadog.trace.agent.decorator.BaseDecorator;
+import datadog.trace.api.DDSpanTypes;
 import datadog.trace.api.DDTags;
 import datadog.trace.bootstrap.WeakMap;
 import io.opentracing.Scope;
@@ -50,8 +51,9 @@ public class JaxRsAnnotationsDecorator extends BaseDecorator {
   }
 
   public void updateCurrentScope(final Scope scope, final Method method) {
-    String resourceName = getResourceName(method);
     final Span span = scope.span();
+    span.setTag(DDTags.SPAN_TYPE, DDSpanTypes.HTTP_SERVER);
+    String resourceName = getResourceName(method);
     if (!resourceName.isEmpty()) {
       span.setTag(DDTags.RESOURCE_NAME, resourceName);
     }
diff --git a/dd-java-agent/instrumentation/jax-rs-annotations/src/test/groovy/JaxRsAnnotationsInstrumentationTest.groovy b/dd-java-agent/instrumentation/jax-rs-annotations/src/test/groovy/JaxRsAnnotationsInstrumentationTest.groovy
index 3cecca43e8..e7cfa80b8e 100644
--- a/dd-java-agent/instrumentation/jax-rs-annotations/src/test/groovy/JaxRsAnnotationsInstrumentationTest.groovy
+++ b/dd-java-agent/instrumentation/jax-rs-annotations/src/test/groovy/JaxRsAnnotationsInstrumentationTest.groovy
@@ -27,7 +27,8 @@ class JaxRsAnnotationsInstrumentationTest extends AgentTestRunner {
       trace(0, 1) {
         span(0) {
           operationName "jax-rs.endpoint"
-          resourceName 'POST /a'
+          resourceName "POST /a"
+          spanType "web"
           tags {
             "$Tags.COMPONENT.key" "jax-rs-controller"
             defaultTags()
@@ -59,6 +60,7 @@ class JaxRsAnnotationsInstrumentationTest extends AgentTestRunner {
         span(1) {
           operationName "jax-rs.endpoint"
           resourceName name
+          spanType "web"
           childOf span(0)
           tags {
             "$Tags.COMPONENT.key" "jax-rs-controller"