test(itest): replace JDP with agent-based discovery

pom.xml

@@ -468,6 +468,34 @@
             <skip>${skipBaseImage}</skip>
           </configuration>
         </execution>
+        <execution>
+          <id>print-podman-version</id>
+          <phase>pre-integration-test</phase>
+          <goals>
+            <goal>exec</goal>
+          </goals>
+          <configuration>
+            <executable>podman</executable>
+            <arguments>
+              <argument>version</argument>
+            </arguments>
+            <skip>${skipITs}</skip>
+          </configuration>
+        </execution>
+        <execution>
+          <id>print-podman-info</id>
+          <phase>pre-integration-test</phase>
+          <goals>
+            <goal>exec</goal>
+          </goals>
+          <configuration>
+            <executable>podman</executable>
+            <arguments>
+              <argument>info</argument>
+            </arguments>
+            <skip>${skipITs}</skip>
+          </configuration>
+        </execution>
         <execution>
           <id>create-pod</id>
           <phase>pre-integration-test</phase>
@@ -571,21 +599,9 @@
               <argument>--env</argument>
               <argument>CRYOSTAT_JMX_CREDENTIALS_DB_PASSWORD=${cryostat.itest.jmx.db-passwd}</argument>
               <argument>--env</argument>
-              <argument>CRYOSTAT_JDBC_URL=jdbc:h2:file:/opt/cryostat.d/conf.d/h2;INIT=create domain if not exists jsonb as varchar</argument>
-              <argument>--env</argument>
-              <argument>CRYOSTAT_JDBC_DRIVER=org.h2.Driver</argument>
-              <argument>--env</argument>
-              <argument>CRYOSTAT_JDBC_USERNAME=sa</argument>
-              <argument>--env</argument>
-              <argument>CRYOSTAT_JDBC_PASSWORD=""</argument>
-              <argument>--env</argument>
-              <argument>CRYOSTAT_HIBERNATE_DIALECT=org.hibernate.dialect.H2Dialect</argument>
-              <argument>--env</argument>
-              <argument>CRYOSTAT_HBM2DDL=update</argument>
-              <argument>--env</argument>
-              <argument>CRYOSTAT_LOG_DB_QUERIES=true</argument>
+              <argument>CRYOSTAT_ENABLE_JDP_BROADCAST=false</argument>
               <argument>--env</argument>
-              <argument>CRYOSTAT_ENABLE_JDP_BROADCAST=true</argument>
+              <argument>CRYOSTAT_DISABLE_BUILTIN_DISCOVERY=true</argument>
               <argument>--env</argument>
               <argument>CRYOSTAT_TARGET_CACHE_TTL=30</argument>
               <argument>--env</argument>

repeated-integration-tests.bash

@@ -45,6 +45,8 @@ STARTFLAGS=(
     "-Dcryostat.itest.imageTag=${ITEST_IMG_VERSION}"
     "-Dcryostat.itest.pullImages=${PULL_IMAGES}"
     "build-helper:regex-property@image-tag-to-lower"
+    "exec:exec@print-podman-version"
+    "exec:exec@print-podman-info"
     "exec:exec@create-pod"
     "exec:exec@start-jfr-datasource"
     "exec:exec@start-grafana"
@@ -61,6 +63,10 @@ if [ -n "$2" ]; then
     STARTFLAGS+=("-Dit.test=$2")
 fi
 
+if [ -n "${RANDOM_SEED}" ]; then
+    STARTFLAGS+=("-Dfailsafe.runOrder.random.seed=${RANDOM_SEED}")
+fi
+
 STOPFLAGS=(
     "exec:exec@destroy-pod"
 )

smoketest.sh

@@ -321,13 +321,21 @@ createPod() {
         --publish 8082:8082 \
         --publish 8083:8083 \
         --publish 8082:8082 \
+        --publish 8910:8910 \
+        --publish 8911:8911 \
+        --publish 8912:8912 \
+        --publish 8082:8082 \
+        --publish 8082:8082 \
         --publish 9990:9990 \
         --publish 10001:10001 \
         --publish 10010:10010
     # 5432: postgres
     # 8081: vertx-fib-demo-1 HTTP
     # 8082: vertx-fib-demo-2 HTTP
     # 8083: vertx-fib-demo-3 HTTP
+    # 8910: vertx-fib-demo-1 Agent HTTP
+    # 8911: vertx-fib-demo-2 Agent HTTP
+    # 8912: vertx-fib-demo-3 Agent HTTP
     # 9990: Wildfly Admin Console
     # 10001: cryostat-reports HTTP
     # 10010: quarkus-test-agent-1 HTTP

src/test/java/itest/AutoRulesCleanupIT.java

@@ -15,15 +15,13 @@
  */
 package itest;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-import java.util.stream.Collectors;
 
 import io.cryostat.net.web.http.HttpMimeType;
 
@@ -32,11 +30,10 @@
 import io.vertx.core.json.JsonArray;
 import io.vertx.core.json.JsonObject;
 import itest.bases.ExternalTargetsTest;
-import itest.util.ITestCleanupFailedException;
 import itest.util.Podman;
+import org.apache.http.client.utils.URLEncodedUtils;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
@@ -47,12 +44,11 @@
 @TestMethodOrder(OrderAnnotation.class)
 class AutoRulesCleanupIT extends ExternalTargetsTest {
 
-    static final List<String> CONTAINERS = new ArrayList<>();
     static final Map<String, String> NULL_RESULT = new HashMap<>();
 
     final String jmxServiceUrl =
             String.format("service:jmx:rmi:///jndi/rmi://%s:9093/jmxrmi", Podman.POD_NAME);
-    final String jmxServiceUrlEncoded = jmxServiceUrl.replaceAll("/", "%2F");
+    final String jmxServiceUrlEncoded = URLEncodedUtils.formatSegments(jmxServiceUrl).substring(1);
 
     final String ruleName = "myrule";
     final String recordingName = "auto_myrule";
@@ -64,29 +60,14 @@ class AutoRulesCleanupIT extends ExternalTargetsTest {
     @BeforeAll
     static void setup() throws Exception {
         Podman.ImageSpec spec =
-                new Podman.ImageSpec(FIB_DEMO_IMAGESPEC, Map.of("JMX_PORT", String.valueOf(9093)));
-        CONTAINERS.add(Podman.run(spec));
-        CompletableFuture.allOf(
-                        CONTAINERS.stream()
-                                .map(id -> Podman.waitForContainerState(id, "running"))
-                                .collect(Collectors.toList())
-                                .toArray(new CompletableFuture[0]))
-                .join();
+                new Podman.ImageSpec(
+                        "vertx-fib-demo",
+                        FIB_DEMO_IMAGESPEC,
+                        Map.of("JMX_PORT", String.valueOf(9093)));
+        CONTAINERS.add(Podman.runAppWithAgent(10_000, spec));
         waitForDiscovery(CONTAINERS.size());
     }
 
-    @AfterAll
-    static void cleanup() throws ITestCleanupFailedException {
-        for (String id : CONTAINERS) {
-            try {
-                Podman.kill(id);
-            } catch (Exception e) {
-                throw new ITestCleanupFailedException(
-                        String.format("Failed to kill container instance with ID %s", id), e);
-            }
-        }
-    }
-
     @Test
     @Order(1)
     void testAddRule() throws TimeoutException, InterruptedException, ExecutionException {
@@ -115,9 +96,7 @@ void testAddRule() throws TimeoutException, InterruptedException, ExecutionExcep
 
         form.add("enabled", "true");
         form.add("name", ruleName);
-        form.add(
-                "matchExpression",
-                "target.annotations.cryostat.JAVA_MAIN=='es.andrewazor.demo.Main'");
+        form.add("matchExpression", "/^vertx-fib-demo/.test(target.alias)");
         form.add("description", "");
         form.add("eventSpecifier", "template=Continuous,type=TARGET");
         form.add("initialDelaySeconds", "0");
@@ -174,7 +153,7 @@ void testAddRule() throws TimeoutException, InterruptedException, ExecutionExcep
                                 "eventSpecifier",
                                 "template=Continuous,type=TARGET",
                                 "matchExpression",
-                                "target.annotations.cryostat.JAVA_MAIN=='es.andrewazor.demo.Main'",
+                                "/^vertx-fib-demo/.test(target.alias)",
                                 "archivalPeriodSeconds",
                                 0,
                                 "initialDelaySeconds",