From 3df1129c63b406369da9fa16dc2777fa1be341dc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Oct 2023 11:52:33 -0400 Subject: [PATCH] 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](https://github.com/cryostatio/cryostat-core/compare/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] * json report generation fixup * remote Agent HTTP service interface fixup --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Andrew Azores --- pom.xml | 2 +- src/main/java/io/cryostat/Producers.java | 3 +-- .../java/io/cryostat/reports/Reports.java | 6 ++--- .../io/cryostat/targets/AgentConnection.java | 4 +-- .../io/cryostat/targets/AgentJFRService.java | 27 +++++++++++++++++-- 5 files changed, 32 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 40fd4dbf4e..34d27fce11 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ UTF-8 UTF-8 - 2.21.0 + 2.23.0 1.16.0 2.13.0 diff --git a/src/main/java/io/cryostat/Producers.java b/src/main/java/io/cryostat/Producers.java index 75c7810857..dafc2bbb96 100644 --- 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 index d40cb895f6..49eaab0b59 100644 --- 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> get(@RestPath String encodedKey) + public Uni> 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> getActive( + public Uni> getActive( @RestPath long targetId, @RestPath long recordingId) throws Exception { var 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 index 926950ca56..ef8e3b6464 100644 --- 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 index e721125129..63997d5a40 100644 --- 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 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'"); + } }