Add some more logging to the debug server.

Mostly 'debug' level logs that won't appear by default.

PiperOrigin-RevId: 200072597

3 files changed, 10 insertions, 2 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 831a7770c6..3164843f3f 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
@@ -36,7 +36,6 @@ public final class SkylarkDebuggerOptions extends OptionsBase {
   @Option(
       name = "experimental_debug_server_port",
       defaultValue = "7300",
-      category = "server startup",
       documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
       effectTags = {OptionEffectTag.EXECUTION},
       metadataTags = {OptionMetadataTag.EXPERIMENTAL},
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 a1696e368a..34b2f3abec 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
@@ -37,6 +37,7 @@ final class DebugServerTransport {
     // TODO(bazel-team): reject all connections after the first
     eventHandler.handle(Event.progress("Waiting for debugger..."));
     Socket clientSocket = serverSocket.accept();
+    eventHandler.handle(Event.info("Debugger connection successfully established."));
     return new DebugServerTransport(
         eventHandler,
         serverSocket,
@@ -72,7 +73,9 @@ final class DebugServerTransport {
   DebugRequest readClientRequest() {
     synchronized (requestStream) {
       try {
-        return DebugRequest.parseDelimitedFrom(requestStream);
+        DebugRequest request = DebugRequest.parseDelimitedFrom(requestStream);
+        eventHandler.handle(Event.debug("Received debug client request:\n" + request));
+        return request;
       } catch (IOException e) {
         handleParsingError(e);
         return null;
@@ -92,6 +95,7 @@ final class DebugServerTransport {
 
   /** Posts a debug event. */
   void postEvent(DebugEvent event) {
+    eventHandler.handle(Event.debug("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 00af706a47..02bc164fd2 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
@@ -104,6 +104,10 @@ public final class SkylarkDebugServer implements DebugServer {
                               + Throwables.getStackTraceAsString(e)));
                 }
               } finally {
+                eventHandler.handle(
+                    Event.info(
+                        "Debug server listener thread closed; shutting down debug server and "
+                            + "resuming all threads"));
                 close();
               }
             });
@@ -115,6 +119,7 @@ public final class SkylarkDebugServer implements DebugServer {
   @Override
   public void close() {
     try {
+      eventHandler.handle(Event.debug("Closing debug server"));
       transport.close();
 
     } catch (IOException e) {