Skip to content

Makes writing the test jar buffered #9561

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
bric3 merged 3 commits into from
Sep 18, 2025
Merged

Makes writing the test jar buffered #9561

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ced2212
fix: Makes writing the test jar buffered
bric3 Sep 18, 2025
290e3c8
chore: Makes google-format happy
bric3 Sep 18, 2025
988561a
chore: Additional fixes
bric3 Sep 18, 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
26 changes: 10 additions & 16 deletions dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/utils/ClasspathUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@

import static datadog.trace.util.Strings.getResourceName;

import java.io.BufferedOutputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Method;
import java.net.URL;
import java.nio.file.Files;
import java.util.UUID;
import java.util.jar.JarEntry;
import java.util.jar.JarOutputStream;
Expand All @@ -28,14 +29,9 @@ public static byte[] convertToByteArray(final InputStream resource) throws IOExc
}

public static byte[] convertToByteArray(final Class<?> clazz) throws IOException {
InputStream inputStream = null;
try {
inputStream = clazz.getClassLoader().getResourceAsStream(getResourceName(clazz.getName()));
try (InputStream inputStream =
clazz.getClassLoader().getResourceAsStream(getResourceName(clazz.getName()))) {
return convertToByteArray(inputStream);
} finally {
if (inputStream != null) {
inputStream.close();
}
}
}

Expand All @@ -56,7 +52,8 @@ public static URL createJarWithClasses(final ClassLoader loader, final String...

final Manifest manifest = new Manifest();
try (final JarOutputStream target =
new JarOutputStream(new FileOutputStream(tmpJar), manifest)) {
new JarOutputStream(
new BufferedOutputStream(Files.newOutputStream(tmpJar.toPath())), manifest)) {
for (final String resourceName : resourceNames) {
try (InputStream is = loader.getResourceAsStream(resourceName)) {
if (is != null) {
Expand All @@ -79,11 +76,13 @@ public static URL createJarWithClasses(final ClassLoader loader, final String...
* @throws IOException
*/
public static URL createJarWithClasses(final Class<?>... classes) throws IOException {
final File tmpJar = File.createTempFile(UUID.randomUUID().toString() + "", ".jar");
final File tmpJar = File.createTempFile(UUID.randomUUID().toString(), ".jar");
tmpJar.deleteOnExit();

final Manifest manifest = new Manifest();
final JarOutputStream target = new JarOutputStream(new FileOutputStream(tmpJar), manifest);
final JarOutputStream target =
new JarOutputStream(
new BufferedOutputStream(Files.newOutputStream(tmpJar.toPath())), manifest);
for (final Class<?> clazz : classes) {
addToJar(getResourceName(clazz.getName()), convertToByteArray(clazz), target);
}
Expand All @@ -92,11 +91,6 @@ public static URL createJarWithClasses(final Class<?>... classes) throws IOExcep
return tmpJar.toURI().toURL();
}

public static URL createJarWithClasses() {

return null;
}

private static void addToJar(
final String resourceName, final byte[] bytes, final JarOutputStream jarOutputStream)
throws IOException {
Expand Down