empty

.circleci/config.yml

@@ -4,10 +4,12 @@ lint_steps: &lint_steps
     - checkout
     - run: ./mvnw verify -B -Dhttps.protocols=TLSv1.2 -DskipTests
 build_steps: &build_steps
+  environment:
+    DEBUG: testcontainers*
   steps:
     - checkout
     - setup_remote_docker
-    - run: ./mvnw test -B -Dhttps.protocols=TLSv1.2 -Dcheckstyle.skip=true -Dtests.log_level=info -Djdk.attach.allowAttachSelf=true
+    - run: echo $DEBUG && ./mvnw -X test -B -Dhttps.protocols=TLSv1.2 -Dcheckstyle.skip=true -Dtests.log_level=debug -Djdk.attach.allowAttachSelf=true -Dtest=TestReconnectContainer
     - run:
         when: on_fail
         command: for log in target/surefire-reports/*.txt; do  echo "$log ========================" ; cat $log ; done
@@ -42,9 +44,4 @@ workflows:
   version: 2
   workflow:
     jobs:
-      - lint_openjdk8
-      - test_openjdk8
       - test_openjdk11
-      - test_openjdk15
-      - test_openjdk17
-      - test_openjdk19

.gitlab-ci.yml

@@ -8,6 +8,7 @@ variables:
   # ryuk is a privileged container started by testcontainers which cleans up containers at the end of testing
   # It is not necessary for our gitlab CI env as #ci-cd infra tears everything down at the end of a gitlab run
   TESTCONTAINERS_RYUK_DISABLED: "true"
+  DEBUG: testcontainers*
 
 
 # Testing is handled by circleCI for PRs, but we also run maven tests as part of the deploy process
@@ -16,7 +17,7 @@ run_unit_tests:
   stage: run_unit_tests
 
   rules:
-    - when: manual
+    - when: always
       allow_failure: true
 
   tags:
@@ -25,12 +26,14 @@ run_unit_tests:
   image: eclipse-temurin:8u382-b05-jdk
 
   script:
-    - ./mvnw -Dhttps.protocols=TLSv1.2 -Dcheckstyle.skip=true -Dtests.log_level=info -Djdk.attach.allowAttachSelf=true -B test
+    - ./mvnw -Dhttps.protocols=TLSv1.2 -Dcheckstyle.skip=true -Dtests.log_level=ALL -Dtest=TestReconnectContainer#testJMXDirectReconnect -Djdk.attach.allowAttachSelf=true -B test
 
   artifacts:
     expire_in: 1 mos
+    when: always
     paths:
-      - ./target/surefire-reports/*.txt
+      - target/surefire-reports/*.txt
+      - target/jmxfetch_test.log*
 
 
 # From the tagged repo, push the release artifact

pom.xml

@@ -200,7 +200,7 @@
         <dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>testcontainers</artifactId>
-            <version>1.18.0</version>
+            <version>1.19.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -225,6 +225,7 @@
                     <!-- allowAttachSelf required for tests in jdk9+ ref https://bugs.openjdk.org/browse/JDK-8180425 -->
                     <!-- rmi.server.hostname required for tests in some MacOS configurations -->
                     <argLine>-Djdk.attach.allowAttachSelf=true -Djava.rmi.server.hostname=localhost</argLine>
+                    <redirectTestOutputToFile>true</redirectTestOutputToFile>
                 </configuration>
             </plugin>
             <plugin>

src/test/java/org/datadog/jmxfetch/TestCommon.java

@@ -75,7 +75,7 @@ public static void init() throws Exception {
         if (level == null) {
             level = "ALL";
         }
-        CustomLogger.setup(LogLevel.ALL, "/tmp/jmxfetch_test.log", false);
+        CustomLogger.setup(LogLevel.ALL, "./target/jmxfetch_test.log", false);
     }
 
     /**
@@ -168,7 +168,7 @@ protected void initApplication(String yamlFileName) throws FileNotFoundException
     }
 
     /*
-     * Init JMXFetch with the given YAML configuration template 
+     * Init JMXFetch with the given YAML configuration template
      * The configuration can be specified as a yaml literal with each arg
      * representing one line of the Yaml file
      * Does not support any SD/AD features.
@@ -180,7 +180,7 @@ protected void initApplicationWithYamlLines(String... yamlLines)
 
         String confdDirectory = tempFile.getParent().toString();
         String yamlFileName = tempFile.getFileName().toString();
-        
+
         List<String> params = new ArrayList<String>();
         params.add("--reporter");
         params.add("console");

src/test/java/org/datadog/jmxfetch/TestReconnectContainer.java

@@ -13,6 +13,7 @@
 import javax.management.remote.JMXServiceURL;
 
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestRule;
@@ -28,6 +29,8 @@
 import java.nio.file.Paths;
 
 import org.datadog.jmxfetch.reporter.ConsoleReporter;
+import org.datadog.jmxfetch.util.CustomLogger;
+import org.datadog.jmxfetch.util.LogLevel;
 
 
 @Slf4j
@@ -54,6 +57,11 @@ private static boolean isDomainPresent(String domain, MBeanServerConnection mbs)
         return found;
     }
 
+    @BeforeClass
+    public static void init() throws Exception {
+        CustomLogger.setup(LogLevel.ALL, "./target/jmxfetch_test.log", false);
+    }
+
     private static ImageFromDockerfile img = new ImageFromDockerfile()
         .withFileFromPath(".", Paths.get("./tools/misbehaving-jmx-server/"));
 

tools/misbehaving-jmx-server/Dockerfile

@@ -10,7 +10,7 @@ RUN mvn dependency:resolve
 
 # Copy the source code and build the JAR file
 COPY src/ /app/src/
-RUN mvn clean package assembly:single
+RUN ["mvn", "compile", "assembly:single"]
 
 RUN ls /app/target
 
@@ -24,4 +24,4 @@ WORKDIR /app
 COPY  --from=build /app/target/misbehavingjmxserver-1.0-SNAPSHOT-jar-with-dependencies.jar .
 
 # Run the supervisor class from the jar
-CMD ["java", "-cp", "misbehavingjmxserver-1.0-SNAPSHOT-jar-with-dependencies.jar", "org.datadog.supervisor.App"]
+CMD ["java", "-cp", "misbehavingjmxserver-1.0-SNAPSHOT-jar-with-dependencies.jar", "org.datadog.supervisor.App"]