From ef8135de6adfc7ca3bae4bc07545bd41888086a2 Mon Sep 17 00:00:00 2001
From: Jinbo Wang <jinbwan@microsoft.com>
Date: Thu, 1 Sep 2022 15:20:11 +0800
Subject: [PATCH] refine the debug trace

---
 .../debug/core/adapter/handler/AttachRequestHandler.java   | 1 +
 .../adapter/handler/ConfigurationDoneRequestHandler.java   | 1 -
 .../debug/core/adapter/handler/LaunchRequestHandler.java   | 7 +++++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/AttachRequestHandler.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/AttachRequestHandler.java
index 4d11ef6fb..cee6e64a3 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/AttachRequestHandler.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/AttachRequestHandler.java
@@ -64,6 +64,7 @@ public CompletableFuture<Response> handle(Command command, Arguments arguments,
 
         Map<String, Object> traceInfo = new HashMap<>();
         traceInfo.put("localAttach", context.isLocalDebugging());
+        traceInfo.put("asyncJDWP", context.asyncJDWP());
 
         IVirtualMachineManagerProvider vmProvider = context.getProvider(IVirtualMachineManagerProvider.class);
         vmHandler.setVmProvider(vmProvider);
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/ConfigurationDoneRequestHandler.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/ConfigurationDoneRequestHandler.java
index 311db11c3..737d5d858 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/ConfigurationDoneRequestHandler.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/ConfigurationDoneRequestHandler.java
@@ -55,7 +55,6 @@ public List<Command> getTargetCommands() {
     public CompletableFuture<Response> handle(Command command, Arguments arguments, Response response, IDebugAdapterContext context) {
         IDebugSession debugSession = context.getDebugSession();
         vmHandler.setVmProvider(context.getProvider(IVirtualMachineManagerProvider.class));
-        UsageDataSession.recordInfo("asyncJDWP", context.asyncJDWP());
         if (debugSession != null) {
             // This is a global event handler to handle the JDI Event from Virtual Machine.
             debugSession.getEventHub().events().subscribe(debugEvent -> {
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/LaunchRequestHandler.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/LaunchRequestHandler.java
index fec967b84..e5b580f50 100644
--- a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/LaunchRequestHandler.java
+++ b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/adapter/handler/LaunchRequestHandler.java
@@ -42,6 +42,7 @@
 import com.microsoft.java.debug.core.DebugUtility;
 import com.microsoft.java.debug.core.IDebugSession;
 import com.microsoft.java.debug.core.LaunchException;
+import com.microsoft.java.debug.core.UsageDataSession;
 import com.microsoft.java.debug.core.adapter.AdapterUtils;
 import com.microsoft.java.debug.core.adapter.ErrorCode;
 import com.microsoft.java.debug.core.adapter.IDebugAdapterContext;
@@ -76,6 +77,12 @@ public List<Command> getTargetCommands() {
     @Override
     public CompletableFuture<Response> handle(Command command, Arguments arguments, Response response, IDebugAdapterContext context) {
         LaunchArguments launchArguments = (LaunchArguments) arguments;
+        Map<String, Object> traceInfo = new HashMap<>();
+        traceInfo.put("asyncJDWP", context.asyncJDWP());
+        traceInfo.put("noDebug", launchArguments.noDebug);
+        traceInfo.put("console", launchArguments.console);
+        UsageDataSession.recordInfo("launch debug info", traceInfo);
+
         activeLaunchHandler = launchArguments.noDebug ? new LaunchWithoutDebuggingDelegate((daContext) -> handleTerminatedEvent(daContext))
                 : new LaunchWithDebuggingDelegate();
         return handleLaunchCommand(arguments, response, context);