Skip to content

Abort on IBMJ9's keytool #11133

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
gh-worker-dd-mergequeue-cf854d merged 5 commits into from
Apr 16, 2026
+61 −1
Merged

Abort on IBMJ9's keytool #11133

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
13e4501
fix: Abort on IBMJ9's keytool
bric3 Apr 16, 2026
68759d4
fix: Abort on other Java 8 / IBMJ9 Java JDKs
bric3 Apr 16, 2026
e840513
Update dd-java-agent/src/main/java/datadog/trace/bootstrap/AgentBoots…
bric3 Apr 16, 2026
1c331eb
Update dd-java-agent/src/main/java/datadog/trace/bootstrap/AgentBoots…
bric3 Apr 16, 2026
2368ed0
fix: Missed some tools hotspot based OpenJDK 8
bric3 Apr 16, 2026
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
62 changes: 61 additions & 1 deletion dd-java-agent/src/main/java/datadog/trace/bootstrap/AgentBootstrap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ private static boolean alreadyInitialized() {
return false;
}

private static boolean isJdkTool() {
static boolean isJdkTool() {
Copy link
Copy Markdown
Contributor

@mcculls mcculls Apr 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this change for unit testing?

Copy link
Copy Markdown
Contributor Author

@bric3 bric3 Apr 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes I wanted to introduce a test for that, but I wanted make sure my test was sound before pushing it. Eventually in another PR.

Copy link
Copy Markdown
Contributor

@PerfectSlayer PerfectSlayer Apr 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would not try pushing on patch release without proper testing.

Copy link
Copy Markdown
Contributor Author

@bric3 bric3 Apr 16, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The code is very simple and reads a system property, like a few lines above.

I started tests here #11134

String moduleMain = SystemProperties.get("jdk.module.main");
if (null != moduleMain && !moduleMain.isEmpty() && moduleMain.charAt(0) == 'j') {
switch (moduleMain) {
Expand Down Expand Up @@ -253,6 +253,66 @@ private static boolean isJdkTool() {
return true;
}
}
// Handles JDK 8 tools (IBM J9 and standard JDK 8 vendors)
// jdk.module.main is only set for JDK 9+ module-based tools (already handled above)
String command = SystemProperties.get("sun.java.command");
if (null != command && !command.isEmpty()) {
// substring on first space
int firstSpace = command.indexOf(' ');
String mainClass = firstSpace > 0 ? command.substring(0, firstSpace) : command;
switch (mainClass) {
// IBM J9 JDK 8 specific tool main classes
case "com.ibm.crypto.tools.KeyTool": // keytool
case "com.ibm.security.krb5.internal.tools.Kinit": // kinit
case "com.ibm.security.krb5.internal.tools.Klist": // klist
case "com.ibm.security.krb5.internal.tools.Ktab": // ktab
case "com.ibm.jvm.dtfjview.DTFJView": // jdmpview
case "com.ibm.gsk.ikeyman.ikeycmd": // ikeycmd
case "com.ibm.CosNaming.TransientNameServer": // tnameserv
case "com.ibm.idl.toJavaPortable.Compile": // idlj
// Standard JDK 8 tool main classes (shared by IBM J9 and Oracle/OpenJDK 8)
case "sun.tools.jar.Main": // jar
case "com.sun.tools.javac.Main": // javac
case "com.sun.tools.javadoc.Main": // javadoc
case "com.sun.tools.javap.Main": // javap
case "com.sun.tools.javah.Main": // javah
case "sun.security.tools.keytool.Main": // keytool (Oracle/OpenJDK 8)
case "sun.security.tools.jarsigner.Main": // jarsigner
case "sun.security.tools.policytool.PolicyTool": // policytool
case "com.sun.tools.example.debug.tty.TTY": // jdb
case "com.sun.tools.jdeps.Main": // jdeps
case "sun.rmi.rmic.Main": // rmic
case "sun.rmi.registry.RegistryImpl": // rmiregistry
case "sun.rmi.server.Activation": // rmid
case "com.sun.tools.extcheck.Main": // extcheck
case "sun.tools.serialver.SerialVer": // serialver
case "sun.tools.native2ascii.Main": // native2ascii
case "com.sun.tools.internal.ws.WsGen": // wsgen
case "com.sun.tools.internal.ws.WsImport": // wsimport
case "com.sun.tools.internal.xjc.Driver": // xjc
case "com.sun.tools.internal.jxc.SchemaGenerator": // schemagen
case "com.sun.tools.script.shell.Main": // jrunscript
case "sun.tools.jconsole.JConsole": // jconsole
case "sun.applet.Main": // appletviewer
case "com.sun.corba.se.impl.naming.cosnaming.TransientNameServer": // tnameserv
// (Oracle/OpenJDK 8)
case "com.sun.tools.corba.se.idl.toJavaPortable.Compile": // idlj (Oracle/OpenJDK 8)
case "com.sun.corba.se.impl.activation.ORBD": // orbd
case "com.sun.corba.se.impl.activation.ServerTool": // servertool
case "sun.tools.jps.Jps": // jps
case "sun.tools.jstack.JStack": // jstack
case "sun.tools.jmap.JMap": // jmap
case "sun.tools.jinfo.JInfo": // jinfo
case "com.sun.tools.hat.Main": // jhat
case "sun.tools.jstat.Jstat": // jstat
case "sun.tools.jstatd.Jstatd": // jstatd
case "sun.tools.jcmd.JCmd": // jcmd
case "jdk.jfr.internal.tool.Main": // jfr, backported to OpenJDK 8 in 8u262 (JEP 328
// backport, July 2020)
case "sun.jvm.hotspot.jdi.SADebugServer": // jsadebugd
return true;
}
}
return false;
}

Expand Down
Loading