Merge branch 'main' into 1494-simplified-agent-registration

Author: jtolentino1

.github/workflows/pr-ci.yaml

@@ -124,6 +124,13 @@ jobs:
           [[registry]]
           location = "docker.io"
           blocked = true
+    - uses: DamianReeves/write-file-action@v1.3
+      with:
+        path: /etc/containers/containers.conf
+        write-mode: overwrite
+        contents: |
+          [engine]
+          service_timeout=0
     - name: Install ansi2txt utility
       run: |
         sudo apt-get update
@@ -208,6 +215,13 @@ jobs:
           [[registry]]
           location = "docker.io"
           blocked = true
+    - uses: DamianReeves/write-file-action@v1.3
+      with:
+        path: /etc/containers/containers.conf
+        write-mode: overwrite
+        contents: |
+          [engine]
+          service_timeout=0
     - name: Install ansi2txt utility
       run: |
         sudo apt-get update

.github/workflows/push-ci.yaml

@@ -57,6 +57,13 @@ jobs:
           [[registry]]
           location = "docker.io"
           blocked = true
+    - uses: DamianReeves/write-file-action@v1.3
+      with:
+        path: /etc/containers/containers.conf
+        write-mode: overwrite
+        contents: |
+          [engine]
+          service_timeout=0
     - name: Install qemu
       run: |
         sudo apt update
@@ -130,6 +137,13 @@ jobs:
           [[registry]]
           location = "docker.io"
           blocked = true
+    - uses: DamianReeves/write-file-action@v1.3
+      with:
+        path: /etc/containers/containers.conf
+        write-mode: overwrite
+        contents: |
+          [engine]
+          service_timeout=0
     - name: Install qemu
       run: |
         sudo apt update

README.md

@@ -62,7 +62,7 @@ Build requirements:
 - git
 - JDK 21+
 - Maven v3+
-- [Quarkus CLI](https://quarkus.io/guides/cli-tooling) v3.4.1+ (Recommended)
+- [Quarkus CLI](https://quarkus.io/guides/cli-tooling) v3.33.1+ (Recommended)
 - [Podman](https://podman.io/docs/installation) 4.7+
 
 Smoketest run requirements:
@@ -87,21 +87,16 @@ For ease and convenience, it is suggested to use `podman` with the following con
 
 ```bash
 $ systemctl --user enable --now podman.socket
+$ # hack to work around testcontainers/podman "Broken pipe" issue
+$ sudo bash -c 'echo -e "[engine]\nservice_timeout=0" >> /etc/containers/containers.conf'
 ```
 
 `$HOME/.bashrc` (or equivalent shell configuration)
 ```bash
 export DOCKER_HOST=unix:///run/user/$(id -u)/podman/podman.sock
 ```
 
-`$HOME/.testcontainers.properties`
-```properties
-docker.client.strategy=org.testcontainers.dockerclient.UnixSocketClientProviderStrategy
-ryuk.container.image=quay.io/infinispan-test/ryuk\:0.8.1
-tinyimage.container.image=registry.access.redhat.com/ubi9/ubi-micro
-ryuk.container.privileged=true
-testcontainers.reuse.enable=false
-```
+If developing using `docker` then the above should be unnecessary.
 
 Initialize submodules before building:
 

pom.xml

@@ -49,9 +49,9 @@
     <org.apache.calcite.version>1.34.0</org.apache.calcite.version>
     <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
     <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
-    <quarkus.platform.version>3.27.3.1</quarkus.platform.version>
+    <quarkus.platform.version>3.33.1.1</quarkus.platform.version>
     <quarkus-quinoa.version>2.8.2</quarkus-quinoa.version>
-    <org.hibernate.orm.hibernate.jfr.version>7.1.18.Final</org.hibernate.orm.hibernate.jfr.version>
+    <org.hibernate.orm.hibernate.jfr.version>7.2.6.Final</org.hibernate.orm.hibernate.jfr.version>
     <org.codehaus.mojo.build.helper.plugin.version>3.6.1</org.codehaus.mojo.build.helper.plugin.version>
     <org.codehaus.mojo.exec.plugin.version>3.6.3</org.codehaus.mojo.exec.plugin.version>
     <assembly-plugin.version>3.8.0</assembly-plugin.version>
@@ -298,7 +298,7 @@
     </dependency>
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
-      <artifactId>netty-nio-client</artifactId>
+      <artifactId>aws-crt-client</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
@@ -374,12 +374,12 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5</artifactId>
+      <artifactId>quarkus-junit</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-junit5-mockito</artifactId>
+      <artifactId>quarkus-junit-mockito</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -400,7 +400,7 @@
     </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
-      <artifactId>junit-jupiter</artifactId>
+      <artifactId>testcontainers-junit-jupiter</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -575,6 +575,7 @@
             <quarkus.test.arg-line>--network-alias=${quarkus.test.network-alias}</quarkus.test.arg-line>
           </systemPropertyVariables>
           <skipTests>${skip.surefire.tests}</skipTests>
+          <argLine>@{argLine}</argLine>
         </configuration>
       </plugin>
       <plugin>
@@ -599,6 +600,9 @@
             </configuration>
           </execution>
         </executions>
+        <configuration>
+          <argLine>@{argLine}</argLine>
+        </configuration>
       </plugin>
     </plugins>
   </build>

schema/openapi.yaml

@@ -859,14 +859,14 @@ components:
       type: object
     SmartTrigger:
       properties:
+        ID:
+          type: string
         durationConstraint:
           type: string
         expression:
           type: string
         firstMetTime:
           $ref: '#/components/schemas/Date'
-        iD:
-          type: string
         id:
           type: string
         recordingTemplateName:
@@ -1137,6 +1137,9 @@ paths:
             type: integer
       responses:
         "200":
+          content:
+            application/json:
+              schema: {}
           description: OK
       summary: Export Revisions
       tags:
@@ -2062,6 +2065,9 @@ paths:
         required: true
       responses:
         "200":
+          content:
+            application/json:
+              schema: {}
           description: OK
         "400":
           description: Bad Request
@@ -2877,6 +2883,9 @@ paths:
         required: true
       responses:
         "200":
+          content:
+            application/json:
+              schema: {}
           description: OK
       summary: Get an automated analysis report
       tags:
@@ -3616,6 +3625,9 @@ paths:
         required: true
       responses:
         "200":
+          content:
+            application/json:
+              schema: {}
           description: OK
       summary: Get an automated analysis report for a particular recording on the specified target
       tags:

src/main/java/io/cryostat/reports/MemoryCachingReportsListener.java

@@ -15,6 +15,8 @@
  */
 package io.cryostat.reports;
 
+import java.time.Duration;
+
 import io.cryostat.ConfigProperties;
 import io.cryostat.discovery.DiscoveryNode;
 import io.cryostat.recordings.ActiveRecording;
@@ -27,6 +29,7 @@
 import io.quarkus.cache.Cache;
 import io.quarkus.cache.CacheName;
 import io.quarkus.vertx.ConsumeEvent;
+import io.smallrye.common.annotation.Blocking;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import jakarta.persistence.PreRemove;
@@ -54,6 +57,7 @@ class MemoryCachingReportsListener {
 
     @Inject Logger logger;
 
+    @Blocking
     @ConsumeEvent(value = ActiveRecordings.ARCHIVED_RECORDING_DELETED)
     public void handleArchivedRecordingDeletion(ArchivedRecording recording) {
         logger.tracev("archived recording cache invalidation: {0}", recording.name());
@@ -66,7 +70,7 @@ public void handleArchivedRecordingDeletion(ArchivedRecording recording) {
         }
         String key = RecordingHelper.archivedRecordingKey(jvmId, recording.name());
         logger.tracev("Picked up deletion of archived recording: {0}", key);
-        archivedCache.invalidate(key);
+        archivedCache.invalidate(key).await().atMost(Duration.ofSeconds(5));
     }
 
     @ConsumeEvent(value = Target.TARGET_JVM_DISCOVERY)
@@ -84,6 +88,7 @@ public void handleTargetDiscovery(TargetDiscovery evt) {
     }
 
     @PreRemove
+    @Blocking
     @ConsumeEvent(value = ActiveRecordings.ACTIVE_RECORDING_DELETED)
     void handleActiveRecordingDeletion(ActiveRecording recording) {
         logger.tracev(
@@ -96,7 +101,7 @@ void handleActiveRecordingDeletion(ActiveRecording recording) {
         logger.tracev(
                 "Picked up deletion of active recording: {0} / {1} ({2})",
                 recording.target.alias, recording.name, key);
-        activeCache.invalidate(key);
+        activeCache.invalidate(key).await().atMost(Duration.ofSeconds(5));
     }
 
     @PreRemove

src/main/resources/application.properties

@@ -248,6 +248,7 @@ quarkus.http.filter.static.order=1
 quarkus.http.test-timeout=60s
 
 quarkus.s3.sync-client.type=apache
+quarkus.s3.async-client.type=aws-crt
 storage-ext.url=
 storage.presigned-downloads.enabled=${storage.presigned-transfers.enabled}
 storage.presigned-transfers.enabled=true

src/test/java/io/cryostat/resources/AgentApplicationResource.java

@@ -22,8 +22,6 @@
 
 import io.quarkus.test.common.DevServicesContext;
 import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
-import org.junit.runner.Description;
-import org.junit.runners.model.Statement;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.HostPortWaitStrategy;
@@ -91,13 +89,6 @@ public String getId() {
 
                                     @Override
                                     public void close() {}
-
-                                    @Override
-                                    public Statement apply(
-                                            Statement base, Description description) {
-                                        throw new UnsupportedOperationException(
-                                                "Unimplemented method 'apply'");
-                                    }
                                 });
         authProxy = new AuthProxyContainer(network, cryostatPort.get());
 

src/test/java/itest/agent/AgentTestBase.java

@@ -30,7 +30,6 @@
 import io.vertx.core.json.JsonArray;
 import io.vertx.core.json.JsonObject;
 import itest.bases.WebSocketTestBase;
-import junit.framework.AssertionFailedError;
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.BeforeEach;
 
@@ -217,8 +216,7 @@ private Target waitForDiscoveryViaPolling(Predicate<Target> p) {
                     elapsed += (now - last);
                     last = now;
                     if (Duration.ofNanos(elapsed).compareTo(DISCOVERY_TIMEOUT) > 0) {
-                        throw new RuntimeException(
-                                new AssertionFailedError("Timed out waiting for target discovery"));
+                        throw new IllegalStateException("Timed out waiting for target discovery");
                     }
                     try {
                         Thread.sleep(DISCOVERY_PERIOD.toMillis());