diff --git a/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java b/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java index 284c41a820e6..686b55101a40 100644 --- a/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java +++ b/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/apiclient/ElasticsearchClientTest.java @@ -40,10 +40,15 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.testcontainers.containers.output.Slf4jLogConsumer; import org.testcontainers.elasticsearch.ElasticsearchContainer; @SuppressWarnings("deprecation") // using deprecated semconv class ElasticsearchClientTest { + private static final Logger logger = LoggerFactory.getLogger(ElasticsearchClientTest.class); + @RegisterExtension static final InstrumentationExtension testing = AgentInstrumentationExtension.create(); @@ -57,9 +62,10 @@ class ElasticsearchClientTest { @BeforeAll static void setUp() { elasticsearch = - new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch:7.17.2"); + new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch:7.17.28"); // limit memory usage elasticsearch.withEnv("ES_JAVA_OPTS", "-Xmx256m -Xms256m"); + elasticsearch.withLogConsumer(new Slf4jLogConsumer(logger)); elasticsearch.start(); httpHost = HttpHost.create(elasticsearch.getHttpHostAddress()); @@ -87,7 +93,7 @@ static void cleanUp() { @Test void elasticsearchStatus() throws IOException { InfoResponse response = client.info(); - assertThat(response.version().number()).isEqualTo("7.17.2"); + assertThat(response.version().number()).isEqualTo("7.17.28"); testing.waitAndAssertTraces( trace -> @@ -188,7 +194,7 @@ void elasticsearchStatusAsync() throws Exception { //noinspection ResultOfMethodCallIgnored countDownLatch.await(10, TimeUnit.SECONDS); - assertThat(request.getResponse().version().number()).isEqualTo("7.17.2"); + assertThat(request.getResponse().version().number()).isEqualTo("7.17.28"); testing.waitAndAssertTraces( trace -> diff --git a/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/ElasticsearchRest5Test.java b/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/ElasticsearchRest5Test.java index 9617787c383b..aee8594e8f2d 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/ElasticsearchRest5Test.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v5_0/ElasticsearchRest5Test.java @@ -61,7 +61,9 @@ static void setup() { new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch-oss:6.8.16"); } // limit memory usage - elasticsearch.withEnv("ES_JAVA_OPTS", "-Xmx256m -Xms256m"); + elasticsearch.withEnv( + "ES_JAVA_OPTS", + "-Xmx256m -Xms256m -Dlog4j2.disableJmx=true -Dlog4j2.disable.jmx=true -XX:-UseContainerSupport"); elasticsearch.start(); httpHost = HttpHost.create(elasticsearch.getHttpHostAddress()); diff --git a/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/ElasticsearchRest6Test.java b/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/ElasticsearchRest6Test.java index 35ba08f6d115..4acf889233a2 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/ElasticsearchRest6Test.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v6_4/ElasticsearchRest6Test.java @@ -52,7 +52,9 @@ static void setUp() { elasticsearch = new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch-oss:6.8.16"); // limit memory usage - elasticsearch.withEnv("ES_JAVA_OPTS", "-Xmx256m -Xms256m"); + elasticsearch.withEnv( + "ES_JAVA_OPTS", + "-Xmx256m -Xms256m -Dlog4j2.disableJmx=true -Dlog4j2.disable.jmx=true -XX:-UseContainerSupport"); elasticsearch.start(); httpHost = HttpHost.create(elasticsearch.getHttpHostAddress()); diff --git a/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java b/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java index 8b0c091655df..c4747bf7568a 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java @@ -55,7 +55,9 @@ static void setUp() { elasticsearch = new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2"); // limit memory usage - elasticsearch.withEnv("ES_JAVA_OPTS", "-Xmx256m -Xms256m"); + elasticsearch.withEnv( + "ES_JAVA_OPTS", + "-Xmx256m -Xms256m -Dlog4j2.disableJmx=true -Dlog4j2.disable.jmx=true -XX:-UseContainerSupport"); elasticsearch.start(); httpHost = HttpHost.create(elasticsearch.getHttpHostAddress()); diff --git a/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/test/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java b/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/test/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java index 0df2dd405521..1011fc02a5e3 100644 --- a/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/test/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java +++ b/instrumentation/elasticsearch/elasticsearch-rest-7.0/library/src/test/java/io/opentelemetry/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7Test.java @@ -51,7 +51,9 @@ static void setUp() { elasticsearch = new ElasticsearchContainer("docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2"); // limit memory usage - elasticsearch.withEnv("ES_JAVA_OPTS", "-Xmx256m -Xms256m"); + elasticsearch.withEnv( + "ES_JAVA_OPTS", + "-Xmx256m -Xms256m -Dlog4j2.disableJmx=true -Dlog4j2.disable.jmx=true -XX:-UseContainerSupport"); elasticsearch.start(); httpHost = HttpHost.create(elasticsearch.getHttpHostAddress()); diff --git a/instrumentation/opensearch/opensearch-java-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/opensearch/v3_0/AbstractOpenSearchTest.java b/instrumentation/opensearch/opensearch-java-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/opensearch/v3_0/AbstractOpenSearchTest.java index 3a98f1646458..2dd524e1ac96 100644 --- a/instrumentation/opensearch/opensearch-java-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/opensearch/v3_0/AbstractOpenSearchTest.java +++ b/instrumentation/opensearch/opensearch-java-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/opensearch/v3_0/AbstractOpenSearchTest.java @@ -64,7 +64,10 @@ void setUp() throws Exception { opensearch = new OpensearchContainer(DockerImageName.parse("opensearchproject/opensearch:1.3.6")) .withSecurityEnabled(); - opensearch.withEnv("OPENSEARCH_JAVA_OPTS", "-Xmx256m -Xms256m"); + // limit memory usage and disable Log4j JMX to avoid cgroup detection issues in containers + opensearch.withEnv( + "OPENSEARCH_JAVA_OPTS", + "-Xmx256m -Xms256m -Dlog4j2.disableJmx=true -Dlog4j2.disable.jmx=true -XX:-UseContainerSupport"); opensearch.start(); httpHost = URI.create(opensearch.getHttpHostAddress()); openSearchClient = buildOpenSearchClient(); diff --git a/instrumentation/opensearch/opensearch-rest-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/AbstractOpenSearchRestTest.java b/instrumentation/opensearch/opensearch-rest-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/AbstractOpenSearchRestTest.java index 4c51f14290a3..e86b67342630 100644 --- a/instrumentation/opensearch/opensearch-rest-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/AbstractOpenSearchRestTest.java +++ b/instrumentation/opensearch/opensearch-rest-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/opensearch/rest/AbstractOpenSearchRestTest.java @@ -59,8 +59,10 @@ void setUp() throws Exception { opensearch = new OpensearchContainer(DockerImageName.parse("opensearchproject/opensearch:1.3.6")) .withSecurityEnabled(); - // limit memory usage - opensearch.withEnv("OPENSEARCH_JAVA_OPTS", "-Xmx256m -Xms256m"); + // limit memory usage and disable Log4j JMX to avoid cgroup detection issues in containers + opensearch.withEnv( + "OPENSEARCH_JAVA_OPTS", + "-Xmx256m -Xms256m -Dlog4j2.disableJmx=true -Dlog4j2.disable.jmx=true -XX:-UseContainerSupport"); opensearch.start(); httpHost = URI.create(opensearch.getHttpHostAddress());