From f94f76488f7beb97d40e797246c9824c55df3484 Mon Sep 17 00:00:00 2001 From: Giuseppe Cafarelli Date: Thu, 13 Feb 2020 14:34:21 +0100 Subject: [PATCH] Add test for elasticsearch 2 TransportActionListener --- .../Elasticsearch2TransportClientTest.groovy | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) 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 fa661385a6..68e415e212 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 @@ -4,6 +4,7 @@ import datadog.trace.agent.test.utils.PortUtils import datadog.trace.api.DDSpanTypes import datadog.trace.bootstrap.instrumentation.api.Tags import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest +import org.elasticsearch.action.admin.cluster.stats.ClusterStatsRequest import org.elasticsearch.client.transport.TransportClient import org.elasticsearch.common.io.FileSystemUtils import org.elasticsearch.common.settings.Settings @@ -104,6 +105,41 @@ class Elasticsearch2TransportClientTest extends AgentTestRunner { } } + def "test elasticsearch stats"() { + setup: + def result = client.admin().cluster().clusterStats(new ClusterStatsRequest(new String[0])) + + def status = result.get().status + def failures = result.get().failures() + + expect: + status.name() == "GREEN" + failures == null + + assertTraces(1) { + trace(0, 1) { + span(0) { + serviceName "elasticsearch" + resourceName "ClusterStatsAction" + operationName "elasticsearch.query" + spanType DDSpanTypes.ELASTICSEARCH + tags { + "$Tags.COMPONENT" "elasticsearch-java" + "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT + "$Tags.PEER_HOSTNAME" "127.0.0.1" + "$Tags.PEER_HOST_IPV4" "127.0.0.1" + "$Tags.PEER_PORT" tcpPort + "$Tags.DB_TYPE" "elasticsearch" + "elasticsearch.action" "ClusterStatsAction" + "elasticsearch.request" "ClusterStatsRequest" + "elasticsearch.node.cluster.name" "test-cluster" + defaultTags() + } + } + } + } + } + def "test elasticsearch error"() { when: client.prepareGet(indexName, indexType, id).get()