From b1e2c3ced6be3d49f3d2e35b54774060923686ba Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Tue, 14 Dec 2021 11:24:42 +0200 Subject: [PATCH] Limit elasticsearch memory usage (#4892) --- .../javaagent/src/test/groovy/ElasticsearchRest5Test.groovy | 2 ++ .../javaagent/src/test/groovy/ElasticsearchRest6Test.groovy | 2 ++ .../javaagent/src/test/groovy/ElasticsearchRest7Test.groovy | 2 ++ 3 files changed, 6 insertions(+) diff --git a/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/groovy/ElasticsearchRest5Test.groovy b/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/groovy/ElasticsearchRest5Test.groovy index e3af7a4b09..c73f8c9e47 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/groovy/ElasticsearchRest5Test.groovy +++ b/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/groovy/ElasticsearchRest5Test.groovy @@ -39,6 +39,8 @@ class ElasticsearchRest5Test extends AgentInstrumentationSpecification { } else { elasticsearch = new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch-oss:6.8.16") } + // limit memory usage + elasticsearch.withEnv("ES_JAVA_OPTS", "-Xmx256m -Xms256m") elasticsearch.start() httpHost = HttpHost.create(elasticsearch.getHttpHostAddress()) diff --git a/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/groovy/ElasticsearchRest6Test.groovy b/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/groovy/ElasticsearchRest6Test.groovy index 9853076ff8..94c6ebbb1b 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/groovy/ElasticsearchRest6Test.groovy +++ b/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/groovy/ElasticsearchRest6Test.groovy @@ -33,6 +33,8 @@ class ElasticsearchRest6Test extends AgentInstrumentationSpecification { def setupSpec() { elasticsearch = new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch-oss:6.8.16") + // limit memory usage + elasticsearch.withEnv("ES_JAVA_OPTS", "-Xmx256m -Xms256m") elasticsearch.start() httpHost = HttpHost.create(elasticsearch.getHttpHostAddress()) diff --git a/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/groovy/ElasticsearchRest7Test.groovy b/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/groovy/ElasticsearchRest7Test.groovy index 7e1351f79a..e5aaa8ee43 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/groovy/ElasticsearchRest7Test.groovy +++ b/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/groovy/ElasticsearchRest7Test.groovy @@ -34,6 +34,8 @@ class ElasticsearchRest7Test extends AgentInstrumentationSpecification { def setupSpec() { elasticsearch = new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2") + // limit memory usage + elasticsearch.withEnv("ES_JAVA_OPTS", "-Xmx256m -Xms256m") elasticsearch.start() httpHost = HttpHost.create(elasticsearch.getHttpHostAddress())