Update javaagent logic inside of AgentBootstrap

Author: mtoffl01

components/cli/src/main/java/datadog.cli/CLIHelper.java

@@ -10,10 +10,8 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 public class CLIHelper {
   public static final CLIHelper ARGS = new CLIHelper();
@@ -24,16 +22,8 @@ public CLIHelper() {
     this.args = parseJvmArgs(initJvmArgs());
   }
 
-  public Set<String> getJvmArgs() {
-    return new HashSet<>(args.keySet());
-  }
-
-  public boolean contains(String argument) {
-    return args.containsKey(argument);
-  }
-
-  public List<String> getValues(String key) {
-    return args.getOrDefault(key, Collections.emptyList());
+  public List<String> getValues(String jvmArg) {
+    return this.args.get(jvmArg);
   }
 
   @SuppressForbidden

dd-java-agent/src/main/java/datadog/trace/bootstrap/AgentBootstrap.java

@@ -381,20 +381,16 @@ private static List<File> getAgentFilesFromVMArguments() {
       // - On IBM-based JDKs since at least 1.7
       // This prevents custom log managers from working correctly
       // Use reflection to bypass the loading of the class~
-      for (final String argument : CLIHelper.ARGS.getJvmArgs()) {
-        if (argument.startsWith(JAVA_AGENT_ARGUMENT)) {
-          int index = argument.indexOf('=', JAVA_AGENT_ARGUMENT.length());
-          String agentPathname =
-              argument.substring(
-                  JAVA_AGENT_ARGUMENT.length(), index == -1 ? argument.length() : index);
-          File agentFile = new File(agentPathname);
-          if (agentFile.exists() && agentFile.isFile()) {
-            agentFiles.add(agentFile);
-          } else {
-            System.err.println(
-                "Could not get bootstrap jar from -javaagent arg: unable to find javaagent file: "
-                    + agentFile);
-          }
+      for (final String argument : CLIHelper.ARGS.getValues(JAVA_AGENT_ARGUMENT)) {
+        int index = argument.indexOf('=');
+        String agentPathname = argument.substring(0, index == -1 ? argument.length() : index);
+        File agentFile = new File(agentPathname);
+        if (agentFile.exists() && agentFile.isFile()) {
+          agentFiles.add(agentFile);
+        } else {
+          System.err.println(
+              "Could not get bootstrap jar from -javaagent arg: unable to find javaagent file: "
+                  + agentFile);
         }
       }
     }