build(deps): bump io.cryostat:cryostat-core from 2.21.0 to 2.23.0 (#91)

* build(deps): bump io.cryostat:cryostat-core from 2.21.0 to 2.23.0 Bumps [io.cryostat:cryostat-core](https://github.com/cryostatio/cryostat-core) from 2.21.0 to 2.23.0. - [Release notes](https://github.com/cryostatio/cryostat-core/releases) - [Commits](cryostatio/cryostat-core@v2.21.0...v2.23.0) --- updated-dependencies: - dependency-name: io.cryostat:cryostat-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * json report generation fixup * remote Agent HTTP service interface fixup --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Andrew Azores <[email protected]>
aali309 · Oct 13, 2023 · 3df1129 · 3df1129
1 parent 4543939
commit 3df1129
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -30,7 +30,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-    <io.cryostat.core.version>2.21.0</io.cryostat.core.version>
+    <io.cryostat.core.version>2.23.0</io.cryostat.core.version>
 
     <org.apache.commons.codec.version>1.16.0</org.apache.commons.codec.version>
     <org.apache.commons.io.version>2.13.0</org.apache.commons.io.version>

diff --git a/src/main/java/io/cryostat/Producers.java b/src/main/java/io/cryostat/Producers.java
@@ -16,7 +16,6 @@
 package io.cryostat;
 
 import java.net.URI;
-import java.util.Set;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ScheduledExecutorService;
@@ -88,7 +87,7 @@ public static ScheduledExecutorService produceScheduledExecutorService() {
     @DefaultBean
     public static InterruptibleReportGenerator produceInterruptibleReportGenerator() {
         return new InterruptibleReportGenerator(
-                io.cryostat.core.log.Logger.INSTANCE, Set.of(), ForkJoinPool.commonPool());
+                ForkJoinPool.commonPool(), io.cryostat.core.log.Logger.INSTANCE);
     }
 
     @Produces

diff --git a/src/main/java/io/cryostat/reports/Reports.java b/src/main/java/io/cryostat/reports/Reports.java
@@ -26,7 +26,7 @@
 import io.cryostat.ConfigProperties;
 import io.cryostat.Producers;
 import io.cryostat.core.reports.InterruptibleReportGenerator;
-import io.cryostat.core.reports.InterruptibleReportGenerator.RuleEvaluation;
+import io.cryostat.core.reports.InterruptibleReportGenerator.AnalysisResult;
 import io.cryostat.recordings.RecordingHelper;
 import io.cryostat.recordings.RemoteRecordingInputStreamFactory;
 import io.cryostat.targets.Target;
@@ -108,7 +108,7 @@ public Response getV1(@RestPath String recordingName) {
     @Path("/api/v3/reports/{encodedKey}")
     @Produces(MediaType.APPLICATION_JSON)
     @RolesAllowed("read")
-    public Uni<Map<String, RuleEvaluation>> get(@RestPath String encodedKey)
+    public Uni<Map<String, AnalysisResult>> get(@RestPath String encodedKey)
             throws IOException, CouldNotLoadRecordingException {
         // TODO implement query parameter for evaluation predicate
         return Uni.createFrom()
@@ -149,7 +149,7 @@ public Response getActiveV1(@RestPath String targetId, @RestPath String recordin
     @Produces(MediaType.APPLICATION_JSON)
     @RolesAllowed("read")
     @Deprecated(since = "3.0", forRemoval = true)
-    public Uni<Map<String, RuleEvaluation>> getActive(
+    public Uni<Map<String, AnalysisResult>> getActive(
             @RestPath long targetId, @RestPath long recordingId) throws Exception {
         var target = Target.<Target>findById(targetId);
         var recording = target.getRecordingById(recordingId);

diff --git a/src/main/java/io/cryostat/targets/AgentConnection.java b/src/main/java/io/cryostat/targets/AgentConnection.java
@@ -31,9 +31,9 @@
 import org.openjdk.jmc.rjmx.ConnectionException;
 import org.openjdk.jmc.rjmx.IConnectionHandle;
 import org.openjdk.jmc.rjmx.ServiceNotAvailableException;
-import org.openjdk.jmc.rjmx.services.jfr.IFlightRecorderService;
 
 import io.cryostat.core.FlightRecorderException;
+import io.cryostat.core.net.CryostatFlightRecorderService;
 import io.cryostat.core.net.IDException;
 import io.cryostat.core.net.JFRConnection;
 import io.cryostat.core.net.MBeanMetrics;
@@ -107,7 +107,7 @@ public int getPort() {
     }
 
     @Override
-    public IFlightRecorderService getService()
+    public CryostatFlightRecorderService getService()
             throws ConnectionException, IOException, ServiceNotAvailableException {
         return new AgentJFRService(webClient);
     }

diff --git a/src/main/java/io/cryostat/targets/AgentJFRService.java b/src/main/java/io/cryostat/targets/AgentJFRService.java
@@ -15,6 +15,7 @@
  */
 package io.cryostat.targets;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.util.Collection;
 import java.util.List;
@@ -24,17 +25,24 @@
 import org.openjdk.jmc.common.unit.IDescribedMap;
 import org.openjdk.jmc.common.unit.IOptionDescriptor;
 import org.openjdk.jmc.common.unit.IQuantity;
+import org.openjdk.jmc.common.unit.QuantityConversionException;
 import org.openjdk.jmc.flightrecorder.configuration.events.EventOptionID;
 import org.openjdk.jmc.flightrecorder.configuration.events.IEventTypeID;
 import org.openjdk.jmc.flightrecorder.configuration.internal.DefaultValueMap;
+import org.openjdk.jmc.rjmx.ConnectionException;
+import org.openjdk.jmc.rjmx.ServiceNotAvailableException;
 import org.openjdk.jmc.rjmx.services.jfr.FlightRecorderException;
 import org.openjdk.jmc.rjmx.services.jfr.IEventTypeInfo;
-import org.openjdk.jmc.rjmx.services.jfr.IFlightRecorderService;
 import org.openjdk.jmc.rjmx.services.jfr.IRecordingDescriptor;
 
+import io.cryostat.core.EventOptionsBuilder.EventOptionException;
+import io.cryostat.core.EventOptionsBuilder.EventTypeException;
+import io.cryostat.core.net.CryostatFlightRecorderService;
+import io.cryostat.core.templates.TemplateType;
+
 import io.vertx.mutiny.ext.web.client.WebClient;
 
-class AgentJFRService implements IFlightRecorderService {
+class AgentJFRService implements CryostatFlightRecorderService {
 
     private final WebClient webClient;
 
@@ -191,4 +199,19 @@ public void updateRecordingOptions(IRecordingDescriptor arg0, IConstrainedMap<St
     }
 
     public static class UnimplementedException extends IllegalStateException {}
+
+    @Override
+    public IRecordingDescriptor start(IConstrainedMap<String> arg0, String arg1, TemplateType arg2)
+            throws io.cryostat.core.FlightRecorderException,
+                    FlightRecorderException,
+                    ConnectionException,
+                    IOException,
+                    FlightRecorderException,
+                    ServiceNotAvailableException,
+                    QuantityConversionException,
+                    EventOptionException,
+                    EventTypeException {
+        // TODO Auto-generated method stub
+        throw new UnsupportedOperationException("Unimplemented method 'start'");
+    }
 }