diff --git a/.circleci/config.yml b/.circleci/config.yml index 4831b98075..17f5183cbb 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -29,7 +29,7 @@ jobs: - run: name: Build Project - command: GRADLE_OPTS="-Dorg.gradle.jvmargs=-Xmx2G -Xms512M" ./gradlew clean :dd-java-agent:shadowJar compileTestGroovy compileTestScala compileTestJava check -x test -x traceAgentTest --build-cache --parallel --stacktrace --no-daemon --max-workers=6 + command: GRADLE_OPTS="-Dorg.gradle.jvmargs=-Xmx2G -Xms512M" ./gradlew clean :dd-java-agent:shadowJar compileTestGroovy compileTestScala compileTestJava check -x test -x traceAgentTest --build-cache --parallel --stacktrace --no-daemon --max-workers=4 - run: name: Collect Libs 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 2c47ea3cb3..0caf378397 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 @@ -34,6 +34,8 @@ 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("http.port", HTTP_PORT) .put("transport.tcp.port", TCP_PORT) .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 b8326bd0b5..013b15d4b9 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 @@ -45,6 +45,8 @@ 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("http.port", HTTP_PORT) .put("transport.tcp.port", TCP_PORT) .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 60b95d9c1d..6efc693997 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 @@ -46,6 +46,8 @@ 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("cluster.name", "test-cluster") .build() ).build() 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 ee2062b867..7f61c662b8 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 @@ -37,6 +37,8 @@ class Elasticsearch5NodeClientTest 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("http.port", HTTP_PORT) .put("transport.tcp.port", TCP_PORT) .put("transport.type", "netty3") 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 9fd5084e0d..68f64e51c5 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 @@ -53,6 +53,8 @@ class Elasticsearch5TransportClientTest extends AgentTestRunner { client = new PreBuiltTransportClient( 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(CLUSTER_NAME_SETTING.getKey(), "test-cluster") .build() ) 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 4fa588a492..b2d96f4680 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 @@ -36,6 +36,8 @@ class Elasticsearch6NodeClientTest 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("http.port", HTTP_PORT) .put("transport.tcp.port", TCP_PORT) .put(CLUSTER_NAME_SETTING.getKey(), "test-cluster") 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 fc7fe80bc8..c0e595b6bb 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 @@ -50,6 +50,8 @@ class Elasticsearch6TransportClientTest extends AgentTestRunner { client = new PreBuiltTransportClient( 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(CLUSTER_NAME_SETTING.getKey(), "test-cluster") .build() )