Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(agent): implement Agent HTTP dynamic JFR stop/delete #1604

Merged
merged 1 commit into from
Aug 14, 2023
Merged

feat(agent): implement Agent HTTP dynamic JFR stop/delete #1604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 46 additions & 6 deletions src/main/java/io/cryostat/net/AgentClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ Future<Boolean> ping() {

Future<MBeanMetrics> mbeanMetrics() {
Future<HttpResponse<String>> f =
invoke(HttpMethod.GET, "/mbean-metrics", BodyCodec.string());
invoke(HttpMethod.GET, "/mbean-metrics/", BodyCodec.string());
return f.map(HttpResponse::body)
// uses Gson rather than Vertx's Jackson because Gson is able to handle MBeanMetrics
// with no additional fuss. Jackson complains about private final fields.
Expand All @@ -134,7 +134,7 @@ Future<IRecordingDescriptor> startRecording(StartRecordingRequest req) {
Future<HttpResponse<String>> f =
invoke(
HttpMethod.POST,
"/recordings",
"/recordings/",
Buffer.buffer(gson.toJson(req)),
BodyCodec.string());
return f.map(
Expand All @@ -152,8 +152,48 @@ Future<IRecordingDescriptor> startRecording(StartRecordingRequest req) {
});
}

Future<Void> stopRecording(long id) {
Future<HttpResponse<Void>> f =
invoke(
HttpMethod.PATCH,
String.format("/recordings/%d", id),
Buffer.buffer(),
BodyCodec.none());
return f.map(
resp -> {
int statusCode = resp.statusCode();
if (HttpStatusCodeIdentifier.isSuccessCode(statusCode)) {
return null;
} else if (statusCode == 403) {
throw new UnsupportedOperationException();
} else {
throw new RuntimeException("Unknown failure");
}
});
}

Future<Void> deleteRecording(long id) {
Future<HttpResponse<Void>> f =
invoke(
HttpMethod.DELETE,
String.format("/recordings/%d", id),
Buffer.buffer(),
BodyCodec.none());
return f.map(
resp -> {
int statusCode = resp.statusCode();
if (HttpStatusCodeIdentifier.isSuccessCode(statusCode)) {
return null;
} else if (statusCode == 403) {
throw new UnsupportedOperationException();
} else {
throw new RuntimeException("Unknown failure");
}
});
}

Future<List<IRecordingDescriptor>> activeRecordings() {
Future<HttpResponse<String>> f = invoke(HttpMethod.GET, "/recordings", BodyCodec.string());
Future<HttpResponse<String>> f = invoke(HttpMethod.GET, "/recordings/", BodyCodec.string());
return f.map(HttpResponse::body)
.map(
s ->
Expand All @@ -168,14 +208,14 @@ Future<List<IRecordingDescriptor>> activeRecordings() {

Future<Collection<? extends IEventTypeInfo>> eventTypes() {
Future<HttpResponse<JsonArray>> f =
invoke(HttpMethod.GET, "/event-types", BodyCodec.jsonArray());
invoke(HttpMethod.GET, "/event-types/", BodyCodec.jsonArray());
return f.map(HttpResponse::body)
.map(arr -> arr.stream().map(o -> new AgentEventTypeInfo((JsonObject) o)).toList());
}

Future<IConstrainedMap<EventOptionID>> eventSettings() {
Future<HttpResponse<JsonArray>> f =
invoke(HttpMethod.GET, "/event-settings", BodyCodec.jsonArray());
invoke(HttpMethod.GET, "/event-settings/", BodyCodec.jsonArray());
return f.map(HttpResponse::body)
.map(
arr -> {
Expand Down Expand Up @@ -229,7 +269,7 @@ Future<IConstrainedMap<EventOptionID>> eventSettings() {

Future<List<String>> eventTemplates() {
Future<HttpResponse<JsonArray>> f =
invoke(HttpMethod.GET, "/event-templates", BodyCodec.jsonArray());
invoke(HttpMethod.GET, "/event-templates/", BodyCodec.jsonArray());
return f.map(HttpResponse::body).map(arr -> arr.stream().map(Object::toString).toList());
}

Expand Down
20 changes: 17 additions & 3 deletions src/main/java/io/cryostat/net/AgentJFRService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,14 @@ public String getVersion() {

@Override
public void close(IRecordingDescriptor descriptor) throws FlightRecorderException {
throw new UnimplementedException();
try {
client.deleteRecording(descriptor.getId())
.toCompletionStage()
.toCompletableFuture()
.get();
} catch (InterruptedException | ExecutionException e) {
throw new FlightRecorderException("Failed to stop recording", e);
}
}

@Override
Expand Down Expand Up @@ -227,8 +234,15 @@ public IRecordingDescriptor start(
}

@Override
public void stop(IRecordingDescriptor arg0) throws FlightRecorderException {
throw new UnimplementedException();
public void stop(IRecordingDescriptor descriptor) throws FlightRecorderException {
try {
client.stopRecording(descriptor.getId())
.toCompletionStage()
.toCompletableFuture()
.get();
} catch (InterruptedException | ExecutionException e) {
throw new FlightRecorderException("Failed to stop recording", e);
}
}

@Override
Expand Down
Loading