Skip to content

Add zstd scenario to profile uploading tests #8869

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

Merged
jbachorik merged 14 commits into from
May 26, 2025
Merged

Add zstd scenario to profile uploading tests #8869

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
58c778f
Enable use of zstd (using default level) for profile upload compression
May 19, 2025
83e210d
Deprecate previous profiling compression flag
May 21, 2025
b16250d
Bump max tracer size to 32 mb
May 21, 2025
89f2fb0
Update dd-trace-api/src/main/java/datadog/trace/api/config/ProfilingC…
May 21, 2025
6ec4951
Nits
May 21, 2025
41cd691
Merge branch 'mattalp/enable-zstd-profiling-compression' of github.co…
May 21, 2025
9590171
Nits
May 21, 2025
4aa5300
Merge branch 'master' into mattalp/enable-zstd-profiling-compression
May 21, 2025
b48351e
Revert defaults briefly for org2
May 21, 2025
4f55f9a
Merge branch 'mattalp/enable-zstd-profiling-compression' of github.co…
May 21, 2025
d0e1566
Include ZSTD tests
May 21, 2025
6e76ffb
Straggling comments and log line zstd-reversion
May 22, 2025
514b467
Update ProfileUploaderTest with zstd scenario
May 22, 2025
6783698
Merge branch 'master' into mattalp/enable-zstd-profiling-compression
May 24, 2025
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
12 changes: 11 additions & 1 deletion .../profiling-uploader/src/test/java/com/datadog/profiling/uploader/ProfileUploaderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
import datadog.trace.relocate.api.IOLogger;
import datadog.trace.util.PidHelper;
import delight.fileupload.FileUpload;
import io.airlift.compress.zstd.ZstdInputStream;
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
Expand Down Expand Up @@ -337,7 +338,7 @@ public void testZippedInput() throws Exception {
}

@ParameterizedTest
@ValueSource(strings = {"on", "lz4", "gzip", "off", "invalid"})
@ValueSource(strings = {"on", "lz4", "gzip", "zstd", "off", "invalid"})
public void testCompression(final String compression) throws Exception {
when(config.getApiKey()).thenReturn(null);
when(config.getProfilingUploadCompression()).thenReturn(compression);
Expand Down Expand Up @@ -372,6 +373,8 @@ public void testCompression(final String compression) throws Exception {
byte[] uploadedBytes = rawJfr.get();
if (compression.equals("gzip")) {
uploadedBytes = unGzip(uploadedBytes);
} else if (compression.equals("zstd")) {
uploadedBytes = unZstd(uploadedBytes);
} else if (compression.equals("on")
|| compression.equals("lz4")
|| compression.equals("invalid")) {
Expand Down Expand Up @@ -895,6 +898,13 @@ private static byte[] unLz4(final byte[] compressed) throws IOException {
return result.toByteArray();
}

private static byte[] unZstd(final byte[] compressed) throws IOException {
final InputStream stream = new ZstdInputStream(new ByteArrayInputStream(compressed));
final ByteArrayOutputStream result = new ByteArrayOutputStream();
ByteStreams.copy(stream, result);
return result.toByteArray();
}

private void uploadAndWait(final RecordingType recordingType, final RecordingData data)
throws InterruptedException {
final CountDownLatch latch = new CountDownLatch(1);
Expand Down