move test apps + deploy on wildfly

Author: SylvainJuge

jmx-scraper/build.gradle.kts

@@ -43,11 +43,6 @@ testing {
   }
 }
 
-sourceSets {
-  create("testApp") {
-  }
-}
-
 tasks {
   shadowJar {
     mergeServiceFiles()
@@ -65,9 +60,16 @@ tasks {
 
   withType<Test>().configureEach {
     dependsOn(shadowJar)
-    dependsOn(named("appJar"))
     systemProperty("shadow.jar.path", shadowJar.get().archiveFile.get().asFile.absolutePath)
-    systemProperty("app.jar.path", named<Jar>("appJar").get().archiveFile.get().asFile.absolutePath)
+
+    val testAppTask = project("test-app").tasks.named<Jar>("jar")
+    dependsOn(testAppTask)
+    systemProperty("app.jar.path", testAppTask.get().archiveFile.get().asFile.absolutePath)
+
+    val testWarTask = project("test-webapp").tasks.named<Jar>("war")
+    dependsOn(testWarTask)
+    systemProperty("app.war.path", testWarTask.get().archiveFile.get().asFile.absolutePath)
+
     systemProperty("gradle.project.version", "${project.version}")
   }
 
@@ -79,14 +81,6 @@ tasks {
   }
 }
 
-tasks.register<Jar>("appJar") {
-  from(sourceSets.get("testApp").output)
-  archiveClassifier.set("app")
-  manifest {
-    attributes["Main-Class"] = "io.opentelemetry.contrib.jmxscraper.TestApp"
-  }
-}
-
 // Don't publish non-shadowed jar (shadowJar is in shadowRuntimeElements)
 with(components["java"] as AdhocComponentWithVariants) {
   configurations.forEach {

jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/JmxScraperContainer.java

@@ -30,8 +30,8 @@ public class JmxScraperContainer extends GenericContainer<JmxScraperContainer> {
   private String password;
   private final List<String> extraJars;
 
-  public JmxScraperContainer(String otlpEndpoint) {
-    super("openjdk:8u342-jre-slim");
+  public JmxScraperContainer(String otlpEndpoint, String baseImage) {
+    super(baseImage);
 
     String scraperJarPath = System.getProperty("shadow.jar.path");
     assertThat(scraperJarPath).isNotNull();

jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/TestAppContainer.java

@@ -38,8 +38,7 @@ public TestAppContainer() {
 
     this.withCopyFileToContainer(MountableFile.forHostPath(appJar), "/app.jar")
         .waitingFor(
-            Wait.forLogMessage("app started\\n", 1)
-                .withStartupTimeout(Duration.ofSeconds(5)))
+            Wait.forLogMessage("app started\\n", 1).withStartupTimeout(Duration.ofSeconds(5)))
         .withCommand("java", "-jar", "/app.jar");
   }
 

jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/TargetSystemIntegrationTest.java

@@ -97,6 +97,10 @@ void afterEach() {
     }
   }
 
+  protected String scraperBaseImage() {
+    return "openjdk:8u342-jre-slim";
+  }
+
   @Test
   void endToEndTest() {
 
@@ -108,7 +112,7 @@ void endToEndTest() {
     target.start();
 
     scraper =
-        new JmxScraperContainer(otlpEndpoint)
+        new JmxScraperContainer(otlpEndpoint, scraperBaseImage())
             .withLogConsumer(new Slf4jLogConsumer(jmxScraperLogger))
             .withNetwork(network)
             .withRmiServiceUrl(TARGET_SYSTEM_NETWORK_ALIAS, JMX_PORT);

jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/WildflyIntegrationTest.java

@@ -7,12 +7,14 @@
 
 import static io.opentelemetry.contrib.jmxscraper.target_systems.MetricAssertions.assertSum;
 import static io.opentelemetry.contrib.jmxscraper.target_systems.MetricAssertions.assertSumWithAttributes;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.entry;
 
 import io.opentelemetry.contrib.jmxscraper.JmxScraperContainer;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.time.Duration;
 import org.junit.jupiter.api.AfterAll;
 import org.testcontainers.containers.GenericContainer;
@@ -36,23 +38,36 @@ public static void cleanup() throws IOException {
   protected GenericContainer<?> createTargetContainer(int jmxPort) {
     // JMX port is ignored here as we are using HTTP management interface
 
+    String appWar = System.getProperty("app.war.path");
+    Path appWarPath = Paths.get(appWar);
+    assertThat(appWarPath).isNotEmptyFile().isReadable();
+
     return new GenericContainer<>(
             new ImageFromDockerfile()
                 .withDockerfileFromBuilder(
                     builder ->
                         builder
-                            .from("jboss/wildfly:23.0.1.Final")
+                            .from("quay.io/wildfly/wildfly:32.0.1.Final-jdk11")
                             // user/pwd needed for remote JMX access
                             .run("/opt/jboss/wildfly/bin/add-user.sh user password --silent")
                             // standalone with management (HTTP) interface enabled
                             .cmd(
                                 "/opt/jboss/wildfly/bin/standalone.sh -b 0.0.0.0 -bmanagement 0.0.0.0")
                             .expose(8080, 9990)
                             .build()))
+        .withCopyFileToContainer(
+            MountableFile.forHostPath(appWarPath),
+            "/opt/jboss/wildfly/standalone/deployments/testapp.war")
         .withStartupTimeout(Duration.ofMinutes(2))
         .waitingFor(Wait.forLogMessage(".*Http management interface listening on.*", 1));
   }
 
+  @Override
+  protected String scraperBaseImage() {
+    // we need to run the scraper with Java 11+ because jboss client jar is using Java 11
+    return "eclipse-temurin:11.0.25_9-jdk-noble";
+  }
+
   @Override
   protected JmxScraperContainer customizeScraperContainer(
       JmxScraperContainer scraper, GenericContainer<?> target) {
@@ -159,7 +174,6 @@ protected void verifyMetrics() {
                 "{transaction}",
                 attrs -> attrs.containsOnly(entry("cause", "system")),
                 attrs -> attrs.containsOnly(entry("cause", "resource")),
-                attrs -> attrs.containsOnly(entry("cause", "application")))
-    );
+                attrs -> attrs.containsOnly(entry("cause", "application"))));
   }
 }

jmx-scraper/test-app/build.gradle.kts

@@ -0,0 +1,13 @@
+plugins {
+  application
+}
+
+description = "JMX metrics scraper - test application"
+
+tasks {
+  jar {
+    manifest {
+      attributes["Main-Class"] = "io.opentelemetry.contrib.jmxscraper.testapp.TestApp"
+    }
+  }
+}

jmx-scraper/src/testApp/java/io/opentelemetry/contrib/jmxscraper/TestApp.java renamed to jmx-scraper/test-app/src/main/java/io/opentelemetry/contrib/jmxscraper/testapp/TestApp.java

@@ -3,14 +3,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.contrib.jmxscraper;
+package io.opentelemetry.contrib.jmxscraper.testapp;
 
 import java.lang.management.ManagementFactory;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
 @SuppressWarnings("all") // for busy wait + stdout
-public class TestApp implements TestAppMXBean {
+public class TestApp implements TestAppMxBean {
 
   private volatile boolean running;
 

jmx-scraper/src/testApp/java/io/opentelemetry/contrib/jmxscraper/TestAppMXBean.java renamed to jmx-scraper/test-app/src/main/java/io/opentelemetry/contrib/jmxscraper/testapp/TestAppMxBean.java

@@ -3,10 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.contrib.jmxscraper;
+package io.opentelemetry.contrib.jmxscraper.testapp;
 
+import javax.management.MXBean;
+
+@MXBean
 @SuppressWarnings("unused")
-public interface TestAppMXBean {
+public interface TestAppMxBean {
 
   int getIntValue();
 

jmx-scraper/test-webapp/build.gradle.kts

@@ -0,0 +1,15 @@
+plugins {
+  war
+}
+
+description = "JMX metrics scraper - test web application"
+
+dependencies {
+  providedCompile("jakarta.servlet:jakarta.servlet-api:5.0.0")
+}
+
+java {
+  toolchain {
+    languageVersion = JavaLanguageVersion.of(11)
+  }
+}

jmx-scraper/test-webapp/src/main/java/io/opentelemetry/contrib/jmxscraper/testwebapp/SimpleServlet.java

@@ -0,0 +1,24 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.contrib.jmxscraper.testwebapp;
+
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+public class SimpleServlet extends HttpServlet {
+
+  private static final long serialVersionUID = 3726145372238690099L;
+
+  @Override
+  protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+    try (PrintWriter out = resp.getWriter()) {
+      out.write("hello!");
+    }
+  }
+}