open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

elasticsearch

This commit is contained in:
Tyler Benson 2018-07-26 16:04:21 +10:00
parent d3ce57d84f
commit 01d57fb497
14 changed files with 167 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dd-java-agent/instrumentation/elasticsearch-rest-5/src/latestDepTest/groovy/Elasticsearch6RestClientTest.groovy
View File

@ -1,5 +1,7 @@
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.agent.test.TestUtils import datadog.trace.agent.test.TestUtils
import datadog.trace.api.DDSpanTypes
import datadog.trace.api.DDTags
import groovy.json.JsonSlurper import groovy.json.JsonSlurper
import io.opentracing.tag.Tags import io.opentracing.tag.Tags
import org.apache.http.HttpHost import org.apache.http.HttpHost
@ -86,11 +88,12 @@ class Elasticsearch6RestClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "ClusterHealthAction" resourceName "ClusterHealthAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
parent() parent()
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"elasticsearch.action" "ClusterHealthAction" "elasticsearch.action" "ClusterHealthAction"
"elasticsearch.request" "ClusterHealthRequest" "elasticsearch.request" "ClusterHealthRequest"
defaultTags() defaultTags()
@ -102,11 +105,12 @@ class Elasticsearch6RestClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "GET _cluster/health" resourceName "GET _cluster/health"
operationName "elasticsearch.rest.query" operationName "elasticsearch.rest.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
parent() parent()
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"$Tags.HTTP_METHOD.key" "GET" "$Tags.HTTP_METHOD.key" "GET"
"$Tags.HTTP_URL.key" "_cluster/health" "$Tags.HTTP_URL.key" "_cluster/health"
"$Tags.PEER_HOSTNAME.key" "localhost" "$Tags.PEER_HOSTNAME.key" "localhost"

4
dd-java-agent/instrumentation/elasticsearch-rest-5/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5RestClientInstrumentation.java
View File

@ -11,6 +11,7 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
import com.google.auto.service.AutoService; import com.google.auto.service.AutoService;
import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.Instrumenter;
import datadog.trace.api.DDSpanTypes;
import datadog.trace.api.DDTags; import datadog.trace.api.DDTags;
import io.opentracing.Scope; import io.opentracing.Scope;
import io.opentracing.Span; import io.opentracing.Span;
@ -47,7 +48,7 @@ public class Elasticsearch5RestClientInstrumentation extends Instrumenter.Defaul
@Override @Override
public Map<ElementMatcher, String> transformers() { public Map<ElementMatcher, String> transformers() {
Map<ElementMatcher, String> transformers = new HashMap<>(); final Map<ElementMatcher, String> transformers = new HashMap<>();
transformers.put( transformers.put(
isMethod() isMethod()
.and(isPublic()) .and(isPublic())
@ -72,6 +73,7 @@ public class Elasticsearch5RestClientInstrumentation extends Instrumenter.Defaul
GlobalTracer.get() GlobalTracer.get()
.buildSpan("elasticsearch.rest.query") .buildSpan("elasticsearch.rest.query")
.withTag(DDTags.SERVICE_NAME, "elasticsearch") .withTag(DDTags.SERVICE_NAME, "elasticsearch")
.withTag(DDTags.SPAN_TYPE, DDSpanTypes.ELASTICSEARCH)
.withTag(Tags.HTTP_METHOD.getKey(), method) .withTag(Tags.HTTP_METHOD.getKey(), method)
.withTag(Tags.HTTP_URL.getKey(), endpoint) .withTag(Tags.HTTP_URL.getKey(), endpoint)
.withTag(Tags.COMPONENT.getKey(), "elasticsearch-java") .withTag(Tags.COMPONENT.getKey(), "elasticsearch-java")

5
dd-java-agent/instrumentation/elasticsearch-rest-5/src/test/groovy/Elasticsearch5RestClientTest.groovy
View File

@ -1,5 +1,7 @@
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.agent.test.TestUtils import datadog.trace.agent.test.TestUtils
import datadog.trace.api.DDSpanTypes
import datadog.trace.api.DDTags
import groovy.json.JsonSlurper import groovy.json.JsonSlurper
import io.opentracing.tag.Tags import io.opentracing.tag.Tags
import org.apache.http.HttpHost import org.apache.http.HttpHost
@ -90,11 +92,12 @@ class Elasticsearch5RestClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "GET _cluster/health" resourceName "GET _cluster/health"
operationName "elasticsearch.rest.query" operationName "elasticsearch.rest.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
parent() parent()
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"$Tags.HTTP_METHOD.key" "GET" "$Tags.HTTP_METHOD.key" "GET"
"$Tags.HTTP_URL.key" "_cluster/health" "$Tags.HTTP_URL.key" "_cluster/health"
"$Tags.PEER_HOSTNAME.key" "localhost" "$Tags.PEER_HOSTNAME.key" "localhost"

4
dd-java-agent/instrumentation/elasticsearch-transport-2/src/main/java/datadog/trace/instrumentation/elasticsearch2/Elasticsearch2TransportClientInstrumentation.java
View File

@ -10,6 +10,7 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
import com.google.auto.service.AutoService; import com.google.auto.service.AutoService;
import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.Instrumenter;
import datadog.trace.api.DDSpanTypes;
import datadog.trace.api.DDTags; import datadog.trace.api.DDTags;
import io.opentracing.Scope; import io.opentracing.Scope;
import io.opentracing.Span; import io.opentracing.Span;
@ -63,7 +64,7 @@ public class Elasticsearch2TransportClientInstrumentation extends Instrumenter.D
@Override @Override
public Map<ElementMatcher, String> transformers() { public Map<ElementMatcher, String> transformers() {
Map<ElementMatcher, String> transformers = new HashMap<>(); final Map<ElementMatcher, String> transformers = new HashMap<>();
transformers.put( transformers.put(
isMethod() isMethod()
.and(named("execute")) .and(named("execute"))
@ -88,6 +89,7 @@ public class Elasticsearch2TransportClientInstrumentation extends Instrumenter.D
.buildSpan("elasticsearch.query") .buildSpan("elasticsearch.query")
.withTag(DDTags.SERVICE_NAME, "elasticsearch") .withTag(DDTags.SERVICE_NAME, "elasticsearch")
.withTag(DDTags.RESOURCE_NAME, action.getClass().getSimpleName()) .withTag(DDTags.RESOURCE_NAME, action.getClass().getSimpleName())
.withTag(DDTags.SPAN_TYPE, DDSpanTypes.ELASTICSEARCH)
.withTag(Tags.COMPONENT.getKey(), "elasticsearch-java") .withTag(Tags.COMPONENT.getKey(), "elasticsearch-java")
.withTag(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_CLIENT) .withTag(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_CLIENT)
.withTag("elasticsearch.action", action.getClass().getSimpleName()) .withTag("elasticsearch.action", action.getClass().getSimpleName())

27
dd-java-agent/instrumentation/elasticsearch-transport-2/src/test/groovy/Elasticsearch2NodeClientTest.groovy
View File

@ -1,5 +1,7 @@
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.agent.test.TestUtils import datadog.trace.agent.test.TestUtils
import datadog.trace.api.DDSpanTypes
import datadog.trace.api.DDTags
import io.opentracing.tag.Tags import io.opentracing.tag.Tags
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest
import org.elasticsearch.common.io.FileSystemUtils import org.elasticsearch.common.io.FileSystemUtils
@ -74,11 +76,11 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "ClusterHealthAction" resourceName "ClusterHealthAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
parent()
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"elasticsearch.action" "ClusterHealthAction" "elasticsearch.action" "ClusterHealthAction"
"elasticsearch.request" "ClusterHealthRequest" "elasticsearch.request" "ClusterHealthRequest"
defaultTags() defaultTags()
@ -102,11 +104,12 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "GetAction" resourceName "GetAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
errored true errored true
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"elasticsearch.action" "GetAction" "elasticsearch.action" "GetAction"
"elasticsearch.request" "GetRequest" "elasticsearch.request" "GetRequest"
"elasticsearch.request.indices" indexName "elasticsearch.request.indices" indexName
@ -167,10 +170,11 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "CreateIndexAction" resourceName "CreateIndexAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"elasticsearch.action" "CreateIndexAction" "elasticsearch.action" "CreateIndexAction"
"elasticsearch.request" "CreateIndexRequest" "elasticsearch.request" "CreateIndexRequest"
"elasticsearch.request.indices" indexName "elasticsearch.request.indices" indexName
@ -183,10 +187,11 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "ClusterHealthAction" resourceName "ClusterHealthAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"elasticsearch.action" "ClusterHealthAction" "elasticsearch.action" "ClusterHealthAction"
"elasticsearch.request" "ClusterHealthRequest" "elasticsearch.request" "ClusterHealthRequest"
defaultTags() defaultTags()
@ -198,10 +203,11 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "GetAction" resourceName "GetAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"$Tags.PEER_HOSTNAME.key" "local" "$Tags.PEER_HOSTNAME.key" "local"
"$Tags.PEER_HOST_IPV4.key" "0.0.0.0" "$Tags.PEER_HOST_IPV4.key" "0.0.0.0"
"$Tags.PEER_PORT.key" 0 "$Tags.PEER_PORT.key" 0
@ -220,10 +226,11 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "PutMappingAction" resourceName "PutMappingAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"elasticsearch.action" "PutMappingAction" "elasticsearch.action" "PutMappingAction"
"elasticsearch.request" "PutMappingRequest" "elasticsearch.request" "PutMappingRequest"
"elasticsearch.request.indices" indexName "elasticsearch.request.indices" indexName
@ -236,10 +243,11 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "IndexAction" resourceName "IndexAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"$Tags.PEER_HOSTNAME.key" "local" "$Tags.PEER_HOSTNAME.key" "local"
"$Tags.PEER_HOST_IPV4.key" "0.0.0.0" "$Tags.PEER_HOST_IPV4.key" "0.0.0.0"
"$Tags.PEER_PORT.key" 0 "$Tags.PEER_PORT.key" 0
@ -256,10 +264,11 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "GetAction" resourceName "GetAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"$Tags.PEER_HOSTNAME.key" "local" "$Tags.PEER_HOSTNAME.key" "local"
"$Tags.PEER_HOST_IPV4.key" "0.0.0.0" "$Tags.PEER_HOST_IPV4.key" "0.0.0.0"
"$Tags.PEER_PORT.key" 0 "$Tags.PEER_PORT.key" 0

27
dd-java-agent/instrumentation/elasticsearch-transport-2/src/test/groovy/Elasticsearch2SpringTemplateTest.groovy
View File

@ -1,5 +1,7 @@
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.agent.test.TestUtils import datadog.trace.agent.test.TestUtils
import datadog.trace.api.DDSpanTypes
import datadog.trace.api.DDTags
import io.opentracing.tag.Tags import io.opentracing.tag.Tags
import org.elasticsearch.action.search.SearchResponse import org.elasticsearch.action.search.SearchResponse
import org.elasticsearch.common.io.FileSystemUtils import org.elasticsearch.common.io.FileSystemUtils
@ -83,11 +85,12 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "RefreshAction" resourceName "RefreshAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
errored true errored true
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"elasticsearch.action" "RefreshAction" "elasticsearch.action" "RefreshAction"
"elasticsearch.request" "RefreshRequest" "elasticsearch.request" "RefreshRequest"
"elasticsearch.request.indices" indexName "elasticsearch.request.indices" indexName
@ -137,10 +140,11 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "CreateIndexAction" resourceName "CreateIndexAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"elasticsearch.action" "CreateIndexAction" "elasticsearch.action" "CreateIndexAction"
"elasticsearch.request" "CreateIndexRequest" "elasticsearch.request" "CreateIndexRequest"
"elasticsearch.request.indices" indexName "elasticsearch.request.indices" indexName
@ -153,10 +157,11 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "ClusterHealthAction" resourceName "ClusterHealthAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"elasticsearch.action" "ClusterHealthAction" "elasticsearch.action" "ClusterHealthAction"
"elasticsearch.request" "ClusterHealthRequest" "elasticsearch.request" "ClusterHealthRequest"
defaultTags() defaultTags()
@ -168,10 +173,11 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "SearchAction" resourceName "SearchAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"elasticsearch.action" "SearchAction" "elasticsearch.action" "SearchAction"
"elasticsearch.request" "SearchRequest" "elasticsearch.request" "SearchRequest"
"elasticsearch.request.indices" indexName "elasticsearch.request.indices" indexName
@ -185,10 +191,11 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "PutMappingAction" resourceName "PutMappingAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"elasticsearch.action" "PutMappingAction" "elasticsearch.action" "PutMappingAction"
"elasticsearch.request" "PutMappingRequest" "elasticsearch.request" "PutMappingRequest"
"elasticsearch.request.indices" indexName "elasticsearch.request.indices" indexName
@ -201,10 +208,11 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "IndexAction" resourceName "IndexAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"$Tags.PEER_HOSTNAME.key" "local" "$Tags.PEER_HOSTNAME.key" "local"
"$Tags.PEER_HOST_IPV4.key" "0.0.0.0" "$Tags.PEER_HOST_IPV4.key" "0.0.0.0"
"$Tags.PEER_PORT.key" 0 "$Tags.PEER_PORT.key" 0
@ -221,10 +229,11 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "RefreshAction" resourceName "RefreshAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"elasticsearch.action" "RefreshAction" "elasticsearch.action" "RefreshAction"
"elasticsearch.request" "RefreshRequest" "elasticsearch.request" "RefreshRequest"
"elasticsearch.request.indices" indexName "elasticsearch.request.indices" indexName
@ -240,10 +249,11 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "SearchAction" resourceName "SearchAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"elasticsearch.action" "SearchAction" "elasticsearch.action" "SearchAction"
"elasticsearch.request" "SearchRequest" "elasticsearch.request" "SearchRequest"
"elasticsearch.request.indices" indexName "elasticsearch.request.indices" indexName
@ -320,6 +330,7 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner {
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"elasticsearch.action" "SearchAction" "elasticsearch.action" "SearchAction"
"elasticsearch.request" "SearchRequest" "elasticsearch.request" "SearchRequest"
"elasticsearch.request.indices" indexName "elasticsearch.request.indices" indexName

27
dd-java-agent/instrumentation/elasticsearch-transport-2/src/test/groovy/Elasticsearch2TransportClientTest.groovy
View File

@ -1,5 +1,7 @@
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.agent.test.TestUtils import datadog.trace.agent.test.TestUtils
import datadog.trace.api.DDSpanTypes
import datadog.trace.api.DDTags
import io.opentracing.tag.Tags import io.opentracing.tag.Tags
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest
import org.elasticsearch.client.transport.TransportClient import org.elasticsearch.client.transport.TransportClient
@ -85,11 +87,11 @@ class Elasticsearch2TransportClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "ClusterHealthAction" resourceName "ClusterHealthAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
parent()
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"$Tags.PEER_HOSTNAME.key" "127.0.0.1" "$Tags.PEER_HOSTNAME.key" "127.0.0.1"
"$Tags.PEER_HOST_IPV4.key" "127.0.0.1" "$Tags.PEER_HOST_IPV4.key" "127.0.0.1"
"$Tags.PEER_PORT.key" tcpPort "$Tags.PEER_PORT.key" tcpPort
@ -116,11 +118,12 @@ class Elasticsearch2TransportClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "GetAction" resourceName "GetAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
errored true errored true
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"elasticsearch.action" "GetAction" "elasticsearch.action" "GetAction"
"elasticsearch.request" "GetRequest" "elasticsearch.request" "GetRequest"
"elasticsearch.request.indices" indexName "elasticsearch.request.indices" indexName
@ -181,10 +184,11 @@ class Elasticsearch2TransportClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "CreateIndexAction" resourceName "CreateIndexAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"elasticsearch.action" "CreateIndexAction" "elasticsearch.action" "CreateIndexAction"
"elasticsearch.request" "CreateIndexRequest" "elasticsearch.request" "CreateIndexRequest"
"elasticsearch.request.indices" indexName "elasticsearch.request.indices" indexName
@ -200,10 +204,11 @@ class Elasticsearch2TransportClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "ClusterHealthAction" resourceName "ClusterHealthAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"elasticsearch.action" "ClusterHealthAction" "elasticsearch.action" "ClusterHealthAction"
"elasticsearch.request" "ClusterHealthRequest" "elasticsearch.request" "ClusterHealthRequest"
"$Tags.PEER_HOSTNAME.key" "127.0.0.1" "$Tags.PEER_HOSTNAME.key" "127.0.0.1"
@ -218,10 +223,11 @@ class Elasticsearch2TransportClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "GetAction" resourceName "GetAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"$Tags.PEER_HOSTNAME.key" "127.0.0.1" "$Tags.PEER_HOSTNAME.key" "127.0.0.1"
"$Tags.PEER_HOST_IPV4.key" "127.0.0.1" "$Tags.PEER_HOST_IPV4.key" "127.0.0.1"
"$Tags.PEER_PORT.key" tcpPort "$Tags.PEER_PORT.key" tcpPort
@ -240,10 +246,11 @@ class Elasticsearch2TransportClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "PutMappingAction" resourceName "PutMappingAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"elasticsearch.action" "PutMappingAction" "elasticsearch.action" "PutMappingAction"
"elasticsearch.request" "PutMappingRequest" "elasticsearch.request" "PutMappingRequest"
"elasticsearch.request.indices" indexName "elasticsearch.request.indices" indexName
@ -256,10 +263,11 @@ class Elasticsearch2TransportClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "IndexAction" resourceName "IndexAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"$Tags.PEER_HOSTNAME.key" "127.0.0.1" "$Tags.PEER_HOSTNAME.key" "127.0.0.1"
"$Tags.PEER_HOST_IPV4.key" "127.0.0.1" "$Tags.PEER_HOST_IPV4.key" "127.0.0.1"
"$Tags.PEER_PORT.key" tcpPort "$Tags.PEER_PORT.key" tcpPort
@ -276,10 +284,11 @@ class Elasticsearch2TransportClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "GetAction" resourceName "GetAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"$Tags.PEER_HOSTNAME.key" "127.0.0.1" "$Tags.PEER_HOSTNAME.key" "127.0.0.1"
"$Tags.PEER_HOST_IPV4.key" "127.0.0.1" "$Tags.PEER_HOST_IPV4.key" "127.0.0.1"
"$Tags.PEER_PORT.key" tcpPort "$Tags.PEER_PORT.key" tcpPort

25
dd-java-agent/instrumentation/elasticsearch-transport-2/src/test/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy
View File

@ -1,6 +1,8 @@
package springdata package springdata
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.api.DDSpanTypes
import datadog.trace.api.DDTags
import io.opentracing.tag.Tags import io.opentracing.tag.Tags
import org.springframework.context.ApplicationContext import org.springframework.context.ApplicationContext
import org.springframework.context.annotation.AnnotationConfigApplicationContext import org.springframework.context.annotation.AnnotationConfigApplicationContext
@ -39,11 +41,12 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "SearchAction" resourceName "SearchAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
errored false errored false
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"elasticsearch.action" "SearchAction" "elasticsearch.action" "SearchAction"
"elasticsearch.request" "SearchRequest" "elasticsearch.request" "SearchRequest"
"elasticsearch.request.indices" indexName "elasticsearch.request.indices" indexName
@ -71,9 +74,11 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
span(0) { span(0) {
resourceName "PutMappingAction" resourceName "PutMappingAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"elasticsearch.action" "PutMappingAction" "elasticsearch.action" "PutMappingAction"
"elasticsearch.request" "PutMappingRequest" "elasticsearch.request" "PutMappingRequest"
"elasticsearch.request.indices" indexName "elasticsearch.request.indices" indexName
@ -85,9 +90,11 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
span(0) { span(0) {
resourceName "IndexAction" resourceName "IndexAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"$Tags.PEER_HOSTNAME.key" "local" "$Tags.PEER_HOSTNAME.key" "local"
"$Tags.PEER_HOST_IPV4.key" "0.0.0.0" "$Tags.PEER_HOST_IPV4.key" "0.0.0.0"
"$Tags.PEER_PORT.key" 0 "$Tags.PEER_PORT.key" 0
@ -103,9 +110,11 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
span(0) { span(0) {
resourceName "RefreshAction" resourceName "RefreshAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"elasticsearch.action" "RefreshAction" "elasticsearch.action" "RefreshAction"
"elasticsearch.request" "RefreshRequest" "elasticsearch.request" "RefreshRequest"
"elasticsearch.request.indices" indexName "elasticsearch.request.indices" indexName
@ -129,9 +138,11 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "GetAction" resourceName "GetAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"$Tags.PEER_HOSTNAME.key" "local" "$Tags.PEER_HOSTNAME.key" "local"
"$Tags.PEER_HOST_IPV4.key" "0.0.0.0" "$Tags.PEER_HOST_IPV4.key" "0.0.0.0"
"$Tags.PEER_PORT.key" 0 "$Tags.PEER_PORT.key" 0
@ -161,9 +172,11 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
span(0) { span(0) {
resourceName "IndexAction" resourceName "IndexAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"$Tags.PEER_HOSTNAME.key" "local" "$Tags.PEER_HOSTNAME.key" "local"
"$Tags.PEER_HOST_IPV4.key" "0.0.0.0" "$Tags.PEER_HOST_IPV4.key" "0.0.0.0"
"$Tags.PEER_PORT.key" 0 "$Tags.PEER_PORT.key" 0
@ -179,9 +192,11 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
span(0) { span(0) {
resourceName "RefreshAction" resourceName "RefreshAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"elasticsearch.action" "RefreshAction" "elasticsearch.action" "RefreshAction"
"elasticsearch.request" "RefreshRequest" "elasticsearch.request" "RefreshRequest"
"elasticsearch.request.indices" indexName "elasticsearch.request.indices" indexName
@ -197,9 +212,11 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "GetAction" resourceName "GetAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"$Tags.PEER_HOSTNAME.key" "local" "$Tags.PEER_HOSTNAME.key" "local"
"$Tags.PEER_HOST_IPV4.key" "0.0.0.0" "$Tags.PEER_HOST_IPV4.key" "0.0.0.0"
"$Tags.PEER_PORT.key" 0 "$Tags.PEER_PORT.key" 0
@ -228,9 +245,11 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
span(0) { span(0) {
resourceName "DeleteAction" resourceName "DeleteAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"$Tags.PEER_HOSTNAME.key" "local" "$Tags.PEER_HOSTNAME.key" "local"
"$Tags.PEER_HOST_IPV4.key" "0.0.0.0" "$Tags.PEER_HOST_IPV4.key" "0.0.0.0"
"$Tags.PEER_PORT.key" 0 "$Tags.PEER_PORT.key" 0
@ -246,9 +265,11 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
span(0) { span(0) {
resourceName "RefreshAction" resourceName "RefreshAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"elasticsearch.action" "RefreshAction" "elasticsearch.action" "RefreshAction"
"elasticsearch.request" "RefreshRequest" "elasticsearch.request" "RefreshRequest"
"elasticsearch.request.indices" indexName "elasticsearch.request.indices" indexName
@ -264,9 +285,11 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "SearchAction" resourceName "SearchAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"elasticsearch.action" "SearchAction" "elasticsearch.action" "SearchAction"
"elasticsearch.request" "SearchRequest" "elasticsearch.request" "SearchRequest"
"elasticsearch.request.indices" indexName "elasticsearch.request.indices" indexName

4
dd-java-agent/instrumentation/elasticsearch-transport-5/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5TransportClientInstrumentation.java
View File

@ -10,6 +10,7 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
import com.google.auto.service.AutoService; import com.google.auto.service.AutoService;
import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.Instrumenter;
import datadog.trace.api.DDSpanTypes;
import datadog.trace.api.DDTags; import datadog.trace.api.DDTags;
import io.opentracing.Scope; import io.opentracing.Scope;
import io.opentracing.Span; import io.opentracing.Span;
@ -63,7 +64,7 @@ public class Elasticsearch5TransportClientInstrumentation extends Instrumenter.D
@Override @Override
public Map<ElementMatcher, String> transformers() { public Map<ElementMatcher, String> transformers() {
Map<ElementMatcher, String> transformers = new HashMap<>(); final Map<ElementMatcher, String> transformers = new HashMap<>();
transformers.put( transformers.put(
isMethod() isMethod()
.and(named("execute")) .and(named("execute"))
@ -88,6 +89,7 @@ public class Elasticsearch5TransportClientInstrumentation extends Instrumenter.D
.buildSpan("elasticsearch.query") .buildSpan("elasticsearch.query")
.withTag(DDTags.SERVICE_NAME, "elasticsearch") .withTag(DDTags.SERVICE_NAME, "elasticsearch")
.withTag(DDTags.RESOURCE_NAME, action.getClass().getSimpleName()) .withTag(DDTags.RESOURCE_NAME, action.getClass().getSimpleName())
.withTag(DDTags.SPAN_TYPE, DDSpanTypes.ELASTICSEARCH)
.withTag(Tags.COMPONENT.getKey(), "elasticsearch-java") .withTag(Tags.COMPONENT.getKey(), "elasticsearch-java")
.withTag(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_CLIENT) .withTag(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_CLIENT)
.withTag("elasticsearch.action", action.getClass().getSimpleName()) .withTag("elasticsearch.action", action.getClass().getSimpleName())

27
dd-java-agent/instrumentation/elasticsearch-transport-5/src/test/groovy/Elasticsearch5NodeClientTest.groovy
View File

@ -1,5 +1,7 @@
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.agent.test.TestUtils import datadog.trace.agent.test.TestUtils
import datadog.trace.api.DDSpanTypes
import datadog.trace.api.DDTags
import io.opentracing.tag.Tags import io.opentracing.tag.Tags
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest
import org.elasticsearch.common.io.FileSystemUtils import org.elasticsearch.common.io.FileSystemUtils
@ -80,11 +82,11 @@ class Elasticsearch5NodeClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "ClusterHealthAction" resourceName "ClusterHealthAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
parent()
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"elasticsearch.action" "ClusterHealthAction" "elasticsearch.action" "ClusterHealthAction"
"elasticsearch.request" "ClusterHealthRequest" "elasticsearch.request" "ClusterHealthRequest"
defaultTags() defaultTags()
@ -108,11 +110,12 @@ class Elasticsearch5NodeClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "GetAction" resourceName "GetAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
errored true errored true
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"elasticsearch.action" "GetAction" "elasticsearch.action" "GetAction"
"elasticsearch.request" "GetRequest" "elasticsearch.request" "GetRequest"
"elasticsearch.request.indices" indexName "elasticsearch.request.indices" indexName
@ -174,10 +177,11 @@ class Elasticsearch5NodeClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "CreateIndexAction" resourceName "CreateIndexAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"elasticsearch.action" "CreateIndexAction" "elasticsearch.action" "CreateIndexAction"
"elasticsearch.request" "CreateIndexRequest" "elasticsearch.request" "CreateIndexRequest"
"elasticsearch.request.indices" indexName "elasticsearch.request.indices" indexName
@ -190,10 +194,11 @@ class Elasticsearch5NodeClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "ClusterHealthAction" resourceName "ClusterHealthAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"elasticsearch.action" "ClusterHealthAction" "elasticsearch.action" "ClusterHealthAction"
"elasticsearch.request" "ClusterHealthRequest" "elasticsearch.request" "ClusterHealthRequest"
defaultTags() defaultTags()
@ -205,10 +210,11 @@ class Elasticsearch5NodeClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "GetAction" resourceName "GetAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"elasticsearch.action" "GetAction" "elasticsearch.action" "GetAction"
"elasticsearch.request" "GetRequest" "elasticsearch.request" "GetRequest"
"elasticsearch.request.indices" indexName "elasticsearch.request.indices" indexName
@ -224,10 +230,11 @@ class Elasticsearch5NodeClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "PutMappingAction" resourceName "PutMappingAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"elasticsearch.action" "PutMappingAction" "elasticsearch.action" "PutMappingAction"
"elasticsearch.request" "PutMappingRequest" "elasticsearch.request" "PutMappingRequest"
defaultTags() defaultTags()
@ -239,10 +246,11 @@ class Elasticsearch5NodeClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "IndexAction" resourceName "IndexAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"elasticsearch.action" "IndexAction" "elasticsearch.action" "IndexAction"
"elasticsearch.request" "IndexRequest" "elasticsearch.request" "IndexRequest"
"elasticsearch.request.indices" indexName "elasticsearch.request.indices" indexName
@ -261,10 +269,11 @@ class Elasticsearch5NodeClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "GetAction" resourceName "GetAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"elasticsearch.action" "GetAction" "elasticsearch.action" "GetAction"
"elasticsearch.request" "GetRequest" "elasticsearch.request" "GetRequest"
"elasticsearch.request.indices" indexName "elasticsearch.request.indices" indexName

24
dd-java-agent/instrumentation/elasticsearch-transport-5/src/test/groovy/Elasticsearch5TransportClientTest.groovy
View File

@ -1,5 +1,7 @@
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.agent.test.TestUtils import datadog.trace.agent.test.TestUtils
import datadog.trace.api.DDSpanTypes
import datadog.trace.api.DDTags
import io.opentracing.tag.Tags import io.opentracing.tag.Tags
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest
import org.elasticsearch.client.transport.TransportClient import org.elasticsearch.client.transport.TransportClient
@ -92,11 +94,11 @@ class Elasticsearch5TransportClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "ClusterHealthAction" resourceName "ClusterHealthAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
parent()
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"$Tags.PEER_HOSTNAME.key" "127.0.0.1" "$Tags.PEER_HOSTNAME.key" "127.0.0.1"
"$Tags.PEER_HOST_IPV4.key" "127.0.0.1" "$Tags.PEER_HOST_IPV4.key" "127.0.0.1"
"$Tags.PEER_PORT.key" tcpPort "$Tags.PEER_PORT.key" tcpPort
@ -123,11 +125,12 @@ class Elasticsearch5TransportClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "GetAction" resourceName "GetAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
errored true errored true
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"elasticsearch.action" "GetAction" "elasticsearch.action" "GetAction"
"elasticsearch.request" "GetRequest" "elasticsearch.request" "GetRequest"
"elasticsearch.request.indices" indexName "elasticsearch.request.indices" indexName
@ -188,10 +191,11 @@ class Elasticsearch5TransportClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "CreateIndexAction" resourceName "CreateIndexAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"elasticsearch.action" "CreateIndexAction" "elasticsearch.action" "CreateIndexAction"
"elasticsearch.request" "CreateIndexRequest" "elasticsearch.request" "CreateIndexRequest"
"elasticsearch.request.indices" indexName "elasticsearch.request.indices" indexName
@ -207,10 +211,11 @@ class Elasticsearch5TransportClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "GetAction" resourceName "GetAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"$Tags.PEER_HOSTNAME.key" "127.0.0.1" "$Tags.PEER_HOSTNAME.key" "127.0.0.1"
"$Tags.PEER_HOST_IPV4.key" "127.0.0.1" "$Tags.PEER_HOST_IPV4.key" "127.0.0.1"
"$Tags.PEER_PORT.key" tcpPort "$Tags.PEER_PORT.key" tcpPort
@ -229,10 +234,11 @@ class Elasticsearch5TransportClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "PutMappingAction" resourceName "PutMappingAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"elasticsearch.action" "PutMappingAction" "elasticsearch.action" "PutMappingAction"
"elasticsearch.request" "PutMappingRequest" "elasticsearch.request" "PutMappingRequest"
defaultTags() defaultTags()
@ -244,10 +250,11 @@ class Elasticsearch5TransportClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "IndexAction" resourceName "IndexAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"$Tags.PEER_HOSTNAME.key" "127.0.0.1" "$Tags.PEER_HOSTNAME.key" "127.0.0.1"
"$Tags.PEER_HOST_IPV4.key" "127.0.0.1" "$Tags.PEER_HOST_IPV4.key" "127.0.0.1"
"$Tags.PEER_PORT.key" tcpPort "$Tags.PEER_PORT.key" tcpPort
@ -269,10 +276,11 @@ class Elasticsearch5TransportClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "GetAction" resourceName "GetAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"$Tags.PEER_HOSTNAME.key" "127.0.0.1" "$Tags.PEER_HOSTNAME.key" "127.0.0.1"
"$Tags.PEER_HOST_IPV4.key" "127.0.0.1" "$Tags.PEER_HOST_IPV4.key" "127.0.0.1"
"$Tags.PEER_PORT.key" tcpPort "$Tags.PEER_PORT.key" tcpPort

4
dd-java-agent/instrumentation/elasticsearch-transport-6/src/main/java/datadog/trace/instrumentation/elasticsearch6/Elasticsearch6TransportClientInstrumentation.java
View File

@ -10,6 +10,7 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
import com.google.auto.service.AutoService; import com.google.auto.service.AutoService;
import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.Instrumenter;
import datadog.trace.api.DDSpanTypes;
import datadog.trace.api.DDTags; import datadog.trace.api.DDTags;
import io.opentracing.Scope; import io.opentracing.Scope;
import io.opentracing.Span; import io.opentracing.Span;
@ -67,7 +68,7 @@ public class Elasticsearch6TransportClientInstrumentation extends Instrumenter.D
@Override @Override
public Map<ElementMatcher, String> transformers() { public Map<ElementMatcher, String> transformers() {
Map<ElementMatcher, String> transformers = new HashMap<>(); final Map<ElementMatcher, String> transformers = new HashMap<>();
transformers.put( transformers.put(
isMethod() isMethod()
.and(named("execute")) .and(named("execute"))
@ -92,6 +93,7 @@ public class Elasticsearch6TransportClientInstrumentation extends Instrumenter.D
.buildSpan("elasticsearch.query") .buildSpan("elasticsearch.query")
.withTag(DDTags.SERVICE_NAME, "elasticsearch") .withTag(DDTags.SERVICE_NAME, "elasticsearch")
.withTag(DDTags.RESOURCE_NAME, action.getClass().getSimpleName()) .withTag(DDTags.RESOURCE_NAME, action.getClass().getSimpleName())
.withTag(DDTags.SPAN_TYPE, DDSpanTypes.ELASTICSEARCH)
.withTag(Tags.COMPONENT.getKey(), "elasticsearch-java") .withTag(Tags.COMPONENT.getKey(), "elasticsearch-java")
.withTag(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_CLIENT) .withTag(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_CLIENT)
.withTag("elasticsearch.action", action.getClass().getSimpleName()) .withTag("elasticsearch.action", action.getClass().getSimpleName())

23
dd-java-agent/instrumentation/elasticsearch-transport-6/src/test/groovy/Elasticsearch6NodeClientTest.groovy
View File

@ -1,5 +1,7 @@
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.agent.test.TestUtils import datadog.trace.agent.test.TestUtils
import datadog.trace.api.DDSpanTypes
import datadog.trace.api.DDTags
import io.opentracing.tag.Tags import io.opentracing.tag.Tags
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest
import org.elasticsearch.common.io.FileSystemUtils import org.elasticsearch.common.io.FileSystemUtils
@ -77,10 +79,11 @@ class Elasticsearch6NodeClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "ClusterHealthAction" resourceName "ClusterHealthAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"elasticsearch.action" "ClusterHealthAction" "elasticsearch.action" "ClusterHealthAction"
"elasticsearch.request" "ClusterHealthRequest" "elasticsearch.request" "ClusterHealthRequest"
defaultTags() defaultTags()
@ -104,11 +107,12 @@ class Elasticsearch6NodeClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "GetAction" resourceName "GetAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
errored true errored true
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"elasticsearch.action" "GetAction" "elasticsearch.action" "GetAction"
"elasticsearch.request" "GetRequest" "elasticsearch.request" "GetRequest"
"elasticsearch.request.indices" indexName "elasticsearch.request.indices" indexName
@ -169,10 +173,11 @@ class Elasticsearch6NodeClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "CreateIndexAction" resourceName "CreateIndexAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"elasticsearch.action" "CreateIndexAction" "elasticsearch.action" "CreateIndexAction"
"elasticsearch.request" "CreateIndexRequest" "elasticsearch.request" "CreateIndexRequest"
"elasticsearch.request.indices" indexName "elasticsearch.request.indices" indexName
@ -185,10 +190,11 @@ class Elasticsearch6NodeClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "GetAction" resourceName "GetAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"elasticsearch.action" "GetAction" "elasticsearch.action" "GetAction"
"elasticsearch.request" "GetRequest" "elasticsearch.request" "GetRequest"
"elasticsearch.request.indices" indexName "elasticsearch.request.indices" indexName
@ -204,10 +210,11 @@ class Elasticsearch6NodeClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "PutMappingAction" resourceName "PutMappingAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"elasticsearch.action" "PutMappingAction" "elasticsearch.action" "PutMappingAction"
"elasticsearch.request" "PutMappingRequest" "elasticsearch.request" "PutMappingRequest"
defaultTags() defaultTags()
@ -219,10 +226,11 @@ class Elasticsearch6NodeClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "IndexAction" resourceName "IndexAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"elasticsearch.action" "IndexAction" "elasticsearch.action" "IndexAction"
"elasticsearch.request" "IndexRequest" "elasticsearch.request" "IndexRequest"
"elasticsearch.request.indices" indexName "elasticsearch.request.indices" indexName
@ -242,10 +250,11 @@ class Elasticsearch6NodeClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "GetAction" resourceName "GetAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"elasticsearch.action" "GetAction" "elasticsearch.action" "GetAction"
"elasticsearch.request" "GetRequest" "elasticsearch.request" "GetRequest"
"elasticsearch.request.indices" indexName "elasticsearch.request.indices" indexName

23
dd-java-agent/instrumentation/elasticsearch-transport-6/src/test/groovy/Elasticsearch6TransportClientTest.groovy
View File

@ -1,5 +1,7 @@
import datadog.trace.agent.test.AgentTestRunner import datadog.trace.agent.test.AgentTestRunner
import datadog.trace.agent.test.TestUtils import datadog.trace.agent.test.TestUtils
import datadog.trace.api.DDSpanTypes
import datadog.trace.api.DDTags
import io.opentracing.tag.Tags import io.opentracing.tag.Tags
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest
import org.elasticsearch.client.transport.TransportClient import org.elasticsearch.client.transport.TransportClient
@ -89,10 +91,11 @@ class Elasticsearch6TransportClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "ClusterHealthAction" resourceName "ClusterHealthAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"$Tags.PEER_HOSTNAME.key" "localhost" "$Tags.PEER_HOSTNAME.key" "localhost"
"$Tags.PEER_HOST_IPV4.key" "127.0.0.1" "$Tags.PEER_HOST_IPV4.key" "127.0.0.1"
"$Tags.PEER_PORT.key" tcpPort "$Tags.PEER_PORT.key" tcpPort
@ -119,11 +122,12 @@ class Elasticsearch6TransportClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "GetAction" resourceName "GetAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
errored true errored true
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"elasticsearch.action" "GetAction" "elasticsearch.action" "GetAction"
"elasticsearch.request" "GetRequest" "elasticsearch.request" "GetRequest"
"elasticsearch.request.indices" indexName "elasticsearch.request.indices" indexName
@ -184,10 +188,11 @@ class Elasticsearch6TransportClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "CreateIndexAction" resourceName "CreateIndexAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"$Tags.PEER_HOSTNAME.key" "localhost" "$Tags.PEER_HOSTNAME.key" "localhost"
"$Tags.PEER_HOST_IPV4.key" "127.0.0.1" "$Tags.PEER_HOST_IPV4.key" "127.0.0.1"
"$Tags.PEER_PORT.key" tcpPort "$Tags.PEER_PORT.key" tcpPort
@ -203,10 +208,11 @@ class Elasticsearch6TransportClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "GetAction" resourceName "GetAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"$Tags.PEER_HOSTNAME.key" "localhost" "$Tags.PEER_HOSTNAME.key" "localhost"
"$Tags.PEER_HOST_IPV4.key" "127.0.0.1" "$Tags.PEER_HOST_IPV4.key" "127.0.0.1"
"$Tags.PEER_PORT.key" tcpPort "$Tags.PEER_PORT.key" tcpPort
@ -225,10 +231,11 @@ class Elasticsearch6TransportClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "PutMappingAction" resourceName "PutMappingAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"elasticsearch.action" "PutMappingAction" "elasticsearch.action" "PutMappingAction"
"elasticsearch.request" "PutMappingRequest" "elasticsearch.request" "PutMappingRequest"
defaultTags() defaultTags()
@ -240,10 +247,11 @@ class Elasticsearch6TransportClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "IndexAction" resourceName "IndexAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"$Tags.PEER_HOSTNAME.key" "localhost" "$Tags.PEER_HOSTNAME.key" "localhost"
"$Tags.PEER_HOST_IPV4.key" "127.0.0.1" "$Tags.PEER_HOST_IPV4.key" "127.0.0.1"
"$Tags.PEER_PORT.key" tcpPort "$Tags.PEER_PORT.key" tcpPort
@ -266,10 +274,11 @@ class Elasticsearch6TransportClientTest extends AgentTestRunner {
serviceName "elasticsearch" serviceName "elasticsearch"
resourceName "GetAction" resourceName "GetAction"
operationName "elasticsearch.query" operationName "elasticsearch.query"
spanType null spanType DDSpanTypes.ELASTICSEARCH
tags { tags {
"$Tags.COMPONENT.key" "elasticsearch-java" "$Tags.COMPONENT.key" "elasticsearch-java"
"$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT "$Tags.SPAN_KIND.key" Tags.SPAN_KIND_CLIENT
"$DDTags.SPAN_TYPE" DDSpanTypes.ELASTICSEARCH
"$Tags.PEER_HOSTNAME.key" "localhost" "$Tags.PEER_HOSTNAME.key" "localhost"
"$Tags.PEER_HOST_IPV4.key" "127.0.0.1" "$Tags.PEER_HOST_IPV4.key" "127.0.0.1"
"$Tags.PEER_PORT.key" tcpPort "$Tags.PEER_PORT.key" tcpPort