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(reports): use S3 presigned URL for report recording transfer #270

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

feat(reports): use S3 presigned URL for report recording transfer #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fa6557
use single HTTP client instance
andrewazores Jan 24, 2024
0236d3b
feat(reports): use S3 presigned URL for report recording transfer
andrewazores Jan 24, 2024
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
3 changes: 3 additions & 0 deletions smoketest/compose/reports.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ services:
environment:
JAVA_OPTS_APPEND: "-Dcom.sun.management.jmxremote.autodiscovery=true -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=11224 -Dcom.sun.management.jmxremote.rmi.port=11224 -Djava.rmi.server.hostname=reports -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.local.only=false"
QUARKUS_HTTP_PORT: 10001
CRYOSTAT_STORAGE_BASE_URI: http://auth:8080/storage
CRYOSTAT_STORAGE_AUTH_METHOD: Basic
CRYOSTAT_STORAGE_AUTH: dXNlcjpwYXNz # user:pass
healthcheck:
test: curl --fail http://localhost:10001/ || exit 1
retries: 3
Expand Down
77 changes: 67 additions & 10 deletions src/main/java/io/cryostat/reports/ReportsServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,12 @@
package io.cryostat.reports;

import java.io.BufferedInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
import java.net.URISyntaxException;
import java.time.Duration;
import java.time.Instant;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
Expand All @@ -35,28 +39,53 @@

import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.quarkus.runtime.ShutdownEvent;
import io.quarkus.runtime.StartupEvent;
import io.smallrye.common.annotation.Blocking;
import io.smallrye.mutiny.Uni;
import io.vertx.ext.web.handler.HttpException;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.event.Observes;
import jakarta.inject.Inject;
import org.apache.commons.lang3.tuple.Pair;
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.CloseableHttpClient;
import org.apache.hc.client5.http.impl.classic.HttpClients;
import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.jboss.logging.Logger;
import software.amazon.awssdk.services.s3.model.GetObjectRequest;
import software.amazon.awssdk.services.s3.presigner.S3Presigner;
import software.amazon.awssdk.services.s3.presigner.model.GetObjectPresignRequest;

@ApplicationScoped
class ReportsServiceImpl implements ReportsService {

@ConfigProperty(name = ConfigProperties.REPORTS_SIDECAR_URL)
Optional<URI> sidecarUri;

@ConfigProperty(name = ConfigProperties.AWS_BUCKET_NAME_ARCHIVES)
String archiveBucket;

@ConfigProperty(name = ConfigProperties.STORAGE_EXT_URL)
Optional<String> externalStorageUrl;

@Inject ObjectMapper mapper;
@Inject RecordingHelper helper;
@Inject InterruptibleReportGenerator reportGenerator;
@Inject S3Presigner presigner;
@Inject Logger logger;

CloseableHttpClient http;

void onStart(@Observes StartupEvent evt) {
this.http = HttpClients.createSystem();
}

void onStop(@Observes ShutdownEvent evt) throws IOException {
this.http.close();
}

@Blocking
@Override
public Uni<Map<String, AnalysisResult>> reportFor(
Expand All @@ -69,8 +98,7 @@ public Uni<Map<String, AnalysisResult>> reportFor(
"sidecar reportFor active recording {0} {1}",
recording.target.jvmId, recording.remoteId);
try {
return fireRequest(
uri, helper.getActiveInputStream(recording));
return fireRequest(uri, getPresignedUri(recording));
} catch (Exception e) {
throw new ReportGenerationException(e);
}
Expand Down Expand Up @@ -101,9 +129,11 @@ public Uni<Map<String, AnalysisResult>> reportFor(
logger.tracev(
"sidecar reportFor archived recording {0} {1}",
jvmId, filename);
return fireRequest(
uri,
helper.getArchivedRecordingStream(jvmId, filename));
try {
return fireRequest(uri, getPresignedPath(jvmId, filename));
} catch (Exception e) {
throw new ReportGenerationException(e);
}
})
.orElseGet(
() -> {
Expand All @@ -124,12 +154,39 @@ private Future<Map<String, AnalysisResult>> process(
new BufferedInputStream(stream), predicate);
}

private Future<Map<String, AnalysisResult>> fireRequest(URI uri, InputStream stream) {
private URI getPresignedUri(ActiveRecording recording) throws Exception {
// TODO refactor, this is copied out of Recordings.java
String savename = recording.name;
String filename = helper.saveRecording(recording, savename, Instant.now().plusSeconds(60));
return getPresignedPath(recording.target.jvmId, filename);
}

private URI getPresignedPath(String jvmId, String filename) throws URISyntaxException {
// TODO refactor, this is copied out of Recordings.java
logger.infov("Handling presigned download request for {0}/{1}", jvmId, filename);
GetObjectRequest getRequest =
GetObjectRequest.builder()
.bucket(archiveBucket)
.key(helper.archivedRecordingKey(Pair.of(jvmId, filename)))
.build();
GetObjectPresignRequest presignRequest =
GetObjectPresignRequest.builder()
.signatureDuration(Duration.ofMinutes(1))
.getObjectRequest(getRequest)
.build();
return URI.create(presigner.presignGetObject(presignRequest).url().toString()).normalize();
}

private Future<Map<String, AnalysisResult>> fireRequest(
URI sidecarUri, URI presignedRecordingUri) {
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();
try {
var post = new HttpPost(sidecarUri.resolve("remote_report"));
var form =
MultipartEntityBuilder.create()
.addTextBody("path", presignedRecordingUri.getPath())
.addTextBody("query", presignedRecordingUri.getQuery())
.build();
post.setEntity(form);
http.execute(
post,
Expand Down
Loading