From 1263e47ec2031761f9bd210a4f90f3fa44dc3aea Mon Sep 17 00:00:00 2001 From: Mateusz Rzeszutek Date: Wed, 7 Jun 2023 16:58:44 +0200 Subject: [PATCH] Fix JMS tests by disabling ActiveMQ Artemis persistence (2nd try) (#8667) --- .../instrumentation/jms/v3_0/Jms3InstrumentationTest.java | 2 +- .../instrumentation/spring/jms/v6_0/SpringJmsListenerTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/instrumentation/jms/jms-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/Jms3InstrumentationTest.java b/instrumentation/jms/jms-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/Jms3InstrumentationTest.java index 6ecb08a23e..c7f0bb0c7c 100644 --- a/instrumentation/jms/jms-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/Jms3InstrumentationTest.java +++ b/instrumentation/jms/jms-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jms/v3_0/Jms3InstrumentationTest.java @@ -71,7 +71,7 @@ class Jms3InstrumentationTest { new GenericContainer<>("quay.io/artemiscloud/activemq-artemis-broker:artemis.2.27.0") .withEnv("AMQ_USER", "test") .withEnv("AMQ_PASSWORD", "test") - .withEnv("AMQ_EXTRA_ARGS", "--disable-persistence") + .withEnv("JAVA_TOOL_OPTIONS", "-Dbrokerconfig.maxDiskUsage=-1") .withExposedPorts(61616, 8161) .waitingFor(Wait.forLogMessage(".*Server is now live.*", 1)) .withStartupTimeout(Duration.ofMinutes(2)) diff --git a/instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v6_0/SpringJmsListenerTest.java b/instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v6_0/SpringJmsListenerTest.java index 868d4559be..12f48ab13d 100644 --- a/instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v6_0/SpringJmsListenerTest.java +++ b/instrumentation/spring/spring-jms/spring-jms-6.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/jms/v6_0/SpringJmsListenerTest.java @@ -64,7 +64,7 @@ class SpringJmsListenerTest { new GenericContainer<>("quay.io/artemiscloud/activemq-artemis-broker:artemis.2.27.0") .withEnv("AMQ_USER", "test") .withEnv("AMQ_PASSWORD", "test") - .withEnv("AMQ_EXTRA_ARGS", "--disable-persistence") + .withEnv("JAVA_TOOL_OPTIONS", "-Dbrokerconfig.maxDiskUsage=-1") .withExposedPorts(61616, 8161) .waitingFor(Wait.forLogMessage(".*Server is now live.*", 1)) .withStartupTimeout(Duration.ofMinutes(2))