Skip to content

Commit

Permalink
remove Apache HttpClient5, replace with RESTEasy client
Browse files Browse the repository at this point in the history
  • Loading branch information
@andrewazores
andrewazores committed Apr 24, 2024
1 parent bf13fb3 commit 465ef49
Show file tree
Hide file tree
Showing 10 changed files with 106 additions and 116 deletions.
2 changes: 1 addition & 1 deletion compose/reports.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: "3"
services:
cryostat:
environment:
- CRYOSTAT_SERVICES_REPORTS_URL=http://reports:10001
- QUARKUS_REST_CLIENT_REPORTS_URL=http://reports:10001
reports:
image: ${CRYOSTAT_REPORTS_IMAGE:-quay.io/cryostat/cryostat-reports:latest}
hostname: reports
Expand Down
5 changes: 0 additions & 5 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,11 +170,6 @@
<artifactId>commons-collections4</artifactId>
<version>${org.apache.commons.collections.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
<version>${org.apache.httpcomponents.version}</version>
</dependency>
<dependency>
<groupId>org.projectnessie.cel</groupId>
<artifactId>cel-tools</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/cryostat/ConfigProperties.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public class ConfigProperties {
public static final String CONNECTIONS_FAILED_BACKOFF = "cryostat.connections.failed-backoff";
public static final String CONNECTIONS_FAILED_TIMEOUT = "cryostat.connections.failed-timeout";

public static final String REPORTS_SIDECAR_URL = "cryostat.services.reports.url";
public static final String REPORTS_SIDECAR_URL = "quarkus.rest-client.reports.url";
public static final String REPORTS_MEMORY_CACHE_ENABLED =
"cryostat.services.reports.memory-cache.enabled";
public static final String REPORTS_STORAGE_CACHE_ENABLED =
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/io/cryostat/events/S3TemplateService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@
import jakarta.enterprise.event.Observes;
import jakarta.inject.Inject;
import jakarta.inject.Named;
import jakarta.ws.rs.core.MediaType;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.hc.core5.http.ContentType;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.jboss.logging.Logger;
import org.jsoup.Jsoup;
Expand Down Expand Up @@ -239,7 +239,7 @@ public Template addTemplate(InputStream stream)
PutObjectRequest.builder()
.bucket(bucket)
.key(templateName)
.contentType(ContentType.APPLICATION_XML.getMimeType())
.contentType(MediaType.APPLICATION_XML)
.tagging(createTemplateTagging(templateName, description, provider))
.build(),
RequestBody.fromString(model.toString()));
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/io/cryostat/recordings/RecordingHelper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,12 @@
import jakarta.ws.rs.BadRequestException;
import jakarta.ws.rs.NotFoundException;
import jakarta.ws.rs.ServerErrorException;
import jakarta.ws.rs.core.Response;
import jdk.jfr.RecordingState;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.commons.validator.routines.UrlValidator;
import org.apache.hc.core5.http.HttpStatus;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.jboss.logging.Logger;
import org.quartz.Job;
Expand Down Expand Up @@ -177,7 +177,7 @@ void onStart(@Observes StartupEvent evt) {
if (grafanaDatasourceURLProperty.isEmpty()) {
grafanaDatasourceURL.completeExceptionally(
new HttpException(
HttpStatus.SC_BAD_GATEWAY,
Response.Status.BAD_GATEWAY.getStatusCode(),
String.format(
"Configuration property %s is not set",
ConfigProperties.GRAFANA_DATASOURCE_URL)));
Expand All @@ -191,7 +191,7 @@ void onStart(@Observes StartupEvent evt) {
if (!isValidUploadUrl) {
grafanaDatasourceURL.completeExceptionally(
new HttpException(
HttpStatus.SC_BAD_GATEWAY,
Response.Status.BAD_GATEWAY.getStatusCode(),
String.format(
"Configuration property %s=%s is not acceptable",
ConfigProperties.GRAFANA_DATASOURCE_URL,
Expand All @@ -202,7 +202,7 @@ void onStart(@Observes StartupEvent evt) {
} catch (MalformedURLException e) {
grafanaDatasourceURL.completeExceptionally(
new HttpException(
HttpStatus.SC_BAD_GATEWAY,
Response.Status.BAD_GATEWAY.getStatusCode(),
String.format(
"Configuration property %s=%s is not a valid URL",
ConfigProperties.GRAFANA_DATASOURCE_URL,
Expand Down
41 changes: 41 additions & 0 deletions src/main/java/io/cryostat/reports/ReportSidecarService.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
/*
* Copyright The Cryostat Authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.cryostat.reports;

import java.io.InputStream;
import java.util.Map;

import io.cryostat.core.reports.InterruptibleReportGenerator.AnalysisResult;

import io.smallrye.mutiny.Uni;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.ws.rs.Consumes;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.core.MediaType;
import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
import org.jboss.resteasy.reactive.PartType;
import org.jboss.resteasy.reactive.RestForm;

@Path("/report")
@RegisterRestClient(configKey = "reports")
@ApplicationScoped
public interface ReportSidecarService {
@POST
@Consumes(MediaType.MULTIPART_FORM_DATA)
Uni<Map<String, AnalysisResult>> generate(
@RestForm("file") @PartType(MediaType.APPLICATION_OCTET_STREAM) InputStream file);
}
137 changes: 49 additions & 88 deletions src/main/java/io/cryostat/reports/ReportsServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
import java.net.URI;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Future;
import java.util.function.Predicate;

import org.openjdk.jmc.flightrecorder.rules.IRule;
Expand All @@ -31,18 +29,13 @@
import io.cryostat.core.reports.InterruptibleReportGenerator.AnalysisResult;
import io.cryostat.recordings.ActiveRecording;
import io.cryostat.recordings.RecordingHelper;
import io.cryostat.util.HttpStatusCodeIdentifier;

import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.smallrye.mutiny.Uni;
import io.vertx.ext.web.handler.HttpException;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import org.apache.hc.client5.http.classic.methods.HttpPost;
import org.apache.hc.client5.http.entity.mime.MultipartEntityBuilder;
import org.apache.hc.client5.http.impl.classic.HttpClients;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.eclipse.microprofile.rest.client.inject.RestClient;
import org.jboss.logging.Logger;

@ApplicationScoped
Expand All @@ -54,65 +47,57 @@ class ReportsServiceImpl implements ReportsService {
@Inject ObjectMapper mapper;
@Inject RecordingHelper helper;
@Inject InterruptibleReportGenerator reportGenerator;
@Inject @RestClient ReportSidecarService sidecar;
@Inject Logger logger;

@Override
public Uni<Map<String, AnalysisResult>> reportFor(
ActiveRecording recording, Predicate<IRule> predicate) {
Future<Map<String, AnalysisResult>> future =
sidecarUri
.map(
uri -> {
logger.tracev(
"sidecar reportFor active recording {0} {1}",
recording.target.jvmId, recording.remoteId);
try {
return fireRequest(
uri, helper.getActiveInputStream(recording));
} catch (Exception e) {
throw new ReportGenerationException(e);
}
})
.orElseGet(
() -> {
logger.tracev(
"inprocess reportFor active recording {0} {1}",
recording.target.jvmId, recording.remoteId);
try {
return process(
helper.getActiveInputStream(recording), predicate);
} catch (Exception e) {
throw new ReportGenerationException(e);
}
});
return Uni.createFrom().future(future);
return sidecarUri
.map(
uri -> {
logger.tracev(
"sidecar reportFor active recording {0} {1}",
recording.target.jvmId, recording.remoteId);
try {
return fireRequest(uri, helper.getActiveInputStream(recording));
} catch (Exception e) {
throw new ReportGenerationException(e);
}
})
.orElseGet(
() -> {
logger.tracev(
"inprocess reportFor active recording {0} {1}",
recording.target.jvmId, recording.remoteId);
try {
return process(helper.getActiveInputStream(recording), predicate);
} catch (Exception e) {
throw new ReportGenerationException(e);
}
});
}

@Override
public Uni<Map<String, AnalysisResult>> reportFor(
String jvmId, String filename, Predicate<IRule> predicate) {
Future<Map<String, AnalysisResult>> future =
sidecarUri
.map(
uri -> {
logger.tracev(
"sidecar reportFor archived recording {0} {1}",
jvmId, filename);
return fireRequest(
uri,
helper.getArchivedRecordingStream(jvmId, filename));
})
.orElseGet(
() -> {
logger.tracev(
"inprocess reportFor archived recording {0} {1}",
jvmId, filename);
return process(
helper.getArchivedRecordingStream(jvmId, filename),
predicate);
});

return Uni.createFrom().future(future);
return sidecarUri
.map(
uri -> {
logger.tracev(
"sidecar reportFor archived recording {0} {1}",
jvmId, filename);
return fireRequest(
uri, helper.getArchivedRecordingStream(jvmId, filename));
})
.orElseGet(
() -> {
logger.tracev(
"inprocess reportFor archived recording {0} {1}",
jvmId, filename);
return process(
helper.getArchivedRecordingStream(jvmId, filename), predicate);
});
}

@Override
Expand All @@ -125,40 +110,16 @@ public Uni<Map<String, AnalysisResult>> reportFor(String jvmId, String filename)
return reportFor(jvmId, filename, r -> true);
}

private Future<Map<String, AnalysisResult>> process(
private Uni<Map<String, AnalysisResult>> process(
InputStream stream, Predicate<IRule> predicate) {
return reportGenerator.generateEvalMapInterruptibly(
new BufferedInputStream(stream), predicate);
return Uni.createFrom()
.future(
reportGenerator.generateEvalMapInterruptibly(
new BufferedInputStream(stream), predicate));
}

private Future<Map<String, AnalysisResult>> fireRequest(URI uri, InputStream stream) {
var cf = new CompletableFuture<Map<String, AnalysisResult>>();
try (var http = HttpClients.createDefault();
stream) {
var post = new HttpPost(uri.resolve("report"));
var form = MultipartEntityBuilder.create().addBinaryBody("file", stream).build();
post.setEntity(form);
http.execute(
post,
response -> {
if (!HttpStatusCodeIdentifier.isSuccessCode(response.getCode())) {
cf.completeExceptionally(
new HttpException(
response.getCode(), response.getReasonPhrase()));
return null;
}
var entity = response.getEntity();
Map<String, AnalysisResult> evaluation =
mapper.readValue(
entity.getContent(),
new TypeReference<Map<String, AnalysisResult>>() {});
cf.complete(evaluation);
return null;
});
} catch (Exception e) {
cf.completeExceptionally(new ReportGenerationException(e));
}
return cf;
private Uni<Map<String, AnalysisResult>> fireRequest(URI uri, InputStream stream) {
return sidecar.generate(stream);
}

public static class ReportGenerationException extends RuntimeException {
Expand Down
21 changes: 7 additions & 14 deletions src/main/java/io/cryostat/targets/AgentClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
import jdk.jfr.RecordingState;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.hc.client5.http.auth.InvalidCredentialsException;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.jboss.logging.Logger;

Expand Down Expand Up @@ -402,20 +401,14 @@ private <T> Uni<HttpResponse<T>> invoke(
.timeout(httpTimeout.toMillis())
.followRedirects(true)
.as(codec);
try {
Credential credential =
credentialsFinder.getCredentialsForConnectUrl(getUri()).orElse(null);
if (credential == null || credential.username == null || credential.password == null) {
throw new InvalidCredentialsException(NULL_CREDENTIALS + " " + getUri());
}
req =
req.authentication(
new UsernamePasswordCredentials(
credential.username, credential.password));
} catch (InvalidCredentialsException e) {
logger.error("Authentication exception", e);
throw new IllegalStateException(e);
Credential credential =
credentialsFinder.getCredentialsForConnectUrl(getUri()).orElse(null);
if (credential == null || credential.username == null || credential.password == null) {
throw new IllegalStateException(NULL_CREDENTIALS + " " + getUri());
}
req =
req.authentication(
new UsernamePasswordCredentials(credential.username, credential.password));

Uni<HttpResponse<T>> uni;
if (payload != null) {
Expand Down
Empty file added src/main/resources/META-INF/beans.xml
View file
Empty file.
2 changes: 1 addition & 1 deletion src/main/resources/application.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cryostat.connections.ttl=10s
cryostat.connections.failed-backoff=2s
cryostat.connections.failed-timeout=10s
cryostat.messaging.queue.size=1024
cryostat.services.reports.url=
quarkus.rest-client.reports.url=
quarkus.cache.enabled=true
cryostat.services.reports.memory-cache.enabled=true
quarkus.cache.caffeine.matchexpressions.maximum-size=512
Expand Down

0 comments on commit 465ef49

Please sign in to comment.