Skip to content

Commit

Permalink
feat: java command detects agent lib automatically
Browse files Browse the repository at this point in the history
  • Loading branch information
teletha committed Jan 29, 2024
1 parent 222c51a commit b51d1ed
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/main/java/bee/Bee.java
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ public void execute() {
* @param tasks A list of task commands
*/
public static void main(String... tasks) {
if (tasks.length == 0) tasks = new String[] {"bun"};
if (tasks.length == 0) tasks = new String[] {"test"};

System.exit(new Bee().execute(BeeOption.parse(tasks)));
}
Expand Down
18 changes: 18 additions & 0 deletions src/main/java/bee/util/Java.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.PrintWriter;
Expand All @@ -25,6 +26,9 @@
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.jar.Attributes;
import java.util.jar.JarFile;
import java.util.jar.Manifest;
import java.util.stream.Collectors;

import javax.management.MBeanServer;
Expand Down Expand Up @@ -239,6 +243,20 @@ public void run(Class<? extends JVM> mainClass, Object... arguments) {
if (classpaths.size() != 0) {
command.add("-cp");
command.add(classpaths.stream().map(Path::toString).collect(Collectors.joining(File.pathSeparator)));

I.signal(classpaths).map(Locator::file).take(psychopath.File::isFile).take(file -> {
try (JarFile jar = new JarFile(file.asJavaFile())) {
Manifest manifest = jar.getManifest();
if (manifest != null) {
Attributes main = manifest.getMainAttributes();
String clazz = main.getValue("Premain-Class");
return clazz != null;
}
} catch (IOException e) {
// ignore
}
return false;
}).to(x -> command.add("-javaagent:\"" + x.path() + '"'));
}

if (enableAssertion) {
Expand Down

0 comments on commit b51d1ed

Please sign in to comment.