Add an option to show verbose debugging logs.

Turns out the event handler (BlazeCommandEventHandler) prints almost all
event types, and I don't believe there's a way to tune it.

We certainly don't want these messages printed to the console unless
we're debugging the debugger, so turn them off by default.

PiperOrigin-RevId: 201211355

3 files changed, 10 insertions, 4 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skylarkdebug/module/SkylarkDebuggerOptions.java b/src/main/java/com/google/devtools/build/lib/skylarkdebug/module/SkylarkDebuggerOptions.java
index 3164843f3f..19fbc23450 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkdebug/module/SkylarkDebuggerOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkdebug/module/SkylarkDebuggerOptions.java
@@ -34,7 +34,7 @@ public final class SkylarkDebuggerOptions extends OptionsBase {
   public boolean debugSkylark;
 
   @Option(
-      name = "experimental_debug_server_port",
+      name = "experimental_skylark_debug_server_port",
       defaultValue = "7300",
       documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
       effectTags = {OptionEffectTag.EXECUTION},
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkdebug/server/DebugServerTransport.java b/src/main/java/com/google/devtools/build/lib/skylarkdebug/server/DebugServerTransport.java
index 34b2f3abec..5f5020f29a 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkdebug/server/DebugServerTransport.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkdebug/server/DebugServerTransport.java
@@ -23,6 +23,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.ServerSocket;
 import java.net.Socket;
+import java.util.logging.Logger;
 import javax.annotation.Nullable;
 
 /**
@@ -46,6 +47,8 @@ final class DebugServerTransport {
         clientSocket.getOutputStream());
   }
 
+  private static final Logger logger = Logger.getLogger(DebugServerTransport.class.getName());
+
   private final EventHandler eventHandler;
   private final ServerSocket serverSocket;
   private final Socket clientSocket;
@@ -74,7 +77,7 @@ final class DebugServerTransport {
     synchronized (requestStream) {
       try {
         DebugRequest request = DebugRequest.parseDelimitedFrom(requestStream);
-        eventHandler.handle(Event.debug("Received debug client request:\n" + request));
+        logger.fine("Received debug client request:\n" + request);
         return request;
       } catch (IOException e) {
         handleParsingError(e);
@@ -95,7 +98,7 @@ final class DebugServerTransport {
 
   /** Posts a debug event. */
   void postEvent(DebugEvent event) {
-    eventHandler.handle(Event.debug("Sending debug event:\n" + event));
+    logger.fine("Sending debug event:\n" + event);
     synchronized (eventStream) {
       try {
         event.writeDelimitedTo(eventStream);
diff --git a/src/main/java/com/google/devtools/build/lib/skylarkdebug/server/SkylarkDebugServer.java b/src/main/java/com/google/devtools/build/lib/skylarkdebug/server/SkylarkDebugServer.java
index 02bc164fd2..aebc81805d 100644
--- a/src/main/java/com/google/devtools/build/lib/skylarkdebug/server/SkylarkDebugServer.java
+++ b/src/main/java/com/google/devtools/build/lib/skylarkdebug/server/SkylarkDebugServer.java
@@ -32,6 +32,7 @@ import java.io.IOException;
 import java.net.ServerSocket;
 import java.util.List;
 import java.util.function.Function;
+import java.util.logging.Logger;
 import javax.annotation.Nullable;
 
 /** Manages the network socket and debugging state for threads running Skylark code. */
@@ -64,6 +65,8 @@ public final class SkylarkDebugServer implements DebugServer {
     return new SkylarkDebugServer(eventHandler, transport);
   }
 
+  private static final Logger logger = Logger.getLogger(SkylarkDebugServer.class.getName());
+
   private final EventHandler eventHandler;
   /** Handles all thread-related state. */
   private final ThreadHandler threadHandler;
@@ -119,7 +122,7 @@ public final class SkylarkDebugServer implements DebugServer {
   @Override
   public void close() {
     try {
-      eventHandler.handle(Event.debug("Closing debug server"));
+      logger.fine("Closing debug server");
       transport.close();
 
     } catch (IOException e) {