Skip to content
Merged
Show file tree
Hide file tree
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
Original file line number Diff line number Diff line change
Expand Up @@ -117,21 +117,54 @@ static List<AgentKind> detectAgents() {
try {
var info = ProcessHandle.current().info();
var arguments = info.arguments();
if (arguments.isEmpty()) return agents;
for (var arg : arguments.get()) {
if (!arg.startsWith("-javaagent:")) continue;
// Strip optional =agentargs suffix: -javaagent:/path/to.jar=args
var jarPath = arg.substring("-javaagent:".length());
var eqIdx = jarPath.indexOf('=');
if (eqIdx >= 0) jarPath = jarPath.substring(0, eqIdx);
agents.add(classifyAgentJar(jarPath));
if (arguments.isPresent()) {
for (var arg : arguments.get()) {
if (!arg.startsWith("-javaagent:")) continue;
agents.add(classifyAgentJar(stripAgentPath(arg)));
}
} else {
// arguments() is often empty on Linux; fall back to commandLine()
var cmdLine = info.commandLine();
if (cmdLine.isPresent()) {
agents.addAll(detectAgentsFromCommandLine(cmdLine.get()));
}
}
} catch (Throwable ignored) {
// ProcessHandle unavailable — return empty, callers fall back gracefully.
} catch (Throwable t) {
log("error detecting agents: " + t.getMessage());
log(t);
}
return agents;
}

/** Extracts {@code -javaagent:} entries from a raw command line string. */
static List<AgentKind> detectAgentsFromCommandLine(String cmdLine) {
var agents = new ArrayList<AgentKind>();
var prefix = "-javaagent:";
int idx = 0;
while ((idx = cmdLine.indexOf(prefix, idx)) >= 0) {
int start = idx + prefix.length();
// The jar path ends at the next whitespace (or end of string).
// An '=' before whitespace separates jar path from agent args.
int end = start;
while (end < cmdLine.length() && cmdLine.charAt(end) != ' ') {
end++;
}
var token = cmdLine.substring(start, end);
var eqIdx = token.indexOf('=');
var jarPath = eqIdx >= 0 ? token.substring(0, eqIdx) : token;
agents.add(classifyAgentJar(jarPath));
idx = end;
}
return agents;
}

private static String stripAgentPath(String arg) {
var jarPath = arg.substring("-javaagent:".length());
var eqIdx = jarPath.indexOf('=');
if (eqIdx >= 0) jarPath = jarPath.substring(0, eqIdx);
return jarPath;
}

private static AgentKind classifyAgentJar(String jarPath) {
try (var jar = new JarFile(jarPath, false)) {
Manifest manifest = jar.getManifest();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,26 @@ void detectAgentsIncludesBraintrust() {
"did not expect DATADOG in plain test JVM, got: " + agents);
}

@Test
void detectAgentsFromCommandLine() {
var cmdLine =
"/usr/bin/java -Dfoo=bar"
+ " -javaagent:/path/to/dd-java-agent-1.61.1.jar"
+ " -javaagent:/tmp/braintrust-java-agent.jar"
+ " -XX:TieredStopAtLevel=1 -cp foo.jar Main";
var agents = AgentBootstrap.detectAgentsFromCommandLine(cmdLine);
assertEquals(2, agents.size(), "expected 2 agents, got: " + agents);
// classifyAgentJar won't find real JARs at these paths, so both will be UNKNOWN;
// the important thing is that parsing found 2 -javaagent entries.
}

@Test
void detectAgentsFromCommandLineWithAgentArgs() {
var cmdLine = "/usr/bin/java -javaagent:/path/agent.jar=someArgs -cp foo.jar Main";
var agents = AgentBootstrap.detectAgentsFromCommandLine(cmdLine);
assertEquals(1, agents.size(), "expected 1 agent, got: " + agents);
}

@Test
void otelAutoconfigureProducesRealTracer() {
assertEquals(
Expand Down
Loading