From 35b980ea89b00d4bc645975e35cb167566718f07 Mon Sep 17 00:00:00 2001 From: Nikolay Martynov Date: Tue, 17 Jul 2018 18:02:16 -0400 Subject: [PATCH] Fix ElasticSearch config for 2.x client --- .../src/test/groovy/Elasticsearch2NodeClientTest.groovy | 2 +- .../src/test/groovy/Elasticsearch2SpringTemplateTest.groovy | 2 +- .../src/test/groovy/Elasticsearch2TransportClientTest.groovy | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 fb2b1406fb..27db9d3b18 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 @@ -38,7 +38,7 @@ class Elasticsearch2NodeClientTest extends AgentTestRunner { def settings = Settings.builder() .put("path.home", esWorkingDir.path) // Since we use listeners to close spans this should make our span closing deterministic which is good for tests - .put("thread_pool.listener.size", 1) + .put("threadpool.listener.size", 1) .put("http.port", httpPort) .put("transport.tcp.port", tcpPort) .build() 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 bcec92ef99..050ab11305 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 @@ -49,7 +49,7 @@ class Elasticsearch2SpringTemplateTest extends AgentTestRunner { def settings = Settings.builder() .put("path.home", esWorkingDir.path) // Since we use listeners to close spans this should make our span closing deterministic which is good for tests - .put("thread_pool.listener.size", 1) + .put("threadpool.listener.size", 1) .put("http.port", httpPort) .put("transport.tcp.port", tcpPort) .build() 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 7b3d17fa99..c27c3a0840 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 @@ -50,7 +50,7 @@ class Elasticsearch2TransportClientTest extends AgentTestRunner { client = TransportClient.builder().settings( Settings.builder() // Since we use listeners to close spans this should make our span closing deterministic which is good for tests - .put("thread_pool.listener.size", 1) + .put("threadpool.listener.size", 1) .put("cluster.name", "test-cluster") .build() ).build()