diff --git a/dd-java-agent/instrumentation/elasticsearch-rest-5/src/latestDepTest/groovy/Elasticsearch6RestClientTest.groovy b/dd-java-agent/instrumentation/elasticsearch-rest-5/src/latestDepTest/groovy/Elasticsearch6RestClientTest.groovy index a61bdd6b68..d2d300e897 100644 --- a/dd-java-agent/instrumentation/elasticsearch-rest-5/src/latestDepTest/groovy/Elasticsearch6RestClientTest.groovy +++ b/dd-java-agent/instrumentation/elasticsearch-rest-5/src/latestDepTest/groovy/Elasticsearch6RestClientTest.groovy @@ -1,5 +1,7 @@ import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.TestUtils +import datadog.trace.api.DDSpanTypes +import datadog.trace.api.DDTags import groovy.json.JsonSlurper import io.opentracing.tag.Tags import org.apache.http.HttpHost @@ -86,11 +88,12 @@ class Elasticsearch6RestClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "ClusterHealthAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH parent() tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "elasticsearch.action" "ClusterHealthAction" "elasticsearch.request" "ClusterHealthRequest" defaultTags() @@ -102,11 +105,12 @@ class Elasticsearch6RestClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "GET _cluster/health" operationName "elasticsearch.rest.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH parent() tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "$Tags.HTTP_METHOD.key" "GET" "$Tags.HTTP_URL.key" "_cluster/health" "$Tags.PEER_HOSTNAME.key" "localhost" diff --git a/dd-java-agent/instrumentation/elasticsearch-rest-5/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5RestClientInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch-rest-5/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5RestClientInstrumentation.java index 256c04e90e..dd8eb6cce4 100644 --- a/dd-java-agent/instrumentation/elasticsearch-rest-5/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5RestClientInstrumentation.java +++ b/dd-java-agent/instrumentation/elasticsearch-rest-5/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5RestClientInstrumentation.java @@ -11,6 +11,7 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArguments; import com.google.auto.service.AutoService; import datadog.trace.agent.tooling.Instrumenter; +import datadog.trace.api.DDSpanTypes; import datadog.trace.api.DDTags; import io.opentracing.Scope; import io.opentracing.Span; @@ -47,7 +48,7 @@ public class Elasticsearch5RestClientInstrumentation extends Instrumenter.Defaul @Override public Map transformers() { - Map transformers = new HashMap<>(); + final Map transformers = new HashMap<>(); transformers.put( isMethod() .and(isPublic()) @@ -72,6 +73,7 @@ public class Elasticsearch5RestClientInstrumentation extends Instrumenter.Defaul GlobalTracer.get() .buildSpan("elasticsearch.rest.query") .withTag(DDTags.SERVICE_NAME, "elasticsearch") + .withTag(DDTags.SPAN_TYPE, DDSpanTypes.ELASTICSEARCH) .withTag(Tags.HTTP_METHOD.getKey(), method) .withTag(Tags.HTTP_URL.getKey(), endpoint) .withTag(Tags.COMPONENT.getKey(), "elasticsearch-java") diff --git a/dd-java-agent/instrumentation/elasticsearch-rest-5/src/test/groovy/Elasticsearch5RestClientTest.groovy b/dd-java-agent/instrumentation/elasticsearch-rest-5/src/test/groovy/Elasticsearch5RestClientTest.groovy index c36dfd7e12..33b6d3d41f 100644 --- a/dd-java-agent/instrumentation/elasticsearch-rest-5/src/test/groovy/Elasticsearch5RestClientTest.groovy +++ b/dd-java-agent/instrumentation/elasticsearch-rest-5/src/test/groovy/Elasticsearch5RestClientTest.groovy @@ -1,5 +1,7 @@ import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.TestUtils +import datadog.trace.api.DDSpanTypes +import datadog.trace.api.DDTags import groovy.json.JsonSlurper import io.opentracing.tag.Tags import org.apache.http.HttpHost @@ -90,11 +92,12 @@ class Elasticsearch5RestClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "GET _cluster/health" operationName "elasticsearch.rest.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH parent() tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "$Tags.HTTP_METHOD.key" "GET" "$Tags.HTTP_URL.key" "_cluster/health" "$Tags.PEER_HOSTNAME.key" "localhost" diff --git a/dd-java-agent/instrumentation/elasticsearch-transport-2/src/main/java/datadog/trace/instrumentation/elasticsearch2/Elasticsearch2TransportClientInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch-transport-2/src/main/java/datadog/trace/instrumentation/elasticsearch2/Elasticsearch2TransportClientInstrumentation.java index 080774664a..7ae20d78b7 100644 --- a/dd-java-agent/instrumentation/elasticsearch-transport-2/src/main/java/datadog/trace/instrumentation/elasticsearch2/Elasticsearch2TransportClientInstrumentation.java +++ b/dd-java-agent/instrumentation/elasticsearch-transport-2/src/main/java/datadog/trace/instrumentation/elasticsearch2/Elasticsearch2TransportClientInstrumentation.java @@ -10,6 +10,7 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import com.google.auto.service.AutoService; import datadog.trace.agent.tooling.Instrumenter; +import datadog.trace.api.DDSpanTypes; import datadog.trace.api.DDTags; import io.opentracing.Scope; import io.opentracing.Span; @@ -63,7 +64,7 @@ public class Elasticsearch2TransportClientInstrumentation extends Instrumenter.D @Override public Map transformers() { - Map transformers = new HashMap<>(); + final Map transformers = new HashMap<>(); transformers.put( isMethod() .and(named("execute")) @@ -88,6 +89,7 @@ public class Elasticsearch2TransportClientInstrumentation extends Instrumenter.D .buildSpan("elasticsearch.query") .withTag(DDTags.SERVICE_NAME, "elasticsearch") .withTag(DDTags.RESOURCE_NAME, action.getClass().getSimpleName()) + .withTag(DDTags.SPAN_TYPE, DDSpanTypes.ELASTICSEARCH) .withTag(Tags.COMPONENT.getKey(), "elasticsearch-java") .withTag(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_CLIENT) .withTag("elasticsearch.action", action.getClass().getSimpleName()) diff --git a/dd-java-agent/instrumentation/elasticsearch-transport-2/src/test/groovy/Elasticsearch2NodeClientTest.groovy b/dd-java-agent/instrumentation/elasticsearch-transport-2/src/test/groovy/Elasticsearch2NodeClientTest.groovy index cac0a9a719..586593b9f0 100644 --- a/dd-java-agent/instrumentation/elasticsearch-transport-2/src/test/groovy/Elasticsearch2NodeClientTest.groovy +++ b/dd-java-agent/instrumentation/elasticsearch-transport-2/src/test/groovy/Elasticsearch2NodeClientTest.groovy @@ -1,5 +1,7 @@ import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.TestUtils +import datadog.trace.api.DDSpanTypes +import datadog.trace.api.DDTags import io.opentracing.tag.Tags import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest import org.elasticsearch.common.io.FileSystemUtils @@ -74,11 +76,11 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "ClusterHealthAction" operationName "elasticsearch.query" - spanType null - parent() + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "elasticsearch.action" "ClusterHealthAction" "elasticsearch.request" "ClusterHealthRequest" defaultTags() @@ -102,11 +104,12 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "GetAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH errored true tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName @@ -167,10 +170,11 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "CreateIndexAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "elasticsearch.action" "CreateIndexAction" "elasticsearch.request" "CreateIndexRequest" "elasticsearch.request.indices" indexName @@ -183,10 +187,11 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "ClusterHealthAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "elasticsearch.action" "ClusterHealthAction" "elasticsearch.request" "ClusterHealthRequest" defaultTags() @@ -198,10 +203,11 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "GetAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "$Tags.PEER_HOSTNAME.key" "local" "$Tags.PEER_HOST_IPV4.key" "0.0.0.0" "$Tags.PEER_PORT.key" 0 @@ -220,10 +226,11 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "PutMappingAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "elasticsearch.action" "PutMappingAction" "elasticsearch.request" "PutMappingRequest" "elasticsearch.request.indices" indexName @@ -236,10 +243,11 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "IndexAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "$Tags.PEER_HOSTNAME.key" "local" "$Tags.PEER_HOST_IPV4.key" "0.0.0.0" "$Tags.PEER_PORT.key" 0 @@ -256,10 +264,11 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "GetAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "$Tags.PEER_HOSTNAME.key" "local" "$Tags.PEER_HOST_IPV4.key" "0.0.0.0" "$Tags.PEER_PORT.key" 0 diff --git a/dd-java-agent/instrumentation/elasticsearch-transport-2/src/test/groovy/Elasticsearch2SpringTemplateTest.groovy b/dd-java-agent/instrumentation/elasticsearch-transport-2/src/test/groovy/Elasticsearch2SpringTemplateTest.groovy index 6dd6864b0a..79f553a53a 100644 --- a/dd-java-agent/instrumentation/elasticsearch-transport-2/src/test/groovy/Elasticsearch2SpringTemplateTest.groovy +++ b/dd-java-agent/instrumentation/elasticsearch-transport-2/src/test/groovy/Elasticsearch2SpringTemplateTest.groovy @@ -1,5 +1,7 @@ import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.TestUtils +import datadog.trace.api.DDSpanTypes +import datadog.trace.api.DDTags import io.opentracing.tag.Tags import org.elasticsearch.action.search.SearchResponse import org.elasticsearch.common.io.FileSystemUtils @@ -83,11 +85,12 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "RefreshAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH errored true tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "elasticsearch.action" "RefreshAction" "elasticsearch.request" "RefreshRequest" "elasticsearch.request.indices" indexName @@ -137,10 +140,11 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "CreateIndexAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "elasticsearch.action" "CreateIndexAction" "elasticsearch.request" "CreateIndexRequest" "elasticsearch.request.indices" indexName @@ -153,10 +157,11 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "ClusterHealthAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "elasticsearch.action" "ClusterHealthAction" "elasticsearch.request" "ClusterHealthRequest" defaultTags() @@ -168,10 +173,11 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "SearchAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "elasticsearch.action" "SearchAction" "elasticsearch.request" "SearchRequest" "elasticsearch.request.indices" indexName @@ -185,10 +191,11 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "PutMappingAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "elasticsearch.action" "PutMappingAction" "elasticsearch.request" "PutMappingRequest" "elasticsearch.request.indices" indexName @@ -201,10 +208,11 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "IndexAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "$Tags.PEER_HOSTNAME.key" "local" "$Tags.PEER_HOST_IPV4.key" "0.0.0.0" "$Tags.PEER_PORT.key" 0 @@ -221,10 +229,11 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "RefreshAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "elasticsearch.action" "RefreshAction" "elasticsearch.request" "RefreshRequest" "elasticsearch.request.indices" indexName @@ -240,10 +249,11 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "SearchAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "elasticsearch.action" "SearchAction" "elasticsearch.request" "SearchRequest" "elasticsearch.request.indices" indexName @@ -320,6 +330,7 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner { tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "elasticsearch.action" "SearchAction" "elasticsearch.request" "SearchRequest" "elasticsearch.request.indices" indexName diff --git a/dd-java-agent/instrumentation/elasticsearch-transport-2/src/test/groovy/Elasticsearch2TransportClientTest.groovy b/dd-java-agent/instrumentation/elasticsearch-transport-2/src/test/groovy/Elasticsearch2TransportClientTest.groovy index 02e9ff7bbb..a41bfe901a 100644 --- a/dd-java-agent/instrumentation/elasticsearch-transport-2/src/test/groovy/Elasticsearch2TransportClientTest.groovy +++ b/dd-java-agent/instrumentation/elasticsearch-transport-2/src/test/groovy/Elasticsearch2TransportClientTest.groovy @@ -1,5 +1,7 @@ import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.TestUtils +import datadog.trace.api.DDSpanTypes +import datadog.trace.api.DDTags import io.opentracing.tag.Tags import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest import org.elasticsearch.client.transport.TransportClient @@ -85,11 +87,11 @@ class Elasticsearch2TransportClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "ClusterHealthAction" operationName "elasticsearch.query" - spanType null - parent() + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "$Tags.PEER_HOSTNAME.key" "127.0.0.1" "$Tags.PEER_HOST_IPV4.key" "127.0.0.1" "$Tags.PEER_PORT.key" tcpPort @@ -116,11 +118,12 @@ class Elasticsearch2TransportClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "GetAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH errored true tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName @@ -181,10 +184,11 @@ class Elasticsearch2TransportClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "CreateIndexAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "elasticsearch.action" "CreateIndexAction" "elasticsearch.request" "CreateIndexRequest" "elasticsearch.request.indices" indexName @@ -200,10 +204,11 @@ class Elasticsearch2TransportClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "ClusterHealthAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "elasticsearch.action" "ClusterHealthAction" "elasticsearch.request" "ClusterHealthRequest" "$Tags.PEER_HOSTNAME.key" "127.0.0.1" @@ -218,10 +223,11 @@ class Elasticsearch2TransportClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "GetAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "$Tags.PEER_HOSTNAME.key" "127.0.0.1" "$Tags.PEER_HOST_IPV4.key" "127.0.0.1" "$Tags.PEER_PORT.key" tcpPort @@ -240,10 +246,11 @@ class Elasticsearch2TransportClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "PutMappingAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "elasticsearch.action" "PutMappingAction" "elasticsearch.request" "PutMappingRequest" "elasticsearch.request.indices" indexName @@ -256,10 +263,11 @@ class Elasticsearch2TransportClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "IndexAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "$Tags.PEER_HOSTNAME.key" "127.0.0.1" "$Tags.PEER_HOST_IPV4.key" "127.0.0.1" "$Tags.PEER_PORT.key" tcpPort @@ -276,10 +284,11 @@ class Elasticsearch2TransportClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "GetAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "$Tags.PEER_HOSTNAME.key" "127.0.0.1" "$Tags.PEER_HOST_IPV4.key" "127.0.0.1" "$Tags.PEER_PORT.key" tcpPort diff --git a/dd-java-agent/instrumentation/elasticsearch-transport-2/src/test/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy b/dd-java-agent/instrumentation/elasticsearch-transport-2/src/test/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy index e0b5dc1253..31f262a1b1 100644 --- a/dd-java-agent/instrumentation/elasticsearch-transport-2/src/test/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy +++ b/dd-java-agent/instrumentation/elasticsearch-transport-2/src/test/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy @@ -1,6 +1,8 @@ package springdata import datadog.trace.agent.test.AgentTestRunner +import datadog.trace.api.DDSpanTypes +import datadog.trace.api.DDTags import io.opentracing.tag.Tags import org.springframework.context.ApplicationContext import org.springframework.context.annotation.AnnotationConfigApplicationContext @@ -39,11 +41,12 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "SearchAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH errored false tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "elasticsearch.action" "SearchAction" "elasticsearch.request" "SearchRequest" "elasticsearch.request.indices" indexName @@ -71,9 +74,11 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner { span(0) { resourceName "PutMappingAction" operationName "elasticsearch.query" + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "elasticsearch.action" "PutMappingAction" "elasticsearch.request" "PutMappingRequest" "elasticsearch.request.indices" indexName @@ -85,9 +90,11 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner { span(0) { resourceName "IndexAction" operationName "elasticsearch.query" + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "$Tags.PEER_HOSTNAME.key" "local" "$Tags.PEER_HOST_IPV4.key" "0.0.0.0" "$Tags.PEER_PORT.key" 0 @@ -103,9 +110,11 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner { span(0) { resourceName "RefreshAction" operationName "elasticsearch.query" + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "elasticsearch.action" "RefreshAction" "elasticsearch.request" "RefreshRequest" "elasticsearch.request.indices" indexName @@ -129,9 +138,11 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "GetAction" operationName "elasticsearch.query" + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "$Tags.PEER_HOSTNAME.key" "local" "$Tags.PEER_HOST_IPV4.key" "0.0.0.0" "$Tags.PEER_PORT.key" 0 @@ -161,9 +172,11 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner { span(0) { resourceName "IndexAction" operationName "elasticsearch.query" + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "$Tags.PEER_HOSTNAME.key" "local" "$Tags.PEER_HOST_IPV4.key" "0.0.0.0" "$Tags.PEER_PORT.key" 0 @@ -179,9 +192,11 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner { span(0) { resourceName "RefreshAction" operationName "elasticsearch.query" + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "elasticsearch.action" "RefreshAction" "elasticsearch.request" "RefreshRequest" "elasticsearch.request.indices" indexName @@ -197,9 +212,11 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "GetAction" operationName "elasticsearch.query" + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "$Tags.PEER_HOSTNAME.key" "local" "$Tags.PEER_HOST_IPV4.key" "0.0.0.0" "$Tags.PEER_PORT.key" 0 @@ -228,9 +245,11 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner { span(0) { resourceName "DeleteAction" operationName "elasticsearch.query" + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "$Tags.PEER_HOSTNAME.key" "local" "$Tags.PEER_HOST_IPV4.key" "0.0.0.0" "$Tags.PEER_PORT.key" 0 @@ -246,9 +265,11 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner { span(0) { resourceName "RefreshAction" operationName "elasticsearch.query" + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "elasticsearch.action" "RefreshAction" "elasticsearch.request" "RefreshRequest" "elasticsearch.request.indices" indexName @@ -264,9 +285,11 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "SearchAction" operationName "elasticsearch.query" + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "elasticsearch.action" "SearchAction" "elasticsearch.request" "SearchRequest" "elasticsearch.request.indices" indexName diff --git a/dd-java-agent/instrumentation/elasticsearch-transport-5/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5TransportClientInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch-transport-5/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5TransportClientInstrumentation.java index 495223eba8..22401d276a 100644 --- a/dd-java-agent/instrumentation/elasticsearch-transport-5/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5TransportClientInstrumentation.java +++ b/dd-java-agent/instrumentation/elasticsearch-transport-5/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5TransportClientInstrumentation.java @@ -10,6 +10,7 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import com.google.auto.service.AutoService; import datadog.trace.agent.tooling.Instrumenter; +import datadog.trace.api.DDSpanTypes; import datadog.trace.api.DDTags; import io.opentracing.Scope; import io.opentracing.Span; @@ -63,7 +64,7 @@ public class Elasticsearch5TransportClientInstrumentation extends Instrumenter.D @Override public Map transformers() { - Map transformers = new HashMap<>(); + final Map transformers = new HashMap<>(); transformers.put( isMethod() .and(named("execute")) @@ -88,6 +89,7 @@ public class Elasticsearch5TransportClientInstrumentation extends Instrumenter.D .buildSpan("elasticsearch.query") .withTag(DDTags.SERVICE_NAME, "elasticsearch") .withTag(DDTags.RESOURCE_NAME, action.getClass().getSimpleName()) + .withTag(DDTags.SPAN_TYPE, DDSpanTypes.ELASTICSEARCH) .withTag(Tags.COMPONENT.getKey(), "elasticsearch-java") .withTag(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_CLIENT) .withTag("elasticsearch.action", action.getClass().getSimpleName()) diff --git a/dd-java-agent/instrumentation/elasticsearch-transport-5/src/test/groovy/Elasticsearch5NodeClientTest.groovy b/dd-java-agent/instrumentation/elasticsearch-transport-5/src/test/groovy/Elasticsearch5NodeClientTest.groovy index 5f622ca05e..b070370104 100644 --- a/dd-java-agent/instrumentation/elasticsearch-transport-5/src/test/groovy/Elasticsearch5NodeClientTest.groovy +++ b/dd-java-agent/instrumentation/elasticsearch-transport-5/src/test/groovy/Elasticsearch5NodeClientTest.groovy @@ -1,5 +1,7 @@ import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.TestUtils +import datadog.trace.api.DDSpanTypes +import datadog.trace.api.DDTags import io.opentracing.tag.Tags import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest import org.elasticsearch.common.io.FileSystemUtils @@ -80,11 +82,11 @@ class Elasticsearch5NodeClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "ClusterHealthAction" operationName "elasticsearch.query" - spanType null - parent() + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "elasticsearch.action" "ClusterHealthAction" "elasticsearch.request" "ClusterHealthRequest" defaultTags() @@ -108,11 +110,12 @@ class Elasticsearch5NodeClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "GetAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH errored true tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName @@ -174,10 +177,11 @@ class Elasticsearch5NodeClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "CreateIndexAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "elasticsearch.action" "CreateIndexAction" "elasticsearch.request" "CreateIndexRequest" "elasticsearch.request.indices" indexName @@ -190,10 +194,11 @@ class Elasticsearch5NodeClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "ClusterHealthAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "elasticsearch.action" "ClusterHealthAction" "elasticsearch.request" "ClusterHealthRequest" defaultTags() @@ -205,10 +210,11 @@ class Elasticsearch5NodeClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "GetAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName @@ -224,10 +230,11 @@ class Elasticsearch5NodeClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "PutMappingAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "elasticsearch.action" "PutMappingAction" "elasticsearch.request" "PutMappingRequest" defaultTags() @@ -239,10 +246,11 @@ class Elasticsearch5NodeClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "IndexAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "elasticsearch.action" "IndexAction" "elasticsearch.request" "IndexRequest" "elasticsearch.request.indices" indexName @@ -261,10 +269,11 @@ class Elasticsearch5NodeClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "GetAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName diff --git a/dd-java-agent/instrumentation/elasticsearch-transport-5/src/test/groovy/Elasticsearch5TransportClientTest.groovy b/dd-java-agent/instrumentation/elasticsearch-transport-5/src/test/groovy/Elasticsearch5TransportClientTest.groovy index 6c826ec619..c7aaa25a2c 100644 --- a/dd-java-agent/instrumentation/elasticsearch-transport-5/src/test/groovy/Elasticsearch5TransportClientTest.groovy +++ b/dd-java-agent/instrumentation/elasticsearch-transport-5/src/test/groovy/Elasticsearch5TransportClientTest.groovy @@ -1,5 +1,7 @@ import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.TestUtils +import datadog.trace.api.DDSpanTypes +import datadog.trace.api.DDTags import io.opentracing.tag.Tags import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest import org.elasticsearch.client.transport.TransportClient @@ -92,11 +94,11 @@ class Elasticsearch5TransportClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "ClusterHealthAction" operationName "elasticsearch.query" - spanType null - parent() + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "$Tags.PEER_HOSTNAME.key" "127.0.0.1" "$Tags.PEER_HOST_IPV4.key" "127.0.0.1" "$Tags.PEER_PORT.key" tcpPort @@ -123,11 +125,12 @@ class Elasticsearch5TransportClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "GetAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH errored true tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName @@ -188,10 +191,11 @@ class Elasticsearch5TransportClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "CreateIndexAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "elasticsearch.action" "CreateIndexAction" "elasticsearch.request" "CreateIndexRequest" "elasticsearch.request.indices" indexName @@ -207,10 +211,11 @@ class Elasticsearch5TransportClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "GetAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "$Tags.PEER_HOSTNAME.key" "127.0.0.1" "$Tags.PEER_HOST_IPV4.key" "127.0.0.1" "$Tags.PEER_PORT.key" tcpPort @@ -229,10 +234,11 @@ class Elasticsearch5TransportClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "PutMappingAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "elasticsearch.action" "PutMappingAction" "elasticsearch.request" "PutMappingRequest" defaultTags() @@ -244,10 +250,11 @@ class Elasticsearch5TransportClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "IndexAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "$Tags.PEER_HOSTNAME.key" "127.0.0.1" "$Tags.PEER_HOST_IPV4.key" "127.0.0.1" "$Tags.PEER_PORT.key" tcpPort @@ -269,10 +276,11 @@ class Elasticsearch5TransportClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "GetAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "$Tags.PEER_HOSTNAME.key" "127.0.0.1" "$Tags.PEER_HOST_IPV4.key" "127.0.0.1" "$Tags.PEER_PORT.key" tcpPort diff --git a/dd-java-agent/instrumentation/elasticsearch-transport-6/src/main/java/datadog/trace/instrumentation/elasticsearch6/Elasticsearch6TransportClientInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch-transport-6/src/main/java/datadog/trace/instrumentation/elasticsearch6/Elasticsearch6TransportClientInstrumentation.java index b223b7080d..27bf0c158f 100644 --- a/dd-java-agent/instrumentation/elasticsearch-transport-6/src/main/java/datadog/trace/instrumentation/elasticsearch6/Elasticsearch6TransportClientInstrumentation.java +++ b/dd-java-agent/instrumentation/elasticsearch-transport-6/src/main/java/datadog/trace/instrumentation/elasticsearch6/Elasticsearch6TransportClientInstrumentation.java @@ -10,6 +10,7 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import com.google.auto.service.AutoService; import datadog.trace.agent.tooling.Instrumenter; +import datadog.trace.api.DDSpanTypes; import datadog.trace.api.DDTags; import io.opentracing.Scope; import io.opentracing.Span; @@ -67,7 +68,7 @@ public class Elasticsearch6TransportClientInstrumentation extends Instrumenter.D @Override public Map transformers() { - Map transformers = new HashMap<>(); + final Map transformers = new HashMap<>(); transformers.put( isMethod() .and(named("execute")) @@ -92,6 +93,7 @@ public class Elasticsearch6TransportClientInstrumentation extends Instrumenter.D .buildSpan("elasticsearch.query") .withTag(DDTags.SERVICE_NAME, "elasticsearch") .withTag(DDTags.RESOURCE_NAME, action.getClass().getSimpleName()) + .withTag(DDTags.SPAN_TYPE, DDSpanTypes.ELASTICSEARCH) .withTag(Tags.COMPONENT.getKey(), "elasticsearch-java") .withTag(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_CLIENT) .withTag("elasticsearch.action", action.getClass().getSimpleName()) diff --git a/dd-java-agent/instrumentation/elasticsearch-transport-6/src/test/groovy/Elasticsearch6NodeClientTest.groovy b/dd-java-agent/instrumentation/elasticsearch-transport-6/src/test/groovy/Elasticsearch6NodeClientTest.groovy index 9ae5ec1d49..6ce78c1db2 100644 --- a/dd-java-agent/instrumentation/elasticsearch-transport-6/src/test/groovy/Elasticsearch6NodeClientTest.groovy +++ b/dd-java-agent/instrumentation/elasticsearch-transport-6/src/test/groovy/Elasticsearch6NodeClientTest.groovy @@ -1,5 +1,7 @@ import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.TestUtils +import datadog.trace.api.DDSpanTypes +import datadog.trace.api.DDTags import io.opentracing.tag.Tags import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest import org.elasticsearch.common.io.FileSystemUtils @@ -77,10 +79,11 @@ class Elasticsearch6NodeClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "ClusterHealthAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "elasticsearch.action" "ClusterHealthAction" "elasticsearch.request" "ClusterHealthRequest" defaultTags() @@ -104,11 +107,12 @@ class Elasticsearch6NodeClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "GetAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH errored true tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName @@ -169,10 +173,11 @@ class Elasticsearch6NodeClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "CreateIndexAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "elasticsearch.action" "CreateIndexAction" "elasticsearch.request" "CreateIndexRequest" "elasticsearch.request.indices" indexName @@ -185,10 +190,11 @@ class Elasticsearch6NodeClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "GetAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName @@ -204,10 +210,11 @@ class Elasticsearch6NodeClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "PutMappingAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "elasticsearch.action" "PutMappingAction" "elasticsearch.request" "PutMappingRequest" defaultTags() @@ -219,10 +226,11 @@ class Elasticsearch6NodeClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "IndexAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "elasticsearch.action" "IndexAction" "elasticsearch.request" "IndexRequest" "elasticsearch.request.indices" indexName @@ -242,10 +250,11 @@ class Elasticsearch6NodeClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "GetAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName diff --git a/dd-java-agent/instrumentation/elasticsearch-transport-6/src/test/groovy/Elasticsearch6TransportClientTest.groovy b/dd-java-agent/instrumentation/elasticsearch-transport-6/src/test/groovy/Elasticsearch6TransportClientTest.groovy index e54313a378..5623d3abab 100644 --- a/dd-java-agent/instrumentation/elasticsearch-transport-6/src/test/groovy/Elasticsearch6TransportClientTest.groovy +++ b/dd-java-agent/instrumentation/elasticsearch-transport-6/src/test/groovy/Elasticsearch6TransportClientTest.groovy @@ -1,5 +1,7 @@ import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.TestUtils +import datadog.trace.api.DDSpanTypes +import datadog.trace.api.DDTags import io.opentracing.tag.Tags import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest import org.elasticsearch.client.transport.TransportClient @@ -89,10 +91,11 @@ class Elasticsearch6TransportClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "ClusterHealthAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "$Tags.PEER_HOSTNAME.key" "localhost" "$Tags.PEER_HOST_IPV4.key" "127.0.0.1" "$Tags.PEER_PORT.key" tcpPort @@ -119,11 +122,12 @@ class Elasticsearch6TransportClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "GetAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH errored true tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "elasticsearch.action" "GetAction" "elasticsearch.request" "GetRequest" "elasticsearch.request.indices" indexName @@ -184,10 +188,11 @@ class Elasticsearch6TransportClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "CreateIndexAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "$Tags.PEER_HOSTNAME.key" "localhost" "$Tags.PEER_HOST_IPV4.key" "127.0.0.1" "$Tags.PEER_PORT.key" tcpPort @@ -203,10 +208,11 @@ class Elasticsearch6TransportClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "GetAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "$Tags.PEER_HOSTNAME.key" "localhost" "$Tags.PEER_HOST_IPV4.key" "127.0.0.1" "$Tags.PEER_PORT.key" tcpPort @@ -225,10 +231,11 @@ class Elasticsearch6TransportClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "PutMappingAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "elasticsearch.action" "PutMappingAction" "elasticsearch.request" "PutMappingRequest" defaultTags() @@ -240,10 +247,11 @@ class Elasticsearch6TransportClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "IndexAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "$Tags.PEER_HOSTNAME.key" "localhost" "$Tags.PEER_HOST_IPV4.key" "127.0.0.1" "$Tags.PEER_PORT.key" tcpPort @@ -266,10 +274,11 @@ class Elasticsearch6TransportClientTest extends AgentTestRunner { serviceName "elasticsearch" resourceName "GetAction" operationName "elasticsearch.query" - spanType null + spanType DDSpanTypes.ELASTICSEARCH tags { "$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT + "$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH "$Tags.PEER_HOSTNAME.key" "localhost" "$Tags.PEER_HOST_IPV4.key" "127.0.0.1" "$Tags.PEER_PORT.key" tcpPort