Skip to content
Merged
Changes from all commits
Commits
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
16 changes: 10 additions & 6 deletions src/main/java/io/cryostat/recordings/RecordingHelper.java
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@
import org.quartz.TriggerBuilder;
import org.quartz.plugins.interrupt.JobInterruptMonitorPlugin;
import software.amazon.awssdk.core.async.AsyncRequestBody;
import software.amazon.awssdk.services.s3.S3AsyncClient;
import software.amazon.awssdk.services.s3.S3Client;
import software.amazon.awssdk.services.s3.model.DeleteObjectRequest;
import software.amazon.awssdk.services.s3.model.GetObjectRequest;
Expand All @@ -145,6 +144,7 @@
import software.amazon.awssdk.services.s3.presigner.model.GetObjectPresignRequest;
import software.amazon.awssdk.transfer.s3.S3TransferManager;
import software.amazon.awssdk.transfer.s3.model.UploadFileRequest;
import software.amazon.awssdk.transfer.s3.model.UploadRequest;

/**
* Utility class for all things relating to Flight Recording operations. This class is used to
Expand All @@ -167,7 +167,6 @@ public class RecordingHelper {
public static final String DATASOURCE_FILENAME = "cryostat-analysis.jfr";

@Inject S3Client storage;
@Inject S3AsyncClient storageAsync;
@Inject S3TransferManager transferManager;
final ExecutorService partUploader = Executors.newVirtualThreadPerTaskExecutor();

Expand Down Expand Up @@ -1022,10 +1021,15 @@ public ArchivedRecording archiveRecording(ActiveRecording recording) throws Exce
default:
throw new IllegalStateException();
}
storageAsync
.putObject(
builder.build(),
AsyncRequestBody.fromInputStream(stream, null, partUploader))
transferManager
.upload(
UploadRequest.builder()
.putObjectRequest(builder.build())
.requestBody(
AsyncRequestBody.fromInputStream(
stream, null, partUploader))
.build())
.completionFuture()
.join();
}
ArchivedRecording archivedRecording =
Expand Down
Loading