From fa71cf9c8ab8d1ae89d9e513b81f2cb038b8c92e Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Sun, 22 Aug 2021 19:27:16 -0700 Subject: [PATCH] Fix sporadically failing smoke test (#3895) * Fix failing smoke test * Revert "Fix failing smoke test" This reverts commit 0356ae308b11d9a5c154e18a808f0089f63355b1. * Apply Xmx --- .../smoketest/AbstractTestContainerManager.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/smoke-tests/src/test/java/io/opentelemetry/smoketest/AbstractTestContainerManager.java b/smoke-tests/src/test/java/io/opentelemetry/smoketest/AbstractTestContainerManager.java index 72d767236e..7f997108fd 100644 --- a/smoke-tests/src/test/java/io/opentelemetry/smoketest/AbstractTestContainerManager.java +++ b/smoke-tests/src/test/java/io/opentelemetry/smoketest/AbstractTestContainerManager.java @@ -21,7 +21,10 @@ public abstract class AbstractTestContainerManager implements TestContainerManag protected Map getAgentEnvironment(String jvmArgsEnvVarName) { Map environment = new HashMap<>(); - environment.put(jvmArgsEnvVarName, "-javaagent:/" + TARGET_AGENT_FILENAME); + // while modern JVMs understand linux container memory limits, they do not understand windows + // container memory limits yet, so we need to explicitly set max heap in order to prevent the + // JVM from taking too much memory and hitting the windows container memory limit + environment.put(jvmArgsEnvVarName, "-Xmx1g -javaagent:/" + TARGET_AGENT_FILENAME); environment.put("OTEL_BSP_MAX_EXPORT_BATCH_SIZE", "1"); environment.put("OTEL_BSP_SCHEDULE_DELAY", "10ms"); environment.put("OTEL_IMR_EXPORT_INTERVAL", "1000");