feat: Update behavior of debug flag

Match behavior of debug options to appmap-java and the maven plugin
getappmap · Aug 6, 2021 · d6e9019 · d6e9019
1 parent 9286a9f
commit d6e9019
Showing 1 changed file with 22 additions and 8 deletions.
diff --git a/src/main/java/com/appland/appmap/AgentCommandLineLoader.java b/src/main/java/com/appland/appmap/AgentCommandLineLoader.java
@@ -20,8 +20,10 @@
  */
 public class AgentCommandLineLoader implements CommandLineArgumentProvider, Named {
 
+  static final String DEFAULT_CONFIG_FILE = "appmap.yml";
+
   private static final Logger LOGGER = Logging.getLogger(CommandLineArgumentProvider.class);
-  private static final List<String> DEBUG_FLAGS = Arrays.asList("hooks", "locals", "http");
+  private static final List<String> DEBUG_FLAGS = Arrays.asList("debug", "hooks", "locals", "http");
 
   private final AppMapPluginExtension appmap;
 
@@ -55,7 +57,7 @@ public List<String> getAsJvmArg() {
           + appmap.getConfigFile().get().getAsFile().getPath());
     }
     if (appmap.shouldSkip()) {
-      LOGGER.warn("AppMap task was executed but but is disable, skip property set to " + appmap
+      LOGGER.warn("AppMap task was executed but but is disabled, 'skip' property set to " + appmap
           .shouldSkip());
       return new ArrayList<>();
     } else {
@@ -66,8 +68,11 @@ public List<String> getAsJvmArg() {
 
       List<String> argumentLn = new ArrayList<>();
       argumentLn.add(javaAgentArg);
-      argumentLn.add("-Dappmap.config.file=" + appmap.getConfigFile().get().toString());
-      argumentLn.add("-Dappmap.output.directory=" + appmap.getOutputDirectory().get().toString());
+
+      if ( appmap.getConfigFile().isPresent() ) {
+        argumentLn.add("-Dappmap.config.file=" + appmap.getConfigFile().get());
+      }
+      argumentLn.add("-Dappmap.output.directory=" + appmap.getOutputDirectory().get());
       argumentLn.add("-Dappmap.event.valueSize=" + appmap.getEventValueSize());
       argumentLn.addAll(buildDebugParams());
       LOGGER.lifecycle("Arguments line set to " + Joiner.on(",").join(argumentLn));
@@ -80,14 +85,23 @@ private List<String> buildDebugParams() {
     if (appmap.getDebug() != null && !appmap.getDebug().isEmpty()) {
       final List<String> debugTokens = new ArrayList<>(
           Arrays.asList(appmap.getDebug().split("[,|\\s]")));
+
+      boolean hasDebug = false;
       for (String token : debugTokens) {
         if (DEBUG_FLAGS.contains(token)) {
-          debugArgs.add("-Dappmap.debug." + token);
+          hasDebug = true;
+          if (token.equals("debug")) {
+            debugArgs.add("-Dappmap.debug");
+          } else {
+            debugArgs.add("-Dappmap.debug." + token);
+          }
         }
       }
-      debugArgs.add(0, "-Dappmap.debug");
-      debugArgs.add(0, "-Dappmap.debug.file=" + StringEscapeUtils
-          .escapeJava(format("%s", appmap.getDebugFile())));
+
+      if (hasDebug) {
+        debugArgs.add(0, "-Dappmap.debug.file=" + StringEscapeUtils
+            .escapeJava(format("%s", appmap.getDebugFile())));
+      }
     }
     return debugArgs;
   }